encommon 0.11.0__tar.gz → 0.11.1__tar.gz

{encommon-0.11.0/encommon.egg-info → encommon-0.11.1}/PKG-INFO

@@ -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 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.0 → encommon-0.11.1}/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-0.11.1/encommon/version.txt

@@ -0,0 +1 @@
+0.11.1

{encommon-0.11.0 → encommon-0.11.1/encommon.egg-info}/PKG-INFO

@@ -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/encommon/version.txt

@@ -1 +0,0 @@
-0.11.0