naas-abi-core 1.1.1__tar.gz → 1.1.3.dev1__tar.gz

naas_abi_core-1.1.3.dev1/=0.9.13

@@ -0,0 +1,6 @@
+Collecting uv
+  Downloading uv-0.9.16-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (11 kB)
+Downloading uv-0.9.16-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (22.0 MB)
+   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 22.0/22.0 MB 73.1 MB/s  0:00:00
+Installing collected packages: uv
+Successfully installed uv-0.9.16

{naas_abi_core-1.1.1 → naas_abi_core-1.1.3.dev1}/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 <!-- version list -->
 
+## v1.1.3-dev.1 (2025-12-08)
+
+### Bug Fixes
+
+- Linting errors
+  ([`fe8c0a4`](https://github.com/jupyter-naas/abi/commit/fe8c0a4b8969bf70eb5aebe83e060a4771298638))
+
+
+## v1.1.2 (2025-12-05)
+
+### Bug Fixes
+
+- Make it possible to define env secrets from config.yaml
+  ([`d9903cf`](https://github.com/jupyter-naas/abi/commit/d9903cfecac03df40a6f3076c7ff44229c0c12cd))
+
+
 ## v1.1.1 (2025-12-05)
 
 

{naas_abi_core-1.1.1 → naas_abi_core-1.1.3.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.1.1
+Version: 1.1.3.dev1
 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

{naas_abi_core-1.1.1 → naas_abi_core-1.1.3.dev1}/naas_abi_core/cli/deploy.py

@@ -1,4 +1,3 @@
-import json
 import subprocess
 from uuid import uuid4
 
@@ -103,6 +102,7 @@ class NaasDeployer:
     image_name: str
 
     naas_api_client: NaasAPIClient
+    configuration: EngineConfiguration
 
     def __init__(self, configuration: EngineConfiguration):
         self.configuration = configuration
@@ -119,6 +119,14 @@ class NaasDeployer:
         return {env_var.split("=", 1)[0]: env_var.split("=", 1)[1] for env_var in env}
 
     def deploy(self, env: list[str]):
+        if self.configuration.deploy is None:
+            logger.error(
+                "Deploy configuration not found in the yaml configuration file. Please add a deploy section to the configuration file."
+            )
+            raise ValueError(
+                "Deploy configuration not found in the yaml configuration file. Please add a deploy section to the configuration file."
+            )
+
         registry = self.naas_api_client.create_registry(
             self.configuration.deploy.space_name
         )
@@ -148,7 +156,6 @@ class NaasDeployer:
 
         image_name_with_sha = f"{image_name.replace(':' + uid, '')}@{image_sha}"
 
-
         self.naas_api_client.create_space(
             Space(
                 name=self.configuration.deploy.space_name,
@@ -159,16 +166,17 @@ class NaasDeployer:
                         port=9879,
                         cpu="1",
                         memory="1Gi",
-                        env=self.env_list_to_dict(env) | {
-                            "NAAS_API_KEY": self.configuration.deploy.naas_api_key,
-                            "ENV": "prod",
-                        },
+                        # env=self.env_list_to_dict(env) | {
+                        #     "NAAS_API_KEY": self.configuration.deploy.naas_api_key,
+                        #     "ENV": "prod",
+                        # },
+                        env=self.configuration.deploy.env | self.env_list_to_dict(env),
                     )
                 ],
             )
         )
 
-        space = self.naas_api_client.get_space(self.configuration.deploy.space_name)
+        self.naas_api_client.get_space(self.configuration.deploy.space_name)
 
         Console().print(
             Markdown(f"""
@@ -183,7 +191,12 @@ class NaasDeployer:
 
 
 @deploy.command("naas")
-@click.option("-e", "--env", multiple=True, help="Environment variables to set (e.g. -e FOO=BAR -e BAZ=QUX)")
+@click.option(
+    "-e",
+    "--env",
+    multiple=True,
+    help="Environment variables to set (e.g. -e FOO=BAR -e BAZ=QUX)",
+)
 def naas(env: list[str]):
     configuration: EngineConfiguration = EngineConfiguration.load_configuration()
 

{naas_abi_core-1.1.1 → naas_abi_core-1.1.3.dev1}/naas_abi_core/engine/engine_configuration/EngineConfiguration.py

@@ -5,6 +5,9 @@ from typing import List
 import yaml
 from jinja2 import Template
 from naas_abi_core import logger
+from naas_abi_core.engine.engine_configuration.EngineConfiguration_Deploy import (
+    DeployConfiguration,
+)
 from naas_abi_core.engine.engine_configuration.EngineConfiguration_ObjectStorageService import (
     ObjectStorageServiceConfiguration,
 )
@@ -20,7 +23,7 @@ from naas_abi_core.engine.engine_configuration.EngineConfiguration_VectorStoreSe
 from naas_abi_core.services.secret.Secret import Secret
 from pydantic import BaseModel, model_validator
 from typing_extensions import Literal
-from naas_abi_core.engine.engine_configuration.EngineConfiguration_Deploy import DeployConfiguration
+
 
 class ServicesConfiguration(BaseModel):
     object_storage: ObjectStorageServiceConfiguration
@@ -80,7 +83,7 @@ class GlobalConfig(BaseModel):
 
 class EngineConfiguration(BaseModel):
     api: ApiConfiguration
-    
+
     deploy: DeployConfiguration | None = None
 
     services: ServicesConfiguration

{naas_abi_core-1.1.1 → naas_abi_core-1.1.3.dev1}/naas_abi_core/engine/engine_configuration/EngineConfiguration_Deploy.py

@@ -4,3 +4,4 @@ class DeployConfiguration(BaseModel):
     workspace_id: str
     space_name: str
     naas_api_key: str
+    env: dict[str, str] = {}

{naas_abi_core-1.1.1 → naas_abi_core-1.1.3.dev1}/naas_abi_core/engine/engine_configuration/EngineConfiguration_TripleStoreService.py

@@ -20,11 +20,29 @@ if TYPE_CHECKING:
 
 
 class OxigraphAdapterConfiguration(BaseModel):
+    """Oxigraph adapter configuration.
+
+    triple_store_adapter:
+      adapter: "oxigraph"
+      config:
+        oxigraph_url: "http://localhost:7878"
+        timeout: 60
+    """
     oxigraph_url: str = "http://localhost:7878"
     timeout: int = 60
 
 
 class AWSNeptuneAdapterConfiguration(BaseModel):
+    """AWS Neptune adapter configuration.
+
+    triple_store_adapter:
+      adapter: "aws_neptune"
+      config:
+        aws_region_name: "eu-west-3"
+        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 }}"
+    """
     aws_region_name: str
     aws_access_key_id: str
     aws_secret_access_key: str
@@ -32,6 +50,20 @@ class AWSNeptuneAdapterConfiguration(BaseModel):
 
 
 class AWSNeptuneSSHTunnelAdapterConfiguration(AWSNeptuneAdapterConfiguration):
+    """AWS Neptune SSH tunnel adapter configuration.
+
+    triple_store_adapter:
+      adapter: "aws_neptune_sshtunnel"
+      config:
+        aws_region_name: "eu-west-3"
+        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 }}"
+    """
     bastion_host: str
     bastion_port: int
     bastion_user: str
@@ -39,11 +71,27 @@ class AWSNeptuneSSHTunnelAdapterConfiguration(AWSNeptuneAdapterConfiguration):
 
 
 class TripleStoreAdapterFilesystemConfiguration(BaseModel):
+    """Filesystem adapter configuration.
+
+    triple_store_adapter:
+      adapter: "fs"
+      config:
+        store_path: "storage/triplestore"
+        triples_path: "triples"
+    """
     store_path: str
     triples_path: str = "triples"
 
 
 class TripleStoreAdapterObjectStorageConfiguration(BaseModel):
+    """Object storage adapter configuration.
+
+    triple_store_adapter:
+      adapter: "object_storage"
+      config:
+        object_storage_service: *object_storage_service
+        triples_prefix: "triples"
+    """
     object_storage_service: ObjectStorageServiceConfiguration
     triples_prefix: str = "triples"
 

{naas_abi_core-1.1.1 → naas_abi_core-1.1.3.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "naas-abi-core"
-version = "1.1.1"
+version = "1.1.3-dev.1"
 description = "Abi framework allowing you to build your AI system."
 authors = [{ name = "Maxime Jublou", email = "maxime@naas.ai" },{ name = "Florent Ravenel", email = "florent@naas.ai" }, { name = "Jeremy Ravenel", email = "jeremy@naas.ai" }]
 requires-python = ">=3.10,<4"

naas_abi_core-1.1.1/=0.9.13

@@ -1,6 +0,0 @@
-Collecting uv
-  Downloading uv-0.9.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (11 kB)
-Downloading uv-0.9.15-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (21.7 MB)
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 21.7/21.7 MB 78.7 MB/s  0:00:00
-Installing collected packages: uv
-Successfully installed uv-0.9.15