libentry 1.30.1__py3-none-any.whl → 1.30.3__py3-none-any.whl

libentry/mcp/service.py

@@ -4,6 +4,7 @@ __author__ = "xi"
 
 import asyncio
 import base64
+import copy
 import uuid
 from dataclasses import dataclass
 from queue import Empty, Queue
@@ -592,6 +593,59 @@ class NotificationsService:
         pass
 
 
+def resolve_ref(schema, root=None, seen=None):
+    if root is None:
+        root = schema
+    if seen is None:
+        seen = set()
+
+    if isinstance(schema, dict):
+        if "$ref" in schema:
+            ref_path = schema["$ref"]
+            if not ref_path.startswith("#/"):
+                raise ValueError(f"只支持本地引用: {ref_path}")
+
+            if ref_path in seen:
+                # 循环引用，返回原样
+                return {"$ref": ref_path}
+
+            seen.add(ref_path)
+
+            # 路径解析
+            parts = ref_path[2:].split("/")
+            target = root
+            for part in parts:
+                target = target[part]
+
+            resolved = copy.deepcopy(target)
+            resolved = resolve_ref(resolved, root, seen)
+
+            seen.remove(ref_path)
+
+            # 合并额外字段（除 $ref 之外的部分）
+            extras = {k: v for k, v in schema.items() if k != "$ref"}
+            if extras:
+                if isinstance(resolved, dict):
+                    merged = copy.deepcopy(resolved)
+                    for k, v in extras.items():
+                        merged[k] = resolve_ref(v, root, seen)
+                    return merged
+                else:
+                    # 被引用的不是 dict，无法合并，直接返回展开的结果
+                    return resolved
+
+            return resolved
+
+        else:
+            return {k: resolve_ref(v, root, seen) for k, v in schema.items()}
+
+    elif isinstance(schema, list):
+        return [resolve_ref(v, root, seen) for v in schema]
+
+    else:
+        return schema
+
+
 class ToolsService:
 
     def __init__(self, service_routes: Dict[str, "Route"]):
@@ -615,10 +669,12 @@ class ToolsService:
             api_info = route.api_info
             api_models = route.fn if isinstance(route.fn, APISignature) else get_api_signature(route.fn)
             args_model = api_models.input_model or api_models.bundled_model
+            json_schema = args_model.model_json_schema()
+            resolved_schema = resolve_ref(json_schema)
             tool = Tool(
                 name=api_info.name,
                 description=api_info.description,
-                inputSchema=ToolSchema.model_validate(args_model.model_json_schema())
+                inputSchema=ToolSchema.model_validate(resolved_schema)
             )
             tools.append(tool)
             # schema = query_api(route.fn)

libentry/mcp/types.py

@@ -314,14 +314,19 @@ class ToolProperty(BaseModel):
     type: Optional[str] = None
     anyOf: Optional[List["ToolProperty"]] = None
     items: Optional["ToolProperty"] = None
-    additionalProperties: Optional["ToolProperty"] = None
+    properties: Optional[Dict[str, "ToolProperty"]] = None
+    additionalProperties: Optional[Union[bool, "ToolProperty"]] = None
+    # title: Optional[str] = None
     description: Optional[str] = None
+    required: Optional[List[str]] = None
 
 
 class ToolSchema(BaseModel):
     type: str = "object"
-    properties: Dict[str, ToolProperty] = {}
-    required: List[str] = []
+    properties: Optional[Dict[str, "ToolProperty"]] = None
+    # title: Optional[str] = None
+    description: Optional[str] = None
+    required: Optional[List[str]] = None
 
 
 class Tool(BaseModel):

{libentry-1.30.1.dist-info → libentry-1.30.3.dist-info}/METADATA

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

{libentry-1.30.1.dist-info → libentry-1.30.3.dist-info}/RECORD

@@ -13,8 +13,8 @@ libentry/utils.py,sha256=vCm6UyAlibnPOlPJHZO57u3TXhw5PZmGM5_vBAPUnB4,1981
 libentry/mcp/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/mcp/api.py,sha256=hhveOjDYhWiEEq3C7wSAOdpbPn9JP1T1CW3QYWrLHa4,3679
 libentry/mcp/client.py,sha256=_O-O6OETwHidhiFmg7P01NIrVhHgEetwFeFfJNqRt6M,24899
-libentry/mcp/service.py,sha256=vVlUa0uEXNkwrN78-_BK7NenRRjdVeW0hMJkeP8baPM,40867
-libentry/mcp/types.py,sha256=5ddT_rxQyL1zvHDXnpzfGXMogviSNVrKd9ohd8yPZYc,15149
+libentry/mcp/service.py,sha256=Awi1JDcfxKI7q9YHfRB-7nCbO4X-MCvL1_LRZiBrREw,42589
+libentry/mcp/types.py,sha256=0Wsd-Aq1ChzsiSkZt14UcRCSJvuM-vq2HRy-NeuqFZE,15394
 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.30.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.30.1.dist-info/METADATA,sha256=C_q7ivxg5PW0_Qa_B8CMVc0OZUNmysfljhvmEjBHHyI,1161
-libentry-1.30.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.30.1.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.30.1.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.30.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.30.1.dist-info/RECORD,,
+libentry-1.30.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.30.3.dist-info/METADATA,sha256=K1d4uO687Db-PzZh90WAd9DsjI8yqs5bStDnOVIoXWA,1161
+libentry-1.30.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.30.3.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.30.3.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.30.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.30.3.dist-info/RECORD,,