Update app.py

app.py

@@ -6,6 +6,7 @@ from PIL import Image
 import io
 import base64
 import json
+import re
 
 app = Flask(__name__)
 
@@ -23,6 +24,50 @@ def index():
 def indexx():
     return render_template('maj.html')
 
+def process_markdown_and_code(text):
+    """Traite le texte pour identifier et formater le code et le markdown"""
+    # Convertit le texte en HTML formaté
+    # Cette fonction pourrait être étendue pour utiliser une bibliothèque de markdown
+    return text
+
+def format_code_execution_result(response_parts):
+    """Formate les résultats d'exécution de code pour l'affichage HTML"""
+    result = []
+    
+    for part in response_parts:
+        # Traitement du texte (équivalent à display(Markdown(part.text)))
+        if hasattr(part, 'text') and part.text is not None:
+            result.append({
+                'type': 'markdown',
+                'content': part.text
+            })
+        
+        # Traitement du code exécutable
+        if hasattr(part, 'executable_code') and part.executable_code is not None:
+            result.append({
+                'type': 'code',
+                'content': part.executable_code.code
+            })
+        
+        # Traitement des résultats d'exécution
+        if hasattr(part, 'code_execution_result') and part.code_execution_result is not None:
+            result.append({
+                'type': 'execution_result',
+                'content': part.code_execution_result.output
+            })
+        
+        # Traitement des images (équivalent à display(Image(data=part.inline_data.data)))
+        if hasattr(part, 'inline_data') and part.inline_data is not None:
+            # Encodage de l'image en base64 pour l'affichage HTML
+            img_data = base64.b64encode(part.inline_data.data).decode('utf-8')
+            result.append({
+                'type': 'image',
+                'content': img_data,
+                'format': 'png'  # Supposé comme png par défaut
+            })
+    
+    return result
+
 @app.route('/solve', methods=['POST'])
 def solve():
     try:
@@ -40,16 +85,15 @@ def solve():
                     model="gemini-2.5-pro-exp-03-25",
                     contents=[
                         {'inline_data': {'mime_type': 'image/png', 'data': img_str}},
-                        """Résous cet exercice en français avec du LaTeX. 
-                        Si nécessaire, utilise du code Python pour effectuer les calculs complexes.
-                        Présente ta solution de façon claire et espacée."""
+                        """Résous ça en français with rendering latex"""
                     ],
                     config=types.GenerateContentConfig(
                         thinking_config=types.ThinkingConfig(
                             thinking_budget=8000
                         ),
+                        # Ajouter l'outil d'exécution de code
                         tools=[types.Tool(
-                            code_execution=types.ToolCodeExecution()
+                            code_execution=types.ToolCodeExecution
                         )]
                     )
                 )
@@ -58,32 +102,30 @@ def solve():
                     for part in chunk.candidates[0].content.parts:
                         if hasattr(part, 'thought') and part.thought:
                             if mode != "thinking":
-                                yield 'data: ' + json.dumps({"mode": "thinking"}) + '\n\n'
+                                yield f'data: {json.dumps({"mode": "thinking"})}\n\n'
                                 mode = "thinking"
-                        elif hasattr(part, 'executable_code') and part.executable_code:
-                            if mode != "executing_code":
-                                yield 'data: ' + json.dumps({"mode": "executing_code"}) + '\n\n'
-                                mode = "executing_code"
-                            code_block_open = "```python\n"
-                            code_block_close = "\n```"
-                            yield 'data: ' + json.dumps({"content": code_block_open + part.executable_code.code + code_block_close}) + '\n\n'
-                        elif hasattr(part, 'code_execution_result') and part.code_execution_result:
-                            if mode != "code_result":
-                                yield 'data: ' + json.dumps({"mode": "code_result"}) + '\n\n'
-                                mode = "code_result"
-                            result_block_open = "Résultat d'exécution:\n```\n"
-                            result_block_close = "\n```"
-                            yield 'data: ' + json.dumps({"content": result_block_open + part.code_execution_result.output + result_block_close}) + '\n\n'
                         else:
                             if mode != "answering":
-                                yield 'data: ' + json.dumps({"mode": "answering"}) + '\n\n'
+                                yield f'data: {json.dumps({"mode": "answering"})}\n\n'
                                 mode = "answering"
-                            if hasattr(part, 'text') and part.text:
-                                yield 'data: ' + json.dumps({"content": part.text}) + '\n\n'
+                        
+                        # Gestion des différents types de contenu
+                        if hasattr(part, 'text') and part.text is not None:
+                            yield f'data: {json.dumps({"content": part.text, "type": "text"})}\n\n'
+                        
+                        if hasattr(part, 'executable_code') and part.executable_code is not None:
+                            yield f'data: {json.dumps({"content": part.executable_code.code, "type": "code"})}\n\n'
+                        
+                        if hasattr(part, 'code_execution_result') and part.code_execution_result is not None:
+                            yield f'data: {json.dumps({"content": part.code_execution_result.output, "type": "result"})}\n\n'
+                        
+                        if hasattr(part, 'inline_data') and part.inline_data is not None:
+                            img_data = base64.b64encode(part.inline_data.data).decode('utf-8')
+                            yield f'data: {json.dumps({"content": img_data, "type": "image"})}\n\n'
 
             except Exception as e:
                 print(f"Error during generation: {e}")
-                yield 'data: ' + json.dumps({"error": str(e)}) + '\n\n'
+                yield f'data: {json.dumps({"error": str(e)})}\n\n'
 
         return Response(
             stream_with_context(generate()),
@@ -114,13 +156,12 @@ def solved():
                     model="gemini-2.5-flash-preview-04-17",
                     contents=[
                         {'inline_data': {'mime_type': 'image/png', 'data': img_str}},
-                        """Résous cet exercice en français avec du LaTeX.
-                        Si nécessaire, utilise du code Python pour effectuer les calculs complexes.
-                        Présente ta solution de façon claire et espacée."""
+                        """Résous ça en français with rendering latex"""
                     ],
                     config=types.GenerateContentConfig(
+                        # Ajouter l'outil d'exécution de code
                         tools=[types.Tool(
-                            code_execution=types.ToolCodeExecution()
+                            code_execution=types.ToolCodeExecution
                         )]
                     )
                 )
@@ -129,32 +170,30 @@ def solved():
                     for part in chunk.candidates[0].content.parts:
                         if hasattr(part, 'thought') and part.thought:
                             if mode != "thinking":
-                                yield 'data: ' + json.dumps({"mode": "thinking"}) + '\n\n'
+                                yield f'data: {json.dumps({"mode": "thinking"})}\n\n'
                                 mode = "thinking"
-                        elif hasattr(part, 'executable_code') and part.executable_code:
-                            if mode != "executing_code":
-                                yield 'data: ' + json.dumps({"mode": "executing_code"}) + '\n\n'
-                                mode = "executing_code"
-                            code_block_open = "```python\n"
-                            code_block_close = "\n```"
-                            yield 'data: ' + json.dumps({"content": code_block_open + part.executable_code.code + code_block_close}) + '\n\n'
-                        elif hasattr(part, 'code_execution_result') and part.code_execution_result:
-                            if mode != "code_result":
-                                yield 'data: ' + json.dumps({"mode": "code_result"}) + '\n\n'
-                                mode = "code_result"
-                            result_block_open = "Résultat d'exécution:\n```\n"
-                            result_block_close = "\n```"
-                            yield 'data: ' + json.dumps({"content": result_block_open + part.code_execution_result.output + result_block_close}) + '\n\n'
                         else:
                             if mode != "answering":
-                                yield 'data: ' + json.dumps({"mode": "answering"}) + '\n\n'
+                                yield f'data: {json.dumps({"mode": "answering"})}\n\n'
                                 mode = "answering"
-                            if hasattr(part, 'text') and part.text:
-                                yield 'data: ' + json.dumps({"content": part.text}) + '\n\n'
+                        
+                        # Gestion des différents types de contenu
+                        if hasattr(part, 'text') and part.text is not None:
+                            yield f'data: {json.dumps({"content": part.text, "type": "text"})}\n\n'
+                        
+                        if hasattr(part, 'executable_code') and part.executable_code is not None:
+                            yield f'data: {json.dumps({"content": part.executable_code.code, "type": "code"})}\n\n'
+                        
+                        if hasattr(part, 'code_execution_result') and part.code_execution_result is not None:
+                            yield f'data: {json.dumps({"content": part.code_execution_result.output, "type": "result"})}\n\n'
+                        
+                        if hasattr(part, 'inline_data') and part.inline_data is not None:
+                            img_data = base64.b64encode(part.inline_data.data).decode('utf-8')
+                            yield f'data: {json.dumps({"content": img_data, "type": "image"})}\n\n'
 
             except Exception as e:
                 print(f"Error during generation: {e}")
-                yield 'data: ' + json.dumps({"error": str(e)}) + '\n\n'
+                yield f'data: {json.dumps({"error": str(e)})}\n\n'
 
         return Response(
             stream_with_context(generate()),