iatoolkit 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

iatoolkit/base_company.py

@@ -6,12 +6,66 @@
 # companies/base_company.py
 from abc import ABC, abstractmethod
 from typing import Any
+from repositories.profile_repo import ProfileRepo
+from repositories.llm_query_repo import LLMQueryRepo
+from services.prompt_manager_service import PromptService
+from repositories.models import Company, Function, PromptCategory
+from iatoolkit import IAToolkit
 
 
 class BaseCompany(ABC):
-    def __init__(self, profile_repo: Any = None, llm_query_repo: Any = None):
-        self.profile_repo = profile_repo
-        self.llm_query_repo = llm_query_repo
+    def __init__(self):
+        # Obtener el inyector global y resolver las dependencias internamente
+        injector = IAToolkit.get_instance().get_injector()
+        self.profile_repo: ProfileRepo = injector.get(ProfileRepo)
+        self.llm_query_repo: LLMQueryRepo = injector.get(LLMQueryRepo)
+        self.prompt_service: PromptService = injector.get(PromptService)
+        self.company: Company | None = None
+
+    def _load_company_by_short_name(self, short_name: str) -> Company:
+        self.company = self.profile_repo.get_company_by_short_name(short_name)
+        return self.company
+
+    def _create_company(self, name: str, short_name: str) -> Company:
+        company_obj = Company(name=name, short_name=short_name, allow_jwt=True)
+        self.company = self.profile_repo.create_company(company_obj)
+        return self.company
+
+    def _create_function(self, function_name: str, description: str, params: dict, **kwargs):
+        if not self.company:
+            raise ValueError("La compañía debe estar definida antes de crear una función.")
+
+        self.llm_query_repo.create_or_update_function(
+            Function(
+                company_id=self.company.id,
+                name=function_name,
+                description=description,
+                parameters=params,
+                system_function=False,
+                **kwargs
+            )
+        )
+
+    def _create_prompt_category(self, name: str, order: int) -> PromptCategory:
+        if not self.company:
+            raise ValueError("La compañía debe estar definida antes de crear una categoría.")
+
+        return self.llm_query_repo.create_or_update_prompt_category(
+            PromptCategory(name=name, order=order, company_id=self.company.id)
+        )
+
+    def _create_prompt(self, prompt_name: str, description: str, category: PromptCategory, order: int, **kwargs):
+        if not self.company:
+            raise ValueError("La compañía debe estar definida antes de crear un prompt.")
+
+        self.prompt_service.create_prompt(
+            prompt_name=prompt_name,
+            description=description,
+            order=order,
+            company=self.company,
+            category=category,
+            **kwargs
+        )
 
     @abstractmethod
     # initialize all the database tables  needed

iatoolkit/cli_commands.py

@@ -11,26 +11,12 @@ from services.profile_service import ProfileService
 
 def register_core_commands(app):
     """Registra los comandos CLI del núcleo de IAToolkit."""
-    
-    @app.cli.command("setup-all-companies")
-    def setup_all_companies():
-        """🗄️ Inicializa todas las compañías registradas en la base de datos."""
-        try:
-            dispatcher = IAToolkit.get_instance().get_injector().get(Dispatcher)
-            click.echo("🚀 Inicializando base de datos y compañías...")
-            dispatcher.setup_all_companies()
-            click.echo("✅ Base de datos y compañías inicializadas correctamente.")
-        except Exception as e:
-            logging.exception(e)
-            click.echo(f"❌ Error: {e}")
 
-    @app.cli.command("setup-company")
+    @app.cli.command("api-key")
     @click.argument("company_short_name")
-    def setup_company(company_short_name: str):
+    def api_key(company_short_name: str):
         """⚙️ Genera una nueva API key para una compañía ya registrada."""
         try:
-            dispatcher = IAToolkit.get_instance().get_injector().get(Dispatcher)
-            dispatcher.setup_all_companies()
             profile_service = IAToolkit.get_instance().get_injector().get(ProfileService)
             click.echo(f"🔑 Generando API key para '{company_short_name}'...")
             result = profile_service.new_api_key(company_short_name)
@@ -47,13 +33,13 @@ def register_core_commands(app):
 
     @app.cli.command("encrypt-key")
     @click.argument("key")
-    def api_key(key: str):
+    def encrypt_llm_api_key(key: str):
         from common.util import Utility
 
         util = IAToolkit.get_instance().get_injector().get(Utility)
         try:
             encrypt_key = util.encrypt_key(key)
-            click.echo(f'la clave encriptada es: {encrypt_key} \n')
+            click.echo(f'la api-key del LLM encriptada es: {encrypt_key} \n')
         except Exception as e:
             logging.exception(e)
             click.echo(f"Error: {str(e)}")

{iatoolkit-0.7.0.dist-info → iatoolkit-0.7.1.dist-info}/METADATA

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

{iatoolkit-0.7.0.dist-info → iatoolkit-0.7.1.dist-info}/RECORD

@@ -1,31 +1,30 @@
 iatoolkit/__init__.py,sha256=GkFxAQHKPifz4Kd8M73Rc8TWRVIxjxkl1N0nsPvb_sU,1743
-iatoolkit/base_company.py,sha256=2fG6NqmBOHGRq6LMRNx6xQoa_WqE2coFu8Y4-9V0GpQ,1939
-iatoolkit/cli_commands.py,sha256=9zL_UEjaduxVeKXClBbFNzS9I9tKcbmOS695jy94OEY,3013
+iatoolkit/base_company.py,sha256=WmD4o0qFC1n5DW5eRsRsuNfaGot9nxGFcJe3LmibSuE,4259
+iatoolkit/cli_commands.py,sha256=D_MB6wm9cCnrvsn6B2_T-a48KRXOVvGL_-P24wFLEkU,2321
 iatoolkit/company_registry.py,sha256=tduqt3oV8iDX_IB1eA7KIgvIxE4edTcy-3qZIXh3Lzw,2549
 iatoolkit/iatoolkit.py,sha256=WgBm34nAeVBCpfDDZD13Pos9xIoRx5viVwxjyYCXAmY,15790
 iatoolkit/system_prompts/format_styles.prompt,sha256=MSMe1qvR3cF_0IbFshn8R0z6Wx6VCHQq1p37rpu5wwk,3576
 iatoolkit/system_prompts/query_main.prompt,sha256=w_9ybgWgiQH4V_RbAXqsvz0M7oOuiyhxcwf-D0CgfA4,3017
 iatoolkit/system_prompts/sql_rules.prompt,sha256=y4nURVnb9AyFwt-lrbMNBHHtZlhk6kC9grYoOhRnrJo,59174
 services/__init__.py,sha256=5JqK9sZ6jBuK83zDQokUhxQ0wuJJJ9DXB8pYCLkX7X4,102
-services/api_service.py,sha256=7FxO9_g-gxuEmYIl5PhgJb7lHVgXJ1btHdH9fDrdhvY,2840
 services/benchmark_service.py,sha256=_ruKh9YzrTLtR0ZKrRNxqJQW0HdbwWuFz1gfLzJ9owA,5850
-services/dispatcher_service.py,sha256=AEaNwROTqUdsZU-RnLylsGQvbiM0540YKKp9PEKKWj4,14098
+services/dispatcher_service.py,sha256=o4XYB04tD_k8MNqgnfSTvtuCc6f4AWaFFbwy9PKEkuo,13983
 services/document_service.py,sha256=8MsJz0pihM9E9Z92PrPqDgQnpMAmpFrbogXr5HscMWM,5926
 services/excel_service.py,sha256=ATPaeAvkLwQAkPZ3AKIUpO73RVyRg0D8c6i37_mcql0,3559
 services/file_processor_service.py,sha256=98yWYF7nIq1nm7nh6IzMmTKaOMTIeqCFWYwXVtV-ZJI,4102
 services/history_service.py,sha256=j0QCqcIIyw7DBy3GrZrEZNk0I4m-uuRoG5g0Z2RCcOE,1586
 services/jwt_service.py,sha256=YoZ9h7_o9xBko-arNQv4MbcwnxoSWVNj4VbZmMo_QGY,3908
-services/load_documents_service.py,sha256=XQ_Ck1pvj6TfJRIC1cNrWRbLmC0u7E0VJkNWC6L2gI4,7027
+services/load_documents_service.py,sha256=UGfomYz7seWFXawbDuk2t6CyoEr1vggR8vmrCUAeLBg,7190
 services/mail_service.py,sha256=_67pctxZO46DHnWBip51ayuYtWd4bEoS1kg29ACO7_I,2162
 services/profile_service.py,sha256=vTK9TvH_2AFdqgL3sGjhck9LyLGIbvdC2USoaRx82G8,17561
-services/prompt_manager_service.py,sha256=W-OkG881D7Yyc8PsM2RxDl0nzvTP55bQfl9rHR9yl24,7955
-services/query_service.py,sha256=yITLcopc1stgzTkFdrBuF84k_XYsZyoKGue1GfXsb-U,15614
+services/prompt_manager_service.py,sha256=Ed40Iz-Az7xDmmzpLwPHufzvY_z5ojLuK7svT-pB9Us,8326
+services/query_service.py,sha256=xw5ouFrV8ecg3qODZihVBIbHivKYMeg5pLi2CU1XEbQ,15298
 services/search_service.py,sha256=bB3FWFxJi1iYsOdBxyu9tzIO406nQxcyeQzEowpmpjY,1803
 services/sql_service.py,sha256=s84K1ADlvMtum949wgMh8jsmqlOUeL-m_SWfAM4Wsv4,2141
 services/tasks_service.py,sha256=1DdbERlAxIkCpGEylnHDKC-KAsXRJugbaRSzRbPfL58,6790
 services/user_feedback_service.py,sha256=_LeNBYz4hHFapXfYTQVfkkD34gE8j2UeKnyOZ8H0nWo,2442
 services/user_session_context_service.py,sha256=GluNSgqP6W_hFke4oslSnfGnU_b-ph28BHH6jf3EIm0,3797
-iatoolkit-0.7.0.dist-info/METADATA,sha256=I_F_F9diQdbMvZ3E_ygMfwpsITxiqqqnXQ1hNzAdOg8,9300
-iatoolkit-0.7.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iatoolkit-0.7.0.dist-info/top_level.txt,sha256=dqlBbmgo9okD9d_WMR9uYzdup7Rxgj26yFF85jRGeu4,19
-iatoolkit-0.7.0.dist-info/RECORD,,
+iatoolkit-0.7.1.dist-info/METADATA,sha256=fUzcLZTwz94BL_jmvcK9XUYIkMurSH0qXPqFi6t2aKo,9300
+iatoolkit-0.7.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iatoolkit-0.7.1.dist-info/top_level.txt,sha256=dqlBbmgo9okD9d_WMR9uYzdup7Rxgj26yFF85jRGeu4,19
+iatoolkit-0.7.1.dist-info/RECORD,,

services/dispatcher_service.py

@@ -5,7 +5,6 @@
 
 from common.exceptions import IAToolkitException
 from services.prompt_manager_service import PromptService
-from services.api_service import ApiService
 from repositories.llm_query_repo import LLMQueryRepo
 from repositories.models import Company, Function
 from services.excel_service import ExcelService
@@ -24,12 +23,10 @@ class Dispatcher:
                  prompt_service: PromptService,
                  llmquery_repo: LLMQueryRepo,
                  util: Utility,
-                 api_service: ApiService,
                  excel_service: ExcelService,
                  mail_service: MailService):
         self.prompt_service = prompt_service
         self.llmquery_repo = llmquery_repo
-        self.api_service = api_service
         self.util = util
         self.excel_service = excel_service
         self.mail_service = mail_service
@@ -42,7 +39,6 @@ class Dispatcher:
         self.tool_handlers = {
             "iat_generate_excel": self.excel_service.excel_generator,
             "iat_send_email": self.mail_service.send_mail,
-            "iat_api_call": self.api_service.call_api
         }
 
     @property
@@ -61,13 +57,17 @@ class Dispatcher:
         return self._company_instances
 
     def start_execution(self):
+        # initialize the system functions and prompts
+        self.setup_iatoolkit_system()
+
         """Runs the startup logic for all registered companies."""
-        for company_name, company_instance in self.company_instances.items():
-            company_instance.start_execution()
+        for company in self.company_instances.values():
+            company.register_company()
+            company.start_execution()
 
         return True
 
-    def setup_all_companies(self):
+    def setup_iatoolkit_system(self):
         # create system functions
         for function in self.system_functions:
             self.llmquery_repo.create_or_update_function(
@@ -80,16 +80,16 @@ class Dispatcher:
                 )
             )
 
-            # create the system prompts
-            i = 1
-            for prompt in self.system_prompts:
-                self.prompt_service.create_prompt(
-                    prompt_name=prompt['name'],
-                    description=prompt['description'],
-                    order=1,
-                    is_system_prompt=True,
-                )
-                i += 1
+        # create the system prompts
+        i = 1
+        for prompt in self.system_prompts:
+            self.prompt_service.create_prompt(
+                prompt_name=prompt['name'],
+                description=prompt['description'],
+                order=1,
+                is_system_prompt=True,
+            )
+            i += 1
 
         # register in the database  every company class
         for company in self.company_instances.values():

services/load_documents_service.py

@@ -120,6 +120,10 @@ class LoadDocumentsService:
             context (dict, optional): A context dictionary, may contain predefined metadata.
         """
 
+        if not company:
+            raise IAToolkitException(IAToolkitException.ErrorType.MISSING_PARAMETER,
+                        f"Falta configurar empresa")
+
         # check if file exist in repositories
         if self.doc_repo.get(company_id=company.id,filename=filename):
             return

services/prompt_manager_service.py

@@ -29,8 +29,7 @@ class PromptService:
                       category: PromptCategory = None,
                       active: bool = True,
                       is_system_prompt: bool = False,
-                      custom_fields: list = [],
-                      params: dict = {}
+                      custom_fields: list = []
                       ):
 
         prompt_filename = prompt_name.lower() + '.prompt'
@@ -46,6 +45,16 @@ class PromptService:
                 raise IAToolkitException(IAToolkitException.ErrorType.INVALID_NAME,
                                f'No existe el archivo de prompt: {relative_prompt_path}')
 
+        if custom_fields:
+            for f in custom_fields:
+                if ('data_key' not in f) or ('label' not in f):
+                    raise IAToolkitException(IAToolkitException.ErrorType.INVALID_PARAMETER,
+                               f'El campo custom_fields debe contener los campos: data_key y label')
+
+                # add default value for data_type
+                if 'type' not in f:
+                    f['type'] = 'text'
+
         prompt = Prompt(
                 company_id=company.id if company else None,
                 name=prompt_name,
@@ -55,8 +64,7 @@ class PromptService:
                 active=active,
                 filename=prompt_filename,
                 is_system_prompt=is_system_prompt,
-                custom_fields=custom_fields,
-                parameters=params
+                custom_fields=custom_fields
             )
 
         try:

services/query_service.py

@@ -210,14 +210,8 @@ class QueryService:
                     company=company,
                 )
 
-            # client profile
-            client_profile = ''
-            if final_client_data.get('client_identity'):
-                client_profile = f"cliente sobre el cual se esta consultando se identifica como ´client_identity´ y tiene el valor: {final_client_data.get('client_identity')}"
-
-
             # This is the final user-facing prompt for this specific turn
-            user_turn_prompt = f"{main_prompt}\n{client_profile}\n{files_context}"
+            user_turn_prompt = f"{main_prompt}\n{files_context}"
             if not prompt_name:
                 user_turn_prompt += f"\n### La pregunta que debes responder es: {question}"
             else:

services/api_service.py

@@ -1,75 +0,0 @@
-# Copyright (c) 2024 Fernando Libedinsky
-# Product: IAToolkit
-#
-# IAToolkit is open source software.
-
-from infra.call_service import CallServiceClient
-from injector import inject
-from common.exceptions import IAToolkitException
-import json
-from typing import Optional, Dict, Any, Union
-
-class ApiService:
-    @inject
-    def __init__(self, call_service: CallServiceClient):
-        self.call_service = call_service
-
-    def call_api(
-        self,
-        endpoint: str,
-        method: str,
-        headers: Optional[Dict[str, str]] = None,
-        params: Optional[Dict[str, Union[str, int, float, bool]]] = None,
-        body: Optional[Dict[str, Any]] = None,
-        files: Optional[Dict[str, Any]] = None,
-        timeout: Union[int, float, tuple] = 10
-    ) -> str:
-        """
-        Ejecuta una llamada HTTP genérica.
-
-        - endpoint: URL completa
-        - method: GET | POST | PUT | DELETE (case-insensitive)
-        - headers: dict opcional de cabeceras
-        - params: dict opcional de query string
-        - body: dict opcional para JSON (POST/PUT/DELETE)
-        - files: dict opcional para multipart/form-data (prioriza POST files)
-        - timeout: segundos (int/float) o tuple (connect, read)
-        """
-        m = (method or "").strip().lower()
-
-        if m == "get":
-            response, status_code = self.call_service.get(
-                endpoint, params=params, headers=headers, timeout=timeout
-            )
-        elif m == "post":
-            # Si vienen files → multipart; si no → JSON
-            if files:
-                response, status_code = self.call_service.post_files(
-                    endpoint, data=files, params=params, headers=headers, timeout=timeout
-                )
-            else:
-                response, status_code = self.call_service.post(
-                    endpoint=endpoint, json_dict=body, params=params, headers=headers, timeout=timeout
-                )
-        elif m == "put":
-            response, status_code = self.call_service.put(
-                endpoint, json_dict=body, params=params, headers=headers, timeout=timeout
-            )
-        elif m == "delete":
-            response, status_code = self.call_service.delete(
-                endpoint, json_dict=body, params=params, headers=headers, timeout=timeout
-            )
-        else:
-            raise IAToolkitException(
-                IAToolkitException.ErrorType.INVALID_PARAMETER,
-                f"API error: método '{method}' no soportado"
-            )
-
-        if status_code < 200 or status_code >= 300:
-            raise IAToolkitException(
-                IAToolkitException.ErrorType.CALL_ERROR,
-                f"API {endpoint} error: {status_code}"
-            )
-
-        # Normalizamos a string JSON (para que el LLM lo consuma consistente)
-        return json.dumps(response)