dmart 1.4.29__py3-none-any.whl → 1.4.31__py3-none-any.whl

{dmart-1.4.29.dist-info → dmart-1.4.31.dist-info}/METADATA

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

{dmart-1.4.29.dist-info → dmart-1.4.31.dist-info}/RECORD

@@ -1,6 +1,6 @@
 bundler.py,sha256=MDTUTVS0WL7gb-i1rDcS4i37KTqaW88TluL4L3rwjRw,1817
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=4i-P3AQTzWlv0LUJdvqDnS2ehHYv8vCv4hXPdxsQ8DQ,23713
+dmart.py,sha256=9tM6DmJUzkngTYWdnG96-yuuqMmMmqxVrEYmvsFYLOE,24445
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 main.py,sha256=KZGhIL6AnEm5ZAPy4IvhBDpzSTjuodilV7NafNOyhzM,19676
 migrate.py,sha256=hn1MZoVby_Jjqhc7y3CrLcGD619QmVZv3PONNvO7VKQ,665
@@ -271,8 +271,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.29.dist-info/METADATA,sha256=TZXo15S93DzXvwBhQPAb9Wmj3HmQvFFJpCVJjQVCNgA,2149
-dmart-1.4.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.29.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.29.dist-info/top_level.txt,sha256=S-gfX1pLerapNXiHZ8lvPYoV7sgwSX2_NCZ6xfzDUHM,267
-dmart-1.4.29.dist-info/RECORD,,
+dmart-1.4.31.dist-info/METADATA,sha256=r47mM-P3jUNVgvsZ8mmT6GTPQE2oOmNkcwAD25B85lk,2149
+dmart-1.4.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.31.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.31.dist-info/top_level.txt,sha256=S-gfX1pLerapNXiHZ8lvPYoV7sgwSX2_NCZ6xfzDUHM,267
+dmart-1.4.31.dist-info/RECORD,,

dmart.py

@@ -21,14 +21,19 @@ from hypercorn.config import Config
 from hypercorn.run import run
 
 # Try to import alembic
-try:
-    from alembic import command as alembic_command
-    from alembic.config import Config as AlembicConfig
-    HAS_ALEMBIC = True
-    ALEMBIC_ERROR = None
-except ImportError as e:
-    HAS_ALEMBIC = False
-    ALEMBIC_ERROR = e
+# Global variable for alembic status
+ALEMBIC_ERROR = None
+
+def get_alembic():
+    global ALEMBIC_ERROR
+    try:
+        from alembic import command as alembic_command
+        from alembic.config import Config as AlembicConfig
+        return alembic_command, AlembicConfig
+    except ImportError as e:
+        import sys
+        ALEMBIC_ERROR = f"{e}\nDebug info: sys.path={sys.path}"
+        return None, None
 
 from data_adapters.file.archive import archive
 from data_adapters.file.create_index import main as create_index
@@ -395,8 +400,6 @@ def hypercorn_main() -> int:
 
 
 def main():
-    global sys
-    
     args = sys.argv[1:]
     if len(args) == 0:
         print("You must provide a command to run:")
@@ -553,9 +556,17 @@ def main():
             
             # Try to find migrations directory
             alembic_dir = pkg_dir / "dmart_migrations"
-            if not alembic_dir.exists():
+            if not (alembic_dir / "env.py").exists():
                 # Fallback to alembic for backward compatibility
-                alembic_dir = pkg_dir / "alembic"
+                # only if it contains env.py (to avoid picking up the alembic library itself)
+                fallback_dir = pkg_dir / "alembic"
+                if (fallback_dir / "env.py").exists():
+                    alembic_dir = fallback_dir
+            
+            if not alembic_dir.exists() or not (alembic_dir / "env.py").exists():
+                print(f"Error: Migration directory not found in {pkg_dir}")
+                print(f"Looked for 'dmart_migrations' or 'alembic' folder containing 'env.py'")
+                sys.exit(1)
             
             # Look for alembic.ini in the package directory or migrations directory
             ini_path = pkg_dir / "alembic.ini"
@@ -568,7 +579,8 @@ def main():
 
             try:
                 # Check if alembic library is installed
-                if not HAS_ALEMBIC:
+                alembic_command, AlembicConfig = get_alembic()
+                if not alembic_command:
                     print(f"Error: 'alembic' library not found. {ALEMBIC_ERROR}")
                     print("Please install 'alembic' library with 'pip install alembic'.")
                     sys.exit(1)