dmart 1.4.40.post23__py3-none-any.whl → 1.4.40.post24__py3-none-any.whl

dmart/dmart.py

@@ -17,13 +17,6 @@ from pathlib import Path
 from multiprocessing import freeze_support
 
 
-script_dir = str(Path(__file__).resolve().parent)
-
-from hypercorn.config import Config
-from hypercorn.run import run
-from dmart.utils.settings import settings
-
-
 commands = """
     serve
     hyper
@@ -48,7 +41,6 @@ sentinel = object()
 
 
 def hypercorn_main(args_list: list[str]) -> int:
-    from dmart.utils.settings import settings
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "application",
@@ -256,33 +248,44 @@ def hypercorn_main(args_list: list[str]) -> 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)
+    
+    # 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
         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)
-        
-        # Ensure dmart_pkg_parent is in sys.path
-        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)
-        
-        # 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"
     else:
         config = Config.from_toml(args.config)
         
@@ -431,6 +434,26 @@ 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:
         print("You must provide a command to run:")
         print(commands)
@@ -846,25 +869,4 @@ def main():
 
 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.post23.dist-info → dmart-1.4.40.post24.dist-info}/METADATA

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

{dmart-1.4.40.post23.dist-info → dmart-1.4.40.post24.dist-info}/RECORD

@@ -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=F4VCjMC1gr7x8eVjWrbadd0_GOAMOuxxp1Kvqnopxm4,34249
+dmart/dmart.py,sha256=5ACm3MWKltX-dP4cVz8jp6UpLVfcVGGOHtCcUdVLeZA,34135
 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.post23.dist-info/METADATA,sha256=lRQ0MaVLCdigjT_Ba5oT1QyW1-Ilh7SRPxKvp7IkoO8,839
-dmart-1.4.40.post23.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dmart-1.4.40.post23.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.40.post23.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.40.post23.dist-info/RECORD,,
+dmart-1.4.40.post24.dist-info/METADATA,sha256=urCqIjPP1uy_ayIMAKGYXsLFTt7j80VgSwCq7WzSr-g,839
+dmart-1.4.40.post24.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dmart-1.4.40.post24.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
+dmart-1.4.40.post24.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.40.post24.dist-info/RECORD,,