mm-std 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

mm_std/concurrency.py

@@ -8,13 +8,13 @@ from dataclasses import dataclass, field
 from datetime import datetime
 from logging import Logger
 from threading import Lock, Thread
-from typing import ParamSpec, TypeAlias, TypeVar
+from typing import ParamSpec, TypeVar
 
 from .date import is_too_old, utc_now
 
-Func: TypeAlias = Callable[..., object]
-Args: TypeAlias = tuple[object, ...]
-Kwargs: TypeAlias = dict[str, object]
+type Func = Callable[..., object]
+type Args = tuple[object, ...]
+type Kwargs = dict[str, object]
 
 
 class ConcurrentTasks:

mm_std/config.py

@@ -1,6 +1,5 @@
 import io
 from pathlib import Path
-from typing import TypeVar
 
 import yaml
 from pydantic import BaseModel, ConfigDict, ValidationError
@@ -9,8 +8,6 @@ from .print_ import PrintFormat, print_console, print_json, print_plain, print_t
 from .str import str_to_list
 from .zip import read_text_from_zip_archive
 
-T = TypeVar("T")
-
 
 class BaseConfig(BaseModel):
     model_config = ConfigDict(extra="forbid")
@@ -32,7 +29,7 @@ class BaseConfig(BaseModel):
         return v
 
     @classmethod
-    def read_config(  # nosec
+    def read_config[T](  # nosec: B107
         cls: type[T],
         config_path: io.TextIOWrapper | str | Path,
         error_print_type: PrintFormat = PrintFormat.PLAIN,

mm_std/net.py

@@ -3,7 +3,7 @@ import socket
 import time
 from dataclasses import asdict, dataclass, field
 from json import JSONDecodeError
-from typing import Any, TypeVar, cast
+from typing import Any, cast
 from urllib.parse import urlencode
 
 import httpx
@@ -15,8 +15,6 @@ FIREFOX_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:108.0) Ge
 SAFARI_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.3 Safari/605.1.15"  # fmt: skip # noqa
 CHROME_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/109.0.0.0 Safari/537.36"  # fmt: skip # noqa
 
-T = TypeVar("T")
-
 
 @dataclass
 class HResponse:
@@ -57,10 +55,10 @@ class HResponse:
                 return self.headers[key]
         return None
 
-    def to_err_result(self, error: str | None = None) -> Err:
+    def to_err_result[T](self, error: str | None = None) -> Err:
         return Err(error or self.error or "error", data=asdict(self))
 
-    def to_ok_result(self, result: T) -> Result[T]:
+    def to_ok_result[T](self, result: T) -> Result[T]:
         return Ok(result, data=asdict(self))
 
     def is_error(self) -> bool:

mm_std/random_.py

@@ -1,12 +1,9 @@
 import random
 from collections.abc import Sequence
 from decimal import Decimal
-from typing import TypeVar
 
-T = TypeVar("T", contravariant=True)
 
-
-def random_choice(source: Sequence[T] | T | None) -> T | None:
+def random_choice[T](source: Sequence[T] | T | None) -> T | None:
     """Deprecated, don't use it"""
     if source is None:
         return None

mm_std/result.py

@@ -2,17 +2,12 @@ from __future__ import annotations
 
 import time
 from collections.abc import Callable
-from typing import Any, Generic, Literal, NoReturn, TypeAlias, TypeVar
+from typing import Any, Literal, NoReturn
 
 from pydantic_core import core_schema
 
-T = TypeVar("T", covariant=True)  # Success type
-U = TypeVar("U")
-F = TypeVar("F")
-TBE = TypeVar("TBE", bound=BaseException)
 
-
-class Ok(Generic[T]):
+class Ok[T]:
     __match_args__ = ("ok",)
 
     def __init__(self, ok: T, data: Any = None) -> None:
@@ -56,7 +51,7 @@ class Ok(Generic[T]):
     def unwrap_err(self) -> NoReturn:
         raise UnwrapError(self, "Called `Result.unwrap_err()` on an `Ok` value")
 
-    def unwrap_or(self, _default: U) -> T:
+    def unwrap_or[U](self, _default: U) -> T:
         return self.ok
 
     def unwrap_or_else(self, op: object) -> T:
@@ -65,13 +60,13 @@ class Ok(Generic[T]):
     def unwrap_or_raise(self, e: object) -> T:
         return self.ok
 
-    def map(self, op: Callable[[T], U]) -> Ok[U]:
+    def map[U](self, op: Callable[[T], U]) -> Ok[U]:
         return Ok(op(self.ok), data=self.data)
 
-    def map_or(self, default: object, op: Callable[[T], U]) -> U:
+    def map_or[U](self, default: object, op: Callable[[T], U]) -> U:
         return op(self.ok)
 
-    def map_or_else(self, err_op: object, ok_op: Callable[[T], U]) -> U:
+    def map_or_else[U](self, err_op: object, ok_op: Callable[[T], U]) -> U:
         """
         The contained result is `Ok`, so return original value mapped to
         a new value using the passed in `op` function.
@@ -84,7 +79,7 @@ class Ok(Generic[T]):
         """
         return self
 
-    def and_then(self, op: Callable[[T], U | Result[U]]) -> Result[U]:
+    def and_then[U](self, op: Callable[[T], U | Result[U]]) -> Result[U]:
         """
         The contained result is `Ok`, so return the result of `op` with the
         original value passed in. If return of `op` function is not Result, it will be a Ok value.
@@ -115,7 +110,7 @@ class Ok(Generic[T]):
                 {
                     "ok": core_schema.model_field(core_schema.any_schema()),
                     "data": core_schema.model_field(core_schema.any_schema()),
-                }
+                },
             ),
         )
 
@@ -159,10 +154,7 @@ class Err:
         """
         Raises an `UnwrapError`.
         """
-        exc = UnwrapError(
-            self,
-            f"{message}: {self.err!r}",
-        )
+        exc = UnwrapError(self, f"{message}: {self.err!r}")
         if isinstance(self.err, BaseException):
             raise exc from self.err
         raise exc
@@ -177,10 +169,7 @@ class Err:
         """
         Raises an `UnwrapError`.
         """
-        exc = UnwrapError(
-            self,
-            f"Called `Result.unwrap()` on an `Err` value: {self.err!r}",
-        )
+        exc = UnwrapError(self, f"Called `Result.unwrap()` on an `Err` value: {self.err!r}")
         if isinstance(self.err, BaseException):
             raise exc from self.err
         raise exc
@@ -191,20 +180,20 @@ class Err:
         """
         return self.err
 
-    def unwrap_or(self, default: U) -> U:
+    def unwrap_or[U](self, default: U) -> U:
         """
         Return `default`.
         """
         return default
 
-    def unwrap_or_else(self, op: Callable[[str], T]) -> T:
+    def unwrap_or_else[T](self, op: Callable[[str], T]) -> T:
         """
         The contained result is ``Err``, so return the result of applying
         ``op`` to the error value.
         """
         return op(self.err)
 
-    def unwrap_or_raise(self, e: type[TBE]) -> NoReturn:
+    def unwrap_or_raise[TBE: BaseException](self, e: type[TBE]) -> NoReturn:
         """
         The contained result is ``Err``, so raise the exception with the value.
         """
@@ -216,13 +205,13 @@ class Err:
         """
         return self
 
-    def map_or(self, default: U, op: object) -> U:
+    def map_or[U](self, default: U, op: object) -> U:
         """
         Return the default value
         """
         return default
 
-    def map_or_else(self, err_op: Callable[[str], U], ok_op: object) -> U:
+    def map_or_else[U](self, err_op: Callable[[str], U], ok_op: object) -> U:
         """
         Return the result of the default operation
         """
@@ -234,10 +223,10 @@ class Err:
         """
         return self
 
-    def ok_or_err(self) -> T | str:
+    def ok_or_err[T](self) -> T | str:
         return self.err
 
-    def ok_or_none(self) -> T | None:
+    def ok_or_none[T](self) -> T | None:
         return None
 
     @classmethod
@@ -248,18 +237,18 @@ class Err:
                 {
                     "err": core_schema.model_field(core_schema.any_schema()),
                     "data": core_schema.model_field(core_schema.any_schema()),
-                }
+                },
             ),
         )
 
 
-Result: TypeAlias = Ok[T] | Err
+type Result[T] = Ok[T] | Err
 
 
 class UnwrapError(Exception):
-    _result: Result[object]
+    _result: Result[Any]
 
-    def __init__(self, result: Result[object], message: str) -> None:
+    def __init__(self, result: Result[Any], message: str) -> None:
         self._result = result
         super().__init__(message)
 
@@ -268,7 +257,7 @@ class UnwrapError(Exception):
         return self._result
 
 
-def try_ok(fn: Callable[..., Result[T]], *, args: tuple[object], attempts: int, delay: int | float = 0) -> Result[T]:
+def try_ok[T](fn: Callable[..., Result[T]], *, args: tuple[object], attempts: int, delay: int | float = 0) -> Result[T]:
     if attempts <= 0:
         raise ValueError("attempts must be more than zero")
     res: Result[T] = Err("not started")

mm_std-0.1.8.dist-info/METADATA

@@ -0,0 +1,11 @@
+Metadata-Version: 2.3
+Name: mm-std
+Version: 0.1.8
+Requires-Python: >=3.12
+Requires-Dist: cryptography~=44.0.0
+Requires-Dist: httpx[http2,socks]~=0.28.0
+Requires-Dist: pydantic~=2.10.2
+Requires-Dist: pydash~=8.0.4
+Requires-Dist: python-dotenv~=1.0.1
+Requires-Dist: pyyaml~=6.0.1
+Requires-Dist: rich~=13.0

{mm_std-0.1.6.dist-info → mm_std-0.1.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mm_std/__init__.py,sha256=4pa6AjO-0mfrfBi6FS5sqOk1HFAKt2OMovA12ys7UvQ,2288
 mm_std/command.py,sha256=r1n9ZHyMFhNkNOH9grRCm5J0hhX4_v0c2wdaal8iCZY,1270
-mm_std/concurrency.py,sha256=XSPYLUsGO1G0mcsdTn_Hwg5nb694-nUMhwQ6TvOrMCc,5340
-mm_std/config.py,sha256=ftYrsZ4i715I20s2q8vqYyniMSCIAVrh-9TtAzsyMfQ,3147
+mm_std/concurrency.py,sha256=SZGSTlswpFRZwsI7ztFWYca1XOPToLe0oBNJBZlSlgo,5311
+mm_std/config.py,sha256=Wo_VS6MO1vTZosOHv97mCo41YYGKZaRAeergaSVzUcs,3111
 mm_std/crypto.py,sha256=jdk0_TCmeU0pPXMyz9xH6kQHSjjZ9GcGClBwQps5vBo,340
 mm_std/date.py,sha256=dhlBE8dTzPe0Qhu5f6YMeR5ka5k2B0IoMe8VA7_-pII,1969
 mm_std/dict.py,sha256=kJBPVG9vEqHiSgKKoji8gVGL1yEBbxAmFNn0zz17AUg,180
@@ -9,15 +9,15 @@ mm_std/env.py,sha256=5zaR9VeIfObN-4yfgxoFeU5IM1GDeZZj9SuYf7t9sOA,125
 mm_std/fs.py,sha256=RwarNRJq3tIMG6LVX_g03hasfYpjYFh_O27oVDt5IPQ,291
 mm_std/json_.py,sha256=12uGLwmnrRA63QI0nUx-UU33zXcyShbsKCoOQiIJ8io,1016
 mm_std/log.py,sha256=6ux6njNKc_ZCQlvWn1FZR6vcSY2Cem-mQzmNXvsg5IE,913
-mm_std/net.py,sha256=Vco5-il0eDNfmU0SYl-PPwUBfLfQITIdOevfKqtAy0s,4707
+mm_std/net.py,sha256=k3kl9OY23VoF2md6UyRBDQ9lhRzWlFCuhalDtv6Of90,4686
 mm_std/print_.py,sha256=mMixwfdrLEYW15ez7_QxXdrV-d38q9XJP8tB8F7P2pI,1553
 mm_std/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_std/random_.py,sha256=KZauQzHsJaCVIeyHrJ74hiH34hdFE7pUxuv5i0Hl28g,1175
-mm_std/result.py,sha256=mYjQdKsSEMCqRFOsq7c-ZRp2faGnO_fieTzAeUwsa20,7592
+mm_std/random_.py,sha256=OuUX4VJeSd13NZBya4qrGpR2TfN7_87tfebOY6DBUnI,1113
+mm_std/result.py,sha256=1uCb2YySZGHLVNrGRQYhs6BngB8aEW2MKY9Bx6j2wNQ,7407
 mm_std/str.py,sha256=nG5XF5870xM2PAvU0LZrJDk-d54LYwRLGnSahIekOVw,3151
 mm_std/telegram.py,sha256=QrHPnsy0LTeqpd-g3RaHhk7gWIfHZEgnMs-S5DLW-vU,1220
 mm_std/types.py,sha256=KpFtJ-BTmDfmmFeOSlgq6cMbCfGGOQjh1oWvdcrW-kw,116
 mm_std/zip.py,sha256=2EXcae4HO5U4kObj2Lj8jl5F2OUpT-WRlJybTyFzt6I,370
-mm_std-0.1.6.dist-info/METADATA,sha256=U-VxSrZYSE0gG-vptgE3kUqluajW13i9_mFeMbGUlOQ,303
-mm_std-0.1.6.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-mm_std-0.1.6.dist-info/RECORD,,
+mm_std-0.1.8.dist-info/METADATA,sha256=qS2lfsHdWITmGzMWqikfNAAA-bZrWRfZHayi1_tF5bA,304
+mm_std-0.1.8.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+mm_std-0.1.8.dist-info/RECORD,,

mm_std-0.1.6.dist-info/METADATA

@@ -1,11 +0,0 @@
-Metadata-Version: 2.3
-Name: mm-std
-Version: 0.1.6
-Requires-Python: >=3.12
-Requires-Dist: cryptography~=43.0.3
-Requires-Dist: httpx[http2,socks]~=0.27.2
-Requires-Dist: pydantic~=2.9.2
-Requires-Dist: pydash~=8.0.0
-Requires-Dist: python-dotenv~=1.0.1
-Requires-Dist: pyyaml~=6.0.1
-Requires-Dist: rich~=13.0