dmart 1.4.0__py3-none-any.whl → 1.4.2__py3-none-any.whl

bundler.py

@@ -2,7 +2,7 @@
 import json
 import subprocess
 import PyInstaller.__main__
-
+import os
 
 branch_cmd = "git rev-parse --abbrev-ref HEAD"
 result, _ = subprocess.Popen(branch_cmd.split(" "), stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
@@ -29,8 +29,7 @@ info = {
 
 json.dump(info, open('info.json', 'w'))
 
-
-PyInstaller.__main__.run([
+args = [
     'dmart.py',
     '--name=dmart',
     '--onefile',
@@ -41,4 +40,13 @@ PyInstaller.__main__.run([
     '--collect-submodules=concurrent_log_handler',
     '--collect-submodules=pythonjsonlogger',
     '--clean',
-])
+]
+
+cxb_path = 'cxb'
+if not os.path.isdir(cxb_path):
+    cxb_path = '../cxb/dist/client'
+
+if os.path.isdir(cxb_path):
+    args.append(f'--add-data={cxb_path}:cxb')
+
+PyInstaller.__main__.run(args)

{dmart-1.4.0.dist-info → dmart-1.4.2.dist-info}/METADATA

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

{dmart-1.4.0.dist-info → dmart-1.4.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-bundler.py,sha256=8gEQputdVfI8vda5Lkzw12blv7kYkmPLVbEWr_itLe0,1522
+bundler.py,sha256=so8ZJResb1PcOH5vboa_mpFAdYr_T8u8DbbFXd570Lg,1704
 data_generator.py,sha256=CnE-VHEeX7-lAXtqCgbRqR9WHjTuOgeiZcviYrHAmho,2287
-dmart.py,sha256=VgNH7vpzHBO2FcMztdwZBLq1TovzbkBFkXrZwn6dKjI,19712
+dmart.py,sha256=WugBannLMtYISbGPfK5Lak-2BPm14cFHNyJwkD-26RM,21711
 get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
-main.py,sha256=XqKHlgFy_S_EtvbGsSxiCMSApSU33BlTpv8T4UWX0yc,17351
+main.py,sha256=3UqzJUoiaZmcoL4yFInka5DMfh_-Agl-gHRCHELL2UM,19551
 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.0.dist-info/METADATA,sha256=vxNYgfiH0Y8TWKyFOmiXTx69CA-SOILtIqnt2Mj-7kY,2068
-dmart-1.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dmart-1.4.0.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
-dmart-1.4.0.dist-info/top_level.txt,sha256=JTypu1r5v9v7ru-60JSSbnSMEESHFRMacpcz-rPJx_U,262
-dmart-1.4.0.dist-info/RECORD,,
+dmart-1.4.2.dist-info/METADATA,sha256=Kyjoer4hkgh3VhudnHtnbyuJO5ZJzjfheq2QihC6sPI,2068
+dmart-1.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dmart-1.4.2.dist-info/entry_points.txt,sha256=GjfoGh1bpxuU9HHGJzbtCFPNptHv9TryxHMN3uBSKpg,37
+dmart-1.4.2.dist-info/top_level.txt,sha256=JTypu1r5v9v7ru-60JSSbnSMEESHFRMacpcz-rPJx_U,262
+dmart-1.4.2.dist-info/RECORD,,

dmart.py

@@ -11,6 +11,7 @@ import subprocess
 import sys
 import time
 import warnings
+import webbrowser
 from multiprocessing import freeze_support
 from pathlib import Path
 
@@ -29,6 +30,7 @@ from utils.settings import settings
 freeze_support()
 
 commands = """    server
+    serve
     hyper
     health-check
     create-index
@@ -49,7 +51,10 @@ sentinel = object()
 def hypercorn_main() -> int:
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        "application", help="The application to dispatch to as path.to.module:instance.path"
+        "application",
+        help="The application to dispatch to as path.to.module:instance.path",
+        nargs="?",
+        default="main:app"
     )
     parser.add_argument("--access-log", help="Deprecated, see access-logfile", default=sentinel)
     parser.add_argument(
@@ -83,7 +88,7 @@ def hypercorn_main() -> int:
         "-c",
         "--config",
         help="Location of a TOML config file, or when prefixed with `file:` a Python file, or when prefixed with `python:` a Python module.",  # noqa: E501
-        default=None,
+        default="hypercorn_config.toml",
     )
     parser.add_argument(
         "--debug",
@@ -210,6 +215,17 @@ def hypercorn_main() -> int:
     parser.add_argument(
         "-u", "--user", help="User to own any unix sockets.", default=sentinel, type=int
     )
+    parser.add_argument(
+        "--open-cxb",
+        help="Open CXB page in browser after server starts",
+        action="store_true",
+        default=False,
+    )
+    parser.add_argument(
+        "--cxb-config",
+        help="Path to CXB config.json",
+        default=sentinel,
+    )
 
     def _convert_verify_mode(value: str) -> ssl.VerifyMode:
         try:
@@ -314,6 +330,9 @@ def hypercorn_main() -> int:
         config.websocket_ping_interval = args.websocket_ping_interval
     if args.workers is not sentinel:
         config.workers = args.workers
+    
+    if args.cxb_config is not sentinel:
+        os.environ["DMART_CXB_CONFIG"] = args.cxb_config
 
     if len(args.binds) > 0:
         config.bind = args.binds
@@ -323,6 +342,32 @@ def hypercorn_main() -> int:
         config.quic_bind = args.quic_binds
     if len(args.server_names) > 0:
         config.server_names = args.server_names
+    
+    if args.open_cxb:
+        # Assuming default port 8282 if not specified in binds
+        port = 8282
+        host = "127.0.0.1"
+        
+        # Try to parse bind address if available
+        if len(args.binds) > 0:
+            try:
+                bind_parts = args.binds[0].split(":")
+                if len(bind_parts) == 2:
+                    host = bind_parts[0]
+                    port = int(bind_parts[1])
+                elif len(bind_parts) == 1:
+                    host = bind_parts[0]
+            except:
+                pass
+        
+        url = f"http://{host}:{port}{settings.cxb_url}/"
+        
+        def open_browser():
+            time.sleep(2)  # Give server a moment to start
+            webbrowser.open(url)
+            
+        import threading
+        threading.Thread(target=open_browser, daemon=True).start()
 
     return run(config)
 
@@ -336,13 +381,30 @@ def main():
 
     match sys.argv[0]:
         case "hyper":
-            if len(sys.argv) == 1:
-                print("Running Hypercorn with default settings")
-                default_params = "main:app --config hypercorn_config.toml"
-                print(f">{default_params}")
-                sys.argv = ["hyper"] + default_params.split(" ")
             hypercorn_main()
-        case "server":
+        case "server" | "serve":
+            # Check for --open-cxb flag in server command arguments
+            open_cxb = False
+            if "--open-cxb" in sys.argv:
+                open_cxb = True
+                sys.argv.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 open_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)
+                
+                import threading
+                threading.Thread(target=open_browser, daemon=True).start()
+
             asyncio.run(server())
         case "health-check":
             parser = argparse.ArgumentParser(

main.py

@@ -5,6 +5,7 @@ from starlette.datastructures import UploadFile
 from contextlib import asynccontextmanager
 import asyncio
 import json
+import os
 from os import getpid
 import sys
 import time
@@ -24,11 +25,12 @@ from fastapi.logger import logger
 from fastapi.encoders import jsonable_encoder
 from fastapi.exceptions import RequestValidationError
 from utils.access_control import access_control
-from fastapi.responses import ORJSONResponse
+from fastapi.responses import ORJSONResponse, FileResponse
 from hypercorn.asyncio import serve
 from hypercorn.config import Config
 from starlette.concurrency import iterate_in_threadpool
 from starlette.exceptions import HTTPException as StarletteHTTPException
+from starlette.staticfiles import StaticFiles
 import models.api as api
 from utils.settings import settings
 from asgi_correlation_id import CorrelationIdMiddleware
@@ -462,6 +464,51 @@ app.include_router(
 # load plugins
 asyncio.run(plugin_manager.load_plugins(app, capture_body))
 
+# Serve CXB
+cxb_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "cxb")
+if not os.path.exists(cxb_path):
+    # Try relative to project root (development mode)
+    project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    cxb_dist_path = os.path.join(project_root, "cxb", "dist", "client")
+    if os.path.isdir(cxb_dist_path):
+        cxb_path = cxb_dist_path
+
+if os.path.isdir(cxb_path):
+    @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")
+        if cxb_config and os.path.exists(cxb_config):
+            return FileResponse(cxb_config)
+            
+        # Priority 1: Check in current directory (where dmart is run)
+        if os.path.exists("config.json"):
+            return FileResponse("config.json")
+        
+        # Priority 2: Check in spaces folder (user directory)
+        user_config = settings.spaces_folder / "config.json"
+        if user_config.exists():
+            return FileResponse(user_config)
+            
+        # Priority 3: Check in bundled CXB directory
+        bundled_config = os.path.join(cxb_path, "config.json")
+        if os.path.exists(bundled_config):
+            return FileResponse(bundled_config)
+            
+        # Fallback to defaults generated from settings
+        return {
+            "title": "DMART Unified Data Platform",
+            "footer": "dmart.cc unified data platform",
+            "short_name": "dmart",
+            "display_name": "dmart",
+            "description": "dmart unified data platform",
+            "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"
+        }
+
+    app.mount(settings.cxb_url, StaticFiles(directory=cxb_path, html=True), name="cxb")
 
 @app.options("/{x:path}", include_in_schema=False)
 async def myoptions():
@@ -503,4 +550,3 @@ if __name__ == "__main__":
         asyncio.run(main())
     except Exception as e:
         print("[!1server]", e)
-

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"