Merge branch #AIdeaText/test' into 'AIdeaText/test2'

app.py

@@ -25,7 +25,8 @@ from modules.ui.ui import (
     display_semantic_analysis_interface,
     display_discourse_analysis_interface, 
     display_student_progress,
-    display_chatbot_interface
+    display_chatbot_interface,
+    display_feedback_form
 )
 from modules.utils.spacy_utils import load_spacy_models
 import logging
@@ -39,7 +40,6 @@ st.set_page_config(page_title="AIdeaText", layout="wide", page_icon="random")
 st.cache_data.clear()
 st.cache_resource.clear()
 
-
 # Cargar los modelos de spaCy una vez al inicio de la aplicación
 print("Cargando modelos")
 @st.cache_resource
@@ -115,7 +115,7 @@ def logged_in_interface():
     # Añadir una línea divisoria
     st.markdown("---")
 
-    tab1, tab2, tab3, tab4, tab5 = st.tabs(["Análisis morfosintáctico", "Análisis semántico", "Análisis del discurso", "Chat con Llama2", "Mi Progreso"])
+    tab1, tab2, tab3, tab4, tab5, tab6 = st.tabs(["Análisis morfosintáctico", "Análisis semántico", "Análisis del discurso", "Chat con Llama2", "Mi Progreso", "Formulario de Retroalimentación"])
 
     with tab1:
         display_morphosyntax_analysis_interface(nlp_models, lang_code)
@@ -127,6 +127,8 @@ def logged_in_interface():
         display_chatbot_interface(lang_code)
     with tab5:
         display_student_progress(st.session_state.username, lang_code)
+    with tab6:
+        display_feedback_form(lang_code)
 
 ###################################################################################################################
 if __name__ == "__main__":

modules/__init__.py

@@ -17,7 +17,8 @@ def load_database_function():
         store_discourse_analysis_result,
         store_chat_history,
         create_admin_user,
-        create_student_user
+        create_student_user,
+        store_user_feedback
     )
     return {
         'initialize_mongodb_connection': initialize_mongodb_connection, 
@@ -28,7 +29,8 @@ def load_database_function():
         'store_discourse_analysis_result': store_discourse_analysis_result, 
         'store_chat_history': store_chat_history, 
         'create_admin_user': create_admin_user, 
-        'create_student_user': create_student_user
+        'create_student_user': create_student_user,
+        'store_user_feedback': store_user_feedback,
     }
 
 def load_ui_functions():
@@ -42,7 +44,8 @@ def load_ui_functions():
         display_morphosyntax_analysis_interface,
         display_semantic_analysis_interface,
         display_discourse_analysis_interface,
-        display_chatbot_interface
+        display_chatbot_interface, 
+        display_feedback_form
     )
     return {
         'main': main, 
@@ -54,7 +57,14 @@ def load_ui_functions():
         'display_morphosyntax_analysis_interface': display_morphosyntax_analysis_interface,
         'display_semantic_analysis_interface': display_semantic_analysis_interface,
         'display_discourse_analysis_interface': display_discourse_analysis_interface,
-        'display_chatbot_interface': display_chatbot_interface   
+        'display_chatbot_interface': display_chatbot_interface, 
+        'display_feedback_form': display_feedback_form
+    }
+
+def load_email_functions():
+    from modules.email.email import send_email_notification
+    return {
+        'send_email_notification': send_email_notification
     }
 
 def load_admin_functions():
@@ -131,4 +141,5 @@ def load_all_functions():
         **discourse_analysis_text_functions(),
         **spacy_utils_functions(),
         **chatbot_functions()
+        **load_email_functions() 
     }

modules/database/database.py

@@ -22,6 +22,7 @@ application_requests_container = None
 cosmos_client = None
 user_database = None
 user_container = None
+user_feedback_container = None
 
 # Variables globales para Cosmos DB MongoDB API
 mongo_client = None
@@ -55,7 +56,7 @@ def initialize_database_connections():
 
 #####################################################################################33
 def initialize_cosmos_sql_connection():
-    global cosmos_client, user_database, user_container, application_requests_container
+    global cosmos_client, user_database, user_container, application_requests_container, user_feedback_container
     logger.info("Initializing Cosmos DB SQL API connection")
     try:
         cosmos_endpoint = os.environ.get("COSMOS_ENDPOINT")
@@ -71,9 +72,11 @@ def initialize_cosmos_sql_connection():
         user_database = cosmos_client.get_database_client("user_database")
         user_container = user_database.get_container_client("users")
         application_requests_container = user_database.get_container_client("application_requests")
+        user_feedback_container = user_database.get_container_client("user_feedback")
         
         logger.info(f"user_container initialized: {user_container is not None}")
         logger.info(f"application_requests_container initialized: {application_requests_container is not None}")
+        logger.info(f"user_feedback_container initialized: {user_feedback_container is not None}")
         
         logger.info("Conexión a Cosmos DB SQL API exitosa")
         return True
@@ -192,6 +195,33 @@ def store_application_request(name, email, institution, role, reason):
         return False
         
 #######################################################################################################
+def store_user_feedback(username, name, email, feedback):
+    global user_feedback_container
+    logger.info(f"Attempting to store user feedback for user: {username}")
+    try:
+        if user_feedback_container is None:
+            logger.error("user_feedback_container is not initialized")
+            return False
+
+        feedback_item = {
+            "id": str(uuid.uuid4()),
+            "username": username,
+            "name": name,
+            "email": email,
+            "feedback": feedback,
+            "timestamp": datetime.utcnow().isoformat()
+        }
+
+        result = user_feedback_container.create_item(body=feedback_item)
+        logger.info(f"User feedback stored with ID: {result['id']} for user: {username}")
+        return True
+    except Exception as e:
+        logger.error(f"Error storing user feedback for user {username}: {str(e)}")
+        return False
+
+
+#######################################################################################################
+
 def store_morphosyntax_result(username, text, repeated_words, arc_diagrams, pos_analysis, morphological_analysis, sentence_structure):
     if analysis_collection is None:
         logger.error("La conexión a MongoDB no está inicializada")

modules/email/email.py

@@ -49,4 +49,38 @@ def send_email_notification(name, email, institution, role, reason):
         return True
     except Exception as e:
         logger.error(f"Error sending email notification: {str(e)}")
+        return False
+
+def send_user_feedback_notification(name, email, feedback):
+    sender_email = "[email protected]"
+    receiver_email = "[email protected]"  # Cambia esto a la dirección que desees
+    password = os.environ.get("EMAIL_PASSWORD")
+
+    message = MIMEMultipart("alternative")
+    message["Subject"] = "Nuevo comentario de usuario en AIdeaText"
+    message["From"] = sender_email
+    message["To"] = receiver_email
+
+    html = f"""\
+    <html>
+      <body>
+        <h2>Nuevo comentario de usuario en AIdeaText</h2>
+        <p><strong>Nombre:</strong> {name}</p>
+        <p><strong>Email:</strong> {email}</p>
+        <p><strong>Comentario:</strong> {feedback}</p>
+      </body>
+    </html>
+    """
+
+    part = MIMEText(html, "html")
+    message.attach(part)
+
+    try:
+        with smtplib.SMTP_SSL("smtp.gmail.com", 465) as server:
+            server.login(sender_email, password)
+            server.sendmail(sender_email, receiver_email, message.as_string())
+        logger.info(f"Email notification sent for user feedback from: {email}")
+        return True
+    except Exception as e:
+        logger.error(f"Error sending user feedback email notification: {str(e)}")
         return False

modules/ui/ui.py

@@ -37,7 +37,8 @@ from ..database.database import (
     store_discourse_analysis_result,
     store_chat_history,
     create_admin_user,
-    create_student_user
+    create_student_user,
+    store_user_feedback
 )
 
 ######################################################
@@ -162,7 +163,7 @@ def user_page():
 
     # Aquí puedes añadir las funcionalidades para el usuario estudiante
     # Por ejemplo:
-    tabs = st.tabs(["Análisis Morfosintáctico", "Análisis Semántico", "Análisis del Discurso", "Chat", "Mi Progreso"])
+    tabs = st.tabs(["Análisis Morfosintáctico", "Análisis Semántico", "Análisis del Discurso", "Chat", "Mi Progreso", "Formulario de Retroalimentación"])
     
     with tabs[0]:
         display_morphosyntax_analysis_interface(nlp_models, 'es')  # Asumiendo que 'es' es el idioma por defecto
@@ -174,6 +175,8 @@ def user_page():
         display_chatbot_interface('es')
     with tabs[4]:
         display_student_progress(st.session_state.username, 'es')
+    with tabs[5]:
+        display_feedback_form('es')
 
 ##################################################################################################
 def display_videos_and_info():
@@ -232,6 +235,37 @@ def register_form():
                 st.error("Hubo un problema al enviar tu solicitud. Por favor, intenta de nuevo más tarde.")
                 logger.error(f"Failed to store application request for {email}")
 
+################################################################################
+def display_feedback_form(lang_code):
+    translations = {
+        'es': {
+            'title': "Formulario de Retroalimentación",
+            'name': "Nombre",
+            'email': "Correo electrónico",
+            'feedback': "Tu retroalimentación",
+            'submit': "Enviar",
+            'success': "¡Gracias por tu retroalimentación!",
+            'error': "Hubo un problema al enviar el formulario. Por favor, intenta de nuevo."
+        },
+        # ... (traducciones para otros idiomas)
+    }
+
+    t = translations[lang_code]
+
+    st.header(t['title'])
+    
+    name = st.text_input(t['name'])
+    email = st.text_input(t['email'])
+    feedback = st.text_area(t['feedback'])
+
+    if st.button(t['submit']):
+        if name and email and feedback:
+            if store_user_feedback(st.session_state.username, name, email, feedback):
+                st.success(t['success'])
+            else:
+                st.error(t['error'])
+        else:
+            st.warning("Por favor, completa todos los campos.")
 
 ################################################################################
 def is_institutional_email(email):