dmart 1.4.21__py3-none-any.whl → 1.4.23__py3-none-any.whl

{dmart-1.4.21.dist-info → dmart-1.4.23.dist-info}/METADATA

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

{dmart-1.4.21.dist-info → dmart-1.4.23.dist-info}/RECORD

@@ -1,6 +1,6 @@
 bundler.py,sha256=MDTUTVS0WL7gb-i1rDcS4i37KTqaW88TluL4L3rwjRw,1817
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=p5fLlsAoCtT9-2J34y8BE6vhkC5gHdXL9mc6nkAZGFQ,26230
+dmart.py,sha256=zgHBt-3kfKL4hCXmjK2CtNq0yTgEvrJH-53hETcvfJY,25688
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 info.json,sha256=hXQWl19lfMkEj_zXdehGeKjiKGNJ7emY4S7d4pIqJ1E,123
 main.py,sha256=KZGhIL6AnEm5ZAPy4IvhBDpzSTjuodilV7NafNOyhzM,19676
@@ -272,8 +272,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.21.dist-info/METADATA,sha256=tHgxO-v_yePlbzxXCXfIjDv8ubvItn2SkEBpgAPachk,2149
-dmart-1.4.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.21.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.21.dist-info/top_level.txt,sha256=S-gfX1pLerapNXiHZ8lvPYoV7sgwSX2_NCZ6xfzDUHM,267
-dmart-1.4.21.dist-info/RECORD,,
+dmart-1.4.23.dist-info/METADATA,sha256=ojXCy8URKygQ9ZaKcr98R76DD5QlBNsc7G3OTiQKmmc,2149
+dmart-1.4.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.23.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.23.dist-info/top_level.txt,sha256=S-gfX1pLerapNXiHZ8lvPYoV7sgwSX2_NCZ6xfzDUHM,267
+dmart-1.4.23.dist-info/RECORD,,

dmart.py

@@ -3,12 +3,14 @@ from __future__ import annotations
 
 import argparse
 import asyncio
+import configparser
 import json
 import os
 import shutil
 import ssl
 import subprocess
 import sys
+import tempfile
 import time
 import warnings
 import webbrowser
@@ -18,10 +20,9 @@ from pathlib import Path
 from hypercorn.config import Config
 from hypercorn.run import run
 
+# Try to import alembic
 try:
-    # Try to import alembic
     import alembic
-    
     # Check if we are importing the local alembic directory which is likely a leftover
     if hasattr(alembic, '__path__'):
         local_alembic_path = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'alembic'))
@@ -38,7 +39,10 @@ try:
                         import alembic
                     except Exception:
                         pass
+except ImportError:
+    pass
 
+try:
     from alembic import command as alembic_command
     from alembic.config import Config as AlembicConfig
     HAS_ALEMBIC = True
@@ -412,20 +416,6 @@ def hypercorn_main() -> int:
 
 
 def main():
-    # Use sys.argv directly instead of modifying it in place which might be confusing
-    # But to fix the UnboundLocalError, we just need to refer to the global sys module
-    # The error happens because we're assigning to sys.argv, making python think sys is local
-    # but we haven't imported it in this scope (it's imported at module level)
-    # However, in Python, module-level imports are available in functions.
-    # The issue is likely that we are assigning to sys.argv, which makes Python treat 'sys' as a local variable
-    # But wait, sys is imported at the top.
-    # Actually, the error "UnboundLocalError: cannot access local variable 'sys' where it is not associated with a value"
-    # suggests that there might be a local variable named 'sys' somewhere or something weird is happening.
-    # Ah, I see what happened. I added "import sys" inside the try/except block in the migrate case!
-    # That local import shadows the global import for the whole function scope in Python 3.x due to how scoping works.
-    
-    # Let's fix this by removing the local import of sys in the migrate case since it's already imported globally.
-    
     global sys
     
     args = sys.argv[1:]
@@ -459,10 +449,6 @@ def main():
                 import threading
                 threading.Thread(target=open_browser, daemon=True).start()
 
-            # We need to update sys.argv for hypercorn/fastapi if they use it, 
-            # but here we are calling asyncio.run(server()) which uses settings.
-            # hypercorn_main uses sys.argv, but we call it explicitly above.
-            # Let's just set sys.argv to the modified args just in case.
             sys.argv = [sys.argv[0]] + args
             asyncio.run(server())
         case "health-check":
@@ -474,7 +460,6 @@ def main():
             parser.add_argument("-s", "--space", help="hit the target space or pass (all) to make the full health check")
             parser.add_argument("-m", "--schemas", nargs="*", help="hit the target schema inside the space")
 
-            # parse_args defaults to sys.argv[1:], so we need to pass the relevant args
             args_parsed = parser.parse_args(args[1:])
             before_time = time.time()
             asyncio.run(health_check(args_parsed.type, args_parsed.space, args_parsed.schemas))
@@ -604,12 +589,29 @@ def main():
             try:
                 # Check if alembic library is installed
                 if not HAS_ALEMBIC:
-                    print("Error: 'alembic' library not found. Please install it with 'pip install alembic'.")
-                    if ALEMBIC_ERROR:
-                        print(f"Details: {ALEMBIC_ERROR}")
-                    print(f"Python executable: {sys.executable}")
-                    print(f"sys.path: {sys.path}")
-                    sys.exit(1)
+                    print("Warning: 'alembic' library not found. Attempting to run 'alembic' CLI...")
+                    
+                    with tempfile.NamedTemporaryFile(mode='w', suffix='.ini', delete=False) as tmp:
+                        temp_ini_path = tmp.name
+                        config = configparser.ConfigParser()
+                        config.read(str(original_ini_path))
+                        if not config.has_section('alembic'):
+                            config.add_section('alembic')
+                        config.set('alembic', 'script_location', alembic_dir.as_posix())
+                        config.write(tmp)
+                    
+                    try:
+                        subprocess.run(["alembic", "-c", temp_ini_path, "upgrade", "head"], check=True)
+                    except Exception as e:
+                        print(f"Error running alembic CLI: {e}")
+                        print("Please install 'alembic' library with 'pip install alembic'.")
+                        if ALEMBIC_ERROR:
+                            print(f"Details: {ALEMBIC_ERROR}")
+                        sys.exit(1)
+                    finally:
+                        if os.path.exists(temp_ini_path):
+                            os.unlink(temp_ini_path)
+                    return
 
                 alembic_cfg = AlembicConfig(str(original_ini_path))
                 alembic_cfg.set_main_option("script_location", alembic_dir.as_posix())