naas-abi-core 1.1.1__py3-none-any.whl → 1.1.3.dev1__py3-none-any.whl

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/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/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/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.dist-info → naas_abi_core-1.1.3.dev1.dist-info}/METADATA

@@ -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.dist-info → naas_abi_core-1.1.3.dev1.dist-info}/RECORD

@@ -11,7 +11,7 @@ naas_abi_core/cli/__init__.py,sha256=P89Ihofvv_pQf2wsfYL-PjLJMl6KRj3fNNIZDB77Qy0
 naas_abi_core/cli/agent.py,sha256=fMdbC7HsrOfZSf5zVRHWSmyrejI5mUdRlAT5v5YHXzk,658
 naas_abi_core/cli/chat.py,sha256=3t_TJ7vqCNs0MIIXOtlSke3nzy4rMSEJtB3P6pKItMo,856
 naas_abi_core/cli/config.py,sha256=CcdDX6HKCP32NjRhbVsCOwLUC9LmaqTm2sv8W5rOt00,1484
-naas_abi_core/cli/deploy.py,sha256=Vmjsf44qYvDkWYGFJHhPaoKipt56FEZcfv4Mswys574,5976
+naas_abi_core/cli/deploy.py,sha256=GN2Hyz1xT4lzURPv9_vLHQI1yWP5MleqLZ34HFVFB1k,6512
 naas_abi_core/cli/init.py,sha256=Pcy2-hy-FvpXf3UOKMP6agWyFrCl9z-KP5ktEWltPy0,220
 naas_abi_core/cli/module.py,sha256=TBl-SpeGUcy1Rrp40Irbt34yQS00xJcNje-OijNE4Hk,717
 naas_abi_core/cli/new.py,sha256=aFhKbTHwqYkPdzrd7r8i_h9dfzXNjI03t8qVeqME8w8,262
@@ -21,13 +21,13 @@ 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=12rKgF1LaLC_YMhKEABFSdU_Fb04qGpW4tft3eVCnPI,5529
-naas_abi_core/engine/engine_configuration/EngineConfiguration_Deploy.py,sha256=NbPMxiNt9C4zfNF70fs7a8prELpd3QAHbZlvHfwcbxs,134
+naas_abi_core/engine/engine_configuration/EngineConfiguration.py,sha256=OgJJW_iHQjnMOQpxwZR-Iwup6p6mqjCbHgsjR6lxf0k,5535
+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_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=XCyn1DO3oW7xPlrfmD1lo3GPymDCVDPI-QXw-lbzzIQ,6278
+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_test.py,sha256=PL4A4Dawq6tfyHsiIkqbHhovc7wkIHcVZra6llRI-CY,286
 naas_abi_core/engine/engine_configuration/utils/PydanticModelValidator.py,sha256=jZzLqLvR8HawpyGYiUJEng3NlebLHiN3mVFOzNDSWs8,504
@@ -123,7 +123,7 @@ 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.1.1.dist-info/METADATA,sha256=N_uONUiksIeNE7DwwW1hWeFUTNDYehPFo2d9LsEHtuE,3897
-naas_abi_core-1.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-naas_abi_core-1.1.1.dist-info/entry_points.txt,sha256=q68PvlGw_rozZ0nl6mUg6l1l2IhxaTOKlf5K9goRDu0,99
-naas_abi_core-1.1.1.dist-info/RECORD,,
+naas_abi_core-1.1.3.dev1.dist-info/METADATA,sha256=CkhEkz14FB3RCMqWAcUmqwXDRdUNS3-JSmiatOtetyA,3902
+naas_abi_core-1.1.3.dev1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naas_abi_core-1.1.3.dev1.dist-info/entry_points.txt,sha256=q68PvlGw_rozZ0nl6mUg6l1l2IhxaTOKlf5K9goRDu0,99
+naas_abi_core-1.1.3.dev1.dist-info/RECORD,,