libentry 1.23.1__py3-none-any.whl → 1.23.3__py3-none-any.whl

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/schema.py

@@ -152,7 +152,8 @@ def _parse_dict(context: ParseContext) -> Optional[str]:
             key_type = "str"
             value_type = parse_type(dict_args[1], context.schemas)
             if isinstance(value_type, list):
-                raise TypeError("\"Union\" cannot be used as the type of dict elements.")
+                value_type = "|".join(value_type)
+                # raise TypeError("\"Union\" cannot be used as the type of dict elements.")
             return f"Dict[{key_type},{value_type}]"
         else:
             return "Dict"
@@ -168,7 +169,8 @@ def _parse_list(context: ParseContext) -> Optional[str]:
                 raise TypeError("Only ONE type can be used as the type of list elements.")
             elem_type = parse_type(list_args[0], context.schemas)
             if isinstance(elem_type, list):
-                raise TypeError("\"Union\" cannot be used as the type of list elements.")
+                elem_type = "|".join(elem_type)
+                # raise TypeError("\"Union\" cannot be used as the type of list elements.")
             return f"List[{elem_type}]"
         else:
             return "List"

{libentry-1.23.1.dist-info → libentry-1.23.3.dist-info}/METADATA

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

{libentry-1.23.1.dist-info → libentry-1.23.3.dist-info}/RECORD

@@ -6,12 +6,12 @@ libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
 libentry/experiment.py,sha256=ejgAHDXWIe9x4haUzIFuz1WasLY0_aD1z_vyEVGjTu8,4922
 libentry/json.py,sha256=CubUUu29h7idLaC4d66vKhjBgVHKN1rZOv-Tw2qM17k,1916
 libentry/logging.py,sha256=IiYoCUzm8XTK1fduA-NA0FI2Qz_m81NEPV3d3tEfgdI,1349
-libentry/schema.py,sha256=jf_rNe-1VRd4TxcZH-M9TmMJYZTHgfqWggpUCq8bNUU,10337
+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/client.py,sha256=tEJbMpXiMKQ0qDgLGyavE2A4jpoXliqbrVj_TMfOGXI,22488
 libentry/mcp/service.py,sha256=KDpEUhHuyVXjc_J5Z9_aciJbTcEy9dYA44rpdgAAwGE,32322
 libentry/mcp/types.py,sha256=xTQCnKAgeJNss4klJ33MrWHGCzG_LeR3urizO_Z9q9U,12239
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
@@ -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.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.23.1.dist-info/METADATA,sha256=HUq8bgDgb7i2Dm9zNcXAzYE-0cpzwYbDCNUnkHEHsks,1135
-libentry-1.23.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.23.1.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.23.1.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.23.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.23.1.dist-info/RECORD,,
+libentry-1.23.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.23.3.dist-info/METADATA,sha256=5AIjlPrO1Q8nWDiCZNN5S4qo8jZCqNXD_twACQuw0T0,1135
+libentry-1.23.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.23.3.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.23.3.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.23.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.23.3.dist-info/RECORD,,