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

naas_abi_cli/cli/new/module.py

@@ -5,10 +5,7 @@ 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()
+from .utils import to_kebab_case, to_pascal_case, to_snake_case
 
 
 @new.command("module")
@@ -18,13 +15,13 @@ 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)
+def new_module(module_name: str, module_path: str = ".", quiet: bool = False):
+    module_name = to_kebab_case(module_name)
 
     if module_path == ".":
-        module_path = os.path.join(os.getcwd(), module_name)
+        module_path = os.path.join(os.getcwd(), to_snake_case(module_name))
     else:
-        module_path = os.path.join(module_path, module_name)
+        module_path = os.path.join(module_path, to_snake_case(module_name))
 
     if not os.path.exists(module_path):
         os.makedirs(module_path, exist_ok=True)
@@ -42,7 +39,14 @@ def new_module(module_name: str, module_path: str = "."):
     copier.copy(
         values={
             "module_name": module_name,
-            "module_name_snake": module_name.replace("-", "_"),
-            "module_name_pascal": module_name.replace("-", "").capitalize(),
+            "module_name_snake": to_snake_case(module_name),
+            "module_name_pascal": to_pascal_case(module_name),
         }
     )
+
+    if not quiet:
+        print(f"\nModule '{module_name}' has been created at:\n  {module_path}\n")
+        print("To enable this module, add the following to your config.yaml:\n")
+        print("modules:")
+        print(f"  - path: {module_path}")
+        print("    enabled: true\n")

naas_abi_cli/cli/new/project.py

@@ -7,12 +7,14 @@ from naas_abi_cli.cli.utils.Copier import Copier
 
 from .module import new_module
 from .new import new
+from .utils import to_kebab_case, to_pascal_case, to_snake_case
 
 
 @new.command("project")
 @click.argument("project-name", required=False, default=None)
 @click.argument("project-path", required=False, default=None)
 def new_project(project_name: str | None, project_path: str | None):
+    project_name = to_kebab_case(project_name)
     # Defaults must be evaluated at runtime so they reflect the caller's CWD.
     if project_name is None:
         project_name = os.path.basename(os.getcwd())
@@ -40,13 +42,13 @@ def new_project(project_name: str | None, project_path: str | None):
     copier.copy(
         values={
             "project_name": project_name,
-            "project_name_snake": project_name.replace("-", "_"),
-            "project_name_pascal": project_name.replace("-", "").capitalize(),
+            "project_name_snake": to_snake_case(project_name),
+            "project_name_pascal": to_pascal_case(project_name),
         }
     )
 
     # Calling new_module to create the module in the src folder
-    new_module(project_name, os.path.join(project_path, "src"))
+    new_module(project_name, os.path.join(project_path, "src"), quiet=True)
 
     # Run dependency install without shell to avoid quoting issues on paths with spaces.
     subprocess.run(

naas_abi_cli/cli/new/templates/module/agents/{{module_name_pascal}}Agent.py

@@ -6,10 +6,10 @@ from naas_abi_core.services.agent.Agent import (
     AgentSharedState,
 )
 
-NAME = "{{module_name_snake}} Agent"
+NAME = "{{module_name_pascal}}Agent"
 DESCRIPTION = "An helpful agent that can help you with your tasks."
 SYSTEM_PROMPT = """
-You are {{module_name_snake}} Agent.
+You are {{module_name_pascal}}Agent.
 """
 
 

naas_abi_cli/cli/new/utils.py

@@ -0,0 +1,13 @@
+import re
+
+
+def to_pascal_case(text):
+    return "".join(word.capitalize() for word in re.findall(r"[A-Za-z0-9]+", text))
+
+
+def to_snake_case(text):
+    return "_".join(word.lower() for word in re.findall(r"[A-Za-z0-9]+", text))
+
+
+def to_kebab_case(text):
+    return "-".join(word.lower() for word in re.findall(r"[A-Za-z0-9]+", text))

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

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

@@ -9,12 +9,13 @@ 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=a3lKkMcgX1mkDFQBhvg3cORcjZYP9RLrNclwznnzfR4,1383
+naas_abi_cli/cli/new/module.py,sha256=X4n9VId4wm5HcMNb5iO9dOuXxFYxlIqSEh2tYlCefbA,1642
 naas_abi_cli/cli/new/new.py,sha256=sfNmeoNZLGhjKRKSHuwEl1vtuxWR_SII0qOo9BVoEwY,55
-naas_abi_cli/cli/new/project.py,sha256=V6FW7FW9lZSkR4waOICk_xw7YzYq5c1FUe9sHEqApGU,2126
+naas_abi_cli/cli/new/project.py,sha256=YSxBgJdMVYqWHGwXs9gxRMKA5Q6uRPPaJ_G5UJ4q5_4,2232
+naas_abi_cli/cli/new/utils.py,sha256=E8ICN4Z8gYYS-Z4nOLld8sY8lHWs6yXFm5lePq9ICFs,336
 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/agents/{{module_name_pascal}}Agent.py,sha256=Swgms8NI2DFAelf484mu0vNqfmT5NB9DKBtq6Ny-D1s,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
@@ -26,7 +27,7 @@ naas_abi_cli/cli/new/templates/project/.github/workflows/release.yaml,sha256=7uV
 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.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,,
+naas_abi_cli-1.8.1.dist-info/METADATA,sha256=joklmI_ft2VCn5EWg7cyoYno7luOKWYi3YXf-L9LvGM,7371
+naas_abi_cli-1.8.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naas_abi_cli-1.8.1.dist-info/entry_points.txt,sha256=ufNXhYVU3uo5dcZ8e1kdEJv1oh2Vons7LHJPg35cP4w,46
+naas_abi_cli-1.8.1.dist-info/RECORD,,