ka-uts-com 2.1.0.250408__py3-none-any.whl → 2.1.1.250415__py3-none-any.whl

ka_uts_com/__version__.py

@@ -1,7 +1,7 @@
 __title__ = 'ka_uts_com'
 __description__ = 'Communication Utilities.'
 __url__ = 'https://ka-ut-com.readthedocs.io/en/latest'
-__version__ = '2.1.0.250408'
+__version__ = '2.1.1.250415'
 __build__ = 0x022200
 __author__ = 'Bernd Stroehle'
 __author_email__ = 'bernd.stroehle@gmail.com'

build/lib/ka_uts_com/base/app_.py → ka_uts_com/app.py

@@ -3,8 +3,8 @@ from typing import Any
 
 from logging import Logger
 
-from ka_uts_com.utils.pacmod import PacMod
-from ka_uts_com.ioc.yaml_ import Yaml_
+from ka_uts_uts.utils.pacmod import PacMod
+from ka_uts_uts.ioc.yaml_ import Yaml_
 
 TyAny = Any
 TyArr = list[Any]
@@ -18,7 +18,7 @@ TnBool = None | bool
 TnDic = None | TyDic
 
 
-class App_:
+class App:
     """Aplication Class
     """
     sw_init: TyBool = False
@@ -29,7 +29,7 @@ class App_:
     app: TyDic = {}
 
     @classmethod
-    def init(cls, com, **kwargs) -> None:
+    def init(cls, cls_com, **kwargs) -> None:
         if cls.sw_init:
             return
         cls.sw_init = True
@@ -37,14 +37,14 @@ class App_:
         cls.sw_replace_keys = kwargs.get('sw_replace_keys', False)
         if cls.sw_replace_keys:
             try:
-                cls.keys = Yaml_.read(PacMod.sh_path_keys(com), com.Log)
+                cls.keys = Yaml_.read(PacMod.sh_path_keys(cls_com), cls_com.Log)
             except Exception as exc:
-                com.Log.error(exc, exc_info=True)
+                cls_com.Log.error(exc, exc_info=True)
                 raise
 
     @classmethod
-    def sh(cls, com, **kwargs) -> Any:
+    def sh(cls, cls_com, **kwargs) -> Any:
         if cls.sw_init:
             return cls
-        cls.init(com, **kwargs)
+        cls.init(cls_com, **kwargs)
         return cls

ka_uts_com/{base/cfg_.py → cfg.py}

@@ -3,7 +3,7 @@ from typing import Any
 
 from logging import Logger
 
-from ka_uts_com.ioc.yaml_ import Yaml_
+from ka_uts_uts.ioc.yaml_ import Yaml_
 
 TyAny = Any
 TyTimeStamp = int
@@ -13,24 +13,24 @@ TyDic = dict[Any, Any]
 TyLogger = Logger
 
 
-class Cfg_:
+class Cfg:
     """Configuration Class
     """
     sw_init: TyBool = False
     cfg: Any = None
 
     @classmethod
-    def init(cls, com, **kwargs) -> None:
+    def init(cls, cls_com, **kwargs) -> None:
         if cls.sw_init:
             return
         cls.sw_init = True
-        _path = com.sh_path_cfg()
+        _path = cls_com.sh_path_cfg_yaml()
         if _path:
-            cls.cfg = Yaml_.read(_path, com.Log)
+            cls.cfg = Yaml_.read(_path, cls_com.Log)
 
     @classmethod
-    def sh(cls, com, **kwargs) -> Any:
+    def sh(cls, cls_com, **kwargs) -> Any:
         if cls.sw_init:
             return cls
-        cls.init(com, **kwargs)
+        cls.init(cls_com, **kwargs)
         return cls.cfg

ka_uts_com/com.py

@@ -4,18 +4,18 @@ from typing import Any
 import os
 import time
 import calendar
-import logging
-import logging.config
-from logging import Logger
 from datetime import datetime
 
-from ka_uts_com.utils.aoeqstmt import AoEqStmt
-from ka_uts_com.utils.pac import Pac
-from ka_uts_com.utils.pacmod import PacMod
-from ka_uts_com.base.app_ import App_
-from ka_uts_com.base.cfg_ import Cfg_
-from ka_uts_com.base.exit_ import Exit_
-from ka_uts_com.base.log_ import Log_
+# from ka_uts_uts.utils.aoeqstmt import AoEqStmt
+from ka_uts_arr.aoeqstmt import AoEqStmt
+from ka_uts_uts.utils.pac import Pac
+from ka_uts_uts.utils.pacmod import PacMod
+
+from ka_uts_com.app import App
+from ka_uts_com.cfg import Cfg
+from ka_uts_com.exit import Exit
+
+from ka_uts_log.log import Log
 
 TyAny = Any
 TyDateTime = datetime
@@ -23,7 +23,6 @@ TyTimeStamp = int
 TyArr = list[Any]
 TyBool = bool
 TyDic = dict[Any, Any]
-TyLogger = Logger
 
 TnAny = None | Any
 TnArr = None | TyArr
@@ -34,7 +33,8 @@ TnStr = None | str
 
 
 class Com:
-    """Communication Class
+    """
+    Communication Class
     """
     sw_init: bool = False
     dir_dat: TnStr = None
@@ -54,14 +54,15 @@ class Com:
     ts_etime: TnDateTime = None
     d_timer: TyDic = {}
 
-    cfg: TnDic = None
-    Log = logging.getLogger('dummy_logger')
+    Cfg: TnDic = None
+    Log: Any = None
     App: Any = None
     Exit: Any = None
 
     @classmethod
-    def init(cls, app_cls, kwargs: TyDic):
-        """ set log and application (module) configuration
+    def init(cls, cls_app, kwargs: TyDic):
+        """
+        initialise static variables of Com class
         """
         if cls.sw_init:
             return
@@ -71,45 +72,50 @@ class Com:
         cls.log_type = kwargs.get('log_type', 'std')
         cls.cmd = kwargs.get('cmd')
         cls.d_com_pacmod = PacMod.sh_d_pacmod(cls)
-        cls.d_app_pacmod = PacMod.sh_d_pacmod(app_cls)
+        cls.d_app_pacmod = PacMod.sh_d_pacmod(cls_app)
         cls.ts = calendar.timegm(time.gmtime())
         cls.pid = os.getpid()
 
         cls.path_bin = cls.sh_path_bin()
-        cls.path_log_cfg = cls.sh_path_log_cfg()
 
-        cls.Log = Log_.sh(cls, **kwargs)
-        cls.cfg = Cfg_.sh(cls, **kwargs)
-        cls.App = App_.sh(cls, **kwargs)
-        cls.Exit = Exit_.sh(**kwargs)
+        cls.Log = Log.sh(cls_app, **kwargs)
+        cls.Cfg = Cfg.sh(cls, **kwargs)
+        cls.App = App.sh(cls, **kwargs)
+        cls.Exit = Exit.sh(**kwargs)
 
     @classmethod
-    def sh_kwargs(cls, app_cls, d_parms, *args) -> TyDic:
+    def sh_kwargs(cls, cls_app, d_parms, *args) -> TyDic:
+        """
+        show keyword arguments
+        """
         _kwargs: TyDic = AoEqStmt.sh_d_eq(*args, d_parms=d_parms)
-        cls.init(app_cls, _kwargs)
+        cls.init(cls_app, _kwargs)
         _kwargs['com'] = cls
         return _kwargs
 
     @classmethod
     def sh_path_bin(cls) -> Any:
-        """ show directory
+        """
+        show path to bin directory in package
         """
         package = cls.d_app_pacmod['package']
         path = "bin"
         return Pac.sh_path_by_package(package, path)
 
     @classmethod
-    def sh_path_log_cfg(cls) -> Any:
-        """ show directory
+    def sh_path_data(cls) -> Any:
+        """
+        show path to data directory in package
         """
-        _packages = [cls.d_app_pacmod['package'], cls.d_com_pacmod['package']]
-        _path = f"data/log.{cls.log_type}.yml"
-        return Pac.sh_path_by_packages(_packages, _path)
+        package = cls.d_app_pacmod['package']
+        path = "data"
+        return Pac.sh_path_by_package(package, path)
 
     @classmethod
-    def sh_path_cfg(cls) -> Any:
-        """ show directory
+    def sh_path_cfg_yaml(cls) -> Any:
+        """
+        show path to configuration yaml-file in data directory of package
         """
         package = cls.d_app_pacmod['package']
-        path = 'data/cfg.yml'
+        path = os.path.join('data', 'cfg.yml')
         return Pac.sh_path_by_package(package, path)

build/lib/ka_uts_com/base/exit_.py → ka_uts_com/exit.py

@@ -12,7 +12,7 @@ TnBool = None | bool
 TnDic = None | TyDic
 
 
-class Exit_:
+class Exit:
     """Exit Class
     """
     sw_init: TyBool = False

ka_uts_com/timer.py

@@ -2,7 +2,7 @@
 from datetime import datetime
 
 from ka_uts_com.com import Com
-from ka_uts_com.log import Log
+from ka_uts_log.log import Log
 
 from typing import Any
 TyAny = Any