iatoolkit 0.3.6__py3-none-any.whl → 0.3.8__py3-none-any.whl

{iatoolkit-0.3.6.dist-info → iatoolkit-0.3.8.dist-info}/METADATA

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

{iatoolkit-0.3.6.dist-info → iatoolkit-0.3.8.dist-info}/RECORD

@@ -1,27 +1,31 @@
 iatoolkit/__init__.py,sha256=JdcXIcvFFTMy2XI9ccEws_pCklilDkPPEb7RaQNf7oY,1444
-iatoolkit/base_company.py,sha256=VWfpNofFlmgHQQK8BCw2KSOPLd2DM9eA68lGQ3SDE7M,1639
+iatoolkit/base_company.py,sha256=gIFaMbQcZ5RAegfNxpjhFLacnOtCvB3sBiXpMtjfM1w,1859
 iatoolkit/company_registry.py,sha256=cRaez-VBo1icnUNKmkQqo_Xlr8UKWFoYEMZ70XP6Jgk,2702
-iatoolkit/iatoolkit.py,sha256=K7d8fKKTk-Q-sMW6Ip58oleiosRP4e-pdc3E5GSoSMw,16450
+iatoolkit/iatoolkit.py,sha256=OKGh5bYQAlyBn8_iI5UKgVykD9V0lW9x4wZE5rCSp5A,18054
+iatoolkit/system_prompts/arquitectura.prompt,sha256=2W-7NWy6P6y1Gh5_-zD1iK-BWq1Siu8TuvGCouP67bQ,1267
+iatoolkit/system_prompts/format_styles.prompt,sha256=MSMe1qvR3cF_0IbFshn8R0z6Wx6VCHQq1p37rpu5wwk,3576
+iatoolkit/system_prompts/query_main.prompt,sha256=Eu5VOQzUygJ45Ct1WKYGbi0JMltgI6FQIZWlGmN1bdk,3214
+iatoolkit/system_prompts/sql_rules.prompt,sha256=y4nURVnb9AyFwt-lrbMNBHHtZlhk6kC9grYoOhRnrJo,59174
 services/__init__.py,sha256=fSvSfIcPW1dHwTBY1hQ5dBEhaoorzk_GzR4G46gD8tY,173
 services/api_service.py,sha256=InIKTc64BWcp4U4tYKHz28x4ErPxIfvR9x3ZlxJZlXs,2911
 services/benchmark_service.py,sha256=g9JVrmAqIe_iI0D1DwdQ6DJ2_FJRCTndarESNSVfhbw,5907
-services/dispatcher_service.py,sha256=CBslIE5FsrST46JjpKW1k_XHnIRtN9WehEr6LKadZlU,13360
+services/dispatcher_service.py,sha256=wWIw9QwyNZ6yaDbANkNdAkdp-f_EAHbJFegjWDcxTAM,14781
 services/document_service.py,sha256=sm5QtbrKs2dF9hpLuSLMB-IMWYNBD7yWHv3rd80aD0o,5960
 services/excel_service.py,sha256=wE9Udbyb96kGRSnZZ6KM2mbE484rKjTEhta9GKKpy-8,3630
 services/file_processor_service.py,sha256=82UArWtwpr94CAMkkoRP0_nPtoqItymdKSIABS0Xkxw,2943
-services/history_service.py,sha256=dl-D7qgdnzpY9QhjuxJokBYZZ1AF0y59HbRzwpPet58,1654
+services/history_service.py,sha256=6fGSSWxy60nxtkwp_fodwDHoVKhpIUbHnzAzUSiNi-Y,1657
 services/jwt_service.py,sha256=dC45Sn6FyzdzRiQJnzgkjN3Hy21V1imRxB0hTyWRvlA,3979
 services/load_documents_service.py,sha256=_-OTUih8Zk0m4dHqAhkE7kAwU2mbz_QoMrOKnrq7ZWs,8821
 services/mail_service.py,sha256=ystFit1LuYUC4ekYYebyiy1rqYQmxeL6K8h58MxEkOY,2233
-services/profile_service.py,sha256=YtnlXofXtvud4AHOFMmPlX9VO7mhs_Fglpc1PTulExc,17861
-services/prompt_manager_service.py,sha256=kKsqZyt2ZUWIHYTA5C6sfBk8sbXhvYF4QAUN9sOYk_s,7915
-services/query_service.py,sha256=Fx_P1WcuoAp_TyocN5LGlv_hc_03ImzU5QdAIqQg0ek,15591
+services/profile_service.py,sha256=vZV0cregZQiPKYcNLaD7xjez2y6-3Mq97cDndC8NL8w,17922
+services/prompt_manager_service.py,sha256=g499zeWZODqoDvqQZX6eHWmsWj7oLWkEhge7UV_y8IE,7679
+services/query_service.py,sha256=zpaDzjzh2HqAG1F2Ap8WHBpfAMVtzZ_6v1JGVEguwvs,15687
 services/search_service.py,sha256=oJD6WRXCJBD7WUVHWWKxexRkhR8nQSrFtcPV3pFO2KQ,1153
 services/sql_service.py,sha256=H7CIPpXTcxLXLojD2fBFr_mIAD0PW1vEJhKHLfJi4Hk,1418
 services/tasks_service.py,sha256=hHJDlcsSOPtEleD6_Vv3pocfxWNmthIhmZSdnoWFpEM,6861
 services/user_feedback_service.py,sha256=YtCndRBekDEWYEbac431Ksn2gMO5iBrI3WqKK0xtShE,2513
 services/user_session_context_service.py,sha256=5qn7fqpuiU8KgMpU4M5-iRUsETumz1raBw-EeZLuE1A,3868
-iatoolkit-0.3.6.dist-info/METADATA,sha256=njGTmLJWG0JmIXWV2d50TDtYlHIhGL7lS-6wgELu58Q,8801
-iatoolkit-0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-iatoolkit-0.3.6.dist-info/top_level.txt,sha256=dqlBbmgo9okD9d_WMR9uYzdup7Rxgj26yFF85jRGeu4,19
-iatoolkit-0.3.6.dist-info/RECORD,,
+iatoolkit-0.3.8.dist-info/METADATA,sha256=ojUeydEjMKJIbnIpXnuYhgzdN3Q0PcWnDf_MbBcojtY,8801
+iatoolkit-0.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+iatoolkit-0.3.8.dist-info/top_level.txt,sha256=dqlBbmgo9okD9d_WMR9uYzdup7Rxgj26yFF85jRGeu4,19
+iatoolkit-0.3.8.dist-info/RECORD,,

services/dispatcher_service.py

@@ -12,6 +12,7 @@ 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
 import logging
@@ -98,10 +99,9 @@ class Dispatcher:
                 )
                 i += 1
 
-        # initialize the database for every company class
+        # register in the database  every company class
         for company in self.company_classes.values():
-            print(f'company: {company.__class__.__name__}')
-            company.init_db()
+            company.register_company()
 
     def dispatch(self, company_name: str, action: str, **kwargs) -> str:
         company_key = company_name.lower()
@@ -179,19 +179,51 @@ class Dispatcher:
             tools.append(ai_tool)
         return tools
 
-    def get_user_info(self, company_name: str, **kwargs) -> dict:
+    def get_user_info(self, company_name: str, user_identifier: str, is_local_user: bool) -> dict:
         if company_name not in self.company_classes:
             raise IAToolkitException(IAToolkitException.ErrorType.EXTERNAL_SOURCE_ERROR,
-                               f"Empresa no configurada: {company_name}")
+                                     f"Empresa no configurada: {company_name}")
+
+        raw_user_data = {}
+        if is_local_user:
+            # source 1: local user login into IAToolkit
+            raw_user_data = SessionManager.get('user', {})
+        else:
+            # source 2: external company user
+            company_instance = self.company_classes[company_name]
+            try:
+                raw_user_data = company_instance.get_user_info(user_identifier)
+            except Exception as e:
+                logging.exception(e)
+                raise IAToolkitException(IAToolkitException.ErrorType.EXTERNAL_SOURCE_ERROR,
+                                         f"Error en get_user_info de {company_name}: {str(e)}") from e
+
+        # always normalize the data for consistent structure
+        return self._normalize_user_data(raw_user_data, is_local_user)
+
+    def _normalize_user_data(self, raw_data: dict, is_local: bool) -> dict:
+        """
+        Asegura que los datos del usuario siempre tengan una estructura consistente.
+        """
+        # Valores por defecto para un perfil robusto
+        normalized_user = {
+            "id": raw_data.get("id", 0),
+            "user_email": raw_data.get("email", ""),
+            "user_fullname": raw_data.get("user_fullname", ""),
+            "super_user": raw_data.get("super_user", False),
+            "company_id": raw_data.get("company_id", 0),
+            "company_name": raw_data.get("company", ""),
+            "company_short_name": raw_data.get("company_short_name", ""),
+            "is_local": is_local,
+            "extras": raw_data.get("extras", {})
+        }
 
-        company_instance = self.company_classes[company_name]
-        try:
-            return company_instance.get_user_info(**kwargs)
-        except Exception as e:
-            logging.exception(e)
-            raise IAToolkitException(IAToolkitException.ErrorType.EXTERNAL_SOURCE_ERROR,
-                               f"Error en get_user_info de {company_name}: {str(e)}") from e
+        # get the extras from the raw data, if any
+        extras = raw_data.get("extras", {})
+        if isinstance(extras, dict):
+            normalized_user.update(extras)
 
+        return normalized_user
 
     def get_metadata_from_filename(self, company_name: str, filename: str) -> dict:
         if company_name not in self.company_classes:

services/history_service.py

@@ -23,7 +23,7 @@ class HistoryService:
                      external_user_id: str = None,
                      local_user_id: int = 0) -> dict:
         try:
-            user_identifier = self.util.resolve_user_identifier(external_user_id, local_user_id)
+            user_identifier, _ = self.util.resolve_user_identifier(external_user_id, local_user_id)
             if not user_identifier:
                 return {'error': "No se pudo resolver el identificador del usuario"}
 

services/profile_service.py

@@ -79,13 +79,13 @@ class ProfileService:
         user_data = {
             "id": user.id,
             "email": user.email,
-            "first_name": user.first_name,
-            "last_name": user.last_name,
+            "user_fullname": f'{user.first_name} {user.last_name}',
             "super_user": user.super_user,
             "company_id": company.id,
             "company": company.name,
             "company_short_name": company.short_name,
-            "company_logo": company.logo_file
+            "user_is_local": True,       # origin of data
+            "extras": {}                 # company specific data
         }
         SessionManager.set('user', user_data)
 

services/prompt_manager_service.py

@@ -12,6 +12,7 @@ from repositories.models import Prompt, PromptCategory, Company
 import os
 from common.exceptions import IAToolkitException
 from pathlib import Path
+import importlib.resources
 
 
 class PromptService:
@@ -33,18 +34,16 @@ class PromptService:
 
         prompt_filename = prompt_name.lower() + '.prompt'
         if is_system_prompt:
-            template_dir = 'src/system_prompts'
+            if not importlib.resources.files('iatoolkit.system_prompts').joinpath(prompt_filename).is_file():
+                raise IAToolkitException(IAToolkitException.ErrorType.INVALID_NAME,
+                                f'No existe el archivo de prompt de sistemas: {prompt_filename}')
         else:
             template_dir = f'companies/{company.short_name}/prompts'
 
-        # Guardar el filepath como una ruta relativa
-        relative_prompt_path = os.path.join(template_dir, prompt_filename)
-
-        # Validar la existencia del archivo usando la ruta absoluta
-        absolute_prompt_path = os.path.join(os.getcwd(), relative_prompt_path)
-        if not os.path.exists(absolute_prompt_path):
-            raise IAToolkitException(IAToolkitException.ErrorType.INVALID_NAME,
-                               f'No existe el archivo de prompt: {absolute_prompt_path}')
+            relative_prompt_path = os.path.join(template_dir, prompt_filename)
+            if not os.path.exists(relative_prompt_path):
+                raise IAToolkitException(IAToolkitException.ErrorType.INVALID_NAME,
+                               f'No existe el archivo de prompt: {relative_prompt_path}')
 
         prompt = Prompt(
                 company_id=company.id if company else None,
@@ -53,7 +52,7 @@ class PromptService:
                 order=order,
                 category_id=category.id if category and not is_system_prompt else None,
                 active=active,
-                filepath=relative_prompt_path,
+                filename=prompt_filename,
                 is_system_prompt=is_system_prompt,
                 parameters=params
             )
@@ -75,7 +74,7 @@ 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.filepath)
+            absolute_filepath = os.path.join(execution_dir, user_prompt.filename)
             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}")
@@ -103,25 +102,18 @@ class PromptService:
         try:
             system_prompt_content = []
 
-            # get the filepaths for all system prompts
-            current_dir = Path(__file__).resolve().parent
-            project_root = current_dir.parent.parent
-
             # read all the system prompts from the database
             system_prompts = self.llm_query_repo.get_system_prompts()
 
             for prompt in system_prompts:
-                # build the absolute filepath for reading it
-                absolute_filepath = os.path.join(project_root, prompt.filepath)
-                if not os.path.exists(absolute_filepath):
-                    logging.warning(f"El archivo para el prompt de sistema no existe: {absolute_filepath}")
-                    continue
                 try:
-                    with open(absolute_filepath, 'r', encoding='utf-8') as f:
-                        system_prompt_content.append(f.read())
+                    content = importlib.resources.read_text('iatoolkit.system_prompts', prompt.filename)
+                    system_prompt_content.append(content)
+                except FileNotFoundError:
+                    logging.warning(f"El archivo para el prompt de sistema no existe en el paquete: {prompt.filename}")
                 except Exception as e:
                     raise IAToolkitException(IAToolkitException.ErrorType.FILE_IO_ERROR,
-                                       f"Error leyendo el archivo de prompt del sistema {absolute_filepath}: {e}")
+                                             f"Error leyendo el archivo de prompt del sistema '{prompt.filename}': {e}")
 
             # join the system prompts into a single string
             return "\n".join(system_prompt_content)

services/query_service.py

@@ -65,7 +65,7 @@ class QueryService:
             model = self.model
 
         # Validate the user and company
-        user_identifier = self.util.resolve_user_identifier(external_user_id, local_user_id)
+        user_identifier, is_local_user = self.util.resolve_user_identifier(external_user_id, local_user_id)
         if not user_identifier:
             raise IAToolkitException(IAToolkitException.ErrorType.INVALID_USER,
                         "No se pudo resolver el identificador del usuario")
@@ -85,23 +85,25 @@ class QueryService:
 
             # 2. get dictionary with user information from company DB
             # user roles are read at this point from company db
-            user_info = self.dispatcher.get_user_info(
+            user_profile = self.dispatcher.get_user_info(
                 company_name=company_short_name,
-                user_id=user_identifier
+                user_identifier=user_identifier,
+                is_local_user=is_local_user
             )
+
             # add the user logged in to the user_info dictionary
-            user_info['user_id'] = user_identifier
+            user_profile['user_id'] = user_identifier
 
             # save the user information in the session context
             # it's needed for the jinja predefined prompts (filtering)
-            self.session_context.save_user_session_data(company_short_name, user_identifier, user_info)
+            self.session_context.save_user_session_data(company_short_name, user_identifier, user_profile)
 
             # 3. render the iatoolkit main system prompt with the company/user information
             system_prompt_template = self.prompt_service.get_system_prompt()
             rendered_system_prompt = self.util.render_prompt_from_string(
                 template_string=system_prompt_template,
                 question=None,
-                client_data=user_info,
+                client_data=user_profile,
                 company=company,
                 service_list=self.dispatcher.get_company_services(company)
             )
@@ -148,7 +150,7 @@ class QueryService:
                   client_data: dict = {},
                   files: list = []) -> dict:
         try:
-            user_identifier = self.util.resolve_user_identifier(external_user_id, local_user_id)
+            user_identifier, is_local_user = self.util.resolve_user_identifier(external_user_id, local_user_id)
             if not user_identifier:
                 return {"error": True,
                         "error_message": "No se pudo identificar al usuario"}