increment version

.gitignore

@@ -1,3 +1,3 @@
-src/config_manager/__pycache__/basic_application.cpython-312.pyc
+__pycache__
 venv/
 .vscode/

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "config_manager"
-version = "1.0.2"
+version = "1.0.4"
 description = "Config manager for building applications"
 authors = [
     { name = "Aleksei Zosimov", email = "lesha.spb@gmail.com" }

setup.cfg

@@ -1,24 +0,0 @@
-[metadata]
-name = config_manager
-version = 1.0.1
-author = Aleksei Zosimov
-author_email = lesha.spb@gmail.com
-description = Base application with configuration and logging features.
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://git.lesha.spb.ru/alex/config_manager
-project_urls =
-    Bug Tracker =  https://git.lesha.spb.ru/alex/config_manager/issues
-classifiers =
-    Programming Language :: Python :: 3
-    License :: OSI Approved :: MIT License
-    Operating System :: OS Independent
-
-[options]
-package_dir =
-    = src
-packages = find:
-python_requires = >=3.10
-
-[options.packages.find]
-where = src

src/config.yaml

@@ -0,0 +1,53 @@
+# === Раздел с общими конфигурационными параметрами ===
+runtime: 5
+
+# === Логирование ===
+log:
+  version: 1
+  disable_existing_loggers: False
+
+  formatters:
+    standard:
+      format: '%(asctime)s %(name)30s [%(levelname)8s]: %(message)s'
+    telegram:
+      format: '%(message)s'
+
+  handlers:
+    console:
+      level: DEBUG
+      formatter: standard
+      class: logging.StreamHandler
+      stream: ext://sys.stdout  # Default is stderr
+
+    file:
+      level: DEBUG
+      formatter: standard
+      class: logging.handlers.RotatingFileHandler
+      filename: logs/log.log
+      mode: a
+      maxBytes: 500000
+      backupCount: 15
+
+    #telegram:
+    #  level: CRITICAL
+    #  formatter: telegram
+    #  class: logging_telegram_handler.TelegramHandler
+    #  chat_id: 211945135
+    #  alias: "PDC"
+
+
+# -- Логгеры --
+  loggers:
+    '':
+      handlers: [console, file]
+      level: ERROR
+      propagate: False
+
+    __main__:
+      handlers: [console, file]
+      level: WARNING
+      propagate: False
+
+    config_manager:
+      handlers: [console, file]
+      level: DEBUG

src/config_manager/config_manager.py

@@ -3,7 +3,7 @@ import json
 import yaml
 import logging
 import logging.config
-from typing import Any
+from typing import Any, Optional
 import os
 
 
@@ -21,6 +21,8 @@ class ConfigManager:
         self.update_interval = self.DEFAULT_UPDATE_INTERVAL
         self.work_interval = self.DEFAULT_WORK_INTERVAL
         self._halt = asyncio.Event()
+        self._task: Optional[asyncio.Task] = None
+        self._loop: Optional[asyncio.AbstractEventLoop] = None
 
     def _read_file_sync(self) -> str:
         with open(self.path, "r", encoding="utf-8") as f:
@@ -29,7 +31,7 @@ class ConfigManager:
     async def _read_file_async(self) -> str:
         return await asyncio.to_thread(self._read_file_sync)
 
-    def _parse_config(self, data: str) -> Any:
+    def _parse_config(self,  str) -> Any:
         ext = os.path.splitext(self.path)[1].lower()
         if ext in (".yaml", ".yml"):
             return yaml.safe_load(data)
@@ -39,7 +41,6 @@ class ConfigManager:
     def _update_intervals_from_config(self) -> None:
         if not self.config:
             return
-        # Берём интервалы из секции config обновления, с контролем типа и значений
         upd = self.config.get("update_interval")
         wrk = self.config.get("work_interval")
 
@@ -98,19 +99,52 @@ class ConfigManager:
             await self._update_config()
             await asyncio.sleep(self.update_interval)
 
-    async def start(self) -> None:
+    async def _run(self) -> None:
+        """Внутренняя корутина, запускающая все циклы"""
         self._halt.clear()
         logger.info("ConfigManager started")
-        await asyncio.gather(
+        try:
-            self._worker_loop(),
+            await asyncio.gather(
-            self._periodic_update_loop()
+                self._worker_loop(),
-        )
+                self._periodic_update_loop()
+            )
+        except asyncio.CancelledError:
+            logger.info("ConfigManager tasks cancelled")
+        finally:
+            logger.info("ConfigManager stopped")
+
+    def start(self) -> None:
+        """Запускает менеджер конфигурации в текущем event loop"""
+        if self._task is not None and not self._task.done():
+            logger.warning("ConfigManager is already running")
+            return
+        
+        try:
+            self._loop = asyncio.get_running_loop()
+        except RuntimeError:
+            logger.error("start() must be called from within an async context")
+            raise
+        
+        self._task = self._loop.create_task(self._run())
+        logger.info("ConfigManager task created")
+
+    async def stop(self) -> None:
+        """Останавливает менеджер конфигурации и ожидает завершения"""
+        if self._task is None:
+            logger.warning("ConfigManager is not running")
+            return
         
-    def stop(self) -> None:
-        self._halt.set()
         logger.info("ConfigManager stopping...")
+        self._halt.set()
         
+        # Ждём корректного завершения задачи
+        try:
+            await self._task
+        except asyncio.CancelledError:
+            pass
         
+        self._task = None
+        logger.info("ConfigManager stopped successfully")
 
 
 # Пример наследования и переопределения execute
@@ -120,15 +154,16 @@ class MyApp(ConfigManager):
 
 
 async def main():
-    app = MyApp("config.yaml")  # Можно config.json или config.yaml
+    app = MyApp("config.yaml")
-    task = asyncio.create_task(app.start())
+    app.start()
     await asyncio.sleep(20)
-    app.stop()
+    await app.stop()
-    await task
     logger.info("Work finished.")
 
 
 if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO,
+    logging.basicConfig(
-                        format="%(asctime)s [%(levelname)s] %(name)s: %(message)s")
+        level=logging.INFO,
+        format="%(asctime)s [%(levelname)s] %(name)s: %(message)s"
+    )
     asyncio.run(main())

src/config_test.yaml

@@ -0,0 +1,100 @@
+# === Раздел с общими конфигурационными параметрами ===
+runtime:
+  symbols: ["BTC_USDT", "ETH_USDT", "USDD_USDT", "TRX_USDT", "BTT_USDT", "NFT_USDT", "XRP_USDT",
+  "ETH_BTC", "XRP_BTC", "TRX_BTC", "LTC_BTC", "EOS_BTC", "XMR_BTC", "DOGE_BTC",
+  "NFT_TRX", "ETH_TRX", "JST_TRX", "XRP_TRX",
+  "ETHBULL_USDT", "BULL_USDT", "BEAR_USDT", "ADABULL_USDT"]
+
+  updateTimeout: 45
+  errorTimeout: 10
+
+orderbook:
+  levels: [ 0.0, 0.2, 0.4, 0.6, 0.8,
+            1.0, 1.2, 1.4, 1.6, 1.8,
+            2.0, 2.2, 2.4, 2.6, 2.8,
+            3.0, 3.3, 3.6, 3.9,
+            4.2, 4.5, 4.8,
+            5.1, 5.4, 5.7, 100 ]
+
+trades:
+  depth: 300
+
+# === Database params ===
+db:
+  #host: 185.117.118.107
+  host: 92.53.127.143
+  port: 59000
+  database: rt5_dev
+
+
+# === Логирование ===
+log:
+  version: 1
+  disable_existing_loggers: False
+
+  formatters:
+    standard:
+      format: '%(asctime)s %(name)30s [%(levelname)8s]: %(message)s'
+    telegram:
+      format: '%(message)s'
+
+  handlers:
+    console:
+      level: DEBUG
+      formatter: standard
+      class: logging.StreamHandler
+      stream: ext://sys.stdout  # Default is stderr
+
+    file:
+      level: DEBUG
+      formatter: standard
+      class: logging.handlers.RotatingFileHandler
+      filename: logs/log.log
+      mode: a
+      maxBytes: 500000
+      backupCount: 15
+
+    telegram:
+      level: CRITICAL
+      formatter: telegram
+      class: logging_telegram_handler.TelegramHandler
+      chat_id: 211945135
+      alias: "PDC"
+
+
+# -- Логгеры --
+  loggers:
+    '':
+      handlers: [console, file]
+      level: ERROR
+      propagate: False
+
+    __main__:
+      handlers: [console, file, telegram]
+      level: WARNING
+      propagate: False
+
+    basic_application:
+      handlers: [console, file, telegram]
+      level: INFO
+
+    config_manager:
+      level: INFO
+
+    log_manager:
+      level: INFO
+
+    poloniex.public:
+      level: ERROR
+
+    controllers.abstract:
+      level: ERROR
+
+    controllers.trades:
+      level: ERROR
+
+    controllers.orderbook:
+      level: ERROR
+
+    clickhouse_connector.clickhouse_connector:
+      level: ERROR