libentry 1.24.7__py3-none-any.whl → 1.24.9__py3-none-any.whl

libentry/argparse.py

@@ -14,9 +14,10 @@ __all__ = [
 
 import argparse
 import ast
+import json
 import re
 from dataclasses import fields, is_dataclass
-from typing import Optional, Sequence, Type, Union, get_args, get_origin
+from typing import Dict, List, Optional, Sequence, Type, Union, get_args, get_origin
 
 import yaml
 from pydantic import BaseModel
@@ -158,12 +159,29 @@ class ArgumentParser(argparse.ArgumentParser):
                     instance=default_value
                 )
             else:
+                desc = info.description + " " if info.description else ""
+                if info.is_required():
+                    desc += "(required)"
+                else:
+                    if default_value is None:
+                        desc += "(default=None)"
+                    elif isinstance(default_value, (str, int, float, bool)):
+                        desc += f"(default={default_value})"
+                    elif isinstance(default_value, (Dict, List)):
+                        try:
+                            desc += f"(default={json.dumps(default_value)})"
+                        except TypeError:
+                            default_type = type(default_value).__name__
+                            desc += f"(default={default_type} object)"
+                    else:
+                        default_type = type(default_value).__name__
+                        desc += f"(default={default_type} object)"
+
                 self.add_argument(
                     f"--{prefix}.{name}",
                     type=literal_eval,
                     default=DefaultValue(default_value),
-                    # required=info.is_required(),
-                    help=info.description
+                    help=desc
                 )
 
     def parse_args(self, args=None, namespace=None):

libentry/mcp/api.py

@@ -15,7 +15,7 @@ __all__ = [
 
 import re
 from functools import partial
-from typing import Callable, List, Literal, Optional, Tuple, Type, Union
+from typing import Any, Callable, List, Literal, Optional, Tuple, Type, Union
 
 from pydantic import BaseModel, ConfigDict
 
@@ -29,16 +29,28 @@ TAG_RESOURCE = "resource"
 
 
 class HasRequestPath:
+    """The object has a request path.
+    A request path is a snake named string starts with "/".
+    """
+
+    __request_name__ = None
 
     @classmethod
     def get_request_path(cls) -> str:
-        name = cls.__name__
-        if name.endswith("Request"):
-            name = name[:-7]
-        return "/" + cls.camel_to_snake(name)
+        name = cls.__request_name__
+        if name:
+            if name.startswith("/"):
+                return name
+            else:
+                return "/" + name
+        else:
+            name = cls.__name__
+            if name.endswith("Request"):
+                name = name[:-7]
+            return "/" + cls._camel_to_snake(name)
 
     @staticmethod
-    def camel_to_snake(name: str) -> str:
+    def _camel_to_snake(name: str) -> str:
         s1 = re.sub(r"(.)([A-Z][a-z]+)", r"\1_\2", name)
         s2 = re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", s1)
         return s2.lower()
@@ -55,7 +67,7 @@ class APIInfo(BaseModel):
 
 
 def api(
-        path: Optional[Union[str, Type[HasRequestPath], HasRequestPath]] = None,
+        path: Optional[Union[str, Type[HasRequestPath], HasRequestPath, Any]] = None,
         methods: List[Literal["GET", "POST"]] = ("GET", "POST"),
         name: Optional[str] = None,
         description: Optional[str] = None,
@@ -76,6 +88,9 @@ def api(
         else:
             _path = f"/{fn_name}"
 
+        if not isinstance(_path, str):
+            raise TypeError(f"\"path\" should be instance of str or HasRequestPath.")
+
         api_info = APIInfo(
             path=_path,
             methods=methods,

libentry/mcp/client.py

@@ -121,7 +121,7 @@ class SubroutineMixIn(abc.ABC):
     @abc.abstractmethod
     def subroutine_request(
             self,
-            path: Union[str, Type[HasRequestPath], HasRequestPath],
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
             params: Optional[Union[JSONObject, BaseModel]] = None,
             options: Optional[HTTPOptions] = None
     ) -> Union[SubroutineResponse, Iterable[SubroutineResponse]]:
@@ -129,7 +129,7 @@ class SubroutineMixIn(abc.ABC):
 
     def request(
             self,
-            path: Union[str, Type[HasRequestPath], HasRequestPath],
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
             params: Optional[Union[JSONObject, BaseModel]] = None,
             options: Optional[HTTPOptions] = None
     ) -> Union[JSONType, Iterable[JSONType]]:
@@ -152,7 +152,7 @@ class SubroutineMixIn(abc.ABC):
 
     def get(
             self,
-            path: Union[str, Type[HasRequestPath], HasRequestPath],
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
             options: Optional[HTTPOptions] = None
     ) -> Union[JSONType, Iterable[JSONType]]:
         if options is None:
@@ -163,7 +163,7 @@ class SubroutineMixIn(abc.ABC):
 
     def post(
             self,
-            path: Union[str, Type[HasRequestPath], HasRequestPath],
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
             params: Optional[Union[JSONObject, BaseModel]] = None,
             options: Optional[HTTPOptions] = None
     ) -> Union[JSONType, Iterable[JSONType]]:
@@ -461,7 +461,7 @@ class APIClient(SubroutineMixIn, MCPMixIn):
 
     def subroutine_request(
             self,
-            path: Union[str, Type[HasRequestPath], HasRequestPath],
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
             params: Optional[Union[JSONObject, BaseModel]] = None,
             options: Optional[HTTPOptions] = None
     ) -> Union[SubroutineResponse, Iterable[SubroutineResponse]]:

{libentry-1.24.7.dist-info → libentry-1.24.9.dist-info}/METADATA

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

{libentry-1.24.7.dist-info → libentry-1.24.9.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=eEjEeLSWnfQNblOPD8wXotvyM6UsP35_NGcR7NN62pU,7993
+libentry/argparse.py,sha256=0_0_EJzLEgE8UFD8fEWCddGnDW1qxyMYMvcD3cuChvY,8882
 libentry/dataclasses.py,sha256=AQV2PuxplJCwGZ5HKX72U-z-POUhTdy3XtpEK9KNIGQ,4541
 libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
 libentry/experiment.py,sha256=ejgAHDXWIe9x4haUzIFuz1WasLY0_aD1z_vyEVGjTu8,4922
@@ -11,8 +11,8 @@ 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=azt3JPTx1rm1aSNTntmadww54WYIKP9PpbtThek4AbA,3196
-libentry/mcp/client.py,sha256=DSvGnjLjFFDWYW2h8Xb3BDGFC7O7Mn6L9JRhZSjkRWw,23040
+libentry/mcp/api.py,sha256=GDErVCz_hh_ZeMxLS8bTPyBUhCTHw3Mm-nGFMV2W2yo,3669
+libentry/mcp/client.py,sha256=3HmKAsFenPlDk1lfSdXL9GJwfCSU92uQS04zvZGeJfQ,23065
 libentry/mcp/service.py,sha256=qA6I9Mi-eudRYwVGhff1_aAImK424bhASlsWaHP8XNI,34971
 libentry/mcp/types.py,sha256=aAoVO4jjqEvDzNneuZapmRYonLLnGsbcLoypVyRNNYg,12389
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
@@ -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.24.7.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.24.7.dist-info/METADATA,sha256=6XcFae6uLhVP_Ieq-AH7Nzk2Xtu7odj78fHUtXwJ-YY,1135
-libentry-1.24.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.24.7.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.24.7.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.24.7.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.24.7.dist-info/RECORD,,
+libentry-1.24.9.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.24.9.dist-info/METADATA,sha256=LttWBo7s_rfqrsHN336XQWPOMKeHggHufl2q8i4ieos,1135
+libentry-1.24.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.24.9.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.24.9.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.24.9.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.24.9.dist-info/RECORD,,