datalex-cli 1.0.0__tar.gz → 1.0.1__tar.gz

{datalex_cli-1.0.0 → datalex_cli-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datalex-cli
-Version: 1.0.0
+Version: 1.0.1
 Summary: Git-native data modeling for dbt users
 Author-email: DuckCode AI Labs <hello@duckcode.ai>
 License: MIT

{datalex_cli-1.0.0 → datalex_cli-1.0.1}/datalex_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datalex-cli
-Version: 1.0.0
+Version: 1.0.1
 Summary: Git-native data modeling for dbt users
 Author-email: DuckCode AI Labs <hello@duckcode.ai>
 License: MIT

{datalex_cli-1.0.0 → datalex_cli-1.0.1}/packages/cli/src/datalex_cli/main.py

@@ -1465,28 +1465,31 @@ def cmd_serve(args: argparse.Namespace) -> int:
     env["DM_PYTHON"] = sys.executable
 
     # The api-server resolves the CLI script via `join(REPO_ROOT, "dm")`
-    # in ~20 call sites. In a repo clone that file exists; in a pip
-    # install it doesn't. Writing a small shim next to REPO_ROOT lets
-    # every existing callsite keep working without touching the
-    # api-server source. If the shim path is already present (dev
-    # clone), we leave it alone.
-    dm_shim = Path(project_dir) / "dm"
-    if not dm_shim.exists():
+    # (and, post-rename, `join(REPO_ROOT, "datalex")`) in ~20 call sites.
+    # In a repo clone those files exist; in a pip install they don't.
+    # Writing small shims next to REPO_ROOT lets every existing callsite
+    # keep working without touching the api-server source. If a shim
+    # path is already present (dev clone), we leave it alone.
+    shim_body = (
+        "#!{py}\n"
+        "import sys\n"
+        "from datalex_cli.main import main\n"
+        "raise SystemExit(main())\n".format(py=sys.executable)
+    )
+    for shim_name in ("dm", "datalex"):
+        shim_path = Path(project_dir) / shim_name
+        if shim_path.exists():
+            continue
         try:
-            dm_shim.write_text(
-                "#!{py}\n"
-                "import sys\n"
-                "from datalex_cli.main import main\n"
-                "raise SystemExit(main())\n".format(py=sys.executable)
-            )
+            shim_path.write_text(shim_body)
             try:
-                dm_shim.chmod(0o755)
+                shim_path.chmod(0o755)
             except Exception:
                 pass
         except Exception as err:
             # Read-only project dir is fine: we'll hit API errors for
             # subprocess-backed routes but the UI still loads.
-            print(f"[datalex] Note: could not write CLI shim at {dm_shim}: {err}")
+            print(f"[datalex] Note: could not write CLI shim at {shim_path}: {err}")
 
     # Auto-register the --project-dir folder as a DataLex project so the UI
     # opens directly into it instead of the "model-examples" default. We only

{datalex_cli-1.0.0 → datalex_cli-1.0.1}/packages/core_engine/src/datalex_core/_server/index.js

@@ -2856,7 +2856,8 @@ app.post("/api/forward/dbt-sync", requireAdmin, express.json({ limit: "5mb" }),
     let errorMsg = "";
 
     try {
-      execFileSync(PYTHON, [join(REPO_ROOT, "datalex"), "dbt", "sync", tmpModel, "--dbt-schema", tmpDbt, "--out", tmpOut], {
+      const { cmd, argv } = dmExec("dbt", "sync", tmpModel, "--dbt-schema", tmpDbt, "--out", tmpOut);
+      execFileSync(cmd, argv, {
         encoding: "utf-8",
         timeout: 30000,
         cwd: REPO_ROOT,
@@ -2981,8 +2982,7 @@ app.post("/api/dbt/import", requireAdmin, express.json({ limit: "2mb" }), async
     const skipWh =
       typeof skipWarehouse === "boolean" ? skipWarehouse : Boolean(gitUrl);
 
-    const cliArgs = [
-      join(REPO_ROOT, "datalex"),
+    const dbtImportArgs = [
       "dbt",
       "import",
       "--project-dir",
@@ -2991,14 +2991,15 @@ app.post("/api/dbt/import", requireAdmin, express.json({ limit: "2mb" }), async
       outDir,
       "--json",
     ];
-    if (skipWh) cliArgs.push("--skip-warehouse");
-    if (target) cliArgs.push("--target", String(target));
-    if (manifest) cliArgs.push("--manifest", String(manifest));
+    if (skipWh) dbtImportArgs.push("--skip-warehouse");
+    if (target) dbtImportArgs.push("--target", String(target));
+    if (manifest) dbtImportArgs.push("--manifest", String(manifest));
 
     let report = null;
     let importError = null;
     try {
-      const stdout = execFileSync(PYTHON, cliArgs, {
+      const { cmd, argv: cliArgs } = dmExec(...dbtImportArgs);
+      const stdout = execFileSync(cmd, cliArgs, {
         cwd: REPO_ROOT,
         encoding: "utf-8",
         timeout: 180000, // 3 min — git + dbt parse can be slow on first run
@@ -3753,18 +3754,19 @@ app.post("/api/connectors/pull/stream", express.json(), async (req, res) => {
     return res.end();
   }
 
-  const args = [join(REPO_ROOT, "datalex"), "pull", connector, ...conn.args];
-  if (model_name) args.push("--model-name", model_name);
+  const pullArgs = ["pull", connector, ...conn.args];
+  if (model_name) pullArgs.push("--model-name", model_name);
   if (tables) {
     const list = typeof tables === "string"
       ? tables.split(",").map((t) => t.trim()).filter(Boolean)
       : tables;
-    if (list.length) args.push("--tables", ...list);
+    if (list.length) pullArgs.push("--tables", ...list);
   }
-  if (project_dir) args.push("--project-dir", project_dir, "--create-project-dir");
-  if (dbt_layout === false) args.push("--no-dbt-layout");
+  if (project_dir) pullArgs.push("--project-dir", project_dir, "--create-project-dir");
+  if (dbt_layout === false) pullArgs.push("--no-dbt-layout");
 
-  const child = spawn(PYTHON, args, { cwd: REPO_ROOT });
+  const { cmd, argv } = dmExec(...pullArgs);
+  const child = spawn(cmd, argv, { cwd: REPO_ROOT });
   let stdoutBuf = "";
   let stderrBuf = "";
 

{datalex_cli-1.0.0 → datalex_cli-1.0.1}/packages/core_engine/src/datalex_core/_server/package.json

@@ -1,7 +1,7 @@
 {
   "name": "datalex-api-server",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "scripts": {
     "start": "node index.js",

{datalex_cli-1.0.0 → datalex_cli-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "datalex-cli"
-version = "1.0.0"
+version = "1.0.1"
 description = "Git-native data modeling for dbt users"
 readme = "README.md"
 requires-python = ">=3.9"