Update app.py

app.py

@@ -18,19 +18,16 @@ os.makedirs(UPLOAD_FOLDER, exist_ok=True)
 IMAGE_WIDTH = 511
 
 def preprocess_image(image: Image.Image) -> Image.Image:
-    # ضبط مقاس الصورة
     image_height = int(image.height * IMAGE_WIDTH / image.width)
     return image.resize((IMAGE_WIDTH, image_height))
 
 def save_image(image: Image.Image) -> str:
-    # حفظ الصورة
     image_filename = f"{uuid.uuid4()}.jpeg"
     path = os.path.join(UPLOAD_FOLDER, image_filename)
     image.save(path, "JPEG", quality=95)
     return path
 
 def process_image(image_path: str) -> tuple:
-    # تحويل وحفظ الصورة
     image = Image.open(image_path).convert('RGB')
     image = preprocess_image(image)
     saved_path = save_image(image)
@@ -45,20 +42,25 @@ def format_message(content, image_data=None):
         ]
     return content
 
-def upload_images(files, history):
+def upload_images(files, uploaded_images):
+    new_uploaded = uploaded_images.copy() if uploaded_images else []
+    history = []
     for f in files:
         saved, _ = process_image(f)
+        new_uploaded.append(saved)
         history.append(("تم رفع صورة:", f"<img src='{saved}' style='max-width:200px;'>"))
-    return history
+    return history, new_uploaded
 
-def chat_with_gpt(user_input, history, files):
-    history = history or []
-    messages = [{"role": "system", "content": "...relevant prompt..."}]
-    if files:
-        for f in files:
-            saved, encoded = process_image(f)
-            messages.append({"role":"user","content":format_message("وصف الصورة:", encoded)})
-    messages.append({"role":"user","content":user_input})
+def chat_with_gpt(user_input, uploaded_images, chat_history):
+    chat_history = chat_history or []
+    messages = [{"role": "system", "content": "أنت مساعد ذكي تحلل الصور وتجاوب على استفسارات المستخدم بدقة وبأسلوب محترم."}]
+    
+    if uploaded_images:
+        for image_path in uploaded_images:
+            _, encoded = process_image(image_path)
+            messages.append({"role": "user", "content": format_message("وصف الصورة:", encoded)})
+
+    messages.append({"role": "user", "content": user_input})
 
     # استدعاء النموذج
     completion = client.chat.completions.create(
@@ -74,33 +76,39 @@ def chat_with_gpt(user_input, history, files):
         if chunk.choices[0].delta.content:
             response += chunk.choices[0].delta.content
             time.sleep(0.01)
-    history.append((f"أنت: {user_input}", None))
-    history.append((None, f"<img src='{BOT_AVATAR}' style='width:50px;border-radius:50%;'> {response}"))
-    return history, history
 
+    chat_history.append({"role": "user", "content": user_input})
+    chat_history.append({"role": "assistant", "content": response})
+    return chat_history, uploaded_images
+
+# واجهة Gradio
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.Markdown("# 🤖 ShfraAI - مساعد ذكي لتحليل الصور")
-    chatbot = gr.Chatbot(label="ShfraAI").style(height=600)
+    chatbot = gr.Chatbot(label="ShfraAI", avatar_images=(None, BOT_AVATAR), type="messages")
     user_input = gr.Textbox(placeholder="اكتب رسالتك...", show_label=False)
     upload_button = gr.UploadButton("رفع صور", file_count="multiple")
     submit_button = gr.Button("إرسال")
-    state = gr.State()
+    uploaded_state = gr.State([])      # لتخزين الصور
+    chat_history_state = gr.State([])  # لتخزين المحادثة
+
+    upload_button.upload(
+        upload_images,
+        inputs=[upload_button, uploaded_state],
+        outputs=[chatbot, uploaded_state]
+    )
 
     submit_button.click(
         chat_with_gpt,
-        inputs=[user_input, state, upload_button],
-        outputs=[chatbot, state]
+        inputs=[user_input, uploaded_state, chat_history_state],
+        outputs=[chatbot, chat_history_state]
     )
+
     user_input.submit(
         chat_with_gpt,
-        inputs=[user_input, state, upload_button],
-        outputs=[chatbot, state]
-    )
-    upload_button.upload(
-        upload_images,
-        inputs=[upload_button, state],
-        outputs=[chatbot]
+        inputs=[user_input, uploaded_state, chat_history_state],
+        outputs=[chatbot, chat_history_state]
     )
 
 if __name__ == "__main__":
     demo.queue().launch(share=True)
+