dmart 1.4.20__py3-none-any.whl → 1.4.21__py3-none-any.whl

{dmart-1.4.20.dist-info → dmart-1.4.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 1.4.20
+Version: 1.4.21
 Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic

{dmart-1.4.20.dist-info → dmart-1.4.21.dist-info}/RECORD

@@ -1,6 +1,6 @@
 bundler.py,sha256=MDTUTVS0WL7gb-i1rDcS4i37KTqaW88TluL4L3rwjRw,1817
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=mG4TCkITYoUajlHsPJ_BZUBMu2G8gxvB7bidYfKoSHA,24498
+dmart.py,sha256=p5fLlsAoCtT9-2J34y8BE6vhkC5gHdXL9mc6nkAZGFQ,26230
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 info.json,sha256=hXQWl19lfMkEj_zXdehGeKjiKGNJ7emY4S7d4pIqJ1E,123
 main.py,sha256=KZGhIL6AnEm5ZAPy4IvhBDpzSTjuodilV7NafNOyhzM,19676
@@ -272,8 +272,8 @@ utils/ticket_sys_utils.py,sha256=9QAlW2iiy8KyxQRBDj_WmzS5kKb0aYJmGwd4qzmGVqo,700
 utils/web_notifier.py,sha256=QM87VVid2grC5lK3NdS1yzz0z1wXljr4GChJOeK86W4,843
 utils/templates/activation.html.j2,sha256=XAMKCdoqONoc4ZQucD0yV-Pg5DlHHASZrTVItNS-iBE,640
 utils/templates/reminder.html.j2,sha256=aoS8bTs56q4hjAZKsb0jV9c-PIURBELuBOpT_qPZNVU,639
-dmart-1.4.20.dist-info/METADATA,sha256=MTGSY6tBlgUmFtLj4RP40CIZbMsFGbMGG2Jo41hv_hY,2149
-dmart-1.4.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.20.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.20.dist-info/top_level.txt,sha256=S-gfX1pLerapNXiHZ8lvPYoV7sgwSX2_NCZ6xfzDUHM,267
-dmart-1.4.20.dist-info/RECORD,,
+dmart-1.4.21.dist-info/METADATA,sha256=tHgxO-v_yePlbzxXCXfIjDv8ubvItn2SkEBpgAPachk,2149
+dmart-1.4.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.21.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.21.dist-info/top_level.txt,sha256=S-gfX1pLerapNXiHZ8lvPYoV7sgwSX2_NCZ6xfzDUHM,267
+dmart-1.4.21.dist-info/RECORD,,

dmart.py

@@ -412,27 +412,43 @@ def hypercorn_main() -> int:
 
 
 def main():
-    sys.argv = sys.argv[1:]
-    if len(sys.argv) == 0:
+    # Use sys.argv directly instead of modifying it in place which might be confusing
+    # But to fix the UnboundLocalError, we just need to refer to the global sys module
+    # The error happens because we're assigning to sys.argv, making python think sys is local
+    # but we haven't imported it in this scope (it's imported at module level)
+    # However, in Python, module-level imports are available in functions.
+    # The issue is likely that we are assigning to sys.argv, which makes Python treat 'sys' as a local variable
+    # But wait, sys is imported at the top.
+    # Actually, the error "UnboundLocalError: cannot access local variable 'sys' where it is not associated with a value"
+    # suggests that there might be a local variable named 'sys' somewhere or something weird is happening.
+    # Ah, I see what happened. I added "import sys" inside the try/except block in the migrate case!
+    # That local import shadows the global import for the whole function scope in Python 3.x due to how scoping works.
+    
+    # Let's fix this by removing the local import of sys in the migrate case since it's already imported globally.
+    
+    global sys
+    
+    args = sys.argv[1:]
+    if len(args) == 0:
         print("You must provide a command to run:")
         print(commands)
         sys.exit(1)
 
-    match sys.argv[0]:
+    match args[0]:
         case "hyper":
             hypercorn_main()
         case "server" | "serve":
             open_cxb = False
-            if "--open-cxb" in sys.argv:
+            if "--open-cxb" in args:
                 open_cxb = True
-                sys.argv.remove("--open-cxb")
+                args.remove("--open-cxb")
             
-            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 "--cxb-config" in args:
+                idx = args.index("--cxb-config")
+                if idx + 1 < len(args):
+                    os.environ["DMART_CXB_CONFIG"] = args[idx + 1]
+                    args.pop(idx + 1)
+                args.pop(idx)
                 
             if open_cxb:
                 url = f"http://{settings.listening_host}:{settings.listening_port}/cxb/"
@@ -443,6 +459,11 @@ def main():
                 import threading
                 threading.Thread(target=open_browser, daemon=True).start()
 
+            # We need to update sys.argv for hypercorn/fastapi if they use it, 
+            # but here we are calling asyncio.run(server()) which uses settings.
+            # hypercorn_main uses sys.argv, but we call it explicitly above.
+            # Let's just set sys.argv to the modified args just in case.
+            sys.argv = [sys.argv[0]] + args
             asyncio.run(server())
         case "health-check":
             parser = argparse.ArgumentParser(
@@ -453,9 +474,10 @@ def main():
             parser.add_argument("-s", "--space", help="hit the target space or pass (all) to make the full health check")
             parser.add_argument("-m", "--schemas", nargs="*", help="hit the target schema inside the space")
 
-            args = parser.parse_args()
+            # parse_args defaults to sys.argv[1:], so we need to pass the relevant args
+            args_parsed = parser.parse_args(args[1:])
             before_time = time.time()
-            asyncio.run(health_check(args.type, args.space, args.schemas))
+            asyncio.run(health_check(args_parsed.type, args_parsed.space, args_parsed.schemas))
             print(f'total time: {"{:.2f}".format(time.time() - before_time)} sec')
         case "create-index":
             parser = argparse.ArgumentParser(
@@ -473,9 +495,9 @@ def main():
                 "--flushall", action='store_true', help="FLUSHALL data on Redis"
             )
 
-            args = parser.parse_args()
+            args_parsed = parser.parse_args(args[1:])
 
-            asyncio.run(create_index(args.space, args.schemas, args.subpaths, args.flushall))
+            asyncio.run(create_index(args_parsed.space, args_parsed.schemas, args_parsed.subpaths, args_parsed.flushall))
         case "export":
             parser = argparse.ArgumentParser()
             parser.add_argument(
@@ -492,24 +514,24 @@ def main():
                 "--since",
                 help="Export entries created/updated since the provided timestamp",
             )
-            args = parser.parse_args()
+            args_parsed = parser.parse_args(args[1:])
             since = None
             output_path = ""
-            if args.output:
-                output_path = args.output
+            if args_parsed.output:
+                output_path = args_parsed.output
 
-            if args.since:
-                since = int(round(float(args.since) * 1000))
+            if args_parsed.since:
+                since = int(round(float(args_parsed.since) * 1000))
 
-            if not os.path.isdir(args.spaces):
-                exit_with_error(f"The spaces folder {args.spaces} is not found.")
+            if not os.path.isdir(args_parsed.spaces):
+                exit_with_error(f"The spaces folder {args_parsed.spaces} is not found.")
 
             out_path = os.path.join(output_path, OUTPUT_FOLDER_NAME)
             if os.path.isdir(out_path):
                 shutil.rmtree(out_path)
 
             tasks = []
-            with open(args.config, "r") as f:
+            with open(args_parsed.config, "r") as f:
                 config_objs = json.load(f)
 
             for config_obj in config_objs:
@@ -521,7 +543,7 @@ def main():
                                      config_obj.get("schema_shortname", ""),
                                      config_obj.get("included_meta_fields", {}),
                                      config_obj.get("excluded_payload_fields", {}),
-                                     args.spaces, output_path, since))
+                                     args_parsed.spaces, output_path, since))
 
             asyncio.run(exporter(tasks))
 
@@ -550,11 +572,11 @@ def main():
                 help="The number of day, older than which, the entries will be archived (based on updated_at)",
             )
 
-            args = parser.parse_args()
-            space = args.space
-            subpath = args.subpath
-            olderthan = args.olderthan
-            schema = args.schema or "meta"
+            args_parsed = parser.parse_args(args[1:])
+            space = args_parsed.space
+            subpath = args_parsed.subpath
+            olderthan = args_parsed.olderthan
+            schema = args_parsed.schema or "meta"
 
             asyncio.run(archive(space, subpath, schema, olderthan))
             print("Done.")
@@ -585,7 +607,6 @@ def main():
                     print("Error: 'alembic' library not found. Please install it with 'pip install alembic'.")
                     if ALEMBIC_ERROR:
                         print(f"Details: {ALEMBIC_ERROR}")
-                    import sys
                     print(f"Python executable: {sys.executable}")
                     print(f"sys.path: {sys.path}")
                     sys.exit(1)