libentry 1.21.3__py3-none-any.whl → 1.22__py3-none-any.whl

libentry/api.py

@@ -14,7 +14,7 @@ import asyncio
 from dataclasses import dataclass, field
 from time import sleep
 from typing import Any, AsyncIterable, Callable, Iterable, List, Literal, Mapping, Optional, Tuple, Union
-from urllib.parse import urljoin
+from urllib.parse import urlencode, urljoin
 
 import httpx
 from urllib3 import PoolManager
@@ -217,10 +217,7 @@ class BaseClient:
             stream: bool,
             verify: bool,
     ) -> Union[bytes, Iterable[bytes]]:
-        if headers is None:
-            headers = self.headers
-        else:
-            headers = {**self.headers, **headers}
+        headers = self.headers if headers is None else {**self.headers, **headers}
         response = self.URLLIB3_POOL[int(verify)].request(
             method=method,
             url=url,
@@ -309,10 +306,7 @@ class BaseClient:
             stream: bool,
             verify: bool,
     ):
-        if headers is None:
-            headers = self.headers
-        else:
-            headers = {**self.headers, **headers}
+        headers = self.headers if headers is None else {**self.headers, **headers}
         if not stream:
             async with httpx.AsyncClient(headers=headers, verify=verify) as client:
                 response = await client.request(
@@ -392,6 +386,19 @@ class BaseClient:
 
 class APIClient(BaseClient):
 
+    @staticmethod
+    def _encode_params(data):
+        result = []
+        for k, v in data.items():
+            if v is not None:
+                result.append(
+                    (
+                        k.encode("utf-8") if isinstance(k, str) else k,
+                        v.encode("utf-8") if isinstance(v, str) else v,
+                    )
+                )
+        return urlencode(result, doseq=True)
+
     def request(
             self,
             method: Literal["GET", "POST"],
@@ -417,7 +424,14 @@ class APIClient(BaseClient):
             headers = {}
         accept = headers["Accept"] if "Accept" in headers else self.headers["Accept"]
         headers["Accept"] = accept + f"; stream={int(stream)}"
-        body = json.dumps(json_data) if json_data is not None else None
+        content_type = headers.get("Content-Type")
+        if content_type is None or content_type == "application/json":
+            body = json.dumps(json_data) if json_data is not None else None
+        elif content_type == "application/x-www-form-urlencoded":
+            body = self._encode_params(json_data)
+        else:
+            raise ValueError(f"Unsupported content type \"{content_type}\".")
+
         content = super().request(
             method,
             full_url,
@@ -571,7 +585,14 @@ class APIClient(BaseClient):
             headers = {}
         accept = headers["Accept"] if "Accept" in headers else self.headers["Accept"]
         headers["Accept"] = accept + f"; stream={int(stream)}"
-        body = json.dumps(json_data) if json_data is not None else None
+        content_type = headers.get("Content-Type")
+        if content_type is None or content_type == "application/json":
+            body = json.dumps(json_data) if json_data is not None else None
+        elif content_type == "application/x-www-form-urlencoded":
+            body = self._encode_params(json_data)
+        else:
+            raise ValueError(f"Unsupported content type \"{content_type}\".")
+
         content = await super().request_async(
             method,
             full_url,

libentry/json.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+__author__ = "xi"
 __all__ = [
     "dump",
     "dumps",
@@ -13,41 +14,35 @@ from functools import partial
 
 import numpy as np
 
+_BINDINGS = []
 
-def encode_ndarray(a: np.ndarray):
-    shape = a.shape
-    dtype = a.dtype
-    data = a.tobytes(order="C")
-    data = b64encode(data).decode()
-    return {
-        "__TYPE__": "numpy",
-        "shape": shape,
-        "dtype": str(dtype),
-        "data": data
-    }
 
+def bind(name, type_):
+    def _wrapper(cls):
+        _BINDINGS.append((name, type_, cls()))
+        return cls
 
-def decode_ndarray(d):
-    shape = d["shape"]
-    dtype = d["dtype"]
-    buffer = b64decode(d["data"].encode())
-    return np.frombuffer(buffer, dtype=dtype).reshape(shape)
+    return _wrapper
 
 
-def custom_encode(o):
-    if isinstance(o, np.ndarray):
-        return encode_ndarray(o)
+def custom_encode(o) -> dict:
+    for name, type_, support in _BINDINGS:
+        if isinstance(o, type_):
+            doc = support.encode(o)
+            doc["__TYPE__"] = name
+            return doc
     raise TypeError(f"Object of type {o.__class__.__name__} is not JSON serializable")
 
 
-def custom_decode(d):
+def custom_decode(d: dict):
     __type__ = d.get("__TYPE__")
     if __type__ is None:
         return d
-    if __type__ == "numpy":
-        return decode_ndarray(d)
-    else:
-        return d
+
+    for name, _, support in _BINDINGS:
+        if __type__ == name:
+            return support.decode(d)
+    return d
 
 
 dump = partial(json.dump, default=custom_encode)
@@ -55,3 +50,36 @@ dumps = partial(json.dumps, default=custom_encode)
 
 load = partial(json.load, object_hook=custom_decode)
 loads = partial(json.loads, object_hook=custom_decode)
+
+
+@bind("bytes", bytes)
+class BytesSupport:
+
+    def encode(self, o: bytes) -> dict:
+        return {
+            "data": b64encode(o).decode(),
+        }
+
+    def decode(self, d: dict) -> bytes:
+        return b64decode(d["data"])
+
+
+@bind("numpy", np.ndarray)
+class NumpySupport:
+
+    def encode(self, a):
+        shape = a.shape
+        dtype = a.dtype
+        data = a.tobytes(order="C")
+        data = b64encode(data).decode()
+        return {
+            "data": data,
+            "shape": shape,
+            "dtype": str(dtype),
+        }
+
+    def decode(self, d):
+        shape = d["shape"]
+        dtype = d["dtype"]
+        buffer = b64decode(d["data"].encode())
+        return np.frombuffer(buffer, dtype=dtype).reshape(shape)

libentry/utils.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+__author__ = "xi"
+__all__ = [
+    "Timer"
+]
+
+import time
+
+
+class Timer:
+
+    def __init__(self):
+        self.start_time = None
+        self.end_time = None
+        self.cost = None
+
+    def __enter__(self):
+        self.start()
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.end()
+
+    def start(self):
+        self.start_time = time.perf_counter()
+        self.end_time = None
+        self.cost = None
+
+    def end(self):
+        if self.start_time is None:
+            raise RuntimeError("The timer has not started yet.")
+        self.end_time = time.perf_counter()
+        self.cost = self.end_time - self.start_time

{libentry-1.21.3.dist-info → libentry-1.22.dist-info}/METADATA

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

{libentry-1.21.3.dist-info → libentry-1.22.dist-info}/RECORD

@@ -1,13 +1,14 @@
 libentry/__init__.py,sha256=ko2YBIIx5H3dD0tedBkialzJGEDczFaP_PZmT1cIlak,148
-libentry/api.py,sha256=ei67QL_PEMs1J_utCuh5MifPbAw17BOYnaYtc8d35UY,22923
+libentry/api.py,sha256=yB5iquRa4RZO0XMcs1Xx8mjI6dQcKJ0j4r9C4JB-j2s,23931
 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/json.py,sha256=Rigg8H3oWooI9bNfIpx9mSOcoc3aTigy_-BHiPIv8kY,1821
 libentry/logging.py,sha256=IiYoCUzm8XTK1fduA-NA0FI2Qz_m81NEPV3d3tEfgdI,1349
 libentry/schema.py,sha256=o6JcdR00Yj4_Qjmlo100OlQpMVnl0PgvvwVVrL9limw,8268
 libentry/test_api.py,sha256=Xw7B7sH6g1iCTV5sFzyBF3JAJzeOr9xg0AyezTNsnIk,4452
+libentry/utils.py,sha256=O7P6GadtUIjq0N2IZH7PhHZDUM3NebzcqyDqytet7CM,683
 libentry/service/__init__.py,sha256=1oLL20yLB1GL9IbFiZD8OReDqiCpFr-yetIR6x1cNkI,23
 libentry/service/common.py,sha256=OVaW2afgKA6YqstJmtnprBCqQEUZEWotZ6tHavmJJeU,42
 libentry/service/flask.py,sha256=Alpsix01ROqI28k-dabD8wJlWAWs-ObNc1nJ-LxOXn4,13349
@@ -15,10 +16,10 @@ 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.21.3.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.21.3.dist-info/METADATA,sha256=43wuxNjrLdOaLoW5E55_JEMhGAPAAVTFe5WltenN7L0,813
-libentry-1.21.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-libentry-1.21.3.dist-info/entry_points.txt,sha256=vgHmJZhM-kqM7U9S179UwDD3pM232tpzJ5NntncXi_8,62
-libentry-1.21.3.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.21.3.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.21.3.dist-info/RECORD,,
+libentry-1.22.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.22.dist-info/METADATA,sha256=MlKCJZtUY5SMDcf4HmUyZKvPxUGyJfsBqdrWqoN7ByM,811
+libentry-1.22.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+libentry-1.22.dist-info/entry_points.txt,sha256=vgHmJZhM-kqM7U9S179UwDD3pM232tpzJ5NntncXi_8,62
+libentry-1.22.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.22.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.22.dist-info/RECORD,,