libentry 1.24.6__py3-none-any.whl → 1.24.8__py3-none-any.whl

libentry/mcp/api.py

@@ -2,6 +2,7 @@
 
 __author__ = "xi"
 __all__ = [
+    "HasRequestPath",
     "APIInfo",
     "api",
     "route",
@@ -12,8 +13,9 @@ __all__ = [
     "list_api_info",
 ]
 
+import re
 from functools import partial
-from typing import Callable, List, Literal, Optional, Tuple
+from typing import Any, Callable, List, Literal, Optional, Tuple, Type, Union
 
 from pydantic import BaseModel, ConfigDict
 
@@ -26,6 +28,34 @@ TAG_TOOL = "tool"
 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.__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:
+        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()
+
+
 class APIInfo(BaseModel):
     path: str
     methods: List[Literal["GET", "POST"]]
@@ -37,7 +67,7 @@ class APIInfo(BaseModel):
 
 
 def api(
-        path: Optional[str] = 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,
@@ -50,8 +80,19 @@ def api(
         fn_name = getattr(fn, "__name__")
         fn_doc = getattr(fn, "__doc__")
 
+        if path:
+            if hasattr(path, "get_request_path"):
+                _path = path.get_request_path()
+            else:
+                _path = path
+        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 or f"/{fn_name}",
+            path=_path,
             methods=methods,
             name=name or fn_name,
             description=description or fn_doc,

libentry/mcp/client.py

@@ -8,19 +8,18 @@ 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, Union
+from typing import Any, Dict, Iterable, List, Optional, Tuple, Type, Union
 from urllib.parse import urlencode, urljoin
 
 import httpx
 from pydantic import BaseModel, TypeAdapter
 
 from libentry import json
+from libentry.mcp.api import HasRequestPath
 from libentry.mcp.types import CallToolRequestParams, CallToolResult, ClientCapabilities, HTTPOptions, HTTPRequest, \
     HTTPResponse, Implementation, InitializeRequestParams, InitializeResult, JSONObject, JSONRPCError, \
-    JSONRPCNotification, \
-    JSONRPCRequest, \
-    JSONRPCResponse, JSONType, ListResourcesResult, ListToolsResult, MIME, ReadResourceRequestParams, \
-    ReadResourceResult, SSE, SubroutineError, SubroutineResponse
+    JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, JSONType, ListResourcesResult, ListToolsResult, MIME, \
+    ReadResourceRequestParams, ReadResourceResult, SSE, SubroutineError, SubroutineResponse
 
 
 class ServiceError(RuntimeError):
@@ -122,16 +121,16 @@ class SubroutineMixIn(abc.ABC):
     @abc.abstractmethod
     def subroutine_request(
             self,
-            path: str,
-            params: Dict[str, Any],
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
+            params: Optional[Union[JSONObject, BaseModel]] = None,
             options: Optional[HTTPOptions] = None
     ) -> Union[SubroutineResponse, Iterable[SubroutineResponse]]:
         raise NotImplementedError()
 
     def request(
             self,
-            path: str,
-            params: Optional[JSONObject] = None,
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
+            params: Optional[Union[JSONObject, BaseModel]] = None,
             options: Optional[HTTPOptions] = None
     ) -> Union[JSONType, Iterable[JSONType]]:
         response = self.subroutine_request(path, params, options)
@@ -153,7 +152,7 @@ class SubroutineMixIn(abc.ABC):
 
     def get(
             self,
-            path: str,
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
             options: Optional[HTTPOptions] = None
     ) -> Union[JSONType, Iterable[JSONType]]:
         if options is None:
@@ -164,8 +163,8 @@ class SubroutineMixIn(abc.ABC):
 
     def post(
             self,
-            path: str,
-            params: Optional[JSONObject] = None,
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
+            params: Optional[Union[JSONObject, BaseModel]] = None,
             options: Optional[HTTPOptions] = None
     ) -> Union[JSONType, Iterable[JSONType]]:
         if options is None:
@@ -462,13 +461,19 @@ class APIClient(SubroutineMixIn, MCPMixIn):
 
     def subroutine_request(
             self,
-            path: str,
-            params: Dict[str, Any],
+            path: Union[str, Type[HasRequestPath], HasRequestPath, Any],
+            params: Optional[Union[JSONObject, BaseModel]] = None,
             options: Optional[HTTPOptions] = None
     ) -> Union[SubroutineResponse, Iterable[SubroutineResponse]]:
+        if isinstance(path, BaseModel):
+            if params is None:
+                params = path
         if isinstance(params, BaseModel):
             params = params.model_dump(exclude_none=True)
 
+        if hasattr(path, "get_request_path"):
+            path = path.get_request_path()
+
         json_request = HTTPRequest(
             path=path,
             json_obj=params,

{libentry-1.24.6.dist-info → libentry-1.24.8.dist-info}/METADATA

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

{libentry-1.24.6.dist-info → libentry-1.24.8.dist-info}/RECORD

@@ -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=KSvz6_TNGKQQoFJPNH1XIc8CMji0I2_CqC9VCSOPRfc,2491
-libentry/mcp/client.py,sha256=tEJbMpXiMKQ0qDgLGyavE2A4jpoXliqbrVj_TMfOGXI,22488
+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.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.24.6.dist-info/METADATA,sha256=uA1bcL68bf5Seq6xOAqVkF7EBPSy1OYVsN9Og7mKVig,1135
-libentry-1.24.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.24.6.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.24.6.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.24.6.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.24.6.dist-info/RECORD,,
+libentry-1.24.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.24.8.dist-info/METADATA,sha256=xTdFiobksHW7BiQG0DgyOd3d46as22zSv3q2uxz5jKM,1135
+libentry-1.24.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.24.8.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.24.8.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.24.8.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.24.8.dist-info/RECORD,,