encommon 0.12.0__py3-none-any.whl → 0.12.2__py3-none-any.whl

encommon/config/logger.py

@@ -266,6 +266,9 @@ class Message:
 class FileFormatter(Formatter):
     """
     Supplement class for built-in logger exception formatter.
+
+    .. note::
+       Input parameters are not defined, check parent class.
     """
 
 

encommon/config/params.py

@@ -37,8 +37,6 @@ class LoggerParams(BaseModel, extra='forbid'):
     :param stdo_level: Minimum level for the message to pass.
     :param file_level: Minimum level for the message to pass.
     :param file_path: Enables writing to the filesystem path.
-    :param data: Keyword arguments passed to Pydantic model.
-        Parameter is picked up by autodoc, please ignore.
     """
 
     stdo_level: Optional[LOGLEVELS] = None

encommon/times/params.py

@@ -24,8 +24,6 @@ class TimerParams(BaseModel, extra='forbid'):
 
     :param timer: Seconds that are used for related timer.
     :param start: Optional time for when the timer started.
-    :param data: Keyword arguments passed to Pydantic model.
-        Parameter is picked up by autodoc, please ignore.
     """
 
     timer: float
@@ -81,8 +79,6 @@ class WindowParams(BaseModel, extra='forbid'):
     :param stop: Determine the ending for scheduling window.
     :param anchor: Optionally define time anchor for window.
     :param delay: Period of time schedulng will be delayed.
-    :param data: Keyword arguments passed to Pydantic model.
-        Parameter is picked up by autodoc, please ignore.
     """
 
     window: SCHEDULE

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)

encommon/times/timers.py

@@ -36,6 +36,9 @@ TIMERS = dict[str, Timer]
 class SQLBase(DeclarativeBase):
     """
     Some additional class that SQLAlchemy requires to work.
+
+    .. note::
+       Input parameters are not defined, check parent class.
     """
 
 
@@ -48,8 +51,6 @@ class TimersTable(SQLBase):
        Fields are not completely documented for this model.
     """
 
-    __tablename__ = 'timers'
-
     group = Column(
         String,
         primary_key=True,
@@ -60,10 +61,16 @@ class TimersTable(SQLBase):
         primary_key=True,
         nullable=False)
 
+    last = Column(
+        String,
+        nullable=False)
+
     update = Column(
         String,
         nullable=False)
 
+    __tablename__ = 'timers'
+
 
 
 class Timers:
@@ -249,28 +256,30 @@ class Timers:
         group = self.__group
 
         session = self.store_session
-        table = TimersTable
-
 
         config = params.timers
 
 
-        records = (
-            session.query(table)
-            .filter(table.group == group)
-            .order_by(table.unique))
+        _table = TimersTable
+        _group = _table.group
+        _unique = _table.unique
 
-        for record in records.all():
+        query = (
+            session.query(_table)
+            .filter(_group == group)
+            .order_by(_unique))
+
+        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()
@@ -318,12 +327,14 @@ class Timers:
             append = TimersTable(
                 group=group,
                 unique=unique,
+                last=timer.times.subsec,
                 update=update.subsec)
 
             session.merge(append)
 
 
         session.commit()
+        session.close()
 
 
     def ready(
@@ -367,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()
 
@@ -400,9 +411,9 @@ class Timers:
 
         timer = timers[unique]
 
-        self.save_children()
+        timer.update(value)
 
-        return timer.update(value)
+        self.save_children()
 
 
     def delete(

encommon/times/windows.py

@@ -36,6 +36,9 @@ WINDOWS = dict[str, Window]
 class SQLBase(DeclarativeBase):
     """
     Some additional class that SQLAlchemy requires to work.
+
+    .. note::
+       Input parameters are not defined, check parent class.
     """
 
 
@@ -48,8 +51,6 @@ class WindowsTable(SQLBase):
        Fields are not completely documented for this model.
     """
 
-    __tablename__ = 'windows'
-
     group = Column(
         String,
         primary_key=True,
@@ -72,6 +73,8 @@ class WindowsTable(SQLBase):
         String,
         nullable=False)
 
+    __tablename__ = 'windows'
+
 
 
 class Windows:
@@ -298,18 +301,20 @@ class Windows:
         group = self.__group
 
         session = self.store_session
-        table = WindowsTable
-
 
         config = params.windows
 
 
-        records = (
-            session.query(table)
-            .filter(table.group == group)
-            .order_by(table.unique))
+        _table = WindowsTable
+        _group = _table.group
+        _unique = _table.unique
+
+        query = (
+            session.query(_table)
+            .filter(_group == group)
+            .order_by(_unique))
 
-        for record in records.all():
+        for record in query.all():
 
             unique = str(record.unique)
             next = str(record.next)
@@ -394,6 +399,7 @@ class Windows:
 
 
         session.commit()
+        session.close()
 
 
     def ready(
@@ -437,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()
 
@@ -470,9 +476,9 @@ class Windows:
 
         window = windows[unique]
 
-        self.save_children()
+        window.update(value)
 
-        return window.update(value)
+        self.save_children()
 
 
     def delete(

encommon/version.txt

@@ -1 +1 @@
-0.12.0
+0.12.2

{encommon-0.12.0.dist-info → encommon-0.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: encommon
-Version: 0.12.0
+Version: 0.12.2
 Summary: Enasis Network Common Library
 License: MIT
 Classifier: Programming Language :: Python :: 3
@@ -74,16 +74,33 @@ information found in the `htmlcov` folder in the root of the project.
 make -s pytest
 ```
 
-## Build and upload to PyPi
-Build the package.
-```
-make -s pypackage
-```
-Upload to the test PyPi.
-```
-make -s pypi-upload-test
-```
-Upload to the prod PyPi.
-```
-make -s pypi-upload-prod
-```
+## Version management
+:warning: Ensure that no changes are pending.
+
+1. Rebuild the environment.
+   ```
+   make -s check-revenv
+   ```
+
+1. Update the [version.txt](encommon/version.txt) file.
+
+1. Push to the `main` branch.
+
+1. Create [repository](https://github.com/enasisnetwork/encommon) release.
+
+1. Build the Python package.<br>
+   ```
+   make -s pypackage
+   ```
+
+1. Upload Python package to PyPi test.
+   ```
+   make -s pypi-upload-test
+   ```
+
+1. Upload Python package to PyPi prod.
+   ```
+   make -s pypi-upload-prod
+   ```
+
+1. Update [Read the Docs](https://encommon.readthedocs.io) documentation.

{encommon-0.12.0.dist-info → encommon-0.12.2.dist-info}/RECORD

@@ -1,12 +1,12 @@
 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=ipMkE9QvlQgvgyNEdlI3mkiF4ygynvyjpn7Jx5PAmUA,7
+encommon/version.txt,sha256=9ILQbk7oMVjkKZnc-VHVkJhh2tfgMxfesrHi3dXEYnQ,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
-encommon/config/logger.py,sha256=qNizCbFNWtgb2tISJRiVx_KvNnS67mkkRrEgVzx6J_o,14141
-encommon/config/params.py,sha256=4bQ7Zz9DMLa5MrYtr89LuEkp0gAAsh7qG-b2wsSDLzI,2311
+encommon/config/logger.py,sha256=7qjujhs0pI02gazhGpPCNa18qnuYpajVCTDlBkCtiro,14217
+encommon/config/params.py,sha256=xygONdnwagGn06791nTX_mCR9hmdFl60RMe7MZr6ICw,2192
 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
@@ -25,20 +25,20 @@ encommon/crypts/test/test_hashes.py,sha256=JYpPit7ISv6u-5-HbC3wSCxuieySDLKawgnE7
 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=llTThgIgoaKlAqPhONK1WA5RaDWURISp6XLdXxci0Tw,3753
+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=Zwb-sHjIVf6qdkxy08phw7prenXLTRbbfmRCpnE8364,8546
+encommon/times/timers.py,sha256=dtwPGpCkNFDoydzgpq33bl_xkcLWzHUUhK94MaYNGCs,8784
 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=HlANd1BB8kJwpRPjHW0zj-0XtP4FvzrEXvdL6Ti1N3k,10137
+encommon/times/windows.py,sha256=2MdZPMkkkDUvec70EtlakHPtYA31UHmYKaaVgCVJ994,10277
 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=7PC9WgA4_HcgW7zH6I7UxaRsLrxzMx48VfHw176RNaA,3919
 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
@@ -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.0.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
-encommon-0.12.0.dist-info/METADATA,sha256=E10Deqzzz2nz7bUAJNPY0AzAmn2sWwl6b38qS1jk_nI,2944
-encommon-0.12.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-encommon-0.12.0.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
-encommon-0.12.0.dist-info/RECORD,,
+encommon-0.12.2.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
+encommon-0.12.2.dist-info/METADATA,sha256=grKBX9PyQwrEEi6QCS-FvraKKbLQgEMftCFFMTOrrhU,3362
+encommon-0.12.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+encommon-0.12.2.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
+encommon-0.12.2.dist-info/RECORD,,