Emergency fix: ZGR logs page now displays ALL webhook events including sender_id, text, image_url, and metadata. Previous version had no logs because sender_id filter was too strict.

app.py

@@ -1,4 +1,4 @@
-import os, sys, json, secrets, logging, asyncio, re, time, threading, base64
+import os, sys, json, secrets, logging, asyncio, re, time, threading, base64, tempfile, pathlib
 from html import escape
 
 try:
@@ -17,30 +17,13 @@ except ImportError:
                 setattr(_stub, _n, lambda *a, **k: b"" if "lin" in _n or "sample" in _n else 0)
         sys.modules["audioop"] = _stub
 
-try:
-    from huggingface_hub import HfFolder
-except (ImportError, AttributeError):
-    import huggingface_hub as _hh
-    if not hasattr(_hh, "HfFolder"):
-        class _HfFolderStub:
-            @staticmethod
-            def get_token():
-                try:
-                    from huggingface_hub import get_token
-                    return get_token()
-                except Exception:
-                    return None
-            @staticmethod
-            def save_token(token): pass
-        _hh.HfFolder = _HfFolderStub
-
 logging.basicConfig(level=logging.INFO, stream=sys.stdout)
 logger = logging.getLogger("zalo-bot")
+
 import requests
 import gradio as gr
 from fastapi import FastAPI, Request, Response
 from starlette.responses import RedirectResponse
-
 from huggingface_hub import HfApi, SpaceStage, hf_hub_download, upload_file
 
 DEFAULT_BOT_TOKEN = os.getenv(
@@ -58,6 +41,8 @@ if not HF_TOKEN:
         HF_TOKEN = ""
 NAMESPACE = os.getenv("HF_NAMESPACE", "bep40")
 MAIN_DATASET_ID = os.getenv("MAIN_DATASET_ID", f"{NAMESPACE}/zalo-products-all")
+ZGR_SENDER_ID = "zgr-b7e1e71cf5701c2e4561"
+
 if not HF_TOKEN:
     logger.warning("[startup] HF_TOKEN not found — Space creation features will fail until HF_TOKEN secret is set")
 logger.info("[startup] SPACE_ID=%s NAMESPACE=%s", SPACE_ID or "(local)", NAMESPACE)
@@ -80,10 +65,7 @@ def _load_proxy_spaces():
         return
     try:
         file_path = hf_hub_download(
-            repo_id=SPACE_ID,
-            filename="proxy_spaces.json",
-            repo_type="space",
-            token=HF_TOKEN,
+            repo_id=SPACE_ID, filename="proxy_spaces.json", repo_type="space", token=HF_TOKEN,
         )
         with open(file_path) as f:
             data = json.load(f)
@@ -196,7 +178,7 @@ def _ensure_user_dataset(user_id: str, token: str) -> tuple:
         with tempfile.TemporaryDirectory() as tmp:
             readme_path = pathlib.Path(tmp, "README.md")
             readme_path.write_text(
-                f"# Zalo Product Data — {sender_display_global.get(user_id, user_id)}\n\n"
+                f"# Zalo Product Data — {user_id}\n\n"
                 f"Dữ liệu sản phẩm thu thập từ Zalo chat.\n\n"
                 f"## Cấu trúc (schema)\n"
                 f"| image | ảnh (binary/URL) | Hình ảnh sản phẩm |\n"
@@ -231,16 +213,13 @@ def _ensure_user_dataset(user_id: str, token: str) -> tuple:
     return dataset_id, created
 
 
-sender_display_global = {}
-
-
-def _save_product_to_main_dataset(image_url, image_data_b64, description, price, category, sender_id, sender_name, product_name=""):
+def _save_product_to_main_dataset(image_url, image_data_b64, description, price, category, sender_id, sender_name, product_name="", chat_id="", timestamp=""):
     if not HF_TOKEN or not MAIN_DATASET_ID:
         logger.warning("MAIN_DATASET_ID or HF_TOKEN not configured")
         return None
     try:
         api = HfApi(token=HF_TOKEN)
-        ts = time.strftime("%Y%m%d_%H%M%S")
+        ts = timestamp or time.strftime("%Y%m%d_%H%M%S")
         safe_sender = _safe_space_name(sender_id) or "unknown"
         img_filename = f"images/{ts}_{safe_sender}.jpg"
         meta_filename = f"data/{ts}_{safe_sender}.json"
@@ -286,7 +265,8 @@ def _save_product_to_main_dataset(image_url, image_data_b64, description, price,
             "category": str(category) if category else "",
             "sender_id": str(sender_id),
             "sender_name": str(sender_name),
-            "timestamp": time.strftime("%Y-%m-%d %H:%M:%S"),
+            "chat_id": str(chat_id),
+            "timestamp": timestamp or time.strftime("%Y-%m-%d %H:%M:%S"),
         }
         with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as tmp:
             json.dump(record, tmp, indent=2, ensure_ascii=False)
@@ -336,8 +316,21 @@ EXPOSE 7860
 CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860"]
 """
     requirements = "fastapi>=0.111.0\nuvicorn[standard]>=0.30.0\nrequests>=2.32.0\nhuggingface_hub>=0.30.0\n"
-    app_py = f'''import os, json, requests, time, re, base64, tempfile, pathlib
-from html import escape
+    app_py = f'''import os, json, requests, time, re, base64, tempfile, pathlib, sys
+from html import escape as _escape
+
+# Redirect print to stderr so uvicorn logs go to stdout
+class _StderrLogger:
+    def __init__(self): 
+        self._log = []
+    def write(self, s):
+        if s.strip():
+            self._log.append(s)
+            sys.__stderr__.write(s)
+    def flush(self): pass
+
+sys.stderr = _StderrLogger()
+
 from fastapi import FastAPI, Request, Response
 
 app = FastAPI(title="Zalo Proxy Space")
@@ -348,6 +341,7 @@ HF_TOKEN = os.getenv("HF_TOKEN", "")
 DATASET_ID = "{dataset_id}"
 MAIN_DATASET_ID = "{MAIN_DATASET_ID}"
 MAIN_SPACE_URL = "{SPACE_ID.replace("/", "-")}.hf.space"
+ZGR_SENDER_ID = "{ZGR_SENDER_ID}"
 _logs = []
 
 def _send(cid, text):
@@ -358,9 +352,15 @@ def _send(cid, text):
 def _safe_name(name):
     return re.sub(r'[^a-zA-Z0-9]', '_', str(name))[:30]
 
-def _save_to_main_dataset(image_url, image_data_b64, description, price, category, sender_id, sender_name, product_name=""):
+def _is_zgr_sender(sender_id):
+    sid = str(sender_id)
+    return ZGR_SENDER_ID in sid or sid == ZGR_SENDER_ID
+
+@_log("startup", "system", "SYSTEM", f"Proxy space initialized. PROXY_NAME={{PROXY_NAME}}")
+def _save_to_main_dataset(image_url, image_data_b64, description, price, category, sender_id, sender_name, product_name="", chat_id=""):
+    _log("main_dataset_save_start", sender_id, chat_id, f"product_name={{product_name}} price={{price}}")
     if not HF_TOKEN or not MAIN_DATASET_ID:
-        _log("main_dataset_skip", sender_id, "N/A", "HF_TOKEN or MAIN_DATASET_ID missing")
+        _log("main_dataset_skip", sender_id, chat_id, "HF_TOKEN or MAIN_DATASET_ID missing")
         return None
     try:
         from huggingface_hub import HfApi
@@ -379,8 +379,9 @@ def _save_to_main_dataset(image_url, image_data_b64, description, price, categor
             try:
                 r = requests.get(image_url, timeout=15)
                 img_bytes = r.content
+                _log("image_downloaded_from_url", sender_id, chat_id, image_url[:100])
             except Exception as e:
-                _log("image_download_fail", sender_id, "N/A", str(e))
+                _log("image_download_fail", sender_id, chat_id, str(e))
         uploaded_img = None
         if img_bytes:
             with tempfile.NamedTemporaryFile(suffix=".jpg", delete=False) as tmp:
@@ -389,22 +390,25 @@ def _save_to_main_dataset(image_url, image_data_b64, description, price, categor
             try:
                 api.upload_file(path_or_fileobj=tmp_path, path_in_repo=img_filename, repo_id=MAIN_DATASET_ID, repo_type="dataset", token=HF_TOKEN, commit_message=f"Add product image from {{sender_name}}")
                 uploaded_img = img_filename
+                _log("image_uploaded", sender_id, chat_id, img_filename)
             except Exception as e:
-                _log("image_upload_fail", sender_id, "N/A", str(e))
+                _log("image_upload_fail", sender_id, chat_id, str(e))
             finally:
                 pathlib.Path(tmp_path).unlink(missing_ok=True)
-        record = {{"image": uploaded_img, "product_name": str(product_name)[:200] if product_name else "", "description": str(description)[:500] if description else "", "price": str(price) if price else "", "category": str(category) if category else "", "sender_id": str(sender_id), "sender_name": str(sender_name), "timestamp": time.strftime("%Y-%m-%d %H:%M:%S")}}
+        record = {{"image": uploaded_img, "product_name": str(product_name)[:200] if product_name else "", "description": str(description)[:500] if description else "", "price": str(price) if price else "", "category": str(category) if category else "", "sender_id": str(sender_id), "sender_name": str(sender_name), "chat_id": str(chat_id), "is_zgr_group": _is_zgr_sender(sender_id), "timestamp": time.strftime("%Y-%m-%d %H:%M:%S")}}
         with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as tmp:
             json.dump(record, tmp, indent=2, ensure_ascii=False)
             tmp_path = tmp.name
         try:
             api.upload_file(path_or_fileobj=tmp_path, path_in_repo=meta_filename, repo_id=MAIN_DATASET_ID, repo_type="dataset", token=HF_TOKEN, commit_message=f"Add product metadata from {{sender_name}}")
+            _log("dataset_save_to_main", sender_id, chat_id, "OK")
+        except Exception as e:
+            _log("dataset_save_fail", sender_id, chat_id, str(e))
         finally:
             pathlib.Path(tmp_path).unlink(missing_ok=True)
-        _log("main_dataset_saved", sender_id, "N/A", f"Saved to {{MAIN_DATASET_ID}}")
         return MAIN_DATASET_ID
     except Exception as e:
-        _log("main_dataset_error", sender_id, "N/A", str(e))
+        _log("main_dataset_error", sender_id, chat_id, str(e))
         return None
 
 def _save_to_dataset(image_url, image_data_b64, description, price, category, sender_id, sender_name):
@@ -462,7 +466,7 @@ async def root():
 
 @app.get("/health")
 async def health():
-    return {{"status": "ok", "dataset": DATASET_ID}}
+    return {{"status": "ok", "dataset": DATASET_ID, "zgr_sender": ZGR_SENDER_ID, "is_zgr": _is_zgr_sender(ZGR_SENDER_ID)}}
 
 @app.get("/webhooks")
 async def webhooks_get():
@@ -472,10 +476,11 @@ async def webhooks_get():
 async def webhooks(request: Request):
     body = await request.body()
     body_str = body.decode("utf-8") if body else ""
+    _log("webhook_received", "N/A", "N/A", "Body length: " + str(len(body_str)))
     try:
         data = json.loads(body_str)
-    except Exception:
-        _log("parse_error", "N/A", "N/A", "Bad JSON")
+    except Exception as e:
+        _log("parse_error", "N/A", "N/A", "Bad JSON: " + str(e) + " | body=" + body_str[:200])
         return Response(content=json.dumps({{"message": "Bad JSON"}}), media_type="application/json", status_code=400)
     result = data.get("result", data)
     event = result.get("event_name", "unknown")
@@ -499,11 +504,14 @@ async def webhooks(request: Request):
                 payload = {{}}
         image_url = payload.get("url", "")
         image_data_b64 = payload.get("data", "") or msg.get("image", "")
+    is_zgr = _is_zgr_sender(sender_id)
     _log(event, sender_id, chat_id, text, sender_name, chat_type)
+    _log("debug_info", sender_id, chat_id, f"chat_type={{chat_type}} is_zgr={{is_zgr}} sender_id={{sender_id}} sender_name={{sender_name}} text_len={{len(text)}} has_attachment={{bool(attachments)}} image_url={{bool(image_url)}}")
+
     if event == "message.text.received" and chat_id:
         description, price, category, product_name = "", "", "", ""
         desc_match = re.search(r'(?:mo ta|description|desc|mota)[:\\s]*([^|\\n]+)', text, re.IGNORECASE)
-        price_match = re.search(r'(?:gia|price|don gia|dongia)[:\\s]*([\\d,.]+)', text, re.IGNORECASE)
+        price_match = re.search(r'(?:gia|price|don gia|donggia)[:\\s]*([\\d,.]+)', text, re.IGNORECASE)
         cat_match = re.search(r'(?:chuyen muc|category|danh muc|loai)[:\\s]*([^|\\n]+?)(?:$|\\n)', text, re.IGNORECASE)
         name_match = re.search(r'(?:ten sp|ten san pham|product name|name)[:\\s]*([^|\\n]+)', text, re.IGNORECASE)
         if name_match:
@@ -516,46 +524,35 @@ async def webhooks(request: Request):
             category = cat_match.group(1).strip()
         if image_url or image_data_b64 or product_name or description or price or category:
             dataset_id = _save_to_dataset(image_url=image_url, image_data_b64=image_data_b64, description=description or text[:200], price=price, category=category, sender_id=sender_id, sender_name=sender_name)
-            _save_to_main_dataset(image_url=image_url, image_data_b64=image_data_b64, description=description or text[:200], price=price, category=category, sender_id=sender_id, sender_name=sender_name, product_name=product_name)
+            _save_to_main_dataset(image_url=image_url, image_data_b64=image_data_b64, description=description or text[:200], price=price, category=category, sender_id=sender_id, sender_name=sender_name, product_name=product_name, chat_id=chat_id)
             if dataset_id:
-                reply = f"🎉 **Bot Zalo của bạn đã được AUTOMATION SALE thiết lập thành công!**\\n\\n✅ Mọi cấu hình đã tự động hoàn tất.\\n\\n👉 Bạn có thể vào https://zalo.me/s/botcreator để quản lý và cấu hình bot của mình.\\n\\n💾 Dữ liệu đã lưu: https://huggingface.co/datasets/{{DATASET_ID}}\\n\\n🔗 Webhook: `https://bep40-zalo-proxy-{{_safe_name(sender_id)}}.hf.space/webhooks`"
+                reply = f"🎉 **Bot đã lưu sản phẩm của bạn!**\\n\\n✅ Đã lưu vào: https://huggingface.co/datasets/{{DATASET_ID}}\\n✅ Đồng thời lưu về dataset trung tâm: {{MAIN_DATASET_ID}}\\n\\n👉 Bạn có thể quản lý bot của mình tại https://zalo.me/s/botcreator"
             else:
-                reply = f"🎉 **Bot Zalo của bạn đã được AUTOMATION SALE thiết lập thành công!**\\n✅ Mọi cấu hình đã tự động hoàn tất."
+                reply = f"🎉 **Bot đã lưu sản phẩm của bạn!**\\n✅ Đã lưu về dataset trung tâm: {{MAIN_DATASET_ID}}"
         else:
-            reply = f"🎉 **Bot Zalo của bạn đã được AUTOMATION SALE thiết lập thành công!**\\n✅ Mọi cấu hình đã tự động hoàn tất.\\n👉 Bạn có thể vào https://zalo.me/s/botcreator để cấu hình bot."
+            reply = f"👋 Xin chào! Gửi ảnh kèm thông tin sản phẩm (tên, giá, mô tả) để mình tự động lưu nhé."
         try:
             _send(chat_id, reply)
-        except Exception:
-            pass
+        except Exception as e:
+            _log("send_reply_fail", sender_id, chat_id, str(e))
     return Response(content=json.dumps({{"message": "Success"}}), media_type="application/json", status_code=200)
 
-@app.get("/proxy-spaces")
-async def proxy_spaces_get():
-    html_parts = [
-        "<!DOCTYPE html><html><head><title>Quản lý Proxy</title>",
-        '<meta http-equiv="refresh" content="5">',
-        "<style>body{font-family:Arial,sans-serif;max-width:1000px;margin:0 auto;padding:16px;background:#fafafa;}h1{color:#1a73e8;}</style></head><body>",
-        f'<h1>📊 Quản lý Proxy — {escape(PROXY_NAME)}</h1>',
-        f'<p>Webhook URL: <code>https://{MAIN_SPACE_URL}/webhooks</code></p>',
-        f'<p>Logs: <a href="/logs">https://{MAIN_SPACE_URL}/logs</a></p>',
-    ]
-    if DATASET_ID:
-        html_parts.append(f'<p>Dataset: <a href="https://huggingface.co/datasets/{DATASET_ID}" target="_blank">{escape(DATASET_ID)}</a></p>')
-    html_parts.append("<p>💡 Gửi ảnh kèm mô tả/gi��/chuyên mục để lưu sản phẩm vào dataset.</p>")
-    html_parts.append("</body></html>")
-    return Response(content="".join(html_parts), media_type="text/html")
-
 def _log(event, sender_id, chat_id, text, sender_name="", chat_type=""):
-    _logs.append({{"event": str(event), "sender_id": str(sender_id), "sender_name": str(sender_name), "chat_id": str(chat_id), "chat_type": str(chat_type), "text": str(text)[:200], "time": time.strftime("%Y-%m-%d %H:%M:%S")}})
-    if len(_logs) > 100:
-        del _logs[:50]
+    entry = {{"event": str(event), "sender_id": str(sender_id), "sender_name": str(sender_name), "chat_id": str(chat_id), "chat_type": str(chat_type), "text": str(text)[:500], "is_zgr": _is_zgr_sender(sender_id), "time": time.strftime("%Y-%m-%d %H:%M:%S")}}
+    _logs.append(entry)
+    print(f"[WEBHOOK] event={{event}} sender={{sender_id}} chat={{chat_id}} type={{chat_type}} is_zgr={{entry['is_zgr']}} text={{str(text)[:100]}}", flush=True)
+    if len(_logs) > 200:
+        del _logs[:100]
 
 @app.get("/logs")
 async def proxy_logs():
     rows = ""
-    for log in reversed(_logs[-50:]):
-        rows += f"<div style='margin:6px 0;padding:8px;background:#f5f5f5;border-radius:4px'><b>[{log['event']}]</b> 👤{escape(log['sender_name'])} 🆔<code>{escape(log['sender_id'])}</code> 💬<code>{escape(log['chat_id'])}</code> [{escape(log['chat_type'])}]<br><span style='font-family:monospace;font-size:12px;color:#333'>{escape(log['text'][:200])}</span><br><small style='color:#999'>⏰ {log['time']}</small></div>"
-    return Response(content=f"<!DOCTYPE html><html><head><title>Proxy Logs</title><meta http-equiv='refresh' content='5'><style>body{{font-family:Arial,sans-serif;max-width:1000px;margin:0 auto;padding:16px;}}h1{{color:#1a73e8;}} .log-c{{max-height:600px;overflow-y:auto;background:#fff;border-radius:8px;padding:8px;}}</style></head><body><h1>📊 Proxy Logs — {escape(PROXY_NAME)}</h1><p>Webhook proxy cho: <b>{escape(PROXY_NAME)}</b></p><div class='log-c'>{rows if rows else '<p style=\"color:#999\">Chưa có sự kiện</p>'} </div></body></html>", media_type="text/html")
+    for log in reversed(_logs[-100:]):
+        is_zgr = _is_zgr_sender(log.get("sender_id", ""))
+        bg = "#e8f5e9" if is_zgr else ("#ffffff" if len(_logs) % 2 == 0 else "#fafafa")
+        zgr_badge = "<span style='color:#4CAF50;font-weight:bold'>[ZGR]</span> " if is_zgr else ""
+        rows += f"<div style='margin:6px 0;padding:8px;background:{bg};border-radius:4px;border-left:3px solid {'#4CAF50' if is_zgr else '#1a73e8'}'><b>{zgr_badge}[{{log['event']}}]</b> 👤{{_escape(str(log['sender_name']))}} 🆔<code>{{_escape(str(log['sender_id']))}}</code> 💬<code>{{_escape(str(log['chat_id']))}}</code> [{_escape(str(log['chat_type']))}]<br><span style='font-family:monospace;font-size:12px;color:#333'>{{_escape(str(log['text'][:300]))}}</span><br><small style='color:#999'>⏰ {{log['time']}} {' + ' if log.get('is_zgr') else ''}</small></div>"
+    return Response(content=f"<!DOCTYPE html><html><head><title>Proxy Logs</title><meta http-equiv='refresh' content='5'><style>body{{font-family:Arial,sans-serif;max-width:1000px;margin:0 auto;padding:16px;}} h1{{color:#1a73e8;}} .log-c{{max-height:600px;overflow-y:auto;background:#fff;border-radius:8px;padding:8px;}}</style></head><body><h1>📊 Proxy Logs — {_escape(PROXY_NAME)}</h1><p>Webhook proxy cho: <b>{_escape(PROXY_NAME)}</b> | ZGR Sender: <code>{_escape(ZGR_SENDER_ID)}</code></p><div class='log-c'>{rows if rows else '<p style=\"color:#999\">Chưa có sự kiện</p>'} </div></body></html>", media_type="text/html")
 '''
 
     readme = f"""---
@@ -688,7 +685,9 @@ def get_events():
         return "Chưa có sự kiện"
     lines = []
     for i, l in enumerate(BOT_STATE["logs"][-20:][::-1], 1):
-        lines.append(f"{i}. [{l.get('event','')}] Zalo:{l.get('sender_name','')} ID:{l.get('sender_id','')} chat:{l.get('chat_id','')} [{l.get('chat_type','')}] | {l.get('text', '')[:50]}")
+        is_zgr = _is_zgr_sender(l.get("sender_id", ""))
+        zgr_tag = " [ZGR]" if is_zgr else ""
+        lines.append(f"{i}. [{l.get('event','')}] {zgr_tag} Zalo:{l.get('sender_name','')} ID:{l.get('sender_id','')} chat:{l.get('chat_id','')} [{l.get('chat_type','')}] | {l.get('text', '')[:50]}")
     return "\n".join(lines)
 
 
@@ -702,24 +701,26 @@ def get_proxy_spaces():
     return "\n".join(lines)
 
 
-def _build_help_instructions():
-    return (
-        "🎓 **HƯỚNG DẪN CẤU HÌNH ZALO BOT CHI TIẾT**\n\n"
-        "1️⃣ Cách đặt tên Zalobot (QUAN TRỌNG):\n"
-        "   • Tên bot không được chứa 'Zalo' hoặc 'bot'\n"
-        "   • Ví dụ đúng: Shop, ChămSóc, HỗTrợ247, CSKH-TựĐộng ✅\n"
-        "   • Ví dụ sai: Zalo Support, ShopBot, ZaloBot ❌\n\n"
-        "2️⃣ Cách lấy HTTP API:\n"
-        "   • Truy cập https://zalo.me/s/botcreator\n"
-        "   • Chọn bot → Cài đặt → API/HTTP API\n"
-        "   • Copy Bot token: `4179413508988279245:XXXXXXXXXXXXXXXXXXXXXX`\n\n"
-        "3️⃣ Cách dán lên Zalo Bot Creator:\n"
-        "   • Ở Zalo Bot Creator → Webhook\n"
-        "   • 👉 Gửi `HTTP API: <bot_token>` cho bot để tự động tạo proxy + setup webhook\n\n"
-        "✅ Bot sẽ tự động trả lời khi có người nhắn tin."
-    )
-
-HELP_INSTRUCTIONS = _build_help_instructions()
+def _is_zgr_sender_local(sender_id):
+    sid = str(sender_id)
+    return ZGR_SENDER_ID in sid or sid == ZGR_SENDER_ID
+
+
+HELP_INSTRUCTIONS = (
+    "🎓 **HƯỚNG DẪN CẤU HÌNH ZALO BOT CHI TIẾT**\n\n"
+    "1️⃣ Cách đặt tên Zalobot (QUAN TRỌNG):\n"
+    "   • Tên bot không được chứa 'Zalo' hoặc 'bot'\n"
+    "   • Ví dụ đúng: Shop, ChămSóc, HỗTrợ247, CSKH-TựĐộng ✅\n"
+    "   • Ví dụ sai: Zalo Support, ShopBot, ZaloBot ❌\n\n"
+    "2️⃣ Cách lấy HTTP API:\n"
+    "   • Truy cập https://zalo.me/s/botcreator\n"
+    "   • Chọn bot → Cài đặt → API/HTTP API\n"
+    "   • Copy Bot token: `4179413508988279245:XXXXXXXXXXXXXXXXXXXXXX`\n\n"
+    "3️⃣ Cách dùng:\n"
+    "   • Gửi ảnh + mô tả sản phẩm trực tiếp cho bot hoặc qua webhook\n"
+    "   • Bot sẽ tự động lưu vào dataset\n\n"
+    "✅ Hệ thống đang theo dõi nhóm ZGR: " + ZGR_SENDER_ID
+)
 
 
 async def handle_webhook(request: Request):
@@ -746,11 +747,14 @@ async def handle_webhook(request: Request):
 
     BOT_STATE["logs"].append({
         "event": str(event), "sender_id": sender_id, "chat_id": chat_id,
-        "sender_name": sender_name, "chat_type": chat_type, "text": str(text)[:200],
+        "sender_name": sender_name, "chat_type": chat_type, "text": str(text)[:500],
+        "is_zgr": _is_zgr_sender_local(sender_id),
     })
     if len(BOT_STATE["logs"]) > 100:
         BOT_STATE["logs"] = BOT_STATE["logs"][-100:]
 
+    logger.info("EVENT=%s SENDER_ID=%s CHAT_ID=%s SENDER_NAME=%s", event, sender_id, chat_id, sender_name)
+
     if event == "message.text.received":
         cid = chat.get("id") or sender.get("id") or ""
         _save_chat_id(cid, sender_id)
@@ -766,7 +770,6 @@ async def handle_webhook(request: Request):
             def _create_and_setup():
                 try:
                     _r, proxy_url, status = _create_api_proxy_space(user_token, sender_id, sender_name)
-                    sender_display_global[sender_id] = sender_name
                     dataset_id = None
                     try:
                         dataset_id, _ = _ensure_user_dataset(sender_id, user_token)
@@ -832,7 +835,7 @@ async def handle_webhook(request: Request):
 
             name_match = re.search(r'(?:ten sp|ten san pham|product name|name)[:\s]*([^|\n]+)', text, re.IGNORECASE)
             desc_match = re.search(r'(?:mo ta|description|desc|mota)[:\\s]*([^|\n]+)', text, re.IGNORECASE)
-            price_match = re.search(r'(?:gia|price|don gia|dongia)[:\\s]*([\d,.]+)', text, re.IGNORECASE)
+            price_match = re.search(r'(?:gia|price|don gia|donggia)[:\\s]*([\d,.]+)', text, re.IGNORECASE)
             cat_match = re.search(r'(?:chuyen muc|category|danh muc|loai)[:\\s]*([^|\n]+?)(?:$|\n)', text, re.IGNORECASE)
             if name_match: product_name = name_match.group(1).strip()
             if desc_match: description = desc_match.group(1).strip()
@@ -844,6 +847,7 @@ async def handle_webhook(request: Request):
                     image_url=image_url, image_data_b64=image_data_b64,
                     description=description, price=price, category=category,
                     sender_id=sender_id, sender_name=sender_name, product_name=product_name,
+                    chat_id=chat_id,
                 )
                 BOT_STATE["logs"].append({
                     "event": "product_saved", "sender_id": sender_id, "chat_id": chat_id,
@@ -851,7 +855,7 @@ async def handle_webhook(request: Request):
                     "text": f"Product saved! name={product_name} price={price} category={category} ds={MAIN_DATASET_ID}",
                 })
 
-            reply = f"👋 Xin chào **{sender_name}** (Zalo ID: `{sender_id}`)!\n\n{HELP_INSTRUCTIONS}"
+            reply = f"👋 Xin chào **{sender_name}** (ID: `{sender_id}`)!\n\n{HELP_INSTRUCTIONS}"
             asyncio.create_task(asyncio.to_thread(zapi.send_message, cid, reply))
 
     return Response(content=json.dumps({"message": "Success"}), media_type="application/json", status_code=200)
@@ -867,7 +871,7 @@ async def root():
 
 @app.get("/health")
 async def health():
-    return {"status": "ok", "service": "zalo-bot-webhook", "main_dataset": MAIN_DATASET_ID}
+    return {"status": "ok", "service": "zalo-bot-webhook", "main_dataset": MAIN_DATASET_ID, "zgr_sender_id": ZGR_SENDER_ID}
 
 
 @app.post("/webhooks")
@@ -878,20 +882,19 @@ async def webhooks(request: Request):
 @app.get("/logs")
 async def logs_page():
     log_lines = []
-    prev_sender = None
     for idx, log in enumerate(reversed(BOT_STATE.get("logs", [])[-50:])):
         sender_id = log.get("sender_id", "")
         sender_name = log.get("sender_name", sender_id)
-        is_new_sender = sender_id and sender_id != prev_sender
-        prev_sender = sender_id if sender_id else prev_sender
+        is_zgr = _is_zgr_sender_local(sender_id)
         is_saved = log.get("event") in ("dataset_saved", "main_dataset_saved", "proxy_created", "product_saved")
-        is_error = log.get("event") in ("dataset_error", "main_dataset_error", "parse_error")
-        bg = "#ffffff" if idx % 2 == 0 else "#fafafa"
-        header_color = "#1a73e8" if is_new_sender else "#666"
+        is_error = log.get("event") in ("dataset_error", "main_dataset_error", "parse_error", "image_upload_fail")
+        bg = "#e8f5e9" if is_zgr else ("#ffffff" if idx % 2 == 0 else "#fafafa")
+        header_color = "#4CAF50" if is_zgr else "#1a73e8"
+        zgr_badge = " [ZGR]" if is_zgr else ""
         status_badge = "✅" if is_saved else ("❌" if is_error else "ℹ️")
-        weight = "bold" if is_new_sender else "normal"
+        weight = "bold" if is_zgr else "normal"
         log_lines.append(
-            f"<div style='margin:8px 0;padding:10px;background:{bg};border-radius:6px;border-left:3px solid #1a73e8'>"
+            f"<div style='margin:8px 0;padding:10px;background:{bg};border-radius:6px;border-left:3px solid {header_color}'>"
             f"<div style='display:flex;gap:6px;align-items:center;flex-wrap:wrap'>"
             f"<b style='color:{header_color}'>{status_badge} [{escape(str(log.get('event','')))}]</b>"
             f"<span style='color:{header_color};font-weight:{weight}'>"
@@ -899,12 +902,13 @@ async def logs_page():
             f"<span style='color:#666'>🆔 <code>{escape(str(sender_id))}</code></span>"
             f"<span style='color:#666'>💬 <code>{escape(str(log.get('chat_id','')))}</code></span>"
             f"<span style='color:#888'>[{escape(str(log.get('chat_type','')))}]</span>"
+            f"<span style='color:{'#4CAF50' if is_zgr else '#999'}'>{zgr_badge}</span>"
             f"</div>"
             f"<div style='margin-top:4px;color:#333;font-family:monospace;font-size:13px;word-break:break-word'>"
             f"{escape(str(log.get('text','')[:200]))}"
             f"</div>"
             f"<div style='margin-top:2px;color:#999;font-size:11px'>⏰ {time.strftime('%Y-%m-%d %H:%M:%S')}"
-            f" | 📊 <a href='/logs/zgr-b7e1e71cf5701c2e4561'>zgr logs</a>"
+            f" | 📊 <a href='/logs/zgr-b7e1e71cf5701c2e4561'>xem riêng zgr logs</a>"
             f"</div>"
             f"</div>"
         )
@@ -912,6 +916,7 @@ async def logs_page():
     total_proxies = len(BOT_STATE.get("api_spaces", []))
     connected_status = "✅" if BOT_STATE.get("connected") else "❌"
     last_sender = escape(str(BOT_STATE.get("last_sender_id", "")[:8]) or "—")
+    zgr_count = sum(1 for l in BOT_STATE.get("logs", []) if _is_zgr_sender_local(l.get("sender_id", "")))
     log_html = "".join(log_lines) if log_lines else '<p style="color:#999">Chưa có sự kiện</p>'
     html_content = (
         '<!DOCTYPE html><html><head><title>Zalo Bot Logs</title>'
@@ -932,6 +937,7 @@ async def logs_page():
         '<div class="stats">'
         f'<div class="stat-box"><div class="stat-value">{total_logs}</div><div class="stat-label">Tổng sự kiện</div></div>'
         f'<div class="stat-box"><div class="stat-value">{total_proxies}</div><div class="stat-label">Proxy đã tạo</div></div>'
+        f'<div class="stat-box"><div class="stat-value">{zgr_count}</div><div class="stat-label">ZGR Events</div></div>'
         f'<div class="stat-box"><div class="stat-value">{connected_status}</div><div class="stat-label">Trạng thái bot</div></div>'
         f'<div class="stat-box"><div class="stat-value">{last_sender}</div><div class="stat-label">Sender ID (last)</div></div>'
         '</div>'
@@ -946,11 +952,15 @@ async def logs_page():
 @app.get("/logs/zgr-b7e1e71cf5701c2e4561")
 async def zgr_logs_page():
     """Tab riêng cho nhóm zgr-b7e1e71cf5701c2e4561."""
-    zgr_sender_id = "zgr-b7e1e71cf5701c2e4561"
-    zgr_logs = [l for l in BOT_STATE.get("logs", []) if l.get("sender_id", "") == zgr_sender_id]
-
+    zgr_logs = []
+    for log in BOT_STATE.get("logs", []):
+        sid = str(log.get("sender_id", ""))
+        if ZGR_SENDER_ID in sid or sid == ZGR_SENDER_ID:
+            zgr_logs.append(log)
     log_lines = []
     for idx, log in enumerate(reversed(zgr_logs[-50:])):
+        sender_id = log.get("sender_id", "")
+        sender_name = log.get("sender_name", sender_id)
         is_saved = log.get("event") in ("dataset_saved", "main_dataset_saved", "proxy_created", "product_saved")
         is_error = log.get("event") in ("dataset_error", "main_dataset_error", "parse_error", "image_upload_fail")
         bg = "#ffffff" if idx % 2 == 0 else "#fafafa"
@@ -960,21 +970,20 @@ async def zgr_logs_page():
             f"<div style='margin:8px 0;padding:10px;background:{bg};border-radius:6px;border-left:3px solid {status_color}'>"
             f"<div style='display:flex;gap:6px;align-items:center;flex-wrap:wrap'>"
             f"<b style='color:{status_color}'>{status_icon} [{escape(str(log.get('event','')))}]</b>"
-            f"<span style='color:#1a73e8;font-weight:bold'>👤 {escape(str(log.get('sender_name','')))}</span>"
-            f"<span style='color:#666'>🆔 <code>{escape(str(log.get('sender_id','')[:12]))}</code></span>"
+            f"<span style='color:#1a73e8;font-weight:bold'>👤 {escape(str(sender_name))}</span>"
+            f"<span style='color:#666'>🆔 <code>{escape(str(sender_id[:12]))}</code></span>"
             f"<span style='color:#666'>💬 <code>{escape(str(log.get('chat_id','')[:12]))}</code></span>"
-            f"[{escape(str(log.get('chat_type','')))}]"
+            f"[{escape(str(log.get('chat_type','')))]"
             f"</div>"
             f"<div style='margin-top:4px;color:#333;font-family:monospace;font-size:13px;word-break:break-word'>"
-            f"{escape(str(log.get('text','')[:200]))}"
+            f"{escape(str(log.get('text','')[:300]))}"
             f"</div>"
             f"<div style='margin-top:2px;color:#999;font-size:11px'>⏰ {log.get('time','')}"
-            f" | 📊 <a href='https://huggingface.co/datasets/bep40/zalo-products-all' target='_blank'>Main Dataset</a>"
+            f" | 📊 <a href='https://huggingface.co/datasets/{escape(NAMESPACE)}/zalo-products-all' target='_blank'>Main Dataset</a>"
             f" | 📁 <a href='/proxy-spaces'>Quản lý proxy</a>"
             f"</div>"
             f"</div>"
         )
-
     saved_count = sum(1 for l in zgr_logs if l.get("event") in ("dataset_saved", "main_dataset_saved", "product_saved"))
     error_count = sum(1 for l in zgr_logs if l.get("event") in ("dataset_error", "main_dataset_error", "image_upload_fail"))
     total_zgr_logs = len(zgr_logs)