Update app.py

app.py

@@ -1,18 +1,47 @@
 # ============================================================
 # CodeAgent - Sub-agent for code generation and execution
-# Author: Mustafa Albakkar
-# Compatible with Hugging Face Spaces (Gradio-based)
+# Modified to log inputs & outputs (file + jsonl)
+# Author: Mustafa Albakkar (modified)
 # ============================================================
 
-import os, json, atexit, logging, traceback, io, sys, contextlib, tempfile
+import os
+import json
+import atexit
+import logging
+import traceback
+import io
+import sys
+import contextlib
+import tempfile
+from logging.handlers import RotatingFileHandler
+
 import gradio as gr
 from llama_cpp import Llama
 
 # ------------------------------------------------------------
-# 🔧 إعداد التسجيل (Logs)
+# 🔧 إعداد التسجيل (Logs) — ملفي و console
 # ------------------------------------------------------------
-logging.basicConfig(level=logging.INFO)
+LOG_DIR = os.environ.get("CODEAGENT_LOG_DIR", "logs")
+os.makedirs(LOG_DIR, exist_ok=True)
+log_file = os.path.join(LOG_DIR, "codeagent.log")
+jsonl_file = os.path.join(LOG_DIR, "records.jsonl")
+
 logger = logging.getLogger("CodeAgent")
+logger.setLevel(logging.INFO)
+
+# Console handler
+ch = logging.StreamHandler(sys.stdout)
+ch.setLevel(logging.INFO)
+ch_formatter = logging.Formatter("%(asctime)s [%(levelname)s] %(name)s: %(message)s")
+ch.setFormatter(ch_formatter)
+logger.addHandler(ch)
+
+# Rotating file handler
+fh = RotatingFileHandler(log_file, maxBytes=5 * 1024 * 1024, backupCount=5, encoding="utf-8")
+fh.setLevel(logging.INFO)
+fh_formatter = logging.Formatter("%(asctime)s [%(levelname)s] %(name)s: %(message)s")
+fh.setFormatter(fh_formatter)
+logger.addHandler(fh)
 
 # ------------------------------------------------------------
 # 🧠 تحميل النموذج (Qwen2.5-Coder-14B-Instruct-GGUF)
@@ -32,7 +61,6 @@ except Exception as e:
     logger.exception("❌ Model load failed: %s", e)
     llm = None
 
-
 # ------------------------------------------------------------
 # 🧩 دوال مساعدة
 # ------------------------------------------------------------
@@ -56,6 +84,27 @@ def compute_safe_max_tokens(prompt: str, max_ctx=4096):
         return 256
 
 
+def append_log_record(prompt: str, model_raw: str, code_clean: str, exec_result: str, extra: dict = None):
+    """
+    يضيف سطر JSON (JSONL) في ملف للمعالجة اللاحقة.
+    كل سطر يمثل طلب واحد مع الطوابع الزمنية.
+    """
+    try:
+        record = {
+            "ts": logging.Formatter().formatTime(logging.LogRecord("x", logging.INFO, "", 0, "", (), None)),
+            "prompt": prompt,
+            "model_raw": model_raw,
+            "code_clean": code_clean,
+            "exec_result": exec_result,
+        }
+        if extra:
+            record.update(extra)
+        with open(jsonl_file, "a", encoding="utf-8") as f:
+            f.write(json.dumps(record, ensure_ascii=False) + "\n")
+    except Exception:
+        logger.exception("Failed to append JSONL record.")
+
+
 # ------------------------------------------------------------
 # 🧮 أداة تنفيذ الكود بأمان
 # ------------------------------------------------------------
@@ -73,13 +122,15 @@ def execute_python_code(code_str: str) -> str:
     try:
         # إعادة توجيه stdout و stderr
         with contextlib.redirect_stdout(buffer), contextlib.redirect_stderr(buffer):
+            # نحدد local_env فقط (لا نعطي globals حساسة)
             local_env = {}
+            # تنفيذ الكود — ضع في اعتبارك مخاطر exec عند تشغيل كود غير موثوق
             exec(code_str, {}, local_env)
         result = buffer.getvalue().strip()
         if not result:
             result = "✅ Code executed successfully (no printed output)."
         return result
-    except Exception as e:
+    except Exception:
         tb = traceback.format_exc()
         return f"❌ Code execution error:\n{tb}"
     finally:
@@ -87,13 +138,13 @@ def execute_python_code(code_str: str) -> str:
 
 
 # ------------------------------------------------------------
-# 🎯 الدالة الأساسية للتوليد والتنفيذ
+# 🎯 الدالة الأساسية للتوليد والتنفيذ (مع لوق مفصّل)
 # ------------------------------------------------------------
 def generate_and_execute_fn(prompt: str) -> str:
     """
     - توليد الكود البرمجي باستخدام نموذج Qwen2.5-Coder
     - تنفيذ الكود مباشرة
-    - إعادة النتائج إلى الوكيل الأساسي
+    - تسجيل المدخلات والمخرجات
     """
     try:
         prompt = safe_text(prompt)
@@ -101,6 +152,7 @@ def generate_and_execute_fn(prompt: str) -> str:
             return "⚠️ No prompt provided."
 
         if llm is None:
+            logger.error("Model not loaded when requested.")
             return "❌ Model not loaded."
 
         # --- تحضير إدخال النموذج بصيغة محادثة ---
@@ -116,6 +168,10 @@ def generate_and_execute_fn(prompt: str) -> str:
 
         max_tokens = compute_safe_max_tokens(formatted_prompt)
 
+        # سجل المدخل (prompt)
+        logger.info("🔔 New request received.")
+        logger.info("➡️ Prompt: %s", prompt)
+
         # --- تنفيذ التوليد ---
         try:
             out = llm(
@@ -131,30 +187,52 @@ def generate_and_execute_fn(prompt: str) -> str:
                 temperature=0.2,
                 stop=["<|im_end|>"]
             )
+        except Exception:
+            logger.exception("Model generation failed.")
+            return "❌ Model generation failed."
 
         # --- استخراج النص الناتج ---
         if isinstance(out, dict):
-            text = out.get("choices", [{}])[0].get("text", "")
+            # قد يختلف هيكل الإرجاع باختلاف binding
+            try:
+                text = out.get("choices", [{}])[0].get("text", "") or out.get("text", "")
+            except Exception:
+                text = json.dumps(out, ensure_ascii=False)
         else:
             text = str(out)
 
-        if not text.strip():
+        model_raw = text or ""
+        if not model_raw.strip():
+            logger.warning("Empty response from model.")
             return "⚠️ Empty response from model."
 
-        logger.info(f"🤖 Generated code:\n{text}")
+        logger.info("🧾 Model raw output (truncated 1000 chars):\n%s", model_raw[:1000])
+
+        # --- تنظيف النص لاستخراج الكود فقط ---
+        # إذا كان النموذج يلف الكود بثلاثي backticks، نفرّغها
+        code_candidate = model_raw.replace("```python", "").replace("```", "").strip()
+        logger.info("🛠 Cleaned code (first 1000 chars):\n%s", code_candidate[:1000])
 
         # --- تنفيذ الكود وإعادة النتيجة ---
-        exec_result = execute_python_code(text)
+        exec_result = execute_python_code(code_candidate)
+        logger.info("📤 Execution result (truncated 2000 chars):\n%s", exec_result[:2000])
+
+        # إضافة سجل JSONL
+        try:
+            append_log_record(prompt=prompt, model_raw=model_raw, code_clean=code_candidate, exec_result=exec_result)
+        except Exception:
+            logger.exception("Failed to write jsonl record.")
+
         final_output = (
             f"🧠 **Prompt:** {prompt}\n\n"
-            f"💻 **Generated Code:**\n{text}\n\n"
+            f"💻 **Generated Code:**\n{code_candidate}\n\n"
             f"🧾 **Execution Result:**\n{exec_result}"
         )
         return final_output
 
-    except Exception as e:
-        logger.exception("Generation/Execution error: %s", e)
-        return f"❌ Error: {e}"
+    except Exception:
+        logger.exception("Generation/Execution error")
+        return "❌ Internal error during generation/execution."
 
 
 # ------------------------------------------------------------