libentry 1.15__py3-none-any.whl → 1.17__py3-none-any.whl

libentry/api.py

@@ -214,12 +214,12 @@ class APIClient:
 
     def get(
             self,
-            path: str,
+            path: Optional[str] = None, *,
             num_trials: int = 5,
             retry_factor: float = 2,
             timeout: float = 15
     ):
-        full_url = urljoin(self.base_url, path) if self.base_url else path
+        full_url = urljoin(self.base_url, path)
         response = self._request(
             "get",
             url=full_url,
@@ -242,7 +242,7 @@ class APIClient:
 
     def post(
             self,
-            path: str,
+            path: Optional[str] = None,
             json_data: Optional[Mapping] = None, *,
             stream: bool = False,
             exhaust_stream: bool = False,
@@ -254,7 +254,7 @@ class APIClient:
             chunk_suffix: str = None,
             error_prefix: str = "ERROR: "
     ):
-        full_url = urljoin(self.base_url, path) if self.base_url else path
+        full_url = urljoin(self.base_url, path)
 
         headers = {**self.headers}
         headers["Accept"] = headers["Accept"] + f"; stream={int(stream)}"

libentry/service/flask.py

@@ -13,7 +13,6 @@ from types import GeneratorType
 from typing import Any, Callable, Iterable, Optional, Type, Union
 
 from flask import Flask, request
-from gunicorn.app.base import BaseApplication
 from pydantic import BaseModel, Field, create_model
 
 from libentry import api, json
@@ -21,6 +20,26 @@ from libentry.api import APIInfo, list_api_info
 from libentry.logging import logger
 from libentry.schema import query_api
 
+try:
+    from gunicorn.app.base import BaseApplication
+except ImportError:
+    class BaseApplication:
+
+        def load(self) -> Flask:
+            pass
+
+        def run(self):
+            flask_server = self.load()
+            assert hasattr(self, "options")
+            bind = getattr(self, "options")["bind"]
+            pos = bind.rfind(":")
+            host = bind[:pos]
+            port = int(bind[pos + 1:])
+            logger.warn("Your system doesn't support gunicorn.")
+            logger.warn("Use Flask directly.")
+            logger.warn("Options like \"num_threads\", \"num_workers\" are ignored.")
+            return flask_server.run(host=host, port=port)
+
 
 class JSONDumper:
 
@@ -261,6 +280,11 @@ class FlaskServer(Flask):
         for fn, api_info in list_api_info(self):
             method = api_info.method
             path = api_info.path
+
+            if any(api_info.path == a.path for _, a in self.api_info_list):
+                logger.info(f"Use custom implementation of {path}.")
+                continue
+
             if asyncio.iscoroutinefunction(fn):
                 logger.error(f"Async function \"{fn.__name__}\" is not supported.")
                 continue
@@ -368,3 +392,4 @@ def run_service(
     for name, value in options.items():
         logger.info(f"Option {name}: {value}")
     GunicornApplication(service_type, service_config, options).run()
+

{libentry-1.15.dist-info → libentry-1.17.dist-info}/METADATA

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

{libentry-1.15.dist-info → libentry-1.17.dist-info}/RECORD

@@ -1,5 +1,5 @@
 libentry/__init__.py,sha256=rDBip9M1Xb1N4wMKE1ni_DldrQbkRjp8DxPkTp3K2qo,170
-libentry/api.py,sha256=OZ-KZvSV2sWHshYB6vgS-qIu1P6bdfqcMCrOQs-_RwA,10114
+libentry/api.py,sha256=zvW4YugZ7k0wmVVFTnOYHgNqWQPf8zTTPYOnED-iUJM,10097
 libentry/argparse.py,sha256=NxzXV-jBN51ReZsNs5aeyOfzwYQ5A5nJ95rWoa-FYCs,10415
 libentry/dataclasses.py,sha256=AQV2PuxplJCwGZ5HKX72U-z-POUhTdy3XtpEK9KNIGQ,4541
 libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
@@ -10,14 +10,14 @@ libentry/schema.py,sha256=BO7EE7i43Cb4xn_OLsBM-HDwWOT6V5fPs91Am3QqnNQ,8178
 libentry/server.py,sha256=gYPoZXd0umlDYZf-6ZV0_vJadg3YQvnLDc6JFDJh9jc,1503
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/service/common.py,sha256=OVaW2afgKA6YqstJmtnprBCqQEUZEWotZ6tHavmJJeU,42
-libentry/service/flask.py,sha256=0sYFI8TJY65AEs-gNJdoKqg8_eWk4rSOfKMPauzHQLc,12550
+libentry/service/flask.py,sha256=Alpsix01ROqI28k-dabD8wJlWAWs-ObNc1nJ-LxOXn4,13349
 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.15.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.15.dist-info/METADATA,sha256=Vlvcl_kB5qp_0xM_eLNJykdEzv0slsqh7LitUa-dpo4,791
-libentry-1.15.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-libentry-1.15.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.15.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.15.dist-info/RECORD,,
+libentry-1.17.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.17.dist-info/METADATA,sha256=6kVrTOffjfB4RzkedsLggG0DVy8la9fIx2c3iP7cuAw,791
+libentry-1.17.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+libentry-1.17.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.17.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.17.dist-info/RECORD,,