Update app.py

app.py

@@ -110,13 +110,6 @@ def index():
 def favicon():
     return Response('', status=204)
 
-@app.route('/main.js')
-def main_js():
-    js_path = os.path.join(TEMPLATE_DIR, 'main.js')
-    if os.path.isfile(js_path):
-        return send_file(js_path, mimetype='application/javascript')
-    return Response('// main.js placeholder\n', status=200, mimetype='application/javascript')
-
 # ======================== أدوات مساعدة ========================
 def as_text(v):
     if v is None:
@@ -129,7 +122,7 @@ def as_text(v):
         return v.get('text') or v.get('body') or v.get('content') or ""
     return str(v)
 
-TOOLS_PROMPT = """You have access to tools. To use a tool, output ONE single valid JSON object at the exact point in your answer.
+TOOLS_PROMPT = """You have access to tools. To use a tool, output ONE single valid JSON object.
 
 Tool formats:
 - Web search: {"tool":"search","query":"search terms"}
@@ -145,7 +138,6 @@ Document content schema:
 Rules:
 - Only emit tools when user explicitly asks
 - Maximum ONE tool per response
-- After tool JSON, add a short sentence
 - Never fake tool results"""
 
 def build_system_prompt(user, interests, think):
@@ -155,11 +147,7 @@ def build_system_prompt(user, interests, think):
     ]
     user = user or {}
     if user.get('name'):
-        lines.append(f"User's name is {user['name']}. Address them warmly but naturally.")
-    if user.get('dob'):
-        lines.append(f"User's birth date: {user['dob']}.")
-    if user.get('gender'):
-        lines.append(f"User's gender: {user['gender']}.")
+        lines.append(f"User's name is {user['name']}.")
     if interests:
         lines.append(f"User interests: {', '.join(interests[:15])}.")
     
@@ -260,14 +248,27 @@ def call_pollinations_text(messages, stream=False):
         response.raise_for_status()
         return response.json()
 
-# ======================== أدوات البحث ========================
-def web_search_duckduckgo(query, n=10):
+# ======================== أدوات البحث (سريعة) ========================
+# كاش للبحث - يخزن النتائج لمدة 5 دقائق
+search_cache = {}
+CACHE_TTL = 300  # 5 دقائق
+
+def web_search_duckduckgo(query, n=5):
+    """بحث سريع مع كاش"""
+    # التحقق من الكاش
+    cache_key = query.lower().strip()
+    if cache_key in search_cache:
+        cached_time, cached_results = search_cache[cache_key]
+        if time.time() - cached_time < CACHE_TTL:
+            logger.info(f"[search] Cache hit for: {query[:50]}")
+            return cached_results
+    
     try:
         r = requests.post(
             "https://html.duckduckgo.com/html/",
             data={"q": query},
-            headers={"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"},
-            timeout=5,
+            headers={"User-Agent": "Mozilla/5.0"},
+            timeout=3,  # timeout قصير
         )
         results = []
         pattern = re.compile(
@@ -284,26 +285,26 @@ def web_search_duckduckgo(query, n=10):
             })
             if len(results) >= n:
                 break
+        
+        # تخزين في الكاش
+        if results:
+            search_cache[cache_key] = (time.time(), results)
+            # تنظيف الكاش القديم
+            for k in list(search_cache.keys()):
+                if time.time() - search_cache[k][0] > CACHE_TTL:
+                    del search_cache[k]
+        
         return results
     except:
         return []
 
-def web_search_with_timeout(query, timeout=5):
-    with concurrent.futures.ThreadPoolExecutor() as executor:
-        future = executor.submit(web_search_duckduckgo, query)
-        try:
-            return future.result(timeout=timeout)
-        except concurrent.futures.TimeoutError:
-            logger.warning(f"[search] Timeout for: {query[:50]}")
-            return []
-
-def image_search(query, n=8):
+def image_search(query, n=6):
     try:
         r = requests.get(
             "https://www.bing.com/images/search",
             params={"q": query, "form": "HDRSC2"},
             headers={"User-Agent": "Mozilla/5.0"},
-            timeout=5,
+            timeout=3,
         )
         urls = re.findall(r'murl&quot;:&quot;(.*?)&quot;', r.text)
         return [{"image": u} for u in urls[:n]]
@@ -322,44 +323,37 @@ def extract_tool_from_text(text):
         pass
     return None
 
-def execute_tool(tool_data):
-    """تنفيذ الأداة وإرجاع النتيجة"""
+def execute_tool_fast(tool_data):
+    """تنفيذ سريع للأداة"""
     tool_type = tool_data.get('tool')
     
     if tool_type == 'search':
         query = tool_data.get('query', '')
-        logger.info(f"[tool] Searching: {query[:100]}")
-        results = web_search_with_timeout(query, timeout=5)
+        results = web_search_duckduckgo(query, n=5)
         if results:
             formatted = "\n\n### نتائج البحث:\n\n"
-            for i, r in enumerate(results[:5], 1):
-                formatted += f"**{i}. {r.get('title', '')}**\n"
-                formatted += f"   {r.get('snippet', '')[:200]}\n"
-                formatted += f"   {r.get('url', '')}\n\n"
+            for i, r in enumerate(results, 1):
+                formatted += f"**{i}. {r['title']}**\n{r['snippet'][:150]}\n{r['url']}\n\n"
             return formatted
-        return "\n\n⚠️ لم يتم العثور على نتائج.\n\n"
+        return "\n\nلم يتم العثور على نتائج.\n\n"
     
     elif tool_type == 'image_search':
         query = tool_data.get('query', '')
-        logger.info(f"[tool] Image search: {query[:100]}")
         images = image_search(query)
         if images:
             formatted = "\n\n### الصور:\n\n"
             for i, img in enumerate(images[:4], 1):
-                formatted += f"![صورة {i}]({img.get('image', '')})\n\n"
+                formatted += f"![صورة {i}]({img['image']})\n\n"
             return formatted
-        return "\n\n⚠️ لم يتم العثور على صور.\n\n"
+        return "\n\nلم يتم العثور على صور.\n\n"
     
     elif tool_type == 'image':
-        prompt = tool_data.get('prompt', '')
-        logger.info(f"[tool] Image generation: {prompt[:100]}")
-        return {"special": "image", "prompt": prompt}
+        return {"special": "image", "prompt": tool_data.get('prompt', '')}
     
     elif tool_type == 'document':
-        logger.info(f"[tool] Document: {tool_data.get('format', 'pdf')}")
-        return "\n\n📄 **جاري إنشاء المستند...**\n\n"
+        return "\n\nجاري إنشاء المستند...\n\n"
     
-    return "\n\n⚠️ أداة غير معروفة.\n\n"
+    return None
 
 # ======================== المستندات ========================
 def build_docx(cmd):
@@ -510,13 +504,49 @@ def chat():
         interests = data.get('interests') or []
         think = bool(data.get('think')) and model_type == 'pro'
         
+        # ✨ فحص إذا كانت الرسالة الأخيرة طلب بحث مباشر
+        last_msg = messages[-1].get('content', '') if messages else ''
+        direct_search = False
+        search_query = ""
+        
+        # كشف طلب البحث المباشر
+        search_patterns = [
+            r'ابحث (?:عن|لي) (.+)',
+            r'بحث (?:عن) (.+)',
+            r'search (?:for)? (.+)',
+            r'find (.+)',
+            r'معلومات عن (.+)',
+            r'اخر اخبار (.+)',
+            r'من هو (.+)',
+            r'ما هي (.+)',
+            r'ما هو (.+)',
+        ]
+        
+        for pattern in search_patterns:
+            match = re.search(pattern, last_msg, re.IGNORECASE)
+            if match:
+                direct_search = True
+                search_query = match.group(1).strip()
+                break
+        
+        # إذا كان بحث مباشر، نجريه أولاً ونضيف النتائج للرسائل
+        if direct_search and search_query:
+            logger.info(f"[direct-search] Detected: {search_query}")
+            search_results = web_search_duckduckgo(search_query, n=5)
+            if search_results:
+                context = "\n\nمعلومات من الإنترنت:\n\n"
+                for r in search_results:
+                    context += f"- {r['title']}: {r['snippet'][:200]}\n  {r['url']}\n"
+                
+                # إضافة السياق لآخر رسالة
+                messages[-1]['content'] = f"استخدم المعلومات التالية للإجابة:\n{context}\n\nسؤال المستخدم: {last_msg}"
+        
         system_prompt = build_system_prompt(user, interests, think)
         full_messages = [{"role": "system", "content": system_prompt}] + normalize_messages(messages[-10:])
         
         def generate():
             attempt = 0
             full_response = ""
-            tool_executed = False
             
             while True:
                 attempt += 1
@@ -554,38 +584,31 @@ def chat():
                                     except json.JSONDecodeError:
                                         continue
                     
-                    # استخراج وتنفيذ الأداة بعد اكتمال الرد
-                    if not tool_executed:
-                        tool = extract_tool_from_text(full_response)
-                        if tool:
-                            tool_executed = True
-                            logger.info(f"[tool] Found: {tool.get('tool')}")
+                    # ✨ معالجة سريعة للأداة بعد الرد
+                    tool = extract_tool_from_text(full_response)
+                    if tool and not direct_search:  # لا نعالج الأدوات إذا كان بحث مباشر
+                        logger.info(f"[tool] Executing: {tool.get('tool')}")
+                        
+                        try:
+                            tool_result = execute_tool_fast(tool)
                             
-                            try:
-                                tool_result = execute_tool(tool)
-                                
-                                if isinstance(tool_result, dict) and tool_result.get('special') == 'image':
-                                    # إرسال إشارة للواجهة لتوليد الصورة
-                                    yield f"data: {json.dumps({'tool': 'image', 'prompt': tool_result['prompt']})}\n\n"
-                                elif tool_result:
-                                    # إرسال نتيجة البحث كنص
-                                    yield f"data: {json.dumps({'delta': tool_result})}\n\n"
-                            except Exception as tool_error:
-                                logger.error(f"[tool] Error: {tool_error}")
-                                error_msg = "\n\n⚠️ خطأ في تنفيذ الأداة: " + str(tool_error) + "\n\n"
-                                yield f"data: {json.dumps({'delta': error_msg})}\n\n"
+                            if isinstance(tool_result, dict) and tool_result.get('special') == 'image':
+                                yield f"data: {json.dumps({'tool': 'image', 'prompt': tool_result['prompt']})}\n\n"
+                            elif tool_result:
+                                yield f"data: {json.dumps({'delta': tool_result})}\n\n"
+                        except Exception as tool_error:
+                            logger.error(f"[tool] Error: {tool_error}")
+                            error_msg = "\n\nخطأ: " + str(tool_error) + "\n\n"
+                            yield f"data: {json.dumps({'delta': error_msg})}\n\n"
                     
                     yield f"data: {json.dumps({'done': True})}\n\n"
                     return
                 
                 except Exception as e:
                     logger.warning(f"[chat] attempt #{attempt} failed: {e}")
-                    if MAX_RETRIES is not None and attempt >= MAX_RETRIES:
-                        yield f"data: {json.dumps({'error': str(e)})}\n\n"
-                        return
-                    
-                    yield f"data: {json.dumps({'retrying': True, 'attempt': attempt})}\n\n"
-                    time.sleep(RETRY_INTERVAL)
+                    yield f"data: {json.dumps({'error': str(e)})}\n\n"
+                    yield f"data: {json.dumps({'done': True})}\n\n"
+                    return
         
         return Response(stream_with_context(generate()), mimetype='text/event-stream')
     
@@ -685,7 +708,7 @@ def search_ep():
     q = _safe_json().get('query', '')
     if not q:
         return jsonify({'results': []})
-    results = web_search_with_timeout(q, timeout=5)
+    results = web_search_duckduckgo(q, n=5)
     return jsonify({'results': results})
 
 @app.route('/api/image-search', methods=['POST'])
@@ -712,8 +735,7 @@ def health():
         'status': 'ok',
         'model': FLASH_MODEL,
         'provider': 'pollinations',
-        'search': 'local (free)',
-        'retryInterval': RETRY_INTERVAL
+        'search': 'local (fast)',
     })
 
 # ======================== Error handlers ========================
@@ -727,5 +749,5 @@ def internal_error(e):
 
 if __name__ == '__main__':
     port = int(os.environ.get('PORT', 7860))
-    logger.info(f"Genisi running on port {port} | Flash: {FLASH_MODEL} | Search: local | Video: disabled")
+    logger.info(f"Genisi running on port {port} | Flash: {FLASH_MODEL} | Search: direct+local")
     app.run(host='0.0.0.0', port=port, threaded=True)