encommon 0.12.1__py3-none-any.whl → 0.12.3__py3-none-any.whl

encommon/times/test/test_timers.py

@@ -58,6 +58,7 @@ def timers(
     timer = TimersTable(
         group='default',
         unique='two',
+        last='1970-01-01T00:00:00Z',
         update='1970-01-01T00:00:00Z')
 
     session.add(timer)
@@ -68,6 +69,7 @@ def timers(
     timer = TimersTable(
         group='default',
         unique='tre',
+        last='1970-01-01T00:00:00Z',
         update='1970-01-01T00:00:00Z')
 
     session.add(timer)
@@ -211,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/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/times/timers.py

@@ -61,6 +61,10 @@ class TimersTable(SQLBase):
         primary_key=True,
         nullable=False)
 
+    last = Column(
+        String,
+        nullable=False)
+
     update = Column(
         String,
         nullable=False)
@@ -268,14 +272,14 @@ class Timers:
         for record in query.all():
 
             unique = str(record.unique)
-            update = str(record.update)
+            last = str(record.last)
 
             if unique not in config:
                 continue
 
             _config = config[unique]
 
-            _config.start = update
+            _config.start = last
 
 
         items = config.items()
@@ -323,6 +327,7 @@ class Timers:
             append = TimersTable(
                 group=group,
                 unique=unique,
+                last=timer.times.subsec,
                 update=update.subsec)
 
             session.merge(append)
@@ -373,12 +378,12 @@ class Timers:
         :returns: Newly constructed instance of related class.
         """
 
-        timers = self.params.timers
+        config = self.params.timers
 
-        if unique in timers:
+        if unique in config:
             raise ValueError('unique')
 
-        timers[unique] = params
+        config[unique] = params
 
         self.load_children()
 
@@ -406,9 +411,9 @@ class Timers:
 
         timer = timers[unique]
 
-        self.save_children()
+        timer.update(value)
 
-        return timer.update(value)
+        self.save_children()
 
 
     def delete(
@@ -418,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
 
-        del timers[unique]
+
+        if unique in timers:
+            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/times/windows.py

@@ -443,12 +443,12 @@ class Windows:
         :returns: Newly constructed instance of related class.
         """
 
-        windows = self.params.windows
+        config = self.params.windows
 
-        if unique in windows:
+        if unique in config:
             raise ValueError('unique')
 
-        windows[unique] = params
+        config[unique] = params
 
         self.load_children()
 
@@ -476,9 +476,9 @@ class Windows:
 
         window = windows[unique]
 
-        self.save_children()
+        window.update(value)
 
-        return window.update(value)
+        self.save_children()
 
 
     def delete(
@@ -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
 
-        del windows[unique]
+
+        if unique in windows:
+            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/version.txt

@@ -1 +1 @@
-0.12.1
+0.12.3

{encommon-0.12.1.dist-info → encommon-0.12.3.dist-info}/METADATA

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

{encommon-0.12.1.dist-info → encommon-0.12.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=9u5pvxxLJ6JCJmzLWutKqMgwY0W56-T_czW4yUBFK4E,7
+encommon/version.txt,sha256=AaUH7akWhj0sVsbSSxOYXId2QERbsT4nJpLWfM8z8Fc,7
 encommon/config/__init__.py,sha256=iZdbW7A4m7iN4xt5cEeQqo0Klqs-CaPLdD5ocLmUYi8,856
 encommon/config/config.py,sha256=ldq1LfXGq0kfZwmlWE9mGG_hCdRuLT98QyLqnZY6ms8,5312
 encommon/config/files.py,sha256=ueXiKTOqlQ4GKUT9lLyOlE-tfr6QAkSxdUs0VPbwEnE,2385
@@ -28,21 +28,21 @@ encommon/times/duration.py,sha256=LTROiKcRXvPcs2Gz9KaB5Cmxo9NXd3TcMo5-jnTxPo0,10
 encommon/times/params.py,sha256=qwfy7cw9_UlWUm2xWm1aRjJJZzZp36w3Bo3Rc-HU2hM,3515
 encommon/times/parse.py,sha256=DXoT_NyWL2Ea_j3vlGHMDY-5P6NBeYHyGhJoiavgBS0,6144
 encommon/times/timer.py,sha256=19dt7A5nJEUdr_0p3WDFGO-Q49OHt3sgPW4R2zHoScU,2901
-encommon/times/timers.py,sha256=uFzgfG1OFexXE-lW9muN_QYioDPXJMdOofpNxxuF_5Y,8696
+encommon/times/timers.py,sha256=4kdLBFpUyZefgiIaMrIyh5Tex7eP8aPAMZOV2yvH4B8,9219
 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=PKGE_8lUUZs6ZsCB3anFmFnGTKK3-G4R4_n98F74gaI,10287
+encommon/times/windows.py,sha256=PiBASTU-E06R37nM2Ozl6cJidkEhTm3Sox9R-1aKkw0,10713
 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=DxIiX4g7tbub4MAP3Z3-vAES5HbEzjDXMQPSAsIFavA,3845
+encommon/times/test/test_timers.py,sha256=Kj5AgzNTCNb2vEep2zpTED6JpJ_1S5j-Kt1Bm17zkdg,3761
 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=dY7QYQ5BCBfAGotHrmkWkPGjRsI2od-8PbWkPwZ-QIM,4643
+encommon/times/test/test_windows.py,sha256=YJJ3-vN4bs2cGCUcGyo8-w4mQlt7fxuek17xCpvZRE8,4484
 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.12.1.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
-encommon-0.12.1.dist-info/METADATA,sha256=SjY2NeW39K-EjlErEdgmjS2069BIn39gle7zjAuqYcA,3362
-encommon-0.12.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-encommon-0.12.1.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
-encommon-0.12.1.dist-info/RECORD,,
+encommon-0.12.3.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
+encommon-0.12.3.dist-info/METADATA,sha256=5RkTVhFWumQfNpvq9gKZXlfFKO-zgDTaInEX1yj9oX8,3362
+encommon-0.12.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+encommon-0.12.3.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
+encommon-0.12.3.dist-info/RECORD,,