dmart 1.4.40.post32__py3-none-any.whl → 1.4.40.post33__py3-none-any.whl

dmart/dmart.py

@@ -9,6 +9,7 @@ import ssl
 import subprocess
 import sys
 import os
+import secrets
 sys.path.append(os.path.dirname(__file__))
 
 import time
@@ -20,7 +21,6 @@ from pathlib import Path
 
 from hypercorn.config import Config
 from hypercorn.run import run
-from utils.settings import settings
 
 # freeze_support()
 
@@ -46,6 +46,109 @@ commands = """
 
 sentinel = object()
 
+def ensure_dmart_home():
+    dmart_home = Path.home() / ".dmart"
+    dmart_home.mkdir(parents=True, exist_ok=True)
+
+    config_env = dmart_home / "config.env"
+    if not config_env.exists():
+        try:
+            (dmart_home / "logs").mkdir(parents=True, exist_ok=True)
+            (dmart_home / "spaces").mkdir(parents=True, exist_ok=True)
+            (dmart_home / "spaces" / "custom_plugins").mkdir(parents=True, exist_ok=True)
+            
+            jwt_secret = secrets.token_urlsafe(32)
+            
+            config_content = f"""# dmart configuration
+JWT_SECRET="{jwt_secret}"
+JWT_ALGORITHM="HS256"
+LOG_FILE="{dmart_home / 'logs' / 'dmart.ljson.log'}"
+WS_LOG_FILE="{dmart_home / 'logs' / 'websocket.ljson.log'}"
+
+# Database configuration
+ACTIVE_DATA_DB="file"
+SPACES_FOLDER="{dmart_home / 'spaces'}"
+DATABASE_DRIVER="sqlite+pysqlite"
+DATABASE_NAME="{dmart_home / 'dmart.db'}"
+
+# Server configuration
+LISTENING_HOST="0.0.0.0"
+LISTENING_PORT=8282
+"""
+            config_env.write_text(config_content)
+            print(f"Created default config.env at {config_env}")
+        except Exception as e:
+            print(f"Warning: Failed to create default config.env at {config_env}: {e}")
+
+    cli_ini = dmart_home / "cli.ini"
+    if not cli_ini.exists():
+        try:
+            default_config = ""
+            sample_path = Path(__file__).resolve().parent / "config.ini.sample"
+            if sample_path.exists():
+                with open(sample_path, "r") as f:
+                    default_config = f.read()
+            else:
+                default_config = (
+                    'url = "http://localhost:8282"\n'
+                    'shortname = "dmart"\n'
+                    'password = "xxxx"\n'
+                    'query_limit = 50\n'
+                    'retrieve_json_payload = True\n'
+                    'default_space = "management"\n'
+                    'pagination = 50\n'
+                )
+
+            login_creds_path = dmart_home / "login_creds.sh"
+            if login_creds_path.exists():
+                try:
+                    with open(login_creds_path, "r") as f:
+                        creds_content = f.read()
+                    
+                    match = re.search(r"export SUPERMAN='(.*?)'", creds_content)
+                    if match:
+                        creds_json = match.group(1)
+                        creds = json.loads(creds_json)
+                        if "shortname" in creds:
+                            default_config = re.sub(r'shortname = ".*"', f'shortname = "{creds["shortname"]}"', default_config)
+                        if "password" in creds:
+                            default_config = re.sub(r'password = ".*"', f'password = "{creds["password"]}"', default_config)
+                except Exception as e:
+                    print(f"Warning: Failed to parse login_creds.sh: {e}")
+
+            with open(cli_ini, "w") as f:
+                f.write(default_config)
+            print(f"Created default cli.ini at {cli_ini}")
+        except Exception as e:
+            print(f"Warning: Failed to create default cli.ini at {cli_ini}: {e}")
+
+    cxb_config = dmart_home / "config.json"
+    if not cxb_config.exists():
+        try:
+            sample_cxb_path = Path(__file__).resolve().parent / "cxb" / "config.sample.json"
+            if sample_cxb_path.exists():
+                shutil.copy2(sample_cxb_path, cxb_config)
+                print(f"Created default config.json at {cxb_config}")
+            else:
+                default_cxb_config = {
+                  "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": "http://localhost:8282",
+                  "websocket": "ws://0.0.0.0:8484/ws"
+                }
+                with open(cxb_config, "w") as f:
+                    json.dump(default_cxb_config, f, indent=2)
+                print(f"Created default config.json at {cxb_config}")
+        except Exception as e:
+            print(f"Warning: Failed to create default config.json at {cxb_config}: {e}")
+
+ensure_dmart_home()
+from utils.settings import settings
 
 def hypercorn_main() -> int:
     parser = argparse.ArgumentParser()
@@ -433,49 +536,6 @@ def main():
                     home_config = Path.home() / ".dmart" / "cli.ini"
                     if home_config.exists():
                         config_file = str(home_config)
-                    else:
-                        try:
-                            home_config.parent.mkdir(parents=True, exist_ok=True)
-                            
-                            default_config = ""
-                            sample_path = Path(__file__).resolve().parent / "config.ini.sample"
-                            if sample_path.exists():
-                                with open(sample_path, "r") as f:
-                                    default_config = f.read()
-                            else:
-                                default_config = (
-                                    'url = "http://localhost:8282"\n'
-                                    'shortname = "dmart"\n'
-                                    'password = "xxxx"\n'
-                                    'query_limit = 50\n'
-                                    'retrieve_json_payload = True\n'
-                                    'default_space = "management"\n'
-                                    'pagination = 50\n'
-                                )
-
-                            login_creds_path = Path.home() / ".dmart" / "login_creds.sh"
-                            if login_creds_path.exists():
-                                try:
-                                    with open(login_creds_path, "r") as f:
-                                        creds_content = f.read()
-                                    
-                                    match = re.search(r"export SUPERMAN='(.*?)'", creds_content)
-                                    if match:
-                                        creds_json = match.group(1)
-                                        creds = json.loads(creds_json)
-                                        if "shortname" in creds:
-                                            default_config = re.sub(r'shortname = ".*"', f'shortname = "{creds["shortname"]}"', default_config)
-                                        if "password" in creds:
-                                            default_config = re.sub(r'password = ".*"', f'password = "{creds["password"]}"', default_config)
-                                except Exception as e:
-                                    print(f"Warning: Failed to parse login_creds.sh: {e}")
-
-                            with open(home_config, "w") as f:
-                                f.write(default_config)
-                            print(f"Created default config at {home_config}")
-                            config_file = str(home_config)
-                        except Exception as e:
-                            print(f"Warning: Failed to create default config at {home_config}: {e}")
             
             if config_file:
                 os.environ["BACKEND_ENV"] = config_file
@@ -723,9 +783,9 @@ def main():
             if not sample_spaces_path.exists():
                 print("Error: Sample spaces not found in the package.")
                 sys.exit(1)
-            
+
             target_path = Path.home() / ".dmart" / "spaces"
-            
+
             try:
                 if target_path.exists():
                     shutil.rmtree(target_path)

dmart/main.py

@@ -41,6 +41,7 @@ from api.public.router import router as public
 from api.user.router import router as user
 from api.info.router import router as info, git_info
 from utils.internal_error_code import InternalErrorCode
+from pathlib import Path
 
 
 class SPAStaticFiles(StaticFiles):
@@ -503,6 +504,10 @@ if os.path.isdir(cxb_path):
         if user_config.exists():
             return FileResponse(user_config)
 
+        home_config = Path.home() / ".dmart" / "config.json"
+        if home_config.exists():
+            return FileResponse(home_config)
+
         bundled_config = os.path.join(cxb_path, "config.json")
         if os.path.exists(bundled_config):
             return FileResponse(bundled_config)

dmart/utils/settings.py

@@ -5,7 +5,6 @@ import os
 import random
 import re
 import string
-import secrets
 from venv import logger
 
 from pydantic import Field
@@ -25,36 +24,6 @@ def get_env_file():
         dmart_home = Path.home() / ".dmart"
         home_config = dmart_home / "config.env"
         
-        if not home_config.exists():
-            if not (os.path.exists(".git") or os.path.exists("setup.py")):
-                try:
-                    dmart_home.mkdir(parents=True, exist_ok=True)
-                    (dmart_home / "logs").mkdir(parents=True, exist_ok=True)
-                    (dmart_home / "spaces").mkdir(parents=True, exist_ok=True)
-                    (dmart_home / "spaces" / "custom_plugins").mkdir(parents=True, exist_ok=True)
-                    
-                    jwt_secret = secrets.token_urlsafe(32)
-                    
-                    config_content = f"""# dmart configuration
-JWT_SECRET="{jwt_secret}"
-JWT_ALGORITHM="HS256"
-LOG_FILE="{dmart_home / 'logs' / 'dmart.ljson.log'}"
-WS_LOG_FILE="{dmart_home / 'logs' / 'websocket.ljson.log'}"
-
-# Database configuration
-ACTIVE_DATA_DB="file"
-SPACES_FOLDER="{dmart_home / 'spaces'}"
-DATABASE_DRIVER="sqlite+pysqlite"
-DATABASE_NAME="{dmart_home / 'dmart.db'}"
-
-# Server configuration
-LISTENING_HOST="0.0.0.0"
-LISTENING_PORT=8282
-"""
-                    home_config.write_text(config_content)
-                except Exception:
-                    pass
-        
         if home_config.exists():
             return str(home_config)
 

{dmart-1.4.40.post32.dist-info → dmart-1.4.40.post33.dist-info}/METADATA

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

{dmart-1.4.40.post32.dist-info → dmart-1.4.40.post33.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=woSheqlEHQPGmBPLcOPjjo0tDq8s6XINTUqYX2G4PVM,32105
+dmart/dmart.py,sha256=IJ1PIoP0OcxXWnIhAugWwSq73gYA4dwI8D4-1LSbuK8,33797
 dmart/get_settings.py,sha256=Sbe2WCoiK398E7HY4SNLfDN_GmE8knR4M-YJWF31jcg,153
 dmart/hypercorn_config.toml,sha256=-eryppEG8HBOM_KbFc4dTQePnpyfoW9ZG5aUATU_6yM,50
 dmart/info.json,sha256=MM4SvhU44LXhSt8jMf8RX_XxQlfPAJkeQSshgBUjz0o,124
 dmart/login_creds.sh,sha256=Aht1LwL11uzR13sa8p3BdeUCprIa9tq0vzOoplJjH5U,235
 dmart/login_creds.sh.sample,sha256=Sb43HNNn1g11rrJrtDsPgAxcXu3_wJvdNn--8S62dTE,227
-dmart/main.py,sha256=yvbEoPfcUdzE65OCiDkP143AQvXWWsnVjlLPfZ9DFzA,19907
+dmart/main.py,sha256=EMsrV57yAf_LZbM-dY9ZkD6oEAFmdhIUQn9l81vmVn4,20072
 dmart/manifest.sh,sha256=K3mY5MsUlrTyHa5cARslkShegvXh-UeqJcE2UZobdrE,544
 dmart/migrate.py,sha256=hn1MZoVby_Jjqhc7y3CrLcGD619QmVZv3PONNvO7VKQ,665
 dmart/password_gen.py,sha256=xjx8wi105ZYvhLBBQj7_rugACpxifGXHse6f7YlGXWQ,196
@@ -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=_8WH9EvvO6R3Y7ddoWYTvvdFqVJM1-qeq-c6EV72968,7193
+dmart/utils/settings.py,sha256=TOlW_ZWYQ_KyelPWCDg30V-fa1jsgazlek8agAPgkQ0,6036
 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.40.post32.dist-info/METADATA,sha256=bXhmZ_knI4V33rfMalEMvh4WgR2lZbDJr7MwUAV8boE,839
-dmart-1.4.40.post32.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-dmart-1.4.40.post32.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
-dmart-1.4.40.post32.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
-dmart-1.4.40.post32.dist-info/RECORD,,
+dmart-1.4.40.post33.dist-info/METADATA,sha256=vst7VgejZJeBryCl7eW3Oln7i6Fa4cKa1JNQrHTKSOg,839
+dmart-1.4.40.post33.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+dmart-1.4.40.post33.dist-info/entry_points.txt,sha256=N832M4wG8d2GDw1xztKRVM3TnxpY2QDzvdFE8XaWaG8,43
+dmart-1.4.40.post33.dist-info/top_level.txt,sha256=zJo4qk9fUW0BGIR9f4DCfpxaXbvQXH9izIOom6JsyAo,6
+dmart-1.4.40.post33.dist-info/RECORD,,