naas-abi-core 1.2.1__py3-none-any.whl → 1.4.0__py3-none-any.whl

naas_abi_core/apps/api/openapi_doc.py

@@ -46,169 +46,6 @@ print(response.json())
 ```
         """,
     },
-    {
-        "name": "Connections",
-        "description": """
-Connections are currently configured using Integration secrets (API keys, credentials) set up in the GitHub project settings. \n
-Learn more about the data access and secrets key [here](https://github.com/jupyter-naas/abi/blob/main/README.md#setup-github-repository-secrets).
-
-### Agicap
-Required:
-- `AGICAP_USERNAME`: Username of your Agicap account
-- `AGICAP_PASSWORD`: Password of your Agicap account
-- `AGICAP_CLIENT_ID`: Client ID of your Agicap account. [Get your client ID](https://app.agicap.com/fr/app/organization-advanced-settings/public-api)
-- `AGICAP_CLIENT_SECRET`: Client Secret of your Agicap account. [Get your client secret](https://app.agicap.com/fr/app/organization-advanced-settings/public-api)
-- `AGICAP_BEARER_TOKEN`: Bearer Token of your Agicap account.
-- `AGICAP_API_TOKEN`: API token of your Agicap account. [Get your API token](https://app.agicap.com/fr/app/parametres/openapi)
-
-### Algolia
-Required:
-- `ALGOLIA_API_KEY`: API key of your Algolia account. [Get your API key](https://www.algolia.com/api-keys)
-- `ALGOLIA_APPLICATION_ID`: Application ID of your Algolia account. [Get your application ID](https://www.algolia.com/api-keys)
-
-### Airtable
-Required:
-- `AIRTABLE_API_KEY`: API key of your Airtable account. [Get your API key](https://airtable.com/create/tokens)
-- `AIRTABLE_BASE_ID`: Base ID of your Airtable account. [Get your base ID](https://airtable.com/create/tokens)
-
-### AWS
-Required:
-- `AWS_ACCESS_KEY_ID`: Access key ID of your AWS account. [Get your access key ID](https://us-east-1.console.aws.amazon.com/iam/home)
-- `AWS_SECRET_ACCESS_KEY`: Secret access key of your AWS account. [Get your secret access key](https://us-east-1.console.aws.amazon.com/iam/home)
-- `AWS_REGION`: Region of your AWS account. [Get your region](https://us-east-1.console.aws.amazon.com/iam/home)
-
-### Brevo
-Required:
-- `BREVO_API_KEY`: API key of your Brevo account. [Get your API key](https://help.brevo.com/hc/en-us/articles/209467485)
-
-### Clockify
-Required:
-- `CLOCKIFY_API_KEY`: API key of your Clockify account. [Get your API key](https://clockify.me/user/settings)
-
-### Discord
-Required:
-- `DISCORD_API_KEY`: API key of your Discord account. [Get your API key](https://discord.com/developers/applications)
-
-### Github
-Required:
-- `GITHUB_ACCESS_TOKEN`: Access token of your Github account. [Get your access token](https://github.com/settings/tokens)
-
-### Gladia
-Required:
-- `GLADIA_API_KEY`: API key of your Gladia account. [Get your API key](https://www.gladia.ai/)
-
-### Gmail
-Required:
-- `GMAIL_EMAIL`: Email of your Gmail account.
-- `GMAIL_APP_PASSWORD`: App password of your Gmail account. [Get your app password](https://support.google.com/mail/answer/185833)
-
-### Harvest
-Required:
-- `HARVEST_API_KEY`: API key of your Harvest account. [Get your API key](https://app.harvestapp.com/account/api)
-- `HARVEST_ACCOUNT_ID`: Account ID of your Harvest account.
-
-### HubSpot
-Required:
-- `HUBSPOT_ACCESS_TOKEN`: Access token of your HubSpot account. [Get your access token](https://developers.hubspot.com/docs/api/private-apps)
-
-### Instagram
-Required:
-- `INSTAGRAM_ACCESS_TOKEN`: Access token of your Instagram account. [Get your access token](https://developers.facebook.com/docs/instagram-api)
-
-### LinkedIn
-Required:
-- `li_at` cookie: li_at cookie of your LinkedIn account. [Get your li_at cookie](https://www.notion.so/LinkedIn-driver-Get-your-cookies)
-- `JSESSIONID` cookie: JSESSIONID cookie of your LinkedIn account. [Get your JSESSIONID cookie](https://www.notion.so/LinkedIn-driver-Get-your-cookies)
-
-### Mailchimp
-Required:
-- `MAILCHIMP_API_KEY`: API key of your Mailchimp account. [Get your API key](https://mailchimp.com/developer/api/)
-- `MAILCHIMP_SERVER_PREFIX`: Server prefix of your Mailchimp account. [Get your server prefix](https://mailchimp.com/developer/api/)
-
-### Mercury
-Required:
-- `MERCURY_API_TOKEN`: API token of your Mercury account. [Get your API token](https://app.mercury.com/settings/tokens)
-
-### NewsAPI
-Required:
-- `NEWSAPI_API_KEY`: API key of your NewsAPI account. [Get your API key](https://newsapi.org/register)
-
-### Notion
-Required:
-- `NOTION_API_KEY`: API key of your Notion account. [Get your API key](https://www.notion.so/my-integrations)
-
-### OneDrive
-Required:
-- `ONEDRIVE_ACCESS_TOKEN`: Access token of your OneDrive account. [Get your access token](https://learn.microsoft.com/en-us/onedrive/developer/rest-api/getting-started/)
-
-### Pennylane
-Required:
-- `PENNYLANE_API_TOKEN`: API token of your Pennylane account. [Get your API token](https://pennylane.readme.io/docs/get-my-api-token)
-
-### Perplexity
-Required:
-- `PERPLEXITY_API_KEY`: API key of your Perplexity account. [Get your API key](https://docs.perplexity.ai/docs/getting-started)
-
-### Pipedrive
-Required:
-- `PIPEDRIVE_API_KEY`: API key of your Pipedrive account. [Get your API key](https://app.pipedrive.com/settings/api)
-
-### PostgreSQL
-Required:
-- `POSTGRES_HOST`: Host of your PostgreSQL database.
-- `POSTGRES_PORT`: Port of your PostgreSQL database.
-- `POSTGRES_DB`: Database name of your PostgreSQL database.
-- `POSTGRES_USER`: User of your PostgreSQL database.
-- `POSTGRES_PASSWORD`: Password of your PostgreSQL database.
-
-### Qonto
-Required:
-- `QONTO_ORGANIZATION_SLUG`: Organization slug of your Qonto account. [Get your organization slug](https://support-fr.qonto.com/hc/en-us/articles/23947692362513)
-- `QONTO_SECRET_KEY`: Secret key of your Qonto account. [Get your secret key](https://support-fr.qonto.com/hc/en-us/articles/23947692362513)
-
-### Replicate
-Required:
-- `REPLICATE_API_KEY`: API key of your Replicate account. [Get your API key](https://replicate.com/account/api-tokens)
-
-### Serper
-Required:
-- `SERPER_API_KEY`: API key of your Serper account. [Get your API key](https://serper.dev/api-key)
-
-### Slack
-Required:
-- `SLACK_BOT_TOKEN`: Bot token of your Slack account. [Get your bot token](https://api.slack.com/apps)
-
-### Stripe
-Required:
-- `STRIPE_API_KEY`: API key of your Stripe account. [Get your API key](https://dashboard.stripe.com/apikeys)
-
-### Supabase
-Required:
-- `SUPABASE_URL`: URL of your Supabase account. [Get your URL](https://app.supabase.com/project/_/settings/api)
-- `SUPABASE_KEY`: Key of your Supabase account. [Get your key](https://app.supabase.com/project/_/settings/api)
-
-### TikTok
-Required:
-- `TIKTOK_ACCESS_TOKEN`: Access token of your TikTok account. [Get your access token](https://developers.tiktok.com/)
-
-### WhatsApp
-Required:
-- `WHATSAPP_ACCESS_TOKEN`: Access token of your WhatsApp account. [Get your access token](https://developers.facebook.com/docs/whatsapp/cloud-api/get-started)
-
-### Yahoo Finance
-Required:
-- `YAHOO_FINANCE_API_KEY`: API key of your Yahoo Finance account. [Get your API key](https://www.yahoofinanceapi.com/)
-
-### YouTube
-Required:
-- `YOUTUBE_API_KEY`: API key of your YouTube account. [Get your API key](https://console.cloud.google.com/apis/credentials)
-
-### ZeroBounce
-Required:
-- `ZEROBOUNCE_API_KEY`: API key of your ZeroBounce account. [Get your API key](https://app.zerobounce.net/)
-
-        """,
-    },
     {
         "name": "Agents",
         "description": """

naas_abi_core/engine/engine_configuration/EngineConfiguration.py

@@ -129,7 +129,22 @@ class EngineConfiguration(BaseModel):
 
             def __getattr__(self, name):
                 if self.secret_service is None:
-                    return 0
+                    # This rule is used only when doing the first pass configuration to load the secret service.
+
+                    # First priority is to check the environment variables.
+                    if name in os.environ:
+                        return os.environ.get(name)
+                    else:
+                        # If the environment variable is not found, we check the .env file. ONLY FOR THE FIRST PASS CONFIGURATION.
+                        from dotenv import dotenv_values
+
+                        secrets = dotenv_values()
+                        if name in secrets:
+                            return secrets.get(name)
+                        else:
+                            return f"Secret '{name}' not found while loading the secret service. Please provide it via the environment variables or .env file."
+                elif name in os.environ:
+                    return os.environ.get(name)
                 secret = self.secret_service.get(name)
                 if secret is None:
                     if not sys.stdin.isatty():
@@ -144,9 +159,6 @@ class EngineConfiguration(BaseModel):
                     return value
                 return secret
 
-            def get(self, key, default=None):
-                return 0
-
         first_pass_data = yaml.safe_load(
             StringIO(Template(yaml_content).render(secret=SecretServiceWrapper()))
         )
@@ -157,13 +169,11 @@ class EngineConfiguration(BaseModel):
         # Here we can now template the yaml by using `yaml_content` and the secret service.
         # Using Jinja2 template engine.
 
-        logger.debug("Yaml content: {yaml_content}")
+        logger.debug(f"Yaml content: {yaml_content}")
 
         template = Template(yaml_content)
         templated_yaml = template.render(secret=SecretServiceWrapper(secret_service))
 
-        logger.debug(f"Templated yaml: {templated_yaml}")
-
         data = yaml.safe_load(StringIO(templated_yaml))
 
         logger.debug(f"Data: {data}")
@@ -178,17 +188,28 @@ class EngineConfiguration(BaseModel):
         if configuration_yaml is not None:
             return cls.from_yaml_content(configuration_yaml)
 
-        logger.debug(f"Loading configuration from {os.getenv('ENV')}")
+        # Get ENV value
+        from dotenv import dotenv_values
+
+        env = os.getenv("ENV")
+        if not env:
+            env = dotenv_values().get("ENV")
 
-        if os.path.exists(f"config.{os.getenv('ENV')}.yaml"):
-            return cls.from_yaml(f"config.{os.getenv('ENV')}.yaml")
+        # First we check the environment variable.
+        if os.path.exists(f"config.{env}.yaml"):
+            config_file = f"config.{env}.yaml"
+        # If the config.{env}.yaml file is not found, we check the config.yaml file.
         elif os.path.exists("config.yaml"):
-            return cls.from_yaml("config.yaml")
+            config_file = "config.yaml"
         else:
             raise FileNotFoundError(
                 "Configuration file not found. Please create a config.yaml file or config.{env}.yaml file."
             )
 
+        logger.debug(f"Loading configuration from {config_file}")
+
+        return cls.from_yaml(config_file)
+
 
 if __name__ == "__main__":
     config = EngineConfiguration.load_configuration()

naas_abi_core/engine/engine_configuration/EngineConfiguration_ObjectStorageService.py

@@ -17,18 +17,46 @@ from typing_extensions import Self
 
 
 class ObjectStorageAdapterFSConfiguration(BaseModel):
+    """Object storage adapter filesystem configuration.
+
+    object_storage_adapter:
+      adapter: "fs"
+      config:
+        base_path: "storage/datastore"
+    """
     base_path: str
 
 
 class ObjectStorageAdapterS3Configuration(BaseModel):
+    """Object storage adapter S3 configuration.
+
+    object_storage_adapter:
+      adapter: "s3"
+      config:
+        bucket_name: "my-bucket"
+        base_prefix: "my-prefix"
+        access_key_id: "{{ secret.AWS_ACCESS_KEY_ID }}"
+        secret_access_key: "{{ secret.AWS_SECRET_ACCESS_KEY }}"
+        session_token: "{{ secret.AWS_SESSION_TOKEN }}"
+    """
     bucket_name: str
+    base_prefix: str
     access_key_id: str
     secret_access_key: str
-    base_prefix: str
     session_token: str | None = None
 
 
 class ObjectStorageAdapterNaasConfiguration(BaseModel):
+    """Object storage adapter Naas configuration.
+
+    object_storage_adapter:
+      adapter: "naas"
+      config:
+        naas_api_key: "{{ secret.NAAS_API_KEY }}"
+        workspace_id: "{{ secret.WORKSPACE_ID }}"
+        storage_name: "{{ secret.STORAGE_NAME }}"
+        base_prefix: "my-prefix"
+    """
     naas_api_key: str
     workspace_id: str
     storage_name: str

naas_abi_core/engine/engine_configuration/EngineConfiguration_SecretService.py

@@ -18,7 +18,38 @@ if TYPE_CHECKING:
     )
 
 
+class DotenvSecretConfiguration(BaseModel):
+    """Dotenv secret configuration.
+
+    secret_adapters:
+      - adapter: "dotenv"
+        config: {}
+    """
+    pass
+
+
+class NaasSecretConfiguration(BaseModel):
+    """Naas secret configuration.
+
+    secret_adapters:
+      - adapter: "naas"
+        config:
+          naas_api_key: "{{ secret.NAAS_API_KEY }}"
+          naas_api_url: "https://api.naas.ai"
+    """
+    naas_api_key: str
+    naas_api_url: str
+
+
 class Base64SecretConfiguration(BaseModel):
+    """Base64 secret configuration.
+
+    secret_adapters:
+      - adapter: "base64"
+        config:
+          secret_adapter: *secret_adapter
+          base64_secret_key: "{{ secret.BASE64_SECRET_KEY }}"
+    """
     secret_adapter: "SecretAdapterConfiguration"
     base64_secret_key: str
 
@@ -30,15 +61,6 @@ class Base64SecretConfiguration(BaseModel):
         return Base64Secret(self.secret_adapter.load(), self.base64_secret_key)
 
 
-class NaasSecretConfiguration(BaseModel):
-    naas_api_key: str
-    naas_api_url: str
-
-
-class DotenvSecretConfiguration(BaseModel):
-    pass
-
-
 class SecretAdapterConfiguration(GenericLoader):
     adapter: Literal["dotenv", "naas", "base64", "custom"]
     config: (

naas_abi_core/engine/engine_configuration/EngineConfiguration_SecretService_test.py

@@ -0,0 +1,74 @@
+from naas_abi_core.engine.engine_configuration.EngineConfiguration_SecretService import (
+    DotenvSecretConfiguration,
+    NaasSecretConfiguration,
+    SecretAdapterConfiguration,
+    SecretServiceConfiguration,
+)
+from naas_abi_core.services.secret.Secret import Secret
+from naas_abi_core.services.secret.SecretPorts import ISecretAdapter
+
+
+def test_secret_service_configuration():
+    from naas_abi_core.services.secret.adaptors.secondary.dotenv_secret_secondaryadaptor import (
+        DotenvSecretSecondaryAdaptor,
+    )
+
+    configuration = SecretServiceConfiguration(
+        secret_adapters=[
+            SecretAdapterConfiguration(
+                adapter="dotenv", config=DotenvSecretConfiguration()
+            )
+        ]
+    )
+    assert configuration.secret_adapters is not None
+    assert len(configuration.secret_adapters) == 1
+
+    secret_adapter = configuration.secret_adapters[0].load()
+
+    assert secret_adapter is not None
+    assert isinstance(secret_adapter, ISecretAdapter)
+    assert isinstance(secret_adapter, DotenvSecretSecondaryAdaptor)
+
+    secret_service = configuration.load()
+
+    assert secret_service is not None
+    assert isinstance(secret_service, Secret)
+
+
+def test_secret_service_configuration_naas():
+    import os
+
+    from dotenv import load_dotenv
+    from naas_abi_core.services.secret.adaptors.secondary.NaasSecret import (
+        NaasSecret,
+    )
+
+    load_dotenv()
+
+    naas_api_key = os.getenv("NAAS_API_KEY")
+    if naas_api_key is None:
+        raise ValueError("NAAS_API_KEY is not set")
+
+    naas_api_url = os.getenv("NAAS_API_URL")
+    if naas_api_url is None:
+        raise ValueError("NAAS_API_URL is not set")
+
+    configuration = SecretServiceConfiguration(
+        secret_adapters=[
+            SecretAdapterConfiguration(
+                adapter="naas",
+                config=NaasSecretConfiguration(
+                    naas_api_key=naas_api_key,
+                    naas_api_url=naas_api_url,
+                ),
+            )
+        ]
+    )
+    assert configuration.secret_adapters is not None
+    assert len(configuration.secret_adapters) == 1
+
+    secret_adapter = configuration.secret_adapters[0].load()
+
+    assert secret_adapter is not None
+    assert isinstance(secret_adapter, ISecretAdapter)
+    assert isinstance(secret_adapter, NaasSecret)

naas_abi_core/engine/engine_configuration/EngineConfiguration_TripleStoreService.py

@@ -28,6 +28,7 @@ class OxigraphAdapterConfiguration(BaseModel):
         oxigraph_url: "http://localhost:7878"
         timeout: 60
     """
+
     oxigraph_url: str = "http://localhost:7878"
     timeout: int = 60
 
@@ -38,11 +39,12 @@ class AWSNeptuneAdapterConfiguration(BaseModel):
     triple_store_adapter:
       adapter: "aws_neptune"
       config:
-        aws_region_name: "eu-west-3"
+        aws_region_name: "{{ secret.AWS_REGION }}"
         aws_access_key_id: "{{ secret.AWS_ACCESS_KEY_ID }}"
         aws_secret_access_key: "{{ secret.AWS_SECRET_ACCESS_KEY }}"
-        db_instance_identifier: "{{ secret.DB_INSTANCE_IDENTIFIER }}"
+        db_instance_identifier: "{{ secret.AWS_NEPTUNE_DB_INSTANCE_IDENTIFIER }}"
     """
+
     aws_region_name: str
     aws_access_key_id: str
     aws_secret_access_key: str
@@ -55,15 +57,16 @@ class AWSNeptuneSSHTunnelAdapterConfiguration(AWSNeptuneAdapterConfiguration):
     triple_store_adapter:
       adapter: "aws_neptune_sshtunnel"
       config:
-        aws_region_name: "eu-west-3"
+        aws_region_name: "{{ secret.AWS_REGION }}"
         aws_access_key_id: "{{ secret.AWS_ACCESS_KEY_ID }}"
         aws_secret_access_key: "{{ secret.AWS_SECRET_ACCESS_KEY }}"
-        db_instance_identifier: "{{ secret.DB_INSTANCE_IDENTIFIER }}"   
-        bastion_host: "bastion.example.com"
-        bastion_port: 22
-        bastion_user: "ubuntu"
-        bastion_private_key: "{{ secret.BASTION_PRIVATE_KEY }}"
+        db_instance_identifier: "{{ secret.AWS_NEPTUNE_DB_INSTANCE_IDENTIFIER }}"
+        bastion_host: "{{ secret.AWS_BASTION_HOST }}"
+        bastion_port: "{{ secret.AWS_BASTION_PORT }}"
+        bastion_user: "{{ secret.AWS_BASTION_USER }}"
+        bastion_private_key: "{{ secret.AWS_BASTION_PRIVATE_KEY }}"
     """
+
     bastion_host: str
     bastion_port: int
     bastion_user: str
@@ -79,6 +82,7 @@ class TripleStoreAdapterFilesystemConfiguration(BaseModel):
         store_path: "storage/triplestore"
         triples_path: "triples"
     """
+
     store_path: str
     triples_path: str = "triples"
 
@@ -92,6 +96,7 @@ class TripleStoreAdapterObjectStorageConfiguration(BaseModel):
         object_storage_service: *object_storage_service
         triples_prefix: "triples"
     """
+
     object_storage_service: ObjectStorageServiceConfiguration
     triples_prefix: str = "triples"
 

naas_abi_core/engine/engine_configuration/EngineConfiguration_TripleStoreService_test.py

@@ -0,0 +1,109 @@
+from naas_abi_core.engine.engine_configuration.EngineConfiguration_TripleStoreService import (
+    AWSNeptuneSSHTunnelAdapterConfiguration,
+    OxigraphAdapterConfiguration,
+    TripleStoreAdapterConfiguration,
+    TripleStoreAdapterFilesystemConfiguration,
+    TripleStoreServiceConfiguration,
+)
+from naas_abi_core.services.triple_store.TripleStorePorts import ITripleStorePort
+from naas_abi_core.services.triple_store.TripleStoreService import TripleStoreService
+
+
+def test_triple_store_service_configuration():
+    from naas_abi_core.services.triple_store.adaptors.secondary.TripleStoreService__SecondaryAdaptor__Filesystem import (
+        TripleStoreService__SecondaryAdaptor__Filesystem,
+    )
+
+    configuration = TripleStoreServiceConfiguration(
+        triple_store_adapter=TripleStoreAdapterConfiguration(
+            adapter="fs",
+            config=TripleStoreAdapterFilesystemConfiguration(
+                store_path="storage/triplestore/test", triples_path="triples"
+            ),
+        )
+    )
+    assert configuration.triple_store_adapter is not None
+
+    triple_store_adapter = configuration.triple_store_adapter.load()
+
+    assert triple_store_adapter is not None
+    assert isinstance(triple_store_adapter, ITripleStorePort)
+    assert isinstance(
+        triple_store_adapter, TripleStoreService__SecondaryAdaptor__Filesystem
+    )
+
+    triple_store_service = configuration.load()
+
+    assert triple_store_service is not None
+    assert isinstance(triple_store_service, TripleStoreService)
+
+
+def test_triple_store_service_configuration_naas():
+    from naas_abi_core.services.triple_store.adaptors.secondary.Oxigraph import (
+        Oxigraph,
+    )
+
+    configuration = TripleStoreServiceConfiguration(
+        triple_store_adapter=TripleStoreAdapterConfiguration(
+            adapter="oxigraph",
+            config=OxigraphAdapterConfiguration(
+                oxigraph_url="http://localhost:7878",
+                timeout=120,
+            ),
+        )
+    )
+    assert configuration.triple_store_adapter is not None
+
+    triple_store_adapter = configuration.triple_store_adapter.load()
+
+    assert triple_store_adapter is not None
+    assert isinstance(triple_store_adapter, ITripleStorePort)
+    assert isinstance(triple_store_adapter, Oxigraph)
+
+    triple_store_service = configuration.load()
+
+    assert triple_store_service is not None
+    assert isinstance(triple_store_service, TripleStoreService)
+
+
+def test_triple_store_service_configuration_aws_neptune_sshtunnel():
+    import os
+
+    from dotenv import load_dotenv
+
+    load_dotenv()
+
+    from naas_abi_core.services.triple_store.adaptors.secondary.AWSNeptune import (
+        AWSNeptuneSSHTunnel,
+    )
+
+    configuration = TripleStoreServiceConfiguration(
+        triple_store_adapter=TripleStoreAdapterConfiguration(
+            adapter="aws_neptune_sshtunnel",
+            config=AWSNeptuneSSHTunnelAdapterConfiguration(
+                aws_region_name=os.environ.get("AWS_REGION"),
+                aws_access_key_id=os.environ.get("AWS_ACCESS_KEY_ID"),
+                aws_secret_access_key=os.environ.get("AWS_SECRET_ACCESS_KEY"),
+                db_instance_identifier=os.environ.get(
+                    "AWS_NEPTUNE_DB_INSTANCE_IDENTIFIER"
+                ),
+                bastion_host=os.environ.get("AWS_BASTION_HOST"),
+                bastion_port=int(os.environ.get("AWS_BASTION_PORT")),
+                bastion_user=os.environ.get("AWS_BASTION_USER"),
+                bastion_private_key=os.environ.get("AWS_BASTION_PRIVATE_KEY"),
+            ),
+        ),
+    )
+
+    assert configuration.triple_store_adapter is not None
+
+    triple_store_adapter = configuration.triple_store_adapter.load()
+
+    assert triple_store_adapter is not None
+    assert isinstance(triple_store_adapter, ITripleStorePort)
+    assert isinstance(triple_store_adapter, AWSNeptuneSSHTunnel)
+
+    triple_store_service = configuration.load()
+
+    assert triple_store_service is not None
+    assert isinstance(triple_store_service, TripleStoreService)

naas_abi_core/engine/engine_configuration/EngineConfiguration_VectorStoreService.py

@@ -12,6 +12,17 @@ from pydantic import BaseModel, model_validator
 
 
 class VectorStoreAdapterQdrantConfiguration(BaseModel):
+    """Qdrant vector store adapter configuration.
+
+    vector_store_adapter:
+      adapter: "qdrant"
+      config:
+        host: "{{ secret.QDRANT_HOST }}"
+        port: "{{ secret.QDRANT_PORT }}"
+        api_key: "{{ secret.QDRANT_API_KEY }}"
+        https: "{{ secret.QDRANT_HTTPS }}"
+        timeout: "{{ secret.QDRANT_TIMEOUT }}"
+    """
     host: str = "localhost"
     port: int = 6333
     api_key: str | None = None

naas_abi_core/engine/engine_configuration/EngineConfiguration_VectorStoreService_test.py

@@ -0,0 +1,33 @@
+from naas_abi_core.engine.engine_configuration.EngineConfiguration_VectorStoreService import (
+    VectorStoreAdapterConfiguration,
+    VectorStoreAdapterQdrantConfiguration,
+    VectorStoreServiceConfiguration,
+)
+from naas_abi_core.services.vector_store.IVectorStorePort import IVectorStorePort
+from naas_abi_core.services.vector_store.VectorStoreService import VectorStoreService
+
+
+def test_vector_store_service_configuration():
+    from naas_abi_core.services.vector_store.adapters.QdrantAdapter import (
+        QdrantAdapter,
+    )
+
+    qdrant_config = VectorStoreAdapterQdrantConfiguration()
+    configuration = VectorStoreServiceConfiguration(
+        vector_store_adapter=VectorStoreAdapterConfiguration(
+            adapter="qdrant",
+            config=qdrant_config.model_dump(),
+        )
+    )
+    assert configuration.vector_store_adapter is not None
+
+    vector_store_adapter = configuration.vector_store_adapter.load()
+
+    assert vector_store_adapter is not None
+    assert isinstance(vector_store_adapter, IVectorStorePort)
+    assert isinstance(vector_store_adapter, QdrantAdapter)
+
+    vector_store_service = configuration.load()
+
+    assert vector_store_service is not None
+    assert isinstance(vector_store_service, VectorStoreService)

naas_abi_core/services/secret/SecretPorts.py

@@ -2,6 +2,10 @@ from abc import ABC, abstractmethod
 from typing import Any, Dict, List
 
 
+class SecretAuthenticationError(Exception):
+    pass
+
+
 class ISecretAdapter(ABC):
     @abstractmethod
     def get(self, key: str, default: Any = None) -> str | Any | None:
@@ -38,3 +42,4 @@ class ISecretService(ABC):
     @abstractmethod
     def list(self) -> Dict[str, str | None]:
         raise NotImplementedError()
+        raise NotImplementedError()

naas_abi_core/services/secret/adaptors/secondary/NaasSecret.py

@@ -2,7 +2,10 @@ from typing import Any, Dict
 
 import requests
 from naas_abi_core import logger
-from naas_abi_core.services.secret.SecretPorts import ISecretAdapter
+from naas_abi_core.services.secret.SecretPorts import (
+    ISecretAdapter,
+    SecretAuthenticationError,
+)
 
 NAAS_API_URL = "https://api.naas.ai"
 
@@ -27,6 +30,10 @@ class NaasSecret(ISecretAdapter):
         except requests.exceptions.HTTPError as _:
             if response.status_code == 404:
                 logger.debug(f"Secret {key} not found")
+            elif response.status_code == 401:
+                error_message = f"Authentication error on '{NAAS_API_URL}' with NAAS_API_KEY '{self.naas_api_key}'"
+                logger.error(error_message)
+                raise SecretAuthenticationError(error_message)
             else:
                 logger.error(f"Error getting secret {key}: {response.status_code}")
             return default

naas_abi_core/services/triple_store/adaptors/secondary/AWSNeptune.py

@@ -251,7 +251,10 @@ class AWSNeptune(ITripleStorePort):
 
         self.neptune_port = cluster_endpoints[0]["Endpoint"]["Port"]
 
-        self.credentials = self.session.get_credentials()
+        credentials = self.session.get_credentials()
+        if credentials is None:
+            raise ValueError("Failed to get credentials from session")
+        self.credentials = credentials
 
         self.neptune_sparql_url = (
             f"https://{self.neptune_sparql_endpoint}:{self.neptune_port}/sparql"
@@ -291,6 +294,9 @@ class AWSNeptune(ITripleStorePort):
         request = AWSRequest(
             method=method, url=url, data=data, params=params, headers=headers
         )
+        assert self.credentials is not None, (
+            "Credentials must be set during initialization"
+        )
         SigV4Auth(
             self.credentials, "neptune-db", region_name=self.aws_region_name
         ).add_auth(request)
@@ -947,7 +953,7 @@ class AWSNeptuneSSHTunnel(AWSNeptune):
         aws_secret_access_key: str,
         db_instance_identifier: str,
         bastion_host: str,
-        bastion_port: int,
+        bastion_port: int | str,
         bastion_user: str,
         bastion_private_key: str,
         default_graph_name: URIRef = NEPTUNE_DEFAULT_GRAPH_NAME,
@@ -965,7 +971,7 @@ class AWSNeptuneSSHTunnel(AWSNeptune):
             aws_secret_access_key (str): AWS secret key for Neptune authentication
             db_instance_identifier (str): Neptune database instance identifier
             bastion_host (str): Hostname or IP address of the bastion host
-            bastion_port (int): SSH port on the bastion host (typically 22)
+            bastion_port (int | str): SSH port on the bastion host (typically 22)
             bastion_user (str): SSH username for bastion host authentication
             bastion_private_key (str): Complete SSH private key content as a string
             default_graph_name (URIRef, optional): Default named graph URI
@@ -1002,6 +1008,16 @@ class AWSNeptuneSSHTunnel(AWSNeptune):
         )
 
         assert isinstance(bastion_host, str)
+        if not isinstance(bastion_port, int):
+            # This block is added because the "naas" secret adapter does not always manage int values:
+            # it may provide 'bastion_port' as a string; convert it to int if needed.
+            if isinstance(bastion_port, str):
+                try:
+                    bastion_port = int(bastion_port)
+                except ValueError:
+                    raise ValueError(
+                        f"bastion_port must be an int or a string convertible to int, got string: {bastion_port!r}"
+                    )
         assert isinstance(bastion_port, int)
         assert isinstance(bastion_user, str)
         assert isinstance(bastion_private_key, str)

naas_abi_core/utils/{OntologyYaml.disabled.py → OntologyYaml.py}

@@ -2,15 +2,17 @@ import copy
 import random
 
 import pydash as _
-from naas_abi import services
 from rdflib import OWL, RDF, RDFS, Graph, URIRef
 
 from naas_abi_core import logger
+from naas_abi_core.services.triple_store.TripleStorePorts import ITripleStoreService
 
 
 class OntologyYaml:
-    def __init__(self):
-        pass
+    __triple_store_service: ITripleStoreService
+
+    def __init__(self, triple_store_service: ITripleStoreService):
+        self.__triple_store_service = triple_store_service
 
     @staticmethod
     def rdf_to_yaml(
@@ -50,7 +52,7 @@ class Translator:
         self.mapping_oprop = {}
 
         # Init ontology schemas
-        consolidated = services.triple_store_service.get_schema_graph()
+        consolidated = self.__triple_store_service.get_schema_graph()
         schema_graph = Graph()
 
         # Filter for desired types

{naas_abi_core-1.2.1.dist-info → naas_abi_core-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.2.1
+Version: 1.4.0
 Summary: Abi framework allowing you to build your AI system.
 Author-email: Maxime Jublou <maxime@naas.ai>, Florent Ravenel <florent@naas.ai>, Jeremy Ravenel <jeremy@naas.ai>
 Requires-Python: <4,>=3.10
@@ -28,14 +28,18 @@ Requires-Dist: spacy>=3.8.7
 Requires-Dist: sparqlwrapper>=2.0.0
 Requires-Dist: sse-starlette<3,>=2.1.3
 Requires-Dist: starlette>=0.46.2
+Requires-Dist: types-paramiko>=4.0.0.20250822
+Requires-Dist: types-pyyaml>=6.0.12.20250915
 Requires-Dist: types-tqdm>=4.67.0.20250809
 Provides-Extra: all
+Requires-Dist: boto3-stubs>=1.42.19; extra == 'all'
 Requires-Dist: boto3<2,>=1.38.19; extra == 'all'
 Requires-Dist: langchain-openai>=0.3.35; extra == 'all'
 Requires-Dist: paramiko<4.0.0,>=3.5.1; extra == 'all'
 Requires-Dist: qdrant-client>=1.14.3; extra == 'all'
 Requires-Dist: sshtunnel>=0.4.0; extra == 'all'
 Provides-Extra: aws
+Requires-Dist: boto3-stubs>=1.42.19; extra == 'aws'
 Requires-Dist: boto3<2,>=1.38.19; extra == 'aws'
 Provides-Extra: openrouter
 Requires-Dist: langchain-openai>=0.3.35; extra == 'openrouter'

{naas_abi_core-1.2.1.dist-info → naas_abi_core-1.4.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 naas_abi_core/__init__.py,sha256=kR93ywABUBo8-tAWCHMbRcCDCJZjqq4hWwxMk3Cr9fI,56
 naas_abi_core/apps/api/api.py,sha256=C11ItO_Xn0qh7ZubZUnQ4-Mts0Cd-Ui_4KEkU2cshqI,7127
 naas_abi_core/apps/api/api_test.py,sha256=7H_VgnbsGqu6oGY-apAHjJr_yjIcGHY0heaEThWBsUk,10537
-naas_abi_core/apps/api/openapi_doc.py,sha256=JbwzcmSP-Yl1rbN0QvUwOSmOFf-yKXECZ-2ptI7fWoU,11834
+naas_abi_core/apps/api/openapi_doc.py,sha256=q0F8EG1e9bUPWDmK0touHxs4RBnfHD2xhuk-aICv_Ko,4737
 naas_abi_core/apps/mcp/Dockerfile.mcp,sha256=936qaoMFGbMvTARjzkNHMgRfGVWnolpVCrz0fBJYrLA,826
 naas_abi_core/apps/mcp/mcp_server.py,sha256=U-wDl8rswMk4nefGg2SUByw4x8CM10M59FfLHxIKC-o,8391
 naas_abi_core/apps/mcp/mcp_server_test.py,sha256=8jixnDyERM_HjjDTRtPDQcJ_rzA0ESAn147sl2Gk8gw,5636
@@ -12,14 +12,17 @@ naas_abi_core/engine/EngineProxy.py,sha256=o-D8LlP-PjQ_Yct4JWrDZw7mA7yporxb2XrJF
 naas_abi_core/engine/Engine_test.py,sha256=8eLZEnkL0IR4VAr6LF8fJ_fxZzi9s1mXCLgTVOIsR3E,161
 naas_abi_core/engine/IEngine.py,sha256=u-m-Qrvt3SP3gYKWPFPVjV8rs05D6NGnzO3XA0FInnw,2865
 naas_abi_core/engine/conftest.py,sha256=Al-SRVLrEdbTrX8sxQ3bBK4w1bbzE4GoBkzoBK-aXlg,932
-naas_abi_core/engine/engine_configuration/EngineConfiguration.py,sha256=NdjfrECgQ5leU7TNxxV6-qackTi0eaKzebqyJXlRPXk,6735
+naas_abi_core/engine/engine_configuration/EngineConfiguration.py,sha256=7_ACJLTwwUYsm2RyabvPenyr78kXxy3x3t1BpW4H4r0,7797
 naas_abi_core/engine/engine_configuration/EngineConfiguration_Deploy.py,sha256=7nqOnXWcNbQAp9G3afc3y58BrxCaIrrTpUz7yBngy14,163
 naas_abi_core/engine/engine_configuration/EngineConfiguration_GenericLoader.py,sha256=KK2TQx6cNmoqFcwr9En00NKrX4ckkZl4ecv9QCUwPyc,1995
-naas_abi_core/engine/engine_configuration/EngineConfiguration_ObjectStorageService.py,sha256=cPZBs5-2dqX-piIZ7KTqiOce6O6GbnDDwjPGcfDN_U4,4736
+naas_abi_core/engine/engine_configuration/EngineConfiguration_ObjectStorageService.py,sha256=erngfACkUwwHHOilmjbN9rRN5IPmMjOz9-zPaAeS5dM,5569
 naas_abi_core/engine/engine_configuration/EngineConfiguration_ObjectStorageService_test.py,sha256=h1PdIbMTJWi_lG83YgpI6zg8gRo0WEWvGSE6R4uKQp4,1063
-naas_abi_core/engine/engine_configuration/EngineConfiguration_SecretService.py,sha256=nqQ7XmfZZIx4kUvSO_FkBsSf9mcrRdwpsF_vkEdKqgU,4064
-naas_abi_core/engine/engine_configuration/EngineConfiguration_TripleStoreService.py,sha256=Wy4866k9JykcMf9ZDqBZfIVFLp98oU3_NwIaDPHrykI,7756
-naas_abi_core/engine/engine_configuration/EngineConfiguration_VectorStoreService.py,sha256=aoO-cmC1dfaXT4gqFivrO1ntB0xK8rjFoWmruf-I67U,2210
+naas_abi_core/engine/engine_configuration/EngineConfiguration_SecretService.py,sha256=yNAwPpDwElSto6QjgKxoQsysnzk5NzjGE0OkIcNilwQ,4589
+naas_abi_core/engine/engine_configuration/EngineConfiguration_SecretService_test.py,sha256=5SyeB5LxPN1tYrgIzTXj7d-xcJttC5qm1XtJrixUyoE,2317
+naas_abi_core/engine/engine_configuration/EngineConfiguration_TripleStoreService.py,sha256=vIWO-RQ5BetHUcG0hfSnPCVzqopx2qO51e4axw7lEbc,7876
+naas_abi_core/engine/engine_configuration/EngineConfiguration_TripleStoreService_test.py,sha256=Q8V_2urBgYhHbgcmlruxd9zV-YbQxdHT_V2SwM_oj2U,4026
+naas_abi_core/engine/engine_configuration/EngineConfiguration_VectorStoreService.py,sha256=1Ulqtbjw9zAjdiXFyqVETtoY-xiqiauPH6GeuPGKiZg,2552
+naas_abi_core/engine/engine_configuration/EngineConfiguration_VectorStoreService_test.py,sha256=hy6OLrn0L-dpcAprbRZLXdKPPgpK0F-gVOdahAvjbf0,1258
 naas_abi_core/engine/engine_configuration/EngineConfiguration_test.py,sha256=PL4A4Dawq6tfyHsiIkqbHhovc7wkIHcVZra6llRI-CY,286
 naas_abi_core/engine/engine_configuration/utils/PydanticModelValidator.py,sha256=jZzLqLvR8HawpyGYiUJEng3NlebLHiN3mVFOzNDSWs8,504
 naas_abi_core/engine/engine_loaders/EngineModuleLoader.py,sha256=4VsGtPsaeslej2JuyksHUbHJEY6J096cnr3iuTrhnpY,12043
@@ -67,17 +70,17 @@ naas_abi_core/services/ontology/OntologyPorts.py,sha256=CANMwmXps5k2IB1pq1I5723H
 naas_abi_core/services/ontology/OntologyService.py,sha256=-shSDmL5zvEvNjTbDQ1pq2ziwnJvfR-ka6XJh1AcDuA,542
 naas_abi_core/services/ontology/adaptors/secondary/OntologyService_SecondaryAdaptor_NERPort.py,sha256=CNGnlvtoADUki8fEWnanD4Xe7_osQrpWDusZOLu1mgo,1303
 naas_abi_core/services/secret/Secret.py,sha256=7odnAtpkC12laA8CFzE_W2NOFpDyaW2TmoebUCFMSQE,5159
-naas_abi_core/services/secret/SecretPorts.py,sha256=E-oBxE49OZmVYbKTwbtsuxjaU58tVXFBMbblmVVbd7k,996
+naas_abi_core/services/secret/SecretPorts.py,sha256=4JnkU1dPC4_p_GweOxmfiEE5RxwZztjNo3Ygnwo2sLw,1087
 naas_abi_core/services/secret/Secret_test.py,sha256=rRLAsBCNDMduUwCeCSdlWtIFwguqFeVdRp-3lF6R9mc,1581
 naas_abi_core/services/secret/adaptors/secondary/Base64Secret.py,sha256=Py7bBEBnkaBnuD9wtXO_tMI5HiM7olspOvfBRRq57Tw,1967
 naas_abi_core/services/secret/adaptors/secondary/Base64Secret_test.py,sha256=wwdfMJrkh6vFZabZie9xyQHYlTjPAfouV-sPI4pk8MM,1287
-naas_abi_core/services/secret/adaptors/secondary/NaasSecret.py,sha256=b31HLYCN3JzYwlWwsiTlQ3FM7t9sLFz7dF3eMmFnA6c,2755
+naas_abi_core/services/secret/adaptors/secondary/NaasSecret.py,sha256=YyJCcMWadsnBg-1jvGbsGqBelKbMwsPtLDXKm92Pbwo,3064
 naas_abi_core/services/secret/adaptors/secondary/NaasSecret_test.py,sha256=gR2hjU8e3hbkWn_suhwj4kfWLjTZjZavj-5R-z93zjU,625
 naas_abi_core/services/secret/adaptors/secondary/dotenv_secret_secondaryadaptor.py,sha256=jNs1bTz25lD0B5HZUKjenxZ7x6qUm9kIESFmh2-QDs8,909
 naas_abi_core/services/triple_store/TripleStoreFactory.py,sha256=4cCWJUhmXo5-yB61fyDwc-pigIYZo_PzmPW_5pY5I-E,4560
 naas_abi_core/services/triple_store/TripleStorePorts.py,sha256=dRhDc5-uiXDZQWzscqUd972EPi_pafPLkj4sXwxF8Xs,6681
 naas_abi_core/services/triple_store/TripleStoreService.py,sha256=X1ty-fH0A1XyLhZpU6oc3h-BgOoarAHSMPzITBBVhlY,16274
-naas_abi_core/services/triple_store/adaptors/secondary/AWSNeptune.py,sha256=fJlkf1QIOj4FCBCSotCfmlv15QtbKDFONcGVtu_W5v8,49390
+naas_abi_core/services/triple_store/adaptors/secondary/AWSNeptune.py,sha256=kma8SUufwMkFA_xYaRcjV9jRsZ-UtUUdBlHEmKiMTVw,50222
 naas_abi_core/services/triple_store/adaptors/secondary/AWSNeptune_test.py,sha256=b9LiXwQ3EWem5T_OplJWgXQ-cPwkrfomKO5MQx6zwF4,7662
 naas_abi_core/services/triple_store/adaptors/secondary/Oxigraph.py,sha256=1VXtc-Ew7unmqULTA95nN8gnaYWP0Leb3rKbuWe1vRo,20729
 naas_abi_core/services/triple_store/adaptors/secondary/Oxigraph_test.py,sha256=oVyBHGYsrZn9HpzC4aRBi3w515yU0vXG8Yo1mIZN1hk,57224
@@ -99,7 +102,7 @@ naas_abi_core/utils/JSON.py,sha256=onIs-E3GWz4fvRuWBQpyb9qRNXCOJPf9x1yV1-jDlqU,1
 naas_abi_core/utils/LazyLoader.py,sha256=rWrnFVuKCK1WrtNgeiegT_i7AkxGy9qK2hfhsXV4dCY,1120
 naas_abi_core/utils/Logger.py,sha256=emZwe1EKAWcEegDQGFkr2U8vLX-oDUZXX580o9kP_xc,203
 naas_abi_core/utils/OntologyReasoner.py,sha256=OgDgiymd7HuDI28XZfcS2-9QeR7_jY9o9LWBQu2AU7k,4591
-naas_abi_core/utils/OntologyYaml.disabled.py,sha256=y5dYzD6w3yByQ4I-T6km6T2J0t-sTNy6iNm8ocpffyA,25246
+naas_abi_core/utils/OntologyYaml.py,sha256=YcLC9FyGwwb7WCfV6fyniJFH6HMNfwyBDh6WgQYM3u4,25437
 naas_abi_core/utils/SPARQL.py,sha256=Yjk2INdNIUuv8P26-ToqNik5odyUroybzWvijMsfcns,9313
 naas_abi_core/utils/Storage.py,sha256=XgB8KcYgnF8armlvxJrZbJPcsnPSb8ByNCnVchFMpo4,1205
 naas_abi_core/utils/StorageUtils.py,sha256=WFGuUSe9u44BXLi5JqnVoHEGmWGpZTFUZv1empbe5dU,13654
@@ -114,7 +117,8 @@ naas_abi_core/utils/onto2py/tests/ttl2py_test.py,sha256=5OZqSxPffjJYiX9T4rT1mV0P
 naas_abi_core/workflow/__init__.py,sha256=hZD58mCB1PApxITqftP_xgjxL7NeLvOfI-rJENg1ENs,250
 naas_abi_core/workflow/workflow.py,sha256=ZufSS073JztVl0OQRTqNyK7FepFvv7gXlc4j5FAEZCI,1216
 assets/favicon.ico,sha256=nWk8wrHZiJV3DeuWrP2MqilXxCuoNWKGtMZfYmEVQLw,666
-naas_abi_core-1.2.1.dist-info/METADATA,sha256=2XbMeXhQxZjvSdFv5OfAppq6CjkTn2cqEoXFzb5pEtY,3897
-naas_abi_core-1.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-naas_abi_core-1.2.1.dist-info/entry_points.txt,sha256=IX0WUFxZuo1JU6H66fcRR6y7gYChMVw_XA9suPk9_1Q,70
-naas_abi_core-1.2.1.dist-info/RECORD,,
+assets/logo.png,sha256=zUu9sNgMmtzJhfNCinDs85GP1LDNVfTy8kYLKRT_pxA,9334
+naas_abi_core-1.4.0.dist-info/METADATA,sha256=-dHvZP15mu5wBnRUM9A6cU385cGhffxRMLueNqfWjpw,4092
+naas_abi_core-1.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naas_abi_core-1.4.0.dist-info/entry_points.txt,sha256=IX0WUFxZuo1JU6H66fcRR6y7gYChMVw_XA9suPk9_1Q,70
+naas_abi_core-1.4.0.dist-info/RECORD,,