iatoolkit 0.57.0__tar.gz → 0.58.0__tar.gz

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/PKG-INFO

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

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/pyproject.toml

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

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/common/routes.py

@@ -21,7 +21,6 @@ def register_views(injector, app):
 
     from iatoolkit.views.index_view import IndexView
     from iatoolkit.views.init_context_api_view import InitContextApiView
-    from iatoolkit.views.llmquery_web_view import LLMQueryWebView
     from iatoolkit.views.llmquery_api_view import LLMQueryApiView
     from iatoolkit.views.tasks_view import TaskView
     from iatoolkit.views.tasks_review_view import TaskReviewView
@@ -67,8 +66,8 @@ def register_views(injector, app):
                      view_func=ChatTokenRequestView.as_view('chat-token'))
 
     # init (reset) the company context (with api-key)
-    app.add_url_rule('/<company_short_name>/api/init_context_api',
-                     view_func=InitContextApiView.as_view('init_context_api'))
+    app.add_url_rule('/<company_short_name>/api/init-context',
+                     view_func=InitContextApiView.as_view('init-context'))
 
     # register new user, account verification and forgot password
     app.add_url_rule('/<company_short_name>/signup',view_func=SignupView.as_view('signup'))
@@ -80,13 +79,8 @@ def register_views(injector, app):
 
     # main chat query, used by the JS in the browser (with credentials)
     # can be used also for executing iatoolkit prompts
-    app.add_url_rule('/<company_short_name>/llm_query', view_func=LLMQueryWebView.as_view('llm_query_web'))
-
-    # this is the same function as above, but with api-key
     app.add_url_rule('/<company_short_name>/api/llm_query', view_func=LLMQueryApiView.as_view('llm_query_api'))
 
-    # chat buttons are here on
-
     # open the promt directory
     app.add_url_rule('/<company_short_name>/api/prompts', view_func=PromptApiView.as_view('prompt'))
 

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/services/profile_service.py

@@ -66,16 +66,18 @@ class ProfileService:
                 "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)
+            # 2. create user_profile in context
+            self.save_user_profile(company, user_identifier, user_profile)
+
+            # 3. create the web session
+            self.set_session_for_user(company.short_name, user_identifier)
             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, user_identifier: str):
+    def create_external_user_profile_context(self, company: Company, user_identifier: str):
         """
-        Public method for views to create a web session for an external user.
+        Public method for views to create a user profile context for an external user.
         """
         # 1. Fetch the external user profile via Dispatcher.
         external_user_profile = self.dispatcher.get_user_info(
@@ -84,12 +86,12 @@ class ProfileService:
         )
 
         # 2. Call the session creation helper with external_user_id as user_identifier
-        self.create_web_session(
+        self.save_user_profile(
             company=company,
             user_identifier=user_identifier,
             user_profile=external_user_profile)
 
-    def create_web_session(self, company: Company, user_identifier: str, user_profile: dict):
+    def save_user_profile(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.
         """
@@ -102,10 +104,8 @@ class ProfileService:
         # save user_profile in Redis session
         self.session_context.save_profile_data(company.short_name, user_identifier, user_profile)
 
-        # save a min Flask session cookie for this user
-        self.set_session_for_user(company.short_name, user_identifier)
-
     def set_session_for_user(self, company_short_name: str, user_identifier:str ):
+        # save a min Flask session cookie for this user
         SessionManager.set('company_short_name', company_short_name)
         SessionManager.set('user_identifier', user_identifier)
 

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/services/query_service.py

@@ -66,9 +66,6 @@ class QueryService:
 
         # 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()

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/services/user_session_context_service.py

@@ -23,7 +23,7 @@ class UserSessionContextService:
         return f"session:{company_short_name}/{user_identifier}"
 
     def clear_all_context(self, company_short_name: str, user_identifier: str):
-        """Limpia el contexto de sesión para un usuario de forma atómica."""
+        """Limpia el contexto del LLM en la sesión para un usuario de forma atómica."""
         session_key = self._get_session_key(company_short_name, user_identifier)
         if session_key:
             # RedisSessionManager.remove(session_key)

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/static/js/chat_main.js

@@ -6,7 +6,7 @@ let selectedPrompt = null; // Will hold a lightweight prompt object
 
 $(document).ready(function () {
     // Gatilla el redeem sin esperar ni manejar respuesta aquí
-        if (window.redeemToken !== '') {
+        if (window.redeemToken) {
             const url = `/api/redeem_token`;
             // No await: dejamos que callToolkit maneje todo internamente
             callToolkit(url, {'token': window.redeemToken}, "POST").catch(() => {});
@@ -183,7 +183,7 @@ const handleChatMessage = async function () {
             user_identifier: window.user_identifier
         };
 
-        const responseData = await callToolkit("/llm_query", data, "POST");
+        const responseData = await callToolkit("/api/llm_query", data, "POST");
         if (responseData && responseData.answer) {
             const answerSection = $('<div>').addClass('answer-section llm-output').append(responseData.answer);
             displayBotMessage(answerSection);

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/templates/_login_widget.html

@@ -14,7 +14,8 @@
           method="post">
       <div class="mb-3">
         <label for="email" class="form-label d-block">Correo Electrónico</label>
-        <input type="email" id="email" name="email" class="form-control" required>
+        <input type="email" id="email" name="email" class="form-control"
+               required value="{{ form_data.email or '' }}">
       </div>
       <div class="mb-3">
         <label for="password" class="form-label d-block">Contraseña</label>

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/templates/chat.html

@@ -183,11 +183,12 @@
     // --- Global Configuration from Backend ---
     window.companyShortName = "{{ company_short_name }}";
     window.user_identifier = "{{ user_identifier }}";
-    window.redeemToken = "{{ redeem_token }}";
+    window.redeemToken = {{ redeem_token | tojson | default('null') }};
     window.iatoolkit_base_url = "{{ iatoolkit_base_url }}";
     window.availablePrompts = {{ prompts.message | tojson }};
     window.onboardingCards = {{ onboarding_cards | tojson }};
     window.sendButtonColor = "{{ branding.send_button_color }}";
+
 </script>
 
 <!-- Carga de los scripts JS externos después de definir las variables globales -->
@@ -195,7 +196,7 @@
 <script src="{{ url_for('static', filename='js/chat_filepond.js', _external=True) }}"></script>
 <script src="{{ url_for('static', filename='js/chat_history.js', _external=True) }}"></script>
 <script src="{{ url_for('static', filename='js/chat_feedback.js', _external=True) }}"></script>
-<script src="{{ url_for('static', filename='js/chat_main.js', _external=True) }}"></script>
+    <script src="{{ url_for('static', filename='js/chat_context_reload.js', _external=True) }}"></script><script src="{{ url_for('static', filename='js/chat_main.js', _external=True) }}"></script>
 
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css">
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
@@ -223,67 +224,6 @@
         })
     });
 
-document.addEventListener('DOMContentLoaded', function() {
-    const reloadButton = document.getElementById('force-reload-button');
-    if (!reloadButton) return;
-
-    const originalIconClass = 'bi bi-arrow-clockwise';
-    const spinnerIconClass = 'spinner-border spinner-border-sm';
-
-    // Configuración de Toastr para que aparezca abajo a la derecha
-    toastr.options = { "positionClass": "toast-bottom-right", "preventDuplicates": true };
-
-    reloadButton.addEventListener('click', function(event) {
-        event.preventDefault();
-
-        if (reloadButton.disabled) return; // Prevenir doble clic
-
-        // 1. Deshabilitar y mostrar spinner
-        reloadButton.disabled = true;
-        const icon = reloadButton.querySelector('i');
-        icon.className = spinnerIconClass;
-        toastr.info('Iniciando recarga de contexto en segundo plano...');
-
-        // 2. Construir la URL dinámicamente
-        const company = window.companyShortName;
-        const reloadUrl = `/${company}/api/init_context_api`;
-
-        // 3. Hacer la llamada AJAX con POST
-        fetch(reloadUrl, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            // Envía un cuerpo vacío o los datos necesarios
-            body: JSON.stringify({})
-        })
-        .then(response => {
-            if (!response.ok) {
-                return response.json().then(err => {
-                    throw new Error(err.error_message || `Error del servidor: ${response.status}`);
-                });
-            }
-            return response.json();
-        })
-        .then(data => {
-            if (data.status === 'OK') {
-                toastr.success(data.message || 'Contexto recargado exitosamente.');
-            } else {
-                toastr.error(data.error_message || 'Ocurrió un error desconocido.');
-            }
-        })
-        .catch(error => {
-            console.error('Error durante la recarga del contexto:', error);
-            toastr.error(error.message || 'Error de red al intentar recargar.');
-        })
-        .finally(() => {
-            // 4. Restaurar el botón
-            reloadButton.disabled = false;
-            icon.className = originalIconClass;
-        });
-    });
-});
-
 // Inicialización del modal de onboarding
 document.addEventListener('DOMContentLoaded', function () {
   const btn = document.getElementById('onboarding-button');

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/views/base_login_view.py

@@ -14,6 +14,7 @@ from iatoolkit.services.branding_service import BrandingService
 from iatoolkit.services.onboarding_service import OnboardingService
 from iatoolkit.services.prompt_manager_service import PromptService
 from iatoolkit.services.jwt_service import JWTService
+from iatoolkit.repositories.models import Company
 
 
 class BaseLoginView(MethodView):
@@ -40,44 +41,26 @@ class BaseLoginView(MethodView):
         self.query_service = query_service
 
 
-    def _handle_login_path(self, company_short_name: str, user_identifier: str, company):
+    def _handle_login_path(self,
+                           company: Company,
+                           user_identifier: str,
+                           target_url: str,
+                           redeem_token: str = None):
         """
         Centralized logic to decide between the fast path and the slow path.
         """
-        # --- Get the company branding ---
+        # --- Get the company branding and onboarding_cards
         branding_data = self.branding_service.get_company_branding(company)
+        onboarding_cards = self.onboarding_service.get_onboarding_cards(company)
+        company_short_name = company.short_name
 
         # this service decides is the context needs to be rebuilt or not
         prep_result = self.query_service.prepare_context(
-            company_short_name=company_short_name, user_identifier=user_identifier
+            company_short_name=company.short_name, user_identifier=user_identifier
         )
 
-        # generate continuation token for external login
-        redeem_token = ''
-        if self.__class__.__name__ == 'ExternalLoginView':
-            redeem_token = self.jwt_service.generate_chat_jwt(
-                company_short_name=company_short_name,
-                user_identifier=user_identifier,
-                expires_delta_seconds=300
-            )
-
-            if not redeem_token:
-                return "Error al generar el redeem_token para login externo.", 500
-
         if prep_result.get('rebuild_needed'):
             # --- SLOW PATH: Render the loading shell ---
-            onboarding_cards = self.onboarding_service.get_onboarding_cards(company)
-
-            # callback url to call when the context finish loading
-            if redeem_token:
-                target_url = url_for('finalize_with_token',
-                                     company_short_name=company_short_name,
-                                     token=redeem_token,
-                                     _external=True)
-            else:
-                target_url = url_for('finalize_no_token',
-                                     company_short_name=company_short_name,
-                                     _external=True)
             return render_template(
                 "onboarding_shell.html",
                 iframe_src_url=target_url,
@@ -87,13 +70,12 @@ class BaseLoginView(MethodView):
         else:
             # --- FAST PATH: Render the chat page directly ---
             prompts = self.prompt_service.get_user_prompts(company_short_name)
-            onboarding_cards = self.onboarding_service.get_onboarding_cards(company)
             return render_template(
                 "chat.html",
                 company_short_name=company_short_name,
                 user_identifier=user_identifier,
-                branding=branding_data,
                 prompts=prompts,
+                branding=branding_data,
                 onboarding_cards=onboarding_cards,
                 redeem_token=redeem_token
             )

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/views/external_login_view.py

@@ -5,7 +5,7 @@
 
 import os
 import logging
-from flask import request, jsonify
+from flask import request, jsonify, url_for
 from injector import inject
 from iatoolkit.views.base_login_view import BaseLoginView
 
@@ -37,11 +37,27 @@ class ExternalLoginView(BaseLoginView):
             return jsonify(auth_response), 401
 
         # 2. Create the external user session.
-        self.profile_service.create_external_user_session(company, user_identifier)
+        self.profile_service.create_external_user_profile_context(company, user_identifier)
 
-        # 3. Delegate the path decision to the centralized logic.
+        # 3. create a redeem_token for create session at the end of the process
+        redeem_token = self.jwt_service.generate_chat_jwt(
+            company_short_name=company_short_name,
+            user_identifier=user_identifier,
+            expires_delta_seconds=300
+        )
+
+        if not redeem_token:
+            return jsonify({"error": "Error al generar el redeem_token para login externo."}), 403
+
+        # 4. define URL to call when slow path is finished
+        target_url = url_for('finalize_with_token',
+                             company_short_name=company_short_name,
+                             token=redeem_token,
+                             _external=True)
+
+        # 5. Delegate the path decision to the centralized logic.
         try:
-            return self._handle_login_path(company_short_name, user_identifier, company)
+            return self._handle_login_path(company, user_identifier, target_url, redeem_token)
         except Exception as e:
             logging.exception(f"Error processing external login path for {company_short_name}/{user_identifier}: {e}")
             return jsonify({"error": f"Internal server error while starting chat. {str(e)}"}), 500

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/views/init_context_api_view.py

@@ -42,6 +42,7 @@ class InitContextApiView(MethodView):
             self.query_service.session_context.clear_all_context(company_short_name, user_identifier)
             logging.info(f"Context for {company_short_name}/{user_identifier} has been cleared.")
 
+            # LLM context is clean, now we can load it again
             self.query_service.prepare_context(
                 company_short_name=company_short_name,
                 user_identifier=user_identifier
@@ -52,7 +53,7 @@ class InitContextApiView(MethodView):
                 user_identifier=user_identifier
             )
 
-            logging.info(f"Context for {company_short_name}/{user_identifier} rebuilt successfully.")
+            # logging.info(f"Context for {company_short_name}/{user_identifier} rebuilt successfully.")
 
             # 3. Respond with JSON, as this is an API endpoint.
             return jsonify({'status': 'OK', 'message': 'Context has been reloaded successfully.'}), 200

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/views/llmquery_api_view.py

@@ -32,12 +32,6 @@ class LLMQueryApiView(MethodView):
         if not data:
             return jsonify({"error": "Invalid JSON body"}), 400
 
-        # 3. Ensure session state exists for this API user (lazy creation).
-        profile = self.profile_service.get_profile_by_identifier(company_short_name, user_identifier)
-        if not profile:
-            company = self.profile_service.get_company_by_short_name(company_short_name)
-            self.profile_service.create_external_user_session(company, user_identifier)
-
         # 4. Call the unified query service method.
         result = self.query_service.llm_query(
             company_short_name=company_short_name,

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit/views/login_view.py

@@ -51,9 +51,14 @@ class LoginView(BaseLoginView):
 
         user_identifier = auth_response['user_identifier']
 
+        # 3. define URL to call when slow path is finished
+        target_url = url_for('finalize_no_token',
+                             company_short_name=company_short_name,
+                             _external=True)
+
         # 2. Delegate the path decision to the centralized logic.
         try:
-            return self._handle_login_path(company_short_name, user_identifier, company)
+            return self._handle_login_path(company, user_identifier, target_url)
         except Exception as e:
             return render_template("error.html", company=company, company_short_name=company_short_name,
                                    message=f"Error processing login path: {str(e)}"), 500

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit.egg-info/PKG-INFO

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

{iatoolkit-0.57.0 → iatoolkit-0.58.0}/src/iatoolkit.egg-info/SOURCES.txt

@@ -104,7 +104,6 @@ src/iatoolkit/views/history_api_view.py
 src/iatoolkit/views/index_view.py
 src/iatoolkit/views/init_context_api_view.py
 src/iatoolkit/views/llmquery_api_view.py
-src/iatoolkit/views/llmquery_web_view.py
 src/iatoolkit/views/login_simulation_view.py
 src/iatoolkit/views/login_view.py
 src/iatoolkit/views/prompt_api_view.py

iatoolkit-0.57.0/src/iatoolkit/views/llmquery_web_view.py

@@ -1,38 +0,0 @@
-from flask.views import MethodView
-from flask import request, jsonify
-from injector import inject
-from iatoolkit.services.query_service import QueryService
-from iatoolkit.services.auth_service import AuthService  # Use AuthService for session check
-
-
-class LLMQueryWebView(MethodView):  # Renamed for clarity
-    """
-    Web-only endpoint for submitting queries from the chat UI.
-    Authenticates via Flask session cookie.
-    """
-
-    @inject
-    def __init__(self, auth_service: AuthService, query_service: QueryService):
-        self.auth_service = auth_service
-        self.query_service = query_service
-
-    def post(self, company_short_name: str):
-        # 1. Authenticate the web session request.
-        auth_result = self.auth_service.verify()
-        if not auth_result.get("success"):
-            return jsonify({"error": auth_result.get("error_message")}), auth_result.get("status_code", 401)
-
-        # 2. Get the guaranteed user_identifier from the auth result.
-        user_identifier = auth_result['user_identifier']
-        data = request.get_json() or {}
-
-        # 3. Call the unified query service method.
-        result = self.query_service.llm_query(
-            company_short_name=company_short_name,
-            user_identifier=user_identifier,
-            question=data.get('question', ''),
-            prompt_name=data.get('prompt_name'),
-            client_data=data.get('client_data', {}),
-            files=data.get('files', [])
-        )
-        return jsonify(result)