chutils 2.7.2__tar.gz → 2.7.3__tar.gz

{chutils-2.7.2 → chutils-2.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chutils
-Version: 2.7.2
+Version: 2.7.3
 Summary: Набор простых и удобных утилит для Python, который избавляет от рутины при работе с конфигурацией и логированием в новых проектах.
 License-Expression: MIT
 License-File: LICENSE
@@ -83,7 +83,8 @@ Every time you start a new project, you have to solve the same tasks:
   file. It uses **lazy initialization** — no heavy operations until you actually need them.
 - **⚙️ Flexible Configuration:** Support for `YAML` and `INI` formats. Simple functions for retrieving typed data.
 - **✍️ Advanced Logger:** The `setup_logger()` function configures logging to the console and rotating files out of the
-  box. It returns a custom logger with additional debug levels (`devdebug`, `mediumdebug`).
+  box. Includes **automatic secret masking** and **smart console width detection** for IDEs (PyCharm, etc.).
+  It returns a custom logger with additional debug levels (`devdebug`, `mediumdebug`).
 - **🔒 Secure Secret Storage:** The `secret_manager` module provides a simple interface for saving and retrieving secrets
   via the system `keyring`, with a fallback to `.env` files.
 - **🚀 CLI Booster:** Turn any function into a CLI tool in seconds using the `@cli_command` decorator with automatic type

{chutils-2.7.2 → chutils-2.7.3}/README.md

@@ -31,7 +31,8 @@ Every time you start a new project, you have to solve the same tasks:
   file. It uses **lazy initialization** — no heavy operations until you actually need them.
 - **⚙️ Flexible Configuration:** Support for `YAML` and `INI` formats. Simple functions for retrieving typed data.
 - **✍️ Advanced Logger:** The `setup_logger()` function configures logging to the console and rotating files out of the
-  box. It returns a custom logger with additional debug levels (`devdebug`, `mediumdebug`).
+  box. Includes **automatic secret masking** and **smart console width detection** for IDEs (PyCharm, etc.).
+  It returns a custom logger with additional debug levels (`devdebug`, `mediumdebug`).
 - **🔒 Secure Secret Storage:** The `secret_manager` module provides a simple interface for saving and retrieving secrets
   via the system `keyring`, with a fallback to `.env` files.
 - **🚀 CLI Booster:** Turn any function into a CLI tool in seconds using the `@cli_command` decorator with automatic type

{chutils-2.7.2 → chutils-2.7.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "chutils"
-version = "2.7.2"
+version = "2.7.3"
 description = "Набор простых и удобных утилит для Python, который избавляет от рутины при работе с конфигурацией и логированием в новых проектах."
 authors = [{name = "Chu4hel", email = "sergeiivanov636@gmail.com"}]
 license = "MIT"

{chutils-2.7.2 → chutils-2.7.3}/src/chutils/cli_utils.py

@@ -1,6 +1,8 @@
+import os
 import re
+import shutil
 import sys
-from typing import Any
+from typing import Any, Optional
 
 from .env import RICH_AVAILABLE, is_rich_enabled
 
@@ -18,6 +20,10 @@ class FallbackConsole:
     def __init__(self, stderr: bool = False):
         self._is_stderr = stderr
 
+    @property
+    def file(self):
+        return sys.stderr if self._is_stderr else sys.stdout
+
     def _strip_markup(self, text: str) -> str:
         """Удаляет простейшие теги rich типа [bold]."""
         return re.sub(r"\[/?[\w\s,=#]*\]", "", text)
@@ -56,6 +62,32 @@ class FallbackConsole:
 
 _console = None
 _err_console = None
+_console_width: Optional[int] = None
+
+
+def set_console_width(width: int):
+    """
+    Устанавливает ширину консоли и сбрасывает кэшированные экземпляры консолей.
+    """
+    global _console_width, _console, _err_console
+    _console_width = width
+    _console = None
+    _err_console = None
+
+
+def _get_default_width() -> Optional[int]:
+    """Определяет ширину консоли по умолчанию с учетом IDE."""
+    if _console_width is not None:
+        return _console_width
+
+    # Пытаемся определить размер терминала
+    width, _ = shutil.get_terminal_size(fallback=(80, 24))
+
+    # Специфичное поведение для PyCharm (часто ограничивает ширину в 80 символов при запуске логов)
+    if os.getenv("PYCHARM_HOSTED") == "1" and width == 80:
+        return 140
+
+    return width
 
 
 def get_console(stderr: bool = False) -> Any:
@@ -68,7 +100,7 @@ def get_console(stderr: bool = False) -> Any:
         if _err_console is not None:
             return _err_console
         if is_rich_enabled():
-            _err_console = Console(stderr=True)
+            _err_console = Console(stderr=True, width=_get_default_width())
         else:
             _err_console = FallbackConsole(stderr=True)
         return _err_console
@@ -77,7 +109,7 @@ def get_console(stderr: bool = False) -> Any:
         return _console
 
     if is_rich_enabled():
-        _console = Console()
+        _console = Console(width=_get_default_width())
     else:
         _console = FallbackConsole()
     return _console

{chutils-2.7.2 → chutils-2.7.3}/src/chutils/dev/ast_indexer.py

@@ -22,6 +22,8 @@ class Indexer:
             self.project_root = self.root_path
 
         self._graph_map: Dict[str, Dict[str, int]] = {}  # {source: {target: weight}}
+        self._current_imports: Dict[str, str] = {}
+        """Карта импортов текущего модуля {asname: full_path}"""
         self._public_symbols = self._discover_public_api()
 
     @property
@@ -162,11 +164,13 @@ class Indexer:
         )
 
         # Анализ зависимостей
+        self._current_imports = {}
         if tree:
             for item in tree.body:
                 if isinstance(item, ast.Import):
                     for alias in item.names:
                         self._record_dependency(rel_path, alias.name)
+                        self._current_imports[alias.asname or alias.name] = alias.name
                 elif isinstance(item, ast.ImportFrom):
                     is_relative = item.level > 0
                     base = item.module if item.module else "." * item.level
@@ -177,6 +181,9 @@ class Indexer:
                                 self._record_dependency(rel_path, base, force_internal=is_relative)
                                 continue
 
+                            full_name = f"{base}.{alias.name}" if not is_relative else f"{base}{alias.name}"
+                            self._current_imports[alias.asname or alias.name] = full_name
+
                             if is_relative:
                                 # Для относительных импортов в тестах ожидается база ('.', '..')
                                 self._record_dependency(rel_path, base, force_internal=True)
@@ -224,6 +231,10 @@ class Indexer:
                         ))
         return symbols
 
+    def _resolve_base_class(self, base_name: str) -> str:
+        """Разрешает имя базового класса в полный путь импорта."""
+        return self._current_imports.get(base_name, base_name)
+
     def _build_symbol(self, node: Union[ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef], sym_type: str) -> Symbol:
         """Создает объект Symbol из узла AST."""
         docstring = ast.get_docstring(node) or ""
@@ -248,15 +259,21 @@ class Indexer:
 
         # Декораторы
         for dec in node.decorator_list:
+            dec_name = ""
             if isinstance(dec, ast.Name):
-                breadcrumbs.decorators.append(dec.id)
+                dec_name = dec.id
             elif isinstance(dec, ast.Attribute) and isinstance(dec.value, ast.Name):
-                breadcrumbs.decorators.append(f"{dec.value.id}.{dec.attr}")
+                dec_name = f"{dec.value.id}.{dec.attr}"
             elif isinstance(dec, ast.Call):
                 if isinstance(dec.func, ast.Name):
-                    breadcrumbs.decorators.append(dec.func.id)
+                    dec_name = dec.func.id
                 elif isinstance(dec.func, ast.Attribute) and isinstance(dec.func.value, ast.Name):
-                    breadcrumbs.decorators.append(f"{dec.func.value.id}.{dec.func.attr}")
+                    dec_name = f"{dec.func.value.id}.{dec.func.attr}"
+
+            if dec_name:
+                breadcrumbs.decorators.append(dec_name)
+                if dec_name == "abstractmethod" or dec_name.endswith(".abstractmethod"):
+                    breadcrumbs.is_abstract = True
 
         # Теги из docstring (:tag:)
         tags = re.findall(r":([\w-]+):", docstring)
@@ -267,7 +284,7 @@ class Indexer:
         if "heavy" in breadcrumbs.tags:
             breadcrumbs.is_heavy = True
 
-        return Symbol(
+        symbol = Symbol(
             name=node.name,
             type=sym_type,
             signature=signature,
@@ -277,3 +294,34 @@ class Indexer:
             line_number=node.lineno,
             layer=self._get_layer(node.name, docstring)
         )
+
+        if isinstance(node, ast.ClassDef):
+            # Извлекаем базы
+            for base in node.bases:
+                if isinstance(base, ast.Name):
+                    symbol.bases.append(self._resolve_base_class(base.id))
+                elif isinstance(base, ast.Attribute):
+                    # Случай типа pydantic.BaseModel
+                    parts = []
+                    curr = base
+                    while isinstance(curr, ast.Attribute):
+                        parts.append(curr.attr)
+                        curr = curr.value
+                    if isinstance(curr, ast.Name):
+                        parts.append(curr.id)
+                    symbol.bases.append(".".join(reversed(parts)))
+
+            # Извлекаем методы
+            for item in node.body:
+                if isinstance(item, (ast.FunctionDef, ast.AsyncFunctionDef)):
+                    # Фильтрация: оставляем публичные, защищенные (_) и __init__.
+                    # Отбрасываем остальные dunder-методы (__dunder__) и приватные (__private).
+                    name = item.name
+                    if name.startswith("__") and name != "__init__":
+                        continue
+
+                    method_symbol = self._build_symbol(item, "method")
+
+                    symbol.children.append(method_symbol)
+
+        return symbol

{chutils-2.7.2 → chutils-2.7.3}/src/chutils/dev/models.py

@@ -12,6 +12,7 @@ class Breadcrumbs(BaseModel):
     is_async: bool = False
     is_thread_safe: bool = False
     is_heavy: bool = False
+    is_abstract: bool = False
     decorators: List[str] = Field(default_factory=list)
     tags: List[str] = Field(default_factory=list)
     custom_metadata: Dict[str, Any] = Field(default_factory=dict)
@@ -29,6 +30,10 @@ class Symbol(BaseModel):
     docstring: Optional[str] = None
     breadcrumbs: Breadcrumbs = Field(default_factory=Breadcrumbs)
     line_number: int = 0
+    bases: List[str] = Field(default_factory=list)
+    """Базовые классы (для классов)"""
+    children: List["Symbol"] = Field(default_factory=list)
+    """Вложенные символы (например, методы класса)"""
 
 
 class Node(BaseModel):

{chutils-2.7.2 → chutils-2.7.3}/src/chutils/env.py

@@ -6,7 +6,10 @@ import os
 
 def _is_installed(package_name: str) -> bool:
     """Проверяет наличие пакета в системе без его импорта."""
-    return importlib.util.find_spec(package_name) is not None
+    try:
+        return importlib.util.find_spec(package_name) is not None
+    except (ImportError, ModuleNotFoundError):
+        return False
 
 
 RICH_AVAILABLE = _is_installed("rich")

{chutils-2.7.2 → chutils-2.7.3}/src/chutils/logger/core.py

@@ -264,6 +264,16 @@ def setup_logger(
 
     final_logger_settings = {**default_settings, **specific_settings}
 
+    # --- Настройка ширины консоли ---
+    cli_settings = cfg.get('CLI', {})
+    config_width = cli_settings.get('console_width')
+    if config_width is not None:
+        try:
+            from chutils.cli_utils import set_console_width
+            set_console_width(int(config_width))
+        except (ValueError, TypeError, ImportError):
+            pass
+
     # --- Определение флага асинхронности ---
     if use_async is not None:
         final_use_async = use_async