encommon 0.13.1__py3-none-any.whl → 0.15.0__py3-none-any.whl

encommon/config/paths.py

@@ -10,13 +10,14 @@ is permitted, for more information consult the project license file.
 from copy import deepcopy
 from glob import glob
 from pathlib import Path
-from typing import Any
 from typing import Optional
 from typing import TYPE_CHECKING
 
 from .files import ConfigFile
 from .utils import config_path
 from .utils import config_paths
+from ..types import DictStrAny
+from ..types import sort_dict
 
 if TYPE_CHECKING:
     from ..utils.common import PATHABLE
@@ -69,7 +70,7 @@ class ConfigPaths:
     paths: tuple[Path, ...]
     config: dict[str, ConfigPath]
 
-    __merged: Optional[dict[str, Any]]
+    __merge: Optional[DictStrAny]
 
 
     def __init__(
@@ -87,13 +88,13 @@ class ConfigPaths:
             str(x): ConfigPath(x)
             for x in self.paths}
 
-        self.__merged = None
+        self.__merge = None
 
 
     @property
-    def merged(
+    def merge(
         self,
-    ) -> dict[str, Any]:
+    ) -> DictStrAny:
         """
         Return the configuration in dictionary format for paths.
 
@@ -101,12 +102,12 @@ class ConfigPaths:
         """
 
         config = self.config
-        merged = self.__merged
+        merge = self.__merge
 
-        if merged is not None:
-            return deepcopy(merged)
+        if merge is not None:
+            return deepcopy(merge)
 
-        merged = {}
+        merge = {}
 
 
         for path in config.values():
@@ -115,9 +116,11 @@ class ConfigPaths:
 
             for key, file in items:
 
-                merged[key] = file.config
+                merge[key] = file.config
 
 
-        self.__merged = merged
+        merge = sort_dict(merge)
 
-        return deepcopy(merged)
+        self.__merge = merge
+
+        return deepcopy(merge)

encommon/config/test/__init__.py

@@ -13,4 +13,4 @@ from pathlib import Path
 
 SAMPLES = (
     Path(__file__).parent
-    .joinpath('samples'))
+    / 'samples')

encommon/config/test/test_config.py

@@ -11,15 +11,13 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 from . import SAMPLES
-from ..logger import Logger
-from ..params import Params
-from ... import ENPYRWS
 from ... import PROJECT
-from ...crypts import Crypts
 from ...types import inrepr
 from ...types import instr
+from ...types import lattrs
 from ...utils import load_sample
 from ...utils import prep_sample
+from ...utils.sample import ENPYRWS
 
 if TYPE_CHECKING:
     from ..config import Config
@@ -38,7 +36,7 @@ def test_Config(
     """
 
 
-    attrs = list(config.__dict__)
+    attrs = lattrs(config)
 
     assert attrs == [
         '_Config__model',
@@ -62,13 +60,9 @@ def test_Config(
         config)
 
 
-    assert instr(
-        'files.ConfigFiles object',
-        config.files)
+    assert config.files.merge
 
-    assert instr(
-        'paths.ConfigPaths object',
-        config.paths)
+    assert config.paths.merge
 
     assert len(config.cargs) == 1
 
@@ -76,13 +70,17 @@ def test_Config(
 
     assert len(config.config) == 3
 
-    assert config.model is Params
+    assert len(config.basic) == 3
+
+    assert len(config.merge) == 5
+
+    assert callable(config.model)
 
-    assert isinstance(config.params, Params)
+    assert config.params
 
-    assert isinstance(config.logger, Logger)
+    assert config.logger
 
-    assert isinstance(config.crypts, Crypts)
+    assert config.crypts
 
 
     replaces = {
@@ -90,7 +88,7 @@ def test_Config(
         'PROJECT': PROJECT}
 
     sample_path = (
-        f'{SAMPLES}/config.json')
+        SAMPLES / 'config.json')
 
     sample = load_sample(
         path=sample_path,
@@ -102,7 +100,7 @@ def test_Config(
         content=config.config,
         replace=replaces)
 
-    assert sample == expect
+    assert expect == sample
 
 
 

encommon/config/test/test_files.py

@@ -16,6 +16,7 @@ from ..files import ConfigFile
 from ..files import ConfigFiles
 from ...types import inrepr
 from ...types import instr
+from ...types import lattrs
 
 
 
@@ -49,7 +50,7 @@ def test_ConfigFile(
         f'{config_path}/config.yml')
 
 
-    attrs = list(file.__dict__)
+    attrs = lattrs(file)
 
     assert attrs == [
         'path',
@@ -83,12 +84,12 @@ def test_ConfigFiles(
     """
 
 
-    attrs = list(files.__dict__)
+    attrs = lattrs(files)
 
     assert attrs == [
         'paths',
         'config',
-        '_ConfigFiles__merged']
+        '_ConfigFiles__merge']
 
 
     assert inrepr(
@@ -106,7 +107,7 @@ def test_ConfigFiles(
 
     assert len(files.config) == 2
 
-    assert files.merged == {
+    assert files.merge == {
         'name': 'Bruce Wayne'}
 
 
@@ -120,7 +121,7 @@ def test_ConfigFiles_cover(
     :param files: Custom fixture for the configuration files.
     """
 
-    merged1 = files.merged
-    merged2 = files.merged
+    merge1 = files.merge
+    merge2 = files.merge
 
-    assert merged1 is not merged2
+    assert merge1 is not merge2

encommon/config/test/test_logger.py

@@ -16,10 +16,12 @@ from pytest import fixture
 from ..logger import Logger
 from ..logger import Message
 from ..params import LoggerParams
+from ...times import Time
 from ...times.common import UNIXMPOCH
 from ...times.common import UNIXSPOCH
 from ...types import inrepr
 from ...types import instr
+from ...types import lattrs
 from ...utils import strip_ansi
 
 
@@ -69,7 +71,7 @@ def test_Message() -> None:
         elapsed=3.69420)
 
 
-    attrs = list(message.__dict__)
+    attrs = lattrs(message)
 
     assert attrs == [
         '_Message__level',
@@ -139,7 +141,7 @@ def test_Logger(
     """
 
 
-    attrs = list(logger.__dict__)
+    attrs = lattrs(logger)
 
     assert attrs == [
         '_Logger__params',
@@ -162,19 +164,19 @@ def test_Logger(
         logger)
 
 
-    assert logger.params is not None
+    assert logger.params
 
     assert logger.stdo_level == 'info'
 
     assert logger.file_level == 'info'
 
-    assert logger.file_path is not None
+    assert logger.file_path
 
-    assert logger.started is False
+    assert not logger.started
 
-    assert logger.logger_stdo is not None
+    assert logger.logger_stdo
 
-    assert logger.logger_file is not None
+    assert logger.logger_file
 
 
     logger.log_d(msg='pytest')
@@ -196,6 +198,8 @@ def test_Logger_cover(
     :param caplog: pytest object for capturing log message.
     """
 
+    time = Time('now')
+
 
     def _logger_logs() -> None:
         logger.log_d(msg='pytest')
@@ -203,6 +207,7 @@ def test_Logger_cover(
         logger.log_e(msg='pytest')
         logger.log_i(msg='pytest')
         logger.log_w(msg='pytest')
+        logger.log_i(elapsed=time)
 
 
     def _logger_stdo() -> _CAPLOG:
@@ -229,16 +234,16 @@ def test_Logger_cover(
 
     _logger_logs()
 
-    assert len(_logger_stdo()) == 5
-    assert len(_logger_file()) == 5
+    assert len(_logger_stdo()) == 6
+    assert len(_logger_file()) == 6
 
     logger.stop()
 
 
     _logger_logs()
 
-    assert len(_logger_stdo()) == 5
-    assert len(_logger_file()) == 5
+    assert len(_logger_stdo()) == 6
+    assert len(_logger_file()) == 6
 
 
     logger.start()
@@ -256,13 +261,14 @@ def test_Logger_cover(
     assert message in str(stdo)
     assert message in str(file)
 
-    assert len(_logger_stdo()) == 6
-    assert len(_logger_file()) == 6
+    assert len(_logger_stdo()) == 7
+    assert len(_logger_file()) == 7
+
 
     logger.stop()
 
 
     _logger_logs()
 
-    assert len(_logger_stdo()) == 6
-    assert len(_logger_file()) == 6
+    assert len(_logger_stdo()) == 7
+    assert len(_logger_file()) == 7

encommon/config/test/test_paths.py

@@ -14,12 +14,13 @@ from pytest import fixture
 from . import SAMPLES
 from ..paths import ConfigPath
 from ..paths import ConfigPaths
-from ... import ENPYRWS
 from ... import PROJECT
 from ...types import inrepr
 from ...types import instr
+from ...types import lattrs
 from ...utils import load_sample
 from ...utils import prep_sample
+from ...utils.sample import ENPYRWS
 
 
 
@@ -52,7 +53,7 @@ def test_ConfigPath(
     path = ConfigPath(config_path)
 
 
-    attrs = list(path.__dict__)
+    attrs = lattrs(path)
 
     assert attrs == [
         'path',
@@ -86,11 +87,11 @@ def test_ConfigPaths(
     """
 
 
-    attrs = list(paths.__dict__)
+    attrs = lattrs(paths)
 
     assert attrs == [
         'paths', 'config',
-        '_ConfigPaths__merged']
+        '_ConfigPaths__merge']
 
 
     assert inrepr(
@@ -113,19 +114,19 @@ def test_ConfigPaths(
         'PROJECT': PROJECT}
 
     sample_path = (
-        f'{SAMPLES}/paths.json')
+        SAMPLES / 'paths.json')
 
     sample = load_sample(
         path=sample_path,
         update=ENPYRWS,
-        content=paths.merged,
+        content=paths.merge,
         replace=replaces)
 
     expect = prep_sample(
-        content=paths.merged,
+        content=paths.merge,
         replace=replaces)
 
-    assert sample == expect
+    assert expect == sample
 
 
 
@@ -138,7 +139,7 @@ def test_ConfigPaths_cover(
     :param paths: Custom fixture for the configuration paths.
     """
 
-    merged1 = paths.merged
-    merged2 = paths.merged
+    merge1 = paths.merge
+    merge2 = paths.merge
 
-    assert merged1 is not merged2
+    assert merge1 is not merge2

encommon/config/utils.py

@@ -8,7 +8,6 @@ is permitted, for more information consult the project license file.
 
 
 from pathlib import Path
-from typing import Any
 from typing import Optional
 from typing import TYPE_CHECKING
 
@@ -17,6 +16,7 @@ from yaml import load
 
 from .. import PROJECT
 from .. import WORKSPACE
+from ..types import DictStrAny
 from ..utils import read_text
 from ..utils import resolve_path
 from ..utils import resolve_paths
@@ -29,7 +29,7 @@ if TYPE_CHECKING:
 
 def config_load(
     path: str | Path,
-) -> dict[str, Any]:
+) -> DictStrAny:
     """
     Load configuration using the directory or file provided.
 
@@ -84,8 +84,14 @@ def config_paths(
     :returns: New resolved filesystem path object instances.
     """
 
+    if replace is None:
+        replace = {}
+
+    replace = dict(replace)
+
     replace = {
         'PROJECT': PROJECT,
         'WORKSPACE': WORKSPACE}
 
-    return resolve_paths(paths, replace)
+    return resolve_paths(
+        paths, replace)

encommon/conftest.py

@@ -27,31 +27,42 @@ def config_factory(
     :returns: Newly constructed instance of related class.
     """
 
+    content = (
+        f"""
+
+        enconfig:
+          paths:
+            - '{SAMPLES}/stark'
+            - '{SAMPLES}/wayne'
+
+        enlogger:
+          stdo_level: info
+
+        encrypts:
+          phrases:
+            default:
+              phrase: phrase
+
+        """)  # noqa: LIT003
+
+    config_path = (
+        tmp_path / 'config.yml')
+
+    config_log = (
+        tmp_path / 'config.log')
+
     save_text(
-        f'{tmp_path}/config.yml',
-        content=(
-            'enconfig:\n'
-            '  paths:\n'
-            f"    - '{SAMPLES}/stark'\n"
-            f"    - '{SAMPLES}/wayne'\n"
-            'enlogger:\n'
-            '  stdo_level: info\n'
-            'encrypts:\n'
-            '  phrases:\n'
-            '    default:\n'
-            '      phrase: phrase\n'))
-
-    config_log = f'{tmp_path}/config.log'
-
-    cargs = {
-        'enlogger/file_path': config_log,
-        'enlogger/file_level': 'info'}
-
-    sargs = {
-        'custom/parameter': 'fart'}
+        config_path, content)
+
+    logger = {
+        'file_path': config_log,
+        'file_level': 'info'}
+
+    cargs = {'enlogger': logger}
+    sargs = {'cus/tom': 'fart'}
 
     return Config(
-        files=f'{tmp_path}/config.yml',
+        config_path,
         cargs=cargs,
         sargs=sargs)
 

encommon/crypts/params.py

@@ -7,30 +7,65 @@ is permitted, for more information consult the project license file.
 
 
 
-from pydantic import BaseModel
+from typing import Annotated
+from typing import Optional
+
+from pydantic import Field
+
+from ..types import BaseModel
+
+
+
+_CRYPTS = dict[str, 'CryptParams']
 
 
 
 class CryptParams(BaseModel, extra='forbid'):
     """
     Process and validate the core configuration parameters.
-
-    :param phrase: Passphrases that are used in operations.
-    :param data: Keyword arguments passed to Pydantic model.
-        Parameter is picked up by autodoc, please ignore.
     """
 
-    phrase: str
+    phrase: Annotated[
+        str,
+        Field(...,
+              description='Passphrase for the operations',
+              min_length=1)]
+
+
+    def __init__(
+        self,
+        phrase: str,
+    ) -> None:
+        """
+        Initialize instance for class using provided parameters.
+        """
+
+        super().__init__(**{
+            'phrase': phrase})
 
 
 
 class CryptsParams(BaseModel, extra='forbid'):
     """
     Process and validate the core configuration parameters.
-
-    :param phrases: Passphrases that are used in operations.
-    :param data: Keyword arguments passed to Pydantic model.
-        Parameter is picked up by autodoc, please ignore.
     """
 
-    phrases: dict[str, CryptParams] = {}
+    phrases: Annotated[
+        _CRYPTS,
+        Field(...,
+              description='Passphrases for the operations',
+              min_length=0)]
+
+
+    def __init__(
+        self,
+        phrases: Optional[_CRYPTS] = None,
+    ) -> None:
+        """
+        Initialize instance for class using provided parameters.
+        """
+
+        phrases = phrases or {}
+
+        super().__init__(**{
+            'phrases': phrases})

encommon/crypts/test/test_crypts.py

@@ -7,8 +7,6 @@ is permitted, for more information consult the project license file.
 
 
 
-from typing import Any
-
 from pytest import fixture
 from pytest import mark
 from pytest import raises
@@ -16,8 +14,10 @@ from pytest import raises
 from ..crypts import Crypts
 from ..params import CryptParams
 from ..params import CryptsParams
+from ...types import DictStrAny
 from ...types import inrepr
 from ...types import instr
+from ...types import lattrs
 
 
 
@@ -29,7 +29,7 @@ def crypts() -> Crypts:
     :returns: Newly constructed instance of related class.
     """
 
-    source: dict[str, Any] = {
+    source: DictStrAny = {
         'default': {'phrase': Crypts.keygen()},
         'secrets': {'phrase': Crypts.keygen()}}
 
@@ -50,7 +50,7 @@ def test_Crypts(
     """
 
 
-    attrs = list(crypts.__dict__)
+    attrs = lattrs(crypts)
 
     assert attrs == [
         '_Crypts__params']
@@ -67,7 +67,7 @@ def test_Crypts(
         crypts)
 
 
-    assert crypts.params is not None
+    assert crypts.params
 
     assert len(crypts.keygen()) == 44
 

encommon/crypts/test/test_hashes.py

@@ -10,6 +10,7 @@ is permitted, for more information consult the project license file.
 from ..hashes import Hashes
 from ...types import inrepr
 from ...types import instr
+from ...types import lattrs
 
 
 
@@ -21,7 +22,7 @@ def test_Hashes() -> None:
     hashes = Hashes('string')
 
 
-    attrs = list(hashes.__dict__)
+    attrs = lattrs(hashes)
 
     assert attrs == [
         '_Hashes__string']

encommon/times/__init__.py

@@ -16,9 +16,10 @@ from .parse import parse_time
 from .parse import shift_time
 from .parse import since_time
 from .parse import string_time
+from .time import Time
 from .timer import Timer
 from .timers import Timers
-from .times import Times
+from .unitime import unitime
 from .utils import findtz
 from .window import Window
 from .windows import Windows
@@ -31,7 +32,7 @@ __all__ = [
     'TimerParams',
     'Timers',
     'TimersParams',
-    'Times',
+    'Time',
     'Window',
     'WindowParams',
     'Windows',
@@ -40,4 +41,5 @@ __all__ = [
     'parse_time',
     'shift_time',
     'since_time',
-    'string_time']
+    'string_time',
+    'unitime']

encommon/times/common.py

@@ -13,7 +13,7 @@ from typing import TYPE_CHECKING
 from typing import Union
 
 if TYPE_CHECKING:
-    from .times import Times
+    from .time import Time
 
 
 
@@ -24,7 +24,8 @@ SNAPABLE = compile(
     r'^(\-|\+)[\d\@a-z\-\+]+$')
 
 STRINGNOW = {
-    'None', 'null', 'now'}
+    'None', None,
+    'null', 'now'}
 
 
 
@@ -32,7 +33,7 @@ NUMERIC = Union[int, float]
 
 PARSABLE = Union[
     str, NUMERIC,
-    datetime, 'Times']
+    datetime, 'Time']
 
 SCHEDULE = Union[
     str, dict[str, int]]