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

libentry/mcp/service.py

@@ -12,6 +12,7 @@ from types import GeneratorType
 from typing import Any, Callable, Dict, Generator, Iterable, List, Literal, Optional, Tuple, Union
 
 from flask import Flask, request as flask_request
+from flask_cors import CORS
 from pydantic import BaseModel, Field, TypeAdapter
 
 from libentry import json, logger
@@ -20,7 +21,7 @@ from libentry.mcp.api import APIInfo, list_api_info
 from libentry.mcp.types import BlobResourceContents, CallToolRequestParams, CallToolResult, Implementation, \
     InitializeRequestParams, InitializeResult, JSONRPCError, JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, \
     ListResourcesResult, ListToolsResult, MIME, ReadResourceRequestParams, ReadResourceResult, Resource, SSE, \
-    ServerCapabilities, SubroutineError, SubroutineResponse, TextContent, TextResourceContents, Tool, ToolSchema, \
+    ServerCapabilities, SubroutineError, SubroutineResponse, TextResourceContents, Tool, ToolSchema, \
     ToolsCapability
 from libentry.schema import APISignature, get_api_signature, query_api
 
@@ -643,26 +644,10 @@ class ToolsService:
         try:
             response = route.handler.subroutine_adapter(params.arguments)
         except Exception as e:
-            error = json.dumps(SubroutineError.from_exception(e))
-            return CallToolResult(
-                content=[TextContent(text=error)],
-                isError=True
-            )
+            return CallToolResult.from_exception(e)
 
         if not isinstance(response, GeneratorType):
-            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
-                )
+            return CallToolResult.from_subroutine_response(response)
         else:
             return self._iter_tool_results(response)
 
@@ -674,43 +659,17 @@ class ToolsService:
             it = iter(responses)
             while True:
                 response = next(it)
+                assert isinstance(response, SubroutineResponse)
+                yield CallToolResult.from_subroutine_response(response)
                 if response.error is not None:
-                    text = json.dumps(response.error)
-                    yield CallToolResult(
-                        content=[TextContent(text=text)],
-                        isError=True
-                    )
                     break
-                else:
-                    result = response.result
-                    text = json.dumps(result) if isinstance(result, (Dict, BaseModel)) else str(result)
-                    yield CallToolResult(
-                        content=[TextContent(text=text)],
-                        isError=False
-                    )
         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
-                    )
+                assert isinstance(response, SubroutineResponse)
+                return CallToolResult.from_subroutine_response(response)
         except Exception as e:
-            text = json.dumps(SubroutineError.from_exception(e))
-            error = CallToolResult(
-                content=[TextContent(text=text)],
-                isError=True
-            )
-            yield error
+            yield CallToolResult.from_exception(e)
         return None
 
 
@@ -815,8 +774,6 @@ class FlaskServer(Flask):
     def __init__(self, service, options: Dict[str, Any]):
         super().__init__(__name__)
         self.options = options
-        self.access_control_allow_origin = self.options.get("access_control_allow_origin")
-        self.access_control_allow_methods = self.options.get("access_control_allow_methods")
 
         self.service_routes = {}
         self.builtin_routes = {}
@@ -879,20 +836,10 @@ class FlaskServer(Flask):
         return routes
 
     def ok(self, body: Union[str, Iterable[str], None], mimetype: str):
-        response = self.response_class(body, status=200, mimetype=mimetype)
-        if self.access_control_allow_origin:
-            response.headers["Access-Control-Allow-Origin"] = "*"
-        if self.access_control_allow_methods:
-            response.headers["Access-Control-Allow-Methods"] = "GET, POST"
-        return response
+        return self.response_class(body, status=200, mimetype=mimetype)
 
     def error(self, body: str, mimetype=MIME.plain.value):
-        response = self.response_class(body, status=500, mimetype=mimetype)
-        if self.access_control_allow_origin:
-            response.headers["Access-Control-Allow-Origin"] = "*"
-        if self.access_control_allow_methods:
-            response.headers["Access-Control-Allow-Methods"] = "GET, POST"
-        return response
+        return self.response_class(body, status=500, mimetype=mimetype)
 
     @api.get("/")
     def index(self, name: str = None):
@@ -950,7 +897,25 @@ class GunicornApplication(BaseApplication):
             service = self._create_service(self.service_type, self.service_config)
         logger.info("Service initialized.")
 
-        return FlaskServer(service, self.options)
+        app = FlaskServer(service, self.options)
+
+        cors_kwargs = {}
+        origins = self.options.get("access_control_allow_origin")
+        if origins:
+            cors_kwargs["origins"] = [m.strip() for m in origins.split(",")]
+
+        methods = self.options.get("access_control_allow_methods")
+        if methods:
+            cors_kwargs["methods"] = [m.strip() for m in methods.split(",")]
+
+        allow_headers = self.options.get("access_control_allow_headers")
+        if allow_headers:
+            cors_kwargs["allow_headers"] = [m.strip() for m in allow_headers.split(",")]
+
+        if cors_kwargs:
+            logger.info(f"CORS arguments: {cors_kwargs}")
+            CORS(app, **cors_kwargs)
+        return app
 
     @staticmethod
     def _create_service(service_type, service_config):
@@ -1037,6 +1002,11 @@ class RunServiceConfig(BaseModel):
         description="Access control allow methods.",
         default="GET, POST"
     )
+    access_control_allow_headers: Optional[str] = Field(
+        title="Access control allow headers",
+        description="Access control allow headers.",
+        default="*"
+    )
     name: Optional[str] = Field(
         title="服务实例名称",
         description="服务实例名称，会在进程命令行中显示。",
@@ -1092,12 +1062,16 @@ def run_service(
             setattr(run_config, name, value)
 
     if run_config.name is None:
-        name = service_type.__name__
-        module = service_type.__module__
-        if module != "builtins":
-            name = f"{module}.{name}"
-        run_config.name = name
-    run_config.name = f"{run_config.name} ({run_config.host}:{run_config.port})"
+        if hasattr(service_type, "__name__"):
+            name = service_type.__name__
+            if hasattr(service_type, "__module__"):
+                module = service_type.__module__
+                if module != "builtins":
+                    name = f"{module}.{name}"
+            run_config.name = name
+        else:
+            run_config.name = ""
+    run_config.name = f"{run_config.name}({run_config.host}:{run_config.port})"
 
     logger.info("Starting gunicorn server.")
 
@@ -1125,6 +1099,7 @@ def run_service(
         "ssl_context": ssl_context,
         "access_control_allow_origin": run_config.access_control_allow_origin,
         "access_control_allow_methods": run_config.access_control_allow_methods,
+        "access_control_allow_headers": run_config.access_control_allow_headers,
         "proc_name": run_config.name,
     }
     for name, value in options.items():

libentry/mcp/types.py

@@ -354,6 +354,36 @@ class TextContent(BaseModel):
     model_config = ConfigDict(extra="allow")
 
 
+class ImageContent(BaseModel):
+    """Image content for a message."""
+
+    type: Literal["image"] = "image"
+    data: str
+    """The base64-encoded image data."""
+    mimeType: str
+    """
+    The MIME type of the image. Different providers may support different
+    image types.
+    """
+
+    model_config = ConfigDict(extra="allow")
+
+
+class AudioContent(BaseModel):
+    """Audio content for a message."""
+
+    type: Literal["audio"]
+    data: str
+    """The base64-encoded audio data."""
+    mimeType: str
+    """
+    The MIME type of the audio. Different providers may support different
+    audio types.
+    """
+
+    model_config = ConfigDict(extra="allow")
+
+
 class CallToolRequestParams(BaseModel):
     """Parameters for calling a tool."""
 
@@ -366,9 +396,67 @@ class CallToolRequestParams(BaseModel):
 class CallToolResult(BaseModel):
     """The server's response to a tool call."""
 
-    content: List[TextContent]
+    content: List[Union[TextContent, ImageContent, AudioContent]] = []
+    structuredContent: Optional[Dict[str, Any]] = None
     isError: bool = False
 
+    @classmethod
+    def from_exception(cls, e: Exception):
+        error = SubroutineError.from_exception(e)
+        return cls(
+            content=[TextContent(text=error.message)],
+            structuredContent=error.model_dump(exclude_none=True),
+            isError=True
+        )
+
+    @classmethod
+    def from_subroutine_response(cls, response: SubroutineResponse):
+        if response.error is not None:
+            error = response.error
+            return cls(
+                content=[TextContent(text=error.message)],
+                structuredContent=error.model_dump(exclude_none=True),
+                isError=True
+            )
+        else:
+            result = response.result
+            if isinstance(result, Dict):
+                return cls(
+                    content=[],
+                    structuredContent=result,
+                    isError=False
+                )
+            elif isinstance(result, BaseModel):
+                return cls(
+                    content=[],
+                    structuredContent=result.model_dump(exclude_none=False),
+                    isError=False
+                )
+            elif isinstance(result, List):
+                return cls(
+                    content=result,
+                    structuredContent=None,
+                    isError=False
+                )
+            elif isinstance(result, (TextContent, ImageContent, AudioContent)):
+                return cls(
+                    content=[result],
+                    structuredContent=None,
+                    isError=False
+                )
+            elif isinstance(result, str):
+                return cls(
+                    content=[TextContent(text=result)],
+                    structuredContent=None,
+                    isError=False
+                )
+            else:
+                return cls(
+                    content=[TextContent(text=str(result))],
+                    structuredContent=None,
+                    isError=False
+                )
+
 
 class Resource(BaseModel):
     """A known resource that the server is capable of reading."""

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: libentry
-Version: 1.29
+Version: 1.30.1
 Summary: Entries for experimental utilities.
 Home-page: https://github.com/XoriieInpottn/libentry
 Author: xi
@@ -16,6 +16,7 @@ Requires-Dist: numpy
 Requires-Dist: urllib3
 Requires-Dist: httpx
 Requires-Dist: Flask
+Requires-Dist: flask-cors
 Requires-Dist: gunicorn
 Dynamic: author
 Dynamic: author-email

{libentry-1.29.dist-info → libentry-1.30.1.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=k7kDAEOq5kUQ1Jz9YsIBIPAage_Ub-jjkX59DzQznmE,42082
-libentry/mcp/types.py,sha256=aAoVO4jjqEvDzNneuZapmRYonLLnGsbcLoypVyRNNYg,12389
+libentry/mcp/service.py,sha256=vVlUa0uEXNkwrN78-_BK7NenRRjdVeW0hMJkeP8baPM,40867
+libentry/mcp/types.py,sha256=5ddT_rxQyL1zvHDXnpzfGXMogviSNVrKd9ohd8yPZYc,15149
 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.29.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.29.dist-info/METADATA,sha256=z588Zlo18mTULlQQLoeNEKpVVKONPW3EeAqzK2AP47Q,1133
-libentry-1.29.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.29.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.29.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.29.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.29.dist-info/RECORD,,
+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,,