libentry 1.25__py3-none-any.whl → 1.26__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,7 +10,7 @@ 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, Literal, 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, Field, TypeAdapter
@@ -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)

libentry/test_api.py

@@ -11,7 +11,8 @@ from typing import Literal, Optional
 
 from pydantic import BaseModel
 
-from libentry.api import APIClient
+from libentry.mcp.client import APIClient
+from libentry.mcp.types import HTTPOptions
 
 
 class TestRequest(BaseModel):
@@ -49,14 +50,13 @@ def test(request: TestRequest):
                 if request.method == "GET":
                     response = APIClient().get(
                         request.url,
-                        **kwargs
+                        HTTPOptions(**kwargs)
                     )
                 else:
                     response = APIClient().post(
                         request.url,
                         request.data,
-                        stream=request.stream,
-                        **kwargs
+                        HTTPOptions(stream=request.stream, **kwargs)
                     )
                 if not request.stream:
                     t = time() - t

libentry/utils.py

@@ -2,10 +2,14 @@
 
 __author__ = "xi"
 __all__ = [
-    "Timer"
+    "Timer",
+    "TimedLRUCache",
 ]
 
+import threading
 import time
+from collections import OrderedDict
+from functools import wraps
 
 
 class Timer:
@@ -32,3 +36,42 @@ class Timer:
             raise RuntimeError("The timer has not started yet.")
         self.end_time = time.perf_counter()
         self.cost = self.end_time - self.start_time
+
+
+class TimedLRUCache:
+
+    def __init__(self, max_size: int = 256, timeout: float = 12):
+        self.maxsize = max_size
+        self.timeout = timeout  # seconds
+
+        self.lock = threading.Lock()
+        self.cache = OrderedDict()
+
+    def __call__(self, func):
+        @wraps(func)
+        def wrapped(*args, **kwargs):
+            key = (args, frozenset(kwargs.items()))
+            now = time.time()
+
+            with self.lock:
+                # clean expired items
+                if key in self.cache:
+                    result, timestamp = self.cache[key]
+                    if now - timestamp < self.timeout:
+                        self.cache.move_to_end(key)
+                        return result
+                    else:
+                        del self.cache[key]  # expired
+
+                # compute new result
+                result = func(*args, **kwargs)
+                self.cache[key] = (result, now)
+                self.cache.move_to_end(key)
+
+                # exceed the max size
+                if len(self.cache) > self.maxsize:
+                    self.cache.popitem(last=False)  # remove the oldest item
+
+                return result
+
+        return wrapped

{libentry-1.25.dist-info → libentry-1.26.dist-info}/METADATA

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

{libentry-1.25.dist-info → libentry-1.26.dist-info}/RECORD

@@ -8,12 +8,12 @@ libentry/json.py,sha256=gTjogVG6eGUMkVrjilKkpFC8ZkElGAyZIutO7mbmSzg,1956
 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/test_api.py,sha256=bs7P8gveLtuUvHxrpujSrfuYqLVJ3fOXVg_MZnZxoJ4,4504
+libentry/utils.py,sha256=vCm6UyAlibnPOlPJHZO57u3TXhw5PZmGM5_vBAPUnB4,1981
 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=VTLA9dS85NJ64OCf1zBKLWvvE9l76I-U8WV5crCmBlM,37943
+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.25.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.25.dist-info/METADATA,sha256=mlgd255AfSGCHpiUuPqHMVipyfRm-Xal71qb5dQAJlg,1133
-libentry-1.25.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-libentry-1.25.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
-libentry-1.25.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.25.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.25.dist-info/RECORD,,
+libentry-1.26.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.26.dist-info/METADATA,sha256=FhTlnziZK-JqX2iRA3i4p0Oz9cQviwQV1dwmhz6Cxs0,1133
+libentry-1.26.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+libentry-1.26.dist-info/entry_points.txt,sha256=1v_nLVDsjvVJp9SWhl4ef2zZrsLTBtFWgrYFgqvQBgc,61
+libentry-1.26.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.26.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.26.dist-info/RECORD,,