iatoolkit 0.50.2__tar.gz → 0.51.0__tar.gz

{iatoolkit-0.50.2 → iatoolkit-0.51.0}/PKG-INFO

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

{iatoolkit-0.50.2 → iatoolkit-0.51.0}/pyproject.toml

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

{iatoolkit-0.50.2 → iatoolkit-0.51.0}/src/iatoolkit/common/routes.py

@@ -26,8 +26,8 @@ def register_views(injector, app):
     from iatoolkit.views.tasks_view import TaskView
     from iatoolkit.views.tasks_review_view import TaskReviewView
     from iatoolkit.views.login_test_view import LoginTest
-    from iatoolkit.views.login_view import LoginView, InitiateLoginView
-    from iatoolkit.views.external_login_view import InitiateExternalChatView
+    from iatoolkit.views.login_view import LoginView, FinalizeContextView
+    from iatoolkit.views.external_login_view import ExternalLoginView
     from iatoolkit.views.signup_view import SignupView
     from iatoolkit.views.verify_user_view import VerifyAccountView
     from iatoolkit.views.forgot_password_view import ForgotPasswordView
@@ -46,8 +46,8 @@ def register_views(injector, app):
 
     # this functions are for login external users (with api-key)
     # only the first one should be used from an external app
-    app.add_url_rule('/<company_short_name>/initiate_external_chat',
-                     view_func=InitiateExternalChatView.as_view('initiate_external_chat'))
+    app.add_url_rule('/<company_short_name>/external_login',
+                     view_func=ExternalLoginView.as_view('external_login'))
 
     # this endpoint is for requesting a chat token for external users
     app.add_url_rule('/auth/chat_token',
@@ -55,8 +55,8 @@ def register_views(injector, app):
 
     # login for the iatoolkit integrated frontend
     # this is the main login endpoint for the frontend
-    app.add_url_rule('/<company_short_name>/chat', view_func=InitiateLoginView.as_view('chat'))
     app.add_url_rule('/<company_short_name>/login', view_func=LoginView.as_view('login'))
+    app.add_url_rule('/<company_short_name>/finalize_context_load', view_func=FinalizeContextView.as_view('finalize_context_load'))
 
     # register new user, account verification and forgot password
     app.add_url_rule('/<company_short_name>/signup',view_func=SignupView.as_view('signup'))

{iatoolkit-0.50.2 → iatoolkit-0.51.0}/src/iatoolkit/iatoolkit.py

@@ -19,7 +19,7 @@ from werkzeug.middleware.proxy_fix import ProxyFix
 from injector import Binder, singleton, Injector
 from importlib.metadata import version as _pkg_version, PackageNotFoundError
 
-IATOOLKIT_VERSION = "0.21.0"
+IATOOLKIT_VERSION = "0.50.2"
 
 # global variable for the unique instance of IAToolkit
 _iatoolkit_instance: Optional['IAToolkit'] = None
@@ -360,6 +360,10 @@ class IAToolkit:
         @self.app.context_processor
         def inject_globals():
             from iatoolkit.common.session_manager import SessionManager
+            from iatoolkit.services.profile_service import ProfileService
+
+            profile_service = self._injector.get(ProfileService)
+            user_profile = profile_service.get_current_session_info().get('profile', {})
 
             return {
                 'url_for': url_for,
@@ -367,6 +371,8 @@ class IAToolkit:
                 'app_name': 'IAToolkit',
                 'user_identifier': SessionManager.get('user_identifier'),
                 'company_short_name': SessionManager.get('company_short_name'),
+                'user_is_local': user_profile.get('user_is_local'),
+                'user_email': user_profile.get('user_email'),
                 'iatoolkit_base_url': os.environ.get('IATOOLKIT_BASE_URL', ''),
             }
 

{iatoolkit-0.50.2 → iatoolkit-0.51.0}/src/iatoolkit/templates/_login_widget.html

@@ -10,7 +10,7 @@
 
     <!-- 2. Formulario de Inicio de Sesión -->
     <form id="login-form"
-          action="{{ url_for('chat', company_short_name=company_short_name) }}"
+          action="{{ url_for('login', company_short_name=company_short_name) }}"
           method="post">
       <div class="mb-3">
         <label for="email" class="form-label d-block">Correo Electrónico</label>

{iatoolkit-0.50.2 → iatoolkit-0.51.0}/src/iatoolkit/templates/login_test.html

@@ -72,7 +72,7 @@
 
           // Actualizar action del formulario "Iniciar Sesión"
           if (selectedCompany && selectedCompany.trim() !== '') {
-              const loginAction = '/' + selectedCompany + '/chat';
+              const loginAction = '/' + selectedCompany + '/external_login';
               $('#login-form').attr('action', loginAction); // Actualizamos la URL del form
           } else {
               $('#login-form').attr('action', '#'); // URL genérica si no hay selección
@@ -116,7 +116,7 @@
               return;
           }
 
-          fetch(`/${selectedCompany}/initiate_external_chat`, {
+          fetch(`/${selectedCompany}/external_login`, {
               method: 'POST',
               headers: {
                   'Content-Type': 'application/json',

iatoolkit-0.51.0/src/iatoolkit/views/base_login_view.py

@@ -0,0 +1,63 @@
+# iatoolkit/views/base_login_view.py
+# Copyright (c) 2024 Fernando Libedinsky
+# Product: IAToolkit
+#
+# IAToolkit is open source software.
+
+from flask.views import MethodView
+from flask import render_template, url_for
+from injector import inject
+from iatoolkit.services.profile_service import ProfileService
+from iatoolkit.services.query_service import QueryService
+from iatoolkit.services.branding_service import BrandingService
+from iatoolkit.services.onboarding_service import OnboardingService
+from iatoolkit.services.prompt_manager_service import PromptService
+
+
+class BaseLoginView(MethodView):
+    """
+    Base class for views that initiate a session and decide the context
+    loading path (fast or slow).
+    """
+    @inject
+    def __init__(self,
+                 profile_service: ProfileService,
+                 branding_service: BrandingService,
+                 prompt_service: PromptService,
+                 onboarding_service: OnboardingService,
+                 query_service: QueryService):
+        self.profile_service = profile_service
+        self.branding_service = branding_service
+        self.prompt_service = prompt_service
+        self.onboarding_service = onboarding_service
+        self.query_service = query_service
+
+    def _handle_login_path(self, company_short_name: str, user_identifier: str, company):
+        """
+        Centralized logic to decide between the fast path and the slow path.
+        """
+        prep_result = self.query_service.prepare_context(
+            company_short_name=company_short_name, user_identifier=user_identifier
+        )
+
+        branding_data = self.branding_service.get_company_branding(company)
+
+        if prep_result.get('rebuild_needed'):
+            # --- SLOW PATH: Render the loading shell ---
+            onboarding_cards = self.onboarding_service.get_onboarding_cards(company)
+            target_url = url_for('finalize_context_load', company_short_name=company_short_name, _external=True)
+
+            return render_template(
+                "onboarding_shell.html",
+                iframe_src_url=target_url,
+                branding=branding_data,
+                onboarding_cards=onboarding_cards
+            )
+        else:
+            # --- FAST PATH: Render the chat page directly ---
+            prompts = self.prompt_service.get_user_prompts(company_short_name)
+            return render_template(
+                "chat.html",
+                branding=branding_data,
+                prompts=prompts,
+            )

iatoolkit-0.51.0/src/iatoolkit/views/external_login_view.py

@@ -0,0 +1,70 @@
+# Copyright (c) 2024 Fernando Libedinsky
+# Product: IAToolkit
+#
+# IAToolkit is open source software.
+
+import os
+import logging
+from flask import request, jsonify
+from injector import inject
+from iatoolkit.services.auth_service import AuthService
+from iatoolkit.views.base_login_view import BaseLoginView
+
+# Importar los servicios que necesita la clase base
+from iatoolkit.services.profile_service import ProfileService
+from iatoolkit.services.branding_service import BrandingService
+from iatoolkit.services.onboarding_service import OnboardingService
+from iatoolkit.services.query_service import QueryService
+from iatoolkit.services.prompt_manager_service import PromptService
+
+class ExternalLoginView(BaseLoginView):
+    """
+    Handles login for external users via API.
+    Authenticates and then delegates the path decision (fast/slow) to the base class.
+    """
+    @inject
+    def __init__(self,
+                 iauthentication: AuthService,
+                 profile_service: ProfileService,
+                 branding_service: BrandingService,
+                 prompt_service: PromptService,
+                 onboarding_service: OnboardingService,
+                 query_service: QueryService):
+        # Pass the dependencies for the base class to its __init__
+        super().__init__(
+            profile_service=profile_service,
+            branding_service=branding_service,
+            onboarding_service=onboarding_service,
+            query_service=query_service,
+            prompt_service=prompt_service
+        )
+        # Handle the dependency specific to this child class
+        self.iauthentication = iauthentication
+
+    def post(self, company_short_name: str):
+        data = request.get_json()
+        if not data or 'external_user_id' not in data:
+            return jsonify({"error": "Falta external_user_id"}), 400
+
+        company = self.profile_service.get_company_by_short_name(company_short_name)
+        if not company:
+            return jsonify({"error": "Empresa no encontrada"}), 404
+
+        external_user_id = data['external_user_id']
+        if not external_user_id:
+            return jsonify({"error": "missing external_user_id"}), 404
+
+        # 1. Authenticate the API call.
+        iaut = self.iauthentication.verify()
+        if not iaut.get("success"):
+            return jsonify(iaut), 401
+
+        # 2. Create the external user session.
+        self.profile_service.create_external_user_session(company, external_user_id)
+
+        # 3. Delegate the path decision to the centralized logic.
+        try:
+            return self._handle_login_path(company_short_name, external_user_id, company)
+        except Exception as e:
+            logging.exception(f"Error processing external login path for {company_short_name}/{external_user_id}: {e}")
+            return jsonify({"error": f"Internal server error while starting chat. {str(e)}"}), 500

iatoolkit-0.51.0/src/iatoolkit/views/login_view.py

@@ -0,0 +1,111 @@
+# Copyright (c) 2024 Fernando Libedinsky
+# Product: IAToolkit
+#
+# IAToolkit is open source software.
+
+from flask.views import MethodView
+from flask import request, redirect, render_template, url_for
+from injector import inject
+from iatoolkit.services.profile_service import ProfileService
+from iatoolkit.services.query_service import QueryService
+from iatoolkit.services.prompt_manager_service import PromptService
+from iatoolkit.services.branding_service import BrandingService
+from iatoolkit.views.base_login_view import BaseLoginView
+
+
+class LoginView(BaseLoginView):
+    """
+    Handles login for local users.
+    Authenticates and then delegates the path decision (fast/slow) to the base class.
+    """
+
+    def post(self, company_short_name: str):
+        company = self.profile_service.get_company_by_short_name(company_short_name)
+        if not company:
+            return render_template('error.html', message="Empresa no encontrada"), 404
+
+        email = request.form.get('email')
+        password = request.form.get('password')
+
+        # 1. Authenticate user and create the unified session.
+        auth_response = self.profile_service.login(
+            company_short_name=company_short_name,
+            email=email,
+            password=password
+        )
+
+        if not auth_response['success']:
+            branding_data = self.branding_service.get_company_branding(company)
+
+            return render_template(
+                'index.html',
+                company_short_name=company_short_name,
+                company=company,
+                branding=branding_data,
+                form_data={"email": email},
+                alert_message=auth_response["message"]
+            ), 400
+
+        user_identifier = auth_response['user_identifier']
+
+        # 2. Delegate the path decision to the centralized logic.
+        try:
+            return self._handle_login_path(company_short_name, user_identifier, company)
+        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
+
+
+class FinalizeContextView(MethodView):
+    """
+    Finalizes context loading in the slow path.
+    This view is invoked by the iframe inside onboarding_shell.html.
+    """
+
+    @inject
+    def __init__(self,
+                 profile_service: ProfileService,
+                 query_service: QueryService,
+                 prompt_service: PromptService,
+                 branding_service: BrandingService
+                 ):
+        self.profile_service = profile_service
+        self.query_service = query_service
+        self.prompt_service = prompt_service
+        self.branding_service = branding_service
+
+    def get(self, company_short_name: str):
+        # 1. Use the centralized method to get session info.
+        session_info = self.profile_service.get_current_session_info()
+        user_identifier = session_info.get('user_identifier')
+
+        if not user_identifier:
+            # This can happen if the session expires or is invalid.
+            return redirect(url_for('login_page', company_short_name=company_short_name))
+
+        company = self.profile_service.get_company_by_short_name(company_short_name)
+        if not company:
+            return render_template('error.html', message="Empresa no encontrada"), 404
+
+        try:
+            # 2. Finalize the context rebuild (the heavy task).
+            self.query_service.finalize_context_rebuild(
+                company_short_name=company_short_name,
+                user_identifier=user_identifier
+            )
+
+            # 3. render the chat page.
+            prompts = self.prompt_service.get_user_prompts(company_short_name)
+            branding_data = self.branding_service.get_company_branding(company)
+
+            return render_template(
+                "chat.html",
+                branding=branding_data,
+                prompts=prompts,
+            )
+
+        except Exception as e:
+            return render_template("error.html",
+                                   company=company,
+                                   company_short_name=company_short_name,
+                                   message=f"An unexpected error occurred during context loading: {str(e)}"), 500

{iatoolkit-0.50.2 → iatoolkit-0.51.0}/src/iatoolkit.egg-info/PKG-INFO

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

{iatoolkit-0.50.2 → iatoolkit-0.51.0}/src/iatoolkit.egg-info/SOURCES.txt

@@ -100,6 +100,7 @@ src/iatoolkit/templates/onboarding_shell.html
 src/iatoolkit/templates/signup.html
 src/iatoolkit/templates/test.html
 src/iatoolkit/views/__init__.py
+src/iatoolkit/views/base_login_view.py
 src/iatoolkit/views/change_password_view.py
 src/iatoolkit/views/chat_token_request_view.py
 src/iatoolkit/views/external_login_view.py

iatoolkit-0.50.2/src/iatoolkit/views/external_login_view.py

@@ -1,93 +0,0 @@
-# Copyright (c) 2024 Fernando Libedinsky
-# Product: IAToolkit
-#
-# IAToolkit is open source software.
-
-import os
-import logging
-from flask import request, jsonify, render_template, url_for
-from flask.views import MethodView
-from injector import inject
-from iatoolkit.services.auth_service import AuthService
-from iatoolkit.services.profile_service import ProfileService
-from iatoolkit.services.query_service import QueryService
-from iatoolkit.services.prompt_manager_service import PromptService
-from iatoolkit.services.branding_service import BrandingService
-from iatoolkit.services.onboarding_service import OnboardingService
-
-
-class InitiateExternalChatView(MethodView):
-    @inject
-    def __init__(self,
-                 iauthentication: AuthService,
-                 branding_service: BrandingService,
-                 profile_service: ProfileService,
-                 onboarding_service: OnboardingService,
-                 query_service: QueryService,
-                 prompt_service: PromptService
-                 ):
-        self.iauthentication = iauthentication
-        self.branding_service = branding_service
-        self.profile_service = profile_service
-        self.onboarding_service = onboarding_service
-        self.query_service = query_service
-        self.prompt_service = prompt_service
-
-    def post(self, company_short_name: str):
-        data = request.get_json()
-        if not data or 'external_user_id' not in data:
-            return jsonify({"error": "Falta external_user_id"}), 400
-
-        company = self.profile_service.get_company_by_short_name(company_short_name)
-        if not company:
-            return jsonify({"error": "Empresa no encontrada"}), 404
-
-        external_user_id = data['external_user_id']
-        if not external_user_id:
-            return jsonify({"error": "missing external_user_id"}), 404
-
-        # 1. Authenticate the API call.
-        iaut = self.iauthentication.verify()
-        if not iaut.get("success"):
-            return jsonify(iaut), 401
-
-        # 2. Delegate session creation to ProfileService.
-        self.profile_service.create_external_user_session(company, external_user_id)
-
-        # 3. prepare and decide the path
-        prep_result = self.query_service.prepare_context(
-            company_short_name=company_short_name, user_identifier=external_user_id
-        )
-
-        if prep_result.get('rebuild_needed'):
-            branding_data = self.branding_service.get_company_branding(company)
-            onboarding_cards = self.onboarding_service.get_onboarding_cards(company)
-            target_url = url_for('login', company_short_name=company_short_name,
-                                 _external=True)
-
-            return render_template(
-                "onboarding_shell.html",
-                iframe_src_url=target_url,
-                branding=branding_data,
-                onboarding_cards=onboarding_cards
-            )
-        else:
-            # fast path, the context is already on the cache, render the chat directly
-            try:
-                session_info = self.profile_service.get_current_session_info()
-                user_profile = session_info.get('profile', {})
-
-                prompts = self.prompt_service.get_user_prompts(company_short_name)
-                branding_data = self.branding_service.get_company_branding(company)
-
-                return render_template("chat.html",
-                                       company_short_name=company_short_name,
-                                       user_is_local=user_profile.get('user_is_local'),
-                                       user_email=user_profile.get('user_email'),
-                                       branding=branding_data,
-                                       prompts=prompts,
-                                       iatoolkit_base_url=os.getenv('IATOOLKIT_BASE_URL'),
-                                       ), 200
-            except Exception as e:
-                logging.exception(f"Error en el camino rápido para {company_short_name}/{external_user_id}: {e}")
-                return jsonify({"error": f"Error interno al iniciar el chat. {str(e)}"}), 500

iatoolkit-0.50.2/src/iatoolkit/views/login_view.py

@@ -1,159 +0,0 @@
-# Copyright (c) 2024 Fernando Libedinsky
-# Product: IAToolkit
-#
-# IAToolkit is open source software.
-
-from flask.views import MethodView
-from flask import request, redirect, render_template, url_for
-from injector import inject
-from iatoolkit.services.profile_service import ProfileService
-from iatoolkit.services.prompt_manager_service import PromptService
-from iatoolkit.services.query_service import QueryService
-import os
-from iatoolkit.services.branding_service import BrandingService
-from iatoolkit.services.onboarding_service import OnboardingService
-
-
-class InitiateLoginView(MethodView):
-    """
-    Handles the initial part of the login process.
-    Authenticates, decides the login path (fast or slow), and renders
-    either the chat page directly or the loading shell.
-    """
-
-    @inject
-    def __init__(self,
-                 profile_service: ProfileService,
-                 branding_service: BrandingService,
-                 onboarding_service: OnboardingService,
-                 query_service: QueryService,
-                 prompt_service: PromptService):
-        self.profile_service = profile_service
-        self.branding_service = branding_service
-        self.onboarding_service = onboarding_service
-        self.query_service = query_service
-        self.prompt_service = prompt_service
-
-    def post(self, company_short_name: str):
-        company = self.profile_service.get_company_by_short_name(company_short_name)
-        if not company:
-            return render_template('error.html', message="Empresa no encontrada"), 404
-
-        email = request.form.get('email')
-        password = request.form.get('password')
-
-        # 1. Authenticate user and create the unified session.
-        auth_response = self.profile_service.login(
-            company_short_name=company_short_name,
-            email=email,
-            password=password
-        )
-
-        if not auth_response['success']:
-            return render_template(
-                'index.html',
-                company_short_name=company_short_name,
-                company=company,
-                form_data={"email": email},
-                alert_message=auth_response["message"]
-            ), 400
-
-        user_identifier = auth_response['user_identifier']
-
-        # 2. PREPARE and DECIDE: Call prepare_context to determine the path.
-        prep_result = self.query_service.prepare_context(
-            company_short_name=company_short_name, user_identifier=user_identifier
-        )
-
-        if prep_result.get('rebuild_needed'):
-            # --- SLOW PATH: Context rebuild is needed ---
-            # Render the shell, which will call LoginView for the heavy lifting.
-            branding_data = self.branding_service.get_company_branding(company)
-            onboarding_cards = self.onboarding_service.get_onboarding_cards(company)
-            target_url = url_for('login', company_short_name=company_short_name, _external=True)
-
-            return render_template(
-                "onboarding_shell.html",
-                iframe_src_url=target_url,
-                branding=branding_data,
-                onboarding_cards=onboarding_cards
-            )
-        else:
-            # --- FAST PATH: Context is already cached ---
-            # Render chat.html directly.
-            try:
-                session_info = self.profile_service.get_current_session_info()
-                user_profile = session_info.get('profile', {})
-
-                prompts = self.prompt_service.get_user_prompts(company_short_name)
-                branding_data = self.branding_service.get_company_branding(company)
-
-                return render_template("chat.html",
-                                       user_is_local=user_profile.get('user_is_local'),
-                                       user_email=user_profile.get('user_email'),
-                                       branding=branding_data,
-                                       prompts=prompts,
-                                       iatoolkit_base_url=os.getenv('IATOOLKIT_BASE_URL'),
-                                       ), 200
-            except Exception as e:
-                return render_template("error.html", company=company, company_short_name=company_short_name,
-                                       message=f"Error in fast path: {str(e)}"), 500
-
-
-class LoginView(MethodView):
-    """
-    Handles the heavy-lifting part of the login, ONLY triggered by the iframe
-    in the slow path (when context rebuild is needed).
-    """
-
-    @inject
-    def __init__(self,
-                 profile_service: ProfileService,
-                 query_service: QueryService,
-                 prompt_service: PromptService,
-                 branding_service: BrandingService):
-        self.profile_service = profile_service
-        self.query_service = query_service
-        self.prompt_service = prompt_service
-        self.branding_service = branding_service
-
-    def get(self, company_short_name: str):
-        # 1. Use the new centralized method to get session info.
-        session_info = self.profile_service.get_current_session_info()
-        user_identifier = session_info.get('user_identifier')
-        user_profile = session_info.get('profile', {})
-
-        if not user_identifier:
-            # This can happen if the session expires or is invalid.
-            return redirect(url_for('login_page', company_short_name=company_short_name))
-
-        company = self.profile_service.get_company_by_short_name(company_short_name)
-        if not company:
-            return render_template('error.html', message="Empresa no encontrada"), 404
-
-        try:
-            # 2. Finalize the context rebuild (the potentially long-running task).
-            # We pass the identifier, and the service resolves if it's local or external.
-            self.query_service.finalize_context_rebuild(
-                company_short_name=company_short_name,
-                user_identifier=user_identifier
-            )
-
-            # 3. Get the necessary data for the chat page.
-            prompts = self.prompt_service.get_user_prompts(company_short_name)
-            branding_data = self.branding_service.get_company_branding(company)
-
-            # 4. Render the final chat page.
-            return render_template("chat.html",
-                                   user_is_local=user_profile.get('user_is_local'),
-                                   user_email=user_profile.get('user_email'),
-                                   branding=branding_data,
-                                   prompts=prompts,
-                                   iatoolkit_base_url=os.getenv('IATOOLKIT_BASE_URL'),
-                                   ), 200
-
-        except Exception as e:
-            return render_template("error.html",
-                                   company=company,
-                                   company_short_name=company_short_name,
-                                   message=f"An unexpected error occurred during context loading: {str(e)}"), 500