iatoolkit 0.11.1__tar.gz → 0.12.0__tar.gz

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/PKG-INFO

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

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/pyproject.toml

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

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/src/iatoolkit/common/routes.py

@@ -26,9 +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.home_view import HomeView
-    from iatoolkit.views.chat_view import ChatView
-    from iatoolkit.views.login_view import LoginView
-    from iatoolkit.views.external_chat_login_view import ExternalChatLoginView
+    from iatoolkit.views.login_view import LoginView, InitiateLoginView
+    from iatoolkit.views.external_chat_login_view import InitiateExternalChatView, ExternalChatLoginView
     from iatoolkit.views.signup_view import SignupView
     from iatoolkit.views.verify_user_view import VerifyAccountView
     from iatoolkit.views.forgot_password_view import ForgotPasswordView
@@ -42,16 +41,19 @@ def register_views(injector, app):
 
     app.add_url_rule('/', view_func=HomeView.as_view('home'))
 
-    # main chat for iatoolkit front
-    app.add_url_rule('/<company_short_name>/chat', view_func=ChatView.as_view('chat'))
-
     # front if the company internal portal
     app.add_url_rule('/<company_short_name>/chat_login', view_func=ExternalChatLoginView.as_view('external_chat_login'))
-    app.add_url_rule('/<company_short_name>/external_login/<external_user_id>', view_func=ExternalLoginView.as_view('external_login'))
+    app.add_url_rule('/<company_short_name>/external_login/<external_user_id>',
+                     view_func=ExternalLoginView.as_view('external_login'))
+    app.add_url_rule('/<company_short_name>/initiate_external_chat',
+                         view_func=InitiateExternalChatView.as_view('initiate_chat_login'))
+
     app.add_url_rule('/auth/chat_token', view_func=ChatTokenRequestView.as_view('chat-token'))
 
     # main pages for the iatoolkit frontend
     app.add_url_rule('/<company_short_name>/login', view_func=LoginView.as_view('login'))
+    app.add_url_rule('/<company_short_name>/initiate_login', view_func=InitiateLoginView.as_view('initiate_login'))
+
     app.add_url_rule('/<company_short_name>/signup',view_func=SignupView.as_view('signup'))
     app.add_url_rule('/<company_short_name>/logout', 'logout', logout)
     app.add_url_rule('/logout', 'logout', logout)

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/src/iatoolkit/iatoolkit.py

@@ -315,12 +315,8 @@ class IAToolkit:
         """Vincula las vistas después de que el injector ha sido creado"""
         from iatoolkit.views.llmquery_view import LLMQueryView
         from iatoolkit.views.home_view import HomeView
-        from iatoolkit.views.chat_view import ChatView
-        from iatoolkit.views.change_password_view import ChangePasswordView
 
         binder.bind(HomeView, to=HomeView)
-        binder.bind(ChatView, to=ChatView)
-        binder.bind(ChangePasswordView, to=ChangePasswordView)
         binder.bind(LLMQueryView, to=LLMQueryView)
 
         logging.info("✅ Views configuradas correctamente")

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/src/iatoolkit/services/profile_service.py

@@ -17,7 +17,6 @@ import secrets
 import string
 from datetime import datetime, timezone
 from iatoolkit.services.user_session_context_service import UserSessionContextService
-from iatoolkit.services.query_service import QueryService
 
 
 class ProfileService:
@@ -25,50 +24,43 @@ class ProfileService:
     def __init__(self,
                  profile_repo: ProfileRepo,
                  session_context_service: UserSessionContextService,
-                 query_service: QueryService,
                  mail_app: MailApp):
         self.profile_repo = profile_repo
         self.session_context = session_context_service
-        self.query_service = query_service
         self.mail_app = mail_app
         self.bcrypt = Bcrypt()
 
 
     def login(self, company_short_name: str, email: str, password: str) -> dict:
         try:
-            # check if exits
+            # check if user exists
             user = self.profile_repo.get_user_by_email(email)
             if not user:
-                return {"error": "Usuario no encontrado"}
+                return {'success': False, "message": "Usuario no encontrado"}
 
             # check the encrypted password
             if not check_password_hash(user.password, password):
-                return {"error": "Contraseña inválida"}
+                return {'success': False, "message": "Contraseña inválida"}
 
             company = self.get_company_by_short_name(company_short_name)
             if not company:
-                return {"error": "Empresa no encontrada"}
+                return {'success': False, "message": "Empresa no encontrada"}
 
-            # check that user belongs to  company
+            # check that user belongs to company
             if company not in user.companies:
-                return {"error": "Usuario no esta autorizado para esta empresa"}
+                return {'success': False, "message": "Usuario no esta autorizado para esta empresa"}
 
             if not user.verified:
-                return {"error": "Tu cuenta no ha sido verificada. Por favor, revisa tu correo."}
+                return {'success': False,
+                        "message": "Tu cuenta no ha sido verificada. Por favor, revisa tu correo."}
 
-            # clear history save user data into session manager
+            # save user data into session manager
             self.set_user_session(user=user, company=company)
 
-            # initialize company context
-            self.query_service.llm_init_context(
-                company_short_name=company_short_name,
-                local_user_id=user.id
-            )
-
-            return {"message": "Login exitoso"}
+            return {'success': True, "user": user, "message": "Login exitoso"}
         except Exception as e:
-            logging.exception(f"login error: {str(e)}")
-            return {"error": str(e)}
+            return {'success': False, "message": str(e)}
+
 
     def set_user_session(self, user: User, company: Company):
         SessionManager.set('user_id', user.id)

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/src/iatoolkit/templates/chat.html

@@ -26,7 +26,7 @@
     <div class="d-flex align-items-center">
         <!-- 1. ID de Usuario -->
         <span style="{{ branding.secondary_text_style }}">
-            {{ external_user_id or user.email }}
+            {{ external_user_id or user_email }}
         </span>
 
         <!-- 2. Separador Vertical -->
@@ -43,7 +43,7 @@
         </a>
 
         <!-- Icono de cerrar sesión (al final) -->
-        {% if user.email %}
+        {% if user_email %}
             <a href="{{ url_for('logout', company_short_name=company_short_name) }}"
                  class="ms-3 action-icon-style" title="Cerrar sesión" style="color: {{ branding.header_text_color }} !important;">
                 <i class="bi bi-box-arrow-right"></i>

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/src/iatoolkit/templates/home.html

@@ -13,7 +13,7 @@
       <div class="border rounded p-4 shadow-sm bg-light">
         <h4 class="text-muted fw-semibold text-start mb-3">login integrado (IAToolkit)</h4>
         <form id="login-form"
-              action="{{ url_for('home', company_short_name=company_short_name) }}"
+              action="{{ url_for('initiate_login', company_short_name=company_short_name) }}"
               method="post">
           <div class="mb-3">
             <label for="company_short_name" class="form-label d-block text-muted">Empresa</label>
@@ -112,7 +112,7 @@
 
           // Actualizar action del formulario "Iniciar Sesión"
           if (selectedCompany && selectedCompany.trim() !== '') {
-              const loginAction = '/' + selectedCompany + '/login';
+              const loginAction = '/' + selectedCompany + '/initiate_login';
               $('#login-form').attr('action', loginAction); // Actualizamos la URL del form
           } else {
               $('#login-form').attr('action', '#'); // URL genérica si no hay selección
@@ -161,7 +161,7 @@
           $button.prop('disabled', true);
           $spinner.removeClass('d-none');
 
-          fetch(`/${selectedCompany}/chat_login`, {
+          fetch(`/${selectedCompany}/initiate_external_chat`, {
               method: 'POST',
               headers: {
                   'Content-Type': 'application/json',

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/src/iatoolkit/views/external_chat_login_view.py

@@ -5,7 +5,7 @@
 
 import os
 import logging
-from flask import request, jsonify, render_template
+from flask import request, jsonify, render_template, url_for, session
 from flask.views import MethodView
 from injector import inject
 from iatoolkit.common.auth import IAuthentication
@@ -15,6 +15,34 @@ from iatoolkit.services.prompt_manager_service import PromptService
 from iatoolkit.services.jwt_service import JWTService
 from iatoolkit.services.branding_service import BrandingService
 
+class InitiateExternalChatView(MethodView):
+    @inject
+    def __init__(self,
+                 iauthentication: IAuthentication,
+                 ):
+        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
+
+        external_user_id = data['external_user_id']
+
+        # 1. verify access credentials quickly
+        iaut = self.iauthentication.verify(
+            company_short_name,
+            body_external_user_id=external_user_id
+        )
+        if not iaut.get("success"):
+            return jsonify(iaut), 401
+
+        # 2. Render the shell page, passing the final data URL and user id
+        return render_template("login_shell.html",
+                               data_source_url=url_for('external_chat_login', company_short_name=company_short_name),
+                               external_user_id=external_user_id
+                               )
+
 class ExternalChatLoginView(MethodView):
     @inject
     def __init__(self,
@@ -39,19 +67,12 @@ class ExternalChatLoginView(MethodView):
 
         external_user_id = data['external_user_id']
 
-        # 1. get access credentials
-        iaut = self.iauthentication.verify(
-            company_short_name,
-            body_external_user_id=external_user_id
-        )
-        if not iaut.get("success"):
-            return jsonify(iaut), 401
-
         company = self.profile_service.get_company_by_short_name(company_short_name)
         if not company:
             return jsonify({"error": "Empresa no encontrada"}), 404
 
         try:
+
             # 1. generate a new JWT, our secure access token.
             token = self.jwt_service.generate_chat_jwt(
                 company_id=company.id,
@@ -75,19 +96,15 @@ class ExternalChatLoginView(MethodView):
             branding_data = self.branding_service.get_company_branding(company)
 
             # 5. render the chat page with the company/user information.
-            user_agent = request.user_agent
-            is_mobile = user_agent.platform in ["android", "iphone", "ipad"] or "mobile" in user_agent.string.lower()
-
             chat_html = render_template("chat.html",
                                         company_short_name=company_short_name,
-                                        branding=branding_data,
-                                        external_user_id=external_user_id,
-                                        is_mobile=is_mobile,
                                         auth_method='jwt',  # login method is JWT
                                         session_jwt=token,  # pass the token to the front-end
-                                        iatoolkit_base_url=os.getenv('IATOOLKIT_BASE_URL'),
+                                        external_user_id=external_user_id,
+                                        branding=branding_data,
                                         prompts=prompts,
-                                        external_login=True)
+                                        iatoolkit_base_url=os.getenv('IATOOLKIT_BASE_URL'),
+                                        )
             return chat_html, 200
 
         except Exception as e:

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/src/iatoolkit/views/history_view.py

@@ -34,7 +34,7 @@ class HistoryView(MethodView):
             return jsonify(iaut), 401
 
         external_user_id = data.get("external_user_id")
-        local_user_id = data.get("local_user_id", 0)
+        local_user_id = iaut.get("local_user_id", 0)
 
         try:
             response = self.history_service.get_history(

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

@@ -0,0 +1,124 @@
+# 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.repositories.models import User
+from iatoolkit.services.profile_service import ProfileService
+from iatoolkit.services.prompt_manager_service import PromptService
+from iatoolkit.services.branding_service import BrandingService
+from iatoolkit.services.query_service import QueryService
+import os
+from iatoolkit.common.session_manager import SessionManager
+
+
+class InitiateLoginView(MethodView):
+    """
+    Handles the initial, fast part of the standard login process.
+    Authenticates user credentials, sets up the server-side session,
+    and immediately returns the loading shell page.
+    """
+    @inject
+    def __init__(self, profile_service: ProfileService):
+        self.profile_service = profile_service
+
+    def post(self, company_short_name: str):
+        # get company info
+        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')
+
+        # authenticate the user
+        response = self.profile_service.login(
+            company_short_name=company_short_name,
+            email=email,
+            password=password
+        )
+
+        if not response['success']:
+            return render_template(
+                'login.html',
+                company_short_name=company_short_name,
+                company=company,
+                form_data={
+                    "email": email,
+                    "password": password,
+                },
+                alert_message=response["error"]), 400
+
+
+        # 3. Render the shell page, passing the URL for the heavy lifting
+        # The shell's AJAX call will now be authenticated via the session cookie.
+        return render_template(
+            "login_shell.html",
+            data_source_url=url_for('login', company_short_name=company_short_name),
+            external_user_id='' # Pass an empty string, the shell will handle it
+        )
+
+
+class LoginView(MethodView):
+    @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):
+        # get company info
+        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
+
+        return render_template('login.html',
+                               company=company,
+                               company_short_name=company_short_name)
+
+    def post(self, company_short_name: str):
+        company = self.profile_service.get_company_by_short_name(company_short_name)
+
+        # 1. The user is already authenticated by the session cookie set by InitiateLoginView.
+        # We just retrieve the user and company IDs from the session.
+        user_id = SessionManager.get('user_id')
+        user_email = SessionManager.get('user')['email']
+
+        try:
+            # 2. init the company/user LLM context.
+            self.query_service.llm_init_context(
+                company_short_name=company_short_name,
+                local_user_id=user_id
+            )
+
+            # 3. get the prompt list from backend
+            prompts = self.prompt_service.get_user_prompts(company_short_name)
+
+            # 4. get the branding data
+            branding_data = self.branding_service.get_company_branding(company)
+
+            return render_template("chat.html",
+                                    company_short_name=company_short_name,
+                                    auth_method="Session",
+                                    session_jwt=None,  # No JWT in this flow
+                                    user_email=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="Ha ocurrido un error inesperado."), 500
+

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/src/iatoolkit.egg-info/PKG-INFO

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

{iatoolkit-0.11.1 → iatoolkit-0.12.0}/src/iatoolkit.egg-info/SOURCES.txt

@@ -96,7 +96,6 @@ src/iatoolkit/templates/test.html
 src/iatoolkit/views/__init__.py
 src/iatoolkit/views/change_password_view.py
 src/iatoolkit/views/chat_token_request_view.py
-src/iatoolkit/views/chat_view.py
 src/iatoolkit/views/download_file_view.py
 src/iatoolkit/views/external_chat_login_view.py
 src/iatoolkit/views/external_login_view.py

iatoolkit-0.11.1/src/iatoolkit/views/chat_view.py

@@ -1,58 +0,0 @@
-# Copyright (c) 2024 Fernando Libedinsky
-# Product: IAToolkit
-#
-# IAToolkit is open source software.
-
-from flask import render_template, request, jsonify
-from iatoolkit.services.profile_service import ProfileService
-from flask.views import MethodView
-from injector import inject
-import os
-from iatoolkit.common.auth import IAuthentication
-from iatoolkit.services.prompt_manager_service import PromptService
-from iatoolkit.services.branding_service import BrandingService
-
-
-class ChatView(MethodView):
-    @inject
-    def __init__(self,
-                 iauthentication: IAuthentication,
-                 prompt_service: PromptService,
-                 profile_service: ProfileService,
-                 branding_service: BrandingService
-                 ):
-        self.iauthentication = iauthentication
-        self.profile_service = profile_service
-        self.prompt_service = prompt_service
-        self.branding_service = branding_service
-
-    def get(self, company_short_name: str):
-        # get access credentials
-        iaut = self.iauthentication.verify(company_short_name)
-        if not iaut.get("success"):
-            return jsonify(iaut), 401
-
-        user_agent = request.user_agent
-        is_mobile = user_agent.platform in ["android", "iphone", "ipad"] or "mobile" in user_agent.string.lower()
-        alert_message = request.args.get('alert_message', None)
-
-        # 1. get company info
-        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
-
-        # 2. get the company prompts
-        prompts = self.prompt_service.get_user_prompts(company_short_name)
-
-        # 3. get the  branding data
-        branding_data = self.branding_service.get_company_branding(company)
-
-        return render_template("chat.html",
-                               branding=branding_data,
-                               company_short_name=company_short_name,
-                               is_mobile=is_mobile,
-                               alert_message=alert_message,
-                               alert_icon='success' if alert_message else None,
-                               iatoolkit_base_url=os.getenv('IATOOLKIT_BASE_URL', 'http://localhost:5000'),
-                               prompts=prompts
-                               )

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

@@ -1,60 +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
-
-class LoginView(MethodView):
-    @inject
-    def __init__(self, profile_service: ProfileService):
-        self.profile_service = profile_service
-
-    def get(self, company_short_name: str):
-        # get company info
-        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
-
-        return render_template('login.html',
-                               company=company,
-                               company_short_name=company_short_name)
-
-    def post(self, company_short_name: str):
-        # get company info
-        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')
-        try:
-            password = request.form.get('password')
-
-            response = self.profile_service.login(
-                company_short_name=company_short_name,
-                email=email,
-                password=password
-                )
-
-            if "error" in response:
-                return render_template(
-                'login.html',
-                                    company_short_name=company_short_name,
-                                    company=company,
-                                    form_data={
-                                           "email": email,
-                                           "password": password,
-                                       },
-                                    alert_message=response["error"]), 400
-
-            return redirect(url_for('chat', company_short_name=company_short_name))
-
-        except Exception as e:
-            return render_template("error.html",
-                                   company=company,
-                                   company_short_name=company_short_name,
-                                   message="Ha ocurrido un error inesperado."), 500
-