libentry 1.23.3__py3-none-any.whl → 1.24__py3-none-any.whl

libentry/mcp/api.py

@@ -19,6 +19,12 @@ from pydantic import BaseModel, ConfigDict
 
 API_INFO_FIELD = "__api_info__"
 
+TAG_SUBROUTINE = "subroutine"
+TAG_JSONRPC = "jsonrpc"
+TAG_ENDPOINT = "endpoint"
+TAG_TOOL = "tool"
+TAG_RESOURCE = "resource"
+
 
 class APIInfo(BaseModel):
     path: str
@@ -69,7 +75,7 @@ def tool(path=None, name=None, description=None, **kwargs):
         methods=["POST"],
         name=name,
         description=description,
-        tag="tool",
+        tag=TAG_TOOL,
         **kwargs
     )
 
@@ -80,7 +86,7 @@ def resource(uri, name=None, description=None, mime_type=None, size=None, **kwar
         methods=["POST"],
         name=name,
         description=description,
-        tag="resource",
+        tag=TAG_RESOURCE,
         mimeType=mime_type,
         size=size,
         uri=uri,

libentry/mcp/service.py

@@ -57,11 +57,24 @@ class SubroutineAdapter:
 
     def __call__(
             self,
-            request: Dict[str, Any]
+            request: Any,
+            args: Optional[Dict[str, str]] = None
     ) -> Union[SubroutineResponse, Iterable[SubroutineResponse]]:
         if isinstance(request, BaseModel):
             request = request.model_dump()
 
+        if not isinstance(request, Dict):
+            raise ValueError(
+                f"Subroutine only accepts JSON object as input. "
+                f"Expect \"dict\", got \"{type(request)}\"."
+            )
+
+        if args is not None:
+            conflicts = args.keys() & request.keys()
+            if len(conflicts) > 0:
+                raise ValueError(f"Duplicated fields: \"{conflicts}\".")
+            request = {**args, **request}
+
         try:
             input_model = self.api_signature.input_model
             if input_model is not None:
@@ -117,16 +130,29 @@ class JSONRPCAdapter:
 
     def __call__(
             self,
-            request: Union[JSONRPCRequest, JSONRPCNotification, Dict[str, Any]]
+            request: Union[JSONRPCRequest, JSONRPCNotification, Dict[str, Any]],
+            args: Optional[Dict[str, str]] = None
     ) -> Union[JSONRPCResponse, Iterable[JSONRPCResponse], None]:
         if isinstance(request, Dict):
+            if args is not None:
+                conflicts = args.keys() & request.keys()
+                if len(conflicts) > 0:
+                    raise ValueError(f"Duplicated fields: \"{conflicts}\".")
+                request = {**args, **request}
             request = self.type_adapter.validate_python(request)
 
+        if isinstance(request, JSONRPCRequest):
+            fn = self._apply_request
+        elif isinstance(request, JSONRPCNotification):
+            fn = self._apply_notification
+        else:
+            raise ValueError(
+                f"JSONRPC only accepts JSONRPCRequest, JSONRPCNotification as input. "
+                f"Expect \"JSONRPCRequest\", \"JSONRPCNotification\" or \"dict\", got \"{type(request)}\"."
+            )
+
         try:
-            if isinstance(request, JSONRPCRequest):
-                return self._apply_request(request)
-            else:
-                return self._apply_notification(request)
+            return fn(request)
         except SystemExit as e:
             raise e
         except KeyboardInterrupt as e:
@@ -233,44 +259,38 @@ class FlaskHandler:
 
         self.subroutine_adapter = SubroutineAdapter(fn, self.api_signature)
         self.jsonrpc_adapter = JSONRPCAdapter(fn, self.api_signature)
-        self.default_adapter = self.subroutine_adapter
 
+        adapter_mapping = {
+            api.TAG_ENDPOINT: self.fn,
+            "free": self.fn,
+            "schema_free": self.fn,
+            "schema-free": self.fn,
+            api.TAG_JSONRPC: self.jsonrpc_adapter,
+            "rpc": self.jsonrpc_adapter,
+            "mcp": self.jsonrpc_adapter,
+        }
         tag = self.api_info.tag if self.api_info else None
-        if tag is not None:
-            tag = tag.lower()
-            if tag in {"free", "schema_free", "schema-free"}:
-                self.default_adapter = self.fn
-            elif tag in {"jsonrpc", "rpc"}:
-                self.default_adapter = self.jsonrpc_adapter
-
-        # todo: debug info
-        print(f"{api_info.path}: {type(self.default_adapter)}\t{self.api_signature.input_model}")
+        self.default_adapter = adapter_mapping.get(tag, self.subroutine_adapter)
 
     def __call__(self):
         args = flask_request.args
         data = flask_request.data
         content_type = flask_request.content_type
 
-        json_from_url = {**args}
+        args = {**args}
         if data:
             if (not content_type) or content_type == MIME.json.value:
-                json_from_data = json.loads(data)
+                raw_request = json.loads(data)
             else:
                 return self.app.error(f"Unsupported Content-Type: \"{content_type}\".")
         else:
-            json_from_data = {}
-
-        conflicts = json_from_url.keys() & json_from_data.keys()
-        if len(conflicts) > 0:
-            return self.app.error(f"Duplicated fields: \"{conflicts}\".")
-
-        input_json = {**json_from_url, **json_from_data}
+            raw_request = {}
 
         ################################################################################
         # Call method as MCP
         ################################################################################
         try:
-            mcp_response = self.default_adapter(input_json)
+            mcp_response = self.default_adapter(raw_request, args)
         except Exception as e:
             error = json.dumps(SubroutineError.from_exception(e))
             return self.app.error(error, mimetype=MIME.json.value)
@@ -369,8 +389,12 @@ class SSEService:
         self.sse_dict = {}
 
     # noinspection PyUnusedLocal
-    @api.get("/sse", tag="schema_free")
-    def sse(self, raw_request: Dict[str, Any]) -> Iterable[SSE]:
+    @api.get("/sse", tag=api.TAG_ENDPOINT)
+    def sse(
+            self,
+            raw_request: Any,
+            args: Optional[Dict[str, str]] = None
+    ) -> Iterable[SSE]:
         session_id = str(uuid.uuid4())
         queue = Queue(8)
         with self.lock:
@@ -395,8 +419,24 @@ class SSEService:
 
         return _stream()
 
-    @api.route("/sse/message", tag="schema_free")
-    def sse_message(self, raw_request: Dict[str, Any]) -> None:
+    @api.route("/sse/message", tag=api.TAG_ENDPOINT)
+    def sse_message(
+            self,
+            raw_request: Any,
+            args: Optional[Dict[str, str]] = None
+    ) -> None:
+        if not isinstance(raw_request, Dict):
+            raise ValueError(
+                f"/message only accepts JSON object as input. "
+                f"Expect \"dict\", got \"{type(raw_request)}\"."
+            )
+
+        if args is not None:
+            conflicts = args.keys() & raw_request.keys()
+            if len(conflicts) > 0:
+                raise ValueError(f"Duplicated fields: \"{conflicts}\".")
+            raw_request = {**args, **raw_request}
+
         ################################################################################
         # session validation
         ################################################################################
@@ -471,8 +511,27 @@ class JSONRPCService:
 
         self.type_adapter = TypeAdapter(Union[JSONRPCRequest, JSONRPCNotification])
 
-    @api.route(tag="schema_free")
-    def message(self, raw_request: Dict[str, Any]) -> Union[JSONRPCResponse, Iterable[JSONRPCResponse], None]:
+    @api.route(tag=api.TAG_ENDPOINT)
+    def message(
+            self,
+            raw_request: Any,
+            args: Optional[Dict[str, str]] = None
+    ) -> Union[JSONRPCResponse, Iterable[JSONRPCResponse], None]:
+        if isinstance(raw_request, List):
+            raise ValueError("Batching RCP requests is not supported yet.")
+
+        if not isinstance(raw_request, Dict):
+            raise ValueError(
+                f"/message only accepts JSON object as input. "
+                f"Expect \"dict\", got \"{type(raw_request)}\"."
+            )
+
+        if args is not None:
+            conflicts = args.keys() & raw_request.keys()
+            if len(conflicts) > 0:
+                raise ValueError(f"Duplicated fields: \"{conflicts}\".")
+            raw_request = {**args, **raw_request}
+
         request = self.type_adapter.validate_python(raw_request)
         path = f"/{request.method}"
         route = self.service_routes.get(path, self.builtin_routes.get(path))
@@ -502,6 +561,10 @@ class LifeCycleService:
             serverInfo=Implementation(name="python-libentry", version="1.0.0")
         )
 
+    @api.route()
+    def ping(self):
+        return None
+
 
 class NotificationsService:
 
@@ -521,7 +584,7 @@ class ToolsService:
             self._tool_routes = {}
             for route in self.service_routes.values():
                 api_info = route.api_info
-                if api_info.tag != "tool":
+                if api_info.tag != api.TAG_TOOL:
                     continue
                 self._tool_routes[api_info.name] = route
         return self._tool_routes
@@ -636,7 +699,7 @@ class ResourcesService:
             self._resource_routes = {}
             for route in self.service_routes.values():
                 api_info = route.api_info
-                if api_info.tag != "resource":
+                if api_info.tag != api.TAG_RESOURCE:
                     continue
                 uri = api_info.model_extra.get("uri", api_info.path)
                 self._resource_routes[uri] = route
@@ -771,10 +834,15 @@ class FlaskServer(Flask):
                 logger.error(f"Async function \"{fn.__name__}\" is not supported.")
                 continue
 
-            logger.info(f"Serving {path} as {', '.join(methods)}.")
-
             handler = FlaskHandler(fn, api_info, self)
             routes[path] = Route(api_info=api_info, fn=fn, handler=handler)
+
+            mode = api.TAG_ENDPOINT
+            if isinstance(handler.default_adapter, SubroutineAdapter):
+                mode = api.TAG_SUBROUTINE
+            elif isinstance(handler.default_adapter, JSONRPCAdapter):
+                mode = api.TAG_JSONRPC
+            logger.info(f"{mode.capitalize()}:\tmethod={'|'.join(methods)}\tpath={path}")
         return routes
 
     def ok(self, body: Union[str, Iterable[str], None], mimetype: str):

libentry/resource.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python3
+
+__author__ = "xi"
+__all__ = [
+    "AbstractResourceManager",
+    "JSONResourceManager",
+    "RemoteResourceManager",
+    "ResourceManager",
+]
+
+import abc
+from typing import Any, Dict, List
+from urllib.parse import urlparse
+
+import yaml
+
+
+class AbstractResourceManager(abc.ABC):
+
+    @abc.abstractmethod
+    def list(self) -> List[str]:
+        pass
+
+    @abc.abstractmethod
+    def get(self, name: str) -> Any:
+        pass
+
+    @abc.abstractmethod
+    def set(self, name: str, value: Any) -> Any:
+        pass
+
+
+class JSONResourceManager(AbstractResourceManager):
+
+    def __init__(self, path: str):
+        with open(path, "r") as f:
+            self.resource_obj = yaml.load(f, yaml.SafeLoader)
+
+        if not isinstance(self.resource_obj, Dict):
+            raise RuntimeError(
+                f"Expect a JSON object, "
+                f"got {type(self.resource_obj)}."
+            )
+
+    def list(self) -> List[str]:
+        return [*self.resource_obj.keys()]
+
+    def get(self, name: str) -> Any:
+        return self.resource_obj.get(name)
+
+    def set(self, name: str, value: Any) -> Any:
+        raise NotImplementedError("\"set\" is not supported by JSONResourceClient.")
+
+
+class RemoteResourceManager(AbstractResourceManager):
+
+    def __init__(self, url: str):
+        pass
+
+
+class ResourceManager:
+
+    def __new__(cls, uri: str) -> AbstractResourceManager:
+        parsed_uri = urlparse(uri)
+        if parsed_uri.scheme in {"", "json", "yaml", "yml"}:
+            return JSONResourceManager(parsed_uri.path)
+        else:
+            raise NotImplementedError(f"Scheme \"{parsed_uri.scheme}\" is not supported.")
+
+
+def _test():
+    client = ResourceManager("config_test.yml")
+    print(client.get("qwen_2.5"))
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(_test())

{libentry-1.23.3.dist-info → libentry-1.24.dist-info}/METADATA

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

{libentry-1.23.3.dist-info → libentry-1.24.dist-info}/RECORD

@@ -6,13 +6,14 @@ libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
 libentry/experiment.py,sha256=ejgAHDXWIe9x4haUzIFuz1WasLY0_aD1z_vyEVGjTu8,4922
 libentry/json.py,sha256=CubUUu29h7idLaC4d66vKhjBgVHKN1rZOv-Tw2qM17k,1916
 libentry/logging.py,sha256=IiYoCUzm8XTK1fduA-NA0FI2Qz_m81NEPV3d3tEfgdI,1349
+libentry/resource.py,sha256=qAPXF7RzRYeCM4xWft6XR3SYk7lEiQ6ymOHbpNoi0mQ,1821
 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=uoGBYCesMj6umlJpRulKZNS3trm9oG3LUSg1otPDS_8,2362
+libentry/mcp/api.py,sha256=KSvz6_TNGKQQoFJPNH1XIc8CMji0I2_CqC9VCSOPRfc,2491
 libentry/mcp/client.py,sha256=tEJbMpXiMKQ0qDgLGyavE2A4jpoXliqbrVj_TMfOGXI,22488
-libentry/mcp/service.py,sha256=KDpEUhHuyVXjc_J5Z9_aciJbTcEy9dYA44rpdgAAwGE,32322
+libentry/mcp/service.py,sha256=VBacwSN9xiV3wk5Ta0LHxRAor1cwR04ZavlKLTdTuWw,34721
 libentry/mcp/types.py,sha256=xTQCnKAgeJNss4klJ33MrWHGCzG_LeR3urizO_Z9q9U,12239
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/service/common.py,sha256=OVaW2afgKA6YqstJmtnprBCqQEUZEWotZ6tHavmJJeU,42
@@ -21,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.23.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.23.3.dist-info/METADATA,sha256=5AIjlPrO1Q8nWDiCZNN5S4qo8jZCqNXD_twACQuw0T0,1135
-libentry-1.23.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.23.3.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.23.3.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.23.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.23.3.dist-info/RECORD,,
+libentry-1.24.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.24.dist-info/METADATA,sha256=zvGz_iBvBEMl_1HH4odL37ySnpBaLTTo7dAsxdwNrB4,1133
+libentry-1.24.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.24.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.24.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.24.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.24.dist-info/RECORD,,