iatoolkit 0.22.1__py3-none-any.whl → 0.50.2__py3-none-any.whl

iatoolkit/services/profile_service.py

@@ -5,18 +5,18 @@
 
 from injector import inject
 from iatoolkit.repositories.profile_repo import ProfileRepo
+from iatoolkit.services.dispatcher_service import Dispatcher
 from iatoolkit.repositories.models import User, Company, ApiKey
 from flask_bcrypt import check_password_hash
 from iatoolkit.common.session_manager import SessionManager
+from iatoolkit.services.user_session_context_service import UserSessionContextService
 from flask_bcrypt import Bcrypt
 from iatoolkit.infra.mail_app import MailApp
 import random
-import logging
 import re
 import secrets
 import string
-from datetime import datetime, timezone
-from iatoolkit.services.user_session_context_service import UserSessionContextService
+from iatoolkit.services.dispatcher_service import Dispatcher
 
 
 class ProfileService:
@@ -24,8 +24,10 @@ class ProfileService:
     def __init__(self,
                  profile_repo: ProfileRepo,
                  session_context_service: UserSessionContextService,
+                 dispatcher: Dispatcher,
                  mail_app: MailApp):
         self.profile_repo = profile_repo
+        self.dispatcher = dispatcher
         self.session_context = session_context_service
         self.mail_app = mail_app
         self.bcrypt = Bcrypt()
@@ -42,7 +44,7 @@ class ProfileService:
             if not check_password_hash(user.password, password):
                 return {'success': False, "message": "Contraseña inválida"}
 
-            company = self.get_company_by_short_name(company_short_name)
+            company = self.profile_repo.get_company_by_short_name(company_short_name)
             if not company:
                 return {'success': False, "message": "Empresa no encontrada"}
 
@@ -54,34 +56,87 @@ class ProfileService:
                 return {'success': False,
                         "message": "Tu cuenta no ha sido verificada. Por favor, revisa tu correo."}
 
-            # save user data into session manager
-            self.set_user_session(user=user, company=company)
-
-            return {'success': True, "user": user, "message": "Login exitoso"}
+            # 1. Build the local user profile dictionary here.
+            # the user_profile variables are used on the LLM templates also (see in query_main.prompt)
+            user_identifier = user.email             # no longer de ID
+            user_profile = {
+                "id": user_identifier,
+                "user_email": user.email,
+                "user_fullname": f'{user.first_name} {user.last_name}',
+                "user_is_local": True,
+                "extras": {}
+            }
+
+            # 2. Call the session creation helper with the pre-built profile.
+            # user_identifier = str(user.id)
+            self.create_web_session(company, user_identifier, user_profile)
+            return {'success': True, "user_identifier": user_identifier, "message": "Login exitoso"}
         except Exception as e:
             return {'success': False, "message": str(e)}
 
+    def create_external_user_session(self, company: Company, external_user_id: str):
+        """
+        Public method for views to create a web session for an external user.
+        """
+        # 1. Fetch the profile from the external system via Dispatcher.
+        user_profile = self.dispatcher.get_user_info(
+            company_name=company.short_name,
+            user_identifier=external_user_id
+        )
+
+        # 2. Call the session creation helper with external_user_id as user_identifier
+        self.create_web_session(
+            company=company,
+            user_identifier=external_user_id,
+            user_profile=user_profile)
+
+    def create_web_session(self, company: Company, user_identifier: str, user_profile: dict):
+        """
+        Private helper: Takes a pre-built profile, saves it to Redis, and sets the Flask cookie.
+        """
+        user_profile['company_short_name'] = company.short_name
+        user_profile['user_identifier'] = user_identifier
+        user_profile['user_id'] = user_identifier
+        user_profile['company_id'] = company.id
+        user_profile['company'] = company.name
+
+        # user_profile['last_activity'] = datetime.now(timezone.utc).timestamp()
+        self.session_context.save_profile_data(company.short_name, user_identifier, user_profile)
 
-    def set_user_session(self, user: User, company: Company):
-        SessionManager.set('user_id', user.id)
-        SessionManager.set('company_id', company.id)
+        # save this values into Flask session cookie
+        SessionManager.set('user_identifier', user_identifier)
         SessionManager.set('company_short_name', company.short_name)
 
-        # save user data into session manager
-        user_data = {
-            "id": user.id,
-            "email": user.email,
-            "user_fullname": f'{user.first_name} {user.last_name}',
-            "company_id": company.id,
-            "company": company.name,
-            "company_short_name": company.short_name,
-            "user_is_local": True,       # origin of data
-            "extras": {}                 # company specific data
+    def get_current_session_info(self) -> dict:
+        """
+         Gets the current web user's profile from the unified session.
+         This is the standard way to access user data for web requests.
+         """
+        # 1. Get identifiers from the simple Flask session cookie.
+        user_identifier = SessionManager.get('user_identifier')
+        company_short_name = SessionManager.get('company_short_name')
+
+        if not user_identifier or not company_short_name:
+            # No authenticated web user.
+            return {}
+
+        # 2. Use the identifiers to fetch the full, authoritative profile from Redis.
+        profile = self.session_context.get_profile_data(company_short_name, user_identifier)
+
+        return {
+            "user_identifier": user_identifier,
+            "company_short_name": company_short_name,
+            "profile": profile
         }
-        SessionManager.set('user', user_data)
 
-        # save time session was activated (in timestamp format)
-        SessionManager.set('last_activity', datetime.now(timezone.utc).timestamp())
+    def get_profile_by_identifier(self, company_short_name: str, user_identifier: str) -> dict:
+        """
+        Fetches a user profile directly by their identifier, bypassing the Flask session.
+        This is ideal for API-side checks.
+        """
+        if not company_short_name or not user_identifier:
+            return {}
+        return self.session_context.get_profile_data(company_short_name, user_identifier)
 
 
     def signup(self,
@@ -95,7 +150,7 @@ class ProfileService:
         try:
 
             # get company info
-            company = self.get_company_by_short_name(company_short_name)
+            company = self.profile_repo.get_company_by_short_name(company_short_name)
             if not company:
                 return {"error": f"la empresa {company_short_name} no existe"}
 
@@ -240,6 +295,9 @@ class ProfileService:
     def get_company_by_short_name(self, short_name: str) -> Company:
         return self.profile_repo.get_company_by_short_name(short_name)
 
+    def get_active_api_key_entry(self, api_key_value: str) -> ApiKey | None:
+        return self.profile_repo.get_active_api_key_entry(api_key_value)
+
     def new_api_key(self, company_short_name: str):
         company = self.get_company_by_short_name(company_short_name)
         if not company:

iatoolkit/services/query_service.py

@@ -4,11 +4,11 @@
 # IAToolkit is open source software.
 
 from iatoolkit.infra.llm_client import llmClient
+from iatoolkit.services.profile_service import ProfileService
 from iatoolkit.repositories.document_repo import DocumentRepo
 from iatoolkit.repositories.profile_repo import ProfileRepo
 from iatoolkit.services.document_service import DocumentService
 from iatoolkit.repositories.llm_query_repo import LLMQueryRepo
-
 from iatoolkit.repositories.models import Task
 from iatoolkit.services.dispatcher_service import Dispatcher
 from iatoolkit.services.prompt_manager_service import PromptService
@@ -21,6 +21,7 @@ import logging
 from typing import Optional
 import json
 import time
+import hashlib
 import os
 
 
@@ -30,6 +31,7 @@ class QueryService:
     @inject
     def __init__(self,
                  llm_client: llmClient,
+                 profile_service: ProfileService,
                  document_service: DocumentService,
                  document_repo: DocumentRepo,
                  llmquery_repo: LLMQueryRepo,
@@ -39,6 +41,7 @@ class QueryService:
                  dispatcher: Dispatcher,
                  session_context: UserSessionContextService
                  ):
+        self.profile_service = profile_service
         self.document_service = document_service
         self.document_repo = document_repo
         self.llmquery_repo = llmquery_repo
@@ -55,107 +58,133 @@ class QueryService:
             raise IAToolkitException(IAToolkitException.ErrorType.API_KEY,
                                "La variable de entorno 'LLM_MODEL' no está configurada.")
 
+    def _build_context_and_profile(self, company_short_name: str, user_identifier: str) -> tuple:
+        # this method read the user/company context from the database and renders the system prompt
+        company = self.profile_repo.get_company_by_short_name(company_short_name)
+        if not company:
+            return None, None
+
+        # Get the user profile from the single source of truth.
+        user_profile = self.profile_service.get_profile_by_identifier(company_short_name, user_identifier)
+        if not user_profile:
+            # This might happen if a session exists for a user that was deleted.
+            return None, None
+
+        # 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_profile,
+            company=company,
+            service_list=self.dispatcher.get_company_services(company)
+        )
+
+        # get the company context: schemas, database models, .md files
+        company_specific_context = self.dispatcher.get_company_context(company_name=company_short_name)
+
+        # merge context: company + user
+        final_system_context = f"{company_specific_context}\n{rendered_system_prompt}"
+
+        return final_system_context, user_profile
+
+    def prepare_context(self, company_short_name: str, user_identifier: str) -> dict:
+        # prepare the context and decide if it needs to be rebuilt
+        # save the generated context in the session context for later use
+        if not user_identifier:
+            return {'rebuild_needed': True, 'error': 'Invalid user identifier'}
 
-    def llm_init_context(self,
-                         company_short_name: str,
-                         external_user_id: str = None,
-                         local_user_id: int = 0,
-                         model: str = ''):
-        start_time = time.time()
-        if not model:
-            model = self.model
+        # create the company/user context and compute its version
+        final_system_context, user_profile = self._build_context_and_profile(
+            company_short_name, user_identifier)
 
-        # Validate the user and company
-        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")
+        # save the user information in the session context
+        # it's needed for the jinja predefined prompts (filtering)
+        self.session_context.save_profile_data(company_short_name, user_identifier, user_profile)
 
-        company = self.profile_repo.get_company_by_short_name(company_short_name)
-        if not company:
-            raise IAToolkitException(IAToolkitException.ErrorType.INVALID_NAME,
-                               f"Empresa no encontrada: {company_short_name}")
+        # calculate the context version
+        current_version = self._compute_context_version_from_string(final_system_context)
 
-        logging.info(f"Inicializando contexto para {company_short_name}/{user_identifier} con modelo {model}  ...")
         try:
-            # 1. clean any previous context for company/user
-            self.session_context.clear_all_context(
-                company_short_name=company_short_name,
-                user_identifier=user_identifier
-            )
+            prev_version = self.session_context.get_context_version(company_short_name, user_identifier)
+        except Exception:
+            prev_version = None
 
-            # 2. get dictionary with user information from company DB
-            # user roles are read at this point from company db
-            user_profile = self.dispatcher.get_user_info(
-                company_name=company_short_name,
-                user_identifier=user_identifier,
-                is_local_user=is_local_user
-            )
+        rebuild_is_needed = not (prev_version and prev_version == current_version and
+                                 self._has_valid_cached_context(company_short_name, user_identifier))
 
-            # add the user logged in to the user_info dictionary
-            user_profile['user_id'] = user_identifier
+        if rebuild_is_needed:
+            logging.info(
+                f"Se necesita reconstrucción de contexto para {company_short_name}/{user_identifier}. Preparando...")
 
-            # 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_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_profile,
-                company=company,
-                service_list=self.dispatcher.get_company_services(company)
-            )
+            # Guardar el contexto preparado y su versión para que `finalize_context_rebuild` los use.
+            self.session_context.save_prepared_context(company_short_name, user_identifier, final_system_context,
+                                                       current_version)
+
+        return {'rebuild_needed': rebuild_is_needed}
+
+    def finalize_context_rebuild(self, company_short_name: str, user_identifier: str, model: str = ''):
+
+        # end the initilization, if there is a prepare context send it to llm
+        if not model:
+            model = self.model
 
-            # 4. add more company context: schemas, database models, .md files
-            company_specific_context = self.dispatcher.get_company_context(company_name=company_short_name)
+        # --- Lógica de Bloqueo ---
+        lock_key = f"lock:context:{company_short_name}/{user_identifier}"
+        if not self.session_context.acquire_lock(lock_key, expire_seconds=60):
+            logging.warning(
+                f"Intento de reconstruir contexto para {user_identifier} mientras ya estaba en progreso. Se omite.")
+            return
+
+        try:
+            start_time = time.time()
+            company = self.profile_repo.get_company_by_short_name(company_short_name)
+
+            # get the prepared context and version from the session cache
+            prepared_context, version_to_save = self.session_context.get_and_clear_prepared_context(company_short_name,
+                                                                                                    user_identifier)
+            if not prepared_context:
+                logging.info(
+                    f"No se requiere reconstrucción de contexto para {company_short_name}/{user_identifier}. Finalización rápida.")
+                return
+
+            logging.info(f"Enviando contexto al LLM para {company_short_name}/{user_identifier}...")
 
-            # 5. merge contexts
-            final_system_context = f"{company_specific_context}\n{rendered_system_prompt}"
+            # Limpiar solo el historial de chat y el ID de respuesta anterior
+            self.session_context.clear_llm_history(company_short_name, user_identifier)
 
             if self.util.is_gemini_model(model):
-                # save the initial context as `context_history` (list of messages)
-                context_history = [{"role": "user", "content": final_system_context}]
+                context_history = [{"role": "user", "content": prepared_context}]
                 self.session_context.save_context_history(company_short_name, user_identifier, context_history)
-                logging.info(f"Contexto inicial para Gemini guardado en sesión")
-                return "gemini-context-initialized"
 
             elif self.util.is_openai_model(model):
-
-                # 6. set the company/user context as the initial context for the LLM
                 response_id = self.llm_client.set_company_context(
-                    company=company,
-                    company_base_context=final_system_context,
-                    model=model
+                    company=company, company_base_context=prepared_context, model=model
                 )
-
-                # 7. save response_id in the session context
                 self.session_context.save_last_response_id(company_short_name, user_identifier, response_id)
 
-                logging.info(f"Contexto inicial de company '{company_short_name}/{user_identifier}' ha sido establecido en {int(time.time() - start_time)} seg.")
-                return response_id
+            if version_to_save:
+                self.session_context.save_context_version(company_short_name, user_identifier, version_to_save)
 
+            logging.info(
+                f"Contexto de {company_short_name}/{user_identifier} establecido en {int(time.time() - start_time)} seg.")
         except Exception as e:
-            logging.exception(f"Error al inicializar el contexto del LLM para {company_short_name}: {e}")
+            logging.exception(f"Error en finalize_context_rebuild para {company_short_name}: {e}")
             raise e
+        finally:
+            # --- Liberar el Bloqueo ---
+            self.session_context.release_lock(lock_key)
 
     def llm_query(self,
                   company_short_name: str,
-                  external_user_id: Optional[str] = None,
-                  local_user_id: int = 0,
+                  user_identifier: str,
                   task: Optional[Task] = None,
                   prompt_name: str = None,
                   question: str = '',
                   client_data: dict = {},
                   files: list = []) -> dict:
         try:
-            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"}
-
             company = self.profile_repo.get_company_by_short_name(short_name=company_short_name)
             if not company:
                 return {"error": True,
@@ -173,23 +202,19 @@ class QueryService:
                 # get user context
                 previous_response_id = self.session_context.get_last_response_id(company.short_name, user_identifier)
                 if not previous_response_id:
-                    # try to initialize the company/user context
-                    previous_response_id = self.llm_init_context(company.short_name, external_user_id, local_user_id)
-                    if not previous_response_id:
-                        return {'error': True,
-                                "error_message": f"FATAL: No se encontró 'previous_response_id' para '{company.short_name}/{user_identifier}'. La conversación no puede continuar."
-                                }
+                    return {'error': True,
+                            "error_message": f"FATAL: No se encontró 'previous_response_id' para '{company.short_name}/{user_identifier}'. La conversación no puede continuar."
+                            }
             elif self.util.is_gemini_model(self.model):
                 # check the length of the context_history and remove old messages
                 self._trim_context_history(context_history)
 
-            # get the user data from the session context
-            user_info_from_session = self.session_context.get_user_session_data(company.short_name, user_identifier)
+            # get the user profile data from the session context
+            user_profile = self.profile_service.get_profile_by_identifier(company.short_name, user_identifier)
 
-            # Combinar datos: los datos de la tarea/request tienen prioridad sobre los de la sesión
-            final_client_data = (user_info_from_session or {}).copy()
+            # combine client_data with user_profile
+            final_client_data = (user_profile or {}).copy()
             final_client_data.update(client_data)
-            final_client_data['user_id'] = user_identifier
 
             # Load attached files into the context
             files_context = self.load_files_for_context(files)
@@ -207,7 +232,7 @@ class QueryService:
                     template_string=prompt_content,
                     question=question,
                     client_data=final_client_data,
-                    external_user_id=external_user_id,
+                    user_identifier=user_identifier,
                     company=company,
                 )
 
@@ -254,6 +279,31 @@ class QueryService:
             logging.exception(e)
             return {'error': True, "error_message": f"{str(e)}"}
 
+    def _compute_context_version_from_string(self, final_system_context: str) -> str:
+        # returns a hash of the context string
+        try:
+            return hashlib.sha256(final_system_context.encode("utf-8")).hexdigest()
+        except Exception:
+            return "unknown"
+
+    def _has_valid_cached_context(self, company_short_name: str, user_identifier: str) -> bool:
+        """
+        Verifica si existe un estado de contexto reutilizable en sesión.
+        - OpenAI: last_response_id presente.
+        - Gemini: context_history con al menos 1 mensaje.
+        """
+        try:
+            if self.util.is_openai_model(self.model):
+                prev_id = self.session_context.get_last_response_id(company_short_name, user_identifier)
+                return bool(prev_id)
+            if self.util.is_gemini_model(self.model):
+                history = self.session_context.get_context_history(company_short_name, user_identifier) or []
+                return len(history) >= 1
+            return False
+        except Exception as e:
+            logging.warning(f"Error verificando caché de contexto: {e}")
+            return False
+
     def load_files_for_context(self, files: list) -> str:
         """
         Processes a list of attached files, decodes their content,

iatoolkit/services/tasks_service.py

@@ -101,7 +101,7 @@ class TaskService:
         # call the IA
         response = self.query_service.llm_query(
             task=task,
-            local_user_id=0,
+            user_identifier='task-monitor',
             company_short_name=task.company.short_name,
             prompt_name=task.task_type.name,
             client_data=task.client_data,

iatoolkit/services/user_feedback_service.py

@@ -19,8 +19,7 @@ class UserFeedbackService:
     def new_feedback(self,
                      company_short_name: str,
                      message: str,
-                     external_user_id: str = None,
-                     local_user_id: int = 0,
+                     user_identifier: str,
                      space: str = None,
                      type: str = None,
                      rating: int = None) -> dict:
@@ -31,7 +30,7 @@ class UserFeedbackService:
                 return {'error': f'No existe la empresa: {company_short_name}'}
 
             # send notification to Google Chat
-            chat_message = f"*Nuevo feedback de {company_short_name}*:\n*Usuario:* {external_user_id or local_user_id}\n*Mensaje:* {message}\n*Calificación:* {rating}"
+            chat_message = f"*Nuevo feedback de {company_short_name}*:\n*Usuario:* {user_identifier}\n*Mensaje:* {message}\n*Calificación:* {rating}"
 
             # TO DO: get the space and type from the input data
             chat_data = {
@@ -45,7 +44,6 @@ class UserFeedbackService:
             }
 
             chat_result = self.google_chat_app.send_message(message_data=chat_data)
-
             if not chat_result.get('success'):
                 logging.warning(f"Error al enviar notificación a Google Chat: {chat_result.get('message')}")
 
@@ -53,8 +51,7 @@ class UserFeedbackService:
             new_feedback = UserFeedback(
                 company_id=company.id,
                 message=message,
-                local_user_id=local_user_id,
-                external_user_id=external_user_id,
+                user_identifier=user_identifier,
                 rating=rating
             )
             new_feedback = self.profile_repo.save_feedback(new_feedback)