naas-abi 1.0.3.dev2__tar.gz → 1.0.4__tar.gz

{naas_abi-1.0.3.dev2 → naas_abi-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi
-Version: 1.0.3.dev2
+Version: 1.0.4
 Summary: Add your description here
 Author-email: Maxime Jublou <maxime@naas.ai>, Florent Ravenel <florent@naas.ai>, Jeremy Ravenel <jeremy@naas.ai>
 Requires-Python: <4,>=3.10

{naas_abi-1.0.3.dev2 → naas_abi-1.0.4}/naas_abi/__init__.py

@@ -15,21 +15,20 @@ class ABIModule(BaseModule):
         modules=[
             "naas_abi_marketplace.ai.chatgpt",
             "naas_abi_marketplace.ai.claude#soft",
-            # "naas_abi_core.modules.templatablesparqlquery",
+            "naas_abi_core.modules.templatablesparqlquery",
         ],
         services=[Secret, TripleStoreService, ObjectStorageService],
     )
 
     class Configuration(ModuleConfiguration):
-        pass
-        # openai_api_key: str | None = None
-        # anthropic_api_key: str | None = None
+        openai_api_key: str
+        anthropic_api_key: str | None = None
 
-    # def on_initialized(self):
-    #     if (
-    #         self.configuration.anthropic_api_key is not None
-    #         and "naas_abi_marketplace.ai.claude" not in self.engine.modules
-    #     ):
-    #         raise ValueError(
-    #             "anthropic_api_key is provided but naas_abi_marketplace.ai.claude is not available"
-    #         )
+    def on_initialized(self):
+        if (
+            self.configuration.anthropic_api_key is not None
+            and "naas_abi_marketplace.ai.claude" not in self.engine.modules
+        ):
+            raise ValueError(
+                "anthropic_api_key is provided but naas_abi_marketplace.ai.claude is not available"
+            )

{naas_abi-1.0.3.dev2 → naas_abi-1.0.4}/naas_abi/agents/AbiAgent.py

@@ -149,19 +149,19 @@ You can browse the data and run queries there."""
 
     tools.append(open_knowledge_graph_explorer)
 
-    # templatable_sparql_query_module = ABIModule.get_instance().engine.modules[
-    #     "naas_abi_core.modules.templatablesparqlquery"
-    # ]
-
-    # agent_recommendation_tools = [
-    #     "find_business_proposal_agents",
-    #     "find_coding_agents",
-    #     "find_math_agents",
-    #     "find_best_value_agents",
-    #     "find_fastest_agents",
-    #     "find_cheapest_agents",
-    # ]
-    # tools.extend(templatable_sparql_query_module.get_tools(agent_recommendation_tools))
+    templatable_sparql_query_module = ABIModule.get_instance().engine.modules[
+        "naas_abi_core.modules.templatablesparqlquery"
+    ]
+
+    agent_recommendation_tools = [
+        "find_business_proposal_agents",
+        "find_coding_agents",
+        "find_math_agents",
+        "find_best_value_agents",
+        "find_fastest_agents",
+        "find_cheapest_agents",
+    ]
+    tools.extend(templatable_sparql_query_module.get_tools(agent_recommendation_tools))
 
     shared_state = agent_shared_state or AgentSharedState(
         thread_id="0", supervisor_agent=NAME

{naas_abi-1.0.3.dev2 → naas_abi-1.0.4}/naas_abi/models/default.py

@@ -5,13 +5,13 @@ from naas_abi_core.models.Model import ChatModel
 
 
 def get_model() -> ChatModel:
-    from naas_abi_marketplace.ai.chatgpt import ABIModule as ChatGPTABIModule
     ai_mode: Literal["cloud", "local", "airgap"] = (
         ABIModule.get_instance().configuration.global_config.ai_mode
     )
     if (
         ai_mode == "airgap"
-        or not ChatGPTABIModule.get_instance().configuration.openai_api_key
+        or not ABIModule.get_instance().configuration.openai_api_key
+        and not ABIModule.get_instance().configuration.openrouter_api_key
     ):
         from naas_abi.models.airgap_qwen import model as airgap_model
 
@@ -22,3 +22,4 @@ def get_model() -> ChatModel:
         )
 
         return cloud_model
+        return cloud_model

naas_abi-1.0.4/naas_abi/models/gpt_4_1.py

@@ -0,0 +1,26 @@
+from langchain_openai import ChatOpenAI
+from naas_abi import ABIModule
+from naas_abi_core.models.Model import ChatModel
+from pydantic import SecretStr
+
+ID = "gpt-4.1"
+NAME = "gpt-4.1"
+DESCRIPTION = "GPT-4.1 excels at instruction following and tool calling, with broad knowledge across domains. It features a 1M token context window, and low latency without a reasoning step."
+IMAGE = "https://naasai-public.s3.eu-west-3.amazonaws.com/abi-demo/ontology_ABI.png"
+CONTEXT_WINDOW = 1047576
+OWNER = "openai"
+
+model: ChatModel = ChatModel(
+    model_id=ID,
+    provider=OWNER,
+    name=NAME,
+    description=DESCRIPTION,
+    image=IMAGE,
+    owner=OWNER,
+    model=ChatOpenAI(
+        model=ID,
+        temperature=0,
+        api_key=SecretStr(ABIModule.get_instance().configuration.openai_api_key),
+    ),
+    context_window=CONTEXT_WINDOW,
+)

{naas_abi-1.0.3.dev2 → naas_abi-1.0.4}/naas_abi/pipelines/RemoveIndividualPipeline.py

@@ -3,7 +3,8 @@ from enum import Enum
 from typing import Annotated, List
 
 from langchain_core.tools import BaseTool, StructuredTool
-from naas_abi import ABIModule, logger
+from naas_abi import ABIModule
+from naas_abi_core import logger
 from naas_abi_core.pipeline import Pipeline, PipelineConfiguration, PipelineParameters
 from naas_abi_core.services.triple_store.TripleStorePorts import ITripleStoreService
 from naas_abi_core.utils.Expose import APIRouter

{naas_abi-1.0.3.dev2 → naas_abi-1.0.4}/naas_abi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi
-Version: 1.0.3.dev2
+Version: 1.0.4
 Summary: Add your description here
 Author-email: Maxime Jublou <maxime@naas.ai>, Florent Ravenel <florent@naas.ai>, Jeremy Ravenel <jeremy@naas.ai>
 Requires-Python: <4,>=3.10

{naas_abi-1.0.3.dev2 → naas_abi-1.0.4}/naas_abi.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ naas_abi/apps/terminal_agent/terminal_style.py
 naas_abi/models/airgap_gemma.py
 naas_abi/models/airgap_qwen.py
 naas_abi/models/default.py
+naas_abi/models/gpt_4_1.py
 naas_abi/pipelines/AIAgentOntologyGenerationPipeline.py
 naas_abi/pipelines/AIAgentOntologyGenerationPipeline_test.py
 naas_abi/pipelines/AddIndividualPipeline.py

{naas_abi-1.0.3.dev2 → naas_abi-1.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "naas-abi"
-version = "1.0.3-dev.2"
+version = "1.0.4"
 description = "Add your description here"
 readme = "README.md"
 authors = [{ name = "Maxime Jublou", email = "maxime@naas.ai" },{ name = "Florent Ravenel", email = "florent@naas.ai" }, { name = "Jeremy Ravenel", email = "jeremy@naas.ai" }]
@@ -30,8 +30,8 @@ build_command = """
     uv build
 """
 
-# [tool.semantic_release.commit_parser_options]
-# path_filters = ["."]
+[tool.semantic_release.commit_parser_options]
+path_filters = ["."]
 # scope_prefix = "naas-abi-"
 
 [tool.semantic_release.branches.main]