Merge branch 'main' into dev

Author: jravenel

lib/abi/utils/OntologyYaml.py

@@ -18,7 +18,7 @@ def __init__(self):
     @staticmethod
     def rdf_to_yaml(
         graph,
-        ontology_schemas: list = ["src/core/ontologies/ConsolidatedOntology.ttl"],
+        ontology_schemas: list = ["src/core/modules/common/ontologies/ConsolidatedOntology.ttl"],
         class_colors_mapping: dict = {},
         top_level_class: str = 'http://purl.obolibrary.org/obo/BFO_0000001',
         display_relations_names: bool = True,
@@ -559,7 +559,23 @@ def create_yaml(self, class_color, display_relations_names):
 
                 # Add title in style
                 ind_title = f"{label} (id: {uri})"
-                for x in ["description", "summary", "headline", "industry", "employeecountrange", "content", "slug"]:
+                yaml_properties = [
+                    "description",
+                    "summary",
+                    "headline",
+                    "industry",
+                    "employeecountrange",
+                    "content",
+                    "slug",
+                    "mission",
+                    "vision",
+                    "number_of_employees",
+                    "market_share",
+                    "source",
+                    "source_url",
+                    "source_date"
+                ]
+                for x in yaml_properties:
                     x_value = individual.get(x)
                     if x_value:
                         entity[x] = x_value[0]

src/core/modules/common/integrations/AiaIntegration.py

@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from pydantic import BaseModel, Field
 from lib.abi.integration.integration import Integration, IntegrationConnectionError, IntegrationConfiguration
-from src import secret
+from src import config
 import requests
 
 LOGO_URL = "https://naasai-public.s3.eu-west-3.amazonaws.com/abi-demo/ontology_AIA.png"
@@ -16,6 +16,8 @@ class AiaIntegrationConfiguration(IntegrationConfiguration):
         base_url (str): Base URL for AIA API
     """
     api_key: str
+    li_at: str
+    JSESSIONID: str
     base_url: str = "https://naas-abi-space.default.space.naas.ai"  # Replace with actual base URL
 
 class AiaIntegration(Integration):
@@ -45,14 +47,14 @@ def _make_request(self, method: str, endpoint: str, data: Dict = None) -> Dict:
         except requests.exceptions.RequestException as e:
             raise IntegrationConnectionError(f"AIA API request failed: {str(e)}")
 
-    def create_aia(self, workspace_id: str, linkedin_urls: List[str]) -> Dict:
+    def create_aia(self, linkedin_urls: List[str]) -> Dict:
         """Create an AIA organization with the specified parameters."""
         data = {
             "api_key": self.__configuration.api_key,
-            "workspace_id": workspace_id,
+            "workspace_id": config.workspace_id,
             "linkedin_urls": linkedin_urls,
-            "li_at": secret.get('li_at'),
-            "JSESSIONID": secret.get('JSESSIONID'),
+            "li_at": self.__configuration.li_at,
+            "JSESSIONID": self.__configuration.JSESSIONID,
         }
         return self._make_request("POST", "/ontology/create_aia_organization", data)
 
@@ -62,15 +64,13 @@ def as_tools(configuration: AiaIntegrationConfiguration):
     integration: AiaIntegration = AiaIntegration(configuration)
 
     class CreateAiaOrganizationSchema(BaseModel):
-        workspace_id: str = Field(..., description="Workspace ID for the organization")
-        linkedin_urls: List[str] = Field(..., description="List of LinkedIn URLs to process")
+        linkedin_urls: List[str] = Field(..., description="LinkedIn URL(s) to process. It can be one or multiple URLs. URLs must be in the format: https://.+\.linkedin\.[^/]+/in/[^?]+")
 
     return [
         StructuredTool(
             name="aia_create_personal_agent",
-            description="Create AIA Personal Assistant and ontology with LinkedIn data to naas workspace",
-            func=lambda workspace_id, linkedin_urls: 
-                integration.create_aia(workspace_id, linkedin_urls),
+            description="Create AIA Personal Assistant/Agent based on LinkedIn URL.",
+            func=lambda linkedin_urls: integration.create_aia(linkedin_urls),
             args_schema=CreateAiaOrganizationSchema
         )
     ]

src/core/modules/common/integrations/LinkedInIntegration.py

@@ -254,7 +254,7 @@ def get_profile_posts(
 
         return df.reset_index(drop=True)
 
-    def get_organization_id(url: str) -> str:
+    def get_organization_id(self, url: str) -> str:
         """Extract organization ID from LinkedIn URL.
         
         Handles company, school and showcase pages.

src/core/modules/opendata/workflows/LinkedInOrganizationsWorkflows.py

@@ -79,33 +79,36 @@ def get_organization_info(self, parameters: LinkedInOrganizationParameters) -> d
                 linkedin_url = self.__google_search_integration.search_linkedin_organization_url(parameters.organization_name)
                 logger.debug(f"LinkedIn URL: {linkedin_url}")
 
-            logger.info(f"Extracting organization data from LinkedInIntegration for '{parameters.organization_name}'")
-            df = self.__linkedin_integration.get_organization_details(linkedin_url)
-            if len(df) > 0:
-                data = {
-                    "organization_name": parameters.organization_name,
-                    "organization_id": create_id_from_string(parameters.organization_name),
-                    "linkedin_url": linkedin_url,
-                    "data": df.to_dict('records'),
-                    "output_dir": str(output_dir),
-                    "date_extracted": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                }
-                logger.info(f"Data successfully extracted: {data}")
-            else:
-                logger.error(f"No data found for '{parameters.organization_name}'")
-
-            # Save data to storage
-            services.storage_service.put_object(
-                prefix=output_dir,
-                key=file_name,
-                content=json.dumps(data, indent=4, ensure_ascii=False).encode("utf-8")
-            )
+            if linkedin_url is not None:
+                logger.info(f"Extracting organization data from LinkedInIntegration for '{parameters.organization_name}'")
+                df = self.__linkedin_integration.get_organization_details(linkedin_url)
+                if len(df) > 0:
+                    data = {
+                        "organization_name": parameters.organization_name,
+                        "organization_id": create_id_from_string(parameters.organization_name),
+                        "linkedin_url": linkedin_url,
+                        "data": df.to_dict('records'),
+                        "output_dir": str(output_dir),
+                        "date_extracted": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                    }
+                    logger.info(f"Data successfully extracted: {data}")
+                else:
+                    logger.error(f"No data found for '{parameters.organization_name}'")
+
+                # Save data to storage
+                services.storage_service.put_object(
+                    prefix=output_dir,
+                    key=file_name,
+                    content=json.dumps(data, indent=4, ensure_ascii=False).encode("utf-8")
+                )
         return data
 
     def get_organization_logo_url(self, parameters: LinkedInOrganizationParameters) -> str:
         """Get organization logo URL from the OpenData store."""
         # Initialize storage
         data = self.get_organization_info(parameters)
+        if data is None:
+            return None
         logo_url = data.get("data", [{}])[0].get("LOGO_URL")
         output_dir = data.get("output_dir")
         organization_id = data.get("organization_id")

src/core/modules/operations/assistants/OperationsAssistant.py

@@ -86,7 +86,7 @@ def create_agent(
         tools += naas_workspace_workflows.as_tools()
 
     if naas_api_key and li_at and JSESSIONID:
-        aia_integration_config = AiaIntegrationConfiguration(api_key=naas_api_key)
+        aia_integration_config = AiaIntegrationConfiguration(api_key=naas_api_key, li_at=li_at, JSESSIONID=JSESSIONID)
         tools += AiaIntegration.as_tools(aia_integration_config)
 
     if github_access_token: