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

libentry/mcp/client.py

@@ -9,7 +9,7 @@ from threading import Semaphore, Thread
 from time import sleep
 from types import GeneratorType
 from typing import Any, Dict, Iterable, List, Optional, Tuple, Type, Union
-from urllib.parse import urlencode, urljoin
+from urllib.parse import urlencode
 
 import httpx
 from pydantic import BaseModel, TypeAdapter
@@ -371,7 +371,7 @@ class APIClient(SubroutineMixIn, MCPMixIn):
         raise err
 
     def _http_request(self, request: HTTPRequest, timeout: float) -> HTTPResponse:
-        full_url = urljoin(self.base_url, request.path)
+        full_url = self.base_url.rstrip("/") + "/" + request.path.lstrip("/")
         headers = (
             {**self.headers}
             if request.options.headers is None else

libentry/mcp/service.py

@@ -10,10 +10,10 @@ from dataclasses import dataclass
 from queue import Empty, Queue
 from threading import Lock
 from types import GeneratorType
-from typing import Any, Callable, Dict, Generator, Iterable, List, Optional, Type, Union
+from typing import Any, Callable, Dict, Generator, Iterable, List, Literal, Optional, Tuple, Type, Union
 
 from flask import Flask, request as flask_request
-from pydantic import BaseModel, TypeAdapter
+from pydantic import BaseModel, Field, TypeAdapter
 
 from libentry import json, logger
 from libentry.mcp import api
@@ -21,8 +21,8 @@ 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, ToolProperty, \
-    ToolSchema, ToolsCapability
+    ServerCapabilities, SubroutineError, SubroutineResponse, TextContent, TextResourceContents, Tool, ToolSchema, \
+    ToolsCapability
 from libentry.schema import APISignature, get_api_signature, query_api
 
 try:
@@ -805,9 +805,11 @@ class FlaskServer(Flask):
         logger.info("Initializing Flask application.")
         existing_routes = {}
 
-        routes = self._create_routes(self.service)
-        self.service_routes.update(routes)
-        existing_routes.update(self.service_routes)
+        input_services = self.service if isinstance(self.service, (List, Tuple)) else [self.service]
+        for input_service in input_services:
+            routes = self._create_routes(input_service)
+            self.service_routes.update(routes)
+            existing_routes.update(self.service_routes)
 
         for builtin_service in self.builtin_services:
             routes = self._create_routes(builtin_service, existing_routes)
@@ -904,26 +906,116 @@ class GunicornApplication(BaseApplication):
         return FlaskServer(service)
 
 
+class RunServiceConfig(BaseModel):
+    """Run service config."""
+
+    host: str = Field(
+        title="Hostname",
+        description=(
+            "The hostname of the server that runs the service. "
+            "IP address or domain name."
+        ),
+        default="0.0.0.0"
+    )
+    port: int = Field(
+        title="Port number",
+        description="The port that the service listened to.",
+    )
+    num_workers: int = Field(
+        title="Number of workers",
+        description="The number of workers (processes) to run the service.",
+        default=1
+    )
+    num_threads: int = Field(
+        title="Number of threads",
+        description="The number of threads for each worker.",
+        default=20
+    )
+    num_connections: Optional[int] = Field(
+        title="Max number of connections",
+        description="The maximum number of simultaneous clients (or socket connections).",
+        default=1024
+    )
+    backlog: Optional[int] = Field(
+        title="The maximum number of pending connections",
+        description="The maximum number of pending connections.",
+        default=2048
+    )
+    worker_class: Literal["sync", "gthread", "eventlet", "gevent", "tornado"] = Field(
+        title="The type of workers to use",
+        description="The type of workers to use.",
+        default="gthread"
+    )
+    timeout: int = Field(
+        title="Worker timeout",
+        description="Workers silent for more than this many seconds are killed and restarted.",
+        default=60
+    )
+    keyfile: Optional[str] = Field(
+        title="SSL key file",
+        description="SSL key file.",
+        default=None
+    )
+    keyfile_password: Optional[str] = Field(
+        title="SSL key file password",
+        description="SSL key file password.",
+        default=None
+    )
+    certfile: Optional[str] = Field(
+        title="SSL certificate file",
+        description="SSL certificate file.",
+        default=None
+    )
+
+
 def run_service(
         service_type: Union[Type, Callable],
         service_config=None,
-        host: str = "0.0.0.0",
-        port: int = 8888,
-        num_workers: int = 1,
-        num_threads: int = 20,
-        num_connections: Optional[int] = 1000,
-        backlog: Optional[int] = 1000,
-        worker_class: str = "gthread",
-        timeout: int = 60,
+        run_config: Optional[RunServiceConfig] = None,
+        *,
+        host: Optional[str] = None,
+        port: Optional[int] = None,
+        num_workers: Optional[int] = None,
+        num_threads: Optional[int] = None,
+        num_connections: Optional[int] = None,
+        backlog: Optional[int] = None,
+        worker_class: Optional[str] = None,
+        timeout: Optional[int] = None,
         keyfile: Optional[str] = None,
         keyfile_password: Optional[str] = None,
         certfile: Optional[str] = None
-):
+) -> None:
+    kwargs = {}
+    if host is not None:
+        kwargs["host"] = host
+    if port is not None:
+        kwargs["port"] = port
+    if num_workers is not None:
+        kwargs["num_workers"] = num_workers
+    if num_threads is not None:
+        kwargs["num_threads"] = num_threads
+    if num_connections is not None:
+        kwargs["num_connections"] = num_connections
+    if backlog is not None:
+        kwargs["backlog"] = backlog
+    if worker_class is not None:
+        kwargs["worker_class"] = worker_class
+    if timeout is not None:
+        kwargs["timeout"] = timeout
+    if keyfile is not None:
+        kwargs["keyfile"] = keyfile
+    if keyfile_password is not None:
+        kwargs["keyfile_password"] = keyfile_password
+    if certfile is not None:
+        kwargs["certfile"] = certfile
+
+    if run_config is None:
+        run_config = RunServiceConfig(**kwargs)
+    else:
+        for name, value in kwargs.items():
+            setattr(run_config, name, value)
+
     logger.info("Starting gunicorn server.")
-    if num_connections is None or num_connections < num_threads * 2:
-        num_connections = num_threads * 2
-    if backlog is None or backlog < num_threads * 2:
-        backlog = num_threads * 2
 
     def ssl_context(config, _default_ssl_context_factory):
         import ssl
@@ -931,21 +1023,21 @@ def run_service(
         context.load_cert_chain(
             certfile=config.certfile,
             keyfile=config.keyfile,
-            password=keyfile_password
+            password=run_config.keyfile_password
         )
         context.minimum_version = ssl.TLSVersion.TLSv1_3
         return context
 
     options = {
-        "bind": f"{host}:{port}",
-        "workers": num_workers,
-        "threads": num_threads,
-        "timeout": timeout,
-        "worker_connections": num_connections,
-        "backlog": backlog,
-        "keyfile": keyfile,
-        "certfile": certfile,
-        "worker_class": worker_class,
+        "bind": f"{run_config.host}:{run_config.port}",
+        "workers": run_config.num_workers,
+        "threads": run_config.num_threads,
+        "timeout": run_config.timeout,
+        "worker_connections": run_config.num_connections,
+        "backlog": run_config.backlog,
+        "keyfile": run_config.keyfile,
+        "certfile": run_config.certfile,
+        "worker_class": run_config.worker_class,
         "ssl_context": ssl_context
     }
     for name, value in options.items():

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

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

{libentry-1.24.9.dist-info → libentry-1.25.1.dist-info}/RECORD

@@ -12,8 +12,8 @@ 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=GDErVCz_hh_ZeMxLS8bTPyBUhCTHw3Mm-nGFMV2W2yo,3669
-libentry/mcp/client.py,sha256=3HmKAsFenPlDk1lfSdXL9GJwfCSU92uQS04zvZGeJfQ,23065
-libentry/mcp/service.py,sha256=qA6I9Mi-eudRYwVGhff1_aAImK424bhASlsWaHP8XNI,34971
+libentry/mcp/client.py,sha256=qFbigNIOJvEf8ZICN2K8nnmVcITIzDhJgaw3c0P-WXM,23078
+libentry/mcp/service.py,sha256=PpdQBxqKPiZ2tpnsqDYiC29_yjMjK9J3VWynn4uvpVg,38109
 libentry/mcp/types.py,sha256=aAoVO4jjqEvDzNneuZapmRYonLLnGsbcLoypVyRNNYg,12389
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/service/common.py,sha256=OVaW2afgKA6YqstJmtnprBCqQEUZEWotZ6tHavmJJeU,42
@@ -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.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,,
+libentry-1.25.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.25.1.dist-info/METADATA,sha256=7HVCqasAkkqvvXhodRtTmaoZTG4FC70Q6CxsgZWnC8U,1135
+libentry-1.25.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.25.1.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.25.1.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.25.1.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.25.1.dist-info/RECORD,,