dmart 1.4.40.post1__py3-none-any.whl → 1.4.40.post2__py3-none-any.whl

dmart/cli.py

@@ -932,8 +932,7 @@ def action(text: str):
                             idx += 1
                     finally:
                         termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
-                        return None
-                # c = input("q: quite, b: previous, n: next = ")
+                    # c = input("q: quite, b: previous, n: next = ")
             # print(tree)
             dmart.current_space, dmart.current_subpath = old_space, old_subpath
             dmart.list()
@@ -988,8 +987,8 @@ def _(event):
     event.current_buffer.validate_and_handle()
 
 
-if __name__ == "__main__":
-    try :
+def main():
+    try:
         # print(Panel.fit("For help, type : [bold]?[/]", title="DMart Cli"))
         print("[bold][green]DMART[/] [yellow]Command line interface[/][/]")
         print(
@@ -1019,6 +1018,7 @@ if __name__ == "__main__":
             key_bindings=key_bindings
         )
 
+        global mode
         if len(sys.argv) >= 2:
             if sys.argv[1] == "s":
                 mode = CLI_MODE.SCRIPT
@@ -1031,8 +1031,34 @@ if __name__ == "__main__":
                 else:
                     check_update_space(sys.argv[2])
                     del sys.argv[2]
-            del sys.argv[0]
-            del sys.argv[0]
+                del sys.argv[0]
+                del sys.argv[0]
+            elif sys.argv[1] == "cli":
+                # When called via 'dmart cli ...'
+                if len(sys.argv) >= 3:
+                    if sys.argv[2] == "s":
+                        mode = CLI_MODE.SCRIPT
+                        del sys.argv[0] # dmart
+                        del sys.argv[0] # cli
+                        del sys.argv[0] # s
+                    elif sys.argv[2] == "c":
+                        mode = CLI_MODE.CMD
+                        if len(sys.argv) >= 5 and sys.argv[4].startswith("/"):
+                            check_update_space(sys.argv[3], sys.argv[4])
+                            del sys.argv[3]
+                            del sys.argv[3]
+                        elif len(sys.argv) >= 4:
+                            check_update_space(sys.argv[3])
+                            del sys.argv[3]
+                        del sys.argv[0] # dmart
+                        del sys.argv[0] # cli
+                        del sys.argv[0] # c
+                else:
+                    del sys.argv[0]
+                    del sys.argv[0]
+            else:
+                del sys.argv[0]
+                del sys.argv[0]
 
         if mode == CLI_MODE.CMD:
             print(sys.argv)
@@ -1099,5 +1125,9 @@ if __name__ == "__main__":
             # else:
             #    print('You entered:', repr(text))
         print("[yellow]Good bye![/]")
-    except requests.exceptions.ConnectionError as _ : 
-        print("[yellow]Connection error[/]")
+    except requests.exceptions.ConnectionError as _ :
+        print("[yellow]Connection error[/]")
+
+
+if __name__ == "__main__":
+    main()

dmart/dmart.py

@@ -440,6 +440,7 @@ def main():
                 os.environ["BACKEND_ENV"] = config_file
             
             # Try to find cli.py in the package or nearby
+            last_import_error = None
             try:
                 # When installed as a package, cli.py is in the same directory as dmart.py
                 dmart_dir = Path(__file__).resolve().parent
@@ -447,20 +448,38 @@ def main():
                     sys.path.append(str(dmart_dir))
                 import cli
                 cli.main()
-            except (ImportError, AttributeError):
-                # Fallback for local development
-                cli_path = Path(__file__).resolve().parent.parent / "cli"
-                if cli_path.exists():
-                    sys.path.append(str(cli_path))
-                    try:
-                        import cli
-                        cli.main()
-                    except (ImportError, AttributeError):
-                        print("Error: cli.py found but main() not found or import failed.")
+                return
+            except ImportError as e:
+                last_import_error = e
+                if e.name and e.name != 'cli':
+                    print(f"Error: Missing dependency for CLI: {e}")
+                    sys.exit(1)
+            except Exception as e:
+                print(f"Error: Failed to start CLI: {e}")
+                sys.exit(1)
+
+            # Fallback for local development
+            cli_path = Path(__file__).resolve().parent.parent / "cli"
+            if cli_path.exists():
+                sys.path.append(str(cli_path))
+                try:
+                    import cli
+                    cli.main()
+                    return
+                except ImportError as e:
+                    last_import_error = e
+                    if e.name and e.name != 'cli':
+                        print(f"Error: Missing dependency for CLI: {e}")
                         sys.exit(1)
-                else:
-                    print("Error: cli.py not found.")
+                except Exception as e:
+                    print(f"Error: Failed to start CLI: {e}")
                     sys.exit(1)
+
+            if last_import_error:
+                 print(f"Error: Could not load cli.py: {last_import_error}")
+            else:
+                 print("Error: cli.py not found.")
+            sys.exit(1)
         case "serve":
             open_cxb = False
             if "--open-cxb" in sys.argv:

{dmart-1.4.40.post1.dist-info → dmart-1.4.40.post2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 1.4.40.post1
+Version: 1.4.40.post2
 Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic
@@ -25,6 +25,9 @@ Requires-Dist: jinja2
 Requires-Dist: pytest-cov
 Requires-Dist: argon2-cffi
 Requires-Dist: orjson
+Requires-Dist: prompt_toolkit
+Requires-Dist: rich
+Requires-Dist: requests
 Provides-Extra: extra
 Requires-Dist: jsf; extra == "extra"
 Requires-Dist: types-psutil; extra == "extra"
@@ -44,13 +47,9 @@ Requires-Dist: firebase-admin; extra == "plugins"
 Requires-Dist: pillow; extra == "plugins"
 Requires-Dist: ldap3; extra == "plugins"
 Provides-Extra: cli-requires
-Requires-Dist: weasyprint; extra == "cli-requires"
-Requires-Dist: pypdf; extra == "cli-requires"
-Requires-Dist: dicttoxml; extra == "cli-requires"
-Requires-Dist: pdf2image; extra == "cli-requires"
-Requires-Dist: firebase-admin; extra == "cli-requires"
-Requires-Dist: pillow; extra == "cli-requires"
-Requires-Dist: ldap3; extra == "cli-requires"
+Requires-Dist: prompt_toolkit; extra == "cli-requires"
+Requires-Dist: rich; extra == "cli-requires"
+Requires-Dist: requests; extra == "cli-requires"
 Provides-Extra: all
 Requires-Dist: jsf; extra == "all"
 Requires-Dist: types-psutil; extra == "all"
@@ -69,6 +68,8 @@ Requires-Dist: firebase-admin; extra == "all"
 Requires-Dist: pillow; extra == "all"
 Requires-Dist: ldap3; extra == "all"
 Requires-Dist: prompt_toolkit; extra == "all"
+Requires-Dist: rich; extra == "all"
+Requires-Dist: requests; extra == "all"
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: requires-python

{dmart-1.4.40.post1.dist-info → dmart-1.4.40.post2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 dmart/__init__.py,sha256=xHodcATn-JYaoi3_TVDimR_UWG_ux9uLePUNQDzHhsY,122
 dmart/alembic.ini,sha256=wQweByyHQm-EI8BQkE0SHNRjULJ6Xn5jqgvv88IT5Sg,3738
 dmart/bundler.py,sha256=so8ZJResb1PcOH5vboa_mpFAdYr_T8u8DbbFXd570Lg,1704
-dmart/cli.py,sha256=aE3_2uHcEiQJA_f6viGRwUmGPB-OaNfzSgDgLR5gf40,40447
+dmart/cli.py,sha256=CyqFdS2O32mrOctsC_wCusCSfN9PSmIIVmfc0tqZrrQ,41618
 dmart/config.env.sample,sha256=CKd4KIBeUatoFcO2IefmrVNBohpaVMQMFcoPkNBvCeI,696
 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=Ax4GRara7_21T2Jcbl8EwGfdezr9NTz7UucW_oVw-pA,24419
+dmart/dmart.py,sha256=wXuqCpuNRHva4yW43J7lgxn02vtvA_s8v-hyFRvoohk,25060
 dmart/get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 dmart/hypercorn_config.toml,sha256=-eryppEG8HBOM_KbFc4dTQePnpyfoW9ZG5aUATU_6yM,50
 dmart/info.json,sha256=5Yz4tc5dEt5eVrM2LzLhXgN8vGvE0aDbbbEEaGDsD5k,123
@@ -280,8 +280,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.post1.dist-info/METADATA,sha256=dRF5fMCJ7hyZsIKXGG6o5e5H00JxS8JkqucCNR4aINc,2577
-dmart-1.4.40.post1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.40.post1.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.40.post1.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.40.post1.dist-info/RECORD,,
+dmart-1.4.40.post2.dist-info/METADATA,sha256=TiJ0jZmWQd7mMxk2wlQyX_2WD9YELXMHyFA_Jb4OFOw,2531
+dmart-1.4.40.post2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.40.post2.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
+dmart-1.4.40.post2.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.40.post2.dist-info/RECORD,,