encommon 0.12.2__tar.gz → 0.13.0__tar.gz

{encommon-0.12.2/encommon.egg-info → encommon-0.13.0}/PKG-INFO

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

{encommon-0.12.2 → encommon-0.13.0}/encommon/config/config.py

@@ -49,12 +49,14 @@ class Config:
     :param paths: Complete or relative path to config paths.
     :param cargs: Configuration arguments in dictionary form,
         which will override contents from the config files.
+    :param sargs: Additional arguments on the command line.
     :param model: Override default config validation model.
     """
 
     __files: ConfigFiles
     __paths: ConfigPaths
     __cargs: dict[str, Any]
+    __sargs: dict[str, Any]
 
     __model: Callable  # type: ignore
 
@@ -69,6 +71,7 @@ class Config:
         files: Optional['PATHABLE'] = None,
         paths: Optional['PATHABLE'] = None,
         cargs: Optional[dict[str, Any]] = None,
+        sargs: Optional[dict[str, Any]] = None,
         model: Optional[Callable] = None,  # type: ignore
     ) -> None:
         """
@@ -78,12 +81,14 @@ class Config:
         files = files or []
         paths = paths or []
         cargs = cargs or {}
+        sargs = sargs or {}
 
         paths = list(config_paths(paths))
 
         self.__model = model or Params
         self.__files = ConfigFiles(files)
         self.__cargs = deepcopy(cargs)
+        self.__sargs = deepcopy(sargs)
 
         self.__params = None
 
@@ -147,6 +152,28 @@ class Config:
         return deepcopy(returned)
 
 
+    @property
+    def sargs(
+        self,
+    ) -> dict[str, Any]:
+        """
+        Return the value for the attribute from class instance.
+
+        :returns: Value for the attribute from class instance.
+        """
+
+        returned: dict[str, Any] = {}
+
+        sargs = deepcopy(self.__sargs)
+
+        items = sargs.items()
+
+        for key, value in items:
+            setate(returned, key, value)
+
+        return deepcopy(returned)
+
+
     @property
     def config(
         self,

{encommon-0.12.2 → encommon-0.13.0}/encommon/config/test/test_config.py

@@ -44,6 +44,7 @@ def test_Config(
         '_Config__model',
         '_Config__files',
         '_Config__cargs',
+        '_Config__sargs',
         '_Config__params',
         '_Config__paths',
         '_Config__logger',
@@ -71,6 +72,8 @@ def test_Config(
 
     assert len(config.cargs) == 1
 
+    assert len(config.sargs) == 1
+
     assert len(config.config) == 3
 
     assert config.model is Params

{encommon-0.12.2 → encommon-0.13.0}/encommon/conftest.py

@@ -47,9 +47,13 @@ def config_factory(
         'enlogger/file_path': config_log,
         'enlogger/file_level': 'info'}
 
+    sargs = {
+        'custom/parameter': 'fart'}
+
     return Config(
         files=f'{tmp_path}/config.yml',
-        cargs=cargs)
+        cargs=cargs,
+        sargs=sargs)
 
 
 

{encommon-0.12.2 → encommon-0.13.0}/encommon/times/test/test_timers.py

@@ -213,13 +213,3 @@ def test_Timers_raises(
     _reason = str(reason.value)
 
     assert _reason == 'unique'
-
-
-    _raises = raises(ValueError)
-
-    with _raises as reason:
-        timers.delete('dne')
-
-    _reason = str(reason.value)
-
-    assert _reason == 'unique'

{encommon-0.12.2 → encommon-0.13.0}/encommon/times/test/test_windows.py

@@ -240,13 +240,3 @@ def test_Windows_raises(
     _reason = str(reason.value)
 
     assert _reason == 'unique'
-
-
-    _raises = raises(ValueError)
-
-    with _raises as reason:
-        windows.delete('dne')
-
-    _reason = str(reason.value)
-
-    assert _reason == 'unique'

{encommon-0.12.2 → encommon-0.13.0}/encommon/times/timers.py

@@ -423,12 +423,33 @@ class Timers:
         """
         Delete the timer from the internal dictionary reference.
 
+        .. note::
+           This is a graceful method, will not raise exception
+           when the provided unique value does not exist.
+
         :param unique: Unique identifier for the related child.
         """
 
         timers = self.__timers
 
-        if unique not in timers:
-            raise ValueError('unique')
+        group = self.__group
+
+        session = self.store_session
+
+
+        if unique in timers:
+            del timers[unique]
+
 
-        del timers[unique]
+        _table = TimersTable
+        _group = _table.group
+        _unique = _table.unique
+
+        (session.query(_table)
+         .filter(_unique == unique)
+         .filter(_group == group)
+         .delete())
+
+
+        session.commit()
+        session.close()

{encommon-0.12.2 → encommon-0.13.0}/encommon/times/windows.py

@@ -488,12 +488,33 @@ class Windows:
         """
         Delete the window from the internal dictionary reference.
 
+        .. note::
+           This is a graceful method, will not raise exception
+           when the provided unique value does not exist.
+
         :param unique: Unique identifier for the related child.
         """
 
         windows = self.__windows
 
-        if unique not in windows:
-            raise ValueError('unique')
+        group = self.__group
+
+        session = self.store_session
+
+
+        if unique in windows:
+            del windows[unique]
+
 
-        del windows[unique]
+        _table = WindowsTable
+        _group = _table.group
+        _unique = _table.unique
+
+        (session.query(_table)
+         .filter(_unique == unique)
+         .filter(_group == group)
+         .delete())
+
+
+        session.commit()
+        session.close()

encommon-0.13.0/encommon/version.txt

@@ -0,0 +1 @@
+0.13.0

{encommon-0.12.2 → encommon-0.13.0/encommon.egg-info}/PKG-INFO

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

encommon-0.12.2/encommon/version.txt

@@ -1 +0,0 @@
-0.12.2