encommon 0.15.0__py3-none-any.whl → 0.17.0__py3-none-any.whl

encommon/config/config.py

@@ -174,19 +174,6 @@ class Config:
         return deepcopy(returned)
 
 
-    @property
-    def config(
-        self,
-    ) -> DictStrAny:
-        """
-        Return the configuration dumped from the Pydantic model.
-
-        :returns: Configuration dumped from the Pydantic model.
-        """
-
-        return self.params.model_dump()
-
-
     @property
     def basic(
         self,
@@ -278,6 +265,19 @@ class Config:
         return self.__params
 
 
+    @property
+    def config(
+        self,
+    ) -> DictStrAny:
+        """
+        Return the configuration dumped from the Pydantic model.
+
+        :returns: Configuration dumped from the Pydantic model.
+        """
+
+        return self.params.endumped
+
+
     @property
     def logger(
         self,

encommon/config/logger.py

@@ -329,7 +329,7 @@ class Logger:
     :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 params: Parameters for instantiating the instance.
+    :param params: Parameters used to instantiate the class.
     """
 
     __params: 'LoggerParams'

encommon/config/test/test_config.py

@@ -68,8 +68,6 @@ def test_Config(
 
     assert len(config.sargs) == 1
 
-    assert len(config.config) == 3
-
     assert len(config.basic) == 3
 
     assert len(config.merge) == 5
@@ -78,6 +76,8 @@ def test_Config(
 
     assert config.params
 
+    assert len(config.config) == 3
+
     assert config.logger
 
     assert config.crypts
@@ -87,6 +87,39 @@ def test_Config(
         'pytemp': tmp_path,
         'PROJECT': PROJECT}
 
+
+    sample_path = (
+        SAMPLES / 'basic.json')
+
+    sample = load_sample(
+        path=sample_path,
+        update=ENPYRWS,
+        content=config.basic,
+        replace=replaces)
+
+    expect = prep_sample(
+        content=config.basic,
+        replace=replaces)
+
+    assert expect == sample
+
+
+    sample_path = (
+        SAMPLES / 'merge.json')
+
+    sample = load_sample(
+        path=sample_path,
+        update=ENPYRWS,
+        content=config.merge,
+        replace=replaces)
+
+    expect = prep_sample(
+        content=config.merge,
+        replace=replaces)
+
+    assert expect == sample
+
+
     sample_path = (
         SAMPLES / 'config.json')
 

encommon/crypts/crypts.py

@@ -48,7 +48,7 @@ class Crypts:
     >>> crypts.decrypt(encrypt)
     'example'
 
-    :param params: Parameters for instantiating the instance.
+    :param params: Parameters used to instantiate the class.
     """
 
     __params: 'CryptsParams'
@@ -154,7 +154,7 @@ class Crypts:
         Create a new phrase using the provided input parameters.
 
         :param unique: Unique identifier of mapping passphrase.
-        :param params: Parameters for instantiating the instance.
+        :param params: Parameters used to instantiate the class.
         """
 
         phrases = self.params.phrases

encommon/times/test/test_timer.py

@@ -68,6 +68,7 @@ def test_Timer(
     assert timer.remains <= 1
 
     assert not timer.ready()
+    assert timer.pause()
 
 
     sleep(1)
@@ -77,11 +78,15 @@ def test_Timer(
     assert timer.remains == 0
 
     assert timer.ready()
+    assert timer.pause()
 
     assert not timer.ready()
+    assert timer.pause()
 
     timer.update('1980-01-01')
 
     assert timer.ready()
+    assert timer.pause()
 
     assert not timer.ready()
+    assert timer.pause()

encommon/times/test/test_timers.py

@@ -151,10 +151,12 @@ def test_Timers_cover(
 
 
     assert timers.ready('two')
+    assert timers.pause('two')
 
     timers.update('two', 'now')
 
     assert not timers.ready('two')
+    assert timers.pause('two')
 
 
     timers = Timers()
@@ -165,10 +167,12 @@ def test_Timers_cover(
     timers.create('fur', params)
 
     assert not timers.ready('fur')
+    assert timers.pause('fur')
 
     sleep(1)
 
     assert timers.ready('fur')
+    assert timers.pause('fur')
 
     timers.delete('fur')
 

encommon/times/time.py

@@ -134,9 +134,7 @@ class Time:
         :returns: Boolean indicating outcome from the operation.
         """
 
-        hashed = int(self.mpoch)
-
-        return int(1e9 + hashed)
+        return hash(self.__source)
 
 
     def __str__(

encommon/times/timer.py

@@ -131,6 +131,20 @@ class Timer:
         return True
 
 
+    def pause(
+        self,
+        update: bool = True,
+    ) -> bool:
+        """
+        Determine whether or not the appropriate time has passed.
+
+        :param update: Determines whether or not time is updated.
+        :returns: Boolean indicating whether enough time passed.
+        """
+
+        return not self.ready(update)
+
+
     def update(
         self,
         value: Optional[PARSABLE] = None,

encommon/times/timers.py

@@ -97,7 +97,7 @@ class Timers:
     >>> timers.ready('one')
     True
 
-    :param params: Parameters for instantiating the instance.
+    :param params: Parameters used to instantiate the class.
     :param store: Optional database path for keeping state.
     :param group: Optional override for default group name.
     """
@@ -365,6 +365,23 @@ class Timers:
         return ready
 
 
+    def pause(
+        self,
+        unique: str,
+        update: bool = True,
+    ) -> bool:
+        """
+        Determine whether or not the appropriate time has passed.
+
+        :param unique: Unique identifier for the related child.
+        :param update: Determines whether or not time is updated.
+        :returns: Boolean indicating whether enough time passed.
+        """
+
+        return not self.ready(
+            unique, update)
+
+
     def create(
         self,
         unique: str,
@@ -374,7 +391,7 @@ class Timers:
         Create a new timer using the provided input parameters.
 
         :param unique: Unique identifier for the related child.
-        :param params: Parameters for instantiating the instance.
+        :param params: Parameters used to instantiate the class.
         :returns: Newly constructed instance of related class.
         """
 

encommon/times/windows.py

@@ -97,7 +97,7 @@ class Windows:
     >>> [windows.ready('one') for x in range(3)]
     [True, True, False]
 
-    :param params: Parameters for instantiating the instance.
+    :param params: Parameters used to instantiate the class.
     :param start: Determine the start for scheduling window.
     :param stop: Determine the ending for scheduling window.
     :param store: Optional database path for keeping state.
@@ -439,7 +439,7 @@ class Windows:
         Create a new window using the provided input parameters.
 
         :param unique: Unique identifier for the related child.
-        :param params: Parameters for instantiating the instance.
+        :param params: Parameters used to instantiate the class.
         :returns: Newly constructed instance of related class.
         """
 

encommon/types/classes.py

@@ -22,7 +22,7 @@ class BaseModel(Pydantic, extra='forbid'):
 
 
     @property
-    def model_dumped(
+    def endumped(
         self,
     ) -> DictStrAny:
         """
@@ -35,7 +35,7 @@ class BaseModel(Pydantic, extra='forbid'):
 
 
     @property
-    def model_pruned(
+    def enpruned(
         self,
     ) -> DictStrAny:
         """

encommon/types/test/test_classes.py

@@ -26,8 +26,8 @@ def test_BaseModel() -> None:
     params = LoggerParams(
         stdo_level='info')
 
-    dumped = params.model_dumped
-    pruned = params.model_pruned
+    dumped = params.endumped
+    pruned = params.enpruned
 
     assert dumped == {
         'file_level': None,

encommon/utils/sample.py

@@ -16,10 +16,10 @@ from typing import Any
 from typing import Callable
 from typing import Optional
 
-from pydantic import BaseModel
 
 from .files import read_text
 from .files import save_text
+from ..types import BaseModel
 from ..types import DictStrAny
 from ..types import rplstr
 
@@ -72,7 +72,7 @@ def prep_sample(  # noqa: CFQ004
             return asdict(value)
 
         if isinstance(value, BaseModel):
-            return value.model_dump()
+            return value.endumped
 
         return str(value)
 

encommon/utils/stdout.py

@@ -19,11 +19,10 @@ from typing import Optional
 from typing import TYPE_CHECKING
 from typing import Union
 
-from pydantic import BaseModel
-
 from .common import JOINABLE
 from ..times import Duration
 from ..times import Time
+from ..types import BaseModel
 from ..types import Empty
 from ..types import clsname
 from ..types.strings import COMMAD
@@ -308,7 +307,7 @@ def array_ansi(  # noqa: CFQ001, CFQ004
     ) -> None:
 
         if isinstance(source, BaseModel):
-            source = source.model_dump()
+            source = source.endumped
 
         if is_dataclass(source):
             source = asdict(source)

encommon/version.txt

@@ -1 +1 @@
-0.15.0
+0.17.0

{encommon-0.15.0.dist-info → encommon-0.17.0.dist-info}/METADATA

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

{encommon-0.15.0.dist-info → encommon-0.17.0.dist-info}/RECORD

@@ -1,26 +1,26 @@
 encommon/__init__.py,sha256=YDGzuhpk5Gd1hq54LI0hw1NrrDvrJDrvH20TEy_0l5E,443
 encommon/conftest.py,sha256=pDU0t5M2fMKPFZsbxJ1ty_dxW_BoiyEC7VoNSqNBVHc,1899
 encommon/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-encommon/version.txt,sha256=-EBaczDChwKNRww-41Bvh48a2F7XnB0a3BnfL_c5iRU,7
+encommon/version.txt,sha256=AtOOmOiPSo3C6kDbt2kzhgEGb8lJILUogqFPIa2X9-4,7
 encommon/colors/__init__.py,sha256=XRiGimMj8oo040NO5a5ZsbsIUxaGVW4tf4xWTPWgnZY,269
 encommon/colors/color.py,sha256=EiUxNbVL1689Cqhw1LmO9ysmN3ulCVtGZGylyV8LuVA,10884
 encommon/colors/test/__init__.py,sha256=PjrnBYT0efyvbaGeNx94dm3tP3EVHUHSVs-VGeLEv5g,218
 encommon/colors/test/test_color.py,sha256=GKYzfnOlb2yKI0qmPDxumkeQNSXpvxTprUV9pAJPV94,4566
 encommon/config/__init__.py,sha256=iZdbW7A4m7iN4xt5cEeQqo0Klqs-CaPLdD5ocLmUYi8,856
-encommon/config/config.py,sha256=MYFQYfQvK2lgRoXO6z8bjF4nu2G1Od2p2OSdEMDOcXo,6957
+encommon/config/config.py,sha256=-votrrG3pvU3oWrHoIMKu-pPZSC2MpdGz-1RSK6uXtk,6953
 encommon/config/files.py,sha256=dSuShvIbQXFiNmpkwNVHCKDI-phBWC03OJVUfKJnfX0,2433
-encommon/config/logger.py,sha256=_6JIpf2kcEtvRi4a3AMAuHnsJHup4WYo_VlhITy8CKU,14333
+encommon/config/logger.py,sha256=1eAcJ2reIhk1SVhhcfPNiUGtRPj0N3h1e_YHX7w_IKg,14332
 encommon/config/params.py,sha256=FtcWi3-CY6OHLN7o3S-iBktpS1yGt5wLVD0546XEKRY,2223
 encommon/config/paths.py,sha256=6eLhqEXDyNQpwdL6QWNPf060uayuUzXyM6A3ikNC24Q,2585
 encommon/config/utils.py,sha256=jZ9x6Nd7H4XZMSyAFr7mydgIu8P7xBzjHqKzMpmduw0,2127
 encommon/config/test/__init__.py,sha256=Vs5Pca7QBgoyoSjk6DSpO0YFcqkUhap5-VLbaCn8MjA,304
-encommon/config/test/test_config.py,sha256=XY2Vjdh79nKUt2ggj13yTQtsEZM8Dz_QdDhapgNM5Rs,2366
+encommon/config/test/test_config.py,sha256=uhvkgdW_vRX4MeKlRb4u0lJnpF4sqrgKxUXU97i2LA0,2965
 encommon/config/test/test_files.py,sha256=elw484lZ9pF9fhBhRWQ_xCVjFhQXd0E5BMNaB3cbMAs,2301
 encommon/config/test/test_logger.py,sha256=jj-vX9v4cl0nAqb3lgDoDeDCQMzP63Ip-ek1eIh5bmc,5293
 encommon/config/test/test_paths.py,sha256=f3slZZkJqnFJK4DAFbQSdnUymhap1GXc9eZmS--vNT4,2649
 encommon/config/test/test_utils.py,sha256=RePpMD97HRCTkZ75ES8Eaf6_BOpcw_DknpgCFZGlQYg,1066
 encommon/crypts/__init__.py,sha256=UsGEitz8rWa7DQF3iAxEbTUAbdiEnE87LSuRs4OBeAQ,371
-encommon/crypts/crypts.py,sha256=fD6dXqRZ_-mHv2CX3vDBAh-Fdhm6d09uA4SEUwSdqnk,4640
+encommon/crypts/crypts.py,sha256=gsppdcUAdw7UBGIy28m3-JR7kFcu6wUqc2hyvQ1nqpY,4638
 encommon/crypts/hashes.py,sha256=bpQf2-Ma5SdMaEWP2nL1_9rtEQmTE0XTdDvSD-fQ9Mk,3075
 encommon/crypts/params.py,sha256=2uH_i1NBMlzhq7UtWgX2jsiUGNniOK69eTCeeiQFpdw,1417
 encommon/crypts/test/__init__.py,sha256=PjrnBYT0efyvbaGeNx94dm3tP3EVHUHSVs-VGeLEv5g,218
@@ -31,26 +31,26 @@ encommon/times/common.py,sha256=HWgWBbqDoyKHIqeg4bBAZZfRM3499X3WPu8dVCzt_5o,995
 encommon/times/duration.py,sha256=LTROiKcRXvPcs2Gz9KaB5Cmxo9NXd3TcMo5-jnTxPo0,10794
 encommon/times/params.py,sha256=qg0mLkXVsl54m72kd9uXRvmYKqUR_Ag5PBfnTsrwQhE,4360
 encommon/times/parse.py,sha256=_PF12z-UOa75SyeUpBXVn7Jjt-c-Pfnzt6pAs_PjXmQ,6496
-encommon/times/time.py,sha256=8bEqBKXG3Y0BLxqmbDq8jWtBrKEJGkfPTu7ny6BwfPQ,11778
-encommon/times/timer.py,sha256=oNU86QRTMfwocL9dhrw0uo1wV9ZTXW3yXYH3W2rbGRY,2889
-encommon/times/timers.py,sha256=iXxT2Dyp9zSG3biIYrGGiX69gEppGQ4b_i1I7vRx5L8,9339
+encommon/times/time.py,sha256=mdYl8vDJ0ZbaiH96A1cFHhOn7fExiRnudQJP1M4Xe2E,11746
+encommon/times/timer.py,sha256=xxS6KVXFuRLq-RkXWMR7MMX5x0HGrEhLlOhRCecuCZY,3225
+encommon/times/timers.py,sha256=ROJzIP0WnYBladc0hFMDOX2m_Hnd4F6rJD8PUxpq_tg,9779
 encommon/times/unitime.py,sha256=pO2I6qaSxR4HN82QSQYX6fo27xTP-n6bW8TahOG8c2k,1179
 encommon/times/utils.py,sha256=PJ5QsKb3_pYEnD3Sz81d8QDhYQtTIj4HJfMoC9gNwmo,3100
 encommon/times/window.py,sha256=tnOPz57cwIXVnOEGh7WPvBPhdjenvw1bYxV4mz721n0,8490
-encommon/times/windows.py,sha256=JmkfYDu-luFJa5XoPChhKE4SC2B8Uzrk6yBkb40NKjg,10827
+encommon/times/windows.py,sha256=LAuM41ttsorhLpYYLgR_zzzkX-tMmpFzS6e_EdYUKoA,10825
 encommon/times/test/__init__.py,sha256=PjrnBYT0efyvbaGeNx94dm3tP3EVHUHSVs-VGeLEv5g,218
 encommon/times/test/test_duration.py,sha256=BZLTggT87HnQcQODHXM50nW8iE-ROZF3aSPfIFddkKQ,4202
 encommon/times/test/test_params.py,sha256=kHvs-WvKfPQCdCDnPU9tAyMVXmzH3eUjwQN-QdWBeh4,1407
 encommon/times/test/test_parse.py,sha256=3Dihhu8xKmgbcq_dqKcO-itAeGtqAJxjGFQ6dPsJ4XM,4210
 encommon/times/test/test_time.py,sha256=CrmC9dY9ROqQqYV_cQHpBPfgsiZBhrppTVfPLbSINnQ,2235
-encommon/times/test/test_timer.py,sha256=w_Rh3APNmE_7OndtlIIC5YiAMEE4KImeLgF5mQWbb3o,1416
-encommon/times/test/test_timers.py,sha256=X148zl5Dkm3KN-F5PW0JldJ0ntoFUJavCxBNtbnGp7E,3746
+encommon/times/test/test_timer.py,sha256=_Sry94CaQicncjEhM8QniL5IGujMHprCLOy-3UzTqfY,1541
+encommon/times/test/test_timers.py,sha256=xHaZcopALER3dbz73OR1C1w2DIqpyEdSGJm_rGT9xt8,3870
 encommon/times/test/test_unitime.py,sha256=5i4UjBCw8R9h-Lw963GfB_dHBMEQhjvv1k-t27Wyyls,510
 encommon/times/test/test_utils.py,sha256=WkzHJY6zOt02Ujg5FItOo1nPtktz5ss8ODmG1tRQaaw,2056
 encommon/times/test/test_window.py,sha256=gNJpWVrwQTnUFQ00OLzWUuvJjWUCoiCwydohr9mevT0,6116
 encommon/times/test/test_windows.py,sha256=IaaxUXqf5n9IF9X0HkRqtCdyOdeCq5DYR1ySLORA9gE,4474
 encommon/types/__init__.py,sha256=_DVoVFJWd-9aCpXtPEaB3CnZ-5gt-uYxMWzquXfXHpg,1047
-encommon/types/classes.py,sha256=rkaeskjMOCRAH-Rqlfgkk5zd64xIL6bSNld8TbL01Ho,1697
+encommon/types/classes.py,sha256=FYFTu8Uj-74JWudHOlhaOrsXXPxitorBfM9_QM3EGSU,1689
 encommon/types/dicts.py,sha256=lC2FmPzMEj9L73jUjf3o6OVQ-LqK_3gp5nBwYibdGfo,2265
 encommon/types/empty.py,sha256=n5y5maXkcM3xNYNYGK6iqvk98ivQSeguaedwc0HoMv4,2739
 encommon/types/lists.py,sha256=4xn1RqS1VMsNnhR-2Xpv4ykB6d2RteFa5zdiWKzo55o,745
@@ -58,7 +58,7 @@ encommon/types/notate.py,sha256=0JIzF5VDnQ6C4umZIpgxIvd91gFo3MXTZ7Kp54S538A,6454
 encommon/types/strings.py,sha256=LW2WZND64cKE1LhNip3vqsoP3elLsUP6cpS0dYnUKGE,2800
 encommon/types/types.py,sha256=DbzdDLLclD1Gk8bmyhDUUWVDnJ5LdaolLV3JYKHFVgA,322
 encommon/types/test/__init__.py,sha256=UIyNazTlIIdUzQS0brlD7hCPN_LYw_J6Ucxm8wh3cPU,789
-encommon/types/test/test_classes.py,sha256=t4A2KXG3PP6zMH01t8R3fuvvJOAx_G67kZ3Jm8NYw00,1483
+encommon/types/test/test_classes.py,sha256=CjthMInwz5WB7aTc7-GpzgcYAvkF9dRmC6nXJVoE91k,1475
 encommon/types/test/test_dicts.py,sha256=-RLkcyexCXGSyJyPx1e3QU8sNXEgtSvD9pZakdOwVvg,2702
 encommon/types/test/test_empty.py,sha256=LVsZbKOg0deyKOtg_0Fhf0b_0c94LftwdDhijna-FbA,995
 encommon/types/test/test_lists.py,sha256=RXvIQvr1nODutPBRx5hMsPRq_10AzBWF594KINoMgU8,437
@@ -69,16 +69,16 @@ encommon/utils/common.py,sha256=-bjGJ2UJa-WTOsVYiuZcVj1gkyH5OlRdRkJtxPw8J6k,555
 encommon/utils/files.py,sha256=2uj10JfvKZHdLHNF992_LUvQ4rfMRCZGqJd7LrxKDnE,1458
 encommon/utils/match.py,sha256=XvmmMKQ1q8_21zzPGuVvaZf6XwHXPZn4IWIYBEqVCQM,2471
 encommon/utils/paths.py,sha256=u8-vTONG3QdnpkKfVpl19WssH95bCHg1gHlnRwzyAFM,3509
-encommon/utils/sample.py,sha256=5ugSUR2aWUnW4Y2V_SMPg_r0X_7ELEAiCQAZ-w9VcpA,4839
-encommon/utils/stdout.py,sha256=5gDOP7sfH6JCl5ZP578Y7bvTdv5R2L2xhdYhaFz5cJY,8575
+encommon/utils/sample.py,sha256=wcT_me9L-U6atd8kEew4q_4B-iIn8vV1LhEDoVr-cFw,4834
+encommon/utils/stdout.py,sha256=aYNX_Ey9sSwnsfAT8VmRs_Kz0sz9n6gtuR_9Recaa64,8569
 encommon/utils/test/__init__.py,sha256=PjrnBYT0efyvbaGeNx94dm3tP3EVHUHSVs-VGeLEv5g,218
 encommon/utils/test/test_files.py,sha256=-hdl4UOo-vH1H5gTL1r9Ib3P26DtWaD2YV32P08ykvc,679
 encommon/utils/test/test_match.py,sha256=QagKpTFdRo23-Y55fSaJrSMpt5jIebScKbz0h8tivrI,1124
 encommon/utils/test/test_paths.py,sha256=4AzIhQyYFEWhRWHgOZCCzomQ3Zs3EVwRnDQDa6Nq1Mc,1942
 encommon/utils/test/test_sample.py,sha256=Qf-W0XbjTe5PfG87sdVizL2ymUPRTdX0qQtLGHaTgx8,3539
 encommon/utils/test/test_stdout.py,sha256=fYiqEaUraD-3hFQYLxMPR4Ti_8CbTjEc8WvReXUA884,6139
-encommon-0.15.0.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
-encommon-0.15.0.dist-info/METADATA,sha256=0DUEJqxShp2BiG0NlnzG3TRqNTzTDJBrAESUEQZUiqQ,3362
-encommon-0.15.0.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-encommon-0.15.0.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
-encommon-0.15.0.dist-info/RECORD,,
+encommon-0.17.0.dist-info/LICENSE,sha256=otnXKCtMjPlbHs0wgZ_BWULrp3g_2dWQJ6icRk9nkgg,1071
+encommon-0.17.0.dist-info/METADATA,sha256=ieo8193Z8YtT8np40oSLNq-qST2PJzp5QMtxozJ9CIY,3362
+encommon-0.17.0.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+encommon-0.17.0.dist-info/top_level.txt,sha256=bP8q7-5tLDNm-3XPlqn_bDENfYNug5801H_xfz3BEAM,9
+encommon-0.17.0.dist-info/RECORD,,

{encommon-0.15.0.dist-info → encommon-0.17.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any