dmart 1.4.41.post36__py3-none-any.whl → 1.4.41.post38__py3-none-any.whl

dmart/data_adapters/file/drop_index.py

@@ -27,6 +27,9 @@ async def drop_index(space: str, schema: str) -> None:
         print(f"Error: {e}")
 
 
+def main():
+    asyncio.run(drop_index(args.space, args.schema))
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Script to drop index and delete associated documents in Redis.")
     parser.add_argument("space", help="Space name where the index is located.")
@@ -37,4 +40,4 @@ if __name__ == "__main__":
     if args.schema == "meta":
         print("Cannot drop index for schema 'meta'")
 
-    asyncio.run(drop_index(args.space, args.schema))
+    main()

dmart/dmart.py

@@ -37,6 +37,7 @@ commands = """
     archive
     json_to_db
     db_to_json
+    update_query_policies
     help
     version 
     info
@@ -140,7 +141,8 @@ LISTENING_PORT=8282
                   "default_language": "en",
                   "languages": { "ar": "العربية", "en": "English" },
                   "backend": "http://localhost:8282",
-                  "websocket": "ws://0.0.0.0:8484/ws"
+                  "websocket": "ws://0.0.0.0:8484/ws",
+                  "cxb_url": "/cxb"
                 }
                 with open(cxb_config, "w") as f:
                     json.dump(default_cxb_config, f, indent=2)
@@ -443,6 +445,7 @@ def hypercorn_main() -> int:
     
     if args.cxb_config is not sentinel:
         os.environ["DMART_CXB_CONFIG"] = args.cxb_config
+        settings.load_cxb_config()
 
     env_file = get_env_file()
     if env_file and os.path.exists(env_file):
@@ -594,6 +597,8 @@ def main():
                     os.environ["DMART_CXB_CONFIG"] = sys.argv[idx + 1]
                     sys.argv.pop(idx + 1)
                 sys.argv.pop(idx)
+            
+            settings.load_cxb_config()
                 
             if open_cxb:
                 host = settings.listening_host

dmart/main.py

@@ -46,16 +46,35 @@ from pathlib import Path
 
 class SPAStaticFiles(StaticFiles):
     async def get_response(self, path: str, scope) -> Response:
+        if path == "" or path == "index.html":
+            return await self.serve_index()
+
         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:
+                    return await self.serve_index()
+                except Exception:
                     pass
             raise ex
 
+    async def serve_index(self):
+        index_path = os.path.join(self.directory, "index.html")
+        if not os.path.exists(index_path):
+             raise StarletteHTTPException(status_code=404)
+        
+        with open(index_path, "r") as f:
+            content = f.read()
+            
+        target_url = settings.cxb_url
+        if not target_url.endswith("/"):
+            target_url += "/"
+            
+        content = content.replace("/cxb/", target_url)
+        
+        return Response(content, media_type="text/html")
+
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
@@ -493,9 +512,8 @@ if not os.path.exists(os.path.join(cxb_path, "index.html")):
 if os.path.isdir(cxb_path):
     @app.get(f"{settings.cxb_url}/config.json", include_in_schema=False)
     async def get_cxb_config():
-        cxb_config = os.getenv("DMART_CXB_CONFIG")
-        if cxb_config and os.path.exists(cxb_config):
-            return FileResponse(cxb_config)
+        if settings.cxb_config_path and os.path.exists(settings.cxb_config_path):
+            return FileResponse(settings.cxb_config_path)
             
         if os.path.exists("config.json"):
             return FileResponse("config.json")
@@ -521,7 +539,8 @@ if os.path.isdir(cxb_path):
             "default_language": "en",
             "languages": { "ar": "العربية", "en": "English" },
             "backend": f"{settings.app_url}" if settings.app_url else f"http://{settings.listening_host}:{settings.listening_port}",
-            "websocket": settings.websocket_url if settings.websocket_url else f"ws://{settings.listening_host}:{settings.websocket_port}/ws"
+            "websocket": settings.websocket_url if settings.websocket_url else f"ws://{settings.listening_host}:{settings.websocket_port}/ws",
+            "cxb_url": settings.cxb_url
         }
 
     app.mount(settings.cxb_url, SPAStaticFiles(directory=cxb_path, html=True), name="cxb")
@@ -537,7 +556,7 @@ async def myoptions():
 @app.patch("/{x:path}", include_in_schema=False)
 @app.delete("/{x:path}", include_in_schema=False)
 async def catchall(x):
-    if x.startswith("cxb"):
+    if x.startswith(settings.cxb_url.strip("/")):
         return RedirectResponse(f"{settings.cxb_url}/")
     raise api.Exception(
         status_code=status.HTTP_404_NOT_FOUND,

dmart/utils/settings.py

@@ -34,6 +34,7 @@ class Settings(BaseSettings):
 
     app_url: str = ""
     cxb_url: str = "/cxb"
+    cxb_config_path: str = ""
     public_app_url: str = ""
     app_name: str = "dmart"
     websocket_url: str = "" #"http://127.0.0.1:8484"
@@ -150,6 +151,46 @@ class Settings(BaseSettings):
                     
             except Exception as e:
                 logger.error(f"Failed to open the channel config file at {channels_config_file}. Error: {e}")
+        
+        self.load_cxb_config()
+
+    def load_cxb_config(self) -> None:
+        backend_dir = Path(__file__).resolve().parent.parent
+        cxb_path = backend_dir / "cxb"
+        if (cxb_path / "client").is_dir():
+            cxb_path = cxb_path / "client"
+        
+        if not (cxb_path / "index.html").exists():
+            project_root = backend_dir.parent
+            cxb_dist_path = project_root / "cxb" / "dist" / "client"
+            if cxb_dist_path.is_dir():
+                cxb_path = cxb_dist_path
+
+        config_path = None
+        cxb_config_env = os.getenv("DMART_CXB_CONFIG")
+        if cxb_config_env and os.path.exists(cxb_config_env):
+            config_path = cxb_config_env
+        elif os.path.exists("config.json"):
+            config_path = "config.json"
+        elif (self.spaces_folder / "config.json").exists():
+            config_path = str(self.spaces_folder / "config.json")
+        elif (Path.home() / ".dmart" / "config.json").exists():
+            config_path = str(Path.home() / ".dmart" / "config.json")
+        elif (cxb_path / "config.json").exists():
+            config_path = str(cxb_path / "config.json")
+            
+        if config_path:
+            self.cxb_config_path = config_path
+            try:
+                with open(config_path, "r") as f:
+                    config_data = json.load(f)
+                    if "cxb_url" in config_data:
+                        url = config_data["cxb_url"]
+                        if not url.startswith("/"):
+                            url = "/" + url
+                        self.cxb_url = url
+            except Exception as e:
+                logger.error(f"Failed to read CXB config at {config_path}. Error: {e}")
 
     raw_allowed_submit_models: str = Field(default="",alias="allowed_submit_models")
 

{dmart-1.4.41.post36.dist-info → dmart-1.4.41.post38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dmart
-Version: 1.4.41.post36
+Version: 1.4.41.post38
 Requires-Python: >=3.11
 Requires-Dist: fastapi
 Requires-Dist: pydantic

{dmart-1.4.41.post36.dist-info → dmart-1.4.41.post38.dist-info}/RECORD

@@ -8,13 +8,13 @@ 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=fgVx80U7DD_CqdlNHlsnFhCpfIFFA9bHxQ0Hum36l3s,34131
+dmart/dmart.py,sha256=Hf3Ac9qq7xW43xKuZZHZQDDPl-DUiBlhae7nXHaTBQw,34281
 dmart/get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 dmart/hypercorn_config.toml,sha256=-eryppEG8HBOM_KbFc4dTQePnpyfoW9ZG5aUATU_6yM,50
 dmart/info.json,sha256=1VYb3TIoWeUp8-9IPkNkfqHIb3znxlrd8qa7oBl3_No,123
 dmart/login_creds.sh,sha256=Aht1LwL11uzR13sa8p3BdeUCprIa9tq0vzOoplJjH5U,235
 dmart/login_creds.sh.sample,sha256=Sb43HNNn1g11rrJrtDsPgAxcXu3_wJvdNn--8S62dTE,227
-dmart/main.py,sha256=EMsrV57yAf_LZbM-dY9ZkD6oEAFmdhIUQn9l81vmVn4,20072
+dmart/main.py,sha256=JyU2UEEoo4H_ag81m1zMJi1elAlzNZLLKDEvtmPcPHc,20719
 dmart/manifest.sh,sha256=K3mY5MsUlrTyHa5cARslkShegvXh-UeqJcE2UZobdrE,544
 dmart/migrate.py,sha256=hn1MZoVby_Jjqhc7y3CrLcGD619QmVZv3PONNvO7VKQ,665
 dmart/password_gen.py,sha256=xjx8wi105ZYvhLBBQj7_rugACpxifGXHse6f7YlGXWQ,196
@@ -204,7 +204,7 @@ dmart/data_adapters/file/archive.py,sha256=B4VV6HNB3Bqd4tlqZ3jUQps8oqht_xOdBNOi9
 dmart/data_adapters/file/create_index.py,sha256=lUcUkepo9QUIQDDDgoPAL74_n16cZ_q0NKnITGmbF6I,11888
 dmart/data_adapters/file/create_users_folders.py,sha256=zOBgxMnqgEskYP4pgkmE6VYMca-ADLz8mXKPHJPYpys,1670
 dmart/data_adapters/file/custom_validations.py,sha256=ziOERgTr-eY_zrN0C41B2FYmpEyoKiV4holh8an-p2c,1754
-dmart/data_adapters/file/drop_index.py,sha256=OK3wXwaO9tUcHcJjqyLeBnkElzK35MZMi8YLGWdrXRw,1417
+dmart/data_adapters/file/drop_index.py,sha256=iczJVaEw22Q_x7u4GqyYCUdaeVUqLB8v5pCiONK24Ko,1441
 dmart/data_adapters/file/health_check.py,sha256=cMvwsXhjEykjrTyB3HtUn8QqKdtB_h5w8mGOEYPepzU,24221
 dmart/data_adapters/file/redis_services.py,sha256=83STcca5fYFaEVLRYAxfUQXeUQZqJOT8XH-GBSbkR-E,39914
 dmart/data_adapters/sql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -476,15 +476,15 @@ dmart/utils/query_policies_helper.py,sha256=Bf5qriQJ8CpUqPaQg5cdvNrn-92l_jKxHwsv
 dmart/utils/regex.py,sha256=cv9b_l_e8tz42mKckeeyDgypKqh2e71E28co2iuEVxA,2286
 dmart/utils/repository.py,sha256=9L-IvQ0Js0SQ5OR-Rh0i2Wdu4H9H06r8eE84hfBIu7Q,18313
 dmart/utils/router_helper.py,sha256=Tgoq3oakejdEeyeVieTNk38JsPZ8x5RuR0kw2THc1mI,604
-dmart/utils/settings.py,sha256=TOlW_ZWYQ_KyelPWCDg30V-fa1jsgazlek8agAPgkQ0,6036
+dmart/utils/settings.py,sha256=zCqwt3TDensl1xCdHomyog6nZnL4RfNICUA28shhOT0,7785
 dmart/utils/sms_notifier.py,sha256=04D6D_ldk3S9SojI7_381pqLc8v9lligeNHAysohz7w,550
 dmart/utils/social_sso.py,sha256=Dm1W6U9OwKbAeUwM-kwJBHFEoreeoN-s-RHdOZ1-cNg,2216
 dmart/utils/ticket_sys_utils.py,sha256=9QAlW2iiy8KyxQRBDj_WmzS5kKb0aYJmGwd4qzmGVqo,7005
 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.41.post36.dist-info/METADATA,sha256=-Zfx3kR9nmHBdVl702Fv_cK19tUNZ7LWMspHKTMhPiM,839
-dmart-1.4.41.post36.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dmart-1.4.41.post36.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.41.post36.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.41.post36.dist-info/RECORD,,
+dmart-1.4.41.post38.dist-info/METADATA,sha256=yeMaKBEPAL2egk8-U7R4GgIxQLl4sTt7KQh6MgtWbNA,839
+dmart-1.4.41.post38.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dmart-1.4.41.post38.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
+dmart-1.4.41.post38.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.41.post38.dist-info/RECORD,,