naas-abi-cli 1.6.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

naas_abi_cli/cli/__init__.py

@@ -48,12 +48,15 @@ def main():
                         "uv run --active python -m naas_abi_cli.cli".split(" ")
                         + sys.argv[1:]
                     )
-                    subprocess.run(
-                        arguments,
-                        cwd=os.getcwd(),
-                        env={**os.environ, "LOCAL_UV_RAN": "true"},
-                        check=True,
-                    )
+                    try:
+                        subprocess.run(
+                            arguments,
+                            cwd=os.getcwd(),
+                            env={**os.environ, "LOCAL_UV_RAN": "true"},
+                            check=True,
+                        )
+                    except Exception:
+                        pass
 
                     return
     _main()

naas_abi_cli/cli/chat.py

@@ -3,14 +3,14 @@ from naas_abi_core import logger
 
 
 @click.command("chat")
-@click.argument("module-name", type=str, default=None)
-@click.argument("agent-name", type=str, default=None)
-def chat(module_name: str | None, agent_name: str | None):
+@click.argument("module-name", type=str, default="")
+@click.argument("agent-name", type=str, default="")
+def chat(module_name: str = "", agent_name: str = ""):
     from naas_abi_core.engine.Engine import Engine
 
     engine = Engine()
 
-    if module_name is None and agent_name is None:
+    if module_name == "" and agent_name == "":
         module_name, agent_name = engine.configuration.default_agent.split(" ")
 
     engine.load(module_names=[module_name])

naas_abi_cli/cli/new/module.py

@@ -1,10 +1,48 @@
+import os
+
 import click
+import naas_abi_cli
+from naas_abi_cli.cli.utils.Copier import Copier
 
 from .new import new
 
 
+def sanitize_module_name(module_name: str) -> str:
+    return module_name.replace("-", "_").replace(" ", "_").lower()
+
+
 @new.command("module")
-@click.argument("module-name")
-@click.argument("module-path")
-def new_module(module_name: str, module_path: str):
-    pass
+@click.argument("module_name", required=True)
+@click.argument("module_path", required=False, default=".")
+def _new_module(module_name: str, module_path: str = "."):
+    new_module(module_name, module_path)
+
+
+def new_module(module_name: str, module_path: str = "."):
+    module_name = sanitize_module_name(module_name)
+
+    if module_path == ".":
+        module_path = os.path.join(os.getcwd(), module_name)
+    else:
+        module_path = os.path.join(module_path, module_name)
+
+    if not os.path.exists(module_path):
+        os.makedirs(module_path, exist_ok=True)
+    elif len(os.listdir(module_path)) > 0:
+        print(f"Folder {module_path} already exists and is not empty.")
+        exit(1)
+
+    copier = Copier(
+        templates_path=os.path.join(
+            os.path.dirname(naas_abi_cli.__file__), "cli/new/templates/module"
+        ),
+        destination_path=module_path,
+    )
+
+    copier.copy(
+        values={
+            "module_name": module_name,
+            "module_name_snake": module_name.replace("-", "_"),
+            "module_name_pascal": module_name.replace("-", "").capitalize(),
+        }
+    )

naas_abi_cli/cli/new/project.py

@@ -5,6 +5,7 @@ import click
 import naas_abi_cli
 from naas_abi_cli.cli.utils.Copier import Copier
 
+from .module import new_module
 from .new import new
 
 
@@ -44,6 +45,9 @@ def new_project(project_name: str | None, project_path: str | None):
         }
     )
 
+    # Calling new_module to create the module in the src folder
+    new_module(project_name, os.path.join(project_path, "src"))
+
     # Run dependency install without shell to avoid quoting issues on paths with spaces.
     subprocess.run(
         [

naas_abi_cli/cli/new/templates/{project/{{project_name_snake}}/agents/{{project_name_pascal}}Agent.py → module/agents/{{module_name_pascal}}Agent.py}

@@ -6,10 +6,10 @@ from naas_abi_core.services.agent.Agent import (
     AgentSharedState,
 )
 
-NAME = "{{project_name_snake}} Agent"
+NAME = "{{module_name_snake}} Agent"
 DESCRIPTION = "An helpful agent that can help you with your tasks."
 SYSTEM_PROMPT = """
-You are {{project_name_snake}} Agent.
+You are {{module_name_snake}} Agent.
 """
 
 
@@ -17,7 +17,7 @@ def create_agent(
     agent_shared_state: Optional[AgentSharedState] = None,
     agent_configuration: Optional[AgentConfiguration] = None,
 ) -> Optional[Agent]:
-    #from {{project_name_snake}} import ABIModule
+    #from {{module_name_snake}} import ABIModule
     
     # Set model
     from naas_abi_marketplace.ai.chatgpt.models.gpt_5 import model as chatgpt_model
@@ -36,7 +36,7 @@ def create_agent(
 
     agents: list = []
 
-    return {{project_name_pascal}}Agent(
+    return {{module_name_pascal}}Agent(
         name=NAME,
         description=DESCRIPTION,
         chat_model=model,
@@ -48,5 +48,5 @@ def create_agent(
     )
 
 
-class {{project_name_pascal}}Agent(Agent):
+class {{module_name_pascal}}Agent(Agent):
     pass

naas_abi_cli/cli/new/templates/project/pyproject.toml

@@ -7,6 +7,13 @@ requires-python = ">=3.12"
 dependencies = [
 ]
 
+[build-system]
+requires = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
 
 # [tool.uv.sources]
 # naas-abi = { path = ".abi/libs/naas-abi",  editable = true }

{naas_abi_cli-1.6.0.dist-info → naas_abi_cli-1.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-cli
-Version: 1.6.0
+Version: 1.7.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.6.0.dist-info → naas_abi_cli-1.7.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
 naas_abi_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-naas_abi_cli/cli/__init__.py,sha256=JJbXMmjdp4TUYkgpVhuTOH5acecBeYT-26xl8jX_Nv0,1340
+naas_abi_cli/cli/__init__.py,sha256=U5B_FHw3WZrDBehe1GBSHMNUVbrrZMZDsRvYOKzIg54,1456
 naas_abi_cli/cli/agent.py,sha256=fMdbC7HsrOfZSf5zVRHWSmyrejI5mUdRlAT5v5YHXzk,658
-naas_abi_cli/cli/chat.py,sha256=2m8Ezf5mfXf3d8NMBBRQKrJ1w5sS7dfNccKUh6yCnyY,960
+naas_abi_cli/cli/chat.py,sha256=fobZsW4hCoTe5VJbWDmFR5gUhd91Y1K1D5fJ_H5fshg,948
 naas_abi_cli/cli/config.py,sha256=CcdDX6HKCP32NjRhbVsCOwLUC9LmaqTm2sv8W5rOt00,1484
 naas_abi_cli/cli/deploy.py,sha256=F4ZO-_ZVfBj93m7WQw5C7qAo3s7D3APl3-ePTpdFTYI,6670
 naas_abi_cli/cli/init.py,sha256=Pcy2-hy-FvpXf3UOKMP6agWyFrCl9z-KP5ktEWltPy0,220
@@ -9,24 +9,24 @@ naas_abi_cli/cli/module.py,sha256=TBl-SpeGUcy1Rrp40Irbt34yQS00xJcNje-OijNE4Hk,71
 naas_abi_cli/cli/run.py,sha256=OLrAs0mtnI0jvyW5Bb_Jd3Sp-bWDMdulCcsPixEq-6s,308
 naas_abi_cli/cli/secret.py,sha256=u_yUZgVEcns-CM-qsIIZUHX8j8T6aioJYluqSQhnXFE,2491
 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/module.py,sha256=a3lKkMcgX1mkDFQBhvg3cORcjZYP9RLrNclwznnzfR4,1383
 naas_abi_cli/cli/new/new.py,sha256=sfNmeoNZLGhjKRKSHuwEl1vtuxWR_SII0qOo9BVoEwY,55
-naas_abi_cli/cli/new/project.py,sha256=rqM7peahVhqdteo8HjWm-ZQW30LfVYYPfuZV2Y2tR2g,1966
+naas_abi_cli/cli/new/project.py,sha256=V6FW7FW9lZSkR4waOICk_xw7YzYq5c1FUe9sHEqApGU,2126
+naas_abi_cli/cli/new/templates/module/__init__.py,sha256=RrPtAs9r4Kf6ZUNkrA2P9BAmQftVZYnid5hZrT7A6wE,912
+naas_abi_cli/cli/new/templates/module/agents/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+naas_abi_cli/cli/new/templates/module/agents/{{module_name_pascal}}Agent.py,sha256=2R0rzjD5YOuIRVzSA_2bSioOniiJOqWcnUWNoZ3DJS8,1323
+naas_abi_cli/cli/new/templates/module/orchestrations/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+naas_abi_cli/cli/new/templates/module/pipelines/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+naas_abi_cli/cli/new/templates/module/workflows/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=fvQumyCVeMfVWssZrK6movGnVE4q1Wnh2su3URRl8k8,409
+naas_abi_cli/cli/new/templates/project/pyproject.toml,sha256=9MHoNOtG2DkS4LE1GZwBFF6Frw4gsl-hb5Mojba0AUM,540
 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=RrPtAs9r4Kf6ZUNkrA2P9BAmQftVZYnid5hZrT7A6wE,912
-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}}/agents/{{project_name_pascal}}Agent.py,sha256=AAbYlAmmp8zC6Tp5WVelvHSMUYYgJCEko4zAhkGUaAg,1328
-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=Y57Qzz_yt8tfHbtDqGCSQxOkwnLgF4eoGOWOq66xSA8,1877
 naas_abi_cli/cli/new/templates/project/config.yaml,sha256=iQAAO6N3xO7iszG33vbSAljO11Pcf4KOvW3N-avJrsQ,1610
-naas_abi_cli-1.6.0.dist-info/METADATA,sha256=xZnpMmt1NfX0MZHPAkGpmPWp0bIQm1l2EKUcaGCtmmc,7371
-naas_abi_cli-1.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-naas_abi_cli-1.6.0.dist-info/entry_points.txt,sha256=ufNXhYVU3uo5dcZ8e1kdEJv1oh2Vons7LHJPg35cP4w,46
-naas_abi_cli-1.6.0.dist-info/RECORD,,
+naas_abi_cli-1.7.0.dist-info/METADATA,sha256=FqG1WZQ3z1EB3ZA6SgV4nDcLNXo8hOKr5gqrLhdRkmI,7371
+naas_abi_cli-1.7.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naas_abi_cli-1.7.0.dist-info/entry_points.txt,sha256=ufNXhYVU3uo5dcZ8e1kdEJv1oh2Vons7LHJPg35cP4w,46
+naas_abi_cli-1.7.0.dist-info/RECORD,,