@pd4castr/cli 1.3.0 → 1.4.0

package/dist/index.js

@@ -88,6 +88,12 @@ var sensitivitySchema = z.object({
   name: z.string(),
   query: z.string()
 });
+var inputAggregationSchema = z.object({
+  name: z.string(),
+  query: z.string(),
+  description: z.string().optional().default(""),
+  colours: z.array(z.string()).optional().default([])
+});
 var CONFIG_WARNING_KEY = "// WARNING: DO NOT MODIFY THESE SYSTEM MANAGED VALUES";
 var projectConfigSchema = z.object({
   name: z.string(),
@@ -102,7 +108,10 @@ var projectConfigSchema = z.object({
   ]),
   displayTimezone: z.string().refine(isIanaTimeZone, "invalid IANA time zone").optional().default("Australia/Brisbane"),
   metadata: z.record(z.string(), z.any()).optional(),
+  public: z.boolean().optional().default(false),
+  runDatetimeQuery: z.string().optional().nullable().default(null),
   inputs: z.array(modelInputSchema),
+  inputAggregations: z.array(inputAggregationSchema).optional().default([]),
   outputs: z.array(modelOutputSchema),
   sensitivities: z.array(sensitivitySchema).optional().default([]),
   [CONFIG_WARNING_KEY]: z.string().optional().default(""),
@@ -798,6 +807,8 @@ import path9 from "path";
 async function getModelConfigFromProjectConfig(ctx) {
   const inputs = await getInputsWithInlinedSQL(ctx);
   const sensitivities = await getSensitivitiesWithInlinedSQL(ctx);
+  const inputAggregations = await getInputAggregationsWithInlinedSQL(ctx);
+  const runDatetimeQuery = await getrunDatetimeQuerySQL(ctx);
   const { $$id, $$modelGroupID, $$revision, $$dockerImage, ...config } = ctx.config;
   return {
     ...config,
@@ -806,7 +817,9 @@ async function getModelConfigFromProjectConfig(ctx) {
     revision: $$revision ?? 0,
     dockerImage: $$dockerImage,
     inputs,
-    sensitivities
+    sensitivities,
+    inputAggregations,
+    runDatetimeQuery
   };
 }
 __name(getModelConfigFromProjectConfig, "getModelConfigFromProjectConfig");
@@ -860,6 +873,36 @@ async function getSensitivitiesWithInlinedSQL(ctx) {
   return sensitivitiesWithSQL;
 }
 __name(getSensitivitiesWithInlinedSQL, "getSensitivitiesWithInlinedSQL");
+async function getInputAggregationsWithInlinedSQL(ctx) {
+  const inputAggregationsWithSQL = [];
+  for (const inputAggregation of ctx.config.inputAggregations) {
+    const queryPath = path9.resolve(ctx.projectRoot, inputAggregation.query);
+    try {
+      const sql = await fs8.readFile(queryPath, "utf8");
+      inputAggregationsWithSQL.push({
+        ...inputAggregation,
+        query: sql
+      });
+    } catch {
+      throw new Error(`Input aggregation query file not found (${inputAggregation.query})`);
+    }
+  }
+  return inputAggregationsWithSQL;
+}
+__name(getInputAggregationsWithInlinedSQL, "getInputAggregationsWithInlinedSQL");
+async function getrunDatetimeQuerySQL(ctx) {
+  if (!ctx.config.runDatetimeQuery) {
+    return null;
+  }
+  const queryPath = path9.resolve(ctx.projectRoot, ctx.config.runDatetimeQuery);
+  try {
+    const sql = await fs8.readFile(queryPath, "utf8");
+    return sql;
+  } catch {
+    throw new Error(`Run datetime query file not found (${ctx.config.runDatetimeQuery})`);
+  }
+}
+__name(getrunDatetimeQuerySQL, "getrunDatetimeQuerySQL");
 
 // src/utils/log-empty-line.ts
 function logEmptyLine() {
@@ -883,10 +926,15 @@ function getModelSummaryLines(ctx) {
     `	${chalk2.bold("Revision:")} ${ctx.config.$$revision}`,
     `	${chalk2.bold("Forecast variable:")} ${ctx.config.forecastVariable}`,
     `	${chalk2.bold("Time horizon:")} ${ctx.config.timeHorizon}`,
+    `	${chalk2.bold("Public:")} ${ctx.config.public}`,
     `	${chalk2.bold("Inputs:")}`,
     ...ctx.config.inputs.map((input2) => `	\u2022 ${input2.key} - ${getInputType(input2)}`),
     `	${chalk2.bold("Outputs:")}`,
     ...ctx.config.outputs.map((output) => `	\u2022 ${output.name} - ${output.type}`),
+    ...ctx.config.inputAggregations.length > 0 ? [
+      `	${chalk2.bold("Input aggregations:")}`,
+      ...ctx.config.inputAggregations.map((agg) => `	\u2022 ${agg.name}`)
+    ] : [],
     ...ctx.config.sensitivities.length > 0 ? [
       `	${chalk2.bold("Sensitivities:")}`,
       ...ctx.config.sensitivities.map((s) => `	\u2022 ${s.name}`)
@@ -1642,7 +1690,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@pd4castr/cli",
-  version: "1.3.0",
+  version: "1.4.0",
   description: "CLI tool for creating, testing, and publishing pd4castr models",
   license: "UNLICENSED",
   main: "dist/index.js",
@@ -1659,7 +1707,7 @@ var package_default = {
   scripts: {
     build: "tsup",
     dev: "tsup --watch",
-    cli: "node dist/index.js",
+    pd4castr: "node dist/index.js",
     release: "semantic-release -e semantic-release-monorepo",
     format: "prettier --write .",
     lint: "eslint .",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pd4castr/cli",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "CLI tool for creating, testing, and publishing pd4castr models",
   "license": "UNLICENSED",
   "main": "dist/index.js",
@@ -17,7 +17,7 @@
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",
-    "cli": "node dist/index.js",
+    "pd4castr": "node dist/index.js",
     "release": "semantic-release -e semantic-release-monorepo",
     "format": "prettier --write .",
     "lint": "eslint .",