libentry 1.23.2__py3-none-any.whl → 1.23.4__py3-none-any.whl

libentry/mcp/api.py

@@ -19,6 +19,12 @@ from pydantic import BaseModel, ConfigDict
 
 API_INFO_FIELD = "__api_info__"
 
+TAG_SUBROUTINE = "subroutine"
+TAG_JSONRPC = "jsonrpc"
+TAG_ENDPOINT = "endpoint"
+TAG_TOOL = "tool"
+TAG_RESOURCE = "resource"
+
 
 class APIInfo(BaseModel):
     path: str
@@ -69,7 +75,7 @@ def tool(path=None, name=None, description=None, **kwargs):
         methods=["POST"],
         name=name,
         description=description,
-        tag="tool",
+        tag=TAG_TOOL,
         **kwargs
     )
 
@@ -80,7 +86,7 @@ def resource(uri, name=None, description=None, mime_type=None, size=None, **kwar
         methods=["POST"],
         name=name,
         description=description,
-        tag="resource",
+        tag=TAG_RESOURCE,
         mimeType=mime_type,
         size=size,
         uri=uri,

libentry/mcp/client.py

@@ -244,6 +244,9 @@ class MCPMixIn(JSONRPCMixIn, abc.ABC):
 
         return InitializeResult.model_validate(result)
 
+    def ping(self):
+        return self.call("ping")
+
     def list_tools(self) -> ListToolsResult:
         result = self.call("tools/list")
         return ListToolsResult.model_validate(result)
@@ -530,51 +533,83 @@ class APIClient(SubroutineMixIn, MCPMixIn):
 
 class SSESession(MCPMixIn):
 
-    def __init__(self, client: APIClient, sse_endpoint: str):
+    def __init__(self, client: APIClient, sse_endpoint: str, sse_timeout: int = 6):
         self.client = client
         self.sse_endpoint = sse_endpoint
-
-        self.sse_thread = Thread(target=self._sse_loop, daemon=True)
-        self.sse_thread.start()
+        self.sse_timeout = sse_timeout
 
         self.lock = Semaphore(0)
         self.endpoint = None
         self.pendings = {}
+        self.closed = False
+
+        self.ping_thread = Thread(target=self._ping_loop, daemon=False)
+        self.ping_thread.start()
+
+        self.sse_thread = Thread(target=self._sse_loop, daemon=False)
+        self.sse_thread.start()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()
+
+    def close(self):
+        with self.lock:
+            self.closed = True
+
+    def _ping_loop(self):
+        interval = max(self.sse_timeout / 2, 0.5)
+        while True:
+            with self.lock:
+                if self.closed:
+                    break
+            sleep(interval)
+            self.ping()
 
     def _sse_loop(self):
         request = HTTPRequest(
             path=self.sse_endpoint,
             options=HTTPOptions(
                 method="GET",
-                timeout=60
+                timeout=self.sse_timeout
             )
         )
         response = self.client.http_request(request)
         assert response.stream
         type_adapter = TypeAdapter(Union[JSONRPCRequest, JSONRPCResponse, JSONRPCNotification])
-        for sse in response.content:
-            assert isinstance(sse, SSE)
-            if sse.event == "endpoint":
-                self.endpoint = sse.data
-                self.lock.release()
-            elif sse.event == "message":
-                json_obj = json.loads(sse.data)
-                obj = type_adapter.validate_python(json_obj)
-                if isinstance(obj, JSONRPCRequest):
-                    self._on_request(obj)
-                elif isinstance(obj, JSONRPCNotification):
-                    self._on_notification(obj)
-                elif isinstance(obj, JSONRPCResponse):
-                    self._on_response(obj)
+        try:
+            for sse in response.content:
+                assert isinstance(sse, SSE)
+                if sse.event == "endpoint":
+                    self.endpoint = sse.data
+                    self.lock.release()
+                elif sse.event == "message":
+                    json_obj = json.loads(sse.data)
+                    obj = type_adapter.validate_python(json_obj)
+                    if isinstance(obj, JSONRPCRequest):
+                        self._on_request(obj)
+                    elif isinstance(obj, JSONRPCNotification):
+                        self._on_notification(obj)
+                    elif isinstance(obj, JSONRPCResponse):
+                        self._on_response(obj)
+                    else:
+                        pass
                 else:
-                    pass
-            else:
-                raise RuntimeError(f"Unknown event {sse.event}.")
+                    raise RuntimeError(f"Unknown event {sse.event}.")
+                with self.lock:
+                    if self.closed:
+                        break
+        except httpx.Timeout:
+            pass
 
     def _on_request(self, request: JSONRPCRequest):
+        print(request)
         pass
 
     def _on_notification(self, notification: JSONRPCNotification):
+        print(notification)
         pass
 
     def _on_response(self, response: JSONRPCResponse):

libentry/mcp/service.py

@@ -233,18 +233,18 @@ class FlaskHandler:
 
         self.subroutine_adapter = SubroutineAdapter(fn, self.api_signature)
         self.jsonrpc_adapter = JSONRPCAdapter(fn, self.api_signature)
-        self.default_adapter = self.subroutine_adapter
 
+        adapter_mapping = {
+            api.TAG_ENDPOINT: self.fn,
+            "free": self.fn,
+            "schema_free": self.fn,
+            "schema-free": self.fn,
+            api.TAG_JSONRPC: self.jsonrpc_adapter,
+            "rpc": self.jsonrpc_adapter,
+            "mcp": self.jsonrpc_adapter,
+        }
         tag = self.api_info.tag if self.api_info else None
-        if tag is not None:
-            tag = tag.lower()
-            if tag in {"free", "schema_free", "schema-free"}:
-                self.default_adapter = self.fn
-            elif tag in {"jsonrpc", "rpc"}:
-                self.default_adapter = self.jsonrpc_adapter
-
-        # todo: debug info
-        print(f"{api_info.path}: {type(self.default_adapter)}\t{self.api_signature.input_model}")
+        self.default_adapter = adapter_mapping.get(tag, self.subroutine_adapter)
 
     def __call__(self):
         args = flask_request.args
@@ -369,7 +369,7 @@ class SSEService:
         self.sse_dict = {}
 
     # noinspection PyUnusedLocal
-    @api.get("/sse", tag="schema_free")
+    @api.get("/sse", tag=api.TAG_ENDPOINT)
     def sse(self, raw_request: Dict[str, Any]) -> Iterable[SSE]:
         session_id = str(uuid.uuid4())
         queue = Queue(8)
@@ -395,7 +395,7 @@ class SSEService:
 
         return _stream()
 
-    @api.route("/sse/message", tag="schema_free")
+    @api.route("/sse/message", tag=api.TAG_ENDPOINT)
     def sse_message(self, raw_request: Dict[str, Any]) -> None:
         ################################################################################
         # session validation
@@ -471,7 +471,7 @@ class JSONRPCService:
 
         self.type_adapter = TypeAdapter(Union[JSONRPCRequest, JSONRPCNotification])
 
-    @api.route(tag="schema_free")
+    @api.route(tag=api.TAG_ENDPOINT)
     def message(self, raw_request: Dict[str, Any]) -> Union[JSONRPCResponse, Iterable[JSONRPCResponse], None]:
         request = self.type_adapter.validate_python(raw_request)
         path = f"/{request.method}"
@@ -521,7 +521,7 @@ class ToolsService:
             self._tool_routes = {}
             for route in self.service_routes.values():
                 api_info = route.api_info
-                if api_info.tag != "tool":
+                if api_info.tag != api.TAG_TOOL:
                     continue
                 self._tool_routes[api_info.name] = route
         return self._tool_routes
@@ -636,7 +636,7 @@ class ResourcesService:
             self._resource_routes = {}
             for route in self.service_routes.values():
                 api_info = route.api_info
-                if api_info.tag != "resource":
+                if api_info.tag != api.TAG_RESOURCE:
                     continue
                 uri = api_info.model_extra.get("uri", api_info.path)
                 self._resource_routes[uri] = route
@@ -771,10 +771,15 @@ class FlaskServer(Flask):
                 logger.error(f"Async function \"{fn.__name__}\" is not supported.")
                 continue
 
-            logger.info(f"Serving {path} as {', '.join(methods)}.")
-
             handler = FlaskHandler(fn, api_info, self)
             routes[path] = Route(api_info=api_info, fn=fn, handler=handler)
+
+            mode = api.TAG_ENDPOINT
+            if isinstance(handler.default_adapter, SubroutineAdapter):
+                mode = api.TAG_SUBROUTINE
+            elif isinstance(handler.default_adapter, JSONRPCAdapter):
+                mode = api.TAG_JSONRPC
+            logger.info(f"{mode.capitalize()}:\tmethod={'|'.join(methods)}\tpath={path}")
         return routes
 
     def ok(self, body: Union[str, Iterable[str], None], mimetype: str):

{libentry-1.23.2.dist-info → libentry-1.23.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: libentry
-Version: 1.23.2
+Version: 1.23.4
 Summary: Entries for experimental utilities.
 Home-page: https://github.com/XoriieInpottn/libentry
 Author: xi

{libentry-1.23.2.dist-info → libentry-1.23.4.dist-info}/RECORD

@@ -10,9 +10,9 @@ libentry/schema.py,sha256=40SOhCF_eytWOF47MWKCRHKHl_lCaQVetx1Af62PkiI,10439
 libentry/test_api.py,sha256=Xw7B7sH6g1iCTV5sFzyBF3JAJzeOr9xg0AyezTNsnIk,4452
 libentry/utils.py,sha256=O7P6GadtUIjq0N2IZH7PhHZDUM3NebzcqyDqytet7CM,683
 libentry/mcp/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
-libentry/mcp/api.py,sha256=uoGBYCesMj6umlJpRulKZNS3trm9oG3LUSg1otPDS_8,2362
-libentry/mcp/client.py,sha256=lM_bTF40pbdYdBrMmoOqUDRzlNgjqEKh5d4IVkpI6D8,21512
-libentry/mcp/service.py,sha256=KDpEUhHuyVXjc_J5Z9_aciJbTcEy9dYA44rpdgAAwGE,32322
+libentry/mcp/api.py,sha256=KSvz6_TNGKQQoFJPNH1XIc8CMji0I2_CqC9VCSOPRfc,2491
+libentry/mcp/client.py,sha256=tEJbMpXiMKQ0qDgLGyavE2A4jpoXliqbrVj_TMfOGXI,22488
+libentry/mcp/service.py,sha256=xInlf_u8AVlGtnWH6gky_l3IolmYahm-FYMqsbm6t3w,32563
 libentry/mcp/types.py,sha256=xTQCnKAgeJNss4klJ33MrWHGCzG_LeR3urizO_Z9q9U,12239
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/service/common.py,sha256=OVaW2afgKA6YqstJmtnprBCqQEUZEWotZ6tHavmJJeU,42
@@ -21,10 +21,10 @@ libentry/service/list.py,sha256=ElHWhTgShGOhaxMUEwVbMXos0NQKjHsODboiQ-3AMwE,1397
 libentry/service/running.py,sha256=FrPJoJX6wYxcHIysoatAxhW3LajCCm0Gx6l7__6sULQ,5105
 libentry/service/start.py,sha256=mZT7b9rVULvzy9GTZwxWnciCHgv9dbGN2JbxM60OMn4,1270
 libentry/service/stop.py,sha256=wOpwZgrEJ7QirntfvibGq-XsTC6b3ELhzRW2zezh-0s,1187
-libentry-1.23.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.23.2.dist-info/METADATA,sha256=8Gc8UbjbMnPJn_EUsJoYzJRHOCOxVWcLVPGvi_wwKSs,1135
-libentry-1.23.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.23.2.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.23.2.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.23.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.23.2.dist-info/RECORD,,
+libentry-1.23.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.23.4.dist-info/METADATA,sha256=-gzj-ialfjOVVPyc_tv-Jj1qH7LlrauZnossj2nOFX4,1135
+libentry-1.23.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.23.4.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.23.4.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.23.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.23.4.dist-info/RECORD,,