libentry 1.28__py3-none-any.whl → 1.28.2__py3-none-any.whl

libentry/mcp/client.py

@@ -143,17 +143,23 @@ class SubroutineMixIn(abc.ABC):
             return self._iter_results_from_subroutine(response)
 
     @staticmethod
-    def _iter_results_from_subroutine(responses: Iterable[SubroutineResponse]) -> Iterable[JSONType]:
-        full_result = None
-        for response in responses:
-            if response.error is None:
-                if response.chunk:
-                    yield response.result
+    def _iter_results_from_subroutine(response: Iterable[SubroutineResponse]) -> Iterable[JSONType]:
+        it = iter(response)
+        try:
+            while True:
+                chunk = next(it)
+                if chunk.error is None:
+                    yield chunk.result
                 else:
-                    full_result = response.result
+                    raise ServiceError.from_subroutine_error(chunk.error)
+        except StopIteration as e:
+            chunk = e.value
+            if chunk is None:
+                return None
+            elif chunk.error is None:
+                return chunk.result
             else:
-                raise ServiceError.from_subroutine_error(response.error)
-        return full_result
+                raise ServiceError.from_subroutine_error(chunk.error)
 
     def get(
             self,
@@ -223,12 +229,24 @@ class JSONRPCMixIn(abc.ABC):
             return self._iter_results_from_jsonrpc(response)
 
     @staticmethod
-    def _iter_results_from_jsonrpc(responses: Iterable[JSONRPCResponse]) -> Iterable[JSONType]:
-        for response in responses:
-            if response.error is None:
-                yield response.result
+    def _iter_results_from_jsonrpc(response: Iterable[JSONRPCResponse]) -> Iterable[JSONType]:
+        it = iter(response)
+        try:
+            while True:
+                chunk = next(it)
+                if chunk.error is None:
+                    yield chunk.result
+                else:
+                    raise ServiceError.from_jsonrpc_error(chunk.error)
+        except StopIteration as e:
+            chunk = e.value
+            if chunk is None:
+                return None
+            elif chunk.error is None:
+                return chunk.result
             else:
-                raise ServiceError.from_jsonrpc_error(response.error)
+                raise ServiceError.from_jsonrpc_error(chunk.error)
+
 
 
 class MCPMixIn(JSONRPCMixIn, abc.ABC):
@@ -492,14 +510,16 @@ class APIClient(SubroutineMixIn, MCPMixIn):
 
     @staticmethod
     def _iter_subroutine_responses(response: HTTPResponse) -> Iterable[SubroutineResponse]:
+        return_response = None
         for sse in response.content:
             assert isinstance(sse, SSE)
-            if sse.event != "message":
-                continue
-            if not sse.data:
-                continue
-            json_obj = json.loads(sse.data)
-            yield SubroutineResponse.model_validate(json_obj)
+            if sse.event == "message" and sse.data:
+                json_obj = json.loads(sse.data)
+                yield SubroutineResponse.model_validate(json_obj)
+            elif sse.event == "return" and sse.data:
+                json_obj = json.loads(sse.data)
+                return_response = SubroutineResponse.model_validate(json_obj)
+        return return_response
 
     def jsonrpc_request(
             self,
@@ -520,14 +540,16 @@ class APIClient(SubroutineMixIn, MCPMixIn):
 
     @staticmethod
     def _iter_jsonrpc_responses(response: HTTPResponse) -> Iterable[JSONRPCResponse]:
+        return_response = None
         for sse in response.content:
             assert isinstance(sse, SSE)
-            if sse.event != "message":
-                continue
-            if not sse.data:
-                continue
-            json_obj = json.loads(sse.data)
-            yield JSONRPCResponse.model_validate(json_obj)
+            if sse.event == "message" and sse.data:
+                json_obj = json.loads(sse.data)
+                yield JSONRPCResponse.model_validate(json_obj)
+            elif sse.event == "return" and sse.data:
+                json_obj = json.loads(sse.data)
+                return_response = JSONRPCResponse.model_validate(json_obj)
+        return return_response
 
     def jsonrpc_notify(
             self,

libentry/mcp/service.py

@@ -100,24 +100,19 @@ class SubroutineAdapter:
             results: Iterable[Any]
     ) -> Iterable[SubroutineResponse]:
         it = iter(results)
-        while True:
-            try:
+        try:
+            while True:
                 result = next(it)
                 if not isinstance(result, SubroutineResponse):
                     result = SubroutineResponse(result=result)
-                result.chunk = True
                 yield result
-            except StopIteration as e:
-                final_result = e.value
-                if not isinstance(final_result, SubroutineResponse):
-                    final_result = SubroutineResponse(result=final_result)
-                final_result.chunk = False
-                yield final_result
-                break
-            except Exception as e:
-                final_result = SubroutineResponse(error=SubroutineError.from_exception(e))
-                yield final_result
-                break
+        except StopIteration as e:
+            result = e.value
+            if not isinstance(result, SubroutineResponse):
+                result = SubroutineResponse(result=result)
+            return result
+        except Exception as e:
+            yield SubroutineResponse(error=SubroutineError.from_exception(e))
 
 
 class JSONRPCAdapter:
@@ -341,15 +336,36 @@ class FlaskHandler:
             )
 
     def _iter_sse_stream(self, events: Iterable[Union[SSE, Dict[str, Any]]]) -> Iterable[str]:
-        for item in events:
-            if isinstance(item, SSE):
-                event = item.event
-                data = item.data
-            else:
-                event = "message"
-                data = item
+        it = iter(events)
+        try:
+            while True:
+                item = next(it)
+                if isinstance(item, SSE):
+                    event = item.event
+                    data = item.data
+                else:
+                    event = "message"
+                    data = item
+                yield "event:"
+                yield event
+                if data is not None:
+                    yield "\n"
+                    yield "data:"
+                    if isinstance(data, BaseModel):
+                        # BaseModel
+                        yield json.dumps(data.model_dump(exclude_none=True))
+                    elif isinstance(data, (Dict, List)):
+                        # JSON Object and Array
+                        yield json.dumps(data)
+                    else:
+                        # Plain text
+                        yield str(data)
+                yield "\n\n"
+        except StopIteration as e:
+            item = e.value
+            data = item.data if isinstance(item, SSE) else item
             yield "event:"
-            yield event
+            yield "return"
             if data is not None:
                 yield "\n"
                 yield "data:"

libentry/mcp/types.py

@@ -48,7 +48,6 @@ class SubroutineError(BaseModel):
 class SubroutineResponse(BaseModel):
     result: Optional[Any] = None
     error: Optional[SubroutineError] = None
-    chunk: bool = False
 
 
 class HTTPOptions(BaseModel):

{libentry-1.28.dist-info → libentry-1.28.2.dist-info}/METADATA

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

{libentry-1.28.dist-info → libentry-1.28.2.dist-info}/RECORD

@@ -12,9 +12,9 @@ libentry/test_api.py,sha256=bs7P8gveLtuUvHxrpujSrfuYqLVJ3fOXVg_MZnZxoJ4,4504
 libentry/utils.py,sha256=vCm6UyAlibnPOlPJHZO57u3TXhw5PZmGM5_vBAPUnB4,1981
 libentry/mcp/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/mcp/api.py,sha256=GDErVCz_hh_ZeMxLS8bTPyBUhCTHw3Mm-nGFMV2W2yo,3669
-libentry/mcp/client.py,sha256=OzAgM-hZ5t24A7MC-i_FkchxQaYM17T6E6M0jPuZJwk,23243
-libentry/mcp/service.py,sha256=cE6K6RVDQ9Jc4pxcJUWOr5zWJMpSvROL54cq8vbJWHE,39130
-libentry/mcp/types.py,sha256=P4lnwDCdETTzfoD7u1XMqx9ZKN4mXl0KSEMk4e_o_k0,12413
+libentry/mcp/client.py,sha256=u9u-hVwcHQLc9o-_CJumz2vtIDf-ZgQcgDTD5xSmZPA,24143
+libentry/mcp/service.py,sha256=RQ658-Ci69Z_h5d4Y43NN1BeykC8mjRpYbOPOGFxzlc,39736
+libentry/mcp/types.py,sha256=aAoVO4jjqEvDzNneuZapmRYonLLnGsbcLoypVyRNNYg,12389
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/service/common.py,sha256=OVaW2afgKA6YqstJmtnprBCqQEUZEWotZ6tHavmJJeU,42
 libentry/service/flask.py,sha256=2egCFFhRAfLpmSyibgaJ-3oexI-j27P1bmaPEn-hSlc,13817
@@ -22,10 +22,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.28.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.28.dist-info/METADATA,sha256=NmtlVZk1U8IW_q8pw22_e6UF3UvAhgIhFLyzF3i1BRU,1133
-libentry-1.28.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.28.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.28.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.28.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.28.dist-info/RECORD,,
+libentry-1.28.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.28.2.dist-info/METADATA,sha256=uM20K0CHXqJCStF-O5_s5lLE_7rptJDY0gdt4NvATCA,1135
+libentry-1.28.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.28.2.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.28.2.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.28.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.28.2.dist-info/RECORD,,