dmart 1.4.40.post25__py3-none-any.whl → 1.4.40.post26__py3-none-any.whl

dmart/__init__.py

@@ -1 +1 @@
-from .dmart import main
+from .manage import main

dmart/dmart.py

@@ -13,9 +13,14 @@ import time
 import warnings
 import webbrowser
 import re
+# from multiprocessing import freeze_support
 from pathlib import Path
-from multiprocessing import freeze_support
 
+from hypercorn.config import Config
+from hypercorn.run import run
+from utils.settings import settings
+
+# freeze_support()
 
 commands = """
     serve
@@ -40,13 +45,13 @@ commands = """
 sentinel = object()
 
 
-def hypercorn_main(args_list: list[str]) -> int:
+def hypercorn_main() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "application",
         help="The application to dispatch to as path.to.module:instance.path",
         nargs="?",
-        default="dmart.main:app"
+        default="main:app"
     )
     parser.add_argument("--access-log", help="Deprecated, see access-logfile", default=sentinel)
     parser.add_argument(
@@ -246,41 +251,8 @@ def hypercorn_main(args_list: list[str]) -> int:
         default=sentinel,
         type=int,
     )
-    args = parser.parse_args(args_list)
-    
-    # Allow child processes to find the application
-    dmart_dir = os.path.dirname(os.path.abspath(__file__))
-    dmart_pkg_parent = os.path.dirname(dmart_dir)
-    
-    # Ensure dmart_pkg_parent is in sys.path
-    if dmart_pkg_parent not in sys.path:
-        sys.path.insert(0, dmart_pkg_parent)
+    args = parser.parse_args(sys.argv[1:])
     
-    # Ensure dmart_dir itself is NOT in sys.path to avoid module/package conflict
-    if dmart_dir in sys.path:
-        sys.path.remove(dmart_dir)
-    
-    # If 'dmart' was imported as a module (due to shadowing), remove it
-    if "dmart" in sys.modules:
-        dmart_mod = sys.modules["dmart"]
-        if not hasattr(dmart_mod, "__path__"):
-            del sys.modules["dmart"]
-    
-    # Handle the case where we are running from source and 'dmart' package is not available
-    # but the current directory contains 'main.py'
-    try:
-        from dmart import main as _unused
-    except ImportError:
-        if os.path.exists(os.path.join(dmart_dir, "main.py")):
-            if dmart_dir not in sys.path:
-                sys.path.insert(0, dmart_dir)
-            if args.application == "dmart.main:app":
-                args.application = "main:app"
-
-    from hypercorn.config import Config
-    from hypercorn.run import run
-    from dmart.utils.settings import settings
-
     if args.config == "hypercorn_config.toml" and not os.path.exists(args.config):
         config = Config()
         config.backlog = 2000
@@ -434,47 +406,23 @@ def print_formatted(data):
 
 
 def main():
-    # Allow processes to find the dmart package
-    dmart_dir = os.path.dirname(os.path.abspath(__file__))
-    dmart_pkg_parent = os.path.dirname(dmart_dir)
-    
-    if dmart_pkg_parent not in sys.path:
-        sys.path.insert(0, dmart_pkg_parent)
-    
-    if dmart_dir in sys.path:
-        sys.path.remove(dmart_dir)
-
-    if "" in sys.path:
-        sys.path.remove("")
-
-    # If 'dmart' was imported as a module (due to shadowing), remove it
-    # so it can be correctly imported as a package from the fixed sys.path
-    if "dmart" in sys.modules:
-        dmart_mod = sys.modules["dmart"]
-        if not hasattr(dmart_mod, "__path__"):
-            del sys.modules["dmart"]
-
-    if len(sys.argv) < 2:
+    sys.argv = sys.argv[1:]
+    if len(sys.argv) == 0:
         print("You must provide a command to run:")
         print(commands)
         sys.exit(1)
 
-    command = sys.argv[1]
-    args_list = sys.argv[2:]
-
-    match command:
+    match sys.argv[0]:
         case "hyper":
-            from multiprocessing import freeze_support
-            freeze_support()
-            hypercorn_main(args_list)
+            hypercorn_main()
         case "cli":
             config_file = None
-            if "--config" in args_list:
-                idx = args_list.index("--config")
-                if idx + 1 < len(args_list):
-                    config_file = args_list[idx + 1]
-                    args_list.pop(idx + 1)
-                    args_list.pop(idx)
+            if "--config" in sys.argv:
+                idx = sys.argv.index("--config")
+                if idx + 1 < len(sys.argv):
+                    config_file = sys.argv[idx + 1]
+                    sys.argv.pop(idx + 1)
+                    sys.argv.pop(idx)
 
             if not config_file:
                 if os.path.exists("cli.ini"):
@@ -532,7 +480,10 @@ def main():
             
             last_import_error = None
             try:
-                from dmart import cli # type: ignore
+                dmart_dir = Path(__file__).resolve().parent
+                if str(dmart_dir) not in sys.path:
+                    sys.path.append(str(dmart_dir))
+                import cli # type: ignore
                 cli.main()
                 return
             except ImportError as e:
@@ -566,19 +517,17 @@ def main():
                  print("Error: cli.py not found.")
             sys.exit(1)
         case "serve":
-            from dmart.utils.settings import settings
-            from dmart.main import main as server
             open_cxb = False
-            if "--open-cxb" in args_list:
+            if "--open-cxb" in sys.argv:
                 open_cxb = True
-                args_list.remove("--open-cxb")
+                sys.argv.remove("--open-cxb")
             
-            if "--cxb-config" in args_list:
-                idx = args_list.index("--cxb-config")
-                if idx + 1 < len(args_list):
-                    os.environ["DMART_CXB_CONFIG"] = args_list[idx + 1]
-                    args_list.pop(idx + 1)
-                args_list.pop(idx)
+            if "--cxb-config" in sys.argv:
+                idx = sys.argv.index("--cxb-config")
+                if idx + 1 < len(sys.argv):
+                    os.environ["DMART_CXB_CONFIG"] = sys.argv[idx + 1]
+                    sys.argv.pop(idx + 1)
+                sys.argv.pop(idx)
                 
             if open_cxb:
                 host = settings.listening_host
@@ -592,9 +541,10 @@ def main():
                 import threading
                 threading.Thread(target=open_browser, daemon=True).start()
 
+            from main import main as server
             asyncio.run(server())
         case "health-check":
-            from dmart.data_adapters.file.health_check import main as health_check
+            from data_adapters.file.health_check import main as health_check
             parser = argparse.ArgumentParser(
                 description="This created for doing health check functionality",
                 formatter_class=argparse.ArgumentDefaultsHelpFormatter,
@@ -608,7 +558,7 @@ def main():
             asyncio.run(health_check(args.type, args.space, args.schemas))
             print(f'total time: {"{:.2f}".format(time.time() - before_time)} sec')
         case "create-index":
-            from dmart.data_adapters.file.create_index import main as create_index
+            from data_adapters.file.create_index import main as create_index
             parser = argparse.ArgumentParser(
                 description="Recreate Redis indices based on the available schema definitions",
                 formatter_class=argparse.ArgumentDefaultsHelpFormatter,
@@ -628,7 +578,7 @@ def main():
 
             asyncio.run(create_index(args.space, args.schemas, args.subpaths, args.flushall))
         case "export":
-            from dmart.utils.exporter import main as exporter, exit_with_error, OUTPUT_FOLDER_NAME, validate_config, extract
+            from utils.exporter import main as exporter, exit_with_error, OUTPUT_FOLDER_NAME, validate_config, extract
             parser = argparse.ArgumentParser()
             parser.add_argument(
                 "--config", required=True, help="Json config relative path from the script"
@@ -681,12 +631,11 @@ def main():
                 f"Output path: {os.path.abspath(os.path.join(output_path, OUTPUT_FOLDER_NAME))}"
             )
         case "settings":
-            from dmart.utils.settings import settings
             print_formatted(settings.model_dump_json())
         case "set_password":
-            from dmart import set_admin_passwd  # noqa: F401
+            import set_admin_passwd  # noqa: F401
         case "archive":
-            from dmart.data_adapters.file.archive import archive
+            from data_adapters.file.archive import archive
             parser = argparse.ArgumentParser(
                 description="Script for archiving records from different spaces and subpaths."
             )
@@ -713,10 +662,10 @@ def main():
             asyncio.run(archive(space, subpath, schema, olderthan))
             print("Done.")
         case "json_to_db":
-            from dmart.data_adapters.sql.json_to_db_migration import main as json_to_db_migration
+            from data_adapters.sql.json_to_db_migration import main as json_to_db_migration
             asyncio.run(json_to_db_migration())
         case "db_to_json":
-            from dmart.data_adapters.sql.db_to_json_migration import main as db_to_json_migration
+            from data_adapters.sql.db_to_json_migration import main as db_to_json_migration
             db_to_json_migration()
         case "help":
             print("Available commands:")
@@ -787,7 +736,6 @@ def main():
             import configparser
             import tempfile
             
-            from dmart.utils.settings import settings
             dmart_root = Path(__file__).resolve().parent
             alembic_ini_path = dmart_root / "alembic.ini"
             
@@ -805,7 +753,7 @@ def main():
 
             config.set('alembic', 'sqlalchemy.url', db_url)
             config.set('alembic', 'script_location', str(dmart_root / "alembic"))
-            config.set('alembic', 'prepend_sys_path', os.path.dirname(dmart_root))
+            config.set('alembic', 'prepend_sys_path', str(dmart_root))
 
             temp_config_path = ""
             try:
@@ -813,7 +761,7 @@ def main():
                     config.write(temp_config_file)
                     temp_config_path = temp_config_file.name
 
-                alembic_cli_args = args_list
+                alembic_cli_args = sys.argv[1:]
                 if not alembic_cli_args:
                     alembic_cli_args = ["upgrade", "head"]
 
@@ -868,5 +816,4 @@ def main():
                 sys.exit(e.returncode)
 
 if __name__ == "__main__":
-    freeze_support()
     main()

{dmart-1.4.40.post25.dist-info → dmart-1.4.40.post26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 1.4.40.post25
+Version: 1.4.40.post26
 Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic

{dmart-1.4.40.post25.dist-info → dmart-1.4.40.post26.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dmart/__init__.py,sha256=XLCEy3hrSIEPcq-9ChqtUx5-_jLFAvsbY4AJXGD-KyE,24
+dmart/__init__.py,sha256=cpaLjFNvudcPHfaUJHWQCWThrQeZTttlzC2YU3gCAQ4,25
 dmart/alembic.ini,sha256=wQweByyHQm-EI8BQkE0SHNRjULJ6Xn5jqgvv88IT5Sg,3738
 dmart/bundler.py,sha256=so8ZJResb1PcOH5vboa_mpFAdYr_T8u8DbbFXd570Lg,1704
 dmart/cli.py,sha256=TkZVc0bDT32nXJxNd_ZVqwKaq6pbMUOXxYRXfEaKYSI,41611
@@ -8,7 +8,7 @@ dmart/conftest.py,sha256=0ry_zeCmdBNLbm5q115b-pkOrUFYxdsOUXbIMkr7E5Y,362
 dmart/curl.pypi.sh,sha256=KQ-kgV3_d5mwqoLd4XOwz5s2wRQ7LDVX3z-kvjvp9hA,15631
 dmart/curl.sh,sha256=lmHSFVr5ft-lc5Aq9LfvKyWfntrfYbnirhzx1EGjp_A,15743
 dmart/data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart/dmart.py,sha256=5ACm3MWKltX-dP4cVz8jp6UpLVfcVGGOHtCcUdVLeZA,34135
+dmart/dmart.py,sha256=SeFQl1TOOZuhJOhvEg0Hzgk5k93VGdpS3v_0JOAIg7g,32061
 dmart/get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 dmart/hypercorn_config.toml,sha256=-eryppEG8HBOM_KbFc4dTQePnpyfoW9ZG5aUATU_6yM,50
 dmart/info.json,sha256=WlfNSLMtm-sATS1PPvWR_HnLUj1XYxzHK4lKZZAPBQg,123
@@ -483,8 +483,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.post25.dist-info/METADATA,sha256=gBzkUyi1bPDcdZImq7jmPL9ZYQdnmUBcS6B62id6r7s,839
-dmart-1.4.40.post25.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dmart-1.4.40.post25.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.40.post25.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.40.post25.dist-info/RECORD,,
+dmart-1.4.40.post26.dist-info/METADATA,sha256=4-f6W27ax_gsqyCdQWVqWFkdnWAH2MwQVZhiaBdUy5o,839
+dmart-1.4.40.post26.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dmart-1.4.40.post26.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.40.post26.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.40.post26.dist-info/RECORD,,