naas-abi-core 1.1.3.dev1__tar.gz → 1.2.0__tar.gz

naas_abi_core-1.2.0/=0.9.13

@@ -0,0 +1,6 @@
+Collecting uv
+  Downloading uv-0.9.18-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (11 kB)
+Downloading uv-0.9.18-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (22.2 MB)
+   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 22.2/22.2 MB 185.4 MB/s  0:00:00
+Installing collected packages: uv
+Successfully installed uv-0.9.18

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/CHANGELOG.md

@@ -2,12 +2,31 @@
 
 <!-- version list -->
 
-## v1.1.3-dev.1 (2025-12-08)
+## v1.2.0 (2025-12-19)
 
 ### Bug Fixes
 
-- Linting errors
-  ([`fe8c0a4`](https://github.com/jupyter-naas/abi/commit/fe8c0a4b8969bf70eb5aebe83e060a4771298638))
+- Inject naas_abi_core.modules.templatablesparqlquery by default
+  ([`b6dc785`](https://github.com/jupyter-naas/abi/commit/b6dc78519e71afb46dd2ffc401539fab19fb865f))
+
+- Review
+  ([`6301a5f`](https://github.com/jupyter-naas/abi/commit/6301a5fcda63875b2748a625727903f236772966))
+
+- Review
+  ([`1ad319b`](https://github.com/jupyter-naas/abi/commit/1ad319ba2e47463ab84cabf7edbd2b721b053e3b))
+
+### Chores
+
+- Remove comments
+  ([`05868ff`](https://github.com/jupyter-naas/abi/commit/05868ff0c60ccb3e7da46cdd8903d207622d5e8c))
+
+- Remove duplicate logger
+  ([`8438450`](https://github.com/jupyter-naas/abi/commit/84384505a88b9645e56628b39bfda8da054792cc))
+
+### Features
+
+- Workin on naas-abi-cli
+  ([`16cd62d`](https://github.com/jupyter-naas/abi/commit/16cd62d77879d94c83fae9218bd451c1909554e4))
 
 
 ## v1.1.2 (2025-12-05)

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.1.3.dev1
+Version: 1.2.0
 Summary: Abi framework 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_core-1.1.3.dev1 → naas_abi_core-1.2.0}/naas_abi_core/engine/engine_configuration/EngineConfiguration.py

@@ -1,4 +1,5 @@
 import os
+import sys
 from io import StringIO
 from typing import List
 
@@ -22,7 +23,8 @@ from naas_abi_core.engine.engine_configuration.EngineConfiguration_VectorStoreSe
 )
 from naas_abi_core.services.secret.Secret import Secret
 from pydantic import BaseModel, model_validator
-from typing_extensions import Literal
+from rich.prompt import Prompt
+from typing_extensions import Literal, Self
 
 
 class ServicesConfiguration(BaseModel):
@@ -92,6 +94,25 @@ class EngineConfiguration(BaseModel):
 
     modules: List[ModuleConfig]
 
+    def ensure_default_modules(self) -> None:
+        if not any(
+            m.path == "naas_abi_core.modules.templatablesparqlquery"
+            or m.module == "naas_abi_core.modules.templatablesparqlquery"
+            for m in self.modules
+        ):
+            self.modules.append(
+                ModuleConfig(
+                    module="naas_abi_core.modules.templatablesparqlquery",
+                    enabled=True,
+                    config={},
+                )
+            )
+
+    @model_validator(mode="after")
+    def validate_modules(self) -> Self:
+        self.ensure_default_modules()
+        return self
+
     @classmethod
     def from_yaml(cls, yaml_path: str) -> "EngineConfiguration":
         with open(yaml_path, "r") as file:
@@ -111,7 +132,16 @@ class EngineConfiguration(BaseModel):
                     return 0
                 secret = self.secret_service.get(name)
                 if secret is None:
-                    raise ValueError(f"Secret {name} not found")
+                    if not sys.stdin.isatty():
+                        raise ValueError(
+                            f"Secret '{name}' not found and no TTY available to prompt. Please provide it via the configured secret service or environment."
+                        )
+                    value = Prompt.ask(
+                        f"[bold yellow]Secret '{name}' not found.[/bold yellow] Please enter the value for [cyan]{name}[/cyan]",
+                        password=False,
+                    )
+                    self.secret_service.set(name, value)
+                    return value
                 return secret
 
             def get(self, key, default=None):

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/naas_abi_core/models/OpenRouter.py

@@ -1,8 +1,11 @@
 import os
+
+# from dotenv import load_dotenv
 from langchain_openai import ChatOpenAI  # using the OpenAI LLM class as wrapper
 from pydantic import SecretStr
-from dotenv import load_dotenv
-load_dotenv()
+
+# load_dotenv()
+
 
 class ChatOpenRouter(ChatOpenAI):
     def __init__(self, model_name: str, **kwargs):

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/naas_abi_core/module/ModuleAgentLoader.py

@@ -23,6 +23,7 @@ class ModuleAgentLoader:
                     agent_module_path = (
                         f"{class_.__module__}.agents.{file.replace('.py', '')}"
                     )
+                    logger.debug(f"Importing agent module from {agent_module_path}")
                     agent_module = importlib.import_module(agent_module_path)
                     for key, value in agent_module.__dict__.items():
                         if (

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/naas_abi_core/services/agent/IntentAgent.py

@@ -13,6 +13,7 @@ from langgraph.graph.message import MessagesState
 from langgraph.types import Command
 from naas_abi_core import logger
 from naas_abi_core.models.Model import ChatModel
+from spacy.cli import download as spacy_download
 
 from .Agent import Agent, AgentConfiguration, AgentSharedState, create_checkpointer
 from .beta.IntentMapper import Intent, IntentMapper, IntentScope, IntentType
@@ -23,7 +24,14 @@ _nlp = None
 def get_nlp():
     global _nlp
     if _nlp is None:
-        _nlp = spacy.load("en_core_web_sm")
+        try:
+            _nlp = spacy.load("en_core_web_sm")
+        except OSError:
+            logger.warning(
+                "Downloading spacy model en_core_web_sm as it is not installed. This is a one time operation and can take a few seconds to complete based on your internet connection speed."
+            )
+            spacy_download("en_core_web_sm")
+            _nlp = spacy.load("en_core_web_sm")
     return _nlp
 
 

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/naas_abi_core/services/agent/beta/Embeddings.py

@@ -2,13 +2,14 @@ import hashlib
 import os
 
 import requests
-from dotenv import load_dotenv
+
+# from dotenv import load_dotenv
 from naas_abi_core.services.cache.CacheFactory import CacheFactory
 from naas_abi_core.services.cache.CachePort import DataType
 from pydantic import SecretStr
 from tqdm import tqdm
 
-load_dotenv()
+# load_dotenv()
 
 
 cache = CacheFactory.CacheFS_find_storage(subpath="intent_mapping")

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/naas_abi_core/services/agent/beta/IntentMapper.py

@@ -3,16 +3,17 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import Any, Optional, Tuple
 
-from dotenv import load_dotenv
+# from dotenv import load_dotenv
 from langchain_openai import ChatOpenAI
 from pydantic import SecretStr
 
-from .Embeddings import EMBEDDINGS_MODELS_DIMENSIONS_MAP, embeddings_batch
+from .Embeddings import EMBEDDINGS_MODELS_DIMENSIONS_MAP
 from .Embeddings import _model_name as embeddings_model_name
 from .Embeddings import embeddings as embeddings
+from .Embeddings import embeddings_batch
 from .VectorStore import VectorStore
 
-load_dotenv()
+# load_dotenv()
 
 
 class IntentScope(Enum):

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/naas_abi_core/services/secret/adaptors/secondary/dotenv_secret_secondaryadaptor.py

@@ -1,12 +1,15 @@
 import os
 from typing import Any, Dict
 
-from dotenv import dotenv_values, set_key
+from dotenv import dotenv_values, find_dotenv, set_key
 from naas_abi_core.services.secret.SecretPorts import ISecretAdapter
+from naas_abi_core.utils.Logger import logger
 
 
 class DotenvSecretSecondaryAdaptor(ISecretAdapter):
     def __init__(self):
+        logger.debug(f"dotenv is using the file: {find_dotenv()}")
+
         self.secrets = dotenv_values()
 
     def get(self, key: str, default: Any = None) -> str:

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/naas_abi_core/utils/Logger.py

@@ -9,4 +9,4 @@ def reconfigure(level: str = "DEBUG"):
     logger.add(sys.stderr, level=level)
 
 
-reconfigure(os.environ.get("LOG_LEVEL", "ERROR"))
+reconfigure(os.environ.get("LOG_LEVEL", "WARNING"))

{naas_abi_core-1.1.3.dev1 → naas_abi_core-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "naas-abi-core"
-version = "1.1.3-dev.1"
+version = "1.2.0"
 description = "Abi framework allowing you to build your AI system."
 authors = [{ name = "Maxime Jublou", email = "maxime@naas.ai" },{ name = "Florent Ravenel", email = "florent@naas.ai" }, { name = "Jeremy Ravenel", email = "jeremy@naas.ai" }]
 requires-python = ">=3.10,<4"
@@ -56,7 +56,6 @@ openrouter = [
     "langchain-openai>=0.3.35",
 ]
 [project.scripts]
-abi = "naas_abi_core.cli:main"
 onto2py = "naas_abi_core.utils.onto2py.__main__:main"
 
 [build-system]

naas_abi_core-1.1.3.dev1/=0.9.13

@@ -1,6 +0,0 @@
-Collecting uv
-  Downloading uv-0.9.16-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl.metadata (11 kB)
-Downloading uv-0.9.16-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl (22.0 MB)
-   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 22.0/22.0 MB 73.1 MB/s  0:00:00
-Installing collected packages: uv
-Successfully installed uv-0.9.16

naas_abi_core-1.1.3.dev1/naas_abi_core/cli/__init__.py

@@ -1,54 +0,0 @@
-import click
-
-from .agent import agent
-from .chat import chat
-from .config import config
-from .init import init
-from .module import module
-from .new import new
-from .secret import secrets
-from .deploy import deploy
-# from dotenv import load_dotenv
-
-# load_dotenv()
-
-
-@click.group("abi")
-def main():
-    pass
-
-
-# @main.command("chat")
-# @click.option("--module-name", type=str, required=True, default="chatgpt")
-# @click.option("--agent-name", type=str, required=True, default="ChatGPTAgent")
-# def chat(module_name: str, agent_name: str):
-#     from naas_abi_core.engine.Engine import Engine
-
-#     engine = Engine()
-#     engine.load(module_names=[module_name])
-
-#     from naas_abi_core.apps.terminal_agent.main import run_agent
-
-#     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
-
-
-# Add the secrets group to the main abi group
-
-
-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)
-
-# if __name__ == "__main__":
-main()

naas_abi_core-1.1.3.dev1/naas_abi_core/cli/agent.py

@@ -1,30 +0,0 @@
-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_core-1.1.3.dev1/naas_abi_core/cli/chat.py

@@ -1,26 +0,0 @@
-import click
-
-from naas_abi_core import logger
-
-
-@click.command("chat")
-@click.argument("module-name", type=str, required=True, default="naas_abi")
-@click.argument("agent-name", type=str, required=True, default="AbiAgent")
-def chat(module_name: str, agent_name: str):
-    from naas_abi_core.engine.Engine import Engine
-
-    engine = Engine()
-    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_core-1.1.3.dev1/naas_abi_core/cli/config.py

@@ -1,49 +0,0 @@
-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_core-1.1.3.dev1/naas_abi_core/cli/deploy.py

@@ -1,209 +0,0 @@
-import subprocess
-from uuid import uuid4
-
-import click
-import requests
-from pydantic import BaseModel
-from rich.console import Console
-from rich.markdown import Markdown
-
-from naas_abi_core import logger
-from naas_abi_core.engine.engine_configuration.EngineConfiguration import (
-    EngineConfiguration,
-)
-
-
-@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)
-
-        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
-    configuration: EngineConfiguration
-
-    def __init__(self, configuration: EngineConfiguration):
-        self.configuration = configuration
-        self.image_name = str(uuid4())
-        assert configuration.deploy is not None
-        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 env_list_to_dict(self, env: list[str]) -> dict:
-        return {env_var.split("=", 1)[0]: env_var.split("=", 1)[1] for env_var in env}
-
-    def deploy(self, env: list[str]):
-        if self.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 ValueError(
-                "Deploy configuration not found in the yaml configuration file. Please add a deploy section to the configuration file."
-            )
-
-        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")
-        )
-
-        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.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),
-                    )
-                ],
-            )
-        )
-
-        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",
-    multiple=True,
-    help="Environment variables to set (e.g. -e FOO=BAR -e BAZ=QUX)",
-)
-def naas(env: list[str]):
-    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."
-        )
-
-    deployer = NaasDeployer(configuration)
-    deployer.deploy(env)

naas_abi_core-1.1.3.dev1/naas_abi_core/cli/init.py

@@ -1,13 +0,0 @@
-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_core-1.1.3.dev1/naas_abi_core/cli/module.py

@@ -1,28 +0,0 @@
-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_core-1.1.3.dev1/naas_abi_core/cli/new.py

@@ -1,13 +0,0 @@
-import click
-
-
-@click.group("new")
-def new():
-    pass
-
-
-@new.command("module")
-@click.argument("module-name")
-@click.argument("module-path")
-def new_module(module_name: str, module_path: str):
-    print(f"Creating a new module: {module_name} at {module_path}")

naas_abi_core-1.1.3.dev1/naas_abi_core/cli/secret.py

@@ -1,79 +0,0 @@
-import os
-
-import click
-
-
-@click.group("secrets")
-def secrets():
-    pass
-
-
-@secrets.group("naas")
-def naas():
-    pass
-
-
-@naas.command("push-env-as-base64")
-@click.option(
-    "--naas-api-key", type=str, required=True, default=os.getenv("NAAS_API_KEY")
-)
-@click.option("--naas-api-url", type=str, required=True, default="https://api.naas.ai")
-@click.option("--naas-secret-name", type=str, required=True, default="abi_secrets")
-@click.option("--env-file", type=str, required=True, default=".env.prod")
-def push_env_to_naas(naas_api_key, naas_api_url, naas_secret_name, env_file):
-    import base64
-
-    from naas_abi_core.services.secret.adaptors.secondary.NaasSecret import NaasSecret
-
-    naas_secret = NaasSecret(naas_api_key, naas_api_url)
-
-    envfile_content = ""
-
-    with open(env_file, "r") as envfile:
-        envfile_content = envfile.read()
-
-    print(envfile_content)
-
-    base64_content = base64.b64encode(envfile_content.encode("utf-8")).decode("utf-8")
-    naas_secret.set(naas_secret_name, base64_content)
-
-    print(f"Pushed {env_file} to Naas as base64 secret {naas_secret_name}")
-
-
-@naas.command("list")
-@click.option(
-    "--naas-api-key", type=str, required=True, default=os.getenv("NAAS_API_KEY")
-)
-@click.option("--naas-api-url", type=str, required=True, default="https://api.naas.ai")
-def list_secrets(naas_api_key, naas_api_url):
-    from naas_abi_core.services.secret.adaptors.secondary.NaasSecret import NaasSecret
-
-    naas_secret = NaasSecret(naas_api_key, naas_api_url)
-
-    naas_secret.list()
-
-    for key, value in naas_secret.list().items():
-        print(f"{key}: {value}")
-
-
-@naas.command("get-base64-env")
-@click.option(
-    "--naas-api-key", type=str, required=True, default=os.getenv("NAAS_API_KEY")
-)
-@click.option("--naas-api-url", type=str, required=True, default="https://api.naas.ai")
-@click.option("--naas-secret-name", type=str, required=True, default="abi_secrets")
-def get_secret(naas_api_key, naas_api_url, naas_secret_name):
-    from naas_abi_core.services.secret.adaptors.secondary.Base64Secret import (
-        Base64Secret,
-    )
-    from naas_abi_core.services.secret.adaptors.secondary.NaasSecret import NaasSecret
-
-    naas_secret = NaasSecret(naas_api_key, naas_api_url)
-    base64_secret = Base64Secret(naas_secret, naas_secret_name)
-
-    for key, value in base64_secret.list().items():
-        # If value is multiline
-        if "\n" in value:
-            print(f'{key}="{value}"')
-        else:
-            print(f"{key}={value}")