iatoolkit 0.59.1__tar.gz → 0.59.2__tar.gz

{iatoolkit-0.59.1 → iatoolkit-0.59.2}/PKG-INFO

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

{iatoolkit-0.59.1 → iatoolkit-0.59.2}/pyproject.toml

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

{iatoolkit-0.59.1 → iatoolkit-0.59.2}/src/iatoolkit/base_company.py

@@ -29,11 +29,13 @@ class BaseCompany(ABC):
     def _create_company(self,
                         short_name: str,
                         name: str,
+                        parameters: dict | None = None,
                         branding: dict | None = None,
-                        onboarding_cards: dict | None = None
+                        onboarding_cards: dict | None = None,
                         ) -> Company:
         company_obj = Company(short_name=short_name,
                               name=name,
+                              parameters=parameters,
                               branding=branding,
                               onboarding_cards=onboarding_cards)
         self.company = self.profile_repo.create_company(company_obj)

{iatoolkit-0.59.1 → iatoolkit-0.59.2}/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.59.1"
+IATOOLKIT_VERSION = "0.59.2"
 
 # global variable for the unique instance of IAToolkit
 _iatoolkit_instance: Optional['IAToolkit'] = None

{iatoolkit-0.59.1 → iatoolkit-0.59.2}/src/iatoolkit/repositories/models.py

@@ -60,7 +60,7 @@ class Company(Base):
 
     branding = Column(JSON, nullable=True)
     onboarding_cards = Column(JSON, nullable=True)
-    parameters = Column(JSON, nullable=True, default={})
+    parameters = Column(JSON, nullable=True)
     created_at = Column(DateTime, default=datetime.now)
     allow_jwt = Column(Boolean, default=True, nullable=True)
 

iatoolkit-0.59.2/src/iatoolkit/services/user_feedback_service.py

@@ -0,0 +1,103 @@
+# Copyright (c) 2024 Fernando Libedinsky
+# Product: IAToolkit
+#
+# IAToolkit is open source software.
+
+from iatoolkit.repositories.models import UserFeedback, Company
+from injector import inject
+from iatoolkit.repositories.profile_repo import ProfileRepo
+from iatoolkit.infra.google_chat_app import GoogleChatApp
+from iatoolkit.infra.mail_app import MailApp  # <-- 1. Importar MailApp
+import logging
+
+
+class UserFeedbackService:
+    @inject
+    def __init__(self,
+                 profile_repo: ProfileRepo,
+                 google_chat_app: GoogleChatApp,
+                 mail_app: MailApp):
+        self.profile_repo = profile_repo
+        self.google_chat_app = google_chat_app
+        self.mail_app = mail_app
+
+    def _send_google_chat_notification(self, space_name: str, message_text: str):
+        """Envía una notificación de feedback a un espacio de Google Chat."""
+        try:
+            chat_data = {
+                "type": "MESSAGE_TRIGGER",
+                "space": {"name": space_name},
+                "message": {"text": message_text}
+            }
+            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')}")
+        except Exception as e:
+            logging.exception(f"Fallo inesperado al enviar notificación a Google Chat: {e}")
+
+    def _send_email_notification(self, destination_email: str, company_name: str, message_text: str):
+        """Envía una notificación de feedback por correo electrónico."""
+        try:
+            subject = f"Nuevo Feedback de {company_name}"
+            # Convertir el texto plano a un HTML simple para mantener los saltos de línea
+            html_body = message_text.replace('\n', '<br>')
+            self.mail_app.send_email(to=destination_email, subject=subject, body=html_body)
+        except Exception as e:
+            logging.exception(f"Fallo inesperado al enviar email de feedback: {e}")
+
+    def _handle_notification(self, company: Company, message_text: str):
+        """Lee la configuración de la empresa y envía la notificación al canal correspondiente."""
+        feedback_params = company.parameters.get('user_feedback')
+        if not isinstance(feedback_params, dict):
+            logging.warning(f"No se encontró configuración de 'user_feedback' para la empresa {company.short_name}.")
+            return
+
+        # get channel and destination
+        channel = feedback_params.get('channel')
+        destination = feedback_params.get('destination')
+        if not channel or not destination:
+            logging.warning(f"Configuración 'user_feedback' incompleta para {company.short_name}. Faltan 'channel' o 'destination'.")
+            return
+
+        if channel == 'google_chat':
+            self._send_google_chat_notification(space_name=destination, message_text=message_text)
+        elif channel == 'email':
+            self._send_email_notification(destination_email=destination, company_name=company.short_name, message_text=message_text)
+        else:
+            logging.warning(f"Canal de feedback '{channel}' no reconocido para la empresa {company.short_name}.")
+
+    def new_feedback(self,
+                     company_short_name: str,
+                     message: str,
+                     user_identifier: str,
+                     rating: int = None) -> dict:
+        try:
+            # 1. Validar empresa
+            company = self.profile_repo.get_company_by_short_name(company_short_name)
+            if not company:
+                return {'error': f'No existe la empresa: {company_short_name}'}
+
+            # 2. Enviar notificación según la configuración de la empresa
+            notification_text = (f"*Nuevo feedback de {company_short_name}*:\n"
+                                 f"*Usuario:* {user_identifier}\n"
+                                 f"*Mensaje:* {message}\n"
+                                 f"*Calificación:* {rating if rating is not None else 'N/A'}")
+            self._handle_notification(company, notification_text)
+
+            # 3. Guardar el feedback en la base de datos (independientemente del éxito de la notificación)
+            new_feedback_obj = UserFeedback(
+                company_id=company.id,
+                message=message,
+                user_identifier=user_identifier,
+                rating=rating
+            )
+            saved_feedback = self.profile_repo.save_feedback(new_feedback_obj)
+            if not saved_feedback:
+                logging.error(f"No se pudo guardar el feedback para el usuario {user_identifier} en la empresa {company_short_name}")
+                return {'error': 'No se pudo guardar el feedback'}
+
+            return {'message': 'Feedback guardado correctamente'}
+
+        except Exception as e:
+            logging.exception(f"Error crítico en el servicio de feedback: {e}")
+            return {'error': str(e)}

{iatoolkit-0.59.1 → iatoolkit-0.59.2}/src/iatoolkit/static/js/chat_feedback.js

@@ -101,12 +101,10 @@ const sendFeedback = async function(message) {
         "user_identifier": window.user_identifier,
         "message": message,
         "rating": activeStars,
-        "space": "spaces/AAQAupQldd4", // Este valor podría necesitar ser dinámico
-        "type": "MESSAGE_TRIGGER"
     };
     try {
         // Asumiendo que callLLMAPI está definido globalmente en otro archivo (ej. chat_main.js)
-        const responseData = await callToolkit('/feedback', data, "POST");
+        const responseData = await callToolkit('/api/feedback', data, "POST");
         return responseData;
     } catch (error) {
         console.error("Error al enviar feedback:", error);

{iatoolkit-0.59.1 → iatoolkit-0.59.2}/src/iatoolkit/views/user_feedback_api_view.py

@@ -37,14 +37,6 @@ class UserFeedbackApiView(MethodView):
         if not message:
             return jsonify({"error_message": "Falta el mensaje de feedback"}), 400
         
-        space = data.get("space")
-        if not space:
-            return jsonify({"error_message": "Falta el espacio de Google Chat"}), 400
-        
-        type = data.get("type")
-        if not type:
-            return jsonify({"error_message": "Falta el tipo de feedback"}), 400
-        
         rating = data.get("rating")
         if not rating:
             return jsonify({"error_message": "Falta la calificación"}), 400
@@ -54,8 +46,6 @@ class UserFeedbackApiView(MethodView):
                 company_short_name=company_short_name,
                 message=message,
                 user_identifier=user_identifier,
-                space=space,
-                type=type,
                 rating=rating
             )
 

{iatoolkit-0.59.1 → iatoolkit-0.59.2}/src/iatoolkit.egg-info/PKG-INFO

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

iatoolkit-0.59.1/src/iatoolkit/services/user_feedback_service.py

@@ -1,64 +0,0 @@
-# Copyright (c) 2024 Fernando Libedinsky
-# Product: IAToolkit
-#
-# IAToolkit is open source software.
-
-from iatoolkit.repositories.models import UserFeedback
-from injector import inject
-from iatoolkit.repositories.profile_repo import ProfileRepo
-from iatoolkit.infra.google_chat_app import GoogleChatApp
-import logging
-
-
-class UserFeedbackService:
-    @inject
-    def __init__(self, profile_repo: ProfileRepo, google_chat_app: GoogleChatApp):
-        self.profile_repo = profile_repo
-        self.google_chat_app = google_chat_app
-
-    def new_feedback(self,
-                     company_short_name: str,
-                     message: str,
-                     user_identifier: str,
-                     space: str = None,
-                     type: str = None,
-                     rating: int = None) -> dict:
-        try:
-            # validate company
-            company = self.profile_repo.get_company_by_short_name(company_short_name)
-            if not company:
-                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:* {user_identifier}\n*Mensaje:* {message}\n*Calificación:* {rating}"
-
-            # TO DO: get the space and type from the input data
-            chat_data = {
-                "type": type,
-                "space": {
-                    "name": space
-                },
-                "message": {
-                    "text": chat_message
-                }
-            }
-
-            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')}")
-
-            # create the UserFeedback object
-            new_feedback = UserFeedback(
-                company_id=company.id,
-                message=message,
-                user_identifier=user_identifier,
-                rating=rating
-            )
-            new_feedback = self.profile_repo.save_feedback(new_feedback)
-            if not new_feedback:
-                return {'error': 'No se pudo guardar el feedback'}
-
-            return {'message': 'Feedback guardado correctamente'}
-
-        except Exception as e:
-            return {'error': str(e)}