@pd4castr/cli 1.0.0 → 1.1.0

package/dist/index.js

@@ -126,17 +126,17 @@ async function isExistingPath(path15) {
 }
 
 // src/config/load-project-context.ts
-async function loadProjectContext() {
+async function loadProjectContext(configPath) {
   const projectRoot = process.cwd();
-  const configPath = path.join(projectRoot, PROJECT_CONFIG_FILE);
-  const configExists = await isExistingPath(configPath);
+  const resolvedConfigPath = configPath ? path.resolve(configPath) : path.join(projectRoot, PROJECT_CONFIG_FILE);
+  const configExists = await isExistingPath(resolvedConfigPath);
   if (!configExists) {
     throw new Error(
-      "No config found (docs: https://github.com/pipelabs/pd4castr-model-examples/blob/main/docs/005-config.md)."
+      `No config found at ${resolvedConfigPath} (docs: https://github.com/pipelabs/pd4castr-model-examples/blob/main/docs/005-config.md).`
     );
   }
   try {
-    const configFileContents = await fs2.readFile(configPath, "utf8");
+    const configFileContents = await fs2.readFile(resolvedConfigPath, "utf8");
     const rawConfig = JSON.parse(configFileContents);
     const config = projectConfigSchema.parse(rawConfig);
     return {
@@ -318,7 +318,7 @@ async function handleAction(options) {
   const spinner = ora("Starting data fetch...").start();
   try {
     const authCtx = await getAuth();
-    const ctx = await loadProjectContext();
+    const ctx = await loadProjectContext(options.config);
     const inputsWithFetchers = ctx.config.inputs.filter((input2) => input2.fetcher);
     if (inputsWithFetchers.length === 0) {
       spinner.info("No inputs with data fetchers found, skipping");
@@ -371,7 +371,7 @@ function registerFetchCommand(program2) {
     "-i, --input-dir <path>",
     "The input test data directory",
     TEST_INPUT_DATA_DIR
-  ).action(handleAction);
+  ).option("-c, --config <path>", "Path to config file", PROJECT_CONFIG_FILE).action(handleAction);
 }
 
 // src/commands/init/handle-action.ts
@@ -479,8 +479,9 @@ var auth0API = ky2.create({ prefixUrl: `https://${AUTH0_DOMAIN}` });
 // src/commands/login/utils/complete-auth-flow.ts
 var FAILED_AUTH_ERRORS = /* @__PURE__ */ new Set(["expired_token", "access_denied"]);
 async function completeAuthFlow(authCtx) {
+  const env = getEnv();
   const payload = {
-    client_id: AUTH0_CLIENT_ID,
+    client_id: env.auth0ClientId,
     grant_type: "urn:ietf:params:oauth:grant-type:device_code",
     device_code: authCtx.deviceCode
   };
@@ -662,11 +663,12 @@ async function triggerModelRun(modelId, authCtx) {
 import fs7 from "fs/promises";
 import path8 from "path";
 import { produce as produce2 } from "immer";
-async function updateProjectConfig(updateFn) {
-  const projectConfig = await loadProjectContext();
+async function updateProjectConfig(updateFn, configPath) {
+  const projectConfig = await loadProjectContext(configPath);
   const updatedConfig = produce2(projectConfig.config, updateFn);
+  const resolvedConfigPath = configPath ? path8.resolve(configPath) : path8.join(projectConfig.projectRoot, PROJECT_CONFIG_FILE);
   await fs7.writeFile(
-    path8.join(projectConfig.projectRoot, PROJECT_CONFIG_FILE),
+    resolvedConfigPath,
     JSON.stringify(updatedConfig, void 0, 2)
   );
 }
@@ -1018,7 +1020,7 @@ async function handleCreateModelFlow(options, app, spinner, ctx, authCtx) {
     config.$$modelGroupID = model.modelGroupId;
     config.$$revision = model.revision;
     config.$$dockerImage = model.dockerImage;
-  });
+  }, options.config);
   spinner.succeed("Model data published successfully");
   spinner.start(
     "Pushing model image to registry - this may take a few minutes..."
@@ -1116,7 +1118,7 @@ async function handleModelRevisionCreateFlow(options, app, spinner, ctx, authCtx
     config.$$modelGroupID = model.modelGroupId;
     config.$$revision = model.revision;
     config.$$dockerImage = model.dockerImage;
-  });
+  }, options.config);
   spinner.succeed("Model revision data published successfully");
   spinner.start(
     "Pushing new model revision image to registry - this may take a few minutes..."
@@ -1193,7 +1195,7 @@ async function handleModelRevisionUpdateFlow(options, app, spinner, ctx, authCtx
     config.$$modelGroupID = model.modelGroupId;
     config.$$revision = model.revision;
     config.$$dockerImage = model.dockerImage;
-  });
+  }, options.config);
   spinner.succeed("Model revision data updated successfully");
   spinner.start(
     "Pushing updated model image to registry - this may take a few minutes..."
@@ -1264,7 +1266,7 @@ async function handleAction5(options) {
     app.use(express2.urlencoded({ limit: "100mb", extended: true }));
     const webServer = __using(_stack, await startWebServer(app, options.port));
     try {
-      const ctx = await loadProjectContext();
+      const ctx = await loadProjectContext(options.config);
       const authCtx = await getAuth();
       await (ctx.config.$$id ? handleUpdateExistingModelFlow(options, app, spinner, ctx, authCtx) : handleCreateModelFlow(options, app, spinner, ctx, authCtx));
     } catch (error) {
@@ -1301,7 +1303,7 @@ function registerPublishCommand(program2) {
     "-p, --port <port>",
     "The port to run the IO testing webserver on",
     TEST_WEBSERVER_PORT.toString()
-  ).option("--sc, --skip-checks", "Skip the model I/O checks", false).option("--st, --skip-trigger", "Skip the model trigger", false).action(handleAction5);
+  ).option("--sc, --skip-checks", "Skip the model I/O checks", false).option("--st, --skip-trigger", "Skip the model trigger", false).option("-c, --config <path>", "Path to config file", PROJECT_CONFIG_FILE).action(handleAction5);
 }
 
 // src/commands/test/handle-action.ts
@@ -1319,7 +1321,7 @@ async function handleAction6(options) {
     app.use(express3.urlencoded({ limit: "100mb", extended: true }));
     const webServer = __using(_stack, await startWebServer(app, options.port));
     try {
-      const ctx = await loadProjectContext();
+      const ctx = await loadProjectContext(options.config);
       const inputFiles = getInputFiles(ctx.config);
       spinner.start("Checking test input data files");
       await checkInputFiles(inputFiles, options.inputDir, ctx);
@@ -1393,7 +1395,7 @@ function registerTestCommand(program2) {
     "-p, --port <port>",
     "The port to run the IO testing webserver on",
     TEST_WEBSERVER_PORT.toString()
-  ).action(handleAction6);
+  ).option("-c, --config <path>", "Path to config file", PROJECT_CONFIG_FILE).action(handleAction6);
 }
 
 // src/program.ts
@@ -1402,7 +1404,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@pd4castr/cli",
-  version: "1.0.0",
+  version: "1.1.0",
   description: "CLI tool for creating, testing, and publishing pd4castr models",
   main: "dist/index.js",
   type: "module",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pd4castr/cli",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "CLI tool for creating, testing, and publishing pd4castr models",
   "main": "dist/index.js",
   "type": "module",