naas-abi-core 1.0.7__tar.gz → 1.1.0__tar.gz

{naas_abi_core-1.0.7 → naas_abi_core-1.1.0}/=0.9.13

@@ -1,6 +1,6 @@
 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 200.6 MB/s  0:00:00
+   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 21.7/21.7 MB 210.2 MB/s  0:00:00
 Installing collected packages: uv
 Successfully installed uv-0.9.15

{naas_abi_core-1.0.7 → naas_abi_core-1.1.0}/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 <!-- version list -->
 
+## v1.1.0 (2025-12-05)
+
+### Features
+
+- Make it possible to add env var using cli deploy
+  ([`eb32c8d`](https://github.com/jupyter-naas/abi/commit/eb32c8d9613ecbddb3a891f25db0a5bc3498b258))
+
+
+## v1.0.8 (2025-12-05)
+
+
 ## v1.0.7 (2025-12-03)
 
 ### Bug Fixes

{naas_abi_core-1.0.7 → naas_abi_core-1.1.0}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.0.7
+Version: 1.1.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
 Requires-Dist: click<8.2,>=8.1.1
+Requires-Dist: docker>=7.1.0
 Requires-Dist: dotenv>=0.9.9
 Requires-Dist: fastapi<0.116,>=0.115.5
 Requires-Dist: fastmcp>=2.13.2

{naas_abi_core-1.0.7 → naas_abi_core-1.1.0}/naas_abi_core/cli/__init__.py

@@ -7,7 +7,7 @@ from .init import init
 from .module import module
 from .new import new
 from .secret import secrets
-
+from .deploy import deploy
 # from dotenv import load_dotenv
 
 # load_dotenv()
@@ -48,6 +48,7 @@ main.add_command(agent)
 main.add_command(chat)
 main.add_command(new)
 main.add_command(init)
+main.add_command(deploy)
 
 # if __name__ == "__main__":
 main()

naas_abi_core-1.1.0/naas_abi_core/cli/deploy.py

@@ -0,0 +1,199 @@
+import json
+import subprocess
+from uuid import uuid4
+
+import click
+import requests
+from pydantic import BaseModel
+from rich.console import Console
+from rich.markdown import Markdown
+
+from naas_abi_core import logger
+from naas_abi_core.engine.engine_configuration.EngineConfiguration import (
+    EngineConfiguration,
+)
+
+
+@click.group("deploy")
+def deploy():
+    pass
+
+
+class Container(BaseModel):
+    name: str
+    image: str
+    port: int
+    cpu: str
+    memory: str
+    env: dict
+
+
+class Space(BaseModel):
+    name: str
+    containers: list[Container]
+
+
+class NaasAPIClient:
+    naas_api_key: str
+    base_url: str
+
+    def __init__(self, naas_api_key: str):
+        self.naas_api_key = naas_api_key
+        self.base_url = "https://api.naas.ai"
+
+    def create_registry(self, name: str):
+        response = requests.post(
+            f"{self.base_url}/registry/",
+            headers={"Authorization": f"Bearer {self.naas_api_key}"},
+            json={"name": name},
+        )
+        if response.status_code == 409:
+            return self.get_registry(name)
+        response.raise_for_status()
+        return response.json()
+
+    def get_registry(self, name: str):
+        response = requests.get(
+            f"{self.base_url}/registry/{name}",
+            headers={"Authorization": f"Bearer {self.naas_api_key}"},
+        )
+        response.raise_for_status()
+        return response.json()
+
+    def get_registry_credentials(self, name: str):
+        response = requests.get(
+            f"{self.base_url}/registry/{name}/credentials",
+            headers={"Authorization": f"Bearer {self.naas_api_key}"},
+        )
+        response.raise_for_status()
+        return response.json()
+
+    def update_space(self, space: Space) -> dict:
+        response = requests.put(
+            f"{self.base_url}/space/{space.name}",
+            headers={"Authorization": f"Bearer {self.naas_api_key}"},
+            json=space.model_dump(),
+        )
+        response.raise_for_status()
+        return response.json()
+
+    def create_space(self, space: Space) -> dict:
+        response = requests.post(
+            f"{self.base_url}/space/",
+            headers={"Authorization": f"Bearer {self.naas_api_key}"},
+            json=space.model_dump(),
+        )
+
+        if response.status_code == 409:
+            return self.update_space(space)
+
+        response.raise_for_status()
+        return response.json()
+
+    def get_space(self, name: str) -> dict:
+        response = requests.get(
+            f"{self.base_url}/space/{name}",
+            headers={"Authorization": f"Bearer {self.naas_api_key}"},
+        )
+        response.raise_for_status()
+        return response.json()
+
+
+class NaasDeployer:
+    image_name: str
+
+    naas_api_client: NaasAPIClient
+
+    def __init__(self, configuration: EngineConfiguration):
+        self.configuration = configuration
+        self.image_name = str(uuid4())
+        assert configuration.deploy is not None
+        self.naas_api_client = NaasAPIClient(configuration.deploy.naas_api_key)
+
+    def docker_build(self, image_name: str):
+        subprocess.run(
+            f"docker build -t {image_name} . --platform linux/amd64", shell=True
+        )
+
+    def env_list_to_dict(self, env: list[str]) -> dict:
+        return {env_var.split("=", 1)[0]: env_var.split("=", 1)[1] for env_var in env}
+
+    def deploy(self, env: list[str]):
+        registry = self.naas_api_client.create_registry(
+            self.configuration.deploy.space_name
+        )
+
+        uid = str(uuid4())
+
+        image_name = f"{registry['registry']['uri']}:{uid}"
+        self.docker_build(image_name)
+        credentials = self.naas_api_client.get_registry_credentials(
+            self.configuration.deploy.space_name
+        )
+        docker_login_command = f"docker login -u {credentials['credentials']['username']} -p {credentials['credentials']['password']} {registry['registry']['uri']}"
+        subprocess.run(docker_login_command, shell=True)
+        subprocess.run(f"docker push {image_name}", shell=True)
+
+        image_sha = (
+            subprocess.run(
+                "docker inspect --format='{{index .RepoDigests 0}}' "
+                + image_name
+                + " | cut -d'@' -f2",
+                shell=True,
+                capture_output=True,
+            )
+            .stdout.strip()
+            .decode("utf-8")
+        )
+
+        image_name_with_sha = f"{image_name.replace(':' + uid, '')}@{image_sha}"
+
+
+        self.naas_api_client.create_space(
+            Space(
+                name=self.configuration.deploy.space_name,
+                containers=[
+                    Container(
+                        name="api",
+                        image=image_name_with_sha,
+                        port=9879,
+                        cpu="1",
+                        memory="1Gi",
+                        env=self.env_list_to_dict(env) | {
+                            "NAAS_API_KEY": self.configuration.deploy.naas_api_key,
+                            "ENV": "prod",
+                        },
+                    )
+                ],
+            )
+        )
+
+        space = self.naas_api_client.get_space(self.configuration.deploy.space_name)
+
+        Console().print(
+            Markdown(f"""
+# Deployment successful
+
+- Space: {self.configuration.deploy.space_name}
+- Image: {image_name_with_sha}
+- URL: https://{self.configuration.deploy.space_name}.default.space.naas.ai
+
+```json
+{json.dumps(space, indent=4)}
+```
+                                 """)
+        )
+
+
+@deploy.command("naas")
+@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()
+
+    if configuration.deploy is None:
+        logger.error(
+            "Deploy configuration not found in the yaml configuration file. Please add a deploy section to the configuration file."
+        )
+
+    deployer = NaasDeployer(configuration)
+    deployer.deploy(env)

{naas_abi_core-1.0.7 → naas_abi_core-1.1.0}/naas_abi_core/engine/engine_configuration/EngineConfiguration.py

@@ -20,7 +20,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,6 +80,8 @@ class GlobalConfig(BaseModel):
 
 class EngineConfiguration(BaseModel):
     api: ApiConfiguration
+    
+    deploy: DeployConfiguration | None = None
 
     services: ServicesConfiguration
 

naas_abi_core-1.1.0/naas_abi_core/engine/engine_configuration/EngineConfiguration_Deploy.py

@@ -0,0 +1,6 @@
+from pydantic import BaseModel
+
+class DeployConfiguration(BaseModel):
+    workspace_id: str
+    space_name: str
+    naas_api_key: str

{naas_abi_core-1.0.7 → naas_abi_core-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "naas-abi-core"
-version = "1.0.7"
+version = "1.1.0"
 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"
@@ -31,6 +31,7 @@ dependencies = [
     "fastmcp>=2.13.2",
     "pandas>=2.3.3",
     "pillow>=12.0.0",
+    "docker>=7.1.0",
 ]
 
 [project.optional-dependencies]