dmart 1.4.40.post20__py3-none-any.whl → 1.4.40.post22__py3-none-any.whl

dmart/__init__.py

@@ -1,7 +0,0 @@
-import os
-import sys
-
-
-_pkg_dir = os.path.dirname(__file__)
-if _pkg_dir not in sys.path:
-    sys.path.insert(0, _pkg_dir)

dmart/dmart.py

@@ -14,15 +14,14 @@ import warnings
 import webbrowser
 import re
 from pathlib import Path
+from multiprocessing import freeze_support
 
 
 script_dir = str(Path(__file__).resolve().parent)
-if script_dir not in sys.path:
-    sys.path.insert(0, script_dir)
 
 from hypercorn.config import Config
 from hypercorn.run import run
-from utils.settings import settings
+from dmart.utils.settings import settings
 
 
 commands = """
@@ -49,6 +48,7 @@ sentinel = object()
 
 
 def hypercorn_main(args_list: list[str]) -> int:
+    from dmart.utils.settings import settings
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "application",
@@ -261,6 +261,15 @@ def hypercorn_main(args_list: list[str]) -> int:
         config.backlog = 2000
         config.workers = 1
         config.bind = ["localhost:8282"]
+        # Allow child processes to find the application
+        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)
+        
+        # Ensure dmart_dir itself is NOT in sys.path
+        if dmart_dir in sys.path:
+            sys.path.remove(dmart_dir)
     else:
         config = Config.from_toml(args.config)
         
@@ -419,6 +428,8 @@ def main():
 
     match command:
         case "hyper":
+            from multiprocessing import freeze_support
+            freeze_support()
             hypercorn_main(args_list)
         case "cli":
             config_file = None
@@ -485,10 +496,7 @@ def main():
             
             last_import_error = None
             try:
-                dmart_dir = Path(__file__).resolve().parent
-                if str(dmart_dir) not in sys.path:
-                    sys.path.append(str(dmart_dir))
-                import cli # type: ignore
+                from dmart import cli # type: ignore
                 cli.main()
                 return
             except ImportError as e:
@@ -522,6 +530,8 @@ 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:
                 open_cxb = True
@@ -546,10 +556,9 @@ 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 data_adapters.file.health_check import main as health_check
+            from dmart.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,
@@ -563,7 +572,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 data_adapters.file.create_index import main as create_index
+            from dmart.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,
@@ -583,7 +592,7 @@ def main():
 
             asyncio.run(create_index(args.space, args.schemas, args.subpaths, args.flushall))
         case "export":
-            from utils.exporter import main as exporter, exit_with_error, OUTPUT_FOLDER_NAME, validate_config, extract
+            from dmart.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"
@@ -636,11 +645,12 @@ 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":
-            import set_admin_passwd  # noqa: F401
+            from dmart import set_admin_passwd  # noqa: F401
         case "archive":
-            from data_adapters.file.archive import archive
+            from dmart.data_adapters.file.archive import archive
             parser = argparse.ArgumentParser(
                 description="Script for archiving records from different spaces and subpaths."
             )
@@ -667,10 +677,10 @@ def main():
             asyncio.run(archive(space, subpath, schema, olderthan))
             print("Done.")
         case "json_to_db":
-            from data_adapters.sql.json_to_db_migration import main as json_to_db_migration
+            from dmart.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 data_adapters.sql.db_to_json_migration import main as db_to_json_migration
+            from dmart.data_adapters.sql.db_to_json_migration import main as db_to_json_migration
             db_to_json_migration()
         case "help":
             print("Available commands:")
@@ -741,6 +751,7 @@ 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"
             
@@ -758,7 +769,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', str(dmart_root))
+            config.set('alembic', 'prepend_sys_path', os.path.dirname(dmart_root))
 
             temp_config_path = ""
             try:
@@ -821,4 +832,26 @@ def main():
                 sys.exit(e.returncode)
 
 if __name__ == "__main__":
+    freeze_support()
+    # If we are running as a script (e.g. during multiprocessing spawn),
+    # we need to ensure the parent of dmart package is in sys.path
+    # so that 'import dmart' works correctly.
+    # However, we must NOT add the directory containing dmart.py itself
+    # to sys.path, as that would make 'dmart' a module instead of a package.
+    
+    # Path to this file: .../site-packages/dmart/dmart.py
+    # dmart_dir: .../site-packages/dmart
+    # dmart_pkg_parent: .../site-packages
+    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.append(dmart_pkg_parent)
+    
+    # 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 "" in sys.path:
+        sys.path.remove("")
+
     main()

{dmart-1.4.40.post20.dist-info → dmart-1.4.40.post22.dist-info}/METADATA

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

{dmart-1.4.40.post20.dist-info → dmart-1.4.40.post22.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dmart/__init__.py,sha256=xHodcATn-JYaoi3_TVDimR_UWG_ux9uLePUNQDzHhsY,122
+dmart/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=kXo4X_2owhksqi8AyIy-VnjTil0Ub59kHUEil_h4P-c,32175
+dmart/dmart.py,sha256=AF_9WBX0bJwD7jc4J_w8DykWFfto4CjRIJwINb2RLuY,33668
 dmart/get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 dmart/hypercorn_config.toml,sha256=-eryppEG8HBOM_KbFc4dTQePnpyfoW9ZG5aUATU_6yM,50
 dmart/info.json,sha256=6Kb7MXzVS0PzDZOUXtBoAA3zpxvtRBR0PJnedjBE-v4,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.post20.dist-info/METADATA,sha256=TGrQyNh7QshaAyxcYzXln6xc5wuTDi_v8XtatAy2bak,839
-dmart-1.4.40.post20.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dmart-1.4.40.post20.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.40.post20.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.40.post20.dist-info/RECORD,,
+dmart-1.4.40.post22.dist-info/METADATA,sha256=9YYBfmV4--BLFQwl3BZAolOVISR06FWRqAfXzn43Qf4,839
+dmart-1.4.40.post22.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dmart-1.4.40.post22.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
+dmart-1.4.40.post22.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.40.post22.dist-info/RECORD,,