libentry 1.21.2__py3-none-any.whl → 1.21.4__py3-none-any.whl

libentry/api.py

@@ -10,10 +10,11 @@ __all__ = [
     "APIClient",
 ]
 
+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
@@ -216,6 +217,7 @@ class BaseClient:
             stream: bool,
             verify: bool,
     ) -> Union[bytes, Iterable[bytes]]:
+        headers = self.headers if headers is None else {**self.headers, **headers}
         response = self.URLLIB3_POOL[int(verify)].request(
             method=method,
             url=url,
@@ -304,6 +306,7 @@ class BaseClient:
             stream: bool,
             verify: bool,
     ):
+        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(
@@ -377,12 +380,25 @@ class BaseClient:
                 err = e
                 if callable(on_error):
                     on_error(e)
-            sleep(interval)
+            await asyncio.sleep(interval)
         raise err
 
 
 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"],
@@ -404,9 +420,14 @@ class APIClient(BaseClient):
             verify: Optional[bool] = None,
     ):
         full_url = urljoin(self.base_url, path)
-        headers = {**self.headers}
-        headers["Accept"] = headers["Accept"] + f"; stream={int(stream)}"
-        body = json.dumps(json_data) if json_data is not None else None
+        if headers is None:
+            headers = {}
+        accept = headers["Accept"] if "Accept" in headers else self.headers["Accept"]
+        headers["Accept"] = accept + f"; stream={int(stream)}"
+        if "Content-Type" in headers and headers["Content-Type"] == "application/x-www-form-urlencoded":
+            body = self._encode_params(json_data)
+        else:
+            body = json.dumps(json_data) if json_data is not None else None
         content = super().request(
             method,
             full_url,
@@ -481,6 +502,7 @@ class APIClient(BaseClient):
             self,
             path: Optional[str] = None,
             *,
+            headers: Optional[Mapping[str, str]] = None,
             timeout: float = 15,
             num_trials: int = 5,
             interval: float = 1,
@@ -490,6 +512,7 @@ class APIClient(BaseClient):
         return self.request(
             "GET",
             path,
+            headers=headers,
             timeout=timeout,
             num_trials=num_trials,
             interval=interval,
@@ -502,6 +525,7 @@ class APIClient(BaseClient):
             path: Optional[str] = None,
             json_data: Optional[Mapping] = None,
             *,
+            headers: Optional[Mapping[str, str]] = None,
             timeout: float = 15,
             num_trials: int = 5,
             interval: float = 1,
@@ -518,6 +542,7 @@ class APIClient(BaseClient):
             "POST",
             path,
             json_data=json_data,
+            headers=headers,
             timeout=timeout,
             num_trials=num_trials,
             interval=interval,
@@ -552,9 +577,14 @@ class APIClient(BaseClient):
             verify: Optional[bool] = None,
     ):
         full_url = urljoin(self.base_url, path)
-        headers = {**self.headers}
-        headers["Accept"] = headers["Accept"] + f"; stream={int(stream)}"
-        body = json.dumps(json_data) if json_data is not None else None
+        if headers is None:
+            headers = {}
+        accept = headers["Accept"] if "Accept" in headers else self.headers["Accept"]
+        headers["Accept"] = accept + f"; stream={int(stream)}"
+        if "Content-Type" in headers and headers["Content-Type"] == "application/x-www-form-urlencoded":
+            body = self._encode_params(json_data)
+        else:
+            body = json.dumps(json_data) if json_data is not None else None
         content = await super().request_async(
             method,
             full_url,
@@ -629,6 +659,7 @@ class APIClient(BaseClient):
             self,
             path: Optional[str] = None,
             *,
+            headers: Optional[Mapping[str, str]] = None,
             timeout: float = 15,
             num_trials: int = 5,
             interval: float = 1,
@@ -638,6 +669,7 @@ class APIClient(BaseClient):
         return await self.request_async(
             "GET",
             path,
+            headers=headers,
             timeout=timeout,
             num_trials=num_trials,
             interval=interval,
@@ -650,6 +682,7 @@ class APIClient(BaseClient):
             path: Optional[str] = None,
             json_data: Optional[Mapping] = None,
             *,
+            headers: Optional[Mapping[str, str]] = None,
             timeout: float = 15,
             num_trials: int = 5,
             interval: float = 1,
@@ -666,6 +699,7 @@ class APIClient(BaseClient):
             "POST",
             path,
             json_data=json_data,
+            headers=headers,
             timeout=timeout,
             num_trials=num_trials,
             interval=interval,

{libentry-1.21.2.dist-info → libentry-1.21.4.dist-info}/METADATA

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

{libentry-1.21.2.dist-info → libentry-1.21.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 libentry/__init__.py,sha256=ko2YBIIx5H3dD0tedBkialzJGEDczFaP_PZmT1cIlak,148
-libentry/api.py,sha256=zlZF0IWyQu8GPEVAM0J6K8BOSgqI06p8JJVoCNaTCBo,22110
+libentry/api.py,sha256=-8rvVdOOuJQ4vL4hYZcNMm8sUoSgv2r41QLNQ-Ny8vw,23607
 libentry/argparse.py,sha256=NxzXV-jBN51ReZsNs5aeyOfzwYQ5A5nJ95rWoa-FYCs,10415
 libentry/dataclasses.py,sha256=AQV2PuxplJCwGZ5HKX72U-z-POUhTdy3XtpEK9KNIGQ,4541
 libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
@@ -15,10 +15,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.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.21.2.dist-info/METADATA,sha256=M2-N8UEjYrgrXC-85vZ2-ts0SeNjOTx9_Vjclgdu8Xg,813
-libentry-1.21.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-libentry-1.21.2.dist-info/entry_points.txt,sha256=vgHmJZhM-kqM7U9S179UwDD3pM232tpzJ5NntncXi_8,62
-libentry-1.21.2.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.21.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.21.2.dist-info/RECORD,,
+libentry-1.21.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+libentry-1.21.4.dist-info/METADATA,sha256=54r6arFvYSQnlyDjhXivn-HYRtM4cEt0kyPRz5sK5YY,813
+libentry-1.21.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+libentry-1.21.4.dist-info/entry_points.txt,sha256=vgHmJZhM-kqM7U9S179UwDD3pM232tpzJ5NntncXi_8,62
+libentry-1.21.4.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
+libentry-1.21.4.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+libentry-1.21.4.dist-info/RECORD,,