mm-std 0.4.1__py3-none-any.whl → 0.4.3__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

@@ -45,6 +45,6 @@ class BaseConfig(BaseModel):
                     data = tomllib.load(f)
             return Result.success(cls(**data))
         except ValidationError as e:
-            return Result.failure_with_exception(e, error="validator_error", extra={"errors": e.errors()})
+            return Result.failure(("validator_error", e), extra={"errors": e.errors()})
         except Exception as e:
-            return Result.failure_with_exception(e)
+            return Result.failure(e)

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 | 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.
@@ -97,7 +105,7 @@ class Result[T]:
                 new_value = fn(cast(T, self.ok))
                 return Result.success(new_value, extra=self.extra)
             except Exception as e:
-                return Result.failure_with_exception(e, error="map_exception", extra=self.extra)
+                return Result.failure(("map_exception", e), extra=self.extra)
         return cast(Result[U], self)
 
     async def map_async(self, fn: Callable[[T], Awaitable[U]]) -> Result[U]:
@@ -106,7 +114,7 @@ class Result[T]:
                 new_value = await fn(cast(T, self.ok))
                 return Result.success(new_value, extra=self.extra)
             except Exception as e:
-                return Result.failure_with_exception(e, error="map_exception", extra=self.extra)
+                return Result.failure(("map_exception", e), extra=self.extra)
         return cast(Result[U], self)
 
     def and_then(self, fn: Callable[[T], Result[U]]) -> Result[U]:
@@ -114,7 +122,7 @@ class Result[T]:
             try:
                 return fn(cast(T, self.ok))
             except Exception as e:
-                return Result.failure_with_exception(e, error="and_then_exception", extra=self.extra)
+                return Result.failure(("and_then_exception", e), extra=self.extra)
         return cast(Result[U], self)
 
     async def and_then_async(self, fn: Callable[[T], Awaitable[Result[U]]]) -> Result[U]:
@@ -122,7 +130,7 @@ class Result[T]:
             try:
                 return await fn(cast(T, self.ok))
             except Exception as e:
-                return Result.failure_with_exception(e, error="and_then_exception", extra=self.extra)
+                return Result.failure(("and_then_exception", e), extra=self.extra)
         return cast(Result[U], self)
 
     def __repr__(self) -> str:
@@ -165,15 +173,43 @@ class Result[T]:
 
     @staticmethod
     def success(ok: T, extra: Extra = None) -> Result[T]:
-        return Result._create(ok=ok, error=None, exception=None, extra=extra)
+        """
+        Creates a successful Result instance.
 
-    @staticmethod
-    def failure(error: str, extra: Extra = None) -> Result[T]:
-        return Result._create(ok=None, error=error, exception=None, extra=extra)
+        Args:
+            ok: The success value to store in the Result.
+            extra: Optional extra metadata to associate with the Result.
+
+        Returns:
+            A Result instance representing success with the provided value.
+        """
+        return Result._create(ok=ok, error=None, exception=None, extra=extra)
 
     @staticmethod
-    def failure_with_exception(exception: Exception, *, error: str = "exception", extra: Extra = None) -> Result[T]:
-        return Result._create(ok=None, error=error, exception=exception, extra=extra)
+    def failure(error: str | Exception | tuple[str, Exception], extra: Extra = None) -> Result[T]:
+        """
+        Creates a Result instance representing a failure.
+
+        Args:
+            error: The error information, which can be:
+                - A string error message
+                - An Exception object
+                - A tuple containing (error_message, exception)
+            extra: Optional extra metadata to associate with the Result.
+
+        Returns:
+            A Result instance representing failure with the provided error information.
+        """
+        if isinstance(error, tuple):
+            error_, exception = error
+        elif isinstance(error, Exception):
+            error_ = "exception"
+            exception = error
+        else:
+            error_ = error
+            exception = None
+
+        return Result._create(ok=None, error=error_, exception=exception, extra=extra)
 
     @classmethod
     def __get_pydantic_core_schema__(cls, _source_type: type[Any], _handler: GetCoreSchemaHandler) -> CoreSchema:

{mm_std-0.4.1.dist-info → mm_std-0.4.3.dist-info}/METADATA

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

{mm_std-0.4.1.dist-info → mm_std-0.4.3.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=VCrvTIjq21uDJngPANVClq5CO9xjmeDJCjRlZgn-fBs,1918
+mm_std/config.py,sha256=QtF-SCzaHZf511miTDjmIWR2dFfVPsnw2x6B5rmhMMk,1884
 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=gUmseH3fkapLIcTDkaeilPkubO5nHXWUCc5PmWh3EiY,6874
+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=wRFeBgsmShwsC3goSpKq7VG-Pcr9FGsPwKn4vd_VWqU,3875
-mm_std-0.4.1.dist-info/METADATA,sha256=9ZG4BGhh3YvzMNgnOT_hgUUhJfWUJ_iYuIjI1Up_R_A,446
-mm_std-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.4.1.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.3.dist-info/METADATA,sha256=JSvnB6eXS5YrbuHr15igF-YOvHK7_YD_1bPP4was71k,446
+mm_std-0.4.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_std-0.4.3.dist-info/RECORD,,