dmart 1.4.14__py3-none-any.whl → 1.4.16__py3-none-any.whl

bundler.py

@@ -36,9 +36,12 @@ args = [
     '--runtime-tmpdir=.',
     '--distpath=.',
     '--add-data=./info.json:.',
+    '--add-data=dmart_migrations:dmart_migrations',
+    '--add-data=alembic.ini:.',
     '--noconfirm',
     '--collect-submodules=concurrent_log_handler',
     '--collect-submodules=pythonjsonlogger',
+    '--collect-all=alembic',
     '--clean',
 ]
 

{dmart-1.4.14.dist-info → dmart-1.4.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 1.4.14
+Version: 1.4.16
 Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic

{dmart-1.4.14.dist-info → dmart-1.4.16.dist-info}/RECORD

@@ -1,7 +1,7 @@
 alembic.ini,sha256=zs8d8VhH9TRwZrPK697EZPBCfaKvI4SqTuGuG0FAm2Y,3747
-bundler.py,sha256=so8ZJResb1PcOH5vboa_mpFAdYr_T8u8DbbFXd570Lg,1704
+bundler.py,sha256=MDTUTVS0WL7gb-i1rDcS4i37KTqaW88TluL4L3rwjRw,1817
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=HHCKuf_JomcSCwWs2QWH4FKNhCZa-r5kgbk0r6vcAEQ,24117
+dmart.py,sha256=M6ALx41TSjzpcEczkx39aA9qdmWZk_CS2jRpU61-aEY,23288
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 info.json,sha256=hXQWl19lfMkEj_zXdehGeKjiKGNJ7emY4S7d4pIqJ1E,123
 main.py,sha256=KZGhIL6AnEm5ZAPy4IvhBDpzSTjuodilV7NafNOyhzM,19676
@@ -282,8 +282,8 @@ utils/ticket_sys_utils.py,sha256=9QAlW2iiy8KyxQRBDj_WmzS5kKb0aYJmGwd4qzmGVqo,700
 utils/web_notifier.py,sha256=QM87VVid2grC5lK3NdS1yzz0z1wXljr4GChJOeK86W4,843
 utils/templates/activation.html.j2,sha256=XAMKCdoqONoc4ZQucD0yV-Pg5DlHHASZrTVItNS-iBE,640
 utils/templates/reminder.html.j2,sha256=aoS8bTs56q4hjAZKsb0jV9c-PIURBELuBOpT_qPZNVU,639
-dmart-1.4.14.dist-info/METADATA,sha256=H9gFXc-9yiV-o41d2QeSLIcFWjIJn041SLM6Ktc5_oY,2069
-dmart-1.4.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.14.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.14.dist-info/top_level.txt,sha256=XELQhaIfj-qupnyBrir39qFRh8ncu1RXkCHeitzqLLg,275
-dmart-1.4.14.dist-info/RECORD,,
+dmart-1.4.16.dist-info/METADATA,sha256=Q_DCo5Avjc2w6n4CaUtDwCoiyzesOI9Ss3GZV-7n6OQ,2069
+dmart-1.4.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.16.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.16.dist-info/top_level.txt,sha256=XELQhaIfj-qupnyBrir39qFRh8ncu1RXkCHeitzqLLg,275
+dmart-1.4.16.dist-info/RECORD,,

dmart.py

@@ -18,6 +18,13 @@ from pathlib import Path
 from hypercorn.config import Config
 from hypercorn.run import run
 
+try:
+    from alembic import command as alembic_command
+    from alembic.config import Config as AlembicConfig
+    HAS_ALEMBIC = True
+except ImportError:
+    HAS_ALEMBIC = False
+
 from data_adapters.file.archive import archive
 from data_adapters.file.create_index import main as create_index
 from data_adapters.file.health_check import main as health_check
@@ -551,36 +558,16 @@ def main():
                 sys.exit(1)
 
             try:
-                # Check if alembic library is installed using importlib.metadata
-                import importlib.metadata
-                try:
-                    importlib.metadata.version('alembic')
-                except importlib.metadata.PackageNotFoundError:
+                # Check if alembic library is installed
+                if not HAS_ALEMBIC:
                     print("Error: 'alembic' library not found. Please install it with 'pip install alembic'.")
                     sys.exit(1)
 
-                import tempfile
-                import re
-                # Create a temporary alembic.ini to override script_location with absolute path
-                with tempfile.NamedTemporaryFile(mode='w', suffix='.ini', delete=False) as tf:
-                    with open(original_ini_path, 'r') as f:
-                        content = f.read()
-                    
-                    content = re.sub(r'^script_location\s*=.*$', f'script_location = {alembic_dir.as_posix()}', content, flags=re.MULTILINE)
-                    tf.write(content)
-                    temp_ini_path = tf.name
-
-                try:
-                    # Run alembic upgrade head
-                    result = subprocess.run(
-                        [sys.executable, "-m", "alembic", "-c", temp_ini_path, "upgrade", "head"],
-                        cwd=pkg_dir
-                    )
-                    if result.returncode != 0:
-                        sys.exit(result.returncode)
-                finally:
-                    if os.path.exists(temp_ini_path):
-                        os.unlink(temp_ini_path)
+                alembic_cfg = AlembicConfig(str(original_ini_path))
+                alembic_cfg.set_main_option("script_location", alembic_dir.as_posix())
+
+                # Run alembic upgrade head
+                alembic_command.upgrade(alembic_cfg, "head")
 
             except Exception as e:
                 print(f"Error running migration: {e}")