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

libentry/mcp/client.py

@@ -144,11 +144,16 @@ class SubroutineMixIn(abc.ABC):
 
     @staticmethod
     def _iter_results_from_subroutine(responses: Iterable[SubroutineResponse]) -> Iterable[JSONType]:
+        full_result = None
         for response in responses:
             if response.error is None:
-                yield response.result
+                if response.chunk:
+                    yield response.result
+                else:
+                    full_result = response.result
             else:
                 raise ServiceError.from_subroutine_error(response.error)
+        return full_result
 
     def get(
             self,

libentry/mcp/service.py

@@ -10,7 +10,7 @@ from dataclasses import dataclass
 from queue import Empty, Queue
 from threading import Lock
 from types import GeneratorType
-from typing import Any, Callable, Dict, Generator, Iterable, List, Literal, Optional, Tuple, Type, Union
+from typing import Any, Callable, Dict, Generator, Iterable, List, Literal, Optional, Tuple, Union
 
 from flask import Flask, request as flask_request
 from pydantic import BaseModel, Field, TypeAdapter
@@ -98,24 +98,26 @@ class SubroutineAdapter:
     @staticmethod
     def _iter_response(
             results: Iterable[Any]
-    ) -> Generator[SubroutineResponse, None, Optional[SubroutineResponse]]:
+    ) -> Iterable[SubroutineResponse]:
         it = iter(results)
         while True:
             try:
                 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
-        return final_result
 
 
 class JSONRPCAdapter:
@@ -891,19 +893,41 @@ class GunicornApplication(BaseApplication):
 
     def load(self):
         logger.info("Initializing the service.")
-        if isinstance(self.service_type, type) or callable(self.service_type):
-            service = self.service_type(self.service_config) if self.service_config else self.service_type()
-        elif self.service_config is None:
+        if isinstance(self.service_type, (List, Tuple)):
+            if isinstance(self.service_config, (List, Tuple)) and len(self.service_config) == len(self.service_type):
+                service = [
+                    self._create_service(t, c)
+                    for t, c in zip(self.service_type, self.service_config)
+                ]
+            elif self.service_config is None:
+                service = [
+                    self._create_service(t, self.service_config)
+                    for t in self.service_type
+                ]
+            else:
+                raise RuntimeError(
+                    f"You are going to run {len(self.service_type)} services. "
+                    "In the multiple service mode, every `service_type` requires a `service_config` object."
+                )
+        else:
+            service = self._create_service(self.service_type, self.service_config)
+        logger.info("Service initialized.")
+
+        return FlaskServer(service)
+
+    @staticmethod
+    def _create_service(service_type, service_config):
+        if isinstance(service_type, type) or callable(service_type):
+            service = service_type(service_config) if service_config else service_type()
+        elif service_config is None:
             logger.warning(
                 "Be careful! It is not recommended to start the server from a service instance. "
                 "Use service_type and service_config instead."
             )
-            service = self.service_type
+            service = service_type
         else:
-            raise TypeError(f"Invalid service type \"{type(self.service_type)}\".")
-        logger.info("Service initialized.")
-
-        return FlaskServer(service)
+            raise TypeError(f"Invalid service type \"{type(service_type)}\".")
+        return service
 
 
 class RunServiceConfig(BaseModel):
@@ -969,7 +993,7 @@ class RunServiceConfig(BaseModel):
 
 
 def run_service(
-        service_type: Union[Type, Callable],
+        service_type: Union[Union[type, Callable], List, Tuple],
         service_config=None,
         run_config: Optional[RunServiceConfig] = None,
         *,

libentry/mcp/types.py

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

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

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

{libentry-1.26.dist-info → libentry-1.28.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=qFbigNIOJvEf8ZICN2K8nnmVcITIzDhJgaw3c0P-WXM,23078
-libentry/mcp/service.py,sha256=PpdQBxqKPiZ2tpnsqDYiC29_yjMjK9J3VWynn4uvpVg,38109
-libentry/mcp/types.py,sha256=aAoVO4jjqEvDzNneuZapmRYonLLnGsbcLoypVyRNNYg,12389
+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/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.26.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.26.dist-info/METADATA,sha256=FhTlnziZK-JqX2iRA3i4p0Oz9cQviwQV1dwmhz6Cxs0,1133
-libentry-1.26.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.26.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.26.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.26.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.26.dist-info/RECORD,,
+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,,