velocity-python 0.0.240__tar.gz → 0.1.2__tar.gz

{velocity_python-0.0.240 → velocity_python-0.1.2}/PKG-INFO

@@ -1,54 +1,59 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.0.240
+Version: 0.1.2
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT
 Project-URL: Homepage, https://codeclubs.org/projects/velocity
 Keywords: database,orm,sql,rapid-development,data-storage
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Database
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.7
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: boto3>=1.26.0
-Requires-Dist: requests>=2.25.0
-Requires-Dist: jinja2>=3.0.0
-Requires-Dist: xlrd>=2.0.0
-Requires-Dist: openpyxl>=3.0.0
-Requires-Dist: sqlparse>=0.4.0
+Requires-Dist: sqlparse>=0.5.0
+Provides-Extra: aws
+Requires-Dist: boto3>=1.35.0; extra == "aws"
+Requires-Dist: requests>=2.32.0; extra == "aws"
+Provides-Extra: excel
+Requires-Dist: openpyxl>=3.1.0; extra == "excel"
+Provides-Extra: templates
+Requires-Dist: jinja2>=3.1.0; extra == "templates"
+Provides-Extra: http
+Requires-Dist: requests>=2.32.0; extra == "http"
 Provides-Extra: mysql
-Requires-Dist: mysql-connector-python>=8.0.0; extra == "mysql"
+Requires-Dist: mysql-connector-python>=9.0.0; extra == "mysql"
 Provides-Extra: sqlserver
-Requires-Dist: python-tds>=1.10.0; extra == "sqlserver"
+Requires-Dist: python-tds>=1.15.0; extra == "sqlserver"
 Provides-Extra: postgres
-Requires-Dist: psycopg2-binary>=2.9.0; extra == "postgres"
+Requires-Dist: psycopg[binary]>=3.2.0; extra == "postgres"
 Provides-Extra: payment
-Requires-Dist: stripe>=8.0.0; extra == "payment"
-Requires-Dist: braintree>=4.0.0; extra == "payment"
+Requires-Dist: stripe>=12.0.0; extra == "payment"
+Requires-Dist: braintree>=4.30.0; extra == "payment"
+Provides-Extra: all
+Requires-Dist: velocity-python[aws,excel,http,payment,postgres,templates]; extra == "all"
 Provides-Extra: dev
-Requires-Dist: pytest>=7.0.0; extra == "dev"
-Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
-Requires-Dist: black>=23.0.0; extra == "dev"
-Requires-Dist: flake8>=6.0.0; extra == "dev"
-Requires-Dist: mypy>=1.0.0; extra == "dev"
-Requires-Dist: pre-commit>=3.0.0; extra == "dev"
+Requires-Dist: pytest>=8.0.0; extra == "dev"
+Requires-Dist: pytest-cov>=6.0.0; extra == "dev"
+Requires-Dist: black>=24.0.0; extra == "dev"
+Requires-Dist: flake8>=7.0.0; extra == "dev"
+Requires-Dist: mypy>=1.10.0; extra == "dev"
+Requires-Dist: pre-commit>=4.0.0; extra == "dev"
 Provides-Extra: test
-Requires-Dist: pytest>=7.0.0; extra == "test"
-Requires-Dist: pytest-cov>=4.0.0; extra == "test"
-Requires-Dist: pytest-mock>=3.10.0; extra == "test"
+Requires-Dist: pytest>=8.0.0; extra == "test"
+Requires-Dist: pytest-cov>=6.0.0; extra == "test"
+Requires-Dist: pytest-mock>=3.14.0; extra == "test"
 Provides-Extra: docs
-Requires-Dist: sphinx>=5.0.0; extra == "docs"
-Requires-Dist: sphinx-rtd-theme>=1.2.0; extra == "docs"
+Requires-Dist: sphinx>=8.0.0; extra == "docs"
+Requires-Dist: sphinx-rtd-theme>=3.0.0; extra == "docs"
 Dynamic: license-file
 
 # Velocity

{velocity_python-0.0.240 → velocity_python-0.1.2}/pyproject.toml

@@ -4,70 +4,80 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "velocity-python"
-version = "0.0.240"
+version = "0.1.2"
 authors = [
   { name="Velocity Team", email="info@codeclubs.org" },
 ]
 description = "A rapid application development library for interfacing with data storage"
 readme = "README.md"
 license = "MIT"
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 keywords = ["database", "orm", "sql", "rapid-development", "data-storage"]
 classifiers = [
-    "Development Status :: 3 - Alpha",
+    "Development Status :: 4 - Beta",
     "Intended Audience :: Developers",
     "Topic :: Database",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
 dependencies = [
-  "boto3>=1.26.0",
-  "requests>=2.25.0",
-  "jinja2>=3.0.0",
-  "xlrd>=2.0.0",
-  "openpyxl>=3.0.0",
-  "sqlparse>=0.4.0"
+  "sqlparse>=0.5.0"
 ]
 
 [project.urls]
 Homepage = "https://codeclubs.org/projects/velocity"
 
 [project.optional-dependencies]
+aws = [
+  "boto3>=1.35.0",
+  "requests>=2.32.0",
+]
+excel = [
+  "openpyxl>=3.1.0",
+]
+templates = [
+  "jinja2>=3.1.0",
+]
+http = [
+  "requests>=2.32.0",
+]
 mysql = [
-  "mysql-connector-python>=8.0.0",
+  "mysql-connector-python>=9.0.0",
 ]
 sqlserver = [
-  "python-tds>=1.10.0",
+  "python-tds>=1.15.0",
 ]
 postgres = [
-  "psycopg2-binary>=2.9.0",
+  "psycopg[binary]>=3.2.0",
 ]
 payment = [
-  "stripe>=8.0.0",
-  "braintree>=4.0.0",
+  "stripe>=12.0.0",
+  "braintree>=4.30.0",
+]
+all = [
+  "velocity-python[postgres,aws,excel,templates,http,payment]",
 ]
 dev = [
-  "pytest>=7.0.0",
-  "pytest-cov>=4.0.0",
-  "black>=23.0.0",
-  "flake8>=6.0.0",
-  "mypy>=1.0.0",
-  "pre-commit>=3.0.0",
+  "pytest>=8.0.0",
+  "pytest-cov>=6.0.0",
+  "black>=24.0.0",
+  "flake8>=7.0.0",
+  "mypy>=1.10.0",
+  "pre-commit>=4.0.0",
 ]
 test = [
-  "pytest>=7.0.0",
-  "pytest-cov>=4.0.0",
-  "pytest-mock>=3.10.0",
+  "pytest>=8.0.0",
+  "pytest-cov>=6.0.0",
+  "pytest-mock>=3.14.0",
 ]
 docs = [
-  "sphinx>=5.0.0",
-  "sphinx-rtd-theme>=1.2.0",
+  "sphinx>=8.0.0",
+  "sphinx-rtd-theme>=3.0.0",
 ]
 
 [tool.setuptools.packages.find]
@@ -78,7 +88,7 @@ where = ["src"]
 
 [tool.black]
 line-length = 88
-target-version = ['py37', 'py38', 'py39', 'py310', 'py311']
+target-version = ['py39', 'py310', 'py311', 'py312']
 include = '\.pyi?$'
 extend-exclude = '''
 /(
@@ -122,7 +132,7 @@ module = [
     "boto3.*",
   "env",
   "pytds.*",
-    "psycopg2.*",
+    "psycopg.*",
   "requests.*",
   "sqlparse.*",
   "stripe.*",

velocity_python-0.1.2/src/velocity/__init__.py

@@ -0,0 +1,17 @@
+__version__ = version = "0.1.2"
+
+import importlib as _importlib
+
+from . import db
+from . import misc
+from . import app
+
+__all__ = ["aws", "db", "misc", "app"]
+
+_LAZY_SUBMODULES = {"aws"}
+
+
+def __getattr__(name: str):
+    if name in _LAZY_SUBMODULES:
+        return _importlib.import_module(f".{name}", __name__)
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

{velocity_python-0.0.240 → velocity_python-0.1.2}/src/velocity/app/formbuilder/reshaper.py

@@ -169,6 +169,8 @@ def reshape_formbuilder_template(raw_row: Dict[str, Any]) -> Dict[str, Any]:
             del fb[key]
 
     for key in (
+        # UI-only computed column (row counter) — never a real DB column
+        "row_number",
         "url_slug",
         "url_slug_alternate",
         # Administrative / validation metadata — not read by DonateMain frontend

{velocity_python-0.0.240 → velocity_python-0.1.2}/src/velocity/aws/__init__.py

@@ -1,15 +1,5 @@
+import importlib as _importlib
 import os
-import requests
-
-from velocity.aws.amplify import AmplifyProject
-from velocity.aws.amplify_build import (
-    BackendDeploymentConfig,
-    build_environment_variables,
-    get_amplify_app_id_and_branch,
-    initialize_build_environment,
-    run_backend_deployment,
-    update_lambda_layers_to_latest,
-)
 
 DEBUG = (os.environ.get("ENV") != "production") or (os.environ.get("DEBUG") == "Y")
 
@@ -23,11 +13,31 @@ class AWS(object):
     # Get AWS EC2 Instance ID. Must run this from the EC2 instance itself to get the ID
     @staticmethod
     def instance_id(cls):
+        import requests
         response = requests.get("http://169.254.169.254/latest/meta-data/instance-id")
         instance_id = response.text
         return instance_id
 
 
+# Lazy-load heavy modules (boto3-dependent) on first access
+_LAZY_ATTRS = {
+    "AmplifyProject": "velocity.aws.amplify",
+    "BackendDeploymentConfig": "velocity.aws.amplify_build",
+    "build_environment_variables": "velocity.aws.amplify_build",
+    "get_amplify_app_id_and_branch": "velocity.aws.amplify_build",
+    "initialize_build_environment": "velocity.aws.amplify_build",
+    "run_backend_deployment": "velocity.aws.amplify_build",
+    "update_lambda_layers_to_latest": "velocity.aws.amplify_build",
+}
+
+
+def __getattr__(name: str):
+    if name in _LAZY_ATTRS:
+        module = _importlib.import_module(_LAZY_ATTRS[name])
+        return getattr(module, name)
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
 __all__ = [
     "AmplifyProject",
     "AWS",

{velocity_python-0.0.240 → velocity_python-0.1.2}/src/velocity/aws/handlers/base_handler.py

@@ -335,7 +335,7 @@ class BaseHandler:
         """Return True if an exception looks like a transient DB disconnect.
 
         This is intentionally message-based so it works even if the originating
-        exception type comes from psycopg2 / SQLAlchemy / wrapped Velocity errors.
+        exception type comes from psycopg / SQLAlchemy / wrapped Velocity errors.
         """
         if exc is None and args:
             exc = args[0]

{velocity_python-0.0.240 → velocity_python-0.1.2}/src/velocity/aws/handlers/mixins/web_handler.py

@@ -217,7 +217,7 @@ class WebHandler(ABC):
         return sanitized
 
     def _normalize_activity_value(self, value: Any) -> Any:
-        """Convert values into types acceptable by psycopg2"""
+        """Convert values into types acceptable by the database driver."""
         if isinstance(value, (dict, list, tuple, set)):
             try:
                 return json.dumps(value)

{velocity_python-0.0.240 → velocity_python-0.1.2}/src/velocity/aws/handlers/sqs_handler.py

@@ -2,7 +2,8 @@
 SQS Handler Module
 
 This module provides a base class for handling AWS SQS events in Lambda functions.
-It includes logging capabilities, action routing, and error handling.
+It includes per-record transaction isolation, partial batch failure reporting
+via ``batchItemFailures``, and error handling hooks.
 """
 
 import json
@@ -22,8 +23,11 @@ class SqsHandler(BaseHandler):
     """
     Base class for handling SQS events in AWS Lambda functions.
 
-    Provides structured processing of SQS records with automatic action routing,
-    logging capabilities, and error handling hooks.
+    Each SQS record is processed in its own database transaction.  If a record
+    fails, the transaction is rolled back and the record's ``messageId`` is
+    included in the ``batchItemFailures`` response so that SQS retries only
+    the failed records.  Successful records are deleted from the queue
+    automatically.
     """
 
     def __init__(
@@ -33,14 +37,6 @@ class SqsHandler(BaseHandler):
         context_factory: Optional[ContextFactory] = None,
         context_class=VelocityContext.Context,
     ):
-        """
-        Initialize the SQS handler.
-
-        Args:
-            aws_event: The AWS Lambda event containing SQS records
-            aws_context: The AWS Lambda context object
-            context_class: The context class to use for processing
-        """
         super().__init__(
             aws_event,
             aws_context,
@@ -50,28 +46,40 @@ class SqsHandler(BaseHandler):
 
     def serve(self, tx):
         """
-        Process all SQS records in the event.
+        Process all SQS records, each in its own transaction.
 
-        Args:
-            tx: Database transaction object
+        Returns a ``batchItemFailures`` response so that only failed records
+        are retried by SQS.  When all records succeed the return value is
+        ``None`` (no failures to report).
         """
         records = self.aws_event.get("Records", [])
+        if not records:
+            return None
+
+        engine = tx.engine
+        failures = []
 
         for record in records:
-            self._process_record(tx, record)
+            message_id = record.get("messageId")
+            try:
+                with engine.transaction() as record_tx:
+                    self._process_record(record_tx, record)
+            except Exception as exc:
+                self.on_record_error(record, exc)
+                if message_id:
+                    failures.append({"itemIdentifier": message_id})
+
+        if failures:
+            return {"batchItemFailures": failures}
+        return None
 
     def _process_record(self, tx, record: Dict[str, Any]):
         """
         Process a single SQS record.
-
-        Args:
-            tx: Database transaction object
-            record: Individual SQS record to process
         """
         attrs = record.get("attributes", {})
         postdata = {}
 
-        # Parse message body if present
         body = record.get("body")
         if body:
             try:
@@ -80,7 +88,6 @@ class SqsHandler(BaseHandler):
                 logger.warning("Failed to parse SQS message body as JSON: %s", e)
                 postdata = {"raw_body": body}
 
-        # Create local context for this record
         local_context = self.create_context(
             args=attrs,
             postdata=postdata,
@@ -90,26 +97,51 @@ class SqsHandler(BaseHandler):
         if hasattr(local_context, "configure_perf"):
             local_context.configure_perf(postdata=postdata)
 
-        # Determine action from postdata
         action = postdata.get("action") if isinstance(postdata, dict) else None
-
-        # Get the list of actions to execute
         actions = self.get_actions_to_execute(action)
 
-        # Use BaseHandler's execute_actions method
         try:
             self.execute_actions(tx, local_context, actions)
         except Exception as e:
+            # Roll back failed DB state so handle_error/onError get a usable tx.
+            try:
+                tx.rollback()
+            except Exception:
+                pass
             self.handle_error(tx, local_context, e)
 
-    def OnActionDefault(self, tx, context):
+    def on_record_error(self, record, exception):
+        """
+        Called when a record fails and will be reported in
+        ``batchItemFailures``.  Override in subclasses for custom behaviour
+        (e.g. alerting, metrics).
         """
-        Default action handler when no specific action is found.
+        message_id = record.get("messageId", "unknown")
+        receive_count = record.get("attributes", {}).get(
+            "ApproximateReceiveCount", "0"
+        )
+        logger.error(
+            "SQS record %s failed (receive count: %s): %s",
+            message_id,
+            receive_count,
+            exception,
+        )
 
-        Args:
-            tx: Database transaction object
-            context: The context object for this record
+    @staticmethod
+    def is_dlq_candidate(record, max_receives=5):
         """
+        Return ``True`` if the record has been received *max_receives* or more
+        times, indicating it is likely headed for the dead-letter queue.
+
+        The actual DLQ routing is controlled by the SQS redrive policy;
+        this helper is for logging and metrics.
+        """
+        receive_count = int(
+            record.get("attributes", {}).get("ApproximateReceiveCount", "0")
+        )
+        return receive_count >= max_receives
+
+    def OnActionDefault(self, tx, context):
         action = context.action() if hasattr(context, "action") else "unknown"
         warning_message = (
             f"[Warn] Action handler not found. Calling default action "

{velocity_python-0.0.240 → velocity_python-0.1.2}/src/velocity/db/core/database.py

@@ -93,12 +93,12 @@ class Database:
         Performs VACUUM on this database, optionally FULL, optionally ANALYZE,
         optionally REINDEX.
         """
-        # Manually open a separate connection to run VACUUM in isolation_level=0
+        # Manually open a separate connection to run VACUUM outside a transaction.
         conn = self.tx.engine.connect()
-        old_isolation_level = conn.isolation_level
+        old_autocommit = conn.autocommit
         try:
-            # Postgres requires VACUUM to run outside a normal transaction block
-            conn.set_isolation_level(0)
+            # Postgres requires VACUUM to run outside a normal transaction block.
+            conn.autocommit = True
 
             # Build up the VACUUM command
             parts = ["VACUUM"]
@@ -116,6 +116,6 @@ class Database:
                     cur.execute(f"REINDEX DATABASE {self.name}")
 
         finally:
-            # Restore isolation level and close the connection
-            conn.set_isolation_level(old_isolation_level)
+            # Restore autocommit state and close the connection
+            conn.autocommit = old_autocommit
             conn.close()

{velocity_python-0.0.240 → velocity_python-0.1.2}/src/velocity/db/core/decorators.py

@@ -60,6 +60,7 @@ def reset_id_on_dup_key(func):
 
     @wraps(func)
     def reset_decorator(self, *args, retries=0, **kwds):
+        max_retries = 10
         sp = self.tx.create_savepoint(cursor=self.cursor())
         try:
             result = func(self, *args, **kwds)
@@ -71,7 +72,7 @@ def reset_id_on_dup_key(func):
                 raise
             if not _is_primary_key_duplicate(error):
                 raise
-            if retries < 3:
+            if retries < max_retries:
                 backoff_time = (2**retries) * 0.01 + random.uniform(0, 0.02)
                 time.sleep(backoff_time)
                 self.set_sequence(self.max("sys_id") + 1)
@@ -145,6 +146,11 @@ def create_missing(func):
     """
     If the function call fails with DbColumnMissingError or DbTableMissingError,
     tries to create them and re-run (only if schema is not locked).
+
+    DDL operations use IF NOT EXISTS at the SQL level, but concurrent Lambdas
+    may still race.  If the CREATE/ALTER raises ``DbObjectExistsError`` we
+    silently ignore it (the object was created by another process) and retry
+    the original operation.
     """
 
     @wraps(func)
@@ -172,7 +178,21 @@ def create_missing(func):
             for i, arg in enumerate(args):
                 if isinstance(arg, dict):
                     data.update(arg)
-            self.alter(data, mode="add")
+
+            # ALTER TABLE ADD COLUMN IF NOT EXISTS — acquire an advisory
+            # lock to serialize DDL across concurrent Lambda containers,
+            # then guard against any remaining race with a savepoint.
+            try:
+                self.tx.advisory_lock(f"velocity_ddl_{self.name}")
+            except Exception:
+                pass  # advisory lock is best-effort (e.g. non-PostgreSQL)
+            sp2 = self.tx.create_savepoint(cursor=self.cursor())
+            try:
+                self.alter(data, mode="add")
+                self.tx.release_savepoint(sp2, cursor=self.cursor())
+            except exceptions.DbObjectExistsError:
+                self.tx.rollback_savepoint(sp2, cursor=self.cursor())
+
             return func(self, *args, **kwds)
         except exceptions.DbTableMissingError as e:
             self.tx.rollback_savepoint(sp, cursor=self.cursor())
@@ -192,7 +212,20 @@ def create_missing(func):
             for i, arg in enumerate(args):
                 if isinstance(arg, dict):
                     data.update(arg)
-            self.create(data)
+
+            # CREATE TABLE IF NOT EXISTS — acquire advisory lock then
+            # guard against concurrent creation with a savepoint.
+            try:
+                self.tx.advisory_lock(f"velocity_ddl_{self.name}")
+            except Exception:
+                pass  # advisory lock is best-effort
+            sp2 = self.tx.create_savepoint(cursor=self.cursor())
+            try:
+                self.create(data)
+                self.tx.release_savepoint(sp2, cursor=self.cursor())
+            except exceptions.DbObjectExistsError:
+                self.tx.rollback_savepoint(sp2, cursor=self.cursor())
+
             return func(self, *args, **kwds)
 
     return wrapper