velocity-python 0.0.30__py3-none-any.whl → 0.0.32__py3-none-any.whl

velocity/misc/merge.py

@@ -1,35 +1,52 @@
 from copy import deepcopy
 from functools import reduce
+from typing import Dict, List, Any
 
 
-def deep_merge(*dicts, update=False):
+def deep_merge(*dicts: Dict[str, Any], update: bool = False) -> Dict[str, Any]:
     """
-    Merges dicts deeply.
+    Deeply merges multiple dictionaries.
+
     Parameters
     ----------
-    dicts : list[dict]
-        List of dicts.
-    update : bool
-        Whether to update the first dict or create a new dict.
+    *dicts : Dict[str, Any]
+        Variable number of dictionaries to merge.
+    update : bool, optional
+        If True, updates the first dictionary in-place.
+        If False, creates and returns a new merged dictionary. Default is False.
+
     Returns
     -------
-    merged : dict
-        Merged dict.
+    Dict[str, Any]
+        The merged dictionary.
+
+    Notes
+    -----
+    - If a key's value in two dictionaries is a dictionary, they are merged recursively.
+    - If a key's value in two dictionaries is a list, values from the second list
+      are added to the first, avoiding duplicates.
+    - For all other types, the value from the latter dictionary overwrites the former.
     """
-    def merge_into(d1, d2):
-        for key in d2:
+
+    def merge_into(d1: Dict[str, Any], d2: Dict[str, Any]) -> Dict[str, Any]:
+        for key, value in d2.items():
             if key not in d1:
-                 d1[key] = deepcopy(d2[key])
-            elif isinstance(d1[key], dict):
-                d1[key] = merge_into(d1[key], d2[key])
-            elif isinstance(d1[key], list) and isinstance(d2[key], list):
-                d1[key].extend(d2[key])
+                d1[key] = deepcopy(value)
+            elif isinstance(d1[key], dict) and isinstance(value, dict):
+                d1[key] = merge_into(d1[key], value)
+            elif isinstance(d1[key], list) and isinstance(value, list):
+                existing_items = set(d1[key])
+                d1[key].extend(x for x in value if x not in existing_items)
+                existing_items.update(
+                    value
+                )  # Keep the set updated for further iterations
             else:
-                d1[key] = deepcopy(d2[key])
-                
+                d1[key] = deepcopy(value)  # Overwrite with the new value
         return d1
 
     if update:
+        # Update the first dictionary in-place
         return reduce(merge_into, dicts[1:], dicts[0])
     else:
+        # Create a new dictionary for the merged result
         return reduce(merge_into, dicts, {})

velocity/misc/timer.py

@@ -1,27 +1,50 @@
 import time
+from typing import Optional
 
 
 class Timer:
-    def __init__(self, label='Timer'):
+    def __init__(self, label: str = "Timer"):
+        """
+        Initializes a Timer instance with an optional label and starts the timer.
+        """
         self._label = label
+        self._start: Optional[float] = None
+        self._end: Optional[float] = None
+        self._diff: Optional[float] = None
         self.start()
 
-    def start(self):
-        self._end = self._start = time.time()
-        self._diff = 0
+    def start(self) -> None:
+        """Starts or restarts the timer."""
+        self._start = time.time()
+        self._end = None
+        self._diff = None
 
-    def end(self):
+    def stop(self) -> float:
+        """Stops the timer and calculates the time elapsed."""
+        if self._start is None:
+            raise ValueError("Timer has not been started.")
         self._end = time.time()
         self._diff = self._end - self._start
+        return self._diff
 
-    def __str__(self):
-        if not self._diff:
-            self.end()
-        return f"{self._label}: {self._diff:.4f} s"
+    def elapsed(self) -> float:
+        """Returns the elapsed time in seconds without stopping the timer."""
+        if self._start is None:
+            raise ValueError("Timer has not been started.")
+        return time.time() - self._start
 
+    def __str__(self) -> str:
+        """Returns a string representation of the time elapsed or final time."""
+        if self._diff is not None:  # Timer has been stopped
+            return f"{self._label}: {self._diff:.4f} s"
+        else:  # Timer is still running, show elapsed time
+            return f"{self._label}: {self.elapsed():.4f} s"
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     t = Timer("My Label")
-    time.sleep(.003)
+    time.sleep(0.003)
+    print(t)  # Should display elapsed time
     time.sleep(3)
-    print(t)
+    t.stop()
+    print(t)  # Should display the stopped time (final diff)

{velocity_python-0.0.30.dist-info → velocity_python-0.0.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velocity-python
-Version: 0.0.30
+Version: 0.0.32
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Paul Perez <pperez@codeclubs.org>
 Project-URL: Homepage, https://codeclubs.org/projects/velocity

velocity_python-0.0.32.dist-info/RECORD

@@ -0,0 +1,39 @@
+velocity/__init__.py,sha256=8Xcz_RUYvy6ibGGQeUrwa-fEVzDMhSKe2ZnYgytCeTw,88
+velocity/aws/__init__.py,sha256=GBTEr02whnCH3TG-BWCpUC3KfHY3uNxD21g0OvsVJnc,598
+velocity/aws/handlers/__init__.py,sha256=xnpFZJVlC2uoeeFW4zuPST8wA8ajaQDky5Y6iXZzi3A,172
+velocity/aws/handlers/context.py,sha256=UIjNR83y2NSIyK8HMPX8t5tpJHFNabiZvNgmmdQL3HA,1822
+velocity/aws/handlers/lambda_handler.py,sha256=RfEFIIn6a2k0W25AMEOMWCqbpUkXF13kV6vXFVKz0b0,6309
+velocity/aws/handlers/response.py,sha256=LXhtizLKnVBWjtHyE0h0bk-NYDrRpj7CHa7tRz9KkC4,9324
+velocity/aws/handlers/sqs_handler.py,sha256=YBqrEkA6EfkQUVk_kwsSI-HjFJO8-JqYco-p0UYDNXE,3368
+velocity/db/__init__.py,sha256=vrn2AFNAKaqTdnPwLFS0OcREcCtzUCOodlmH54U7ADg,200
+velocity/db/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+velocity/db/core/column.py,sha256=nibAue9zBY3ln7S81tgMvCDzpAmrHlBqAjvvzatzB5A,6258
+velocity/db/core/database.py,sha256=r4S_x9ntkdXkwqdPqSgVQ7YB2r68SbKssHyXfSfCJYo,1875
+velocity/db/core/decorators.py,sha256=q3_0j06vZF9J-pPcLjsR2wftp4iXjlGgJ2l70WdtbUo,3271
+velocity/db/core/engine.py,sha256=qubySirnGymBYfQb5hF6EdYUhNr-GSjOmvRNswG9RFI,14535
+velocity/db/core/exceptions.py,sha256=MOWyA1mlMe8eWbFkEHK0Lp9czdplpRyqbAn2JfGmMrM,707
+velocity/db/core/result.py,sha256=keE-SKn4Uw08uoiA_8FdaMzBfiaAIxidQEEsl3TM86U,4945
+velocity/db/core/row.py,sha256=AHopXrrQUp5dCXEMLEDm0iAhswKDtMUdBxjTtPQ7Udk,5659
+velocity/db/core/sequence.py,sha256=4WkXJUE1tea4bo3y8JzJq6KgtU_1yAV6rp3HHrOVAoI,1177
+velocity/db/core/table.py,sha256=d7KyIXAinBBzIqvxIZClJ8d-DGskPucruFiFFT4PtCM,19805
+velocity/db/core/transaction.py,sha256=XeqGkgrleIqC8krrDcqVXWiBAjXx9z67ZecJNjELgiw,6641
+velocity/db/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+velocity/db/servers/mysql.py,sha256=O3-lP1Y4VmdeAL5PcYcj_mulJBeK7vcoei_v23oo8qc,24272
+velocity/db/servers/postgres.py,sha256=aA4Fkz-PTo-Vi9kpDvWWMt2snv4r93PtQYDzgCg1XIs,42723
+velocity/db/servers/sqlite.py,sha256=_PGg6ECHdOyOMn4tTWX4WlectAukW3Dov7cZxHbVtBM,36198
+velocity/db/servers/sqlserver.py,sha256=ACdkTyJzdFzN-RpmOabKgmMPtCdHzT-FwYH00UpSNyM,34465
+velocity/misc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+velocity/misc/db.py,sha256=MtuNa7Z6F4SBy9wCXqLpSzWOJMkx51Z3vpUxn4FgUqU,2850
+velocity/misc/export.py,sha256=lATvwTe-Of6X7ZtzvJZiFghh9QlyMYZfDfQ_GJyt5yg,5197
+velocity/misc/format.py,sha256=OnjkxEEKzKuwihdf570VDSpsqOJLp0iyW0cuyDaxL-U,2649
+velocity/misc/mail.py,sha256=BrxDqeVsOd0epyJKwrHA-owzs6di2oLA_qJskoTux-c,2553
+velocity/misc/merge.py,sha256=EYtqwnckBllPO60tRALxFRuzmUQ7Wl0qZC6sCgyiZDA,1885
+velocity/misc/timer.py,sha256=cN3aS0t6HLlhYfF2Ir6ihJehxNrWf9ebaLzXUaWRKEA,1637
+velocity/misc/conv/__init__.py,sha256=MLYF58QHjzfDSxb1rdnmLnuEQCa3gnhzzZ30CwZVvQo,40
+velocity/misc/conv/iconv.py,sha256=ThTT3_t0Us5P7UuBa58ko-GKVm30FFUrSmPBd6Gfh90,5660
+velocity/misc/conv/oconv.py,sha256=XdRTQnywWNwVc0FH-8hPHjlTpZNFg80ivIfyTV3mMak,5495
+velocity_python-0.0.32.dist-info/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.0.32.dist-info/METADATA,sha256=teq0KrZ_b16Wx7QWDWpXIChNmAxJMiKbyjBMDt_9uf4,8522
+velocity_python-0.0.32.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+velocity_python-0.0.32.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.0.32.dist-info/RECORD,,

{velocity_python-0.0.30.dist-info → velocity_python-0.0.32.dist-info}/WHEEL

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

velocity_python-0.0.30.dist-info/RECORD

@@ -1,39 +0,0 @@
-velocity/__init__.py,sha256=AdcyndESw30hDhTzKaaDtdbwcCXgJgSyb8BLGlek0pA,88
-velocity/aws/__init__.py,sha256=ukvGrS0R8p6HtYajexOAJ7Kn9CJNlx6yb58W7o-JrAg,620
-velocity/aws/handlers/__init__.py,sha256=xnpFZJVlC2uoeeFW4zuPST8wA8ajaQDky5Y6iXZzi3A,172
-velocity/aws/handlers/context.py,sha256=UIjNR83y2NSIyK8HMPX8t5tpJHFNabiZvNgmmdQL3HA,1822
-velocity/aws/handlers/lambda_handler.py,sha256=RfEFIIn6a2k0W25AMEOMWCqbpUkXF13kV6vXFVKz0b0,6309
-velocity/aws/handlers/response.py,sha256=PlbrTFWZ6-2s7MGqaGAYENVuL63wOC7FlW7ZogFyTKo,3869
-velocity/aws/handlers/sqs_handler.py,sha256=YBqrEkA6EfkQUVk_kwsSI-HjFJO8-JqYco-p0UYDNXE,3368
-velocity/db/__init__.py,sha256=vrn2AFNAKaqTdnPwLFS0OcREcCtzUCOodlmH54U7ADg,200
-velocity/db/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-velocity/db/core/column.py,sha256=vB7dCrcIWFvRG1fgyzDQnEu7j_0KYxUuDSTCWVCYlPc,6153
-velocity/db/core/database.py,sha256=i1hzCkte6onEInH8ZtTI7D2Xj8q3uwU-uL3wn7Ix5oU,1860
-velocity/db/core/decorators.py,sha256=q3_0j06vZF9J-pPcLjsR2wftp4iXjlGgJ2l70WdtbUo,3271
-velocity/db/core/engine.py,sha256=94wVlnapVVmJCRp6NPGrwnqSxCDlC-848Vu42p9RtCs,14643
-velocity/db/core/exceptions.py,sha256=3ZyRq-idtCdtOGyT4rbNsmEyjfP75BMBq9y-Phakxow,684
-velocity/db/core/result.py,sha256=keE-SKn4Uw08uoiA_8FdaMzBfiaAIxidQEEsl3TM86U,4945
-velocity/db/core/row.py,sha256=AHopXrrQUp5dCXEMLEDm0iAhswKDtMUdBxjTtPQ7Udk,5659
-velocity/db/core/sequence.py,sha256=6sUaHJ29ItthNYoAvQy0SMAZURRdDS8bomnmQspJaT4,1083
-velocity/db/core/table.py,sha256=d7KyIXAinBBzIqvxIZClJ8d-DGskPucruFiFFT4PtCM,19805
-velocity/db/core/transaction.py,sha256=XeqGkgrleIqC8krrDcqVXWiBAjXx9z67ZecJNjELgiw,6641
-velocity/db/servers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-velocity/db/servers/mysql.py,sha256=c0yUG00jvgnhLMJcV8BuOlTL7uGJ3uRPjJ0xVJingbk,21975
-velocity/db/servers/postgres.py,sha256=aA4Fkz-PTo-Vi9kpDvWWMt2snv4r93PtQYDzgCg1XIs,42723
-velocity/db/servers/sqlite.py,sha256=QVdr_ytvCuSSKVgcP_PI05yTU0gNyFRtTmH4XQlQVjQ,34047
-velocity/db/servers/sqlserver.py,sha256=5kRNLNKbaszMww8JrlUvs2viSIb2hDZfn6nSvR52MEU,31593
-velocity/misc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-velocity/misc/db.py,sha256=ZbAlVjSC-ASfVV69zlLjUqwndQnsUTBBjORyIBNrMUo,2842
-velocity/misc/export.py,sha256=KA_ezon-jd874rHIDMeZSOWTCAuLcA7kayjWZVTewew,4863
-velocity/misc/format.py,sha256=2GwdWOpUqmQjtLJKrHjQjTMFrATF6G1IXkLI1xVPB7U,2301
-velocity/misc/mail.py,sha256=fKfJtEkRKO3f_JbHNw9ThxKHJnChlBMsQwmEDFgj264,2096
-velocity/misc/merge.py,sha256=hBYPJy6lGL8lzb0wK1i1oEAyzragTWKF1rW9_PGHm6s,918
-velocity/misc/timer.py,sha256=wMbV-1yNXeCJo_UPi5sTSslu9hPzokLaIKgd98tyG_4,536
-velocity/misc/conv/__init__.py,sha256=-caOuiqo0mzjP30Rh-3T0bSlt4M-SzJ4SPr2COk9wmg,39
-velocity/misc/conv/iconv.py,sha256=V-PcpDXq7wCmyxZ3sXfzpmVH5Nc9OHScvMH26K7N3bI,4375
-velocity/misc/conv/oconv.py,sha256=TGC6vTcOACtwp_Gpce33ZiVmgqBYQnwBcMNQ1MP6Qdc,4121
-velocity_python-0.0.30.dist-info/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
-velocity_python-0.0.30.dist-info/METADATA,sha256=Y-7JiFFbsnSw4MiYeM679d3NlXrqnluwIH-WFOTDyqw,8522
-velocity_python-0.0.30.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-velocity_python-0.0.30.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
-velocity_python-0.0.30.dist-info/RECORD,,