mm-std 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

mm_std/__init__.py

@@ -21,8 +21,8 @@ from .dict import replace_empty_dict_values as replace_empty_dict_values
 from .env import get_dotenv as get_dotenv
 from .http.http_request import http_request as http_request
 from .http.http_request_sync import http_request_sync as http_request_sync
-from .http.response import HttpError as HttpError
-from .http.response import HttpResponse as HttpResponse
+from .http.http_response import HttpError as HttpError
+from .http.http_response import HttpResponse as HttpResponse
 from .json_ import CustomJSONEncoder as CustomJSONEncoder
 from .json_ import json_dumps as json_dumps
 from .log import configure_logging as configure_logging

mm_std/config.py

@@ -1,7 +1,7 @@
 import sys
 import tomllib
 from pathlib import Path
-from typing import NoReturn, Self
+from typing import Any, NoReturn, Self, TypeVar
 
 from pydantic import BaseModel, ConfigDict, ValidationError
 
@@ -9,6 +9,8 @@ from .print_ import print_json, print_plain
 from .result import Result
 from .zip import read_text_from_zip_archive
 
+T = TypeVar("T", bound="BaseConfig")
+
 
 class BaseConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
@@ -18,21 +20,18 @@ class BaseConfig(BaseModel):
         sys.exit(0)
 
     @classmethod
-    def read_toml_config_or_exit[T](cls: type[T], config_path: Path, zip_password: str = "") -> T:  # noqa: PYI019 # nosec
-        res: Result[T] = cls.read_toml_config(config_path, zip_password)  # type:ignore[attr-defined]
+    def read_toml_config_or_exit(cls, config_path: Path, zip_password: str = "") -> Self:  # nosec
+        res: Result[Self] = cls.read_toml_config(config_path, zip_password)
         if res.is_ok():
             return res.unwrap()
+        cls._print_error_and_exit(res)
 
-        if res.error == "validator_error" and res.extra:
-            print_plain("config validation errors")
-            for e in res.extra["errors"]:
-                loc = e["loc"]
-                field = ".".join(str(lo) for lo in loc) if len(loc) > 0 else ""
-                print_plain(f"{field} {e['msg']}")
-        else:
-            print_plain(f"can't parse config file: {res.error}")
-
-        sys.exit(1)
+    @classmethod
+    async def read_toml_config_or_exit_async(cls, config_path: Path, zip_password: str = "") -> Self:  # nosec
+        res: Result[Self] = await cls.read_toml_config_async(config_path, zip_password)
+        if res.is_ok():
+            return res.unwrap()
+        cls._print_error_and_exit(res)
 
     @classmethod
     def read_toml_config(cls, config_path: Path, zip_password: str = "") -> Result[Self]:  # nosec
@@ -48,3 +47,31 @@ class BaseConfig(BaseModel):
             return Result.failure(("validator_error", e), extra={"errors": e.errors()})
         except Exception as e:
             return Result.failure(e)
+
+    @classmethod
+    async def read_toml_config_async(cls, config_path: Path, zip_password: str = "") -> Result[Self]:  # nosec
+        try:
+            config_path = config_path.expanduser()
+            if config_path.name.endswith(".zip"):
+                data = tomllib.loads(read_text_from_zip_archive(config_path, password=zip_password))
+            else:
+                with config_path.open("rb") as f:
+                    data = tomllib.load(f)
+            model = await cls.model_validate_async(data)  # type:ignore[attr-defined]
+            return Result.success(model)
+        except ValidationError as e:
+            return Result.failure(("validator_error", e), extra={"errors": e.errors()})
+        except Exception as e:
+            return Result.failure(e)
+
+    @classmethod
+    def _print_error_and_exit(cls, res: Result[Any]) -> NoReturn:
+        if res.error == "validator_error" and res.extra:
+            print_plain("config validation errors")
+            for e in res.extra["errors"]:
+                loc = e["loc"]
+                field = ".".join(str(lo) for lo in loc) if len(loc) > 0 else ""
+                print_plain(f"{field} {e['msg']}")
+        else:
+            print_plain(f"can't parse config file: {res.error}")
+        sys.exit(1)

mm_std/http/http_request.py

@@ -3,7 +3,7 @@ from aiohttp.typedefs import LooseCookies, Query
 from aiohttp_socks import ProxyConnector
 from multidict import CIMultiDictProxy
 
-from mm_std.http.response import HttpError, HttpResponse
+from mm_std.http.http_response import HttpError, HttpResponse
 
 
 async def http_request(

mm_std/http/http_request_sync.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import requests
 
-from mm_std.http.response import HttpError, HttpResponse
+from mm_std.http.http_response import HttpError, HttpResponse
 
 
 def http_request_sync(

mm_std/http/{response.py → http_response.py}

@@ -57,10 +57,10 @@ class HttpResponse:
     def is_error(self) -> bool:
         return self.error is not None or (self.status_code is not None and self.status_code >= 400)
 
-    def to_result_err[T](self, error: str | Exception | tuple[str, Exception] | None = None) -> Result[T]:
+    def to_result_failure[T](self, error: str | Exception | tuple[str, Exception] | None = None) -> Result[T]:
         return Result.failure(error or self.error or "error", extra=self.to_dict())
 
-    def to_result_ok[T](self, result: T) -> Result[T]:
+    def to_result_success[T](self, result: T) -> Result[T]:
         return Result.success(result, extra=self.to_dict())
 
     def to_dict(self) -> dict[str, Any]:

mm_std/result.py

@@ -79,6 +79,14 @@ class Result[T]:
             return self.exception
         raise RuntimeError("No exception provided")
 
+    def ok_or_error(self) -> T | str:
+        """
+        Returns the success value if available, otherwise returns the error message.
+        """
+        if self.is_ok():
+            return self.unwrap()
+        return self.unwrap_error()
+
     def to_dict(self) -> dict[str, object]:
         """
         Returns a dictionary representation of the result.

{mm_std-0.4.2.dist-info → mm_std-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mm-std
-Version: 0.4.2
+Version: 0.4.4
 Requires-Python: >=3.12
 Requires-Dist: aiohttp-socks~=0.10.1
 Requires-Dist: aiohttp~=3.11.16

{mm_std-0.4.2.dist-info → mm_std-0.4.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
-mm_std/__init__.py,sha256=Kl-7TT_hd-xmwDJJ0E5AO2Qjpj5H8H7A93DgDwv_r-0,2804
+mm_std/__init__.py,sha256=gSMy_KY9kffPFnrDzdUti_JiQP1hB3ZtF7GxhOCc1Vc,2814
 mm_std/command.py,sha256=ze286wjUjg0QSTgIu-2WZks53_Vclg69UaYYgPpQvCU,1283
-mm_std/config.py,sha256=QtF-SCzaHZf511miTDjmIWR2dFfVPsnw2x6B5rmhMMk,1884
+mm_std/config.py,sha256=KArBvdt1gr_YvAtdXA4bqzF5W3IyUh25TexFoJCcN-E,3094
 mm_std/crypto.py,sha256=jdk0_TCmeU0pPXMyz9xH6kQHSjjZ9GcGClBwQps5vBo,340
 mm_std/date.py,sha256=976eEkSONuNqHQBgSRu8hrtH23tJqztbmHFHLdbP2TY,1879
 mm_std/dict.py,sha256=6GkhJPXD0LiJDxPcYe6jPdEDw-MN7P7mKu6U5XxwYDk,675
@@ -12,7 +12,7 @@ mm_std/net.py,sha256=qdRCBIDneip6FaPNe5mx31UtYVmzqam_AoUF7ydEyjA,590
 mm_std/print_.py,sha256=zB7sVbSSF8RffMxvnOdbKCXjCKtKzKV3R68pBri4NkQ,1638
 mm_std/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_std/random_.py,sha256=OuUX4VJeSd13NZBya4qrGpR2TfN7_87tfebOY6DBUnI,1113
-mm_std/result.py,sha256=VrEIJvFaVFus-b5s75I8PATvfoIRQw084zuOhbnbRSA,7655
+mm_std/result.py,sha256=Q4mmX2VP2TNpVFf1J_YWZY-rKwmqJwI1RlMjLsDF7hY,7896
 mm_std/str.py,sha256=BEjJ1p5O4-uSYK0h-enasSSDdwzkBbiwdQ4_dsrlEE8,3257
 mm_std/toml.py,sha256=CNznWKR0bpOxS6e3VB5LGS-Oa9lW-wterkcPUFtPcls,610
 mm_std/types_.py,sha256=9FGd2q47a8M9QQgsWJR1Kq34jLxBAkYSoJuwih4PPqg,257
@@ -25,9 +25,9 @@ mm_std/concurrency/sync_decorators.py,sha256=syCQBOmN7qPO55yzgJB2rbkh10CVww376hm
 mm_std/concurrency/sync_scheduler.py,sha256=j4tBL_cBI1spr0cZplTA7N2CoYsznuORMeRN8rpR6gY,2407
 mm_std/concurrency/sync_task_runner.py,sha256=s5JPlLYLGQGHIxy4oDS-PN7O9gcy-yPZFoNm8RQwzcw,1780
 mm_std/http/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_std/http/http_request.py,sha256=h74_ZjACwdbeINjzhuEwNUpvnaHZvyGl7TExjlBwMGg,3704
-mm_std/http/http_request_sync.py,sha256=aawVZfopzMI0alS3lkJQmVOVxH51rmtvsOK_inUlJOs,1537
-mm_std/http/response.py,sha256=Y6voWD3y_iK-tYBuXPborjcD7Y6-piupD6kcGXmAqmY,3911
-mm_std-0.4.2.dist-info/METADATA,sha256=j2djNKVv_DiXYat3p3hbpBaKzaSj5m-CExfViW5qVHU,446
-mm_std-0.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.4.2.dist-info/RECORD,,
+mm_std/http/http_request.py,sha256=VnjZKrfaXQfMxrHRUqQ-Sxtr5Qf9FXBiJ-mmJTCzNkY,3709
+mm_std/http/http_request_sync.py,sha256=bqCBilbe4ZJ9vkhuBQeU5UMTJh6BtvtUwjieEodu6rw,1542
+mm_std/http/http_response.py,sha256=gz4kCCL0qr7wvw4NNiK1K2hXlrY0B0Iq4fJuYSrv3bw,3920
+mm_std-0.4.4.dist-info/METADATA,sha256=zQdcBSHWHf-504aqEWMZzK84MwT6stxPdvRryHjymZ4,446
+mm_std-0.4.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_std-0.4.4.dist-info/RECORD,,