Update app.py

app.py

@@ -6,27 +6,20 @@ import zipfile
 from pathlib import Path
 import gradio as gr
 from huggingface_hub import InferenceClient
-from flask import Flask, send_from_directory, render_template_string, request
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler
-import tornado.ioloop
-import tornado.web
-import tornado.websocket
 
 # --------------------------- الإعدادات ---------------------------
 ALLOWED_EXTENSIONS = {
     '.py', '.js', '.html', '.css', '.txt', '.json', '.md', 
     '.php', '.xml', '.csv', '.zip', '.png', '.jpg', '.svg', '.ico'
 }
-# نستخدم نموذج Qwen2.5-Coder لقوته الفائقة في فهم المشاريع البرمجية كاملة
-MODEL_ID = os.environ.get('HF_MODEL_ID', 'Qwen/Qwen2.5-Coder-32B-Instruct')
+MODEL_ID = os.environ.get('HF_MODEL_ID', 'Qwen/Qwen3-Coder-480B-A35B-Instruct-FP8')
 HF_TOKEN = os.environ.get('HF_TOKEN')
 
 class ProjectTank:
     def __init__(self):
         self.work_dir = tempfile.mkdtemp(prefix="tank_dev_")
-        self.files_cache = {} # {filename: content}
-        self.structure = ""    # خريطة المشروع
+        self.files_cache = {} 
+        self.structure = ""    
 
     def sync_files(self, file_objs):
         if not file_objs: return "⚠️ لم يتم اختيار ملفات.", []
@@ -46,7 +39,6 @@ class ProjectTank:
                 shutil.copy(f.name, dest)
         
         self._reload_memory()
-        self._start_live_preview()
         return f"🚀 تم تحميل {len(self.files_cache)} ملف بنجاح.", list(self.files_cache.keys())
 
     def _reload_memory(self):
@@ -57,8 +49,7 @@ class ProjectTank:
                 rel = str(p.relative_to(self.work_dir)).replace("\\", "/")
                 structure_list.append(f"- {rel}")
                 try:
-                    # نقرأ فقط ملفات الكود في الذاكرة لتوفير الـ Tokens
-                    if p.suffix in ['.html', '.css', '.js', '.json', '.txt', '.md', '.py']:
+                    if p.suffix.lower() in ['.html', '.css', '.js', '.json', '.txt', '.md', '.py']:
                         self.files_cache[rel] = p.read_text(encoding='utf-8', errors='ignore')
                 except: pass
         self.structure = "\n".join(structure_list)
@@ -71,87 +62,31 @@ class ProjectTank:
         self.files_cache[filename] = content
 
     def build_preview(self):
-        entry = next((f for f in ["index.html", "main.html"] if f in self.files_cache), 
-                     next((f for f in self.files_cache if f.endswith('.html')), None))
+        """رادار ذكي للبحث عن ملف التشغيل في أي عمق"""
+        all_keys = list(self.files_cache.keys())
+        # البحث عن أي ملف ينتهي بـ index.html بغض النظر عن المجلد
+        entry = next((k for k in all_keys if k.lower().endswith('index.html')), None)
         
         if not entry:
-            return "<div style='text-align:center; padding:50px;'>⚠️ لم يتم العثور على ملف HTML للمعاينة</div>"
+            # إذا لم يجد index، يبحث عن أي ملف html
+            entry = next((k for k in all_keys if k.endswith('.html')), None)
+        
+        if not entry:
+            return f"<div style='text-align:center; padding:50px;'>⚠️ لم يتم العثور على ملف HTML للمعاينة.<br>الملفات المكتشفة: {str(all_keys[:3])}</div>"
 
         html = self.files_cache[entry]
+        base_dir = os.path.dirname(entry)
 
-        # 1. حقن CSS (بذكاء: استبدال أو إضافة في الـ Head)
-        css_content = ""
+        # حقن CSS و JS مع مراعاة المسارات
         for name, code in self.files_cache.items():
+            fname = os.path.basename(name)
             if name.endswith('.css'):
-                css_content += f"\n/* --- {name} --- */\n{code}\n"
-        
-        if "</head>" in html:
-            html = html.replace("</head>", f"<style>{css_content}</style>\n</head>")
-        else:
-            html = f"<style>{css_content}</style>" + html
-
-        # 2. حقن JS (في نهاية الـ Body لضمان عمل الـ DOM)
-        js_content = ""
-        for name, code in self.files_cache.items():
+                html = re.sub(rf'<link.*?href=["\'].*?{fname}["\'].*?>', f"<style>\n{code}\n</style>", html)
             if name.endswith('.js'):
-                js_content += f"\n// --- {name} ---\n{code}\n"
-        
-        if "</body>" in html:
-            html = html.replace("</body>", f"<script>{js_content}</script>\n</body>")
-        else:
-            html += f"<script>{js_content}</script>"
+                html = re.sub(rf'<script.*?src=["\'].*?{fname}["\'].*?></script>', f"<script>\n{code}\n</script>", html)
 
         return html
 
-    def export_project(self):
-        out_path = tempfile.mktemp()
-        shutil.make_archive(out_path, 'zip', self.work_dir)
-        return out_path + ".zip"
-    
-    def _start_live_preview(self):
-        class PreviewHandler(tornado.web.RequestHandler):
-            def get(self):
-                entry = next((f for f in ["index.html", "main.html"] if f in tank.files_cache), 
-                             next((f for f in tank.files_cache if f.endswith('.html')), None))
-                if not entry:
-                    self.write("<div style='text-align:center; padding:50px;'>⚠️ لم يتم العثور على ملف HTML للمعاينة</div>")
-                    return
-                self.write(tank.files_cache[entry])
-
-        class WebSocketHandler(tornado.websocket.WebSocketHandler):
-            clients = set()
-            
-            def open(self):
-                WebSocketHandler.clients.add(self)
-            
-            def on_close(self):
-                WebSocketHandler.clients.remove(self)
-            
-            @classmethod
-            def send_update(cls, message):
-                for client in cls.clients:
-                    client.write_message(message)
-
-        class Watcher(FileSystemEventHandler):
-            def on_modified(self, event):
-                if event.is_directory: return
-                if Path(event.src_path).suffix in ALLOWED_EXTENSIONS:
-                    tank._reload_memory()
-                    message = tank.build_preview()
-                    WebSocketHandler.send_update(message)
-
-        self.watcher = Observer()
-        self.watcher.schedule(Watcher(), self.work_dir, recursive=True)
-        self.watcher.start()
-
-        self.server = tornado.web.Application([
-            (r"/preview", PreviewHandler),
-            (r"/ws", WebSocketHandler),
-        ])
-        self.server.listen(8888)
-        tornado.ioloop.IOLoop.current().start()
-        
-
 tank = ProjectTank()
 client = InferenceClient(api_key=HF_TOKEN) if HF_TOKEN else None
 
@@ -162,25 +97,19 @@ def chat_and_code(message, history):
         yield history + [{"role": "assistant", "content": "⚠️ مفقود HF_TOKEN"}]
         return
 
-    # بناء سياق قوي: الهيكل + المحتوى
-    context = f"### PROJECT STRUCTURE ###\n{tank.structure}\n\n"
-    context += "### FULL FILE CONTENTS ###\n"
+    context = f"### PROJECT STRUCTURE ###\n{tank.structure}\n\n### FULL FILE CONTENTS ###\n"
     for name, content in tank.files_cache.items():
         context += f"--- FILE: {name} ---\n{content}\n"
 
     system_instr = (
-        "You are an expert AI IDE. Your goal is to help the user build and debug their project.\n"
-        "1. Analyze the project structure to understand how files interact.\n"
-        "2. Provide clear explanations.\n"
-        "3. When modifying code, use the format: [TARGET: filename] followed by a code block.\n"
-        "4. Always output the FULL content of the file in the code block."
+        "You are an AI IDE. Provide short explanations then output the FULL modified files using this format:\n"
+        "[TARGET: filename]\n```\nUpdated Code\n```"
     )
 
     messages = [{"role": "system", "content": system_instr}]
     for m in history:
         messages.append({"role": m["role"], "content": str(m["content"])})
-    
-    messages.append({"role": "user", "content": f"{context}\n\nTask: {message}"})
+    messages.append({"role": "user", "content": f"{context}\n\nUser Request: {message}"})
 
     response = ""
     history.append({"role": "user", "content": message})
@@ -189,157 +118,57 @@ def chat_and_code(message, history):
     try:
         stream = client.chat_completion(model=MODEL_ID, messages=messages, max_tokens=6000, stream=True)
         for chunk in stream:
-            if hasattr(chunk, 'choices') and chunk.choices and len(chunk.choices) > 0:
+            if hasattr(chunk, 'choices') and chunk.choices:
                 token = chunk.choices[0].delta.content
                 if token:
                     response += token
                     history[-1]["content"] = response
                     yield history
     except Exception as e:
-        history[-1]["content"] = f"❌ خطأ في السيرفر: {str(e)}"
+        history[-1]["content"] = f"❌ خطأ: {str(e)}"
         yield history
 
 def apply_and_preview(history):
     if not history: return "لا توجد بيانات", None, []
-    
     content = history[-1]["content"]
     matches = re.findall(r"\[TARGET:\s*(.*?)\]\s*```.*?\n(.*?)```", content, re.DOTALL | re.IGNORECASE)
     
-    if not matches:
-        return "⚠️ لم يتم اكتشاف ملفات للتحديث.", tank.build_preview(), list(tank.files_cache.keys())
-    
     for filename, code in matches:
         tank.update_file_content(filename.strip(), code.strip())
     
-    return "✅ تم تحديث الملفات وحقن المعاينة بنجاح!", tank.build_preview(), list(tank.files_cache.keys())
-
-# --------------------------- الواجهة ---------------------------
-
-app = Flask(__name__)
-
-@app.route('/upload', methods=['POST'])
-def upload_file():
-    files = request.files.getlist('files[]')
-    log, choices = tank.sync_files(files)
-    return log
-
-@app.route('/files/<path:filename>')
-def get_file(filename):
-    path = os.path.join(tank.work_dir, filename)
-    return send_from_directory(tank.work_dir, filename)
+    tank._reload_memory()
+    return "✅ تم التحديث بنجاح!", tank.build_preview(), list(tank.files_cache.keys())
 
-@app.route('/project')
-def get_project_structure():
-    return {"structure": tank.structure}
+# --------------------------- الواجهة (Gradio هي الأضمن في الاستقرار) ---------------------------
 
-@app.route('/preview')
-def serve_preview():
-    entry = next((f for f in ["index.html", "main.html"] if f in tank.files_cache), 
-                 next((f for f in tank.files_cache if f.endswith('.html')), None))
-    if not entry:
-        return "⚠️ لم يتم العثور على ملف HTML للمعاينة"
-    return render_template_string(tank.files_cache[entry])
-
-@app.route('/chat', methods=['POST'])
-def chat_endpoint():
-    message = request.form['message']
-    history = request.form.get('history', [])
-    if not client:
-        history.append({"role": "assistant", "content": "⚠️ مفقود HF_TOKEN"})
-        return str(history)
+with gr.Blocks(theme=gr.themes.Monochrome(), title="AI Tank IDE Pro") as demo:
+    gr.Markdown("# 🛡️ AI Tank IDE Pro\n**نظام المعاينة العميقة والتحصين ضد الأخطاء**")
     
-    context = f"### PROJECT STRUCTURE ###\n{tank.structure}\n\n"
-    context += "### FULL FILE CONTENTS ###\n"
-    for name, content in tank.files_cache.items():
-        context += f"--- FILE: {name} ---\n{content}\n"
-
-    system_instr = (
-        "You are an expert AI IDE. Your goal is to help the user build and debug their project.\n"
-        "1. Analyze the project structure to understand how files interact.\n"
-        "2. Provide clear explanations.\n"
-        "3. When modifying code, use the format: [TARGET: filename] followed by a code block.\n"
-        "4. Always output the FULL content of the file in the code block."
-    )
-
-    messages = [{"role": "system", "content": system_instr}]
-    for m in history:
-        messages.append({"role": m["role"], "content": str(m)})
-    
-    messages.append({"role": "user", "content": f"{context}\n\nTask: {message}"})
-
-    response = ""
-    history.append({"role": "user", "content": message})
-    history.append({"role": "assistant", "content": ""})
-
-    try:
-        stream = client.chat_completion(model=MODEL_ID, messages=messages, max_tokens=6000, stream=True)
-        for chunk in stream:
-            if hasattr(chunk, 'choices') and chunk.choices and len(chunk.choices) > 0:
-                token = chunk.choices[0].delta.content
-                if token:
-                    response += token
-                    history[-1]["content"] = response
-        return str(history)
-    except Exception as e:
-        history[-1]["content"] = f"❌ خطأ في السيرفر: {str(e)}"
-        return str(history)
-
-@app.route('/apply', methods=['POST'])
-def apply_endpoint():
-    history = request.form.get('history', [])
-    if not history: return "لا توجد بيانات"
-    
-    content = history[-1]["content"]
-    matches = re.findall(r"\[TARGET:\s*(.*?)\]\s*```.*?\n(.*?)```", content, re.DOTALL | re.IGNORECASE)
-    
-    if not matches:
-        return "⚠️ لم يتم اكتشاف ملفات للتحديث."
-    
-    for filename, code in matches:
-        tank.update_file_content(filename.strip(), code.strip())
-    
-    return "✅ تم تحديث الملفات وحقن المعاينة بنجاح!"
-
-@app.route('/export')
-def export_project():
-    return send_from_directory(Path(tank.export_project()).parent, Path(tank.export_project()).name)
-
-@app.route('/')
-def serve_index():
-    return """
-    <div>
-        <h1>AI Tank IDE Pro</h1>
-        <a href="/preview">معاينة المشروع</a><br/>
-        <input type="file" id="files" name="files[]" multiple />
-        <button onclick="uploadFiles()">ارفع المشروع</button>
-        <div id="status">جاهز للعمل</div>
-        <div id="preview" style="margin-top: 20px;"></div>
-    </div>
-    <script>
-        function uploadFiles() {
-            const formData = new FormData();
-            const fileInput = document.getElementById('files');
-            Array.from(fileInput.files).forEach(file => {
-                formData.append('files[]', file);
-            });
+    with gr.Row():
+        with gr.Column(scale=1):
+            upload = gr.UploadButton("📁 ارفع المشروع (ZIP/Files)", file_count="multiple")
+            file_list = gr.Dropdown(label="ملفات المشروع")
+            status = gr.Markdown("🟢 جاهز")
             
-            fetch('/upload', { method: 'POST', body: formData })
-                .then(response => response.text())
-                .then(log => {
-                    document.getElementById('status').innerText = log;
-                    if (log.includes('تم تحميل')) {
-                        fetch('/preview')
-                            .then(res => res.text())
-                            .then(html => {
-                                document.getElementById('preview').innerHTML = html;
-                            });
-                    }
-                });
-        }
-    </script>
-    """
+            chat = gr.Chatbot(type="messages", height=400)
+            msg = gr.Textbox(placeholder="اطلب تعديلاً...", show_label=False)
+            with gr.Row():
+                send = gr.Button("إرسال", variant="primary")
+                apply = gr.Button("⚡ تطبيق المعاينة", variant="stop")
+
+        with gr.Column(scale=2):
+            with gr.Tabs():
+                with gr.TabItem("🌐 المعاينة الفورية"):
+                    preview = gr.HTML()
+                with gr.TabItem("📝 المحرر"):
+                    editor = gr.Code(label="كود الملف", lines=25, interactive=True)
+    
+    # ربط الأحداث
+    upload.upload(tank.sync_files, upload, [status, file_list]).then(tank.build_preview, None, preview)
+    send.click(chat_and_code, [msg, chat], chat).then(lambda: "", None, msg)
+    apply.click(apply_and_preview, chat, [status, preview, file_list])
+    file_list.change(lambda n: tank.files_cache.get(n, ""), file_list, editor)
 
 if __name__ == "__main__":
-    tank = ProjectTank()
-    client = InferenceClient(api_key=HF_TOKEN) if HF_TOKEN else None
-    app.run(host='0.0.0.0', port=7860)
+    demo.queue().launch(server_name="0.0.0.0", server_port=7860)
+port=7860)