libentry 1.11.4__py3-none-any.whl → 1.11.6__py3-none-any.whl

libentry/api.py

@@ -11,6 +11,7 @@ __all__ = [
 ]
 
 from dataclasses import dataclass, field
+from time import sleep
 from typing import Any, Callable, Iterable, List, Literal, Mapping, Optional, Tuple
 from urllib.parse import urljoin
 
@@ -31,6 +32,7 @@ class APIInfo:
     chunk_suffix: str = field(default=None)
     stream_prefix: str = field(default=None)
     stream_suffix: str = field(default=None)
+    error_prefix: str = field(default="ERROR: ")
     extra_info: Mapping[str, Any] = field(default_factory=dict)
 
 
@@ -189,9 +191,48 @@ class APIClient:
             self.headers["Authorization"] = f"Bearer {api_key}"
         self.verify = verify
 
-    def get(self, path: str, timeout=60):
+    def _request(
+            self,
+            method: str,
+            url: str,
+            num_trials: int = 5,
+            retry_interval: int = 5,
+            retry_factor: float = 2,
+            timeout: float = 5,
+            **kwargs
+    ):
+        err = None
+        for _ in range(num_trials):
+            try:
+                return requests.request(method, url, timeout=timeout, **kwargs)
+            except requests.Timeout as e:
+                err = e
+            except requests.ConnectionError as e:
+                err = e
+                sleep(retry_interval)
+            timeout *= retry_factor
+            retry_interval *= retry_factor
+        raise err
+
+    def get(
+            self,
+            path: str,
+            num_trials: int = 5,
+            retry_interval: int = 5,
+            retry_factor: float = 2,
+            timeout: float = 5
+    ):
         api_url = urljoin(self.base_url, path)
-        response = requests.get(api_url, headers=self.headers, verify=self.verify, timeout=timeout)
+        response = self._request(
+            "get",
+            url=api_url,
+            headers=self.headers,
+            verify=self.verify,
+            num_trials=num_trials,
+            retry_interval=retry_interval,
+            retry_factor=retry_factor,
+            timeout=timeout
+        )
 
         if response.status_code != 200:
             text = response.text
@@ -207,21 +248,29 @@ class APIClient:
             self,
             path: str,
             json_data: Optional[Mapping] = None,
-            stream=False,
-            timeout=60,
+            stream: bool = False,
+            num_trials: int = 5,
+            retry_interval: int = 5,
+            retry_factor: float = 2,
+            timeout: float = 5,
             chunk_delimiter: str = "\n\n",
             chunk_prefix: str = None,
             chunk_suffix: str = None,
+            error_prefix: str = "ERROR: "
     ):
         full_url = urljoin(self.base_url, path)
 
         data = json.dumps(json_data) if json_data is not None else None
-        response = requests.post(
-            full_url,
+        response = self._request(
+            "post",
+            url=full_url,
             headers=self.headers,
             data=data,
             verify=self.verify,
             stream=stream,
+            num_trials=num_trials,
+            retry_interval=retry_interval,
+            retry_factor=retry_factor,
             timeout=timeout
         )
         if response.status_code != 200:
@@ -239,6 +288,7 @@ class APIClient:
                     chunk_delimiter=chunk_delimiter.encode() if chunk_delimiter else None,
                     chunk_prefix=chunk_prefix.encode() if chunk_prefix else None,
                     chunk_suffix=chunk_suffix.encode() if chunk_suffix else None,
+                    error_prefix=error_prefix.encode() if error_prefix else None,
                 )
         else:
             try:
@@ -251,13 +301,26 @@ class APIClient:
             response: requests.Response,
             chunk_delimiter: bytes,
             chunk_prefix: bytes,
-            chunk_suffix: bytes
+            chunk_suffix: bytes,
+            error_prefix: bytes
     ) -> Iterable:
         try:
+            error = None
             for chunk in response.iter_lines(decode_unicode=False, delimiter=chunk_delimiter):
+                if error is not None:
+                    # error is not None means there is a fatal exception raised from the server side.
+                    # The client should just complete the stream and then raise the error to the upper.
+                    continue
+
                 if not chunk:
                     continue
 
+                if error_prefix is not None:
+                    if chunk.startswith(error_prefix):
+                        chunk = chunk[len(error_prefix):]
+                        error = ServiceError(chunk)
+                        continue
+
                 if chunk_prefix is not None:
                     if chunk.startswith(chunk_prefix):
                         chunk = chunk[len(chunk_prefix):]
@@ -271,5 +334,8 @@ class APIClient:
                         continue
 
                 yield _load_json_or_str(chunk)
+
+            if error is not None:
+                raise error
         finally:
             response.close()

libentry/service/flask.py

@@ -33,16 +33,27 @@ class JSONDumper:
         if self.api_info.chunk_delimiter is not None:
             yield self.api_info.chunk_delimiter
 
-        for item in response:
-            text = self.dump(item)
+        try:
+            for item in response:
+                text = self.dump(item)
 
-            if self.api_info.chunk_prefix is not None:
-                yield self.api_info.chunk_prefix
+                if self.api_info.chunk_prefix is not None:
+                    yield self.api_info.chunk_prefix
 
-            yield text
+                yield text
 
-            if self.api_info.chunk_suffix is not None:
-                yield self.api_info.chunk_suffix
+                if self.api_info.chunk_suffix is not None:
+                    yield self.api_info.chunk_suffix
+
+                if self.api_info.chunk_delimiter is not None:
+                    yield self.api_info.chunk_delimiter
+        except Exception as e:
+            if isinstance(e, (SystemExit, KeyboardInterrupt)):
+                raise e
+            if self.api_info.error_prefix is not None:
+                yield self.api_info.error_prefix
+
+            yield self.dump_error(e)
 
             if self.api_info.chunk_delimiter is not None:
                 yield self.api_info.chunk_delimiter
@@ -65,6 +76,19 @@ class JSONDumper:
             except TypeError:
                 return repr(response)
 
+    @staticmethod
+    def dump_error(e: Exception) -> str:
+        err_cls = e.__class__
+        err_name = err_cls.__name__
+        module = err_cls.__module__
+        if module != "builtins":
+            err_name = f"{module}.{err_name}"
+        return json.dumps({
+            "error": err_name,
+            "message": str(e),
+            "traceback": traceback.format_exc()
+        }, indent=2)
+
 
 def create_model_from_signature(fn):
     sig = signature(fn)
@@ -122,14 +146,14 @@ class FlaskWrapper:
             except Exception as e:
                 if isinstance(e, (SystemExit, KeyboardInterrupt)):
                     raise e
-                return self.app.error(self.make_err(e))
+                return self.app.error(self.dumper.dump_error(e))
         else:
             try:
                 response = self.fn(**input_json)
             except Exception as e:
                 if isinstance(e, (SystemExit, KeyboardInterrupt)):
                     raise e
-                return self.app.error(self.make_err(e))
+                return self.app.error(self.dumper.dump_error(e))
 
         if isinstance(response, (GeneratorType, range)):
             return self.app.response_class(
@@ -142,19 +166,6 @@ class FlaskWrapper:
                 mimetype=self.api_info.mime_type
             )
 
-    @staticmethod
-    def make_err(e):
-        err_cls = e.__class__
-        err_name = err_cls.__name__
-        module = err_cls.__module__
-        if module != "builtins":
-            err_name = f"{module}.{err_name}"
-        return json.dumps({
-            "error": err_name,
-            "message": str(e),
-            "traceback": traceback.format_exc()
-        }, indent=2)
-
 
 class CustomGenerateJsonSchema(GenerateJsonSchema):
 
@@ -260,8 +271,10 @@ def run_service(
         host: str = "0.0.0.0",
         port: int = 8888,
         num_workers: int = 1,
-        num_threads: int = 10,
-        num_connections: int = 2000,
+        num_threads: int = 20,
+        num_connections: Optional[int] = 100,
+        backlog: Optional[int] = 100,
+        worker_class: str = "gthread",
         timeout: int = 60,
         keyfile: Optional[str] = None,
         certfile: Optional[str] = None
@@ -272,9 +285,11 @@ def run_service(
         "workers": num_workers,
         "threads": num_threads,
         "timeout": timeout,
-        "worker_connections": num_connections,
+        "worker_connections": num_connections if num_connections else num_threads,
+        "backlog": backlog if backlog else num_threads,
         "keyfile": keyfile,
         "certfile": certfile,
+        "worker_class": worker_class
     }
     for name, value in options.items():
         logger.info(f"Option {name}: {value}")

{libentry-1.11.4.dist-info → libentry-1.11.6.dist-info}/METADATA

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

{libentry-1.11.4.dist-info → libentry-1.11.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 libentry/__init__.py,sha256=rDBip9M1Xb1N4wMKE1ni_DldrQbkRjp8DxPkTp3K2qo,170
-libentry/api.py,sha256=2I52bVwJPxr_FTHCn4fCm08lGpNofcp9JGWz8JJJq4A,7934
+libentry/api.py,sha256=IajZ1oSSsFfB7Gc4QUCGy8uUqxrtFov1LTsMg06ck0Y,10067
 libentry/argparse.py,sha256=Bk11H4WRKxcjMlSd0mjWj1T4NWh0JW5eA7TX3C21IoE,10116
 libentry/dataclasses.py,sha256=AQV2PuxplJCwGZ5HKX72U-z-POUhTdy3XtpEK9KNIGQ,4541
 libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
@@ -9,14 +9,14 @@ libentry/logging.py,sha256=IiYoCUzm8XTK1fduA-NA0FI2Qz_m81NEPV3d3tEfgdI,1349
 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=TZGyDXWh5r93uxklSpP7cKmD2r0ZswplMUK91Hxo4Do,9169
+libentry/service/flask.py,sha256=71FcjawjfoNG4p0hUWyPpiQ8X5Ao4zsTqt_UEbnSMRc,9842
 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.11.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.11.4.dist-info/METADATA,sha256=bWMkqIhQ4ro2pebBCS7tRNdvXEiOwWy7g2mmVSB1098,500
-libentry-1.11.4.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
-libentry-1.11.4.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.11.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.11.4.dist-info/RECORD,,
+libentry-1.11.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.11.6.dist-info/METADATA,sha256=pQ_nA2SJrcmSEX-_y-ljBsTP3C7j70onmqtU8IWXFeY,500
+libentry-1.11.6.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
+libentry-1.11.6.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.11.6.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.11.6.dist-info/RECORD,,