beans-logging 4.1.1__tar.gz → 6.0.0__tar.gz

{beans_logging-4.1.1 → beans_logging-6.0.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: beans_logging
-Version: 4.1.1
+Version: 6.0.0
 Summary: 'beans_logging' is a python package for simple logger and easily managing logging modules. It is a Loguru based custom logging package for python projects.
 Home-page: https://github.com/bybatkhuu/module.python-logging
-Download-URL: https://github.com/bybatkhuu/module.python-logging/archive/v4.1.1.tar.gz
+Download-URL: https://github.com/bybatkhuu/module.python-logging/archive/v6.0.0.tar.gz
 Author: Batkhuu Byambajav
 Author-email: batkhuu10@gmail.com
 License: MIT
@@ -20,8 +20,10 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: PyYAML<7.0,>=6.0
-Requires-Dist: pydantic<3.0.0,>=2.1.1
+Requires-Dist: pydantic!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0,>=1.10.0
 Requires-Dist: loguru<1.0.0,>=0.7.2
+Provides-Extra: fastapi
+Requires-Dist: beans-logging-fastapi<2.0.0,>=1.0.0; extra == "fastapi"
 
 # beans_logging
 
@@ -47,8 +49,8 @@ It is a `Loguru` based custom logging package for python projects.
 - Custom logging **formats**
 - **Multiprocess** compatibility (Linux, macOS - 'fork')
 - Add custom **handlers**
-- **FastAPI** HTTP access logging **middleware**
 - **Base** logging module
+- Support **Pydantic-v1** and **Pydantic-v2**
 
 ---
 
@@ -206,16 +208,16 @@ python ./main.py
 **Output**:
 
 ```txt
-[2023-09-01 09:00:00.384 +09:00 | TRACE | beans_logging._base:478]: Intercepted modules: ['concurrent', 'concurrent.futures', 'asyncio']; Muted modules: [];
-[2023-09-01 09:00:00.384 +09:00 | TRACE | __main__:7]: Tracing...
-[2023-09-01 09:00:00.385 +09:00 | DEBUG | __main__:8]: Debugging...
-[2023-09-01 09:00:00.385 +09:00 | INFO  | __main__:9]: Logging info.
-[2023-09-01 09:00:00.385 +09:00 | OK    | __main__:10]: Success.
-[2023-09-01 09:00:00.385 +09:00 | WARN  | __main__:11]: Warning something.
-[2023-09-01 09:00:00.385 +09:00 | ERROR | __main__:12]: Error occured.
-[2023-09-01 09:00:00.386 +09:00 | CRIT  | __main__:13]: CRITICAL ERROR.
-[2023-09-01 09:00:00.386 +09:00 | ERROR | __main__:25]: division by zero
-[2023-09-01 09:00:00.386 +09:00 | ERROR | __main__:32]: Show me, what value is wrong:
+[2023-09-01 00:00:00.000 +09:00 | TRACE | beans_logging._base:478]: Intercepted modules: ['concurrent', 'concurrent.futures', 'asyncio']; Muted modules: [];
+[2023-09-01 00:00:00.000 +09:00 | TRACE | __main__:7]: Tracing...
+[2023-09-01 00:00:00.000 +09:00 | DEBUG | __main__:8]: Debugging...
+[2023-09-01 00:00:00.000 +09:00 | INFO  | __main__:9]: Logging info.
+[2023-09-01 00:00:00.000 +09:00 | OK    | __main__:10]: Success.
+[2023-09-01 00:00:00.000 +09:00 | WARN  | __main__:11]: Warning something.
+[2023-09-01 00:00:00.000 +09:00 | ERROR | __main__:12]: Error occured.
+[2023-09-01 00:00:00.000 +09:00 | CRIT  | __main__:13]: CRITICAL ERROR.
+[2023-09-01 00:00:00.000 +09:00 | ERROR | __main__:25]: division by zero
+[2023-09-01 00:00:00.000 +09:00 | ERROR | __main__:32]: Show me, what value is wrong:
 Traceback (most recent call last):
 
 > File "/home/user/workspaces/projects/beans_logging/examples/simple/./main.py", line 30, in <module>
@@ -235,157 +237,12 @@ Traceback (most recent call last):
 ZeroDivisionError: division by zero
 ```
 
-### **Advanced (FastAPI)**
+### **FastAPI**
 
-[**`configs/logger.yml`**](https://github.com/bybatkhuu/module.python-logging/blob/main/examples/advanced/configs/logger.yml):
+Checkout `beans_logging_fastapi` package: <https://github.com/bybatkhuu/module.fastapi-logging>
 
-```yaml
-logger:
-  app_name: "fastapi-app"
-  level: "TRACE"
-  use_diagnose: false
-  stream:
-    use_color: true
-    use_icon: false
-    format_str: "[<c>{time:YYYY-MM-DD HH:mm:ss.SSS Z}</c> | <level>{level_short:<5}</level> | <w>{name}:{line}</w>]: <level>{message}</level>"
-    std_handler:
-      enabled: true
-  file:
-    logs_dir: "./logs"
-    rotate_size: 10000000 # 10MB
-    rotate_time: "00:00:00"
-    backup_count: 90
-    log_handlers:
-      enabled: true
-      format_str: "[{time:YYYY-MM-DD HH:mm:ss.SSS Z} | {level_short:<5} | {name}:{line}]: {message}"
-      log_path: "{app_name}.std.all.log"
-      err_path: "{app_name}.std.err.log"
-    json_handlers:
-      enabled: true
-      use_custom: false
-      log_path: "json/{app_name}.json.all.log"
-      err_path: "json/{app_name}.json.err.log"
-  intercept:
-    auto_load:
-      enabled: true
-      only_base: false
-      ignore_modules: []
-    include_modules: []
-    mute_modules: ["uvicorn.access", "uvicorn.error"]
-  extra:
-    http_std_debug_format: '<n>[{request_id}]</n> {client_host} {user_id} "<u>{method} {url_path}</u> HTTP/{http_version}"'
-    http_std_msg_format: '<n><w>[{request_id}]</w></n> {client_host} {user_id} "<u>{method} {url_path}</u> HTTP/{http_version}" {status_code} {content_length}B {response_time}ms'
-    http_file_enabled: true
-    http_log_path: "http/{app_name}.http.access.log"
-    http_err_path: "http/{app_name}.http.err.log"
-    http_json_enabled: true
-    http_json_path: "json.http/{app_name}.json.http.access.log"
-    http_json_err_path: "json.http/{app_name}.json.http.err.log"
-```
-
-[**`.env`**](https://github.com/bybatkhuu/module.python-logging/blob/main/examples/advanced/.env):
-
-```sh
-ENV=development
-DEBUG=true
-```
-
-[**`logger.py`**](https://github.com/bybatkhuu/module.python-logging/blob/main/examples/advanced/logger.py):
-
-```python
-from beans_logging import Logger, LoggerLoader
-from beans_logging.fastapi import add_http_file_handler, add_http_file_json_handler
-
-
-logger_loader = LoggerLoader()
-logger: Logger = logger_loader.load()
-
-if logger_loader.config.extra.http_file_enabled:
-    add_http_file_handler(
-        logger_loader=logger_loader,
-        log_path=logger_loader.config.extra.http_log_path,
-        err_path=logger_loader.config.extra.http_err_path,
-    )
-
-if logger_loader.config.extra.http_json_enabled:
-    add_http_file_json_handler(
-        logger_loader=logger_loader,
-        log_path=logger_loader.config.extra.http_json_path,
-        err_path=logger_loader.config.extra.http_json_err_path,
-    )
-```
-
-[**`app.py`**](https://github.com/bybatkhuu/module.python-logging/blob/main/examples/advanced/app.py):
-
-```python
-from typing import Union
-from contextlib import asynccontextmanager
-
-from dotenv import load_dotenv
-from fastapi import FastAPI, HTTPException
-from fastapi.responses import RedirectResponse
-
-load_dotenv()
-
-from beans_logging.fastapi import HttpAccessLogMiddleware
-
-from logger import logger, logger_loader
-from __version__ import __version__
-
-
-@asynccontextmanager
-async def lifespan(app: FastAPI):
-    logger.info("Preparing to startup...")
-    logger.success("Finished preparation to startup.")
-    logger.info(f"API version: {__version__}")
-
-    yield
-    logger.info("Praparing to shutdown...")
-    logger.success("Finished preparation to shutdown.")
-
-app = FastAPI(lifespan=lifespan, version=__version__)
-app.add_middleware(
-    HttpAccessLogMiddleware,
-    has_proxy_headers=True,
-    debug_format=logger_loader.config.extra.http_std_debug_format,
-    msg_format=logger_loader.config.extra.http_std_msg_format,
-)
-
-@app.get("/")
-def root():
-    return {"Hello": "World"}
-```
-
-Run the [**`examples/advanced`**](https://github.com/bybatkhuu/module.python-logging/tree/main/examples/advanced):
-
-```sh
-cd ./examples/advanced
-# Install python dependencies for examples:
-pip install -r ./requirements.txt
-
-uvicorn app:app --host=0.0.0.0 --port=8000
-```
-
-**Output**:
-
-```txt
-[2023-09-01 12:37:38.569 +09:00 | TRACE | beans_logging._base:499]: Intercepted modules: ['watchfiles.watcher', 'asyncio', 'watchfiles', 'concurrent', 'dotenv', 'concurrent.futures', 'fastapi', 'dotenv.main', 'uvicorn', 'watchfiles.main']; Muted modules: ['uvicorn.error', 'uvicorn.access'];
-[2023-09-01 12:37:38.579 +09:00 | INFO  | uvicorn.server:76]: Started server process [22599]
-[2023-09-01 12:37:38.579 +09:00 | INFO  | uvicorn.lifespan.on:46]: Waiting for application startup.
-[2023-09-01 12:37:38.579 +09:00 | INFO  | app:21]: Preparing to startup...
-[2023-09-01 12:37:38.580 +09:00 | OK    | app:22]: Finished preparation to startup.
-[2023-09-01 12:37:38.580 +09:00 | INFO  | app:23]: API version: 0.0.1-000000
-[2023-09-01 12:37:38.580 +09:00 | INFO  | uvicorn.lifespan.on:60]: Application startup complete.
-[2023-09-01 12:37:38.582 +09:00 | INFO  | uvicorn.server:218]: Uvicorn running on http://0.0.0.0:9000 (Press CTRL+C to quit)
-[2023-09-01 12:37:48.487 +09:00 | DEBUG | anyio._backends._asyncio:807]: [0b9f972939054a58ba10e7a39a12bd21] 127.0.0.1 - "GET / HTTP/1.1"
-[2023-09-01 12:37:48.488 +09:00 | OK    | anyio._backends._asyncio:807]: [0b9f972939054a58ba10e7a39a12bd21] 127.0.0.1 - "GET / HTTP/1.1" 200 17B 0.5ms
-^C[2023-09-01 12:37:51.845 +09:00 | INFO  | uvicorn.server:264]: Shutting down
-[2023-09-01 12:37:51.949 +09:00 | INFO  | uvicorn.lifespan.on:65]: Waiting for application shutdown.
-[2023-09-01 12:37:51.951 +09:00 | INFO  | app:26]: Praparing to shutdown...
-[2023-09-01 12:37:51.952 +09:00 | OK    | app:27]: Finished preparation to shutdown.
-[2023-09-01 12:37:51.952 +09:00 | INFO  | uvicorn.lifespan.on:76]: Application shutdown complete.
-[2023-09-01 12:37:51.953 +09:00 | INFO  | uvicorn.server:86]: Finished server process [22599]
-```
+- FastAPI HTTP access logging middleware
+- Install with pip: `pip install -U beans-logging[fastapi]` or `pip install -U beans-logging-fastapi`
 
 ---
 
@@ -411,7 +268,7 @@ DEBUG=true
 
 BEANS_LOGGING_DISABLE_DEFAULT=false
 BEANS_LOGGING_CONFIG_PATH="./configs/logger.yml"
-BEANS_LOGGING_DIR="./logs"
+BEANS_LOGGING_LOGS_DIR="./logs"
 ```
 
 ## Configuration
@@ -466,3 +323,4 @@ logger:
 - <https://github.com/Delgan/loguru>
 - <https://loguru.readthedocs.io/en/stable/api/logger.html>
 - <https://loguru.readthedocs.io/en/stable/resources/recipes.html>
+- <https://github.com/bybatkhuu/module.fastapi-logging>

{beans_logging-4.1.1 → beans_logging-6.0.0}/README.md

@@ -22,8 +22,8 @@ It is a `Loguru` based custom logging package for python projects.
 - Custom logging **formats**
 - **Multiprocess** compatibility (Linux, macOS - 'fork')
 - Add custom **handlers**
-- **FastAPI** HTTP access logging **middleware**
 - **Base** logging module
+- Support **Pydantic-v1** and **Pydantic-v2**
 
 ---
 
@@ -181,16 +181,16 @@ python ./main.py
 **Output**:
 
 ```txt
-[2023-09-01 09:00:00.384 +09:00 | TRACE | beans_logging._base:478]: Intercepted modules: ['concurrent', 'concurrent.futures', 'asyncio']; Muted modules: [];
-[2023-09-01 09:00:00.384 +09:00 | TRACE | __main__:7]: Tracing...
-[2023-09-01 09:00:00.385 +09:00 | DEBUG | __main__:8]: Debugging...
-[2023-09-01 09:00:00.385 +09:00 | INFO  | __main__:9]: Logging info.
-[2023-09-01 09:00:00.385 +09:00 | OK    | __main__:10]: Success.
-[2023-09-01 09:00:00.385 +09:00 | WARN  | __main__:11]: Warning something.
-[2023-09-01 09:00:00.385 +09:00 | ERROR | __main__:12]: Error occured.
-[2023-09-01 09:00:00.386 +09:00 | CRIT  | __main__:13]: CRITICAL ERROR.
-[2023-09-01 09:00:00.386 +09:00 | ERROR | __main__:25]: division by zero
-[2023-09-01 09:00:00.386 +09:00 | ERROR | __main__:32]: Show me, what value is wrong:
+[2023-09-01 00:00:00.000 +09:00 | TRACE | beans_logging._base:478]: Intercepted modules: ['concurrent', 'concurrent.futures', 'asyncio']; Muted modules: [];
+[2023-09-01 00:00:00.000 +09:00 | TRACE | __main__:7]: Tracing...
+[2023-09-01 00:00:00.000 +09:00 | DEBUG | __main__:8]: Debugging...
+[2023-09-01 00:00:00.000 +09:00 | INFO  | __main__:9]: Logging info.
+[2023-09-01 00:00:00.000 +09:00 | OK    | __main__:10]: Success.
+[2023-09-01 00:00:00.000 +09:00 | WARN  | __main__:11]: Warning something.
+[2023-09-01 00:00:00.000 +09:00 | ERROR | __main__:12]: Error occured.
+[2023-09-01 00:00:00.000 +09:00 | CRIT  | __main__:13]: CRITICAL ERROR.
+[2023-09-01 00:00:00.000 +09:00 | ERROR | __main__:25]: division by zero
+[2023-09-01 00:00:00.000 +09:00 | ERROR | __main__:32]: Show me, what value is wrong:
 Traceback (most recent call last):
 
 > File "/home/user/workspaces/projects/beans_logging/examples/simple/./main.py", line 30, in <module>
@@ -210,157 +210,12 @@ Traceback (most recent call last):
 ZeroDivisionError: division by zero
 ```
 
-### **Advanced (FastAPI)**
+### **FastAPI**
 
-[**`configs/logger.yml`**](https://github.com/bybatkhuu/module.python-logging/blob/main/examples/advanced/configs/logger.yml):
+Checkout `beans_logging_fastapi` package: <https://github.com/bybatkhuu/module.fastapi-logging>
 
-```yaml
-logger:
-  app_name: "fastapi-app"
-  level: "TRACE"
-  use_diagnose: false
-  stream:
-    use_color: true
-    use_icon: false
-    format_str: "[<c>{time:YYYY-MM-DD HH:mm:ss.SSS Z}</c> | <level>{level_short:<5}</level> | <w>{name}:{line}</w>]: <level>{message}</level>"
-    std_handler:
-      enabled: true
-  file:
-    logs_dir: "./logs"
-    rotate_size: 10000000 # 10MB
-    rotate_time: "00:00:00"
-    backup_count: 90
-    log_handlers:
-      enabled: true
-      format_str: "[{time:YYYY-MM-DD HH:mm:ss.SSS Z} | {level_short:<5} | {name}:{line}]: {message}"
-      log_path: "{app_name}.std.all.log"
-      err_path: "{app_name}.std.err.log"
-    json_handlers:
-      enabled: true
-      use_custom: false
-      log_path: "json/{app_name}.json.all.log"
-      err_path: "json/{app_name}.json.err.log"
-  intercept:
-    auto_load:
-      enabled: true
-      only_base: false
-      ignore_modules: []
-    include_modules: []
-    mute_modules: ["uvicorn.access", "uvicorn.error"]
-  extra:
-    http_std_debug_format: '<n>[{request_id}]</n> {client_host} {user_id} "<u>{method} {url_path}</u> HTTP/{http_version}"'
-    http_std_msg_format: '<n><w>[{request_id}]</w></n> {client_host} {user_id} "<u>{method} {url_path}</u> HTTP/{http_version}" {status_code} {content_length}B {response_time}ms'
-    http_file_enabled: true
-    http_log_path: "http/{app_name}.http.access.log"
-    http_err_path: "http/{app_name}.http.err.log"
-    http_json_enabled: true
-    http_json_path: "json.http/{app_name}.json.http.access.log"
-    http_json_err_path: "json.http/{app_name}.json.http.err.log"
-```
-
-[**`.env`**](https://github.com/bybatkhuu/module.python-logging/blob/main/examples/advanced/.env):
-
-```sh
-ENV=development
-DEBUG=true
-```
-
-[**`logger.py`**](https://github.com/bybatkhuu/module.python-logging/blob/main/examples/advanced/logger.py):
-
-```python
-from beans_logging import Logger, LoggerLoader
-from beans_logging.fastapi import add_http_file_handler, add_http_file_json_handler
-
-
-logger_loader = LoggerLoader()
-logger: Logger = logger_loader.load()
-
-if logger_loader.config.extra.http_file_enabled:
-    add_http_file_handler(
-        logger_loader=logger_loader,
-        log_path=logger_loader.config.extra.http_log_path,
-        err_path=logger_loader.config.extra.http_err_path,
-    )
-
-if logger_loader.config.extra.http_json_enabled:
-    add_http_file_json_handler(
-        logger_loader=logger_loader,
-        log_path=logger_loader.config.extra.http_json_path,
-        err_path=logger_loader.config.extra.http_json_err_path,
-    )
-```
-
-[**`app.py`**](https://github.com/bybatkhuu/module.python-logging/blob/main/examples/advanced/app.py):
-
-```python
-from typing import Union
-from contextlib import asynccontextmanager
-
-from dotenv import load_dotenv
-from fastapi import FastAPI, HTTPException
-from fastapi.responses import RedirectResponse
-
-load_dotenv()
-
-from beans_logging.fastapi import HttpAccessLogMiddleware
-
-from logger import logger, logger_loader
-from __version__ import __version__
-
-
-@asynccontextmanager
-async def lifespan(app: FastAPI):
-    logger.info("Preparing to startup...")
-    logger.success("Finished preparation to startup.")
-    logger.info(f"API version: {__version__}")
-
-    yield
-    logger.info("Praparing to shutdown...")
-    logger.success("Finished preparation to shutdown.")
-
-app = FastAPI(lifespan=lifespan, version=__version__)
-app.add_middleware(
-    HttpAccessLogMiddleware,
-    has_proxy_headers=True,
-    debug_format=logger_loader.config.extra.http_std_debug_format,
-    msg_format=logger_loader.config.extra.http_std_msg_format,
-)
-
-@app.get("/")
-def root():
-    return {"Hello": "World"}
-```
-
-Run the [**`examples/advanced`**](https://github.com/bybatkhuu/module.python-logging/tree/main/examples/advanced):
-
-```sh
-cd ./examples/advanced
-# Install python dependencies for examples:
-pip install -r ./requirements.txt
-
-uvicorn app:app --host=0.0.0.0 --port=8000
-```
-
-**Output**:
-
-```txt
-[2023-09-01 12:37:38.569 +09:00 | TRACE | beans_logging._base:499]: Intercepted modules: ['watchfiles.watcher', 'asyncio', 'watchfiles', 'concurrent', 'dotenv', 'concurrent.futures', 'fastapi', 'dotenv.main', 'uvicorn', 'watchfiles.main']; Muted modules: ['uvicorn.error', 'uvicorn.access'];
-[2023-09-01 12:37:38.579 +09:00 | INFO  | uvicorn.server:76]: Started server process [22599]
-[2023-09-01 12:37:38.579 +09:00 | INFO  | uvicorn.lifespan.on:46]: Waiting for application startup.
-[2023-09-01 12:37:38.579 +09:00 | INFO  | app:21]: Preparing to startup...
-[2023-09-01 12:37:38.580 +09:00 | OK    | app:22]: Finished preparation to startup.
-[2023-09-01 12:37:38.580 +09:00 | INFO  | app:23]: API version: 0.0.1-000000
-[2023-09-01 12:37:38.580 +09:00 | INFO  | uvicorn.lifespan.on:60]: Application startup complete.
-[2023-09-01 12:37:38.582 +09:00 | INFO  | uvicorn.server:218]: Uvicorn running on http://0.0.0.0:9000 (Press CTRL+C to quit)
-[2023-09-01 12:37:48.487 +09:00 | DEBUG | anyio._backends._asyncio:807]: [0b9f972939054a58ba10e7a39a12bd21] 127.0.0.1 - "GET / HTTP/1.1"
-[2023-09-01 12:37:48.488 +09:00 | OK    | anyio._backends._asyncio:807]: [0b9f972939054a58ba10e7a39a12bd21] 127.0.0.1 - "GET / HTTP/1.1" 200 17B 0.5ms
-^C[2023-09-01 12:37:51.845 +09:00 | INFO  | uvicorn.server:264]: Shutting down
-[2023-09-01 12:37:51.949 +09:00 | INFO  | uvicorn.lifespan.on:65]: Waiting for application shutdown.
-[2023-09-01 12:37:51.951 +09:00 | INFO  | app:26]: Praparing to shutdown...
-[2023-09-01 12:37:51.952 +09:00 | OK    | app:27]: Finished preparation to shutdown.
-[2023-09-01 12:37:51.952 +09:00 | INFO  | uvicorn.lifespan.on:76]: Application shutdown complete.
-[2023-09-01 12:37:51.953 +09:00 | INFO  | uvicorn.server:86]: Finished server process [22599]
-```
+- FastAPI HTTP access logging middleware
+- Install with pip: `pip install -U beans-logging[fastapi]` or `pip install -U beans-logging-fastapi`
 
 ---
 
@@ -386,7 +241,7 @@ DEBUG=true
 
 BEANS_LOGGING_DISABLE_DEFAULT=false
 BEANS_LOGGING_CONFIG_PATH="./configs/logger.yml"
-BEANS_LOGGING_DIR="./logs"
+BEANS_LOGGING_LOGS_DIR="./logs"
 ```
 
 ## Configuration
@@ -441,3 +296,4 @@ logger:
 - <https://github.com/Delgan/loguru>
 - <https://loguru.readthedocs.io/en/stable/api/logger.html>
 - <https://loguru.readthedocs.io/en/stable/resources/recipes.html>
+- <https://github.com/bybatkhuu/module.fastapi-logging>

beans_logging-6.0.0/beans_logging/__init__.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+from ._base import Logger, logger, LoggerLoader
+from .schemas import LoggerConfigPM
+from ._consts import WarnEnum
+from .__version__ import __version__
+
+
+__all__ = [
+    "Logger",
+    "logger",
+    "LoggerLoader",
+    "LoggerConfigPM",
+    "WarnEnum",
+    "__version__",
+]

{beans_logging-4.1.1 → beans_logging-6.0.0}/beans_logging/__version__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "4.1.1"
+__version__ = "6.0.0"

{beans_logging-4.1.1 → beans_logging-6.0.0}/beans_logging/_base.py

@@ -11,7 +11,12 @@ from typing import Union, Dict, Any
 import yaml
 from loguru import logger
 from loguru._logger import Logger
-from pydantic import validate_call
+import pydantic
+
+if "2.0.0" <= pydantic.__version__:
+    from pydantic import validate_call
+else:
+    from pydantic import validate_arguments as validate_call
 
 ## Internal modules
 from ._utils import create_dir, deep_merge
@@ -168,7 +173,11 @@ class LoggerLoader:
         """
 
         if isinstance(config, dict):
-            _config_dict = self.config.model_dump()
+            if "2.0.0" <= pydantic.__version__:
+                _config_dict = self.config.model_dump()
+            else:
+                _config_dict = self.config.dict()
+
             _merged_dict = deep_merge(_config_dict, config)
             try:
                 self.config = LoggerConfigPM(**_merged_dict)
@@ -219,7 +228,11 @@ class LoggerLoader:
                             return
 
                         _new_config_dict = _new_config_dict["logger"]
-                        _config_dict = self.config.model_dump()
+                        if "2.0.0" <= pydantic.__version__:
+                            _config_dict = self.config.model_dump()
+                        else:
+                            _config_dict = self.config.dict()
+
                         _merged_dict = deep_merge(_config_dict, _new_config_dict)
                         self.config = LoggerConfigPM(**_merged_dict)
                 except Exception:
@@ -240,7 +253,11 @@ class LoggerLoader:
                             return
 
                         _new_config_dict = _new_config_dict["logger"]
-                        _config_dict = self.config.model_dump()
+                        if "2.0.0" <= pydantic.__version__:
+                            _config_dict = self.config.model_dump()
+                        else:
+                            _config_dict = self.config.dict()
+
                         _merged_dict = deep_merge(_config_dict, _new_config_dict)
                         self.config = LoggerConfigPM(**_merged_dict)
                 except Exception:
@@ -252,7 +269,9 @@ class LoggerLoader:
             #     try:
             #         import toml
 
-            #         with open(self.config_file_path, "r", encoding="utf-8") as _config_file:
+            #         with open(
+            #             self.config_file_path, "r", encoding="utf-8"
+            #         ) as _config_file:
             #             _new_config_dict = toml.load(_config_file) or {}
             #             if "logger" not in _new_config_dict:
             #                 logger.warning(
@@ -261,7 +280,11 @@ class LoggerLoader:
             #                 return
 
             #             _new_config_dict = _new_config_dict["logger"]
-            #             _config_dict = self.config.model_dump()
+            #             if "2.0.0" <= pydantic.__version__:
+            #                 _config_dict = self.config.model_dump()
+            #             else:
+            #                 _config_dict = self.config.dict()
+
             #             _merged_dict = deep_merge(_config_dict, _new_config_dict)
             #             self.config = LoggerConfigPM(**_merged_dict)
             #     except Exception:
@@ -287,8 +310,8 @@ class LoggerLoader:
         if _is_debug and (self.config.level != "TRACE"):
             self.config.level = "DEBUG"
 
-        if "BEANS_LOGGING_DIR" in os.environ:
-            self.config.file.logs_dir = os.getenv("BEANS_LOGGING_DIR")
+        if "BEANS_LOGGING_LOGS_DIR" in os.environ:
+            self.config.file.logs_dir = os.getenv("BEANS_LOGGING_LOGS_DIR")
 
         # if self.config.stream.use_color:
         #     ## Checking terminal could support xterm colors:
@@ -529,11 +552,13 @@ class LoggerLoader:
                 ):
                     _logger = logging.getLogger(_module_name)
                     _logger.handlers = [_intercept_handler]
+                    _logger.propagate = False
                     _intercepted_modules.add(_module_name)
 
         for _include_module_name in self.config.intercept.include_modules:
             _logger = logging.getLogger(_include_module_name)
             _logger.handlers = [_intercept_handler]
+            logger.propagate = False
 
             if _include_module_name not in _intercepted_modules:
                 _intercepted_modules.add(_include_module_name)
@@ -541,8 +566,8 @@ class LoggerLoader:
         for _mute_module_name in self.config.intercept.mute_modules:
             _logger = logging.getLogger(_mute_module_name)
             _logger.handlers = []
-            # _logger.propagate = False
-            # _logger.disabled = True
+            _logger.propagate = False
+            _logger.disabled = True
 
             if _mute_module_name in _intercepted_modules:
                 _intercepted_modules.remove(_mute_module_name)

beans_logging-6.0.0/beans_logging/_consts.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+from enum import Enum
+
+
+class WarnEnum(str, Enum):
+    ERROR = "ERROR"
+    ALWAYS = "ALWAYS"
+    DEBUG = "DEBUG"
+    IGNORE = "IGNORE"
+
+
+class LogLevelEnum(str, Enum):
+    TRACE = "TRACE"
+    DEBUG = "DEBUG"
+    INFO = "INFO"
+    SUCCESS = "SUCCESS"
+    WARNING = "WARNING"
+    ERROR = "ERROR"
+    CRITICAL = "CRITICAL"

{beans_logging-4.1.1 → beans_logging-6.0.0}/beans_logging/_utils.py

@@ -1,13 +1,19 @@
 # -*- coding: utf-8 -*-
 
 import os
+import sys
 import copy
 import errno
 
 from loguru import logger
-from pydantic import validate_call
+import pydantic
 
-from ._const import WarnEnum
+if "2.0.0" <= pydantic.__version__:
+    from pydantic import validate_call
+else:
+    from pydantic import validate_arguments as validate_call
+
+from ._consts import WarnEnum
 
 
 @validate_call
@@ -16,13 +22,13 @@ def create_dir(create_dir: str, warn_mode: WarnEnum = WarnEnum.DEBUG):
 
     Args:
         create_dir (str, required): Create directory path.
-        warn_mode  (str, optional): Warning message mode, for example: 'LOG', 'DEBUG', 'QUIET'. Defaults to "QUIET".
+        warn_mode  (str, optional): Warning message mode, for example: 'ERROR', 'ALWAYS', 'DEBUG', 'IGNORE'. Defaults to "DEBUG".
     """
 
     if not os.path.isdir(create_dir):
         try:
             _message = f"Creaing '{create_dir}' directory..."
-            if warn_mode == WarnEnum.LOG:
+            if warn_mode == WarnEnum.ALWAYS:
                 logger.info(_message)
             elif warn_mode == WarnEnum.DEBUG:
                 logger.debug(_message)
@@ -36,7 +42,7 @@ def create_dir(create_dir: str, warn_mode: WarnEnum = WarnEnum.DEBUG):
                 raise
 
         _message = f"Successfully created '{create_dir}' directory."
-        if warn_mode == WarnEnum.LOG:
+        if warn_mode == WarnEnum.ALWAYS:
             logger.success(_message)
         elif warn_mode == WarnEnum.DEBUG:
             logger.debug(_message)
@@ -67,3 +73,28 @@ def deep_merge(dict1: dict, dict2: dict) -> dict:
             _merged[_key] = copy.deepcopy(_val)
 
     return _merged
+
+
+def get_default_logs_dir() -> str:
+    """Return default logs directory path (current working directory + 'logs').
+
+    Returns:
+        str: Default logs directory path.
+    """
+
+    return os.path.join(os.getcwd(), "logs")
+
+
+def get_app_name() -> str:
+    """Return application name (sys.argv[0]).
+
+    Returns:
+        str: Application name.
+    """
+
+    return (
+        os.path.splitext(os.path.basename(sys.argv[0]))[0]
+        .strip()
+        .replace(" ", "-")
+        .lower()
+    )