naas-abi-core 1.0.2__py3-none-any.whl → 1.0.3.dev1__py3-none-any.whl

naas_abi_core/module/Module.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import glob
 import os
-from typing import Dict, List
+from typing import Dict, List, cast
 
 from naas_abi_core import logger
 from naas_abi_core.engine.engine_configuration.EngineConfiguration import GlobalConfig
@@ -13,6 +13,7 @@ from naas_abi_core.pipeline.pipeline import Pipeline
 from naas_abi_core.services.agent.Agent import Agent
 from naas_abi_core.workflow.workflow import Workflow
 from pydantic import BaseModel, ConfigDict
+from typing_extensions import Generic, Self, TypeVar
 
 
 class ModuleDependencies:
@@ -46,13 +47,16 @@ class ModuleConfiguration(BaseModel):
     global_config: GlobalConfig
 
 
-class BaseModule:
+TConfig = TypeVar("TConfig", bound=ModuleConfiguration)
+
+
+class BaseModule(Generic[TConfig]):
     """Base interface class for ABI modules."""
 
-    _instances: Dict[type, "BaseModule"] = {}
+    _instances: Dict[type, Self] = {}
 
     _engine: EngineProxy
-    _configuration: ModuleConfiguration
+    _configuration: TConfig
     dependencies: ModuleDependencies = ModuleDependencies(modules=[], services=[])
 
     __ontologies: List[str] = []
@@ -61,7 +65,7 @@ class BaseModule:
     __workflows: List[Workflow] = []
     __pipelines: List[Pipeline] = []
 
-    def __init__(self, engine: EngineProxy, configuration: ModuleConfiguration):
+    def __init__(self, engine: EngineProxy, configuration: TConfig):
         assert isinstance(configuration, ModuleConfiguration), (
             "configuration must be an instance of ModuleConfiguration"
         )
@@ -76,7 +80,9 @@ class BaseModule:
             "BaseModule.Configuration must be a subclass of ModuleConfiguration"
         )
 
-        self._instances[self.__class__] = self
+        self_instance: Self = cast(Self, self)
+
+        self._instances[self.__class__] = self_instance
 
     @classmethod
     def get_dependencies(cls) -> List[str]:
@@ -84,7 +90,7 @@ class BaseModule:
         return getattr(cls, "dependencies", [])
 
     @classmethod
-    def get_instance(cls) -> "BaseModule":
+    def get_instance(cls) -> Self:
         if cls not in cls._instances:
             raise ValueError(f"Module {cls} not initialized")
         return cls._instances[cls]
@@ -94,7 +100,7 @@ class BaseModule:
         return self._engine
 
     @property
-    def configuration(self) -> ModuleConfiguration:
+    def configuration(self) -> TConfig:
         return self._configuration
 
     @property
@@ -243,3 +249,4 @@ class BaseModule:
 #     def on_initialized(self):
 #         if hasattr(self.imported_module, "on_initialized"):
 #             self.imported_module.on_initialized()
+#             self.imported_module.on_initialized()

naas_abi_core/utils/Expose.py

@@ -4,8 +4,9 @@ from abc import ABC, abstractmethod
 from enum import Enum
 from typing import TYPE_CHECKING
 
-if TYPE_CHECKING:
-    from fastapi import APIRouter
+from fastapi import APIRouter
+
+if TYPE_CHECKING:    
     from langchain_core.tools import BaseTool
 
 
@@ -51,3 +52,4 @@ class Expose(ABC):
             NotImplementedError: If the concrete class does not implement this method
         """
         raise NotImplementedError()
+        raise NotImplementedError()

{naas_abi_core-1.0.2.dist-info → naas_abi_core-1.0.3.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: naas-abi-core
-Version: 1.0.2
+Version: 1.0.3.dev1
 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.0.2.dist-info → naas_abi_core-1.0.3.dev1.dist-info}/RECORD

@@ -37,7 +37,7 @@ naas_abi_core/integration/integration.py,sha256=tbdAV63Uisml9G8diZl20_JDlgJVFuLQ
 naas_abi_core/models/Model.py,sha256=s1Aj8Mcy113uhgYR4-lSfoyLnucOzOlnxKu6QKSwfeY,8223
 naas_abi_core/models/OpenRouter.py,sha256=6bvn_Dl4mQB1J-XTMoF1rD8F4FNszLAA0358fzJDBxs,485
 naas_abi_core/models/OpenRouter_test.py,sha256=nLlVdBaBan0mkdbnF3vrWGJYr8zQAC7Fl3wLUc37Mvw,1168
-naas_abi_core/module/Module.py,sha256=C5AlEmofh9bYUIMd817ODZExC4m6nvs6Rm6sRtNPN5E,8904
+naas_abi_core/module/Module.py,sha256=UGNXZkwgD0xv7HrxTHH9eRXYPv8kuxqfMGAHgfgQJlM,9096
 naas_abi_core/module/ModuleAgentLoader.py,sha256=Tc2KYODt8cGeK__QLk7h0J5QZ0EM-ZsQZTDeCJ4ip38,1965
 naas_abi_core/module/ModuleUtils.py,sha256=6wUHpbdl0y_16xvz7W-NSOaRyLW9N9zx2Lg_Jkg0eMM,707
 naas_abi_core/modules/templatablesparqlquery/README.md,sha256=Cpz3FPMc1q-P5HmQ7848er5_MRTHLDLqYqq0nFrs7Dw,6991
@@ -99,7 +99,7 @@ naas_abi_core/services/vector_store/VectorStoreService_test.py,sha256=LKGdUJoayV
 naas_abi_core/services/vector_store/__init__.py,sha256=tuRLebTOVhH5UF8JRke3rVTze1V3WK1DFT4k9ZYHqeA,407
 naas_abi_core/services/vector_store/adapters/QdrantAdapter.py,sha256=rlgjwbPXxFU1sAiNX8_57ia-5svN3e5kAkE6p42kJRI,7981
 naas_abi_core/services/vector_store/adapters/QdrantAdapter_test.py,sha256=JyKNfx-e4M7VybWViWrGWG8KiAnBa0oOwT-W_Yg23Uw,1891
-naas_abi_core/utils/Expose.py,sha256=_01Qz5_-T8H75ssC0e-BIiPe8IxllHgrhynjmjX8m1o,1709
+naas_abi_core/utils/Expose.py,sha256=ycxiz2tOXkRco_fiNM281e85RWHWi2xUT82PEE_Hdjk,1746
 naas_abi_core/utils/Graph.py,sha256=FoBuiTrcLw4dzhROnd7JHp-LMxMuwJISFbtdrwpoM24,6288
 naas_abi_core/utils/JSON.py,sha256=onIs-E3GWz4fvRuWBQpyb9qRNXCOJPf9x1yV1-jDlqU,1687
 naas_abi_core/utils/LazyLoader.py,sha256=rWrnFVuKCK1WrtNgeiegT_i7AkxGy9qK2hfhsXV4dCY,1120
@@ -119,7 +119,7 @@ naas_abi_core/utils/onto2py/onto2py.py,sha256=_wn9qrrsWd8gO-BY4_jQJVfY87e9MJ2Er2
 naas_abi_core/utils/onto2py/tests/ttl2py_test.py,sha256=5OZqSxPffjJYiX9T4rT1mV0PT1Qhf6goqEYT_mAPnaI,8055
 naas_abi_core/workflow/__init__.py,sha256=hZD58mCB1PApxITqftP_xgjxL7NeLvOfI-rJENg1ENs,250
 naas_abi_core/workflow/workflow.py,sha256=ZufSS073JztVl0OQRTqNyK7FepFvv7gXlc4j5FAEZCI,1216
-naas_abi_core-1.0.2.dist-info/METADATA,sha256=38HzSmS04kqcgI7uMWIyaWMNkvjyP43fU73XF2pAF7w,3192
-naas_abi_core-1.0.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-naas_abi_core-1.0.2.dist-info/entry_points.txt,sha256=R6N3E2Hh92nTrji34JIwBgc6c-wVpfBYBTwkU0xe64E,79
-naas_abi_core-1.0.2.dist-info/RECORD,,
+naas_abi_core-1.0.3.dev1.dist-info/METADATA,sha256=UOS_Na1xUMnzwS_H_NeIhLs7sojsmA5YlDRuU31jqMY,3197
+naas_abi_core-1.0.3.dev1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+naas_abi_core-1.0.3.dev1.dist-info/entry_points.txt,sha256=R6N3E2Hh92nTrji34JIwBgc6c-wVpfBYBTwkU0xe64E,79
+naas_abi_core-1.0.3.dev1.dist-info/RECORD,,