Commit Markdown Slack messages

test_logfire.py

@@ -60,19 +60,37 @@ load_dotenv()
 #     # Test async tracing
 #     asyncio.run(test_logfire_tracing())
     
-#     print("\n🎉 Logfire tracing is working correctly!")
+from tool import send_slack_message
+from dotenv import load_dotenv
+
+load_dotenv()
+
+report = f"""# [] PR #1: Change something PR
+Hello World
 
-from pathlib import Path
-logfire.configure(token = os.getenv('LOGFIRE_API_KEY'))
+**🌿 Branch Information:**
+- **Source Branch:**  → **Target Branch:** 
 
-cwd = Path.cwd()
-total_size = 0
+**👤 Người tạo:** Hải Huỳnh @Hai Huynh
+
+**📅 Thời gian tạo:** 2024-08-20 14:30:00 +07:00
+
+**👥 Reviewers:**
+
+**🔗 Link Pull Request:** [PR #1: Implement user authentication system](https://google.com.vn)
+"""
 
-with logfire.span('counting size of {cwd=}', cwd=cwd):
-    for path in cwd.iterdir():
-        if path.is_file():
-            with logfire.span('reading {path}', path=path.relative_to(cwd)):
-                total_size += len(path.read_bytes())
 
-    logfire.info('total size of {cwd} is {size} bytes', cwd=cwd, size=total_size)
+send_slack_message(
+    message_text = "Hello, *World*",                
+    webhook_url = os.getenv("SLACK_WEBHOOK_URL"),
+    bot_token = os.getenv("SLACK_BOT_TOKEN"),
+    channel = "pull-request",
+    blocks = [
+        {
+            "type": "markdown",
+            "text": report
+        }
+    ]
+) 
 

tool.py

@@ -34,6 +34,7 @@ def create_session(username: Optional[str] = None, app_password: Optional[str] =
     session = requests.Session()
     session.auth = (resolved_username, resolved_app_password)
     session.headers.update({"Accept": "application/json"})
+    session.headers.update({"Content-Type": "application/json"})
     return session
 
 
@@ -126,24 +127,70 @@ def send_slack_message(
     resolved_bot_token = bot_token or SLACK_BOT_TOKEN
     resolved_channel = channel or SLACK_CHANNEL
 
+    # Chuẩn hoá blocks nếu user truyền dạng đơn giản {"type": "markdown", "text": "..."}
+    normalized_blocks: Optional[List[Dict[str, Any]]] = None
+    if blocks is not None:
+        normalized_blocks = blocks
+
     # Ưu tiên gửi qua Incoming Webhook nếu có
     if resolved_webhook_url:
-        payload: Dict[str, Any] = {"text": message_text, "type": "mrkdwn"}
-        if blocks is not None:
-            payload["blocks"] = blocks
-
-        response = requests.post(resolved_webhook_url, json=payload, timeout=15)
-        try:
-            response.raise_for_status()
-        except Exception as exc:
-            raise ValueError(f"Slack webhook request failed: {exc}") from exc
-
-        return {
-            "ok": response.status_code == 200 and response.text.strip().lower() == "ok",
-            "method": "webhook",
-            "status_code": response.status_code,
-            "response": response.text,
-        }
+        payload: Dict[str, Any] = {"text": message_text}
+        if normalized_blocks is not None:
+            payload["blocks"] = normalized_blocks
+
+        response = requests.post(resolved_webhook_url, json=json.dumps(payload))
+        if 200 <= response.status_code < 300 and response.text.strip().lower() in ("ok", ""):
+            return {
+                "ok": True,
+                "method": "webhook",
+                "status_code": response.status_code,
+                "response": response.text,
+            }
+
+        # Nếu webhook trả lỗi, thử fallback sang Web API nếu có cấu hình
+        if resolved_bot_token and resolved_channel:
+            api_url = "https://slack.com/api/chat.postMessage"
+            headers = {
+                "Authorization": f"Bearer {resolved_bot_token}",
+                "Content-Type": "application/json",
+            }
+            payload_api: Dict[str, Any] = {
+                "channel": resolved_channel,
+                "text": message_text,
+            }
+            if normalized_blocks is not None:
+                payload_api["blocks"] = normalized_blocks
+            if thread_ts is not None:
+                payload_api["thread_ts"] = thread_ts
+
+            api_resp = requests.post(api_url, headers=headers, json=payload_api, timeout=15)
+            try:
+                api_resp.raise_for_status()
+            except Exception as exc:
+                raise ValueError(
+                    f"Slack webhook failed (status {response.status_code}, body={response.text!r}); "
+                    f"fallback Web API also failed: {exc}"
+                ) from exc
+
+            data = api_resp.json()
+            if not data.get("ok", False):
+                error_detail = data.get("error", "unknown_error")
+                raise ValueError(
+                    f"Slack webhook failed (status {response.status_code}, body={response.text!r}); "
+                    f"fallback Web API responded with error: {error_detail}"
+                )
+
+            return {
+                "ok": True,
+                "method": "webhook_fallback_web_api",
+                "status_code": api_resp.status_code,
+                "response": data,
+            }
+
+        # Không có fallback khả dụng, báo lỗi chi tiết
+        raise ValueError(
+            f"Slack webhook request failed with status {response.status_code}: {response.text}"
+        )
 
     # Fallback: dùng Slack Web API nếu có token + channel
     if resolved_bot_token and resolved_channel:
@@ -156,8 +203,8 @@ def send_slack_message(
             "channel": resolved_channel,
             "text": message_text,
         }
-        if blocks is not None:
-            payload["blocks"] = blocks
+        if normalized_blocks is not None:
+            payload["blocks"] = normalized_blocks
         if thread_ts is not None:
             payload["thread_ts"] = thread_ts