iatoolkit 0.3.9__tar.gz → 0.4.0__tar.gz

{iatoolkit-0.3.9 → iatoolkit-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iatoolkit
-Version: 0.3.9
+Version: 0.4.0
 Summary: IAToolkit
 Author: Fernando Libedinsky
 License-Expression: MIT

{iatoolkit-0.3.9 → iatoolkit-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "iatoolkit"
-version = "0.3.9"
+version = "0.4.0"
 requires-python = ">=3.11"
 description = "IAToolkit"
 readme = "readme.md"

{iatoolkit-0.3.9 → iatoolkit-0.4.0}/src/iatoolkit/company_registry.py

@@ -46,6 +46,10 @@ class CompanyRegistry:
 
         return self._company_instances.copy()
 
+    def get_all_company_instances(self) -> Dict[str, BaseCompany]:
+        """Devuelve un diccionario con todas las instancias de empresas creadas."""
+        return self._company_instances.copy()
+
     def get_registered_companies(self) -> Dict[str, Type[BaseCompany]]:
         return self._company_classes.copy()
 

{iatoolkit-0.3.9 → iatoolkit-0.4.0}/src/iatoolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iatoolkit
-Version: 0.3.9
+Version: 0.4.0
 Summary: IAToolkit
 Author: Fernando Libedinsky
 License-Expression: MIT

{iatoolkit-0.3.9 → iatoolkit-0.4.0}/src/services/dispatcher_service.py

@@ -3,7 +3,6 @@
 # Todos los derechos reservados.
 # En trámite de registro en el Registro de Propiedad Intelectual de Chile.
 
-from iatoolkit import current_iatoolkit
 from common.exceptions import IAToolkitException
 from services.prompt_manager_service import PromptService
 from services.api_service import ApiService
@@ -11,10 +10,10 @@ from repositories.llm_query_repo import LLMQueryRepo
 from repositories.models import Company, Function
 from services.excel_service import ExcelService
 from services.mail_service import MailService
-from iatoolkit.company_registry import get_company_registry
 from common.session_manager import SessionManager
 from common.util import Utility
 from injector import inject
+from typing import Dict
 import logging
 import os
 
@@ -37,11 +36,10 @@ class Dispatcher:
         self.system_functions = _FUNCTION_LIST
         self.system_prompts = _SYSTEM_PROMPT
 
-        # Use the global registry
-        self.company_registry = get_company_registry()
+        self._company_registry = None
+        self._company_instances = None
 
         # load into the dispatcher the configured companies
-        self.company_classes = {}
         self.initialize_companies()
 
         # run the statrtup logic for all companies
@@ -53,23 +51,40 @@ class Dispatcher:
             "iat_api_call": self.api_service.call_api
         }
 
+    @property
+    def company_registry(self):
+        """Lazy-loads and returns the CompanyRegistry instance."""
+        if self._company_registry is None:
+            from iatoolkit.company_registry import get_company_registry
+            self._company_registry = get_company_registry()
+        return self._company_registry
+
+    @property
+    def company_instances(self):
+        """Lazy-loads and returns the instantiated company classes."""
+        if self._company_instances is None:
+            self._company_instances = self.company_registry.get_all_company_instances()
+        return self._company_instances
+
     def initialize_companies(self):
+        from iatoolkit import current_iatoolkit
         """
         Initializes and instantiates all registered company classes.
         This method should be called *after* the main injector is fully configured
         and the company registry is populated.
         """
-        if self.company_classes: # Prevent re-initialization
+        if self.company_registry.get_all_company_instances():  # Check if already instantiated
             return
 
         # ✅ NOW it is safe to get the injector and instantiate companies.
         injector = current_iatoolkit().get_injector()
         self.company_registry.set_injector(injector)
-        self.company_classes = self.company_registry.instantiate_companies()
+        self.company_registry.instantiate_companies()
+
 
     def start_execution(self):
         """Runs the startup logic for all registered companies."""
-        for company_name, company_instance in self.company_classes.items():
+        for company_name, company_instance in self.company_instances.items():
             logging.info(f'Starting execution for company: {company_name}')
             company_instance.start_execution()
 
@@ -100,14 +115,14 @@ class Dispatcher:
                 i += 1
 
         # register in the database  every company class
-        for company in self.company_classes.values():
+        for company in self.company_instances.values():
             company.register_company()
 
     def dispatch(self, company_name: str, action: str, **kwargs) -> str:
         company_key = company_name.lower()
 
-        if company_key not in self.company_classes:
-            available_companies = list(self.company_classes.keys())
+        if company_key not in self.company_instances:
+            available_companies = list(self.company_instances.keys())
             raise IAToolkitException(
                 IAToolkitException.ErrorType.EXTERNAL_SOURCE_ERROR,
                 f"Empresa '{company_name}' no configurada. Empresas disponibles: {available_companies}"
@@ -117,7 +132,7 @@ class Dispatcher:
         if action in self.tool_handlers:
             return  self.tool_handlers[action](**kwargs)
 
-        company_instance = self.company_classes[company_name]
+        company_instance = self.company_instances[company_name]
         try:
             return company_instance.handle_request(action, **kwargs)
         except IAToolkitException as e:
@@ -130,7 +145,7 @@ class Dispatcher:
                                f"Error en function call '{action}': {str(e)}") from e
 
     def get_company_context(self, company_name: str, **kwargs) -> str:
-        if company_name not in self.company_classes:
+        if company_name not in self.company_instances:
             raise IAToolkitException(IAToolkitException.ErrorType.EXTERNAL_SOURCE_ERROR,
                                f"Empresa no configurada: {company_name}")
 
@@ -152,7 +167,7 @@ class Dispatcher:
             filepath = os.path.join(schema_dir, file)
             company_context += self.util.generate_context_for_schema(schema_name, filepath)
 
-        company_instance = self.company_classes[company_name]
+        company_instance = self.company_instances[company_name]
         try:
             return company_context + company_instance.get_company_context(**kwargs)
         except Exception as e:
@@ -180,7 +195,7 @@ class Dispatcher:
         return tools
 
     def get_user_info(self, company_name: str, user_identifier: str, is_local_user: bool) -> dict:
-        if company_name not in self.company_classes:
+        if company_name not in self.company_instances:
             raise IAToolkitException(IAToolkitException.ErrorType.EXTERNAL_SOURCE_ERROR,
                                      f"Empresa no configurada: {company_name}")
 
@@ -190,7 +205,7 @@ class Dispatcher:
             raw_user_data = SessionManager.get('user', {})
         else:
             # source 2: external company user
-            company_instance = self.company_classes[company_name]
+            company_instance = self.company_instances[company_name]
             try:
                 raw_user_data = company_instance.get_user_info(user_identifier)
             except Exception as e:
@@ -226,11 +241,11 @@ class Dispatcher:
         return normalized_user
 
     def get_metadata_from_filename(self, company_name: str, filename: str) -> dict:
-        if company_name not in self.company_classes:
+        if company_name not in self.company_instances:
             raise IAToolkitException(IAToolkitException.ErrorType.EXTERNAL_SOURCE_ERROR,
                                f"Empresa no configurada: {company_name}")
 
-        company_instance = self.company_classes[company_name]
+        company_instance = self.company_instances[company_name]
         try:
             return company_instance.get_metadata_from_filename(filename)
         except Exception as e:
@@ -240,14 +255,14 @@ class Dispatcher:
 
     def get_company_instance(self, company_name: str):
         """Returns the instance for a given company name."""
-        return self.company_classes.get(company_name)
+        return self.company_instances.get(company_name)
 
     def get_registered_companies(self) -> dict:
-        """Obtiene todas las empresas registradas (para debugging/admin)"""
+        """Gets all registered companies (for debugging/admin purposes)"""
         return {
             "registered_classes": list(self.company_registry.get_registered_companies().keys()),
-            "instantiated": list(self.company_classes.keys()),
-            "count": len(self.company_classes)
+            "instantiated": list(self.company_instances.keys()),
+            "count": len(self.company_instances)
         }
 
 

{iatoolkit-0.3.9 → iatoolkit-0.4.0}/src/services/prompt_manager_service.py

@@ -74,7 +74,8 @@ class PromptService:
                 raise IAToolkitException(IAToolkitException.ErrorType.DOCUMENT_NOT_FOUND,
                                    f"No se encontró el prompt '{prompt_name}' para la empresa '{company.short_name}'")
 
-            absolute_filepath = os.path.join(execution_dir, user_prompt.filename)
+            prompt_file = f'companies/{company.short_name}/prompts/{user_prompt.filename}'
+            absolute_filepath = os.path.join(execution_dir, prompt_file)
             if not os.path.exists(absolute_filepath):
                 raise IAToolkitException(IAToolkitException.ErrorType.FILE_IO_ERROR,
                                    f"El archivo para el prompt '{prompt_name}' no existe: {absolute_filepath}")

{iatoolkit-0.3.9 → iatoolkit-0.4.0}/src/iatoolkit/__init__.py

@@ -21,9 +21,9 @@ from services.excel_service import ExcelService
 from services.dispatcher_service import Dispatcher
 from services.document_service import DocumentService
 from services.search_service import SearchService
-from services.query_service import QueryService
 from repositories.profile_repo import ProfileRepo
 from repositories.llm_query_repo import LLMQueryRepo
+from services.query_service import QueryService
 from repositories.database_manager import DatabaseManager
 from infra.call_service import CallServiceClient
 from common.util import Utility
@@ -40,8 +40,8 @@ __all__ = [
     'ExcelService',
     'Dispatcher',
     'DocumentService',
-    'QueryService',
     'SearchService',
+    'QueryService',
     'ProfileRepo',
     'LLMQueryRepo',
     'DatabaseManager',