velocity-python 0.1.56__tar.gz → 0.1.58__tar.gz

{velocity_python-0.1.56 → velocity_python-0.1.58}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.1.56
+Version: 0.1.58
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.1.56 → velocity_python-0.1.58}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "velocity-python"
-version = "0.1.56"
+version = "0.1.58"
 authors = [
   { name="Velocity Team", email="info@codeclubs.org" },
 ]

{velocity_python-0.1.56 → velocity_python-0.1.58}/src/velocity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = version = "0.1.56"
+__version__ = version = "0.1.58"
 
 import importlib as _importlib
 

{velocity_python-0.1.56 → velocity_python-0.1.58}/src/velocity/aws/assets/backfill.py

@@ -70,7 +70,16 @@ def backfill_asset_records(
     bucket: str,
     objects: Iterable[Mapping[str, Any]],
     head_loader: HeadLoader | None = None,
+    dry_run: bool = False,
 ) -> tuple[list[AssetRecord], AssetBackfillSummary]:
+    """Register missing S3 objects as ``images`` rows.
+
+    When ``dry_run`` is True no rows are written: the function still scans,
+    checks for existing rows, and builds the candidate records, and the returned
+    summary's ``inserted`` count reflects how many rows *would* be created. The
+    returned asset list holds the normalized would-be records. This lets a
+    runbook or the admin button preview a backfill before committing it.
+    """
     inserted_assets: list[AssetRecord] = []
     scanned = 0
     inserted = 0
@@ -91,8 +100,11 @@ def backfill_asset_records(
         if not row:
             skipped_unsupported += 1
             continue
-        tx.table("images").upsert(row, {"key": row["key"]})
         inserted += 1
+        if dry_run:
+            inserted_assets.append(normalize_asset_record(row))
+            continue
+        tx.table("images").upsert(row, {"key": row["key"]})
         stored = tx.table("images").find({"key": row["key"]})
         inserted_assets.append(normalize_asset_record(stored.to_dict() if stored else row))
 

{velocity_python-0.1.56 → velocity_python-0.1.58}/src/velocity/db/servers/mysql/__init__.py

@@ -1,4 +1,5 @@
 import os
+from velocity.aws.ssm_config import getenv as _getenv
 from ..base.initializer import BaseInitializer
 from velocity.db.core import engine
 from .sql import SQL
@@ -27,13 +28,13 @@ class MySQLInitializer(BaseInitializer):
                 "MySQL connector not available. Install with: pip install mysql-connector-python"
             )
 
-        # Base configuration from environment (if available)
+        # Base configuration from environment / SSM (same cascade as postgres)
         base_config = {
-            "database": os.environ.get("DBDatabase"),
-            "host": os.environ.get("DBHost"),
-            "port": os.environ.get("DBPort"),
-            "user": os.environ.get("DBUser"),
-            "password": os.environ.get("DBPassword"),
+            "database": _getenv("DBDatabase"),
+            "host": _getenv("DBHost"),
+            "port": _getenv("DBPort"),
+            "user": _getenv("DBUser"),
+            "password": _getenv("DBPassword"),
         }
 
         # Remove None values

{velocity_python-0.1.56 → velocity_python-0.1.58}/src/velocity/db/servers/sqlserver/__init__.py

@@ -1,4 +1,5 @@
 import os
+from velocity.aws.ssm_config import getenv as _getenv
 from ..base.initializer import BaseInitializer
 from velocity.db.core import engine
 from .sql import SQL
@@ -27,15 +28,13 @@ class SQLServerInitializer(BaseInitializer):
                 "SQL Server connector not available. Install with: pip install python-tds"
             )
 
-        # Base configuration from environment (if available)
+        # Base configuration from environment / SSM (same cascade as postgres)
         base_config = {
-            "database": os.environ.get("DBDatabase"),
-            "server": os.environ.get(
-                "DBHost"
-            ),  # SQL Server uses 'server' instead of 'host'
-            "port": os.environ.get("DBPort"),
-            "user": os.environ.get("DBUser"),
-            "password": os.environ.get("DBPassword"),
+            "database": _getenv("DBDatabase"),
+            "server": _getenv("DBHost"),  # SQL Server uses 'server' instead of 'host'
+            "port": _getenv("DBPort"),
+            "user": _getenv("DBUser"),
+            "password": _getenv("DBPassword"),
         }
 
         # Remove None values

{velocity_python-0.1.56 → velocity_python-0.1.58}/src/velocity_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: velocity-python
-Version: 0.1.56
+Version: 0.1.58
 Summary: A rapid application development library for interfacing with data storage
 Author-email: Velocity Team <info@codeclubs.org>
 License-Expression: MIT

{velocity_python-0.1.56 → velocity_python-0.1.58}/src/velocity_python.egg-info/SOURCES.txt

@@ -158,6 +158,7 @@ tests/test_concurrency_safety.py
 tests/test_connection_pool.py
 tests/test_connection_resilience.py
 tests/test_context_job_descriptions.py
+tests/test_db_credentials_ssm_cascade.py
 tests/test_decorators.py
 tests/test_dirty_pipeline_fast_path.py
 tests/test_email_processing.py

{velocity_python-0.1.56 → velocity_python-0.1.58}/tests/test_assets_service.py

@@ -299,6 +299,43 @@ def test_backfill_asset_records_skips_existing_and_thumbnail_objects():
     assert summary.skipped_unsupported == 1
 
 
+def test_backfill_asset_records_dry_run_reports_without_writing():
+    tx = FakeTx(
+        [
+            {
+                "sys_id": "img-1",
+                "bucket": "donate.resources",
+                "key": "client-a/existing.png",
+                "url": "https://donate.resources.s3.amazonaws.com/client-a/existing.png",
+                "public": True,
+            }
+        ]
+    )
+    objects = [
+        {"Key": "client-a/existing.png", "Size": 10, "ETag": '"a"'},
+        {"Key": "client-a/new.png", "Size": 11, "ETag": '"b"'},
+        {"Key": "client-a/new-thumb.png", "Size": 12, "ETag": '"c"'},
+    ]
+    rows_before = len(tx.images.rows)
+
+    inserted, summary = backfill_asset_records(
+        tx,
+        bucket="donate.resources",
+        objects=objects,
+        dry_run=True,
+    )
+
+    # Same accounting as a real run...
+    assert summary.scanned == 3
+    assert summary.inserted == 1
+    assert summary.skipped_existing == 1
+    assert summary.skipped_unsupported == 1
+    assert len(inserted) == 1
+    assert inserted[0].key == "client-a/new.png"
+    # ...but nothing was actually written.
+    assert len(tx.images.rows) == rows_before
+
+
 def _matches(row, where):
     for key, value in where.items():
         if key == "!%key":

velocity_python-0.1.58/tests/test_db_credentials_ssm_cascade.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+"""DB credential resolution must go through the SSM->env cascade (ssm_config.getenv),
+the same way the postgres initializer does, so MySQL/SQL Server work in SSM-only
+environments rather than only reading raw os.environ.
+"""
+
+import unittest
+from unittest.mock import MagicMock, patch
+
+from velocity.db.servers import mysql as mysql_server
+from velocity.db.servers import sqlserver as sqlserver_server
+
+FAKE = {
+    "DBDatabase": "ssm_db",
+    "DBHost": "ssm_host",
+    "DBPort": "5599",
+    "DBUser": "ssm_user",
+    "DBPassword": "ssm_pass",
+}
+
+
+class TestDbCredentialsSsmCascade(unittest.TestCase):
+    def test_mysql_resolves_credentials_via_getenv(self):
+        captured = {}
+
+        def fake_engine(driver, cfg, sql, **kwargs):
+            captured.update(cfg)
+            return MagicMock()
+
+        with patch.object(mysql_server, "_getenv", lambda key: FAKE.get(key)), patch.object(
+            mysql_server.engine, "Engine", fake_engine
+        ):
+            mysql_server.MySQLInitializer.initialize(None)
+
+        self.assertEqual(captured["database"], "ssm_db")
+        self.assertEqual(captured["host"], "ssm_host")
+        self.assertEqual(captured["port"], "5599")
+        self.assertEqual(captured["user"], "ssm_user")
+        self.assertEqual(captured["password"], "ssm_pass")
+
+    def test_sqlserver_resolves_credentials_via_getenv(self):
+        captured = {}
+
+        def fake_engine(driver, cfg, sql, **kwargs):
+            captured.update(cfg)
+            return MagicMock()
+
+        with patch.object(
+            sqlserver_server, "_getenv", lambda key: FAKE.get(key)
+        ), patch.object(sqlserver_server.engine, "Engine", fake_engine):
+            sqlserver_server.SQLServerInitializer.initialize(None)
+
+        self.assertEqual(captured["database"], "ssm_db")
+        self.assertEqual(captured["server"], "ssm_host")  # SQL Server uses 'server'
+        self.assertEqual(captured["port"], "5599")
+        self.assertEqual(captured["user"], "ssm_user")
+        self.assertEqual(captured["password"], "ssm_pass")
+
+
+if __name__ == "__main__":
+    unittest.main()