naas-abi 1.0.8__tar.gz → 1.0.10__tar.gz

{naas_abi-1.0.8 → naas_abi-1.0.10}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: naas-abi
-Version: 1.0.8
-Summary: Add your description here
+Version: 1.0.10
+Summary: Multi-agent orchestrator and knowledge graph management system for AI orchestration, providing comprehensive coordination of specialized AI agents and semantic data management capabilities
 Author-email: Maxime Jublou <maxime@naas.ai>, Florent Ravenel <florent@naas.ai>, Jeremy Ravenel <jeremy@naas.ai>
 Requires-Python: <4,>=3.10
 Description-Content-Type: text/markdown

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/__init__.py

@@ -14,13 +14,28 @@ class ABIModule(BaseModule):
     dependencies: ModuleDependencies = ModuleDependencies(
         modules=[
             "naas_abi_marketplace.ai.chatgpt",
-            # "naas_abi_core.modules.templatablesparqlquery",
+            "naas_abi_core.modules.templatablesparqlquery",
+            "naas_abi_marketplace.ai.qwen#soft",
+            "naas_abi_marketplace.applications.naas#soft",
         ],
         services=[Secret, TripleStoreService, ObjectStorageService],
     )
 
     class Configuration(ModuleConfiguration):
+        """
+        Configuration example:
+
+        module: naas_abi
+        enabled: true
+        config:
+            datastore_path: "abi"
+            workspace_id: "{{ secret.WORKSPACE_ID }}"
+            storage_name: "{{ secret.STORAGE_NAME }}"
+        """
+
         datastore_path: str = "abi"
+        workspace_id: str | None = None
+        storage_name: str | None = None
 
     # def on_initialized(self):
     #     if (

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/agents/AbiAgent.py

@@ -1,8 +1,6 @@
 from typing import Optional
 
 from langchain_core.tools import tool
-from naas_abi import ABIModule
-from naas_abi.models.default import get_model
 from naas_abi_core.services.agent.IntentAgent import (
     AgentConfiguration,
     AgentSharedState,
@@ -132,6 +130,8 @@ def create_agent(
     agent_configuration: Optional[AgentConfiguration] = None,
 ) -> IntentAgent:
     # Define model based on AI_MODE
+    from naas_abi.models.default import get_model
+
     model = get_model()
 
     # Define tools
@@ -149,19 +149,22 @@ 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"
-    # ]
+    from naas_abi_core.modules.templatablesparqlquery import (
+        ABIModule as TemplatableSparqlQueryABIModule,
+    )
 
-    # 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))
+    agent_recommendation_tools = [
+        "find_business_proposal_agents",
+        "find_coding_agents",
+        "find_math_agents",
+        "find_best_value_agents",
+        "find_fastest_agents",
+        "find_cheapest_agents",
+    ]
+    sparql_query_tools_list = TemplatableSparqlQueryABIModule.get_instance().get_tools(
+        agent_recommendation_tools
+    )
+    tools += sparql_query_tools_list
 
     shared_state = agent_shared_state or AgentSharedState(
         thread_id="0", supervisor_agent=NAME
@@ -173,16 +176,22 @@ You can browse the data and run queries there."""
 
     # Define agents - all agents are now loaded automatically during module loading
     agents: list = []
+    from naas_abi import ABIModule
+    from naas_abi_core import logger
 
     modules = ABIModule.get_instance().engine.modules.values()
-    for module in modules:
+    for module in sorted(modules, key=lambda x: x.__class__.__module__):
+        logger.info(f"🔍 Checking module: {module.__class__.__module__}")
         if hasattr(module, "agents"):
             for agent in module.agents:
                 if (
                     agent is not None
-                    and agent != AbiAgent
-                    and (hasattr(agent, "NAME") and not agent.NAME.endswith("Research"))
-                ):  # exclude ChatGPT and Perplexity Research Agents NOT working properly with supervisor
+                    and hasattr(agent.New(), "name")
+                    and not agent.New().name.endswith("Research")
+                ):
+                    logger.info(
+                        f"🤖 Adding agent: {agent.New().name} as sub-agent of {NAME}"
+                    )
                     new_agent = agent.New().duplicate(
                         agent_queue, agent_shared_state=shared_state
                     )

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/agents/EntitytoSPARQLAgent.py

@@ -5,15 +5,12 @@ from typing import Any, Callable, Optional, Union
 from langchain_core.language_models import BaseChatModel
 from langchain_core.messages import AIMessage, BaseMessage, SystemMessage
 from langchain_core.tools import BaseTool, Tool
-from langchain_openai import ChatOpenAI  # noqa: F401
 from langgraph.checkpoint.base import BaseCheckpointSaver
 from langgraph.checkpoint.memory import MemorySaver
 from langgraph.graph import START, StateGraph
 from langgraph.graph.message import MessagesState
 from langgraph.types import Command
 from naas_abi import ABIModule
-
-# from naas_abi import secret
 from naas_abi_core.engine.EngineProxy import ServicesProxy
 from naas_abi_core.models.Model import ChatModel
 from naas_abi_core.services.agent.Agent import (
@@ -21,6 +18,7 @@ from naas_abi_core.services.agent.Agent import (
     AgentConfiguration,
     AgentSharedState,
 )
+from naas_abi_core.utils.StorageUtils import StorageUtils
 
 MODULE: ABIModule = ABIModule.get_instance()
 SERVICES: ServicesProxy = MODULE.engine.services
@@ -146,15 +144,10 @@ def create_agent(
     agent_shared_state: Optional[AgentSharedState] = None,
     agent_configuration: Optional[AgentConfiguration] = None,
 ) -> Optional[Agent]:
-    # Set model based on AI_MODE
-    ai_mode = MODULE.configuration.global_config.ai_mode
-
-    if ai_mode == "airgap":
-        from naas_abi.models.default import get_model
+    # Set model
+    from naas_abi.models.default import get_model
 
-        model = get_model()
-    else:
-        from naas_abi_marketplace.ai.chatgpt.models.o3_mini import model
+    model = get_model()
 
     if agent_configuration is None:
         agent_configuration = AgentConfiguration(system_prompt=SYSTEM_PROMPT)
@@ -191,6 +184,15 @@ class EntityExtractionState(MessagesState):
 
 
 class EntitytoSPARQLAgent(Agent):
+    """
+    Agent for entity to SPARQL conversion.
+
+    Attributes:
+        __storage_utils (StorageUtils): Storage utilities for saving data.
+    """
+
+    __storage_utils: StorageUtils
+
     def __init__(
         self,
         name: str,
@@ -216,6 +218,9 @@ class EntitytoSPARQLAgent(Agent):
         )
 
         self.datastore_path = f"datastore/ontology/entities_to_sparql/{datetime.now().strftime('%Y%m%d%H%M%S')}"
+        self.__storage_utils = StorageUtils(
+            ABIModule.get_instance().engine.services.object_storage
+        )
 
     def entity_extract(self, state: EntityExtractionState) -> Command:
         """
@@ -756,7 +761,6 @@ If you find you missed entities, you can add it again in the message.
         """
         import uuid
 
-        from naas_abi_core.utils.Storage import save_json, save_text
         from naas_abi.workflows.GetObjectPropertiesFromClassWorkflow import (
             GetObjectPropertiesFromClassWorkflow,
             GetObjectPropertiesFromClassWorkflowConfiguration,
@@ -796,14 +800,16 @@ If you find you missed entities, you can add it again in the message.
 
         # Save data to storage
         last_last_message_content_str = str(state["messages"][-2].content)
-        save_text(
+        self.__storage_utils.save_text(
             last_last_message_content_str,
             self.datastore_path,
             "init_text.txt",
             copy=False,
         )
-        save_json(entities, self.datastore_path, "entities.json", copy=False)
-        save_json(
+        self.__storage_utils.save_json(
+            entities, self.datastore_path, "entities.json", copy=False
+        )
+        self.__storage_utils.save_json(
             object_properties, self.datastore_path, "object_properties.json", copy=False
         )
 
@@ -828,7 +834,6 @@ If you find you missed entities, you can add it again in the message.
         Returns:
             Command: Command to end the workflow with the generated SPARQL statement
         """
-        from naas_abi_core.utils.Storage import save_text
 
         # Create system message for SPARQL generation
         system_prompt = """# ROLE:
@@ -910,7 +915,7 @@ INSERT DATA {
 
         # Save SPARQL statement to storage
         response_content_str = str(response.content) if response.content else ""
-        save_text(
+        self.__storage_utils.save_text(
             response_content_str, self.datastore_path, "insert_data.sparql", copy=False
         )
 

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/agents/KnowledgeGraphBuilderAgent.py

@@ -1,16 +1,11 @@
-# from naas_abi import secret
 from typing import Optional
 
-from langchain_openai import ChatOpenAI  # noqa: F401
-from naas_abi import ABIModule
 from naas_abi_core.services.agent.Agent import (
     Agent,
     AgentConfiguration,
     AgentSharedState,
 )
 
-MODULE: ABIModule = ABIModule.get_instance()
-
 NAME: str = "Knowledge_Graph_Builder"
 AVATAR_URL: str = "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f3/Rdf_logo.svg/1200px-Rdf_logo.svg.png"
 DESCRIPTION: str = (
@@ -148,13 +143,9 @@ def create_agent(
 
     model = get_model()
 
-    # Use provided configuration or create default one
-    if agent_configuration is None:
-        agent_configuration = AgentConfiguration(system_prompt=SYSTEM_PROMPT)
+    from naas_abi import ABIModule
 
-    # Use provided shared state or create new one
-    if agent_shared_state is None:
-        agent_shared_state = AgentSharedState()
+    MODULE: ABIModule = ABIModule.get_instance()
 
     # Init tools
     tools: list = []
@@ -290,9 +281,9 @@ def create_agent(
         tools += Pipeline(Configuration(MODULE.engine.services.triple_store)).as_tools()
 
     # Add search organizations tools
-    templatable_sparql_query_module = ABIModule.get_instance().engine.modules[
-        "naas_abi_core.modules.templatablesparqlquery"
-    ]
+    from naas_abi_core.modules.templatablesparqlquery import (
+        ABIModule as TemplatableSparqlQueryABIModule,
+    )
 
     ontology_tools: list = [
         "search_class",
@@ -304,7 +295,18 @@ def create_agent(
         "merge_individuals",
         "remove_individuals",
     ]
-    tools.extend(templatable_sparql_query_module.get_tools(ontology_tools))
+    sparql_query_tools_list = TemplatableSparqlQueryABIModule.get_instance().get_tools(
+        ontology_tools
+    )
+    tools += sparql_query_tools_list
+
+    # Use provided configuration or create default one
+    if agent_configuration is None:
+        agent_configuration = AgentConfiguration(system_prompt=SYSTEM_PROMPT)
+
+    # Use provided shared state or create new one
+    if agent_shared_state is None:
+        agent_shared_state = AgentSharedState()
 
     return KnowledgeGraphBuilderAgent(
         name=NAME,

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/agents/OntologyEngineerAgent.py

@@ -1,18 +1,12 @@
 from typing import Optional
 
-from langchain_openai import ChatOpenAI  # noqa: F401
-from naas_abi import ABIModule
-
-# from naas_abi import secret
 from naas_abi_core.services.agent.Agent import (
     Agent,
     AgentConfiguration,
     AgentSharedState,
 )
 
-MODULE: ABIModule = ABIModule.get_instance()
-
-NAME = "Ontology_Engineer_Agent"
+NAME = "Ontology_Engineer"
 DESCRIPTION = "A agent that helps users understand BFO Ontology and transform text into ontologies."
 SYSTEM_PROMPT = """
 # ROLE: 
@@ -69,15 +63,10 @@ def create_agent(
     agent_shared_state: Optional[AgentSharedState] = None,
     agent_configuration: Optional[AgentConfiguration] = None,
 ) -> Optional[Agent]:
-    # Set model based on AI_MODE
-    ai_mode = MODULE.configuration.global_config.ai_mode
-
-    if ai_mode == "airgap":
-        from naas_abi.models.default import get_model
+    # Set model
+    from naas_abi.models.default import get_model
 
-        model = get_model()
-    else:
-        from naas_abi_marketplace.ai.chatgpt.models.o3_mini import model
+    model = get_model()
 
     # Use provided configuration or create default one
     if agent_configuration is None:

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/apps/oxigraph_admin/main.py

@@ -6,7 +6,6 @@ Provides terminal-based management and monitoring for Oxigraph triple store
 import subprocess
 
 import requests
-from naas_abi import services
 from naas_abi.apps.oxigraph_admin.terminal_style import (
     clear_screen,
     get_user_input,
@@ -17,6 +16,7 @@ from naas_abi.apps.oxigraph_admin.terminal_style import (
     print_success_message,
     print_welcome_message,
 )
+from naas_abi_core.services.triple_store.TripleStorePorts import ITripleStoreService
 from rich.console import Console
 from rich.table import Table
 
@@ -24,9 +24,9 @@ console = Console()
 
 
 class OxigraphAdmin:
-    def __init__(self):
+    def __init__(self, triple_store_service: ITripleStoreService):
         self.oxigraph_url = "http://localhost:7878"
-        self.triple_store_service = services.triple_store_service
+        self.triple_store_service = triple_store_service
         self.query_templates = self._init_query_templates()
 
     def _init_query_templates(self):
@@ -384,7 +384,10 @@ SELECT ?entity ?label ?type WHERE {
 
 
 def main():
-    admin = OxigraphAdmin()
+    from naas_abi import ABIModule
+
+    triple_store_service = ABIModule.get_instance().engine.services.triple_store
+    admin = OxigraphAdmin(triple_store_service)
     admin.run()
 
 

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/apps/sparql_terminal/main.py

@@ -1,4 +1,3 @@
-from naas_abi import services
 from naas_abi.apps.sparql_terminal.terminal_style import (
     clear_screen,
     get_user_input,
@@ -9,11 +8,12 @@ from naas_abi.apps.sparql_terminal.terminal_style import (
     print_system_message,
     print_welcome_message,
 )
+from naas_abi_core.services.triple_store.TripleStorePorts import ITripleStoreService
 
 
 class SPARQLTerminal:
-    def __init__(self):
-        self.triple_store_service = services.triple_store_service
+    def __init__(self, triple_store_service: ITripleStoreService):
+        self.triple_store_service = triple_store_service
 
     def execute_query(self, query):
         """Execute a SPARQL query and return the results"""
@@ -60,7 +60,10 @@ class SPARQLTerminal:
 
 
 def main():
-    terminal = SPARQLTerminal()
+    from naas_abi import ABIModule
+
+    triple_store_service = ABIModule.get_instance().engine.services.triple_store
+    terminal = SPARQLTerminal(triple_store_service)
     terminal.run()
 
 

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/pipelines/AIAgentOntologyGenerationPipeline_test.py

@@ -1,19 +1,20 @@
 import json
 
 import pytest
+from naas_abi import ABIModule
 from naas_abi.pipelines.AIAgentOntologyGenerationPipeline import (
     AIAgentOntologyGenerationConfiguration,
     AIAgentOntologyGenerationParameters,
     AIAgentOntologyGenerationPipeline,
 )
 
+triple_store_service = ABIModule.get_instance().engine.services.triple_store
+
 
 @pytest.fixture
 def pipeline() -> AIAgentOntologyGenerationPipeline:
-    from naas_abi import services
-
     pipeline_configuration = AIAgentOntologyGenerationConfiguration(
-        triple_store=services.triple_store,
+        triple_store=triple_store_service,
         datastore_path="storage/datastore/test/ai_agent_ontology_generation",
         source_datastore_path="storage/datastore/test/artificial_analysis_workflow",
     )

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/pipelines/AddIndividualPipeline_test.py

@@ -1,5 +1,5 @@
 import pytest
-from naas_abi import services
+from naas_abi import ABIModule
 from naas_abi.pipelines.AddIndividualPipeline import (
     AddIndividualPipeline,
     AddIndividualPipelineConfiguration,
@@ -8,16 +8,20 @@ from naas_abi.pipelines.AddIndividualPipeline import (
 from naas_abi.workflows.SearchIndividualWorkflow import (
     SearchIndividualWorkflowConfiguration,
 )
+from naas_abi_core.utils.SPARQL import SPARQLUtils
+
+triple_store_service = ABIModule.get_instance().engine.services.triple_store
+sparql_utils = SPARQLUtils(triple_store_service)
 
 
 @pytest.fixture
 def pipeline() -> AddIndividualPipeline:
     search_individual_workflow_configuration = SearchIndividualWorkflowConfiguration(
-        triple_store=services.triple_store_service
+        triple_store=triple_store_service
     )
     pipeline = AddIndividualPipeline(
         configuration=AddIndividualPipelineConfiguration(
-            triple_store=services.triple_store_service,
+            triple_store=triple_store_service,
             search_individual_configuration=search_individual_workflow_configuration,
         )
     )
@@ -25,7 +29,6 @@ def pipeline() -> AddIndividualPipeline:
 
 
 def test_add_individual_pipeline(pipeline: AddIndividualPipeline):
-    from naas_abi_core.utils.SPARQL import results_to_list
     from rdflib import OWL, RDF, RDFS, Literal, URIRef
 
     label = "Naas.ai"
@@ -45,7 +48,7 @@ def test_add_individual_pipeline(pipeline: AddIndividualPipeline):
     )
 
     # Remove graph
-    services.triple_store_service.remove(graph)
+    triple_store_service.remove(graph)
 
     # Check triples are removed from the triple store
     sparql_query = """
@@ -61,6 +64,6 @@ def test_add_individual_pipeline(pipeline: AddIndividualPipeline):
     }
     """
     sparql_query = sparql_query.replace("{{individual_uri}}", str(individual_uri))
-    results = services.triple_store_service.query(sparql_query)
-    results_list = results_to_list(results)
+    results = triple_store_service.query(sparql_query)
+    results_list = sparql_utils.results_to_list(results)
     assert results_list is None, results_list

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/pipelines/InsertDataSPARQLPipeline.py

@@ -163,7 +163,11 @@ class InsertDataSPARQLPipeline(Pipeline):
 
 
 if __name__ == "__main__":
-    from naas_abi import services
+    from naas_abi_core.engine.Engine import Engine
+
+    engine = Engine()
+    engine.load(module_names=["naas_abi"])
+    triple_store_service = engine.services.triple_store
 
     sparql_statement = """
     PREFIX abi: <http://ontology.naas.ai/abi/>
@@ -184,9 +188,7 @@ if __name__ == "__main__":
     }
     """
     pipeline = InsertDataSPARQLPipeline(
-        InsertDataSPARQLPipelineConfiguration(
-            triple_store=services.triple_store_service
-        )
+        InsertDataSPARQLPipelineConfiguration(triple_store=triple_store_service)
     )
     # result = pipeline.get_sparql_from_text(InsertDataSPARQLPipelineParameters(sparql_statement=sparql_statement))
     # logger.info(result)

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/pipelines/InsertDataSPARQLPipeline_test.py

@@ -1,24 +1,27 @@
 import pytest
-from naas_abi import services
+from naas_abi import ABIModule
 from naas_abi.pipelines.InsertDataSPARQLPipeline import (
     InsertDataSPARQLPipeline,
     InsertDataSPARQLPipelineConfiguration,
     InsertDataSPARQLPipelineParameters,
 )
+from naas_abi_core.utils.SPARQL import SPARQLUtils
+
+triple_store_service = ABIModule.get_instance().engine.services.triple_store
+sparql_utils = SPARQLUtils(triple_store_service)
 
 
 @pytest.fixture
 def pipeline() -> InsertDataSPARQLPipeline:
     pipeline = InsertDataSPARQLPipeline(
         configuration=InsertDataSPARQLPipelineConfiguration(
-            triple_store=services.triple_store_service
+            triple_store=triple_store_service
         )
     )
     return pipeline
 
 
 def test_insert_data_sparql_pipeline(pipeline: InsertDataSPARQLPipeline):
-    from naas_abi_core.utils.SPARQL import results_to_list
     from rdflib import Literal, Namespace, URIRef
 
     sparql_statement = """
@@ -54,7 +57,7 @@ def test_insert_data_sparql_pipeline(pipeline: InsertDataSPARQLPipeline):
     ), graph.serialize(format="turtle")
 
     # Remove graph
-    services.triple_store_service.remove(graph)
+    triple_store_service.remove(graph)
 
     # Check triples are removed from the triple store
     sparql_query = """
@@ -69,8 +72,8 @@ def test_insert_data_sparql_pipeline(pipeline: InsertDataSPARQLPipeline):
         FILTER(?s = abi:john || ?s = abi:jane)
     }
     """
-    results = services.triple_store_service.query(sparql_query)
-    results_list = results_to_list(results)
+    results = triple_store_service.query(sparql_query)
+    results_list = sparql_utils.results_to_list(results)
     assert results_list is None, results_list
 
 

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/pipelines/MergeIndividualsPipeline.py

@@ -226,13 +226,17 @@ class MergeIndividualsPipeline(Pipeline):
 
 
 if __name__ == "__main__":
-    from naas_abi import services
+    from naas_abi_core.engine.Engine import Engine
+
+    engine = Engine()
+    engine.load(module_names=["naas_abi"])
+    triple_store_service = ABIModule.get_instance().engine.services.triple_store
 
     uri_to_keep = "http://ontology.naas.ai/abi/69a231b9-e87a-4503-8f80-a530ed8eaa4b"  # URI that will remain
     uri_to_merge = "http://ontology.naas.ai/abi/4f92bbdd-e710-4e43-9480-9b6cd6d9af80"  # URI that will be merged and removed
 
     configuration = MergeIndividualsPipelineConfiguration(
-        triple_store=services.triple_store_service
+        triple_store=triple_store_service
     )
 
     pipeline = MergeIndividualsPipeline(configuration)

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/pipelines/MergeIndividualsPipeline_test.py

@@ -1,18 +1,20 @@
 import pytest
-from naas_abi import services
+from naas_abi import ABIModule
 from naas_abi.pipelines.MergeIndividualsPipeline import (
     MergeIndividualsPipeline,
     MergeIndividualsPipelineConfiguration,
     MergeIndividualsPipelineParameters,
 )
+from naas_abi_core.utils.SPARQL import SPARQLUtils
+
+triple_store_service = ABIModule.get_instance().engine.services.triple_store
+sparql_utils = SPARQLUtils(triple_store_service)
 
 
 @pytest.fixture
 def pipeline() -> MergeIndividualsPipeline:
     return MergeIndividualsPipeline(
-        MergeIndividualsPipelineConfiguration(
-            triple_store=services.triple_store_service
-        )
+        MergeIndividualsPipelineConfiguration(triple_store=triple_store_service)
     )
 
 
@@ -20,8 +22,7 @@ def test_merge_individuals_pipeline(pipeline: MergeIndividualsPipeline):
     import time
     from uuid import uuid4
 
-    from naas_abi_core.utils.SPARQL import get_subject_graph
-    from naas_abi_core import logger, services
+    from naas_abi_core import logger
     from rdflib import OWL, RDF, RDFS, SKOS, Graph, Literal, Namespace, URIRef
 
     ABI = Namespace("http://ontology.naas.ai/abi/")
@@ -68,7 +69,7 @@ def test_merge_individuals_pipeline(pipeline: MergeIndividualsPipeline):
     )
 
     logger.info("Inserting triples to triplestore")
-    services.triple_store_service.insert(graph)
+    triple_store_service.insert(graph)
     time.sleep(3)
 
     # Run pipeline to merge individuals
@@ -90,9 +91,9 @@ def test_merge_individuals_pipeline(pipeline: MergeIndividualsPipeline):
     )
 
     # Check if uri_to_merge is removed in triplestore
-    graph = get_subject_graph(str(uri_to_merge), 1)
+    graph = sparql_utils.get_subject_graph(str(uri_to_merge), 1)
     assert len(graph) == 0, graph.serialize(format="turtle")
 
     # Remove graphs
-    services.triple_store_service.remove(graph_merged)
+    triple_store_service.remove(graph_merged)
     time.sleep(3)

{naas_abi-1.0.8 → naas_abi-1.0.10}/naas_abi/pipelines/RemoveIndividualPipeline.py

@@ -147,7 +147,11 @@ class RemoveIndividualPipeline(Pipeline):
 
 
 if __name__ == "__main__":
-    from naas_abi import services
+    from naas_abi_core.engine.Engine import Engine
+
+    engine = Engine()
+    engine.load(module_names=["naas_abi"])
+    triple_store_service = ABIModule.get_instance().engine.services.triple_store
 
     uris_to_remove = [
         "http://ontology.naas.ai/abi/example-uri-1",
@@ -155,7 +159,7 @@ if __name__ == "__main__":
     ]
 
     configuration = RemoveIndividualPipelineConfiguration(
-        triple_store=services.triple_store_service
+        triple_store=triple_store_service
     )
 
     pipeline = RemoveIndividualPipeline(configuration)