naas-abi-cli 1.8.0__py3-none-any.whl

naas_abi_cli/cli/__init__.py

@@ -0,0 +1,65 @@
+import os
+import subprocess
+import sys
+
+import click
+
+from .agent import agent
+from .chat import chat
+from .config import config
+from .deploy import deploy
+from .init import init
+from .module import module
+from .new import new
+from .run import run
+from .secret import secrets
+
+
+@click.group("abi")
+def _main():
+    pass
+
+
+_main.add_command(secrets)
+_main.add_command(config)
+_main.add_command(module)
+_main.add_command(agent)
+_main.add_command(chat)
+_main.add_command(new)
+_main.add_command(init)
+_main.add_command(deploy)
+_main.add_command(run)
+
+ran = False
+
+
+def main():
+    global ran
+    if ran:
+        return
+    ran = True
+
+    # Check how the project is being runned.
+    if os.getenv("LOCAL_UV_RAN") is None:
+        if "pyproject.toml" in os.listdir(os.getcwd()):
+            with open("pyproject.toml", "r") as file:
+                if "naas-abi-cli" in file.read():
+                    arguments = (
+                        "uv run --active python -m naas_abi_cli.cli".split(" ")
+                        + sys.argv[1:]
+                    )
+                    try:
+                        subprocess.run(
+                            arguments,
+                            cwd=os.getcwd(),
+                            env={**os.environ, "LOCAL_UV_RAN": "true"},
+                            check=True,
+                        )
+                    except Exception:
+                        pass
+
+                    return
+    _main()
+
+
+main()

naas_abi_cli/cli/agent.py

@@ -0,0 +1,30 @@
+import click
+from rich.console import Console
+from rich.table import Table
+
+from naas_abi_core.engine.Engine import Engine
+
+
+@click.group("agent")
+def agent():
+    pass
+
+
+@agent.command("list")
+def list():
+    engine = Engine()
+    engine.load()
+
+    console = Console()
+    table = Table(
+        title="Available Agents", show_header=True, header_style="bold magenta"
+    )
+    table.add_column("Module", style="cyan", no_wrap=True)
+    table.add_column("Agent", style="green")
+
+    modules = engine.modules
+    for module in modules:
+        for agent in modules[module].agents:
+            table.add_row(module, agent.__name__)
+
+    console.print(table)

naas_abi_cli/cli/chat.py

@@ -0,0 +1,29 @@
+import click
+from naas_abi_core import logger
+
+
+@click.command("chat")
+@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 == "" and agent_name == "":
+        module_name, agent_name = engine.configuration.default_agent.split(" ")
+
+    engine.load(module_names=[module_name])
+
+    from naas_abi_core.apps.terminal_agent.main import run_agent
+
+    if module_name not in engine.modules:
+        raise ValueError(f"Module {module_name} not found")
+
+    logger.debug(f"Module agents: {engine.modules[module_name].agents}")
+
+    for agent_class in engine.modules[module_name].agents:
+        logger.debug(f"Agent class: {agent_class.__name__}")
+        if agent_class.__name__ == agent_name:
+            run_agent(agent_class.New())
+            break

naas_abi_cli/cli/config.py

@@ -0,0 +1,49 @@
+import os
+
+import click
+import yaml
+
+from naas_abi_core.engine.engine_configuration.EngineConfiguration import (
+    EngineConfiguration,
+)
+
+
+@click.group("config")
+def config():
+    pass
+
+
+@config.command("validate")
+@click.option("--configuration-file", type=str, required=False, default=None)
+def validate(configuration_file: str | None):
+    configuration_content: str | None = None
+
+    if configuration_file is not None:
+        if not os.path.exists(configuration_file):
+            raise FileNotFoundError(
+                f"Configuration file {configuration_file} not found"
+            )
+        with open(configuration_file, "r") as file:
+            configuration_content = file.read()
+
+    EngineConfiguration.load_configuration(configuration_content)
+    print("Configuration is valid")
+
+
+@config.command("render")
+@click.option("--configuration-file", type=str, required=False, default=None)
+def render(configuration_file: str | None):
+    configuration_content: str | None = None
+
+    if configuration_file is not None:
+        if not os.path.exists(configuration_file):
+            raise FileNotFoundError(
+                f"Configuration file {configuration_file} not found"
+            )
+        with open(configuration_file, "r") as file:
+            configuration_content = file.read()
+
+    configuration: EngineConfiguration = EngineConfiguration.load_configuration(
+        configuration_content
+    )
+    print(yaml.dump(configuration.model_dump(), indent=2))

naas_abi_cli/cli/deploy.py

@@ -0,0 +1,212 @@
+import os
+import subprocess
+from uuid import uuid4
+
+import click
+import requests
+from naas_abi_core import logger
+from naas_abi_core.engine.engine_configuration.EngineConfiguration import (
+    EngineConfiguration,
+)
+from pydantic import BaseModel
+from rich.console import Console
+from rich.markdown import Markdown
+
+
+@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)
+        elif response.status_code == 402:
+            raise click.ClickException(
+                "You must have an active subscription to create a space on naas.ai."
+            )
+
+        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())
+        if configuration.deploy is None:
+            # Fail fast with a clear, user-facing error instead of an assertion.
+            raise click.ClickException(
+                "Deploy configuration is missing; please add a deploy section before running this command."
+            )
+        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 deploy(self):
+        assert self.configuration.deploy is not None
+        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")
+        )
+
+        if image_sha is None or image_sha == "":
+            raise click.ClickException(
+                "Failed to get image SHA. Please check if the image is correctly built and pushed to the registry."
+            )
+
+        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.configuration.deploy.env,
+                    )
+                ],
+            )
+        )
+
+        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
+
+                                 """)
+        )
+
+
+@deploy.command("naas")
+@click.option(
+    "-e",
+    "--env",
+    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: 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:
+        logger.error(
+            "Deploy configuration not found in the yaml configuration file. Please add a deploy section to the configuration file."
+        )
+        raise click.ClickException("Missing deploy configuration; aborting.")
+
+    deployer = NaasDeployer(configuration)
+    deployer.deploy()

naas_abi_cli/cli/init.py

@@ -0,0 +1,13 @@
+import os
+
+import click
+
+
+@click.command("init")
+@click.argument("path")
+def init(path: str):
+    if path == ".":
+        path = os.getcwd()
+
+    os.makedirs(path, exist_ok=True)
+    # os.exec(f"cd {path} && uv init .")

naas_abi_cli/cli/module.py

@@ -0,0 +1,28 @@
+import click
+from naas_abi_core.engine.engine_configuration.EngineConfiguration import (
+    EngineConfiguration,
+)
+from rich.console import Console
+from rich.table import Table
+
+
+@click.group("module")
+def module():
+    pass
+
+
+@module.command("list")
+def list() -> None:
+    configuration: EngineConfiguration = EngineConfiguration.load_configuration()
+
+    console = Console()
+    table = Table(
+        title="Available Modules", show_header=True, header_style="bold magenta"
+    )
+    table.add_column("Module", style="cyan", no_wrap=True)
+    table.add_column("Enabled", style="green")
+
+    for module in configuration.modules:
+        table.add_row(module.module, str(module.enabled))
+
+    console.print(table)

naas_abi_cli/cli/new/__init__.py

@@ -0,0 +1,4 @@
+import naas_abi_cli.cli.new.module as module  # noqa: F401
+import naas_abi_cli.cli.new.project as project  # noqa: F401
+
+from .new import new  # noqa: F401

naas_abi_cli/cli/new/module.py

@@ -0,0 +1,55 @@
+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", 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 = ".", quiet: bool = False):
+    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(),
+        }
+    )
+
+    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/new.py

@@ -0,0 +1,6 @@
+import click
+
+
+@click.group("new")
+def new():
+    pass

naas_abi_cli/cli/new/project.py

@@ -0,0 +1,63 @@
+import os
+import subprocess
+
+import click
+import naas_abi_cli
+from naas_abi_cli.cli.utils.Copier import Copier
+
+from .module import new_module
+from .new import new
+
+
+@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):
+    # 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())
+    if project_path is None:
+        project_path = os.getcwd()
+    # Resolve relative segments (., ..) and user home (~) to a normalized absolute path.
+    project_path = os.path.abspath(os.path.expanduser(project_path))
+
+    # 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)
+
+    if not os.path.exists(project_path):
+        os.makedirs(project_path, exist_ok=True)
+    elif len(os.listdir(project_path)) > 0:
+        print(f"Folder {project_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/project"
+        ),
+        destination_path=project_path,
+    )
+    copier.copy(
+        values={
+            "project_name": project_name,
+            "project_name_snake": project_name.replace("-", "_"),
+            "project_name_pascal": project_name.replace("-", "").capitalize(),
+        }
+    )
+
+    # Calling new_module to create the module in the src folder
+    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(
+        [
+            "uv",
+            "add",
+            "naas-abi-core[all]",
+            "naas-abi-marketplace[ai-chatgpt]",
+            "naas-abi",
+            "naas-abi-cli",
+        ],
+        cwd=project_path,
+        check=True,
+    )

naas_abi_cli/cli/new/templates/module/__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/module/agents/{{module_name_pascal}}Agent.py

@@ -0,0 +1,52 @@
+from typing import Optional
+
+from naas_abi_core.services.agent.Agent import (
+    Agent,
+    AgentConfiguration,
+    AgentSharedState,
+)
+
+NAME = "{{module_name_snake}} Agent"
+DESCRIPTION = "An helpful agent that can help you with your tasks."
+SYSTEM_PROMPT = """
+You are {{module_name_snake}} Agent.
+"""
+
+
+def create_agent(
+    agent_shared_state: Optional[AgentSharedState] = None,
+    agent_configuration: Optional[AgentConfiguration] = None,
+) -> Optional[Agent]:
+    #from {{module_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 {{module_name_pascal}}Agent(
+        name=NAME,
+        description=DESCRIPTION,
+        chat_model=model,
+        tools=tools,
+        agents=agents,
+        memory=None,
+        state=agent_shared_state,
+        configuration=agent_configuration,
+    )
+
+
+class {{module_name_pascal}}Agent(Agent):
+    pass

naas_abi_cli/cli/new/templates/project/.github/workflows/release.yaml

@@ -0,0 +1,31 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install dependencies
+        run: |
+            python -m pip install uv
+
+      - name: Deploy
+        env:
+          NAAS_API_KEY: ${{ '{{ secrets.NAAS_API_KEY }}' }}
+          ENV: prod
+        run: |
+            uv sync --no-dev
+            uv run python -m naas_abi_cli.cli deploy naas