naas-abi 1.0.5__py3-none-any.whl → 1.0.6.dev1__py3-none-any.whl

naas_abi/__init__.py

@@ -15,20 +15,21 @@ 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):
-        openai_api_key: str
-        anthropic_api_key: str | None = None
+        pass
+        # openai_api_key: str | None = None
+        # 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/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/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 ABIModule.get_instance().configuration.openai_api_key
-        and not ABIModule.get_instance().configuration.openrouter_api_key
+        or not ChatGPTABIModule.get_instance().configuration.openai_api_key
     ):
         from naas_abi.models.airgap_qwen import model as airgap_model
 
@@ -22,4 +22,3 @@ def get_model() -> ChatModel:
         )
 
         return cloud_model
-        return cloud_model

{naas_abi-1.0.5.dist-info → naas_abi-1.0.6.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi
-Version: 1.0.5
+Version: 1.0.6.dev1
 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.5.dist-info → naas_abi-1.0.6.dev1.dist-info}/RECORD

@@ -1,8 +1,8 @@
-naas_abi/__init__.py,sha256=X1SuoUFhRyOWCx3VfKcEYQStJJqZO1cM9V3Jsxob7GU,1160
+naas_abi/__init__.py,sha256=Zqi9WxG8fsjWNxGHt_LZi7tVx8kEBUug6RqLOst0Gzs,1209
 naas_abi/cli.py,sha256=bfCcxGoQ_iSMhQDDX0-dRCyhc53Nawsy3WAruCNCL7M,27549
 naas_abi/mappings.py,sha256=qu17k8cPwPNKRIqchDMnxViDx0Kn0MTy2XT8XYUIW34,4872
 naas_abi/triggers.py,sha256=ljkgZP2zsTlmkK02ivTPW-yV02pn2TdyRk5CP4kUtvo,4658
-naas_abi/agents/AbiAgent.py,sha256=xbpjtsGIqIOMrg5jL8acpKRCAE2Ik_us5sr8ttbnQRk,18071
+naas_abi/agents/AbiAgent.py,sha256=mjOCpMncEuDm-y7ZcFg_IEaSSTYJLkt6ICkljD2DK30,18095
 naas_abi/agents/AbiAgent_test.py,sha256=AKggG5RS3zDWnql1DFE7cF7riAHeOdKTZp44WN65Arg,5906
 naas_abi/agents/EntitytoSPARQLAgent.py,sha256=KNBQUIANT1nuQ62zBySm1izGSEl6SCsfwm9l_SGCDGs,57105
 naas_abi/agents/EntitytoSPARQLAgent_test.py,sha256=kx0gkbJoQZqt2_f_RINajwQU5EnHR1PsQx53rh7wJvA,2267
@@ -18,8 +18,7 @@ naas_abi/apps/terminal_agent/main.py,sha256=7MN88mivIV7gP1lELnqNxP_huwTbavhnTjkN
 naas_abi/apps/terminal_agent/terminal_style.py,sha256=YOpfvBlKU52wNyGEKbZPiRQVKxug-hI92H8ScV5L8Ew,5254
 naas_abi/models/airgap_gemma.py,sha256=I9pWN_DSgy4h6rT7OiYWDVijyTMoEgONm4xfZYWvp6I,8469
 naas_abi/models/airgap_qwen.py,sha256=EQZ-0tAKZCTCqnovLiGCx4ss0yh2Jjk0xh7wCwDomG8,682
-naas_abi/models/default.py,sha256=R7QmR3-IrNwvsm_l0NDhawrWqTYDY6S_w0cr6TbHic4,737
-naas_abi/models/gpt_4_1.py,sha256=0luDssCvt8BoK_iVDRI7wkZ5GYn1d--G3GtnN6jiPIg,838
+naas_abi/models/default.py,sha256=XZ4--FmFjvO99fQdV0I7niJtHNgSFZuCKPb95pyhLns,721
 naas_abi/pipelines/AIAgentOntologyGenerationPipeline.py,sha256=QWrooZ_xJy0uX92Tzw7fBOs_uME2nLhsjeWi0EGTUBA,24640
 naas_abi/pipelines/AIAgentOntologyGenerationPipeline_test.py,sha256=lDsuZKfQlCtLNKQ09nkSHemsvjSNdeZAhaDw-cPYbjo,4130
 naas_abi/pipelines/AddIndividualPipeline.py,sha256=EKrJX4ODXBMSFUl0R2UsaSmLaj0cUJ3AdIhhtU0Fhso,8445
@@ -56,7 +55,7 @@ naas_abi/workflows/GetSubjectGraphWorkflow.py,sha256=EkgrFQPyaUVeC8sd7oVcxT9LUka
 naas_abi/workflows/GetSubjectGraphWorkflow_test.py,sha256=fzzFYUwojM39x5Ld-59jHMDbGy4Lcq6uO8_BAvZV0ug,1886
 naas_abi/workflows/SearchIndividualWorkflow.py,sha256=6vWwywKNBlaosopPxiw0OpQnrn99wuiji0uA7jwKOn4,6572
 naas_abi/workflows/SearchIndividualWorkflow_test.py,sha256=KBhd58TATMSWWdThYPg7veAySR4hts5LuoygQqQIiaU,2749
-naas_abi-1.0.5.dist-info/METADATA,sha256=KV5l5EWuEQ989b2fxTCxP7hYdlDwxm0kfPylzKlyw_Q,389
-naas_abi-1.0.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-naas_abi-1.0.5.dist-info/top_level.txt,sha256=Dhf3mhATB9-JuvBR8Y55OabvI-PCeQUqb5ae3EMmbeA,9
-naas_abi-1.0.5.dist-info/RECORD,,
+naas_abi-1.0.6.dev1.dist-info/METADATA,sha256=8_Ls-7aVRRj6xpAKh7HphjWiXaZO2rHEKqUYroDx0yk,394
+naas_abi-1.0.6.dev1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+naas_abi-1.0.6.dev1.dist-info/top_level.txt,sha256=Dhf3mhATB9-JuvBR8Y55OabvI-PCeQUqb5ae3EMmbeA,9
+naas_abi-1.0.6.dev1.dist-info/RECORD,,

naas_abi/models/gpt_4_1.py

@@ -1,26 +0,0 @@
-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,
-)