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

libentry/api.py

@@ -10,12 +10,11 @@ __all__ = [
     "APIClient",
 ]
 
-import os
 from dataclasses import dataclass, field
-from typing import Any, Callable, Iterable, List, Literal, Mapping, Optional, Tuple, Union
+from typing import Any, Callable, Iterable, List, Literal, Mapping, Optional, Tuple
+from urllib.parse import urljoin
 
 import requests
-from pydantic import BaseModel
 
 from libentry import json
 
@@ -129,23 +128,40 @@ def list_api_info(obj) -> List[Tuple[Callable, APIInfo]]:
     return api_list
 
 
+def _load_json_or_str(text: str):
+    try:
+        return json.loads(text)
+    except ValueError:
+        return text
+
+
 class ServiceError(RuntimeError):
 
-    def __init__(self, error_message=None, error_type=None, traceback=None):
-        self.error_message = error_message + "\n"
-        self.error_type = " " + error_type if error_type is not None else ""
-        self.traceback = traceback
+    def __init__(self, text: str):
+        err = _load_json_or_str(text)
+        if isinstance(err, dict):
+            if "message" in err:
+                self.message = err.get("message")
+                self.error = err.get("error")
+                self.traceback = err.get("traceback")
+            else:
+                self.message = str(err)
+                self.error = ""
+                self.traceback = None
+        else:
+            self.message = err
+            self.error = ""
+            self.traceback = None
 
     def __str__(self):
-        message = (
-            f"{self.error_message}\n"
-            f"This is caused by server side error{self.error_type}. "
-        )
-        traceback = (
-            f"Below is the stacktrace:\n"
-            f"{self.traceback.rstrip()}"
-        ) if self.traceback is not None else ""
-        return message + traceback
+        lines = []
+        if self.message:
+            lines += [self.message, "\n\n"]
+        if self.error:
+            lines += ["This is caused by server side error ", self.error, ".\n"]
+        if self.traceback:
+            lines += ["Below is the stacktrace:\n", self.traceback.rstrip()]
+        return "".join(lines)
 
 
 class APIClient:
@@ -174,33 +190,30 @@ class APIClient:
         self.verify = verify
 
     def get(self, path: str, timeout=60):
-        api_url = os.path.join(self.base_url, path)
+        api_url = urljoin(self.base_url, path)
         response = requests.get(api_url, headers=self.headers, verify=self.verify, timeout=timeout)
 
         if response.status_code != 200:
-            err = self._load_json(response.text)
-            is_standard_error = isinstance(err, dict) and "message" in err
-            message = err["message"] if is_standard_error else str(err)
-            error_type = err.get("error")
-            traceback = err.get("traceback")
-            raise ServiceError(message, error_type, traceback)
+            text = response.text
+            response.close()
+            raise ServiceError(text)
 
         try:
-            return self._load_json(response.text)
+            return _load_json_or_str(response.text)
         finally:
             response.close()
 
     def post(
             self,
             path: str,
-            json_data: Mapping = None,
+            json_data: Optional[Mapping] = None,
             stream=False,
             timeout=60,
             chunk_delimiter: str = "\n\n",
             chunk_prefix: str = None,
             chunk_suffix: str = None,
     ):
-        full_url = os.path.join(self.base_url, path)
+        full_url = urljoin(self.base_url, path)
 
         data = json.dumps(json_data) if json_data is not None else None
         response = requests.post(
@@ -212,12 +225,9 @@ class APIClient:
             timeout=timeout
         )
         if response.status_code != 200:
-            err = self._load_json(response.text)
-            is_standard_error = isinstance(err, dict) and "message" in err
-            message = err["message"] if is_standard_error else str(err)
-            error_type = err.get("error")
-            traceback = err.get("traceback")
-            raise ServiceError(message, error_type, traceback)
+            text = response.text
+            response.close()
+            raise ServiceError(text)
 
         if stream:
             if chunk_delimiter is None:
@@ -232,7 +242,7 @@ class APIClient:
                 )
         else:
             try:
-                return self._load_json(response.text)
+                return _load_json_or_str(response.text)
             finally:
                 response.close()
 
@@ -260,34 +270,6 @@ class APIClient:
                     else:
                         continue
 
-                yield self._load_json(chunk)
+                yield _load_json_or_str(chunk)
         finally:
             response.close()
-
-    @staticmethod
-    def _load_json(text: str):
-        try:
-            return json.loads(text)
-        except ValueError:
-            return text
-
-    def __getattr__(self, item: str):
-        return MethodProxy(self, item)
-
-
-class MethodProxy:
-
-    def __init__(self, client: APIClient, url: str):
-        self.client = client
-        self.url = url
-
-    def __call__(self, request: Optional[Union[Mapping, BaseModel]] = None, **kwargs):
-        if request is None:
-            request = kwargs
-        elif isinstance(request, BaseModel):
-            request = request.model_dump()
-        for k, v in kwargs.items():
-            if isinstance(v, BaseModel):
-                v = v.model_dump()
-            request[k] = v
-        return self.client.post(self.url, request)

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

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

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

@@ -1,5 +1,5 @@
 libentry/__init__.py,sha256=rDBip9M1Xb1N4wMKE1ni_DldrQbkRjp8DxPkTp3K2qo,170
-libentry/api.py,sha256=W6pDdozmMnfnwVjsLoz5YvEGHEjYPEqpsndKlKBgpiA,8809
+libentry/api.py,sha256=2I52bVwJPxr_FTHCn4fCm08lGpNofcp9JGWz8JJJq4A,7934
 libentry/argparse.py,sha256=Bk11H4WRKxcjMlSd0mjWj1T4NWh0JW5eA7TX3C21IoE,10116
 libentry/dataclasses.py,sha256=AQV2PuxplJCwGZ5HKX72U-z-POUhTdy3XtpEK9KNIGQ,4541
 libentry/executor.py,sha256=cTV0WxJi0nU1TP-cOwmeodN8DD6L1691M2HIQsJtGrU,6582
@@ -14,9 +14,9 @@ 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.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-libentry-1.11.2.dist-info/METADATA,sha256=6OCqmqrv6dBqxh8QlDBILoySEewiFZ-KVPP62Cf-blo,500
-libentry-1.11.2.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
-libentry-1.11.2.dist-info/top_level.txt,sha256=u2uF6-X5fn2Erf9PYXOg_6tntPqTpyT-yzUZrltEd6I,9
-libentry-1.11.2.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-libentry-1.11.2.dist-info/RECORD,,
+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,,