Restore to commit 11a233f + add text message saving for ZGR group with detailed HELP_INSTRUCTIONS

app.py

@@ -282,6 +282,44 @@ def _save_product_to_main_dataset(image_url, image_data_b64, description, price,
         return None
 
 
+def _save_text_message_to_dataset(text, description, price, category, sender_id, sender_name, chat_id):
+    """Save a text-only message to the main Zalo products dataset."""
+    try:
+        from huggingface_hub import HfApi
+        api = HfApi()
+        filename_ts = time.strftime("%Y%m%d_%H%M%S")
+        safe_name = re.sub(r'[^a-zA-Z0-9_\-]', '_', str(sender_name)[:30]) if sender_name else ""
+        file_name = f"{filename_ts}_{safe_name}_text.json"
+        upload_path = "data/" + file_name
+        record = {
+            "text": text,
+            "description": description[:500] if description else text[:500],
+            "price": price or "",
+            "category": category or "",
+            "sender_id": str(sender_id),
+            "sender_name": str(sender_name),
+            "chat_id": str(chat_id),
+            "image": "",
+            "product_name": "",
+            "timestamp": time.strftime("%Y-%m-%d %H:%M:%S"),
+            "message_type": "text",
+        }
+        json_content = json.dumps(record, ensure_ascii=False, indent=2)
+        api.upload_file(
+            path=upload_path,
+            path_in_repo=upload_path,
+            repo_id=MAIN_DATASET_ID,
+            repo_type="dataset",
+            token=HF_TOKEN,
+            commit_message=f"Add text message from {sender_name}",
+        )
+        logger.info("Text message saved to dataset: %s", file_name)
+        return upload_path
+    except Exception as e:
+        logger.error("Failed to save text to dataset: %s", e)
+        return None
+
+
 def _ocr_extract_text(image_bytes):
     """Use HF Inference API with Vietnamese OCR model (Vintern-1B) to extract text from image."""
     try:
@@ -405,7 +443,7 @@ def _log(event, sender_id, chat_id, text, sender_name="", chat_type=""):
 
 _log("startup", "system", "SYSTEM", "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=""):
+def _save_to_main_dataset(image_url, image_data_b64, description, price, category, sender_id, sender_name, product_name="", chat_id="", text_message=None):
     _log("main_dataset_save_start", sender_id, chat_id, "product_name=" + str(product_name) + " price=" + str(price))
     if not HF_TOKEN or not MAIN_DATASET_ID:
         _log("main_dataset_skip", sender_id, chat_id, "HF_TOKEN or MAIN_DATASET_ID missing")
@@ -416,8 +454,12 @@ def _save_to_main_dataset(image_url, image_data_b64, description, price, categor
         file_ts = time.strftime("%Y%m%d_%H%M%S")
         rec_ts = time.strftime("%Y-%m-%d %H:%M:%S")
         safe_sender = _safe_name(sender_id) or "unknown"
-        img_filename = "images/" + file_ts + "_" + safe_sender + ".jpg"
-        meta_filename = "data/" + file_ts + "_" + safe_sender + ".json"
+        if text_message:
+            img_filename = ""
+            meta_filename = "data/" + file_ts + "_" + safe_sender + "_text.json"
+        else:
+            img_filename = "images/" + file_ts + "_" + safe_sender + ".jpg"
+            meta_filename = "data/" + file_ts + "_" + safe_sender + ".json"
         img_bytes = None
         if image_data_b64:
             try:
@@ -444,7 +486,10 @@ def _save_to_main_dataset(image_url, image_data_b64, description, price, categor
                 _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 "", "category": str(category) if category else "", "description": str(description)[:500] if description else "", "price": str(price) if price 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": rec_ts}
+        if text_message:
+            record = {"image": "", "product_name": str(product_name)[:200] if product_name else "", "category": str(category) if category else "", "description": str(description)[:500] if description else str(text_message)[:500], "price": str(price) if price 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": rec_ts, "text": str(text_message)[:1000], "message_type": "text"}
+        else:
+            record = {"image": uploaded_img, "product_name": str(product_name)[:200] if product_name else "", "category": str(category) if category else "", "description": str(description)[:500] if description else "", "price": str(price) if price 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": rec_ts}
         with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as tmp:
             json.dump(record, tmp, indent=2, ensure_ascii=False)
             tmp_path = tmp.name
@@ -582,6 +627,16 @@ async def webhooks(request: Request):
                 reply = "GOT IT! Product saved!"
             else:
                 reply = "GOT IT! Saved to main dataset!"
+        elif is_zgr and text:
+            # Save all text messages from ZGR group to main dataset
+            _save_to_main_dataset(
+                image_url=image_url, image_data_b64=image_data_b64,
+                description=text[:200], price=price, category=category,
+                sender_id=sender_id, sender_name=sender_name,
+                product_name=product_name, chat_id=chat_id,
+                text_message=text,
+            )
+            reply = "👋 Xin chào " + str(sender_name) + " (Zalo ID: " + str(sender_id) + ")!\n\n" + HELP_INSTRUCTIONS
         else:
             reply = "Hi! Send image + product info to save."
         try:
@@ -779,10 +834,19 @@ def get_proxy_spaces():
 
 
 HELP_INSTRUCTIONS = (
-    "Cach cau hinh Zalo bot:\n"
-    "1. Ten bot khong duoc chua 'Zalo' hoac 'bot'\n"
-    "2. Lay HTTP API tu https://zalo.me/s/botcreator\n"
-    "3. Gui anh + mo ta san pham de luu"
+    "🎓 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 HTTP API: <bot_token> để tạo proxy tự động\n"
+    "• Gửi ảnh + mô tả sản phẩm để lưu vào dataset\n"
+    "• Mọi tin nhắn trong nhóm sẽ được lưu tự động"
 )
 
 
@@ -913,8 +977,20 @@ async def handle_webhook(request: Request):
                     "text": "Saved! " + str(product_name)[:50],
                     "time": time.strftime("%Y-%m-%d %H:%M:%S"),
                 })
+            elif _is_zgr_sender_local(sender_id) and text:
+                # Save all text messages from ZGR group to dataset
+                _save_text_message_to_dataset(
+                    text=text, description=text[:200], price=price, category=category,
+                    sender_id=sender_id, sender_name=sender_name, chat_id=chat_id,
+                )
+                BOT_STATE["logs"].append({
+                    "event": "text_saved", "sender_id": sender_id, "chat_id": chat_id,
+                    "sender_name": sender_name, "chat_type": chat_type,
+                    "text": "Text saved: " + str(text[:100]),
+                    "time": time.strftime("%Y-%m-%d %H:%M:%S"),
+                })
 
-            reply = "Hi " + str(sender_name) + "! " + HELP_INSTRUCTIONS
+            reply = "👋 Xin chào " + str(sender_name) + " (Zalo ID: " + str(sender_id) + ")!\n\n" + HELP_INSTRUCTIONS
             asyncio.create_task(asyncio.to_thread(zapi.send_message, cid, reply))
 
     elif event == "message.image.received" and chat_id: