mm-std 0.3.14__py3-none-any.whl → 0.3.16__py3-none-any.whl

mm_std/concurrency/async_scheduler.py

@@ -1,7 +1,9 @@
+import asyncio
 import threading
 from dataclasses import dataclass, field
 from datetime import datetime
 from logging import Logger
+from typing import Any
 
 import anyio
 
@@ -26,6 +28,7 @@ class AsyncScheduler:
         self.tasks: dict[str, AsyncScheduler.TaskInfo] = {}
         self._running: bool = False
         self._cancel_scope: anyio.CancelScope | None = None
+        self._main_task: asyncio.Task[Any] | None = None
         self._thread: threading.Thread | None = None
         self._logger = logger
 
@@ -82,8 +85,9 @@ class AsyncScheduler:
             return
         self._running = True
         self._logger.debug("Starting AsyncScheduler")
-        self._thread = threading.Thread(target=lambda: anyio.run(self._start_all_tasks), daemon=True, name="AsyncScheduler")
-        self._thread.start()
+
+        # Create a task in the current event loop
+        self._main_task = asyncio.create_task(self._start_all_tasks())
 
     def stop(self) -> None:
         """

mm_std/http_.py

@@ -3,6 +3,7 @@ from dataclasses import asdict, dataclass, field
 from typing import Any
 from urllib.parse import urlencode
 
+import anyio
 import httpx
 import pydash
 import requests
@@ -170,31 +171,33 @@ async def async_hrequest(
     else:
         data = params
 
-    try:
-        async with httpx.AsyncClient(
-            proxy=proxy,
-            timeout=timeout,
-            cookies=cookies,
-            auth=auth,
-            verify=verify,
-        ) as client:
-            r = await client.request(
-                method,
-                url,
-                headers=headers,
-                params=query_params,
-                json=json_,
-                data=data,
-            )
-            return HResponse(code=r.status_code, body=r.text, headers=dict(r.headers))
-    except httpx.TimeoutException:
-        return HResponse(error="timeout")
-    except httpx.ProxyError:
-        return HResponse(error="proxy_error")
-    except httpx.RequestError as err:
-        return HResponse(error=f"connection_error: {err}")
-    except Exception as err:
-        return HResponse(error=f"exception: {err}")
+    with anyio.move_on_after(timeout):
+        try:
+            async with httpx.AsyncClient(
+                proxy=proxy,
+                timeout=timeout,
+                cookies=cookies,
+                auth=auth,
+                verify=verify,
+            ) as client:
+                r = await client.request(
+                    method,
+                    url,
+                    headers=headers,
+                    params=query_params,
+                    json=json_,
+                    data=data,
+                )
+                return HResponse(code=r.status_code, body=r.text, headers=dict(r.headers))
+        except httpx.TimeoutException:
+            return HResponse(error="timeout")
+        except httpx.ProxyError:
+            return HResponse(error="proxy_error")
+        except httpx.RequestError as err:
+            return HResponse(error=f"connection_error: {err}")
+        except Exception as err:
+            return HResponse(error=f"exception: {err}")
+    return HResponse(error="timeout")
 
 
 def add_query_params_to_url(url: str, params: dict[str, object]) -> str:

{mm_std-0.3.14.dist-info → mm_std-0.3.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mm-std
-Version: 0.3.14
+Version: 0.3.16
 Requires-Python: >=3.12
 Requires-Dist: anyio>=4.9.0
 Requires-Dist: cryptography~=44.0.2
@@ -8,7 +8,7 @@ Requires-Dist: httpx[socks]>=0.28.1
 Requires-Dist: pydantic-settings>=2.8.1
 Requires-Dist: pydantic~=2.10.6
 Requires-Dist: pydash~=8.0.5
-Requires-Dist: python-dotenv~=1.0.1
+Requires-Dist: python-dotenv~=1.1.0
 Requires-Dist: requests[socks]~=2.32.3
 Requires-Dist: rich~=13.9.4
 Requires-Dist: tomlkit~=0.13.2

{mm_std-0.3.14.dist-info → mm_std-0.3.16.dist-info}/RECORD

@@ -6,7 +6,7 @@ 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=JkyHZ29EOC6Ulqw_5eBNLmeMrca6NDGueTSwpj96aKM,6003
+mm_std/http_.py,sha256=x5d4wnQcPlB_IYaYNCQGz7iOTEft8cQmMggHt30o7xI,6193
 mm_std/json_.py,sha256=Naa6mBE4D0yiQGkPNRrFvndnUH3R7ovw3FeaejWV60o,1196
 mm_std/log.py,sha256=6ux6njNKc_ZCQlvWn1FZR6vcSY2Cem-mQzmNXvsg5IE,913
 mm_std/net.py,sha256=qdRCBIDneip6FaPNe5mx31UtYVmzqam_AoUF7ydEyjA,590
@@ -20,11 +20,11 @@ mm_std/types_.py,sha256=9FGd2q47a8M9QQgsWJR1Kq34jLxBAkYSoJuwih4PPqg,257
 mm_std/zip.py,sha256=axzF1BwcIygtfNNTefZH7hXKaQqwe-ZH3ChuRWr9dnk,396
 mm_std/concurrency/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mm_std/concurrency/async_decorators.py,sha256=tJ5u-_G9mAF3zrFr1aBUhYh03rB-K_6oiDKGdmGdlGk,449
-mm_std/concurrency/async_scheduler.py,sha256=NsR9nrxAEdiYjGL-lTdDlQAXJHJZBUYnm26h-0zaxCg,3932
+mm_std/concurrency/async_scheduler.py,sha256=-crLjrFwRJSNGdyhU3brCvqP7EPPLwEVfZFbDCBe9Qo,3995
 mm_std/concurrency/async_task_runner.py,sha256=D4fD_hwSVy55sM_-U1_sdVYlkahnQeigXdMfbIi8Rpc,4492
 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.14.dist-info/METADATA,sha256=sH9DFjRqCXpYR3okXUVWFsTNlbyEk98QxYIfYGbFiXg,410
-mm_std-0.3.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.3.14.dist-info/RECORD,,
+mm_std-0.3.16.dist-info/METADATA,sha256=tXTemaQ7P5DOoxtamgJjtXkXVrhzvHOaaNyH4PavjYg,410
+mm_std-0.3.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_std-0.3.16.dist-info/RECORD,,