dmart 1.4.38__py3-none-any.whl → 1.4.39__py3-none-any.whl

dmart/dmart.py

@@ -420,9 +420,6 @@ def main():
         case "hyper":
             hypercorn_main()
         case "cli":
-            cli_path = Path(__file__).resolve().parent.parent / "cli"
-            sys.path.append(str(cli_path))
-            
             config_file = None
             if "--config" in sys.argv:
                 idx = sys.argv.index("--config")
@@ -438,12 +435,33 @@ def main():
                     home_config = Path.home() / ".dmart" / "config.ini"
                     if home_config.exists():
                         config_file = str(home_config)
-                    else:
-                        config_file = str(cli_path / "config.ini")
             
-            os.environ["BACKEND_ENV"] = config_file
-            import cli
-            cli.main()
+            if config_file:
+                os.environ["BACKEND_ENV"] = config_file
+            
+            # Try to find cli.py in the package or nearby
+            try:
+                import cli
+                cli.main()
+            except ImportError:
+                # Check if it's in the same directory as dmart.py (installed via MANIFEST.in)
+                dmart_dir = Path(__file__).resolve().parent
+                cli_path = dmart_dir / "cli.py"
+                if cli_path.exists():
+                    if str(dmart_dir) not in sys.path:
+                        sys.path.append(str(dmart_dir))
+                    import cli
+                    cli.main()
+                else:
+                    # Fallback for local development
+                    cli_path = dmart_dir.parent / "cli"
+                    if cli_path.exists():
+                        sys.path.append(str(cli_path))
+                        import cli
+                        cli.main()
+                    else:
+                        print("Error: cli.py not found.")
+                        sys.exit(1)
         case "serve":
             open_cxb = False
             if "--open-cxb" in sys.argv:

{dmart-1.4.38.dist-info → dmart-1.4.39.dist-info}/METADATA

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

{dmart-1.4.38.dist-info → dmart-1.4.39.dist-info}/RECORD

@@ -5,7 +5,7 @@ dmart/config.env.sample,sha256=CKd4KIBeUatoFcO2IefmrVNBohpaVMQMFcoPkNBvCeI,696
 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=K4r56p6yasr2_Imm7DrcH-Bk9oQS1q5palogrVKVRgU,23605
+dmart/dmart.py,sha256=Hmejqz79xFMJAJztnTEtqYm7XA1B1blIHryuZ48D8AI,24377
 dmart/get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 dmart/hypercorn_config.toml,sha256=-eryppEG8HBOM_KbFc4dTQePnpyfoW9ZG5aUATU_6yM,50
 dmart/info.json,sha256=5Yz4tc5dEt5eVrM2LzLhXgN8vGvE0aDbbbEEaGDsD5k,123
@@ -278,8 +278,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.38.dist-info/METADATA,sha256=F8fVK2mpN_Avfa2E3nJx8iuhiJ1W6SqF6530sWjz9Xo,2571
-dmart-1.4.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.38.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.38.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.38.dist-info/RECORD,,
+dmart-1.4.39.dist-info/METADATA,sha256=GZGdPHieT1FqO4Baoab0MvxcAUm3DNXsnywyPMH6c08,2571
+dmart-1.4.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.39.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
+dmart-1.4.39.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.39.dist-info/RECORD,,