dmart 1.4.40.post21__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,6 +14,7 @@ import warnings
 import webbrowser
 import re
 from pathlib import Path
+from multiprocessing import freeze_support
 
 
 script_dir = str(Path(__file__).resolve().parent)
@@ -261,9 +262,14 @@ def hypercorn_main(args_list: list[str]) -> int:
         config.workers = 1
         config.bind = ["localhost:8282"]
         # Allow child processes to find the application
-        script_dir = os.path.dirname(os.path.abspath(__file__))
-        if script_dir not in sys.path:
-            sys.path.insert(0, script_dir)
+        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)
         
@@ -422,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
@@ -761,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:
@@ -824,10 +832,26 @@ def main():
                 sys.exit(e.returncode)
 
 if __name__ == "__main__":
-    # If installed as a package, we need to ensure the parent of dmart package
-    # is in sys.path for child processes to find 'dmart.dmart'
-    dmart_pkg_parent = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    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.post21.dist-info → dmart-1.4.40.post22.dist-info}/METADATA

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

{dmart-1.4.40.post21.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=eaaggp05-3F0Z-rHgW01TZfFbuk7GhOSbNRtDIEtrWQ,32735
+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.post21.dist-info/METADATA,sha256=tDXPuJEXMjftV_fpEETDfHb9kgcYvG_WoPOtBb1_k1M,839
-dmart-1.4.40.post21.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dmart-1.4.40.post21.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.40.post21.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.40.post21.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,,