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

velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.0.32"
+__version__ = version = "0.0.34"
 
 from . import aws
 from . import db

velocity/db/core/decorators.py

@@ -1,5 +1,6 @@
 from functools import wraps
 from velocity.db import exceptions
+import traceback
 
 
 def retry_on_dup_key(function):
@@ -55,6 +56,7 @@ def return_default(
                 if result is None:
                     result = default
             except f.exceptions as e:
+                traceback.print_exc()
                 self.tx.rollback_savepoint(sp, cursor=self.cursor)
                 return f.default
             self.tx.release_savepoint(sp, cursor=self.cursor)

velocity/db/core/engine.py

@@ -169,6 +169,8 @@ class Engine(object):
                     return function(*args, **kwds)
                 except exceptions.DbRetryTransaction as e:
                     if e.args and e.args[0]:
+                        print(e)
+                        print("**Retry Transaction. Rollback and start over")
                         _tx.rollback()
                         continue
                     retry_count += 1
@@ -249,6 +251,7 @@ class Engine(object):
             conf["database"] = database
         if "dbname" in conf:
             conf["dbname"] = database
+
         return self
 
     def set_config(self, config):

velocity/db/core/table.py

@@ -1,3 +1,4 @@
+# table.py
 from velocity.db import exceptions
 from velocity.db.core.row import Row
 from velocity.db.core.result import Result
@@ -9,8 +10,13 @@ from velocity.db.core.decorators import (
 )
 
 
-class Query(str):
-    pass
+class Query:
+    def __init__(self, sql, params=()):
+        self.sql = sql
+        self.params = params
+
+    def __str__(self):
+        return self.sql
 
 
 class Table(object):

velocity/db/core/transaction.py

@@ -6,6 +6,7 @@ from velocity.db.core.column import Column
 from velocity.db.core.database import Database
 from velocity.db.core.sequence import Sequence
 from velocity.misc.db import randomword
+import traceback
 
 
 debug = False
@@ -29,6 +30,11 @@ class Transaction(object):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if exc_type:
+            if debug:
+                print("Transaction.__exit__")
+            tb_str = "".join(traceback.format_exception(exc_type, exc_val, exc_tb))
+            if debug:
+                print(tb_str)
             self.rollback()
         self.close()
 
@@ -206,3 +212,10 @@ class Transaction(object):
             result = self.execute(sql, vals)
             self.__pg_types = dict(result.as_tuple())
         return self.__pg_types
+
+    def switch_to_database(self, name):
+        if self.connection:
+            self.connection.close()
+            self.connection = None
+        self.engine.switch_to_database(name)
+        return self

velocity/db/servers/postgres.py

@@ -445,7 +445,7 @@ class SQL(object):
         trigger = "".format(name)
         sql = []
         if drop:
-            sql.append(cls.drop_table(fqtn))
+            sql.append(cls.drop_table(fqtn)[0])
         sql.append(
             """
             CREATE TABLE {0} (

velocity/misc/conv/iconv.py

@@ -83,7 +83,11 @@ def email(data: str) -> Optional[str]:
 
 def integer(data: str) -> int:
     """Converts a string to an integer, removing non-numeric characters."""
-    return int(re.sub(r"[^0-9\.-]", "", data))
+    cleaned_data = re.sub(r"[^0-9\.-]", "", data)
+    try:
+        return int(float(cleaned_data))
+    except ValueError:
+        raise ValueError(f"Cannot convert {data} to integer.")
 
 
 def boolean(data: Union[str, bool]) -> bool:

velocity/misc/conv/oconv.py

@@ -1,9 +1,11 @@
+# oconv.py
 import re
 import codecs
 import decimal
-from datetime import datetime, date, time
+import datetime
 from pprint import pformat
 from typing import Optional, Union, List, Callable
+import ast
 
 # Convert SQL data to JS format for display
 
@@ -36,7 +38,15 @@ def day_of_week(data: Union[int, str, List], abbrev: bool = False) -> str:
         6: "Saturday",
         7: "Sunday",
     }
-    days_abbrev = {1: "Mon", 2: "Tue", 3: "Wed", 4: "Thu", 5: "Fri", 6: "Sat", 7: "Sun"}
+    days_abbrev = {
+        1: "Mon",
+        2: "Tue",
+        3: "Wed",
+        4: "Thu",
+        5: "Fri",
+        6: "Sat",
+        7: "Sun",
+    }
     days = days_abbrev if abbrev else days_full
 
     if isinstance(data, list):
@@ -48,19 +58,29 @@ def day_of_week(data: Union[int, str, List], abbrev: bool = False) -> str:
         return ""
 
 
-def date(data: Union[datetime, date, str], fmt: str = "%Y-%m-%d") -> str:
+def date(
+    data: Union[datetime.datetime, datetime.date, str], fmt: str = "%Y-%m-%d"
+) -> str:
     """Formats a date object as a string according to the specified format."""
-    return data.strftime(fmt) if isinstance(data, (datetime, date)) else str(data)
+    return (
+        data.strftime(fmt)
+        if isinstance(data, (datetime.datetime, datetime.date))
+        else str(data)
+    )
 
 
-def time(data: Union[datetime, time, str], fmt: str = "%X") -> str:
+def time(data: Union[datetime.datetime, datetime.time, str], fmt: str = "%X") -> str:
     """Formats a time object as a string according to the specified format."""
-    return data.strftime(fmt) if isinstance(data, (datetime, time)) else str(data)
+    return (
+        data.strftime(fmt)
+        if isinstance(data, (datetime.datetime, datetime.time))
+        else str(data)
+    )
 
 
-def timestamp(data: Union[datetime, str], fmt: str = "%c") -> str:
+def timestamp(data: Union[datetime.datetime, str], fmt: str = "%c") -> str:
     """Formats a datetime object as a string according to the specified format."""
-    return data.strftime(fmt) if isinstance(data, datetime) else str(data)
+    return data.strftime(fmt) if isinstance(data, datetime.datetime) else str(data)
 
 
 def email(data: Optional[str]) -> str:
@@ -88,24 +108,29 @@ def boolean(data: Union[str, bool]) -> bool:
     return bool(data)
 
 
-def money(data: str) -> str:
-    """Formats a numeric string as currency."""
+def money(data: Union[str, float, int, decimal.Decimal]) -> str:
+    """Formats a numeric value as currency."""
     if data in [None, ""]:
         return ""
-    cleaned_data = re.sub(r"[^0-9\.-]", "", str(data))
-    return f"${decimal.Decimal(cleaned_data):,.2f}"
+    try:
+        amount = decimal.Decimal(str(data))
+        return f"${amount:,.2f}"
+    except (decimal.InvalidOperation, ValueError):
+        return ""
 
 
 def round_to(
     precision: int, data: Optional[Union[str, float, decimal.Decimal]] = None
-) -> Union[Callable, str]:
+) -> Union[Callable[[Union[str, float, decimal.Decimal]], str], str]:
     """Rounds a number to the specified precision."""
 
     def function(value):
-        cleaned_value = re.sub(r"[^0-9\.-]", "", str(value))
-        return (
-            f"{decimal.Decimal(cleaned_value):.{precision}f}" if cleaned_value else "0"
-        )
+        try:
+            amount = decimal.Decimal(str(value))
+            rounded = round(amount, precision)
+            return f"{rounded:.{precision}f}"
+        except (decimal.InvalidOperation, ValueError):
+            return "0"
 
     return function if data is None else function(data)
 
@@ -125,11 +150,15 @@ def to_list(data: Union[str, List]) -> Optional[List]:
         return None
     if isinstance(data, list):
         return data
-    if isinstance(data, str) and data.startswith("["):
-        try:
-            return eval(data)  # Be cautious with eval; only use if data is trusted
-        except (SyntaxError, NameError):
-            return None
+    if isinstance(data, str):
+        data = data.strip()
+        if data.startswith("[") and data.endswith("]"):
+            try:
+                return ast.literal_eval(data)
+            except (SyntaxError, ValueError):
+                return None
+        else:
+            return [data]
     return [data]
 
 
@@ -160,8 +189,9 @@ def padding(length: int, char: str) -> Callable[[str], str]:
 def pprint(data: str) -> str:
     """Pretty-prints a JSON-like string representation of data."""
     try:
-        return pformat(eval(data))
-    except (SyntaxError, NameError):
+        parsed_data = ast.literal_eval(data)
+        return pformat(parsed_data)
+    except (SyntaxError, ValueError):
         return data
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: velocity-python
-Version: 0.0.32
+Version: 0.0.34
 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 → velocity_python-0.0.34.dist-info}/RECORD

@@ -1,4 +1,4 @@
-velocity/__init__.py,sha256=8Xcz_RUYvy6ibGGQeUrwa-fEVzDMhSKe2ZnYgytCeTw,88
+velocity/__init__.py,sha256=hlMhCqzGev3NaHpaO6Uf0N-bpmP_fv3PUHIpqrGgInY,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
@@ -9,17 +9,17 @@ 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/decorators.py,sha256=HxlelX8BPuGz1T2owhZwHnLxHg5aywUgr1tXvg1zghQ,3326
+velocity/db/core/engine.py,sha256=yleohNqeqLfsTapOamKW-aiGxMooQPcR61p7vN9cCVo,14647
 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/core/table.py,sha256=0CvuhHWEMOC6I3_ycXGU35zzIxIipfj1XRpnzIiCPt8,19942
+velocity/db/core/transaction.py,sha256=S0ojO40u4Ads_QhofUYAXvHcvhs1W3ir2kyhe5d-btM,7067
 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/postgres.py,sha256=E8JRRVW3_YrpbmcYM-ZbVgk-BoVZajlWUr4Ni3KtQvg,42726
 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
@@ -30,10 +30,10 @@ 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/misc/conv/iconv.py,sha256=d3Vafl0xaMjWD3aeWDnfraOrLinAFjGRPqiozoRunio,5798
+velocity/misc/conv/oconv.py,sha256=WdyGhifokFkta6Q0jBc9z9dk34rU0htMR_e0eUY-Vyg,6018
+velocity_python-0.0.34.dist-info/LICENSE,sha256=aoN245GG8s9oRUU89KNiGTU4_4OtnNmVi4hQeChg6rM,1076
+velocity_python-0.0.34.dist-info/METADATA,sha256=HxyHJU7LxOIbkqWqp903MgxLEQgGtpJzk-BH-eH8d1Y,8522
+velocity_python-0.0.34.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+velocity_python-0.0.34.dist-info/top_level.txt,sha256=JW2vJPmodgdgSz7H6yoZvnxF8S3fTMIv-YJWCT1sNW0,9
+velocity_python-0.0.34.dist-info/RECORD,,