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

libentry/argparse.py

@@ -21,6 +21,7 @@ from typing import Dict, List, Optional, Sequence, Type, Union, get_args, get_or
 
 import yaml
 from pydantic import BaseModel
+from pydantic_core import PydanticUndefined
 
 
 def literal_eval(exp):
@@ -213,6 +214,10 @@ class ArgumentParser(argparse.ArgumentParser):
             else:
                 if not isinstance(value, DefaultValue):
                     merged_flat_dict[name] = value
+        merged_flat_dict = {
+            k: v for k, v in merged_flat_dict.items()
+            if v is not None and v is not PydanticUndefined
+        }
 
         merged_json = {}
         self._json_unflatten(merged_flat_dict, merged_json)

libentry/mcp/client.py

@@ -8,7 +8,7 @@ from queue import Queue
 from threading import Semaphore, Thread
 from time import sleep
 from types import GeneratorType
-from typing import Any, Dict, Iterable, List, Optional, Tuple, Type, Union
+from typing import Any, Dict, Generator, Iterable, List, Optional, Tuple, Type, Union
 from urllib.parse import urlencode
 
 import httpx
@@ -248,7 +248,6 @@ class JSONRPCMixIn(abc.ABC):
                 raise ServiceError.from_jsonrpc_error(chunk.error)
 
 
-
 class MCPMixIn(JSONRPCMixIn, abc.ABC):
 
     def initialize(self) -> InitializeResult:
@@ -282,10 +281,18 @@ class MCPMixIn(JSONRPCMixIn, abc.ABC):
         if not isinstance(result, GeneratorType):
             return CallToolResult.model_validate(result)
         else:
-            return (
-                CallToolResult.model_validate(item)
-                for item in result
-            )
+            def gen() -> Generator[CallToolResult, None, Optional[CallToolResult]]:
+                it = iter(result)
+                try:
+                    while True:
+                        item = next(it)
+                        yield CallToolResult.model_validate(item)
+                except StopIteration as e:
+                    item = e.value
+                    if item is not None:
+                        return CallToolResult.model_validate(item)
+
+            return gen()
 
     def list_resources(self) -> ListResourcesResult:
         result = self.call("resources/list")
@@ -297,10 +304,18 @@ class MCPMixIn(JSONRPCMixIn, abc.ABC):
         if not isinstance(result, GeneratorType):
             return ReadResourceResult.model_validate(result)
         else:
-            return (
-                ReadResourceResult.model_validate(item)
-                for item in result
-            )
+            def gen() -> Generator[ReadResourceResult, None, Optional[ReadResourceResult]]:
+                it = iter(result)
+                try:
+                    while True:
+                        item = next(it)
+                        yield ReadResourceResult.model_validate(item)
+                except StopIteration as e:
+                    item = e.value
+                    if item is not None:
+                        return ReadResourceResult.model_validate(item)
+
+            return gen()
 
 
 class APIClient(SubroutineMixIn, MCPMixIn):

libentry/mcp/service.py

@@ -4,7 +4,6 @@ __author__ = "xi"
 
 import asyncio
 import base64
-import io
 import uuid
 from dataclasses import dataclass
 from queue import Empty, Queue
@@ -98,7 +97,7 @@ class SubroutineAdapter:
     @staticmethod
     def _iter_response(
             results: Iterable[Any]
-    ) -> Iterable[SubroutineResponse]:
+    ) -> Generator[SubroutineResponse, None, Optional[SubroutineResponse]]:
         it = iter(results)
         try:
             while True:
@@ -113,6 +112,7 @@ class SubroutineAdapter:
             return result
         except Exception as e:
             yield SubroutineResponse(error=SubroutineError.from_exception(e))
+        return None
 
 
 class JSONRPCAdapter:
@@ -669,18 +669,17 @@ class ToolsService:
     @staticmethod
     def _iter_tool_results(
             responses: Iterable[SubroutineResponse]
-    ) -> Generator[CallToolResult, None, CallToolResult]:
-        final_text = io.StringIO()
-        error = None
+    ) -> Generator[CallToolResult, None, Optional[CallToolResult]]:
         try:
-            for response in responses:
+            it = iter(responses)
+            while True:
+                response = next(it)
                 if response.error is not None:
                     text = json.dumps(response.error)
-                    error = CallToolResult(
+                    yield CallToolResult(
                         content=[TextContent(text=text)],
                         isError=True
                     )
-                    yield error
                     break
                 else:
                     result = response.result
@@ -689,7 +688,22 @@ class ToolsService:
                         content=[TextContent(text=text)],
                         isError=False
                     )
-                    final_text.write(text)
+        except StopIteration as e:
+            response = e.value
+            if response is not None:
+                if response.error is not None:
+                    text = json.dumps(response.error)
+                    return CallToolResult(
+                        content=[TextContent(text=text)],
+                        isError=True
+                    )
+                else:
+                    result = response.result
+                    text = json.dumps(result) if isinstance(result, (Dict, BaseModel)) else str(result)
+                    return CallToolResult(
+                        content=[TextContent(text=text)],
+                        isError=False
+                    )
         except Exception as e:
             text = json.dumps(SubroutineError.from_exception(e))
             error = CallToolResult(
@@ -697,14 +711,7 @@ class ToolsService:
                 isError=True
             )
             yield error
-
-        if error is None:
-            return CallToolResult(
-                content=[TextContent(text=final_text.getvalue())],
-                isError=False
-            )
-        else:
-            return error
+        return None
 
 
 class ResourcesService:
@@ -778,6 +785,7 @@ class ResourcesService:
             uri: str,
             mime_type: Optional[str] = None
     ) -> Generator[ReadResourceResult, None, Optional[ReadResourceResult]]:
+        # todo: returned content need to be processed
         for content in contents:
             if isinstance(content, str):
                 yield ReadResourceResult(contents=[TextResourceContents(

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

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

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

@@ -1,6 +1,6 @@
 libentry/__init__.py,sha256=ko2YBIIx5H3dD0tedBkialzJGEDczFaP_PZmT1cIlak,148
 libentry/api.py,sha256=UkXdBv9oqQhaSESRReLWEPj8venBUoCBppIg-FAXqKA,24146
-libentry/argparse.py,sha256=0_0_EJzLEgE8UFD8fEWCddGnDW1qxyMYMvcD3cuChvY,8882
+libentry/argparse.py,sha256=ti-eJ-lM0m671rqji3gGGDlF1CSluMADIB-_J2v4c6c,9079
 libentry/dataclasses.py,sha256=AQV2PuxplJCwGZ5HKX72U-z-POUhTdy3XtpEK9KNIGQ,4541
 libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
 libentry/experiment.py,sha256=ejgAHDXWIe9x4haUzIFuz1WasLY0_aD1z_vyEVGjTu8,4922
@@ -12,8 +12,8 @@ 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=u9u-hVwcHQLc9o-_CJumz2vtIDf-ZgQcgDTD5xSmZPA,24143
-libentry/mcp/service.py,sha256=RQ658-Ci69Z_h5d4Y43NN1BeykC8mjRpYbOPOGFxzlc,39736
+libentry/mcp/client.py,sha256=_O-O6OETwHidhiFmg7P01NIrVhHgEetwFeFfJNqRt6M,24899
+libentry/mcp/service.py,sha256=Zl031pZS-4wJjp0YG6825iDgcKNev8RdOANkWwO7WkU,40272
 libentry/mcp/types.py,sha256=aAoVO4jjqEvDzNneuZapmRYonLLnGsbcLoypVyRNNYg,12389
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/service/common.py,sha256=OVaW2afgKA6YqstJmtnprBCqQEUZEWotZ6tHavmJJeU,42
@@ -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.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,,
+libentry-1.28.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.28.3.dist-info/METADATA,sha256=5F5-FDkDPfYZ9KkWHvX2G3xXmYZoqc6HK_Mz4sJe_5I,1135
+libentry-1.28.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.28.3.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.28.3.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.28.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.28.3.dist-info/RECORD,,