kl-mcp-client 1.0.6__tar.gz → 1.1.0__tar.gz

{kl_mcp_client-1.0.6 → kl_mcp_client-1.1.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: kl-mcp-client
-Version: 1.0.6
-Summary: MCP Client
+Version: 1.1.0
+Summary: MCP Client for Python
 Author-email: Kyle <hngan.it@gmail.com>
 License: MIT
 Requires-Python: >=3.8

{kl_mcp_client-1.0.6 → kl_mcp_client-1.1.0}/kl_mcp_client/asyncio/client.py

@@ -1,11 +1,10 @@
 # mcp_client_async.py
 import uuid
 import time
+import asyncio
 from typing import Any, Dict, List, Optional
 
 import httpx
-import asyncio
-
 
 DEFAULT_HEADERS = {
     "Content-Type": "application/json",
@@ -24,12 +23,18 @@ class MCPClient:
         headers: Optional[Dict[str, str]] = None,
         timeout: int = 30,
         retries: int = 1,
+        proxies: Optional[Dict[str, str]] = None,
     ):
         """
         base_url: full MCP HTTP endpoint e.g. http://localhost:3000/mcp
         headers: extra headers (e.g. {"Authorization": "Bearer ..."})
         timeout: request timeout seconds
         retries: number of attempts for network errors
+        proxies: httpx proxies dict, e.g.
+            {
+              "http://": "http://127.0.0.1:8080",
+              "https://": "http://127.0.0.1:8080"
+            }
         """
         self.base_url = base_url.rstrip("/")
         self.headers = DEFAULT_HEADERS.copy()
@@ -40,13 +45,17 @@ class MCPClient:
         self.retries = max(1, retries)
 
         self._client = httpx.AsyncClient(
-            timeout=self.timeout,
             headers=self.headers,
+            timeout=httpx.Timeout(self.timeout),
+            proxies=proxies,
         )
 
         # local session cache
         self._sessions: Dict[str, Dict[str, Any]] = {}
 
+    # -------------------------
+    # JSON-RPC core
+    # -------------------------
     async def _rpc(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
         payload = {
             "jsonrpc": "2.0",
@@ -55,15 +64,13 @@ class MCPClient:
             "params": params,
         }
 
-        last_exc = None
+        last_exc: Optional[Exception] = None
+
         for attempt in range(self.retries):
             try:
-                r = await self._client.post(
-                    self.base_url,
-                    json=payload,
-                )
+                r = await self._client.post(self.base_url, json=payload)
                 r.raise_for_status()
-            except Exception as e:
+            except httpx.HTTPError as e:
                 last_exc = e
                 await asyncio.sleep(0.2 * (attempt + 1))
                 continue
@@ -89,7 +96,7 @@ class MCPClient:
         raise MCPError(f"Request failed after {self.retries} attempts: {last_exc}")
 
     # -------------------------
-    # Generic tool wrappers
+    # Tool wrappers
     # -------------------------
 
     async def call_tool_structured(

{kl_mcp_client-1.0.6 → kl_mcp_client-1.1.0}/kl_mcp_client/client.py

@@ -3,7 +3,7 @@ import time
 import uuid
 from typing import Any, Dict, List, Optional
 
-import requests
+import httpx
 
 DEFAULT_HEADERS = {
     "Content-Type": "application/json",
@@ -22,22 +22,43 @@ class MCPClient:
         headers: Optional[Dict[str, str]] = None,
         timeout: int = 30,
         retries: int = 1,
+        proxies: Optional[Dict[str, str]] = None,
     ):
         """
         base_url: full MCP HTTP endpoint e.g. http://localhost:3000/mcp
         headers: extra headers (e.g. {"Authorization": "Bearer ..."})
         timeout: request timeout seconds
         retries: number of attempts for network errors
+        proxies: httpx proxies dict, e.g.
+            {
+              "http://": "http://127.0.0.1:8080",
+              "https://": "http://127.0.0.1:8080"
+            }
         """
         self.base_url = base_url.rstrip("/")
         self.headers = DEFAULT_HEADERS.copy()
         if headers:
             self.headers.update(headers)
+
         self.timeout = timeout
         self.retries = max(1, int(retries))
-        # local cache of sessions -> can be used to reuse session ids
         self._sessions: Dict[str, Dict[str, Any]] = {}
 
+        # httpx client (sync)
+        self._client = httpx.Client(
+            base_url=self.base_url,
+            headers=self.headers,
+            timeout=httpx.Timeout(self.timeout),
+            proxies=proxies,
+        )
+
+    def close(self):
+        """Close underlying httpx client."""
+        self._client.close()
+
+    # ---------------------------
+    # JSON-RPC core
+    # ---------------------------
     def _rpc(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
         payload = {
             "jsonrpc": "2.0",
@@ -45,17 +66,14 @@ class MCPClient:
             "method": method,
             "params": params,
         }
-        last_exc = None
+
+        last_exc: Optional[Exception] = None
+
         for attempt in range(self.retries):
             try:
-                r = requests.post(
-                    self.base_url,
-                    json=payload,
-                    headers=self.headers,
-                    timeout=self.timeout,
-                )
+                r = self._client.post("", json=payload)
                 r.raise_for_status()
-            except requests.RequestException as e:
+            except httpx.HTTPError as e:
                 last_exc = e
                 time.sleep(0.2 * (attempt + 1))
                 continue
@@ -76,59 +94,55 @@ class MCPClient:
                         "data": err.get("data"),
                     }
                 )
+
             return data.get("result", {})
 
-        # all retries failed
         raise MCPError(f"Request failed after {self.retries} attempts: {last_exc}")
 
-    # ----- Generic callTool wrapper -----
+    # ---------------------------
+    # Tool wrappers
+    # ---------------------------
     def call_tool_structured(
         self, tool: str, arguments: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
         args = {"tool": tool, "arguments": arguments or {}}
         res = self._rpc("callTool", args)
-        # return structuredContent when possible
+
         if isinstance(res, dict) and "structuredContent" in res:
             return res["structuredContent"]
-        # fallback: maybe top-level result
+
         return res
 
-    # ----- Generic callTool wrapper -----
     def call_tool(
         self, tool: str, arguments: Optional[Dict[str, Any]] = None
     ) -> Dict[str, Any]:
         args = {"tool": tool, "arguments": arguments or {}}
-        res = self._rpc("callTool", args)
-        # # return structuredContent when possible
-        # if isinstance(res, dict) and "structuredContent" in res:
-        #     return res["structuredContent"]
-        # # fallback: maybe top-level result
-        return res
+        return self._rpc("callTool", args)
 
-    # ----- Session helpers -----
+    # ---------------------------
+    # Session helpers
+    # ---------------------------
     def create_session(self, cdpUrl: str) -> str:
         result = self.call_tool_structured("createSession", {"cdpUrl": cdpUrl})
-        # Many MCP servers put sessionId in structuredContent.sessionId or result.sessionId
+
         session_id = None
         if isinstance(result, dict):
             session_id = (
                 result.get("sessionId") or result.get("session_id") or result.get("id")
             )
+
         if not session_id:
-            # fallback: try raw result text or content
             raise MCPError("createSession did not return sessionId")
-        # store meta
+
         self._sessions[session_id] = {"created_at": time.time()}
         return session_id
 
     def close_session(self, session_id: str) -> bool:
         try:
             self.call_tool_structured("closeSession", {"sessionId": session_id})
-            if session_id in self._sessions:
-                del self._sessions[session_id]
+            self._sessions.pop(session_id, None)
             return True
         except MCPError:
-            # still remove local record if present
             self._sessions.pop(session_id, None)
             raise
 

{kl_mcp_client-1.0.6 → kl_mcp_client-1.1.0}/kl_mcp_client/tools.py

@@ -228,3 +228,29 @@ class MCPTools:
             "selectorMap",
             {"sessionId": sessionId, "selector": selector, "args": args or {}},
         )
+
+    # ======================================================
+    # AI / CONTENT PARSING
+    # ======================================================
+    @_ensure_client
+    def parse_html_by_prompt(self, html: str, prompt: str) -> Dict[str, Any]:
+        """
+        Parse HTML content using AI with dynamic prompt-defined structure.
+
+        Args:
+            html: Raw HTML string (client-provided)
+            prompt: Instruction that defines what to extract and output structure
+                    Example:
+                      - "Hãy lấy nội dung bài viết, struct trả về { content }"
+                      - "Hãy lấy số lượng like, share, comment, trả JSON { like, share, comment }"
+
+        Returns:
+            structuredContent (dynamic JSON defined by prompt)
+        """
+        return self.client.call_tool(
+            "parseHTMLByPrompt",
+            {
+                "html": html,
+                "prompt": prompt,
+            },
+        ).get("structuredContent", {})

{kl_mcp_client-1.0.6 → kl_mcp_client-1.1.0}/kl_mcp_client.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: kl-mcp-client
-Version: 1.0.6
-Summary: MCP Client
+Version: 1.1.0
+Summary: MCP Client for Python
 Author-email: Kyle <hngan.it@gmail.com>
 License: MIT
 Requires-Python: >=3.8

{kl_mcp_client-1.0.6 → kl_mcp_client-1.1.0}/pyproject.toml

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "kl-mcp-client"  
-version = "1.0.6"
-description = "MCP Client"
+version = "1.1.0"
+description = "MCP Client for Python"
 authors = [
   { name="Kyle", email="hngan.it@gmail.com" }
 ]