naas-abi-core 1.7.0__py3-none-any.whl → 1.7.2__py3-none-any.whl

naas_abi_core/engine/engine_loaders/EngineOntologyLoader.py

@@ -2,7 +2,8 @@ from typing import List
 
 from naas_abi_core import logger
 from naas_abi_core.module.Module import BaseModule
-from naas_abi_core.services.triple_store.TripleStoreService import TripleStoreService
+from naas_abi_core.services.triple_store.TripleStoreService import \
+    TripleStoreService
 
 
 class EngineOntologyLoader:
@@ -13,4 +14,5 @@ class EngineOntologyLoader:
         logger.debug("Loading ontologies")
         for module in modules:
             for ontology in module.ontologies:
+                logger.debug(f"Loading ontology: {ontology}")
                 triple_store.load_schema(ontology)

naas_abi_core/modules/templatablesparqlquery/__init__.py

@@ -1,12 +1,9 @@
-from naas_abi_core.module.Module import (
-    BaseModule,
-    ModuleConfiguration,
-    ModuleDependencies,
-)
-from naas_abi_core.modules.templatablesparqlquery.workflows.TemplatableSparqlQueryLoader import (
-    TemplatableSparqlQueryLoader,
-)
-from naas_abi_core.services.triple_store.TripleStoreService import TripleStoreService
+from naas_abi_core.module.Module import (BaseModule, ModuleConfiguration,
+                                         ModuleDependencies)
+from naas_abi_core.modules.templatablesparqlquery.workflows.TemplatableSparqlQueryLoader import \
+    TemplatableSparqlQueryLoader
+from naas_abi_core.services.triple_store.TripleStoreService import \
+    TripleStoreService
 
 
 class ABIModule(BaseModule):
@@ -32,7 +29,7 @@ class ABIModule(BaseModule):
     def get_workflows(self):
         return self.__workflows
 
-    def get_tools(self, tool_names: list[str] = []):
+    def get_tools(self, tool_names: list[str] = []) -> list:
         if len(tool_names) == 0:
             return self.__tools
         else:

naas_abi_core/services/agent/Agent.py

@@ -182,8 +182,9 @@ class AgentSharedState:
     def set_requesting_help(self, requesting_help: bool):
         self._requesting_help = requesting_help
 
+
 class ABIAgentState(MessagesState):
-    system_prompt: str = Field(default="")
+    system_prompt: str
 
 
 @dataclass
@@ -227,7 +228,11 @@ class AgentConfiguration:
     )
 
     def get_system_prompt(self, messages: list[AnyMessage]) -> str:
-        return self.system_prompt(messages) if callable(self.system_prompt) else self.system_prompt
+        return (
+            self.system_prompt(messages)
+            if callable(self.system_prompt)
+            else self.system_prompt
+        )
 
 
 class CompletionQuery(BaseModel):
@@ -867,12 +872,18 @@ AGENT SYSTEM PROMPT:
             from datetime import datetime
 
             current_date_str = f"CURRENT_DATE: The current date is {datetime.now().strftime('%Y-%m-%d')}\n"
-            #self._system_prompt = self._system_prompt + "\n" + current_date_str
+            # self._system_prompt = self._system_prompt + "\n" + current_date_str
             updated_system_prompt = updated_system_prompt + "\n" + current_date_str
-            return Command(goto="current_active_agent", update={"system_prompt": updated_system_prompt})
+            return Command(
+                goto="current_active_agent",
+                update={"system_prompt": updated_system_prompt},
+            )
 
         # logger.debug(f"💬 System prompt: {self._system_prompt}")
-        return Command(goto="continue_conversation", update={"system_prompt": updated_system_prompt})
+        return Command(
+            goto="continue_conversation",
+            update={"system_prompt": updated_system_prompt},
+        )
 
     def continue_conversation(self, state: ABIAgentState) -> Command:
         return Command(goto="call_model")

{naas_abi_core-1.7.0.dist-info → naas_abi_core-1.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.7.0
+Version: 1.7.2
 Summary: Abi framework allowing you to build your AI system.
 Project-URL: Homepage, https://github.com/jupyter-naas/abi
 Project-URL: Repository, https://github.com/jupyter-naas/abi/tree/main/libs/naas-abi-core

{naas_abi_core-1.7.0.dist-info → naas_abi_core-1.7.2.dist-info}/RECORD

@@ -26,7 +26,7 @@ naas_abi_core/engine/engine_configuration/EngineConfiguration_VectorStoreService
 naas_abi_core/engine/engine_configuration/EngineConfiguration_test.py,sha256=PL4A4Dawq6tfyHsiIkqbHhovc7wkIHcVZra6llRI-CY,286
 naas_abi_core/engine/engine_configuration/utils/PydanticModelValidator.py,sha256=jZzLqLvR8HawpyGYiUJEng3NlebLHiN3mVFOzNDSWs8,504
 naas_abi_core/engine/engine_loaders/EngineModuleLoader.py,sha256=4VsGtPsaeslej2JuyksHUbHJEY6J096cnr3iuTrhnpY,12043
-naas_abi_core/engine/engine_loaders/EngineOntologyLoader.py,sha256=dKVnzBRCFQDjHDdkG5wtBlXP3TDf6JY1mwGfKjVqhqs,527
+naas_abi_core/engine/engine_loaders/EngineOntologyLoader.py,sha256=eAHdQ3CL3vkZW0DbdPdT3T-wtEh2-TJ2TSq4z0OCuIM,595
 naas_abi_core/engine/engine_loaders/EngineServiceLoader.py,sha256=OPBTFG1c-QAFulXqNMwEh58IZ0ynClP5fFHdW3pS9PU,1772
 naas_abi_core/integration/__init__.py,sha256=bB7l26o_ksuEo8O5dggIaZcolJbveJxGZe0-J_UzL3Y,305
 naas_abi_core/integration/integration.py,sha256=tbdAV63Uisml9G8diZl20_JDlgJVFuLQpK_7VE4qgSw,811
@@ -37,14 +37,14 @@ naas_abi_core/module/Module.py,sha256=fyZBU0rUwWuPR3LGjUm5v6eWNXrCWvv_QDkWVu9n_y
 naas_abi_core/module/ModuleAgentLoader.py,sha256=9FXcK8h0_0h4hU3gEjImUbNBBeYJ9HOEjYqKVdTl3ik,2050
 naas_abi_core/module/ModuleUtils.py,sha256=6wUHpbdl0y_16xvz7W-NSOaRyLW9N9zx2Lg_Jkg0eMM,707
 naas_abi_core/modules/templatablesparqlquery/README.md,sha256=Cpz3FPMc1q-P5HmQ7848er5_MRTHLDLqYqq0nFrs7Dw,6991
-naas_abi_core/modules/templatablesparqlquery/__init__.py,sha256=Y2tAF9omNqYhJGYbt4MA28q7bnTX3wy3ATvJQwEwAmU,1225
+naas_abi_core/modules/templatablesparqlquery/__init__.py,sha256=-eOtGG7ETc_4wB-8L_ZBqmVucyfYZokvCXRIRbYJqOE,1262
 naas_abi_core/modules/templatablesparqlquery/ontologies/TemplatableSparqlQueryOntology.ttl,sha256=P8c4ZlWV6nzXZ7DiOlY1aDE39cKh0rlmjKp03Wc7U-8,4933
 naas_abi_core/modules/templatablesparqlquery/workflows/GenericWorkflow.py,sha256=1wo9KAlNkSGXfZtQVJTi4XvDNTEMiyB9OCthkTMjeZY,1617
 naas_abi_core/modules/templatablesparqlquery/workflows/TemplatableSparqlQueryLoader.py,sha256=_NU6RN1VZnv5N5GAYCsYCqRv07IgxemwZPd0fCxkGFI,7351
 naas_abi_core/pipeline/__init__.py,sha256=4de6BzXJI6nTSI7baeqe4IoN-Q95idsADchU6Eiv55Q,309
 naas_abi_core/pipeline/pipeline.py,sha256=m1QWXwdy_0yr8hxILNwoPSK2-vIz4P9WeZ6pDm9gJSg,2186
 naas_abi_core/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-naas_abi_core/services/agent/Agent.py,sha256=h3797FYzXc1vV-6q0L1B5LriwXRLGbXa4qvnvm78yuQ,64129
+naas_abi_core/services/agent/Agent.py,sha256=786elqXQOUthNHudE1_oZhY-pdd-KsB_vO-_MtwMhWQ,64241
 naas_abi_core/services/agent/AgentMemory_test.py,sha256=sSqDkr0o0MgeHudsX5s3u2oFLaAX7GVgyQPwdsD76Cs,650
 naas_abi_core/services/agent/Agent_test.py,sha256=VITdYn0fSK-7dq67qVQbirkwZBIRBwtRqdaWy9E87VY,6343
 naas_abi_core/services/agent/IntentAgent.py,sha256=KwILHZYFqbVGo0AoEZrSgFk64_Cd1q02SQ_81gVZ6jE,46139
@@ -118,7 +118,7 @@ naas_abi_core/workflow/__init__.py,sha256=hZD58mCB1PApxITqftP_xgjxL7NeLvOfI-rJEN
 naas_abi_core/workflow/workflow.py,sha256=ZufSS073JztVl0OQRTqNyK7FepFvv7gXlc4j5FAEZCI,1216
 assets/favicon.ico,sha256=nWk8wrHZiJV3DeuWrP2MqilXxCuoNWKGtMZfYmEVQLw,666
 assets/logo.png,sha256=zUu9sNgMmtzJhfNCinDs85GP1LDNVfTy8kYLKRT_pxA,9334
-naas_abi_core-1.7.0.dist-info/METADATA,sha256=tA_I09koD-mWO_95RhPiPuY4ynK7qEjSkuKNCEQRgzU,17567
-naas_abi_core-1.7.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-naas_abi_core-1.7.0.dist-info/entry_points.txt,sha256=IX0WUFxZuo1JU6H66fcRR6y7gYChMVw_XA9suPk9_1Q,70
-naas_abi_core-1.7.0.dist-info/RECORD,,
+naas_abi_core-1.7.2.dist-info/METADATA,sha256=dbt1fNxkP8YjZCOhXl9shRLnRCkVnWvPga4KzjKgU-Y,17567
+naas_abi_core-1.7.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naas_abi_core-1.7.2.dist-info/entry_points.txt,sha256=IX0WUFxZuo1JU6H66fcRR6y7gYChMVw_XA9suPk9_1Q,70
+naas_abi_core-1.7.2.dist-info/RECORD,,