encommon 0.11.0__py3-none-any.whl → 0.11.1__py3-none-any.whl

encommon/config/config.py

@@ -217,11 +217,10 @@ class Config:
         if self.__logger is not None:
             return self.__logger
 
-        enlogger = (
+        logger = Logger(
             self.params.enlogger)
 
-        self.__logger = (
-            Logger(params=enlogger))
+        self.__logger = logger
 
         return self.__logger
 
@@ -239,12 +238,9 @@ class Config:
         if self.__crypts is not None:
             return self.__crypts
 
-        encrypts = (
+        crypts = Crypts(
             self.params.encrypts)
 
-        assert encrypts is not None
-
-        self.__crypts = (
-            Crypts(params=encrypts))
+        self.__crypts = crypts
 
         return self.__crypts

encommon/config/logger.py

@@ -7,6 +7,7 @@ is permitted, for more information consult the project license file.
 
 
 
+from copy import deepcopy
 from json import dumps
 from logging import CRITICAL
 from logging import DEBUG
@@ -337,11 +338,11 @@ class Logger:
 
     def __init__(
         self,
+        params: Optional['LoggerParams'] = None,
         *,
         stdo_level: Optional[LOGLEVELS] = None,
         file_level: Optional[LOGLEVELS] = None,
         file_path: Optional[str | Path] = None,
-        params: Optional['LoggerParams'] = None,
     ) -> None:
         """
         Initialize instance for class using provided parameters.
@@ -355,7 +356,7 @@ class Logger:
                 file_level=file_level,
                 file_path=file_path)
 
-        self.__params = params
+        self.__params = deepcopy(params)
 
         stdo_level = params.stdo_level
         file_level = params.file_level

encommon/config/test/test_logger.py

@@ -44,7 +44,7 @@ def logger(
         file_level='info',
         file_path=f'{tmp_path}/test.log')
 
-    return Logger(params=params)
+    return Logger(params)
 
 
 

encommon/crypts/crypts.py

@@ -7,9 +7,11 @@ is permitted, for more information consult the project license file.
 
 
 
+from copy import deepcopy
 from re import compile
 from re import match as re_match
 from re import sub as re_sub
+from typing import Optional
 from typing import TYPE_CHECKING
 
 from cryptography.fernet import Fernet
@@ -17,6 +19,7 @@ from cryptography.fernet import Fernet
 from ..types.strings import SEMPTY
 
 if TYPE_CHECKING:
+    from .params import CryptParams
     from .params import CryptsParams
 
 
@@ -53,13 +56,18 @@ class Crypts:
 
     def __init__(
         self,
-        params: 'CryptsParams',
+        params: Optional['CryptsParams'] = None,
     ) -> None:
         """
         Initialize instance for class using provided parameters.
         """
 
-        self.__params = params
+        from .params import CryptsParams
+
+        if params is None:
+            params = CryptsParams()
+
+        self.__params = deepcopy(params)
 
 
     @property
@@ -90,6 +98,9 @@ class Crypts:
 
         phrases = self.params.phrases
 
+        if unique not in phrases:
+            raise ValueError('unique')
+
         phrase = phrases[unique].phrase
 
         encrypt = (
@@ -134,6 +145,44 @@ class Crypts:
             .decode())
 
 
+    def create(
+        self,
+        unique: str,
+        params: 'CryptParams',
+    ) -> None:
+        """
+        Create a new phrase using the provided input parameters.
+
+        :param unique: Unique identifier of mapping passphrase.
+        :param params: Parameters for instantiating the instance.
+        """
+
+        phrases = self.params.phrases
+
+        if unique in phrases:
+            raise ValueError('unique')
+
+        phrases[unique] = params
+
+
+    def delete(
+        self,
+        unique: str,
+    ) -> None:
+        """
+        Delete the phrase from the internal dictionary reference.
+
+        :param unique: Unique identifier of mapping passphrase.
+        """
+
+        phrases = self.params.phrases
+
+        if unique not in phrases:
+            raise ValueError('unique')
+
+        del phrases[unique]
+
+
     @classmethod
     def keygen(
         cls: object,

encommon/crypts/params.py

@@ -33,4 +33,4 @@ class CryptsParams(BaseModel, extra='forbid'):
         Parameter is picked up by autodoc, please ignore.
     """
 
-    phrases: dict[str, CryptParams]
+    phrases: dict[str, CryptParams] = {}

encommon/crypts/test/test_crypts.py

@@ -14,6 +14,7 @@ from pytest import mark
 from pytest import raises
 
 from ..crypts import Crypts
+from ..params import CryptParams
 from ..params import CryptsParams
 from ...types import inrepr
 from ...types import instr
@@ -35,7 +36,7 @@ def crypts() -> Crypts:
     params = CryptsParams(
         phrases=source)
 
-    return Crypts(params=params)
+    return Crypts(params)
 
 
 
@@ -103,6 +104,28 @@ def test_Crypts_iterate(
 
 
 
+def test_Crypts_cover(
+    crypts: Crypts,
+) -> None:
+    """
+    Perform various tests associated with relevant routines.
+
+    :param crypts: Primary class instance for the encryption.
+    """
+
+
+    crypts = Crypts()
+
+
+    params = CryptParams(
+        phrase=Crypts.keygen())
+
+    crypts.create('testing', params)
+
+    crypts.delete('testing')
+
+
+
 def test_Crypts_raises(
     crypts: Crypts,
 ) -> None:
@@ -113,6 +136,16 @@ def test_Crypts_raises(
     """
 
 
+    _raises = raises(ValueError)
+
+    with _raises as reason:
+        crypts.encrypt('foo', 'dne')
+
+    _reason = str(reason.value)
+
+    assert _reason == 'unique'
+
+
     _raises = raises(ValueError)
 
     with _raises as reason:
@@ -132,3 +165,25 @@ def test_Crypts_raises(
     _reason = str(reason.value)
 
     assert _reason == 'version'
+
+
+    _raises = raises(ValueError)
+
+    params = CryptParams(phrase='foo')
+
+    with _raises as reason:
+        crypts.create('default', params)
+
+    _reason = str(reason.value)
+
+    assert _reason == 'unique'
+
+
+    _raises = raises(ValueError)
+
+    with _raises as reason:
+        crypts.delete('dne')
+
+    _reason = str(reason.value)
+
+    assert _reason == 'unique'

encommon/times/params.py

@@ -68,7 +68,7 @@ class TimersParams(BaseModel, extra='forbid'):
         Parameter is picked up by autodoc, please ignore.
     """
 
-    timers: dict[str, TimerParams]
+    timers: dict[str, TimerParams] = {}
 
 
 
@@ -117,7 +117,7 @@ class WindowParams(BaseModel, extra='forbid'):
             stop = Times(stop)
 
         if anchor is not None:
-            anchor = Times(stop)
+            anchor = Times(anchor)
 
         if delay is not None:
             delay = float(delay)
@@ -152,4 +152,4 @@ class WindowsParams(BaseModel, extra='forbid'):
         Parameter is picked up by autodoc, please ignore.
     """
 
-    windows: dict[str, WindowParams]
+    windows: dict[str, WindowParams] = {}

encommon/times/test/test_timers.py

@@ -8,6 +8,7 @@ is permitted, for more information consult the project license file.
 
 
 from pathlib import Path
+from time import sleep
 from typing import Any
 
 from pytest import fixture
@@ -140,35 +141,23 @@ def test_Timers_cover(
     """
 
 
-    assert not timers.ready('one')
-
     assert timers.ready('two')
 
-
     timers.update('two', 'now')
 
     assert not timers.ready('two')
 
-    timers.load_children()
-
-    assert timers.ready('two')
-
-
-    timers.update('two', 'now')
 
-    assert not timers.ready('two')
+    timers = Timers()
 
-    timers.save_children()
-    timers.load_children()
 
-    assert not timers.ready('two')
+    params = TimerParams(timer=1)
 
+    timers.create('fur', params)
 
-    params = TimerParams(
-        timer=1,
-        start='-1s')
+    assert not timers.ready('fur')
 
-    timers.create('fur', params)
+    sleep(1)
 
     assert timers.ready('fur')
 

encommon/times/test/test_windows.py

@@ -8,6 +8,7 @@ is permitted, for more information consult the project license file.
 
 
 from pathlib import Path
+from time import sleep
 from typing import Any
 
 from pytest import fixture
@@ -173,37 +174,22 @@ def test_Windows_cover(
     """
 
 
-    assert windows.ready('one')
-
     assert windows.ready('two')
 
-
     windows.update('two', '+1h')
 
     assert not windows.ready('two')
 
-    windows.load_children()
 
-    assert windows.ready('two')
+    windows = Windows()
 
+    params = WindowParams(window=1)
 
-    windows.update('two', '+1h')
-
-    assert not windows.ready('two')
-
-    windows.save_children()
-    windows.load_children()
-
-    assert not windows.ready('two')
-
+    windows.create('fur', params)
 
-    params = WindowParams(
-        window='* * * * *',
-        start=310,
-        stop=610,
-        delay=10)
+    assert not windows.ready('fur')
 
-    windows.create('fur', params)
+    sleep(2)
 
     assert windows.ready('fur')
 

encommon/times/timers.py

@@ -7,6 +7,7 @@ is permitted, for more information consult the project license file.
 
 
 
+from copy import deepcopy
 from sqlite3 import Connection
 from sqlite3 import connect as SQLite
 from typing import Optional
@@ -82,7 +83,7 @@ class Timers:
 
     def __init__(
         self,
-        params: 'TimersParams',
+        params: Optional['TimersParams'] = None,
         *,
         file: str = ':memory:',
         table: str = 'timers',
@@ -92,7 +93,12 @@ class Timers:
         Initialize instance for class using provided parameters.
         """
 
-        self.__params = params
+        from .params import TimersParams
+
+        if params is None:
+            params = TimersParams()
+
+        self.__params = deepcopy(params)
 
 
         sqlite = SQLite(file)
@@ -322,7 +328,12 @@ class Timers:
 
         timer = timers[unique]
 
-        return timer.ready(update)
+        ready = timer.ready(update)
+
+        if ready is True:
+            self.save_children()
+
+        return ready
 
 
     def create(
@@ -340,8 +351,6 @@ class Timers:
 
         timers = self.params.timers
 
-        self.save_children()
-
         if unique in timers:
             raise ValueError('unique')
 
@@ -349,6 +358,8 @@ class Timers:
 
         self.load_children()
 
+        self.save_children()
+
         return self.children[unique]
 
 
@@ -371,6 +382,8 @@ class Timers:
 
         timer = timers[unique]
 
+        self.save_children()
+
         return timer.update(value)
 
 

encommon/times/windows.py

@@ -7,6 +7,7 @@ is permitted, for more information consult the project license file.
 
 
 
+from copy import deepcopy
 from sqlite3 import Connection
 from sqlite3 import connect as SQLite
 from typing import Optional
@@ -85,7 +86,7 @@ class Windows:
 
     def __init__(  # noqa: CFQ002
         self,
-        params: 'WindowsParams',
+        params: Optional['WindowsParams'] = None,
         start: PARSABLE = 'now',
         stop: PARSABLE = '3000-01-01',
         *,
@@ -97,7 +98,12 @@ class Windows:
         Initialize instance for class using provided parameters.
         """
 
-        self.__params = params
+        from .params import WindowsParams
+
+        if params is None:
+            params = WindowsParams()
+
+        self.__params = deepcopy(params)
 
 
         start = Times(start)
@@ -389,7 +395,12 @@ class Windows:
 
         window = windows[unique]
 
-        return window.ready(update)
+        ready = window.ready(update)
+
+        if ready is True:
+            self.save_children()
+
+        return ready
 
 
     def create(
@@ -407,8 +418,6 @@ class Windows:
 
         windows = self.params.windows
 
-        self.save_children()
-
         if unique in windows:
             raise ValueError('unique')
 
@@ -416,6 +425,8 @@ class Windows:
 
         self.load_children()
 
+        self.save_children()
+
         return self.children[unique]
 
 
@@ -438,6 +449,8 @@ class Windows:
 
         window = windows[unique]
 
+        self.save_children()
+
         return window.update(value)
 
 

encommon/version.txt

@@ -1 +1 @@
-0.11.0
+0.11.1

{encommon-0.11.0.dist-info → encommon-0.11.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: encommon
-Version: 0.11.0
+Version: 0.11.1
 Summary: Enasis Network Common Library
 License: MIT
 Classifier: Programming Language :: Python :: 3

{encommon-0.11.0.dist-info → encommon-0.11.1.dist-info}/RECORD

@@ -1,48 +1,48 @@
 encommon/__init__.py,sha256=VoXUcphq-gcXCraaU47EtXBftF6UVuQPMGr0fuCTt9A,525
 encommon/conftest.py,sha256=zoshfXjo2y_NsmWSHErOaTZx7A5tSYxNAhUf4TmUZKE,1827
 encommon/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-encommon/version.txt,sha256=eV1rx5V00q7AOtnP7EBLuVCDyd0hDmUh4NQZl3LSjUQ,7
+encommon/version.txt,sha256=_osjQQwNkAPnDBQcpybzxmm7wL9-Ost7o18jz3JgMys,7
 encommon/config/__init__.py,sha256=iZdbW7A4m7iN4xt5cEeQqo0Klqs-CaPLdD5ocLmUYi8,856
-encommon/config/config.py,sha256=Pk-ds6cBdRK73k4gi3w6IZSbidSLI7qod5WC4t44Srw,5405
+encommon/config/config.py,sha256=ldq1LfXGq0kfZwmlWE9mGG_hCdRuLT98QyLqnZY6ms8,5312
 encommon/config/files.py,sha256=ueXiKTOqlQ4GKUT9lLyOlE-tfr6QAkSxdUs0VPbwEnE,2385
-encommon/config/logger.py,sha256=z3UQdwpU81aC_QVkg994_f82jl9D_RZcx7Af9V2_1cQ,14105
+encommon/config/logger.py,sha256=qNizCbFNWtgb2tISJRiVx_KvNnS67mkkRrEgVzx6J_o,14141
 encommon/config/params.py,sha256=4bQ7Zz9DMLa5MrYtr89LuEkp0gAAsh7qG-b2wsSDLzI,2311
 encommon/config/paths.py,sha256=f0JDqkmd1xVd9KJ6s0b5KaFk-N6MlOjz4n1W39A5JHM,2533
 encommon/config/utils.py,sha256=VzTpBSZ-l6codt6vk4p4SpcmKk-H1OBy-9IUBPKP3t4,2039
 encommon/config/test/__init__.py,sha256=i0JAeRcM-0YH2StGfwpaDbZV9dVribNSgFDcYcPPay8,313
 encommon/config/test/test_config.py,sha256=POup-M0oIuCSceUDV1tkSCmv0bwKQS_wgFzesUgIgNM,2440
 encommon/config/test/test_files.py,sha256=qJgavSxTxilHOnGzfF6fBpViOmKFGcBdupOIRhDsXuk,2295
-encommon/config/test/test_logger.py,sha256=FVwVJ7qcsToK_ZyWNaMWHr-wPtXPx2osoZz86HlKuwA,5253
+encommon/config/test/test_logger.py,sha256=6X_ZYhKExvZsXo2o8FXneYi1uUekSj-t_B3u5wmeIDM,5246
 encommon/config/test/test_paths.py,sha256=jCrSEnPkZprsJSvolsfTKoyuYqxqyQdDymL9yk3elvQ,2633
 encommon/config/test/test_utils.py,sha256=RePpMD97HRCTkZ75ES8Eaf6_BOpcw_DknpgCFZGlQYg,1066
 encommon/crypts/__init__.py,sha256=UsGEitz8rWa7DQF3iAxEbTUAbdiEnE87LSuRs4OBeAQ,371
-encommon/crypts/crypts.py,sha256=1M7_U3HHYkfQHCeD-ZGa8N0isOxusc_Cr5xhTs11aFg,3516
+encommon/crypts/crypts.py,sha256=fD6dXqRZ_-mHv2CX3vDBAh-Fdhm6d09uA4SEUwSdqnk,4640
 encommon/crypts/hashes.py,sha256=bpQf2-Ma5SdMaEWP2nL1_9rtEQmTE0XTdDvSD-fQ9Mk,3075
-encommon/crypts/params.py,sha256=s4BWuUKsxUmc3dFPMa1pgQ_PDEPnmdOhXyTEVm2YyuQ,918
+encommon/crypts/params.py,sha256=AfuGbFvLPDdfGgday34T1Jb7NzGLi-R7tJQ_f5gVcRk,923
 encommon/crypts/test/__init__.py,sha256=PjrnBYT0efyvbaGeNx94dm3tP3EVHUHSVs-VGeLEv5g,218
-encommon/crypts/test/test_crypts.py,sha256=rBsn92QNvSqK3cvuZfMa7nGRyEbKX1sClH55GkP2cA0,2560
+encommon/crypts/test/test_crypts.py,sha256=gFkCA4-M2DLudP9nBpgU6sSchyWU1gtbvCWe6T0wg5I,3469
 encommon/crypts/test/test_hashes.py,sha256=JYpPit7ISv6u-5-HbC3wSCxuieySDLKawgnE7-xHgTY,1180
 encommon/times/__init__.py,sha256=aa3Wb2WBpZcf_RBgZu4vM3lEyPZhyuZicG5Fcg0DgEI,931
 encommon/times/common.py,sha256=g7kkZLyodZCIPpdiPCZh0-UMHwn-rwCv_Y6gdSvek6k,988
 encommon/times/duration.py,sha256=LTROiKcRXvPcs2Gz9KaB5Cmxo9NXd3TcMo5-jnTxPo0,10794
-encommon/times/params.py,sha256=Ob15P_21w2LoWYjBgteT_xgBNVSfMfx86Yp0luEM-Wk,3741
+encommon/times/params.py,sha256=llTThgIgoaKlAqPhONK1WA5RaDWURISp6XLdXxci0Tw,3753
 encommon/times/parse.py,sha256=DXoT_NyWL2Ea_j3vlGHMDY-5P6NBeYHyGhJoiavgBS0,6144
 encommon/times/timer.py,sha256=19dt7A5nJEUdr_0p3WDFGO-Q49OHt3sgPW4R2zHoScU,2901
-encommon/times/timers.py,sha256=YNT6Ek1v_J0-QTo3_6YDyqjww8bKuw0tNAW9lr2ccR8,8023
+encommon/times/timers.py,sha256=CWm_flWVADIpjdKXaba1wbRtHqKy85Pm07eAG7k1aDw,8295
 encommon/times/times.py,sha256=FBOAVY1H21OV4BjGHj6iJrYbGQpSkWPj3Ss2Vepdvu4,9682
 encommon/times/utils.py,sha256=PJ5QsKb3_pYEnD3Sz81d8QDhYQtTIj4HJfMoC9gNwmo,3100
 encommon/times/window.py,sha256=3ctrDd0UWvnwrqxRZf7M-mVeEYVWvet6GZTj17YQ9sU,8526
-encommon/times/windows.py,sha256=PT67OizarogT8l63Wq2AvlQLlrR-W-dJfnYLm2d2QnQ,9639
+encommon/times/windows.py,sha256=0ayWmfCBYlxc5e199ycj3HHupQOluWrooR8zn3eIRM8,9913
 encommon/times/test/__init__.py,sha256=PjrnBYT0efyvbaGeNx94dm3tP3EVHUHSVs-VGeLEv5g,218
 encommon/times/test/test_duration.py,sha256=ofCBdQ4-tOKP5W5U2xyTaZrCVvD-dWEgnYoCvZ99MuA,4189
 encommon/times/test/test_params.py,sha256=kHvs-WvKfPQCdCDnPU9tAyMVXmzH3eUjwQN-QdWBeh4,1407
 encommon/times/test/test_parse.py,sha256=ozP8PBgIsqdknK8cEtlYA3KusKnJzbjfAUKhcFv_eFk,4054
 encommon/times/test/test_timer.py,sha256=A5pBmkd1i71LTpG-uA9-9UGNJUK8tkw6by8Adm0AbGE,1400
-encommon/times/test/test_timers.py,sha256=ao7RF_oOTi3CQF3iynKftGI4Sg-oPo_Hx9RvxJi6lBE,4042
+encommon/times/test/test_timers.py,sha256=pH-7QGVI0YUJUGXWD1Q9crmVswPqtOO3auiYnyYaskI,3851
 encommon/times/test/test_times.py,sha256=vxEtXI9gYFlWnBLsyPyi17a96MJzgcI79SCy8U1Co8I,1748
 encommon/times/test/test_utils.py,sha256=WkzHJY6zOt02Ujg5FItOo1nPtktz5ss8ODmG1tRQaaw,2056
 encommon/times/test/test_window.py,sha256=Sx_fd0J1ofaFx52t-uWz9Isa9KqBxPFnynzfGfiG7uo,6098
-encommon/times/test/test_windows.py,sha256=22Z0LvSpy0s1tV3osUXV-nTmovjpCqVSeKnvyRFPY0A,4936
+encommon/times/test/test_windows.py,sha256=tw0SvutfP2eTB6R5P4stLRcQJcgr0pkmbxKEs49-0rs,4699
 encommon/types/__init__.py,sha256=L1pdigJyPNPEoAkkbCHM9IhmFtU2GjFRxHMRTAnPqKk,667
 encommon/types/dicts.py,sha256=lC2FmPzMEj9L73jUjf3o6OVQ-LqK_3gp5nBwYibdGfo,2265
 encommon/types/empty.py,sha256=n5y5maXkcM3xNYNYGK6iqvk98ivQSeguaedwc0HoMv4,2739
@@ -66,8 +66,8 @@ encommon/utils/test/test_match.py,sha256=QagKpTFdRo23-Y55fSaJrSMpt5jIebScKbz0h8t
 encommon/utils/test/test_paths.py,sha256=1yiZp5PCxljGk0J6fwIfWOUl-KWz40INybrwrN3JIog,1945
 encommon/utils/test/test_sample.py,sha256=sHAeWOL1mchTGYGQaFK_A3Z28tThuULumm9kQebnIdk,1710
 encommon/utils/test/test_stdout.py,sha256=TA7xQuFoPZUYW2l00e04MGp4P9gHkkVxVflvPlhpQXg,4878
-encommon-0.11.0.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
-encommon-0.11.0.dist-info/METADATA,sha256=PD5srG41aBZLkqV7YQ00mxTR_hx3Gw_CqcmJ9XWy_Ro,2918
-encommon-0.11.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-encommon-0.11.0.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
-encommon-0.11.0.dist-info/RECORD,,
+encommon-0.11.1.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
+encommon-0.11.1.dist-info/METADATA,sha256=LdI5NoYcQNPKSDWIdSjtwHPJquyKIY1qMd9hxCcUbRA,2918
+encommon-0.11.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+encommon-0.11.1.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
+encommon-0.11.1.dist-info/RECORD,,