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

libentry/api.py

@@ -196,7 +196,6 @@ class APIClient:
             method: str,
             url: str,
             num_trials: int = 5,
-            retry_interval: int = 5,
             retry_factor: float = 2,
             timeout: float = 5,
             **kwargs
@@ -209,16 +208,14 @@ class APIClient:
                 err = e
             except requests.ConnectionError as e:
                 err = e
-                sleep(retry_interval)
+                sleep(timeout)
             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
     ):
@@ -229,7 +226,6 @@ class APIClient:
             headers=self.headers,
             verify=self.verify,
             num_trials=num_trials,
-            retry_interval=retry_interval,
             retry_factor=retry_factor,
             timeout=timeout
         )
@@ -247,10 +243,10 @@ class APIClient:
     def post(
             self,
             path: str,
-            json_data: Optional[Mapping] = None,
+            json_data: Optional[Mapping] = None, *,
             stream: bool = False,
+            exhaust_stream: bool = False,
             num_trials: int = 5,
-            retry_interval: int = 5,
             retry_factor: float = 2,
             timeout: float = 5,
             chunk_delimiter: str = "\n\n",
@@ -260,16 +256,19 @@ class APIClient:
     ):
         full_url = urljoin(self.base_url, path)
 
+        headers = self.headers
+        if stream:
+            headers = {**headers}
+            headers["Accept"] = headers["Accept"] + "-stream"
         data = json.dumps(json_data) if json_data is not None else None
         response = self._request(
             "post",
             url=full_url,
-            headers=self.headers,
+            headers=headers,
             data=data,
             verify=self.verify,
             stream=stream,
             num_trials=num_trials,
-            retry_interval=retry_interval,
             retry_factor=retry_factor,
             timeout=timeout
         )
@@ -283,13 +282,14 @@ class APIClient:
                 # TODO: this branch is not tested yet!
                 return response.iter_content(decode_unicode=True)
             else:
-                return self._iter_chunks(
+                gen = self._iter_chunks(
                     response=response,
                     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,
                 )
+                return gen if not exhaust_stream else [*gen]
         else:
             try:
                 return _load_json_or_str(response.text)

libentry/argparse.py

@@ -106,11 +106,16 @@ class ArgumentParser(argparse.ArgumentParser):
     def add_schema(self, name: str, schema: Type[BaseModel], default: Union[str, BaseModel] = None):
         if default is not None:
             if isinstance(default, str):
-                default_json = yaml.load(default, yaml.FullLoader)
+                default_json = yaml.safe_load(default)
+                if isinstance(default_json, str):
+                    with open(default_json, "r") as f:
+                        default_json = yaml.safe_load(f)
+                if not isinstance(default_json, dict):
+                    raise ValueError(f"Invalid default value for \"{name}\".")
             elif isinstance(default, BaseModel):
                 default_json = default.model_dump()
             else:
-                raise TypeError(f"Invalid default type {type(default)}.")
+                raise TypeError(f"Invalid default type {type(default)} for \"{name}\".")
             default_flat_dict = {}
             self._json_flatten(name, default_json, default_flat_dict)
             default = default_flat_dict

libentry/service/flask.py

@@ -26,7 +26,9 @@ class JSONDumper:
     def __init__(self, api_info: APIInfo):
         self.api_info = api_info
 
-    def dump_stream(self, response: Iterable):
+    def dump_stream(self, response: Iterable) -> Iterable[str]:
+        return_value = None
+
         if self.api_info.stream_prefix is not None:
             yield self.api_info.stream_prefix
 
@@ -34,7 +36,14 @@ class JSONDumper:
             yield self.api_info.chunk_delimiter
 
         try:
-            for item in response:
+            it = iter(response)
+            while True:
+                try:
+                    item = next(it)
+                except StopIteration as e:
+                    return_value = e.value
+                    break
+
                 text = self.dump(item)
 
                 if self.api_info.chunk_prefix is not None:
@@ -64,6 +73,9 @@ class JSONDumper:
         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)
+
     @staticmethod
     def dump(response) -> str:
         if response is None:
@@ -132,6 +144,9 @@ 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":
@@ -155,13 +170,27 @@ class FlaskWrapper:
                     raise e
                 return self.app.error(self.dumper.dump_error(e))
 
-        if isinstance(response, (GeneratorType, range)):
-            return self.app.response_class(
+        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
             )
         else:
-            return self.app.response_class(
+            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
             )
@@ -224,7 +253,7 @@ class FlaskServer(Flask):
 
         return self.error(f"No API named \"{name}\"")
 
-    def ok(self, body: str, mimetype="application/json"):
+    def ok(self, body: Union[str, Iterable[str]], mimetype="application/json"):
         return self.response_class(body, status=200, mimetype=mimetype)
 
     def error(self, body: str, mimetype="text"):

libentry/start_service.py

@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+
+__author__ = "xi"
+
+import os
+import subprocess
+from cgi import parse
+from typing import Dict, List, Optional
+
+import yaml
+from pydantic import BaseModel, Field
+
+from libentry import ArgumentParser
+
+
+class Config(BaseModel):
+    exec: str = Field()
+    envs: Dict[str, str] = Field(default_factory=dict)
+    stdout: Optional[str] = Field(default="-")
+    stderr: Optional[str] = Field(default="-")
+
+
+class Status(BaseModel):
+    pid: int = Field()
+
+
+def main():
+    parser = ArgumentParser()
+    parser.add_argument("--config_dir", "-d")
+    parser.add_argument("--config_filename", "-f", default="config.json")
+    parser.add_argument("--status_filename", default="status.json")
+    args = parser.parse_args()
+
+    config_dir = args.config_dir
+    if config_dir is None:
+        config_dir = os.getcwd()
+    config_dir = os.path.abspath(config_dir)
+    os.chdir(config_dir)
+
+    if not os.path.exists(args.config_filename):
+        raise FileNotFoundError(f"Cannot find \"{args.config_filename}\".")
+
+    with open(args.config_filename) as f:
+        config = Config.model_validate(yaml.safe_load(f))
+
+    if config.stdout == "-":
+        stdout = None
+    elif config.stdout is None:
+        stdout = subprocess.DEVNULL
+    else:
+        stdout = open(config.stdout, "a")
+    if config.stderr == "-":
+        stderr = None
+    elif config.stderr is None:
+        stderr = subprocess.DEVNULL
+    else:
+        stderr = open(config.stderr, "a")
+
+    process = subprocess.Popen(
+        ["/bin/bash", "-c", config["exec"]],
+        cwd=os.getcwd(),
+        env={**os.environ, **config.envs} if len(config.envs) > 0 else None,
+        preexec_fn=os.setpgrp,
+        stdout=stdout,
+        stderr=stderr
+    )
+    pgid = os.getpgid(process.pid)
+    with open(PID_FILENAME, "w") as f:
+        f.write(str(pgid))
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())

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

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

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

@@ -1,22 +1,23 @@
 libentry/__init__.py,sha256=rDBip9M1Xb1N4wMKE1ni_DldrQbkRjp8DxPkTp3K2qo,170
-libentry/api.py,sha256=IajZ1oSSsFfB7Gc4QUCGy8uUqxrtFov1LTsMg06ck0Y,10067
-libentry/argparse.py,sha256=Bk11H4WRKxcjMlSd0mjWj1T4NWh0JW5eA7TX3C21IoE,10116
+libentry/api.py,sha256=arv2CfcZA3XfwyNh_V2NZD16_GIKGSPliwPgvdPjIuk,10066
+libentry/argparse.py,sha256=NxzXV-jBN51ReZsNs5aeyOfzwYQ5A5nJ95rWoa-FYCs,10415
 libentry/dataclasses.py,sha256=AQV2PuxplJCwGZ5HKX72U-z-POUhTdy3XtpEK9KNIGQ,4541
 libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
 libentry/experiment.py,sha256=ejgAHDXWIe9x4haUzIFuz1WasLY0_aD1z_vyEVGjTu8,4922
 libentry/json.py,sha256=1-Kv5ZRb5dBrOTU84n6sZtYZV3xE-O6wEt_--ynbSaU,1209
 libentry/logging.py,sha256=IiYoCUzm8XTK1fduA-NA0FI2Qz_m81NEPV3d3tEfgdI,1349
 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=71FcjawjfoNG4p0hUWyPpiQ8X5Ao4zsTqt_UEbnSMRc,9842
+libentry/service/flask.py,sha256=A8BJ4EMgRLwOVknnhuQYaceCEONcIl5RQnTQ2Q1qyW8,10809
 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.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,,
+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.6.dist-info → libentry-1.11.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.36.2)
+Generator: bdist_wheel (0.37.1)
 Root-Is-Purelib: true
 Tag: py3-none-any