ka-uts-com 2.0.0.250407__tar.gz → 2.1.0.250408__tar.gz

{ka_uts_com-2.0.0.250407/ka_uts_com.egg-info → ka_uts_com-2.1.0.250408}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ka_uts_com
-Version: 2.0.0.250407
+Version: 2.1.0.250408
 Summary: Communication Class Utilities
 Author-email: Bernd Stroehle <bernd.stroehle@gmail.com>
 Maintainer-email: Bernd Stroehle <bernd.stroehle@gmail.com>

{ka_uts_com-2.0.0.250407 → ka_uts_com-2.1.0.250408}/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.0.0.250407'
+__version__ = '2.1.0.250408'
 __build__ = 0x022200
 __author__ = 'Bernd Stroehle'
 __author_email__ = 'bernd.stroehle@gmail.com'

{ka_uts_com-2.0.0.250407 → ka_uts_com-2.1.0.250408}/ka_uts_com/base/cfg_.py

@@ -3,7 +3,6 @@ from typing import Any
 
 from logging import Logger
 
-from ka_uts_com.utils.pacmod import PacMod
 from ka_uts_com.ioc.yaml_ import Yaml_
 
 TyAny = Any
@@ -25,7 +24,9 @@ class Cfg_:
         if cls.sw_init:
             return
         cls.sw_init = True
-        cls.cfg = Yaml_.read(PacMod.sh_path_cfg(com), com.Log)
+        _path = com.sh_path_cfg()
+        if _path:
+            cls.cfg = Yaml_.read(_path, com.Log)
 
     @classmethod
     def sh(cls, com, **kwargs) -> Any:

{ka_uts_com-2.0.0.250407 → ka_uts_com-2.1.0.250408}/ka_uts_com/com.py

@@ -4,13 +4,13 @@ from typing import Any
 import os
 import time
 import calendar
-import importlib.resources as resources
 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_
@@ -72,16 +72,11 @@ class Com:
         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.ts = calendar.timegm(time.gmtime())
         cls.pid = os.getpid()
 
-        # print(f"Com.init cls.tenanat = {cls.tenant}")
-        # print(f"Com.init cls.cmd = {cls.cmd}")
-        # print(f"Com.init kwargs = {kwargs}")
-
-        cls.set_path_bin()
-        cls.set_path_log_cfg()
+        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)
@@ -96,26 +91,25 @@ class Com:
         return _kwargs
 
     @classmethod
-    def set_path_bin(cls):
+    def sh_path_bin(cls) -> Any:
         """ show directory
         """
         package = cls.d_app_pacmod['package']
-        path = resources.files(package).joinpath("bin")
-        if path.is_file():
-            cls.path_bin = path
-        # raise ModuleNotFoundError
+        path = "bin"
+        return Pac.sh_path_by_package(package, path)
 
     @classmethod
-    def set_path_log_cfg(cls):
+    def sh_path_log_cfg(cls) -> Any:
+        """ show directory
+        """
+        _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)
+
+    @classmethod
+    def sh_path_cfg(cls) -> Any:
         """ show directory
         """
         package = cls.d_app_pacmod['package']
-        path = resources.files(package).joinpath(f"data/log.{cls.log_type}.yml")
-        if path.is_file():
-            cls.path_log_cfg = path
-            return
-        package = cls.d_com_pacmod['package']
-        path = resources.files(package).joinpath(f"data/log.{cls.log_type}.yml")
-        if path.is_file():
-            cls.path_log_cfg = path
-        # raise ModuleNotFoundError
+        path = 'data/cfg.yml'
+        return Pac.sh_path_by_package(package, path)

{ka_uts_com-2.0.0.250407 → ka_uts_com-2.1.0.250408}/ka_uts_com/ioc/jinja2_.py

@@ -38,5 +38,5 @@ class Jinja2_:
             return obj
         except IOError as exc:
             log.error(exc, exc_info=True)
-            # log.error(f"No such file or directory: {path}")
+            # log.error(f"No such file or directory: path='{path'}")
             raise

{ka_uts_com-2.0.0.250407 → ka_uts_com-2.1.0.250408}/ka_uts_com/ioc/yaml_.py

@@ -21,7 +21,8 @@ class Yaml_:
                 obj = yaml.load(fd, Loader=yaml.SafeLoader)
                 return obj
         except FileNotFoundError:
-            log.error(f"No such file or directory: {path}")
+            log.error(f"No such file or directory: path='{path}'")
+            raise
         except IOError:
             # if Com.Log is not None:
             #     fnc_error = Com.Log.error

ka_uts_com-2.1.0.250408/ka_uts_com/utils/pac.py

@@ -0,0 +1,35 @@
+# coding=utf-8
+from typing import Any
+
+import os
+import importlib.resources as resources
+
+TyArr = list[Any]
+TyDic = dict[Any, Any]
+TyPackage = str
+TyPackages = list[str]
+TyPath = str
+
+
+class Pac:
+
+    @staticmethod
+    def sh_path_by_package(package: TyPackage, path: TyPath) -> Any:
+        """ show directory
+        """
+        _path = str(resources.files(package).joinpath(path))
+        # if _path.is_file():
+        if _path is not None and _path != '':
+            if os.path.exists(_path):
+                return _path
+        return ''
+
+    @classmethod
+    def sh_path_by_packages(cls, packages: TyPackages, path: TyPath) -> Any:
+        """ show directory
+        """
+        for _package in packages:
+            _path = cls.sh_path_by_package(_package, path)
+            if _path:
+                return _path
+        return ''

{ka_uts_com-2.0.0.250407 → ka_uts_com-2.1.0.250408}/ka_uts_com/utils/pacmod.py

@@ -2,16 +2,13 @@
 from typing import Any
 
 from os import path as os_path
-# import pkg_resources
-import importlib.resources as resources
+
+from ka_uts_com.utils.pac import Pac
 
 TyArr = list[Any]
 TyDic = dict[Any, Any]
 TyPath = str
 
-TnDic = None | TyDic
-TnPath = None | TyPath
-
 
 class PacMod:
     """ Package Module Management
@@ -24,28 +21,21 @@ class PacMod:
         return {'package': a_pacmod[0], 'module': a_pacmod[1]}
 
     @staticmethod
-    def sh_path_module_yaml(d_pacmod: TyDic) -> str:
+    def sh_path_module_yaml(d_pacmod: TyDic) -> Any:
         """ show directory
         """
-        # def sh_path_cfg_yaml(d_pacmod: TyDic) -> str:
         package = d_pacmod['package']
         module = d_pacmod['module']
-        filename = f"{module}.yml"
-        file = resources.files(f"{package}.data")
-        print("sh_path_module_yaml files = {files}")
-        path: TyPath = file.joinpath(filename)
-        return path
+        path = f"{module}/data/{module}.yml"
+        return Pac.sh_path_by_package(package, path)
 
     @staticmethod
-    def sh_path_keys(
-            d_pacmod: TyDic, filename: str = 'keys.yml') -> TyPath:
+    def sh_path_keys(d_pacmod: TyDic) -> Any:
         """ show directory
         """
         package = d_pacmod['package']
-        files = resources.files(f"{package}.data")
-        print("sh_path_keys files = {files}")
-        path: TyPath = files.joinpath(filename)
-        return path
+        path = 'data/keys.yml'
+        return Pac.sh_path_by_package(package, path)
 
     # @staticmethod
     # def sh_path_log_cfg(com) -> TyPath:
@@ -61,16 +51,13 @@ class PacMod:
     #         return path
     #     raise ModuleNotFoundError
 
-    @staticmethod
-    def sh_path_cfg(com) -> TyPath:
-        """ show directory
-        """
-        filename = 'cfg.yml'
-        package = com.d_app_pacmod['package']
-        files = resources.files(f"{package}.data")
-        print(f"sh_path_cfg files = {files}")
-        path: TyPath = files.joinpath(filename)
-        return path
+    # @staticmethod
+    # def sh_path_cfg(d_pacmod: TyDic) -> Any:
+    #     """ show directory
+    #     """
+    #     package = com.d_app_pacmod['package']
+    #     path = 'dat/cfg.yml'
+    #     return Pac.sh_path(package, path)
 
     # @staticmethod
     # def sh_path_type(d_pacmod: TyDic, type_: str) -> str:
@@ -101,7 +88,7 @@ class PacMod:
     #   return file_path
 
     @staticmethod
-    def sh_dir_type(com, type_: str) -> str:
+    def sh_dir_type(com, type_: str) -> TyPath:
         """Show run_dir
         """
         dir_dat: str = com.dir_dat
@@ -115,9 +102,8 @@ class PacMod:
 
     @classmethod
     def sh_path_pattern(
-            cls, com, filename, type_: str, suffix: str) -> str:
+            cls, com, filename, type_: str, suffix: str) -> TyPath:
         """ show type specific path
         """
         _dir: str = cls.sh_dir_type(com, type_)
-        path: TyPath = os_path.join(_dir, f"{filename}*.{suffix}")
-        return path
+        return os_path.join(_dir, f"{filename}*.{suffix}")

{ka_uts_com-2.0.0.250407 → ka_uts_com-2.1.0.250408/ka_uts_com.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ka_uts_com
-Version: 2.0.0.250407
+Version: 2.1.0.250408
 Summary: Communication Class Utilities
 Author-email: Bernd Stroehle <bernd.stroehle@gmail.com>
 Maintainer-email: Bernd Stroehle <bernd.stroehle@gmail.com>

{ka_uts_com-2.0.0.250407 → ka_uts_com-2.1.0.250408}/ka_uts_com.egg-info/SOURCES.txt

@@ -5,7 +5,7 @@ classifiers.txt
 pyproject.toml
 requirements.txt
 setup.cfg
-dist/ka_uts_com-2.0.0.250407-py3-none-any.whl
+dist/ka_uts_com-2.1.0.250408-py3-none-any.whl
 ka_uts_com/__init__.py
 ka_uts_com/__version__.py
 ka_uts_com/com.py
@@ -32,5 +32,6 @@ ka_uts_com/ioc/yaml_.py
 ka_uts_com/utils/aoeqstmt.py
 ka_uts_com/utils/date.py
 ka_uts_com/utils/doeq.py
+ka_uts_com/utils/pac.py
 ka_uts_com/utils/pacmod.py
 ka_uts_com/utils/str.py