libentry 1.11.8__py3-none-any.whl → 1.11.10__py3-none-any.whl

libentry/api.py

@@ -217,7 +217,7 @@ class APIClient:
             path: str,
             num_trials: int = 5,
             retry_factor: float = 2,
-            timeout: float = 5
+            timeout: float = 15
     ):
         api_url = urljoin(self.base_url, path)
         response = self._request(
@@ -248,7 +248,7 @@ class APIClient:
             exhaust_stream: bool = False,
             num_trials: int = 5,
             retry_factor: float = 2,
-            timeout: float = 5,
+            timeout: float = 15,
             chunk_delimiter: str = "\n\n",
             chunk_prefix: str = None,
             chunk_suffix: str = None,
@@ -256,10 +256,8 @@ class APIClient:
     ):
         full_url = urljoin(self.base_url, path)
 
-        headers = self.headers
-        if stream:
-            headers = {**headers}
-            headers["Accept"] = headers["Accept"] + "-stream"
+        headers = {**self.headers}
+        headers["Accept"] = headers["Accept"] + f"; stream={int(stream)}"
         data = json.dumps(json_data) if json_data is not None else None
         response = self._request(
             "post",

libentry/service/flask.py

@@ -6,6 +6,7 @@ __all__ = [
 ]
 
 import asyncio
+import re
 import traceback
 from inspect import signature
 from types import GeneratorType
@@ -32,8 +33,8 @@ class JSONDumper:
         if self.api_info.stream_prefix is not None:
             yield self.api_info.stream_prefix
 
-        if self.api_info.chunk_delimiter is not None:
-            yield self.api_info.chunk_delimiter
+            if self.api_info.chunk_delimiter is not None:
+                yield self.api_info.chunk_delimiter
 
         try:
             it = iter(response)
@@ -59,6 +60,7 @@ class JSONDumper:
         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
 
@@ -70,12 +72,15 @@ class JSONDumper:
         if self.api_info.stream_suffix is not None:
             yield self.api_info.stream_suffix
 
-        if self.api_info.chunk_delimiter is not None:
-            yield self.api_info.chunk_delimiter
+            if self.api_info.chunk_delimiter is not None:
+                yield self.api_info.chunk_delimiter
 
         if return_value is not None:
             yield self.dump(return_value)
 
+            if self.api_info.chunk_delimiter is not None:
+                yield self.api_info.chunk_delimiter
+
     @staticmethod
     def dump(response) -> str:
         if response is None:
@@ -144,9 +149,6 @@ class FlaskWrapper:
                     self.input_schema = value.annotation
 
     def __call__(self):
-        print("*" * 10)
-        print(request.headers)
-        print("*" * 10)
         if request.method == "POST":
             input_json = json.loads(request.data) if request.data else {}
         elif request.method == "GET":
@@ -170,30 +172,50 @@ class FlaskWrapper:
                     raise e
                 return self.app.error(self.dumper.dump_error(e))
 
-        stream = request.headers.get("Accept", "").endswith("-stream")
-        if stream:
-            if not isinstance(response, (GeneratorType, range)):
-                response = [response]
-            return self.app.ok(
-                self.dumper.dump_stream(response),
-                mimetype=self.api_info.mime_type
-            )
+        stream = None
+        accept = request.headers.get("Accept", "")
+        for param in accept.split(";"):
+            match = re.search(r"^\s*stream=(.+)$", param)
+            if match:
+                stream = match.group(1)
+                stream = stream in {"1", "true", "True"}
+                break
+
+        if stream is not None:
+            if stream:
+                if not isinstance(response, (GeneratorType, range)):
+                    response = [response]
+                return self.app.ok(
+                    self.dumper.dump_stream(response),
+                    mimetype=self.api_info.mime_type
+                )
+            else:
+                if isinstance(response, (GeneratorType, range)):
+                    output = []
+                    it = iter(response)
+                    while True:
+                        try:
+                            output.append(next(it))
+                        except StopIteration as e:
+                            if e.value is not None:
+                                output.append(e.value)
+                            break
+                    response = output
+                return self.app.ok(
+                    self.dumper.dump(response),
+                    mimetype=self.api_info.mime_type
+                )
         else:
             if isinstance(response, (GeneratorType, range)):
-                output = []
-                it = iter(response)
-                while True:
-                    try:
-                        output.append(next(it))
-                    except StopIteration as e:
-                        if e.value is not None:
-                            output.append(e.value)
-                        break
-                response = output
-            return self.app.ok(
-                self.dumper.dump(response),
-                mimetype=self.api_info.mime_type
-            )
+                return self.app.ok(
+                    self.dumper.dump_stream(response),
+                    mimetype=self.api_info.mime_type
+                )
+            else:
+                return self.app.ok(
+                    self.dumper.dump(response),
+                    mimetype=self.api_info.mime_type
+                )
 
 
 class CustomGenerateJsonSchema(GenerateJsonSchema):

{libentry-1.11.8.dist-info → libentry-1.11.10.dist-info}/METADATA

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

{libentry-1.11.8.dist-info → libentry-1.11.10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 libentry/__init__.py,sha256=rDBip9M1Xb1N4wMKE1ni_DldrQbkRjp8DxPkTp3K2qo,170
-libentry/api.py,sha256=arv2CfcZA3XfwyNh_V2NZD16_GIKGSPliwPgvdPjIuk,10066
+libentry/api.py,sha256=BWPeeHEgExWt0NOejH6v76baDLv4OxMoBqi1KsdaDeU,10031
 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/server.py,sha256=gYPoZXd0umlDYZf-6ZV0_vJadg3YQvnLDc6JFDJh9jc,1503
 libentry/start_service.py,sha256=Mm0HRwikW1KcDsnkK_Jo2QlNqe5BBBgMqtGd9jZxX1o,1902
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/service/common.py,sha256=OVaW2afgKA6YqstJmtnprBCqQEUZEWotZ6tHavmJJeU,42
-libentry/service/flask.py,sha256=A8BJ4EMgRLwOVknnhuQYaceCEONcIl5RQnTQ2Q1qyW8,10809
+libentry/service/flask.py,sha256=x3R_DJElxxWkuaO4zY5A0ze0y5diUgsfHMwsyvMKtnE,11643
 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.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.11.8.dist-info/METADATA,sha256=6FeQU10fPl7lFCmX6l1P5754bnaiFBUbeqPw1d7bXwU,500
-libentry-1.11.8.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-libentry-1.11.8.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.11.8.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.11.8.dist-info/RECORD,,
+libentry-1.11.10.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.11.10.dist-info/METADATA,sha256=07AZ2hkh4xxZEaN9Yz5eun-_SnfttEcmAGWarWJWxXY,501
+libentry-1.11.10.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+libentry-1.11.10.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.11.10.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.11.10.dist-info/RECORD,,