naas-abi-cli 1.4.4__py3-none-any.whl → 1.5.0__py3-none-any.whl

naas_abi_cli/cli/new/project.py

@@ -2,7 +2,6 @@ import os
 import subprocess
 
 import click
-
 import naas_abi_cli
 from naas_abi_cli.cli.utils.Copier import Copier
 
@@ -24,7 +23,6 @@ def new_project(project_name: str | None, project_path: str | None):
     # Ensure the last path component matches the project name, not just the suffix.
     if os.path.basename(os.path.normpath(project_path)) != project_name:
         project_path = os.path.join(project_path, project_name)
-    print(project_path)
 
     if not os.path.exists(project_path):
         os.makedirs(project_path, exist_ok=True)
@@ -42,6 +40,7 @@ def new_project(project_name: str | None, project_path: str | None):
         values={
             "project_name": project_name,
             "project_name_snake": project_name.replace("-", "_"),
+            "project_name_pascal": project_name.replace("-", "").capitalize(),
         }
     )
 

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

@@ -0,0 +1,67 @@
+deploy:
+  workspace_id: "{{ naas_workspace_id }}"
+  space_name: "{{ project_name_snake }}-abi-api"
+{% raw %}
+  naas_api_key: "{{ secret.NAAS_API_KEY }}"
+  env:
+    ENV: "prod"
+    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
+  exclude_agents: [] # Agents to exclude from auto-publishing (empty list means publish all enabled agents)
+  default_agent: "Abi" # Which agent to set as default in workspace
+
+api:
+  title: "ABI API"
+  description: "API for ABI, your Artifical Business Intelligence"
+  logo_path: "assets/logo.png"
+  favicon_path: "assets/favicon.ico"
+  cors_origins:
+    - "http://localhost:9879"
+
+
+global_config:
+  ai_mode: "cloud"
+
+modules:
+  - module: naas_abi
+    enabled: true
+  - module: naas_abi_marketplace.ai.chatgpt
+    enabled: true
+    config:
+      openai_api_key: "{{ secret.OPENAI_API_KEY }}"
+{% endraw %}
+  - module: {{ project_name_snake }}
+    enabled: true
+
+{% raw %}
+services:
+  secret:
+    secret_adapters:
+      - adapter: "naas"
+        config:
+          naas_api_key: "{{ secret.NAAS_API_KEY }}"
+          naas_api_url: "https://api.naas.ai"
+  object_storage:
+    object_storage_adapter:
+      adapter: "naas"
+      config:
+        naas_api_key: "{{ secret.NAAS_API_KEY }}"
+        workspace_id: "{{ secret.NAAS_WORKSPACE_ID }}"
+        storage_name: "{{ secret.NAAS_STORAGE_NAME }}"
+        base_prefix: "datastore"
+  triple_store:
+    triple_store_adapter:
+      adapter: "fs"
+      config:
+        store_path: "storage/triplestore"
+  vector_store:
+    vector_store_adapter:
+      adapter: "qdrant"
+      config: {}
+
+{% endraw %}

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

@@ -1,13 +1,13 @@
 deploy:
-  workspace_id: "your_workspace_id"
-  space_name: "your_project_name-abi-api"
+  workspace_id: "{{ naas_workspace_id }}"
+  space_name: "{{ project_name_snake }}-abi-api"
+{% raw %}
   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
   exclude_agents: [] # Agents to exclude from auto-publishing (empty list means publish all enabled agents)
@@ -32,7 +32,11 @@ modules:
     enabled: true
     config:
       openai_api_key: "{{ secret.OPENAI_API_KEY }}"
+{% endraw %}
+  - module: {{ project_name_snake }}
+    enabled: true
 
+{% raw %}
 services:
   secret:
     secret_adapters:
@@ -52,3 +56,4 @@ services:
     vector_store_adapter:
       adapter: "qdrant"
       config: {}
+{% endraw %}

naas_abi_cli/cli/new/templates/project/{{project_name_snake}}/__init__.py

@@ -0,0 +1,31 @@
+from naas_abi_core.module.Module import (
+    BaseModule,
+    ModuleConfiguration,
+    ModuleDependencies,
+)
+
+# from naas_abi_core.services.object_storage.ObjectStorageService import ObjectStorageService
+# from naas_abi_core.services.secret.Secret import Secret
+# from naas_abi_core.services.triple_store.TripleStoreService import TripleStoreService
+# from naas_abi_core.services.vector_store.VectorStoreService import VectorStoreService
+
+
+class ABIModule(BaseModule):
+    dependencies: ModuleDependencies = ModuleDependencies(
+        modules=[
+            "naas_abi_marketplace.ai.chatgpt",
+        ],
+        services=[
+            # Secret,
+            # TripleStoreService,
+            # ObjectStorageService,
+            # VectorStoreService
+        ],
+    )
+
+    class Configuration(ModuleConfiguration):
+        pass
+        # example: str
+
+    def on_initialized(self):
+        super().on_initialized()

naas_abi_cli/cli/new/templates/project/{{project_name_snake}}/agents/Agent.py

@@ -0,0 +1,52 @@
+from typing import Optional
+
+from naas_abi_core.services.agent.Agent import (
+    Agent,
+    AgentConfiguration,
+    AgentSharedState,
+)
+
+NAME = "{{project_name_snake}} Agent"
+DESCRIPTION = "An helpful agent that can help you with your tasks."
+SYSTEM_PROMPT = """
+You are {{project_name_snake}} Agent.
+"""
+
+
+def create_agent(
+    agent_shared_state: Optional[AgentSharedState] = None,
+    agent_configuration: Optional[AgentConfiguration] = None,
+) -> Optional[Agent]:
+    #from {{project_name_snake}} import ABIModule
+    
+    # Set model
+    from naas_abi_marketplace.ai.chatgpt.models.gpt_5 import model as chatgpt_model
+
+    model = chatgpt_model.model
+
+    # Use provided configuration or create default one
+    if agent_configuration is None:
+        agent_configuration = AgentConfiguration(system_prompt=SYSTEM_PROMPT)
+
+    # Use provided shared state or create new one
+    if agent_shared_state is None:
+        agent_shared_state = AgentSharedState()
+
+    tools: list = []
+
+    agents: list = []
+
+    return {{project_name_pascal}}Agent(
+        name=NAME,
+        description=DESCRIPTION,
+        chat_model=model,
+        tools=tools,
+        agents=agents,
+        memory=None,
+        state=agent_shared_state,
+        configuration=agent_configuration,
+    )
+
+
+class {{project_name_pascal}}Agent(Agent):
+    pass

naas_abi_cli/cli/utils/Copier.py

@@ -2,6 +2,20 @@ import os
 import shutil
 
 import jinja2
+import rich
+from jinja2 import Environment, meta
+
+
+class ValueProvider(dict):
+    def collect_values(self, template_string: str) -> dict:
+        env = Environment()  # add your filters/tests if you use them
+        ast = env.parse(template_string)
+        needed = meta.find_undeclared_variables(ast)
+
+        for name in sorted(needed):
+            if name in self:
+                continue
+            self[name] = rich.prompt.Prompt.ask(f"Enter value for '{name}'")
 
 
 class Copier:
@@ -14,21 +28,24 @@ class Copier:
         self.templates_path = os.path.abspath(templates_path)
         self.destination_path = os.path.abspath(destination_path)
 
-    def template_file_to_file(
-        self, template_path: str, values: dict, destination_path: str
+    def _template_file_to_file(
+        self, template_path: str, values: ValueProvider, destination_path: str
     ) -> None:
-        destination_path = self.template_string(destination_path, values)
+        destination_path = self._template_string(destination_path, values)
         with open(destination_path, "w", encoding="utf-8") as file:
-            file.write(self.template_file(template_path, values))
+            file.write(self._template_file(template_path, values))
 
-    def template_file(self, template_path: str, values: dict) -> str:
+    def _template_file(self, template_path: str, values: ValueProvider) -> str:
         with open(template_path, "r", encoding="utf-8") as file:
-            return self.template_string(file.read(), values)
+            return self._template_string(file.read(), values)
 
-    def template_string(self, template_string: str, values: dict) -> str:
+    def _template_string(self, template_string: str, values: ValueProvider) -> str:
+        values.collect_values(template_string)
         return jinja2.Template(template_string).render(values)
 
     def copy(self, values: dict, templates_path: str | None = None):
+        vp = ValueProvider(values)
+
         if templates_path is None:
             templates_path = self.templates_path
         elif not os.path.isabs(templates_path):
@@ -45,22 +62,23 @@ class Copier:
 
         for file in os.listdir(templates_path):
             if os.path.isfile(os.path.join(templates_path, file)):
-                if "config" in file and file.endswith(".yaml"):
+                if False and "config" in file and file.endswith(".yaml"):
                     shutil.copy(
                         os.path.join(templates_path, file),
-                        self.template_string(os.path.join(target_path, file), values),
+                        self._template_string(os.path.join(target_path, file), vp),
                     )
                 else:
-                    self.template_file_to_file(
+                    self._template_file_to_file(
                         os.path.join(templates_path, file),
-                        values,
+                        vp,
                         os.path.join(target_path, file),
                     )
             elif os.path.isdir(os.path.join(templates_path, file)):
                 os.makedirs(
-                    self.template_string(os.path.join(target_path, file), values),
+                    self._template_string(os.path.join(target_path, file), vp),
                     exist_ok=True,
                 )
                 self.copy(values, os.path.join(templates_path, file))
             else:
                 print(f"Skipping {file}")
+                print(f"Skipping {file}")

{naas_abi_cli-1.4.4.dist-info → naas_abi_cli-1.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-cli
-Version: 1.4.4
+Version: 1.5.0
 Summary: Abi cli allowing you to build your AI system.
 Project-URL: Homepage, https://github.com/jupyter-naas/abi
 Project-URL: Repository, https://github.com/jupyter-naas/abi/tree/main/libs/naas-abi-cli

{naas_abi_cli-1.4.4.dist-info → naas_abi_cli-1.5.0.dist-info}/RECORD

@@ -11,16 +11,22 @@ naas_abi_cli/cli/secret.py,sha256=u_yUZgVEcns-CM-qsIIZUHX8j8T6aioJYluqSQhnXFE,24
 naas_abi_cli/cli/new/__init__.py,sha256=i-lOPJh8DL729CFhZyuXZibsaswsqPj5e7u_N68xXeM,156
 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/project.py,sha256=rqM7peahVhqdteo8HjWm-ZQW30LfVYYPfuZV2Y2tR2g,1966
 naas_abi_cli/cli/new/templates/project/.gitignore,sha256=UGpJjKfZf8Gv1AD8aCgx0EDGsY_7j4viVinCdxDZMhQ,18
 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=XbH96_X2EFowSsM5yl3NjE9NzcwkLgsznx29bNlx0io,1362
-naas_abi_cli-1.4.4.dist-info/METADATA,sha256=ttwSxszM9SNQQVXf1t6-9uAoEyHrUfWPZUTO8Vn-Mh8,7371
-naas_abi_cli-1.4.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-naas_abi_cli-1.4.4.dist-info/entry_points.txt,sha256=ufNXhYVU3uo5dcZ8e1kdEJv1oh2Vons7LHJPg35cP4w,46
-naas_abi_cli-1.4.4.dist-info/RECORD,,
+naas_abi_cli/cli/new/templates/project/{{project_name_snake}}/__init__.py,sha256=RrPtAs9r4Kf6ZUNkrA2P9BAmQftVZYnid5hZrT7A6wE,912
+naas_abi_cli/cli/new/templates/project/{{project_name_snake}}/agents/Agent.py,sha256=AAbYlAmmp8zC6Tp5WVelvHSMUYYgJCEko4zAhkGUaAg,1328
+naas_abi_cli/cli/new/templates/project/{{project_name_snake}}/agents/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+naas_abi_cli/cli/new/templates/project/{{project_name_snake}}/orchestrations/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+naas_abi_cli/cli/new/templates/project/{{project_name_snake}}/pipelines/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+naas_abi_cli/cli/new/templates/project/{{project_name_snake}}/workflows/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+naas_abi_cli/cli/utils/Copier.py,sha256=cYo-5INC0jSrxcBgf2tvhahMr-92j2-BLpSmb6nQ1pc,3269
+naas_abi_cli/cli/new/templates/project/config.prod.yaml,sha256=5aAfS2wSH7WnOm_z1Xxu4SarttPnPno39ES0T3bEVj0,1741
+naas_abi_cli/cli/new/templates/project/config.yaml,sha256=NgjksaCwSJ6iHpGoMFMdcrtguiHUYx-FKPKIiQ8aODI,1474
+naas_abi_cli-1.5.0.dist-info/METADATA,sha256=PBK11Mhqqnq42JkYqRcA4xYQLde_iALyNH5tDYKP4XI,7371
+naas_abi_cli-1.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naas_abi_cli-1.5.0.dist-info/entry_points.txt,sha256=ufNXhYVU3uo5dcZ8e1kdEJv1oh2Vons7LHJPg35cP4w,46
+naas_abi_cli-1.5.0.dist-info/RECORD,,