Update main.py

main.py

@@ -26,13 +26,11 @@ from langgraph.checkpoint.memory import MemorySaver
 from langchain_openai import ChatOpenAI
 from langchain_core.messages import HumanMessage, SystemMessage, AIMessage
 
-from dash_socketio import DashSocketIO
 import dash
 from dash.dependencies import Input, Output, State
 from dash import Dash, html, dcc, callback, callback_context, ctx, Output, Input, dash_table, State, no_update, _dash_renderer, clientside_callback
 from dash import html
 
-import dash_bootstrap_components as dbc
 import dash_bootstrap_components as dbc
 from dash.exceptions import PreventUpdate
 import dash_mantine_components as dmc
@@ -40,7 +38,6 @@ from dash_iconify import DashIconify
 _dash_renderer._set_react_version("18.2.0")
 import flask
 from flask_login import LoginManager, UserMixin, login_user, current_user, login_required, logout_user
-from flask_socketio import SocketIO, emit
 from datetime import timedelta
 
 from IPython.display import display, HTML
@@ -591,7 +588,7 @@ def build_workflow(num_bcc,file,pathname) -> StateGraph:
 
     return workflow
 
-def init_agent_state(current_url, num, socket_id, pathname) -> AgentState:
+def init_agent_state(current_url, num, pathname) -> AgentState:
     initial_state: AgentState = {
         #"files_list": csv_files[1:],  # Tous les fichiers sauf le premier
         #"current_file": csv_files[0],  # Premier fichier à traiter
@@ -625,61 +622,37 @@ def init_agent_state(current_url, num, socket_id, pathname) -> AgentState:
                     if task == "load_and_preprocess":
                         if key == "current_file":
                             result += f"Traitement du fichier {taskInfo['current_file']} en cours...\n"
-                            emit("stream", f"Traitement du fichier {taskInfo['current_file']} en cours... Création des catégories d'enseignements en cours...\n", namespace="/", to=socket_id)
-                            time.sleep(0.05)
                     if task == "classify_teachings":
                         if key == "status":
                             for key, value in taskInfo['classified_teachings'].items():
                                 result += f"\n\n-**Enseignement classé dans la catégorie '{key}'** : "
-                                emit("stream", f"\n\nEnseignement classé dans la catégorie '{key}' : ", namespace="/", to=socket_id)
-                                time.sleep(1.0)
                                 for enseignement in value:
                                     result += f"{enseignement}, "
-                                    emit("stream", f"{enseignement}, ", namespace="/", to=socket_id)
-                                    time.sleep(0.05)
                             result += f"\n\nTraitement de la tâche : {taskInfo['status']}...\n"
-                            emit("stream", f"\n\nTraitement de la tâche : {taskInfo['status']}... Création des situations d'apprentissage en cours...\n", namespace="/", to=socket_id)
-                            time.sleep(0.05)
                     if task == "create_categories":
                         if key == "status":
                             result += f"\n\nTraitement de la tâche : {taskInfo['status']}...\n"
-                            emit("stream", f"\n\nTraitement de la tâche : {taskInfo['status']}... Classification des enseignements en cours...\n", namespace="/", to=socket_id)
-                            time.sleep(0.05)
                     if task == "create_learning_situations":
                         if key == "status":
                             if taskInfo['learning_situations'].items():
                                 for key, value in taskInfo['learning_situations'].items():
                                     result += f"\n\n-**Situation d'apprentissage créée pour la catégorie '{key}'** : {value}\n"
-                                    emit("stream", f"\n\nSituation d'apprentissage créée pour la catégorie '{key}' : {value}\n", namespace="/", to=socket_id)
-                                    time.sleep(1.0)
                                 result += f"\n\nTraitement de la tâche : {taskInfo['status']}...\n"
-                                emit("stream", f"\n\nTraitement de la tâche : {taskInfo['status']}... Création des BCC en cours...\n", namespace="/", to=socket_id)
-                                time.sleep(0.05)
                             else:
                                 result += f"\n\nTraitement de la tâche : pas de situations d'apprentissage créées\n"
-                                emit("stream", f"\n\nTraitement de la tâche : pas de situations d'apprentissage créées\n", namespace="/", to=socket_id)
-                                time.sleep(0.05)
                     if task == "create_academic_competencies":
                         if key == "dataframe":
                             df = taskInfo['dataframe']
                         if key == "status":
                             if taskInfo['academic_competencies'].items():
                                 for key, value in taskInfo['academic_competencies'].items():
-                                    result += f"\n\n-**Compétence académique créée pour la catégorie '{key}'** : {value}\n"
-                                    emit("stream", f"\n\nCompétence académique créée pour la catégorie '{key}' : {value}\n", namespace="/", to=socket_id)
-                                    time.sleep(1.0)                            
+                                    result += f"\n\n-**Compétence académique créée pour la catégorie '{key}'** : {value}\n"                        
                                 result += f"\n\nTraitement de la tâche : {taskInfo['status']}...\n"
-                                emit("stream", f"\n\nTraitement de la tâche : {taskInfo['status']}...\n", namespace="/", to=socket_id)
-                                time.sleep(0.05)
                             else:
                                 result += f"\n\nTraitement de la tâche : pas de BCC créés\n"
-                                emit("stream", f"\n\nTraitement de la tâche : pas de BCC créés\n", namespace="/", to=socket_id)
-                                time.sleep(0.05)
                     if task == "export_to_excel_2":
                         if key == "status":
                             result += f"\n\nTraitement de la tâche : {taskInfo['status']}...\n"
-                            emit("stream", f"\n\nTraitement de la tâche : {taskInfo['status']}...\n", namespace="/", to=socket_id)
-                            time.sleep(0.05)
 
     except Exception as e:
         print(f"Erreur lors de l'exécution du workflow: {e}")
@@ -801,7 +774,6 @@ app = dash.Dash(__name__, server=server, external_stylesheets=[dmc.styles.ALL, d
                 update_title='Chargement...',
                 suppress_callback_exceptions=True)
 
-socketio = SocketIO(app.server)
 # Updating the Flask Server configuration with Secret Key to encrypt the user session cookie
 server.config['REMEMBER_COOKIE_DURATION'] = timedelta(seconds=3600)
 
@@ -1134,7 +1106,7 @@ app_page = dmc.MantineProvider(
                         className="g-0"
                     ),
                     html.H4(id="text-enseignement-dropdown", className="mb-3 text-success", style={"font-size": "0.7rem"}),
-                    dbc.Textarea(id="enseignement-dropdown", className="mb-3", style={"height":"200px", "max-height":"250px", "font-size": "0.75rem","color":"white","border":"border 1px solid rgb(67,167,255)!important", "background-color":"transparent"}),
+                    dcc.Loading(dbc.Textarea(id="enseignement-dropdown", className="mb-3", style={"height":"200px", "max-height":"250px", "font-size": "0.75rem","color":"white","border":"border 1px solid rgb(67,167,255)!important", "background-color":"transparent"}),),
                 ], md=6),
                 dbc.Col([
                     dbc.Row(
@@ -1148,7 +1120,7 @@ app_page = dmc.MantineProvider(
                         className="g-0"
                     ),
                     html.H4("Choisir d'abord une maquette de formation avec propositions BCC", className="mb-3", style={"font-size": "0.7rem"}),
-                    dbc.Textarea(id="classification-dropdown", className="mb-3", placeholder="Choisir d'abord une maquette avec propositions BCC", style={"height":"200px", "max-height":"250px", "font-size": "0.75rem","color":"white","border":"border 1px solid rgb(67,167,255)!important", "background-color":"transparent"}),
+                    dcc.Loading(dbc.Textarea(id="classification-dropdown", className="mb-3", placeholder="Choisir d'abord une maquette avec propositions BCC", style={"height":"200px", "max-height":"250px", "font-size": "0.75rem","color":"white","border":"border 1px solid rgb(67,167,255)!important", "background-color":"transparent"}),),
                 ], md=6)
                 ]),
                 dbc.Row([
@@ -1164,7 +1136,7 @@ app_page = dmc.MantineProvider(
                         className="g-0"
                     ),
                     html.H4("Choisir d'abord une maquette de formation avec propositions BCC", className="mb-3", style={"font-size": "0.7rem"}),
-                    dbc.Textarea(id="situation-dropdown", className="mb-3", placeholder="Choisir d'abord une maquette avec propositions BCC", style={"height":"200px", "max-height":"250px", "font-size": "0.75rem","color":"white","border":"border 1px solid rgb(67,167,255)!important", "background-color":"transparent"}),
+                    dcc.Loading(dbc.Textarea(id="situation-dropdown", className="mb-3", placeholder="Choisir d'abord une maquette avec propositions BCC", style={"height":"200px", "max-height":"250px", "font-size": "0.75rem","color":"white","border":"border 1px solid rgb(67,167,255)!important", "background-color":"transparent"}),),
                 ], md=6),
                 dbc.Col([
                     dbc.Row(
@@ -1292,9 +1264,8 @@ app_page = dmc.MantineProvider(
                         align="left",
                         className="g-0"
                     ),
-            html.Div(id='output-response', style={"color":"rgb(90, 242, 156)","border-radius":"3px","border":"1px solid rgb(255,255,255)!important","background-color":"rgba(90, 242, 156, 0.2)","padding":"5px"}),
-            html.Div(id="notification_wrapper", style={"margin-top":"1rem"}),
-            DashSocketIO(id='socketio', eventNames=["notification", "stream"]),
+            dcc.Loading(html.Div(id='output-response', style={"color":"rgb(90, 242, 156)","border-radius":"3px","border":"1px solid rgb(255,255,255)!important","background-color":"rgba(90, 242, 156, 0.2)","padding":"5px"}),),
+            
         ], width=12)
     ])
 ], className="mt-5")],
@@ -1675,9 +1646,8 @@ app_avid_page = dmc.MantineProvider(
                         align="left",
                         className="g-0"
                     ),
-            html.Div(id='output-response-avid', style={"color":"rgb(156, 242, 242)","border-radius":"3px","border":"1px solid rgb(255,255,255)!important","background-color":"rgba(156, 242, 242, 0.2)","padding":"5px"}),
-            html.Div(id="notification_wrapper-avid", style={"margin-top":"1rem"}),
-            DashSocketIO(id='socketio-avid', eventNames=["notification", "stream"]),
+            dcc.Loading(html.Div(id='output-response-avid', style={"color":"rgb(156, 242, 242)","border-radius":"3px","border":"1px solid rgb(255,255,255)!important","background-color":"rgba(156, 242, 242, 0.2)","padding":"5px"}),),
+            
         ], width=12)
     ])
 ], className="mt-5")],
@@ -2215,129 +2185,66 @@ def display_page(pathname):
     # You could also return a 404 "URL not found" page here
     return view, url
 
-@socketio.on("connect")
-def on_connect():
-    print("Client connected")
-
-@socketio.on("disconnect")
-def on_disconnect():
-    print("Client disconnected")
-
-
 @callback(
     Output("output-response", "children"),
-    Output("notification_wrapper", "children", allow_duplicate=True),
     Input("num-bcc", "value"),
     Input("maquette-dropdown", "value"),
     Input("submit-button", "n_clicks"),
-    State("socketio", "socketId"),
     State("url", "pathname"),
-    running=[[Output("output-response", "children"), "", None]],
     prevent_initial_call=True,
 )
-def display_status(num, current, n_clicks, socket_id, pathname):
-    if not n_clicks or not socket_id:
-        return no_update, []
+def display_status(num, current, n_clicks, pathname):
+    if not n_clicks:
+        return no_update
     
     if not current:
         print(f"Erreur: Il n'y a pas de fichier dans le répertoire.")
-        return no_update, []
+        return no_update
     if not num:
         print(f"Erreur: Il n'y a pas de nombre de BCC à générer.")
-        return no_update, []
+        return no_update
 
     current_url = current
     
     print(f"Fichier Maquette sélectionné: {current_url}")
-    agent = init_agent_state(current_url, num, socket_id, pathname)
+    agent = init_agent_state(current_url, num, pathname)
     try:
         df = agent[0]
         result = agent[1]
-        return html.Div(children=[dbc.Table.from_dataframe(df[["diplome", "RNCP", "Année d'étude", "Semestre", "BCC", "UE", "ECUE","exemple_situation_apprentissage"]], striped=True, bordered=True, hover=True, index=False), dcc.Markdown(f"""{result}""", style={"color":"white","font-size":"0.75rem"})]), []
+        return html.Div(children=[dbc.Table.from_dataframe(df[["diplome", "RNCP", "Année d'étude", "Semestre", "BCC", "UE", "ECUE","exemple_situation_apprentissage"]], striped=True, bordered=True, hover=True, index=False), dcc.Markdown(f"""{result}""", style={"color":"white","font-size":"0.75rem"})])
     except:
-        return html.Div(dcc.Markdown(f"""{agent}""", style={"color":"white","font-size":"0.75rem"})), []
+        return html.Div(dcc.Markdown(f"""{agent}""", style={"color":"white","font-size":"0.75rem"}))
     
 @callback(
     Output("output-response-avid", "children"),
-    Output("notification_wrapper-avid", "children", allow_duplicate=True),
     Input("num-bcc-avid", "value"),
     Input("maquette-dropdown-avid", "value"),
     Input("submit-button-avid", "n_clicks"),
-    State("socketio-avid", "socketId"),
     State("url", "pathname"),
-    running=[[Output("output-response-avid", "children"), "", None]],
     prevent_initial_call=True,
 )
-def display_status(num, current, n_clicks, socket_id, pathname):
-    if not n_clicks or not socket_id:
-        return no_update, []
+def display_status(num, current, n_clicks, pathname):
+    if not n_clicks:
+        return no_update
     
     if not current:
         print(f"Erreur: Il n'y a pas de fichier dans le répertoire.")
-        return no_update, []
+        return no_update
     if not num:
         print(f"Erreur: Il n'y a pas de nombre de BCC à générer.")
-        return no_update, []
+        return no_update
 
     current_url = current
     
     print(f"Fichier Maquette sélectionné: {current_url}")
     
-    agent = init_agent_state(current_url, num, socket_id, pathname)
+    agent = init_agent_state(current_url, num, pathname)
     try:
         df = agent[0]
         result = agent[1]
-        return html.Div(children=[dbc.Table.from_dataframe(df[["diplome", "RNCP", "Année d'étude", "Semestre", "BCC", "UE", "ECUE","exemple_situation_apprentissage"]], striped=True, bordered=True, hover=True, index=False), dcc.Markdown(f"""{result}""", style={"color":"white","font-size":"0.75rem"})]), []
+        return html.Div(children=[dbc.Table.from_dataframe(df[["diplome", "RNCP", "Année d'étude", "Semestre", "BCC", "UE", "ECUE","exemple_situation_apprentissage"]], striped=True, bordered=True, hover=True, index=False), dcc.Markdown(f"""{result}""", style={"color":"white","font-size":"0.75rem"})])
     except:
-        return html.Div(dcc.Markdown(f"""{agent}""", style={"color":"white","font-size":"0.75rem"})), []
-
-clientside_callback(
-    """connected => !connected""",
-    Output("submit-button", "disabled"),
-    Input("socketio", "connected"),
-)
-
-clientside_callback(
-    """(notification) => {
-        if (!notification) return dash_clientside.no_update
-        return notification
-    }""",
-    Output("notification_wrapper", "children", allow_duplicate=True),
-    Input("socketio", "data-notification"),
-    prevent_initial_call=True,
-)
-
-clientside_callback(
-    """(word, text) => text + word""",
-    Output("output-response", "children", allow_duplicate=True),
-    Input("socketio", "data-stream"),
-    State("output-response", "children"),
-    prevent_initial_call=True,
-)
-
-clientside_callback(
-    """connected => !connected""",
-    Output("submit-button-avid", "disabled"),
-    Input("socketio-avid", "connected"),
-)
-
-clientside_callback(
-    """(notification) => {
-        if (!notification) return dash_clientside.no_update
-        return notification
-    }""",
-    Output("notification_wrapper-avid", "children", allow_duplicate=True),
-    Input("socketio-avid", "data-notification"),
-    prevent_initial_call=True,
-)
-
-clientside_callback(
-    """(word, text) => text + word""",
-    Output("output-response-avid", "children", allow_duplicate=True),
-    Input("socketio-avid", "data-stream"),
-    State("output-response-avid", "children"),
-    prevent_initial_call=True,
-)
+        return html.Div(dcc.Markdown(f"""{agent}""", style={"color":"white","font-size":"0.75rem"}))
 
 if __name__ == '__main__':
     app.run_server(debug=True)