naas-abi-cli 1.0.2__py3-none-any.whl → 1.1.0__py3-none-any.whl

naas_abi_cli/cli/deploy.py

@@ -1,3 +1,4 @@
+import os
 import subprocess
 from uuid import uuid4
 
@@ -117,23 +118,7 @@ class NaasDeployer:
             f"docker build -t {image_name} . --platform linux/amd64", shell=True
         )
 
-    @staticmethod
-    def env_list_to_dict(env: list[str]) -> dict:
-        env_dict: dict[str, str] = {}
-        for env_var in env:
-            if "=" not in env_var:
-                raise click.ClickException(
-                    f"Invalid environment variable '{env_var}'. Expected format KEY=VALUE."
-                )
-            key, value = env_var.split("=", 1)
-            if not key:
-                raise click.ClickException(
-                    f"Invalid environment variable '{env_var}'. Missing key before '='."
-                )
-            env_dict[key] = value
-        return env_dict
-
-    def deploy(self, env: list[str]):
+    def deploy(self):
         assert self.configuration.deploy is not None
         registry = self.naas_api_client.create_registry(
             self.configuration.deploy.space_name
@@ -174,11 +159,7 @@ 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.configuration.deploy.env | self.env_list_to_dict(env),
+                        env=self.configuration.deploy.env,
                     )
                 ],
             )
@@ -202,10 +183,14 @@ class NaasDeployer:
 @click.option(
     "-e",
     "--env",
-    multiple=True,
-    help="Environment variables to set (e.g. -e FOO=BAR -e BAZ=QUX)",
+    type=str,
+    default="prod",
+    help="Environment to use (default: prod). This is used to know which configuration file to load. (config.prod.yaml, config.yaml, ...)",
 )
-def naas(env: list[str]):
+def naas(env: str):
+    # Set the ENV environment variable for the EngineConfiguration.load_configuration() to load the correct configuration file.
+    os.environ["ENV"] = env
+
     configuration: EngineConfiguration = EngineConfiguration.load_configuration()
 
     if configuration.deploy is None:
@@ -215,4 +200,4 @@ def naas(env: list[str]):
         raise click.ClickException("Missing deploy configuration; aborting.")
 
     deployer = NaasDeployer(configuration)
-    deployer.deploy(env)
+    deployer.deploy()

naas_abi_cli/cli/new/templates/project/.gitignore

@@ -0,0 +1,2 @@
+.venv
+.env

naas_abi_cli/cli/new/templates/project/Dockerfile

@@ -0,0 +1,11 @@
+FROM python:3.11
+
+WORKDIR /app
+
+COPY . .
+
+RUN pip install uv
+
+RUN uv sync --no-dev
+
+CMD ["uv", "run", "python", "-m", "naas_abi_core.apps.api.api"]

naas_abi_cli/cli/new/templates/project/config.yaml

@@ -1,3 +1,12 @@
+deploy:
+  workspace_id: "your_workspace_id"
+  space_name: "your_project_name-abi-api"
+  naas_api_key: "{{ secret.NAAS_API_KEY }}"
+  env:
+    NAAS_API_KEY: "{{ secret.NAAS_API_KEY }}"
+    OPENAI_API_KEY: "{{ secret.OPENAI_API_KEY }}"
+    ABI_API_KEY: "{{ secret.ABI_API_KEY }}"
+
 
 auto_publish:
   enabled: true # Enable automatic publishing of agents to workspace
@@ -33,7 +42,7 @@ services:
     object_storage_adapter:
       adapter: "fs"
       config:
-        base_path: "storage/object_store"
+        base_path: "storage/datastore"
   triple_store:
     triple_store_adapter:
       adapter: "fs"

{naas_abi_cli-1.0.2.dist-info → naas_abi_cli-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-cli
-Version: 1.0.2
+Version: 1.1.0
 Summary: Abi cli 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_cli-1.0.2.dist-info → naas_abi_cli-1.1.0.dist-info}/RECORD

@@ -4,7 +4,7 @@ naas_abi_cli/cli/__init__.py,sha256=JJbXMmjdp4TUYkgpVhuTOH5acecBeYT-26xl8jX_Nv0,
 naas_abi_cli/cli/agent.py,sha256=fMdbC7HsrOfZSf5zVRHWSmyrejI5mUdRlAT5v5YHXzk,658
 naas_abi_cli/cli/chat.py,sha256=3t_TJ7vqCNs0MIIXOtlSke3nzy4rMSEJtB3P6pKItMo,856
 naas_abi_cli/cli/config.py,sha256=CcdDX6HKCP32NjRhbVsCOwLUC9LmaqTm2sv8W5rOt00,1484
-naas_abi_cli/cli/deploy.py,sha256=QD64psPMMkG2cpaaVTKnNgy65h3iEXkr_myP_GANa1A,6896
+naas_abi_cli/cli/deploy.py,sha256=SW4mJUPYBJL-k5D_zqRjGy-1dvUYDIA4iX82LmSaB3I,6269
 naas_abi_cli/cli/init.py,sha256=Pcy2-hy-FvpXf3UOKMP6agWyFrCl9z-KP5ktEWltPy0,220
 naas_abi_cli/cli/module.py,sha256=TBl-SpeGUcy1Rrp40Irbt34yQS00xJcNje-OijNE4Hk,717
 naas_abi_cli/cli/run.py,sha256=OLrAs0mtnI0jvyW5Bb_Jd3Sp-bWDMdulCcsPixEq-6s,308
@@ -13,13 +13,15 @@ naas_abi_cli/cli/new/__init__.py,sha256=i-lOPJh8DL729CFhZyuXZibsaswsqPj5e7u_N68x
 naas_abi_cli/cli/new/module.py,sha256=e4gXnE7iQ4aCJpAU-0iMrHQ11T-PS11UDuifBLwyYFs,183
 naas_abi_cli/cli/new/new.py,sha256=sfNmeoNZLGhjKRKSHuwEl1vtuxWR_SII0qOo9BVoEwY,55
 naas_abi_cli/cli/new/project.py,sha256=ptYIh9_M-bOr-LEj6hzfKIYVLCaQtKhJXhP5OGKH0TQ,1912
+naas_abi_cli/cli/new/templates/project/.gitignore,sha256=ihQc17bVJjD6v8FCge51KB0u3me3rdvLlskyTu1WZ0k,10
+naas_abi_cli/cli/new/templates/project/Dockerfile,sha256=1qKIDdqwc_JYJE9ROHFqsq3RPyYpkfqjZHKACCMR4JE,147
 naas_abi_cli/cli/new/templates/project/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naas_abi_cli/cli/new/templates/project/pyproject.toml,sha256=LQfOYOCSYvI6BP5TGYoWV4dlfSAUVFBZJkXqf-em48o,165
 naas_abi_cli/cli/new/templates/project/.github/workflows/release.yaml,sha256=7uV4SE20zvAfJKr1caKLbHIC3eyBmS-LOwjkKe6plhI,596
 naas_abi_cli/cli/new/templates/project/{{project_name_snake}}/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 naas_abi_cli/cli/utils/Copier.py,sha256=YDYY9rxbL0TFB8IHKZc1ZR0w9tMUlX29jhVw4To8OQs,2640
-naas_abi_cli/cli/new/templates/project/config.yaml,sha256=RWZtS6ua1R8echvEVZg-ETsy_7FgjvE6iw7YA7TQRfM,1087
-naas_abi_cli-1.0.2.dist-info/METADATA,sha256=Df8V269GIqn479L3M3q8UBSxXoGpZi0QJg8Dchu-Jzw,381
-naas_abi_cli-1.0.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-naas_abi_cli-1.0.2.dist-info/entry_points.txt,sha256=ufNXhYVU3uo5dcZ8e1kdEJv1oh2Vons7LHJPg35cP4w,46
-naas_abi_cli-1.0.2.dist-info/RECORD,,
+naas_abi_cli/cli/new/templates/project/config.yaml,sha256=XbH96_X2EFowSsM5yl3NjE9NzcwkLgsznx29bNlx0io,1362
+naas_abi_cli-1.1.0.dist-info/METADATA,sha256=380ZcqQi5eDqzktHD1cAQYYIbXAkPW0KtXP-llktq9s,381
+naas_abi_cli-1.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naas_abi_cli-1.1.0.dist-info/entry_points.txt,sha256=ufNXhYVU3uo5dcZ8e1kdEJv1oh2Vons7LHJPg35cP4w,46
+naas_abi_cli-1.1.0.dist-info/RECORD,,