kl-mcp-client 1.0.3__tar.gz → 1.0.4__tar.gz

{kl_mcp_client-1.0.3 → kl_mcp_client-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kl-mcp-client
-Version: 1.0.3
+Version: 1.0.4
 Summary: MCP Client
 Author-email: Kyle <hngan.it@gmail.com>
 License: MIT

{kl_mcp_client-1.0.3 → kl_mcp_client-1.0.4}/kl_mcp_client/tools.py

@@ -1,8 +1,24 @@
+from functools import wraps
 from typing import Any, Dict, Optional
 
 from .client import MCPClient
 
 
+def _ensure_client(func):
+    """Decorator kiểm tra self.client != None trước khi gọi tool."""
+
+    @wraps(func)
+    def wrapper(self, *args, **kwargs):
+        if self.client is None:
+            return {
+                "ok": False,
+                "error": "MCP client not connected. Call connect mcp server first.",
+            }
+        return func(self, *args, **kwargs)
+
+    return wrapper
+
+
 class MCPTools:
     """
     Wrapper chuẩn cho Google ADK + MCP Server.
@@ -10,38 +26,47 @@ class MCPTools:
     - Tool screenshot → trả đúng content để ADK Web hiển thị image
     """
 
-    def __init__(self, client: MCPClient):
-        self.client = client
+    def __init__(self):
+        self.client = None
 
     # ======================================================
     # SESSION MANAGEMENT
     # ======================================================
+    def connect_mcp(self, mcpUrl: str) -> Dict[str, Any]:
+        # sid = self.client.create_session(mcpUrl)
+        self.client = MCPClient(base_url=mcpUrl, headers=None, timeout=30, retries=2)
+        return {"ok": True, "cdpUrl": "http://127.0.0.1:9222"}
 
+    @_ensure_client
     def create_session(self, cdpUrl: str) -> Dict[str, Any]:
         sid = self.client.create_session(cdpUrl)
         return {"sessionId": sid}
 
+    @_ensure_client
     def close_session(self, sessionId: str) -> Dict[str, Any]:
         ok = self.client.close_session(sessionId)
         return {"ok": bool(ok)}
 
+    @_ensure_client
     def list_sessions(self) -> Dict[str, Any]:
         return {"sessions": self.client.list_local_sessions()}
 
     # ======================================================
     # NAVIGATION & DOM
     # ======================================================
-
+    @_ensure_client
     def open_page(self, sessionId: str, url: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "openPage", {"sessionId": sessionId, "url": url}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def get_html(self, sessionId: str) -> Dict[str, Any]:
         return self.client.call_tool("getHTML", {"sessionId": sessionId}).get(
             "structuredContent", {}
         )
 
+    @_ensure_client
     def screenshot(self, sessionId: str) -> Dict[str, Any]:
         """
         Trả về đúng phần IMAGE content:
@@ -54,16 +79,19 @@ class MCPTools:
         full = self.client.call_tool("screenshot", {"sessionId": sessionId})
         return full["content"][0]
 
+    @_ensure_client
     def click(self, sessionId: str, selector: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "click", {"sessionId": sessionId, "selector": selector}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def type(self, sessionId: str, selector: str, text: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "type", {"sessionId": sessionId, "selector": selector, "text": text}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def evaluate(self, sessionId: str, expression: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "evaluate", {"sessionId": sessionId, "expression": expression}
@@ -72,27 +100,31 @@ class MCPTools:
     # ======================================================
     # ELEMENT UTILITIES
     # ======================================================
-
+    @_ensure_client
     def find_element(self, sessionId: str, selector: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "findElement", {"sessionId": sessionId, "selector": selector}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def find_all(self, sessionId: str, selector: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "findAll", {"sessionId": sessionId, "selector": selector}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def get_bounding_box(self, sessionId: str, selector: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "getBoundingBox", {"sessionId": sessionId, "selector": selector}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def click_bounding_box(self, sessionId: str, selector: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "clickBoundingBox", {"sessionId": sessionId, "selector": selector}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def upload_file(
         self, sessionId: str, selector: str, filename: str, base64data: str
     ) -> Dict[str, Any]:
@@ -116,6 +148,7 @@ class MCPTools:
             },
         ).get("structuredContent", {})
 
+    @_ensure_client
     def wait_for_selector(
         self, sessionId: str, selector: str, timeoutMs: Optional[int] = None
     ) -> Dict[str, Any]:
@@ -130,7 +163,7 @@ class MCPTools:
     # ======================================================
     # TAB MANAGEMENT
     # ======================================================
-
+    @_ensure_client
     def new_tab(
         self, sessionId: str, url: Optional[str] = "about:blank"
     ) -> Dict[str, Any]:
@@ -138,6 +171,7 @@ class MCPTools:
             "newTab", {"sessionId": sessionId, "url": url}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def switch_tab(self, sessionId: str, targetId: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "switchTab", {"sessionId": sessionId, "targetId": targetId}
@@ -146,27 +180,31 @@ class MCPTools:
     # ======================================================
     # ADVANCED ACTIONS
     # ======================================================
-
+    @_ensure_client
     def click_to_text(self, sessionId: str, text: str) -> dict:
         return self.client.call_tool(
             "clickToText", {"sessionId": sessionId, "text": text}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def find_element_xpath(self, sessionId: str, xpath: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "findElementByXPath", {"sessionId": sessionId, "xpath": xpath}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def find_element_by_text(self, sessionId: str, text: str) -> Dict[str, Any]:
         return self.client.call_tool(
             "findElementByText", {"sessionId": sessionId, "text": text}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def click_by_node_id(self, sessionId: str, nodeId: int) -> Dict[str, Any]:
         return self.client.call_tool(
             "clickByNodeId", {"sessionId": sessionId, "nodeId": nodeId}
         ).get("structuredContent", {})
 
+    @_ensure_client
     def import_cookies(self, sessionId: str, cookies: dict) -> Dict[str, Any]:
         return self.client.call_tool(
             "importCookies", {"sessionId": sessionId, "cookies": cookies}

{kl_mcp_client-1.0.3 → kl_mcp_client-1.0.4}/kl_mcp_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kl-mcp-client
-Version: 1.0.3
+Version: 1.0.4
 Summary: MCP Client
 Author-email: Kyle <hngan.it@gmail.com>
 License: MIT

{kl_mcp_client-1.0.3 → kl_mcp_client-1.0.4}/pyproject.toml

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