libentry 1.16__py3-none-any.whl → 1.18__py3-none-any.whl

libentry/api.py

@@ -166,6 +166,9 @@ class ServiceError(RuntimeError):
         return "".join(lines)
 
 
+ErrorCallback = Callable[[Exception], None]
+
+
 class APIClient:
 
     def __init__(
@@ -195,29 +198,41 @@ class APIClient:
             self,
             method: str,
             url: str,
-            num_trials: int = 5,
-            retry_factor: float = 2,
-            timeout: float = 5,
+            num_trials: int,
+            timeout: float,
+            interval: float,
+            retry_factor: float,
+            on_error: Optional[ErrorCallback] = None,
             **kwargs
     ):
         err = None
-        for _ in range(num_trials):
+        for i in range(num_trials):
             try:
-                return requests.request(method, url, timeout=timeout, **kwargs)
+                return requests.request(
+                    method=method,
+                    url=url,
+                    timeout=timeout * (1 + i * retry_factor),
+                    **kwargs
+                )
             except requests.Timeout as e:
                 err = e
+                if callable(on_error):
+                    on_error(e)
             except requests.ConnectionError as e:
                 err = e
-                sleep(timeout)
-            timeout *= retry_factor
+                if callable(on_error):
+                    on_error(e)
+            sleep(interval)
         raise err
 
     def get(
             self,
             path: Optional[str] = None, *,
             num_trials: int = 5,
-            retry_factor: float = 2,
-            timeout: float = 15
+            timeout: float = 15,
+            interval: float = 1,
+            retry_factor: float = 0.5,
+            on_error: Optional[ErrorCallback] = None
     ):
         full_url = urljoin(self.base_url, path)
         response = self._request(
@@ -226,8 +241,10 @@ class APIClient:
             headers=self.headers,
             verify=self.verify,
             num_trials=num_trials,
+            timeout=timeout,
+            interval=interval,
             retry_factor=retry_factor,
-            timeout=timeout
+            on_error=on_error
         )
 
         if response.status_code != 200:
@@ -247,8 +264,10 @@ class APIClient:
             stream: bool = False,
             exhaust_stream: bool = False,
             num_trials: int = 5,
-            retry_factor: float = 2,
             timeout: float = 15,
+            interval: float = 1,
+            retry_factor: float = 0.5,
+            on_error: Optional[ErrorCallback] = None,
             chunk_delimiter: str = "\n\n",
             chunk_prefix: str = None,
             chunk_suffix: str = None,
@@ -267,8 +286,10 @@ class APIClient:
             verify=self.verify,
             stream=stream,
             num_trials=num_trials,
+            timeout=timeout,
+            interval=interval,
             retry_factor=retry_factor,
-            timeout=timeout
+            on_error=on_error
         )
         if response.status_code != 200:
             text = response.text

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:
 
@@ -373,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.16.dist-info → libentry-1.18.dist-info}/METADATA

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

{libentry-1.16.dist-info → libentry-1.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 libentry/__init__.py,sha256=rDBip9M1Xb1N4wMKE1ni_DldrQbkRjp8DxPkTp3K2qo,170
-libentry/api.py,sha256=zvW4YugZ7k0wmVVFTnOYHgNqWQPf8zTTPYOnED-iUJM,10097
+libentry/api.py,sha256=LqTa8T8Oh8z5BybzrgtdC0HhMXWL2-DZPdOdBHb6Vl0,10753
 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=obFIfm7WVNr_wQsUDO9zFMH2RbfqPHAeqQq9vCpiyWg,12722
+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.16.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.16.dist-info/METADATA,sha256=5EyO2Vs582BzElenZhG1qs7ccPV4-4GRoR7OS9Ctnxk,791
-libentry-1.16.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-libentry-1.16.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.16.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.16.dist-info/RECORD,,
+libentry-1.18.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.18.dist-info/METADATA,sha256=3LKED9qfL_-_CvMdtfNW2YnoK1LBDdnQxN7Bf2_ZsKE,791
+libentry-1.18.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+libentry-1.18.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.18.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.18.dist-info/RECORD,,