naas-abi-core 1.1.2__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.2 → naas_abi_core-1.2.0}/CHANGELOG.md

@@ -2,6 +2,33 @@
 
 <!-- version list -->
 
+## v1.2.0 (2025-12-19)
+
+### Bug Fixes
+
+- 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)
 
 ### Bug Fixes

{naas_abi_core-1.1.2 → naas_abi_core-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.1.2
+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.2 → naas_abi_core-1.2.0}/naas_abi_core/engine/engine_configuration/EngineConfiguration.py

@@ -1,10 +1,14 @@
 import os
+import sys
 from io import StringIO
 from typing import List
 
 import yaml
 from jinja2 import Template
 from naas_abi_core import logger
+from naas_abi_core.engine.engine_configuration.EngineConfiguration_Deploy import (
+    DeployConfiguration,
+)
 from naas_abi_core.engine.engine_configuration.EngineConfiguration_ObjectStorageService import (
     ObjectStorageServiceConfiguration,
 )
@@ -19,8 +23,9 @@ 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 naas_abi_core.engine.engine_configuration.EngineConfiguration_Deploy import DeployConfiguration
+from rich.prompt import Prompt
+from typing_extensions import Literal, Self
+
 
 class ServicesConfiguration(BaseModel):
     object_storage: ObjectStorageServiceConfiguration
@@ -80,7 +85,7 @@ class GlobalConfig(BaseModel):
 
 class EngineConfiguration(BaseModel):
     api: ApiConfiguration
-    
+
     deploy: DeployConfiguration | None = None
 
     services: ServicesConfiguration
@@ -89,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:
@@ -108,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.2 → naas_abi_core-1.2.0}/naas_abi_core/engine/engine_configuration/EngineConfiguration_TripleStoreService.py

@@ -20,11 +20,29 @@ if TYPE_CHECKING:
 
 
 class OxigraphAdapterConfiguration(BaseModel):
+    """Oxigraph adapter configuration.
+
+    triple_store_adapter:
+      adapter: "oxigraph"
+      config:
+        oxigraph_url: "http://localhost:7878"
+        timeout: 60
+    """
     oxigraph_url: str = "http://localhost:7878"
     timeout: int = 60
 
 
 class AWSNeptuneAdapterConfiguration(BaseModel):
+    """AWS Neptune adapter configuration.
+
+    triple_store_adapter:
+      adapter: "aws_neptune"
+      config:
+        aws_region_name: "eu-west-3"
+        aws_access_key_id: "{{ secret.AWS_ACCESS_KEY_ID }}"
+        aws_secret_access_key: "{{ secret.AWS_SECRET_ACCESS_KEY }}"
+        db_instance_identifier: "{{ secret.DB_INSTANCE_IDENTIFIER }}"
+    """
     aws_region_name: str
     aws_access_key_id: str
     aws_secret_access_key: str
@@ -32,6 +50,20 @@ class AWSNeptuneAdapterConfiguration(BaseModel):
 
 
 class AWSNeptuneSSHTunnelAdapterConfiguration(AWSNeptuneAdapterConfiguration):
+    """AWS Neptune SSH tunnel adapter configuration.
+
+    triple_store_adapter:
+      adapter: "aws_neptune_sshtunnel"
+      config:
+        aws_region_name: "eu-west-3"
+        aws_access_key_id: "{{ secret.AWS_ACCESS_KEY_ID }}"
+        aws_secret_access_key: "{{ secret.AWS_SECRET_ACCESS_KEY }}"
+        db_instance_identifier: "{{ secret.DB_INSTANCE_IDENTIFIER }}"   
+        bastion_host: "bastion.example.com"
+        bastion_port: 22
+        bastion_user: "ubuntu"
+        bastion_private_key: "{{ secret.BASTION_PRIVATE_KEY }}"
+    """
     bastion_host: str
     bastion_port: int
     bastion_user: str
@@ -39,11 +71,27 @@ class AWSNeptuneSSHTunnelAdapterConfiguration(AWSNeptuneAdapterConfiguration):
 
 
 class TripleStoreAdapterFilesystemConfiguration(BaseModel):
+    """Filesystem adapter configuration.
+
+    triple_store_adapter:
+      adapter: "fs"
+      config:
+        store_path: "storage/triplestore"
+        triples_path: "triples"
+    """
     store_path: str
     triples_path: str = "triples"
 
 
 class TripleStoreAdapterObjectStorageConfiguration(BaseModel):
+    """Object storage adapter configuration.
+
+    triple_store_adapter:
+      adapter: "object_storage"
+      config:
+        object_storage_service: *object_storage_service
+        triples_prefix: "triples"
+    """
     object_storage_service: ObjectStorageServiceConfiguration
     triples_prefix: str = "triples"
 

{naas_abi_core-1.1.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → 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.2 → naas_abi_core-1.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "naas-abi-core"
-version = "1.1.2"
+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.2/=0.9.13

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

naas_abi_core-1.1.2/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.2/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.2/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.2/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))