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

mm_std/__init__.py

@@ -29,6 +29,7 @@ from .http_ import hrequest as hrequest
 from .http_ import hrequest_async as hrequest_async
 from .json_ import CustomJSONEncoder as CustomJSONEncoder
 from .json_ import json_dumps as json_dumps
+from .log import configure_logging as configure_logging
 from .log import init_logger as init_logger
 from .net import check_port as check_port
 from .net import get_free_local_port as get_free_local_port

mm_std/concurrency/async_scheduler.py

@@ -1,8 +1,8 @@
 import asyncio
+import logging
 from collections.abc import Awaitable, Callable
 from dataclasses import dataclass, field
 from datetime import datetime
-from logging import Logger
 from typing import Any
 
 from mm_std.date import utc_now
@@ -11,6 +11,8 @@ type AsyncFunc = Callable[..., Awaitable[object]]
 type Args = tuple[object, ...]
 type Kwargs = dict[str, object]
 
+logger = logging.getLogger(__name__)
+
 
 class AsyncScheduler:
     """
@@ -34,13 +36,12 @@ class AsyncScheduler:
         last_run: datetime | None = None
         running: bool = False
 
-    def __init__(self, logger: Logger, name: str = "AsyncScheduler") -> None:
+    def __init__(self, name: str = "AsyncScheduler") -> None:
         """Initialize the async scheduler."""
         self.tasks: dict[str, AsyncScheduler.TaskInfo] = {}
         self._running: bool = False
         self._tasks: list[asyncio.Task[Any]] = []
         self._main_task: asyncio.Task[Any] | None = None
-        self._logger = logger
         self._name = name
 
     def add_task(self, task_id: str, interval: float, func: AsyncFunc, args: Args = (), kwargs: Kwargs | None = None) -> None:
@@ -73,6 +74,7 @@ class AsyncScheduler:
         task = self.tasks[task_id]
         task.running = True
 
+        elapsed = 0.0
         try:
             while self._running:
                 task.last_run = utc_now()
@@ -81,11 +83,11 @@ class AsyncScheduler:
                     await task.func(*task.args, **task.kwargs)
                 except Exception:
                     task.error_count += 1
-                    self._logger.exception(f"Exception in task {task_id}")
+                    logger.exception("Error in task", extra={"task_id": task_id, "error_count": task.error_count})
 
                 # Calculate elapsed time and sleep if needed
                 elapsed = (utc_now() - task.last_run).total_seconds()
-                sleep_time = max(0, task.interval - elapsed)
+                sleep_time = max(0.0, task.interval - elapsed)
                 if sleep_time > 0:
                     try:
                         await asyncio.sleep(sleep_time)
@@ -93,7 +95,7 @@ class AsyncScheduler:
                         break
         finally:
             task.running = False
-            self._logger.debug(f"Task {task_id} stopped")
+            logger.debug("Finished task", extra={"task_id": task_id, "elapsed": elapsed})
 
     async def _start_all_tasks(self) -> None:
         """Starts all tasks concurrently using asyncio tasks."""
@@ -108,7 +110,7 @@ class AsyncScheduler:
             while self._running:  # noqa: ASYNC110
                 await asyncio.sleep(0.1)
         except asyncio.CancelledError:
-            self._logger.debug("Main scheduler task cancelled")
+            logger.debug("Cancelled all tasks")
         finally:
             # Cancel all running tasks when we exit
             for task in self._tasks:
@@ -127,11 +129,11 @@ class AsyncScheduler:
         Creates tasks in the current event loop for each registered task.
         """
         if self._running:
-            self._logger.warning("AsyncScheduler already running")
+            logger.warning("AsyncScheduler already running")
             return
 
         self._running = True
-        self._logger.debug("Starting AsyncScheduler")
+        logger.debug("starting")
         self._main_task = asyncio.create_task(self._start_all_tasks())
 
     def stop(self) -> None:
@@ -141,16 +143,16 @@ class AsyncScheduler:
         Cancels all running tasks and waits for them to complete.
         """
         if not self._running:
-            self._logger.warning("AsyncScheduler not running")
+            logger.warning("now running")
             return
 
-        self._logger.debug("Stopping AsyncScheduler")
+        logger.debug("stopping")
         self._running = False
 
         if self._main_task and not self._main_task.done():
             self._main_task.cancel()
 
-        self._logger.debug("AsyncScheduler stopped")
+        logger.debug("stopped")
 
     def is_running(self) -> bool:
         """
@@ -164,7 +166,7 @@ class AsyncScheduler:
     def clear_tasks(self) -> None:
         """Clear all tasks from the scheduler."""
         if self._running:
-            self._logger.warning("Cannot clear tasks while scheduler is running")
+            logger.warning("Cannot clear tasks while scheduler is running")
             return
         self.tasks.clear()
-        self._logger.debug("Cleared all tasks from the scheduler")
+        logger.debug("cleared tasks")

mm_std/concurrency/async_task_runner.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 import asyncio
+import logging
 from collections.abc import Awaitable
 from dataclasses import dataclass
-from logging import Logger
 from typing import Any
 
+logger = logging.getLogger(__name__)
+
 
 class AsyncTaskRunner:
     """
@@ -28,20 +30,20 @@ class AsyncTaskRunner:
         awaitable: Awaitable[Any]
 
     def __init__(
-        self, max_concurrent_tasks: int, timeout: float | None = None, name: str | None = None, logger: Logger | None = None
+        self, max_concurrent_tasks: int, timeout: float | None = None, name: str | None = None, no_logging: bool = False
     ) -> None:
         """
         :param max_concurrent_tasks: Maximum number of tasks that can run concurrently.
         :param timeout: Optional overall timeout in seconds for running all tasks.
         :param name: Optional name for the runner.
-        :param logger: Optional logger for task exceptions.
+        :param no_logging: If True, suppresses logging for task exception.
         """
         if timeout is not None and timeout <= 0:
             raise ValueError("Timeout must be positive if specified.")
         self.max_concurrent_tasks: int = max_concurrent_tasks
         self.timeout: float | None = timeout
         self.name = name
-        self.logger = logger
+        self.no_logging = no_logging
         self.semaphore: asyncio.Semaphore = asyncio.Semaphore(max_concurrent_tasks)
         self._tasks: list[AsyncTaskRunner.Task] = []
         self._was_run: bool = False
@@ -97,8 +99,8 @@ class AsyncTaskRunner:
                     res: Any = await task.awaitable
                     results[task.task_id] = res
                 except Exception as e:
-                    if self.logger:
-                        self.logger.exception(f"Task '{self._task_name(task.task_id)}' raised an exception")
+                    if not self.no_logging:
+                        logger.exception("Task raised an exception", extra={"task_id": task.task_id})
                     exceptions[task.task_id] = e
 
         # Create asyncio tasks for all runner tasks

mm_std/log.py

@@ -2,6 +2,69 @@ import logging
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
 
+from rich.logging import RichHandler
+
+
+class ExtraFormatter(logging.Formatter):
+    def format(self, record: logging.LogRecord) -> str:
+        base = super().format(record)
+        extras = {
+            key: value
+            for key, value in record.__dict__.items()
+            if key not in logging.LogRecord.__dict__
+            and key
+            not in (
+                "name",
+                "msg",
+                "args",
+                "levelname",
+                "levelno",
+                "pathname",
+                "filename",
+                "module",
+                "exc_info",
+                "exc_text",
+                "stack_info",
+                "lineno",
+                "funcName",
+                "created",
+                "msecs",
+                "relativeCreated",
+                "thread",
+                "threadName",
+                "processName",
+                "process",
+                "message",
+                "taskName",
+                "asctime",
+            )
+        }
+        if extras:
+            extras_str = " | " + " ".join(f"{k}={v}" for k, v in extras.items())
+            return base + extras_str
+        return base
+
+
+def configure_logging(developer_console: bool = False, console_level: int = logging.INFO) -> None:
+    """
+    Configure the root logger with a custom formatter that includes extra fields.
+    """
+    logger = logging.getLogger()
+    logger.setLevel(console_level)
+    logger.handlers.clear()
+
+    console_handler: logging.Handler
+
+    if developer_console:
+        console_handler = RichHandler(rich_tracebacks=True, show_time=True, show_level=True, show_path=False)
+        formatter = ExtraFormatter("{message}", style="{")
+    else:
+        console_handler = logging.StreamHandler()
+        formatter = ExtraFormatter("{asctime} - {name} - {levelname} - {message}", datefmt="%Y-%m-%d %H:%M:%S", style="{")
+    console_handler.setFormatter(formatter)
+
+    logger.addHandler(console_handler)
+
 
 def init_logger(name: str, file_path: str | None = None, file_mkdir: bool = True, level: int = logging.DEBUG) -> logging.Logger:
     log = logging.getLogger(name)

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

@@ -1,14 +1,14 @@
 Metadata-Version: 2.4
 Name: mm-std
-Version: 0.3.20
+Version: 0.3.22
 Requires-Python: >=3.12
 Requires-Dist: aiohttp-socks~=0.10.1
-Requires-Dist: aiohttp~=3.11.14
+Requires-Dist: aiohttp~=3.11.16
 Requires-Dist: cryptography~=44.0.2
 Requires-Dist: pydantic-settings>=2.8.1
-Requires-Dist: pydantic~=2.11.0
+Requires-Dist: pydantic~=2.11.2
 Requires-Dist: pydash~=8.0.5
 Requires-Dist: python-dotenv~=1.1.0
 Requires-Dist: requests[socks]~=2.32.3
-Requires-Dist: rich~=13.9.4
+Requires-Dist: rich>=13.9.0
 Requires-Dist: tomlkit~=0.13.2

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

@@ -1,4 +1,4 @@
-mm_std/__init__.py,sha256=yxfH7ROIU5jwRQEeFIloTlDPZm_8443PKk50xzmQq7c,2984
+mm_std/__init__.py,sha256=ETGLXQW17ZnV5i6kdhoNA-1MulHZixpzGIOLlYpiYx0,3040
 mm_std/command.py,sha256=ze286wjUjg0QSTgIu-2WZks53_Vclg69UaYYgPpQvCU,1283
 mm_std/config.py,sha256=4ox4D2CgGR76bvZ2n2vGQOYUDagFnlKEDb87to5zpxE,1871
 mm_std/crypto.py,sha256=jdk0_TCmeU0pPXMyz9xH6kQHSjjZ9GcGClBwQps5vBo,340
@@ -8,7 +8,7 @@ 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/json_.py,sha256=Naa6mBE4D0yiQGkPNRrFvndnUH3R7ovw3FeaejWV60o,1196
-mm_std/log.py,sha256=6ux6njNKc_ZCQlvWn1FZR6vcSY2Cem-mQzmNXvsg5IE,913
+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
@@ -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=xEpyipzp3ZhaPHtdeTE-Ikrt67SUTFKBE6LQPeoeh6Q,1735
-mm_std/concurrency/async_scheduler.py,sha256=qS3QKMA0xpoxCZWjDW1ItAwKMTQ5h8esXMMRA0eXtxE,5644
-mm_std/concurrency/async_task_runner.py,sha256=KyTp4aHt-qBc-qJpXIutFaTP9ykupG7uKafghAwbBvg,4948
+mm_std/concurrency/async_scheduler.py,sha256=TSu2WDJ8vfKZ4-saM3iZdcpGz8yPpSmud-7jJ4XKdJs,5579
+mm_std/concurrency/async_task_runner.py,sha256=EN7tN2enkVYVgDbhSiAr-_W4o9m9wBXCveXGT8aVXII,4994
 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.20.dist-info/METADATA,sha256=bcvPFhVCzwNBhB8qz0DW1AZY_jeKqdFIuMiOHHz-22I,415
-mm_std-0.3.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_std-0.3.20.dist-info/RECORD,,
+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,,