mm-std 0.3.22__py3-none-any.whl → 0.3.24__py3-none-any.whl

mm_std/__init__.py

@@ -46,6 +46,8 @@ from .random_ import random_str_choice as random_str_choice
 from .result import Err as Err
 from .result import Ok as Ok
 from .result import Result as Result
+from .result import err as err
+from .result import ok as ok
 from .result import try_ok as try_ok
 from .str import number_with_separator as number_with_separator
 from .str import str_contains_any as str_contains_any

mm_std/http_.py

@@ -1,4 +1,3 @@
-import asyncio
 import json
 from dataclasses import asdict, dataclass, field
 from typing import Any
@@ -7,7 +6,6 @@ from urllib.parse import urlencode
 import aiohttp
 import pydash
 import requests
-import rich
 from aiohttp_socks import ProxyConnector
 from requests.auth import AuthBase
 
@@ -74,10 +72,10 @@ class HResponse:
         return self.error == "timeout"
 
     def is_proxy_error(self) -> bool:
-        return self.error == "proxy_error"
+        return self.error == "proxy"
 
     def is_connection_error(self) -> bool:
-        return self.error is not None and self.error.startswith("connection_error:")
+        return self.error is not None and self.error.startswith("connection:")
 
     def to_dict(self) -> dict[str, Any]:
         return pydash.omit(asdict(self), "_json_data")
@@ -137,9 +135,9 @@ def hrequest(
     except requests.exceptions.Timeout:
         return HResponse(error="timeout")
     except requests.exceptions.ProxyError:
-        return HResponse(error="proxy_error")
+        return HResponse(error="proxy")
     except requests.exceptions.RequestException as err:
-        return HResponse(error=f"connection_error: {err}")
+        return HResponse(error=f"connection: {err}")
     except Exception as err:
         return HResponse(error=f"exception: {err}")
 
@@ -156,7 +154,6 @@ async def hrequest_async(
     user_agent: str | None = None,
     json_params: bool = True,
     auth: tuple[str, str] | None = None,
-    verify: bool = True,
 ) -> HResponse:
     query_params: dict[str, Any] | None = None
     data: dict[str, Any] | None = None
@@ -175,55 +172,67 @@ async def hrequest_async(
         data = params
 
     try:
-        # Configure connector based on proxy type
-        if proxy:
-            # HTTP proxy will be handled in request kwargs
-            connector = ProxyConnector.from_url(proxy) if proxy.startswith("socks5://") else aiohttp.TCPConnector(ssl=verify)
+        request_kwargs: dict[str, Any] = {"headers": headers}
+        if query_params:
+            request_kwargs["params"] = query_params
+        if json_:
+            request_kwargs["json"] = json_
+        if data:
+            request_kwargs["data"] = data
+        if cookies:
+            request_kwargs["cookies"] = cookies
+        if auth and isinstance(auth, tuple) and len(auth) == 2:
+            request_kwargs["auth"] = aiohttp.BasicAuth(auth[0], auth[1])
+
+        if proxy and proxy.startswith("socks"):
+            res = await _aiohttp_socks5(url, method, proxy, request_kwargs, timeout)
         else:
-            connector = aiohttp.TCPConnector(ssl=verify)
-
-        timeout_obj = aiohttp.ClientTimeout(total=timeout)
-
-        async with aiohttp.ClientSession(connector=connector, timeout=timeout_obj, cookies=cookies) as session:
-            request_kwargs: dict[str, Any] = {"headers": headers}
-
-            if query_params:
-                request_kwargs["params"] = query_params
-            if json_:
-                request_kwargs["json"] = json_
-            if data:
-                request_kwargs["data"] = data
-
-            if auth and isinstance(auth, tuple) and len(auth) == 2:
-                request_kwargs["auth"] = aiohttp.BasicAuth(auth[0], auth[1])
-
-            # Set HTTP proxy (not needed for SOCKS5)
-            if proxy and not proxy.startswith("socks5://"):
-                request_kwargs["proxy"] = proxy
-
-            try:
-                async with await asyncio.wait_for(session.request(method, url, **request_kwargs), timeout=timeout) as response:
-                    body = await response.text()
-                    return HResponse(code=response.status, body=body, headers=dict(response.headers))
-            except TimeoutError:
-                return HResponse(error="timeout")
-            except (aiohttp.ClientProxyConnectionError, aiohttp.ClientHttpProxyError):
-                return HResponse(error="proxy_error")
-            except aiohttp.ClientConnectorError as err:
-                return HResponse(error=f"connection_error: {err}")
-            except aiohttp.ClientError as err:
-                rich.inspect(err)
-                return HResponse(error=f"connection_error: {err}")
-            except Exception as err:
-                if "couldn't connect to proxy" in str(err).lower():
-                    return HResponse(error="proxy_error")
-                return HResponse(error=f"exception: {err}")
+            res = await _aiohttp(url, method, request_kwargs, timeout=timeout, proxy=proxy)
+
+        return HResponse(code=res.status, body=res.body, headers=res.headers)
     except TimeoutError:
         return HResponse(error="timeout")
+    except (aiohttp.ClientProxyConnectionError, aiohttp.ClientHttpProxyError):
+        return HResponse(error="proxy")
+    except aiohttp.ClientConnectorError as err:
+        return HResponse(error=f"connection: {err}")
+    except aiohttp.ClientError as err:
+        return HResponse(error=f"error: {err}")
     except Exception as err:
+        if "couldn't connect to proxy" in str(err).lower():
+            return HResponse(error="proxy")
         return HResponse(error=f"exception: {err}")
 
 
+@dataclass
+class AioHttpResponse:
+    status: int
+    body: str
+    headers: dict[str, str]
+
+
+async def _aiohttp(
+    url: str, method: str, request_kwargs: dict[str, object], timeout: float | None = None, proxy: str | None = None
+) -> AioHttpResponse:
+    if proxy:
+        request_kwargs["proxy"] = proxy
+    client_timeout = aiohttp.ClientTimeout(total=timeout) if timeout else None
+    async with aiohttp.ClientSession(timeout=client_timeout) as session, session.request(method, url, **request_kwargs) as res:  # type: ignore[arg-type]
+        return AioHttpResponse(status=res.status, headers=dict(res.headers), body=await res.text())
+
+
+async def _aiohttp_socks5(
+    url: str, method: str, proxy: str, request_kwargs: dict[str, object], timeout: float | None = None
+) -> AioHttpResponse:
+    connector = ProxyConnector.from_url(proxy)
+    client_timeout = aiohttp.ClientTimeout(total=timeout) if timeout else None
+    async with (
+        aiohttp.ClientSession(connector=connector, timeout=client_timeout) as session,
+        session.request(method, url, **request_kwargs) as res,  # type: ignore[arg-type]
+    ):
+        return AioHttpResponse(status=res.status, headers=dict(res.headers), body=await res.text())
+
+
 def add_query_params_to_url(url: str, params: dict[str, object]) -> str:
     query_params = urlencode({k: v for k, v in params.items() if v is not None})
     if query_params:

mm_std/result.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import time
 from collections.abc import Callable
-from typing import Any, ClassVar, Literal, NoReturn, TypeVar, Union
+from typing import Any, ClassVar, Literal, NoReturn, TypeGuard, TypeVar, Union
 
 from pydantic_core import core_schema
 
@@ -258,6 +258,16 @@ class UnwrapError(Exception):
         return self._result
 
 
+def ok(result: Result[T]) -> TypeGuard[Ok[T]]:
+    """Used for type narrowing from `Result` to `Ok`."""
+    return isinstance(result, Ok)
+
+
+def err(result: Result[T]) -> TypeGuard[Err]:
+    """Used for type narrowing from `Result` to `Err`."""
+    return isinstance(result, Err)
+
+
 def try_ok[T](fn: Callable[..., Result[T]], *, args: tuple[object], attempts: int, delay: float = 0) -> Result[T]:
     if attempts <= 0:
         raise ValueError("attempts must be more than zero")

{mm_std-0.3.22.dist-info → mm_std-0.3.24.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: mm-std
-Version: 0.3.22
+Version: 0.3.24
 Requires-Python: >=3.12
 Requires-Dist: aiohttp-socks~=0.10.1
 Requires-Dist: aiohttp~=3.11.16
 Requires-Dist: cryptography~=44.0.2
 Requires-Dist: pydantic-settings>=2.8.1
-Requires-Dist: pydantic~=2.11.2
+Requires-Dist: pydantic~=2.11.3
 Requires-Dist: pydash~=8.0.5
 Requires-Dist: python-dotenv~=1.1.0
 Requires-Dist: requests[socks]~=2.32.3

{mm_std-0.3.22.dist-info → mm_std-0.3.24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mm_std/__init__.py,sha256=ETGLXQW17ZnV5i6kdhoNA-1MulHZixpzGIOLlYpiYx0,3040
+mm_std/__init__.py,sha256=bdkBTX7_u4NYtTRdVDHgZUozQlFRBx3TTiMK7Cenup0,3100
 mm_std/command.py,sha256=ze286wjUjg0QSTgIu-2WZks53_Vclg69UaYYgPpQvCU,1283
 mm_std/config.py,sha256=4ox4D2CgGR76bvZ2n2vGQOYUDagFnlKEDb87to5zpxE,1871
 mm_std/crypto.py,sha256=jdk0_TCmeU0pPXMyz9xH6kQHSjjZ9GcGClBwQps5vBo,340
@@ -6,14 +6,14 @@ mm_std/date.py,sha256=976eEkSONuNqHQBgSRu8hrtH23tJqztbmHFHLdbP2TY,1879
 mm_std/dict.py,sha256=6GkhJPXD0LiJDxPcYe6jPdEDw-MN7P7mKu6U5XxwYDk,675
 mm_std/env.py,sha256=5zaR9VeIfObN-4yfgxoFeU5IM1GDeZZj9SuYf7t9sOA,125
 mm_std/fs.py,sha256=RwarNRJq3tIMG6LVX_g03hasfYpjYFh_O27oVDt5IPQ,291
-mm_std/http_.py,sha256=cozBUGZcbKp9sZuEnu7bklwa6lTE0RxEUVo_aNt1_kE,7468
+mm_std/http_.py,sha256=A9SUidkmTEFYWXD9y-rX4MrUXtaZFiy84Ul8floYBn8,7700
 mm_std/json_.py,sha256=Naa6mBE4D0yiQGkPNRrFvndnUH3R7ovw3FeaejWV60o,1196
 mm_std/log.py,sha256=0TkTsAlUTt00gjgukvsvnZRIAGELq0MI6Lv8mKP-Wz4,2887
 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=KLnPWjICYFkP6CAhq7Ifs22XSD-PQ9RkG6n1-cZcXkM,7625
+mm_std/result.py,sha256=2cLa0Lb1W7IY1Kxn-r-9GyqDz3colabp00dcvr7AKbU,7917
 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,6 +25,6 @@ mm_std/concurrency/async_task_runner.py,sha256=EN7tN2enkVYVgDbhSiAr-_W4o9m9wBXCv
 mm_std/concurrency/sync_decorators.py,sha256=syCQBOmN7qPO55yzgJB2rbkh10CVww376hmyvs6e5tA,1080
 mm_std/concurrency/sync_scheduler.py,sha256=j4tBL_cBI1spr0cZplTA7N2CoYsznuORMeRN8rpR6gY,2407
 mm_std/concurrency/sync_task_runner.py,sha256=s5JPlLYLGQGHIxy4oDS-PN7O9gcy-yPZFoNm8RQwzcw,1780
-mm_std-0.3.22.dist-info/METADATA,sha256=BN3U-377sfY6l7yYDzLyW3RRkYqAU581moSJAfIDU8c,415
-mm_std-0.3.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.3.22.dist-info/RECORD,,
+mm_std-0.3.24.dist-info/METADATA,sha256=El91GJxSAEQMfJHtBogFAyAsXGcRJ3J9sfCPCNwIehA,415
+mm_std-0.3.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_std-0.3.24.dist-info/RECORD,,