dmart 1.4.1__py3-none-any.whl → 1.4.3__py3-none-any.whl

{dmart-1.4.1.dist-info → dmart-1.4.3.dist-info}/METADATA

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

{dmart-1.4.1.dist-info → dmart-1.4.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
 bundler.py,sha256=so8ZJResb1PcOH5vboa_mpFAdYr_T8u8DbbFXd570Lg,1704
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=QZQvR0q3CGOJy8KzXh7m8wW51JqILw--xvC0N4akjnY,21683
+dmart.py,sha256=WugBannLMtYISbGPfK5Lak-2BPm14cFHNyJwkD-26RM,21711
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
-main.py,sha256=0jguG9WZMYJgYAR_JO95GrSFM8Hu5qbInABMxWvoY3I,19526
+main.py,sha256=LZYT5wKNECd0xWA0mAZBunoW1y_RtaaUdQOO7xoZcJU,20098
 migrate.py,sha256=hn1MZoVby_Jjqhc7y3CrLcGD619QmVZv3PONNvO7VKQ,665
 password_gen.py,sha256=xjx8wi105ZYvhLBBQj7_rugACpxifGXHse6f7YlGXWQ,196
 run_notification_campaign.py,sha256=ZCvHfaimK4W6q4XuHs2r6wavMGipYYw4aUkNlxmGUd8,2652
@@ -135,15 +135,15 @@ utils/query_policies_helper.py,sha256=jBcNI_15P6LqVeWz6w9UMreLuNIc50GxqAf17KzxE8
 utils/regex.py,sha256=cv9b_l_e8tz42mKckeeyDgypKqh2e71E28co2iuEVxA,2286
 utils/repository.py,sha256=9L-IvQ0Js0SQ5OR-Rh0i2Wdu4H9H06r8eE84hfBIu7Q,18313
 utils/router_helper.py,sha256=Tgoq3oakejdEeyeVieTNk38JsPZ8x5RuR0kw2THc1mI,604
-utils/settings.py,sha256=SIunwTJF0Ac9fUWRt3sUsgWzMkWk0RUryEANYuOJQ9k,5660
+utils/settings.py,sha256=eWsIKxyFzeCO7Jte0U5SR8SiCLSXz0dD0vO0x-R-y2k,5686
 utils/sms_notifier.py,sha256=04D6D_ldk3S9SojI7_381pqLc8v9lligeNHAysohz7w,550
 utils/social_sso.py,sha256=Dm1W6U9OwKbAeUwM-kwJBHFEoreeoN-s-RHdOZ1-cNg,2216
 utils/ticket_sys_utils.py,sha256=9QAlW2iiy8KyxQRBDj_WmzS5kKb0aYJmGwd4qzmGVqo,7005
 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.1.dist-info/METADATA,sha256=Xx4kYj7woXX61a2PqjZnthP2Ud5fVUpbly5mCg6xWCk,2068
-dmart-1.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.1.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.1.dist-info/top_level.txt,sha256=JTypu1r5v9v7ru-60JSSbnSMEESHFRMacpcz-rPJx_U,262
-dmart-1.4.1.dist-info/RECORD,,
+dmart-1.4.3.dist-info/METADATA,sha256=M7EkARIc0iYV5zNXpVCLGk1xYLFnOL0hQqAownZ5cdA,2068
+dmart-1.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.3.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.3.dist-info/top_level.txt,sha256=JTypu1r5v9v7ru-60JSSbnSMEESHFRMacpcz-rPJx_U,262
+dmart-1.4.3.dist-info/RECORD,,

dmart.py

@@ -360,7 +360,7 @@ def hypercorn_main() -> int:
             except:
                 pass
         
-        url = f"http://{host}:{port}/cxb/"
+        url = f"http://{host}:{port}{settings.cxb_url}/"
         
         def open_browser():
             time.sleep(2)  # Give server a moment to start
@@ -397,7 +397,7 @@ def main():
                 sys.argv.pop(idx)
                 
             if open_cxb:
-                url = f"http://{settings.listening_host}:{settings.listening_port}/cxb/"
+                url = f"http://{settings.listening_host}:{settings.listening_port}{settings.cxb_url}/"
                 def open_browser():
                     time.sleep(2)  # Give server a moment to start
                     webbrowser.open(url)

main.py

@@ -31,6 +31,19 @@ from hypercorn.config import Config
 from starlette.concurrency import iterate_in_threadpool
 from starlette.exceptions import HTTPException as StarletteHTTPException
 from starlette.staticfiles import StaticFiles
+from starlette.responses import Response
+
+class SPAStaticFiles(StaticFiles):
+    async def get_response(self, path: str, scope) -> Response:
+        try:
+            return await super().get_response(path, scope)
+        except StarletteHTTPException as ex:
+            if ex.status_code == 404 and path != "index.html" and not os.path.splitext(path)[1]:
+                try:
+                    return await super().get_response("index.html", scope)
+                except StarletteHTTPException:
+                    pass
+            raise ex
 import models.api as api
 from utils.settings import settings
 from asgi_correlation_id import CorrelationIdMiddleware
@@ -474,7 +487,7 @@ if not os.path.exists(cxb_path):
         cxb_path = cxb_dist_path
 
 if os.path.isdir(cxb_path):
-    @app.get("/cxb/config.json", include_in_schema=False)
+    @app.get(f"{settings.cxb_url}/config.json", include_in_schema=False)
     async def get_cxb_config():
         # Priority 0: Explicit path from flag
         cxb_config = os.getenv("DMART_CXB_CONFIG")
@@ -508,7 +521,7 @@ if os.path.isdir(cxb_path):
             "websocket": settings.websocket_url if settings.websocket_url else f"ws://{settings.listening_host}:{settings.websocket_port}/ws"
         }
 
-    app.mount("/cxb", StaticFiles(directory=cxb_path, html=True), name="cxb")
+    app.mount(settings.cxb_url, SPAStaticFiles(directory=cxb_path, html=True), name="cxb")
 
 @app.options("/{x:path}", include_in_schema=False)
 async def myoptions():

utils/settings.py

@@ -16,6 +16,7 @@ class Settings(BaseSettings):
     """Main settings class"""
 
     app_url: str = ""
+    cxb_url: str = "/cxb"
     public_app_url: str = ""
     app_name: str = "dmart"
     websocket_url: str = "" #"http://127.0.0.1:8484"