dmart 1.4.40.post8__py3-none-any.whl → 1.4.40.post10__py3-none-any.whl

dmart/dmart.py

@@ -732,30 +732,61 @@ def main():
                 print(f"Error initializing sample spaces: {e}")
                 sys.exit(1)
         case "migrate":
-            from alembic.config import Config
-            from alembic import command
-
+            import configparser
+            import tempfile
+            
             dmart_root = Path(__file__).resolve().parent
             alembic_ini_path = dmart_root / "alembic.ini"
-            alembic_cfg = Config(str(alembic_ini_path))
-            alembic_cfg.set_main_option("script_location", str(dmart_root / "alembic"))
+            
+            if not alembic_ini_path.exists():
+                print(f"Error: alembic.ini not found at {alembic_ini_path}")
+                sys.exit(1)
+
+            config = configparser.ConfigParser()
+            config.read(alembic_ini_path)
 
             if "sqlite" in settings.database_driver:
                 db_url = f"{settings.database_driver}:///{settings.database_name}"
             else:
                 db_url = f"{settings.database_driver}://{settings.database_username}:{settings.database_password}@{settings.database_host}:{settings.database_port}/{settings.database_name}"
 
-            alembic_cfg.set_main_option("sqlalchemy.url", db_url)
-            
-            # Add dmart package to sys.path to allow alembic to find models
-            sys.path.insert(0, str(dmart_root.parent))
+            config.set('alembic', 'sqlalchemy.url', db_url)
+            config.set('alembic', 'script_location', str(dmart_root / "alembic"))
+            config.set('alembic', 'prepend_sys_path', str(dmart_root.parent))
 
+            temp_config_path = ""
             try:
-                command.upgrade(alembic_cfg, "head")
-                print("Database migration completed successfully.")
-            except Exception as e:
-                print(f"Error during database migration: {e}")
-                sys.exit(1)
+                with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix=".ini") as temp_config_file:
+                    config.write(temp_config_file)
+                    temp_config_path = temp_config_file.name
+
+                alembic_cli_args = sys.argv[1:]
+                if not alembic_cli_args:
+                    alembic_cli_args = ["upgrade", "head"]
+
+                command = [sys.executable, "-m", "alembic", "-c", temp_config_path] + alembic_cli_args
+                
+                result = subprocess.run(command, capture_output=True, text=True, check=False)
+
+                if result.returncode == 0:
+                    print("Alembic command finished.")
+                    if result.stdout:
+                        print(result.stdout)
+                    if result.stderr:
+                        print(result.stderr)
+                else:
+                    print(f"Error during alembic command (exit code: {result.returncode}):")
+                    if result.stdout:
+                        print("--- stdout ---")
+                        print(result.stdout)
+                    if result.stderr:
+                        print("--- stderr ---")
+                        print(result.stderr)
+                    sys.exit(1)
+
+            finally:
+                if temp_config_path and os.path.exists(temp_config_path):
+                    os.remove(temp_config_path)
 
 if __name__ == "__main__":
     main()

{dmart-1.4.40.post8.dist-info → dmart-1.4.40.post10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 1.4.40.post8
+Version: 1.4.40.post10
 Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic
@@ -28,6 +28,7 @@ Requires-Dist: orjson
 Requires-Dist: prompt_toolkit
 Requires-Dist: rich
 Requires-Dist: requests
+Requires-Dist: alembic
 Provides-Extra: extra
 Requires-Dist: jsf; extra == "extra"
 Requires-Dist: types-psutil; extra == "extra"

{dmart-1.4.40.post8.dist-info → dmart-1.4.40.post10.dist-info}/RECORD

@@ -7,7 +7,7 @@ dmart/config.ini.sample,sha256=AADMdwG07zRV_cAGMoOorHQaqzTTL2WEIC_mPWjIslE,159
 dmart/conftest.py,sha256=0ry_zeCmdBNLbm5q115b-pkOrUFYxdsOUXbIMkr7E5Y,362
 dmart/curl.sh,sha256=lmHSFVr5ft-lc5Aq9LfvKyWfntrfYbnirhzx1EGjp_A,15743
 dmart/data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart/dmart.py,sha256=F2rw4410FIVrkG09fv385uAJAaLhLejbNTY_JjmtKVg,29557
+dmart/dmart.py,sha256=Jiw1lzo1r_xEo1JXlI_gsHMcgl6lPkT1ErQmphcCefw,30855
 dmart/get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 dmart/hypercorn_config.toml,sha256=-eryppEG8HBOM_KbFc4dTQePnpyfoW9ZG5aUATU_6yM,50
 dmart/info.json,sha256=u-MRDFZVj6_3IVamajI201LZqjNJLkGGr20IsyB4BtQ,123
@@ -482,8 +482,8 @@ dmart/utils/ticket_sys_utils.py,sha256=9QAlW2iiy8KyxQRBDj_WmzS5kKb0aYJmGwd4qzmGV
 dmart/utils/web_notifier.py,sha256=QM87VVid2grC5lK3NdS1yzz0z1wXljr4GChJOeK86W4,843
 dmart/utils/templates/activation.html.j2,sha256=XAMKCdoqONoc4ZQucD0yV-Pg5DlHHASZrTVItNS-iBE,640
 dmart/utils/templates/reminder.html.j2,sha256=aoS8bTs56q4hjAZKsb0jV9c-PIURBELuBOpT_qPZNVU,639
-dmart-1.4.40.post8.dist-info/METADATA,sha256=jOcpIysg1mVFbXRJsXwmfXHc_gJpFMZMbu2BKLI_H74,2531
-dmart-1.4.40.post8.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-dmart-1.4.40.post8.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.40.post8.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.40.post8.dist-info/RECORD,,
+dmart-1.4.40.post10.dist-info/METADATA,sha256=zmK0XLtfnmcQThoesQ22KKN7yCrJZxjgZ6UR9Lzkp0Y,2555
+dmart-1.4.40.post10.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+dmart-1.4.40.post10.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
+dmart-1.4.40.post10.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.40.post10.dist-info/RECORD,,