datagrok-tools 6.3.1 → 6.3.3

package/CHANGELOG.md

@@ -1,7 +1,12 @@
 # Datagrok-tools changelog
 
-## 6.3.1 (WIP)
+## 6.3.3 (2026-06-16)
 
+* Fixed Celery Docker image generation — the image wasn't built locally on publish.
+
+## 6.3.2 (2026-06-15)
+
+* `func-gen` webpack plugin — generated RichFunctionView model inputs now use the script-form names (argument bounds/step `_t0`/`_t1`/`_h`, loop count `_count`) instead of the deprefixed forms, so the run, fitting, and sensitivity-analysis paths share one set of input names with diff-grok's pipeline. Fixes `Inconsistent inputs: "_t0" is missing` when starting fitting/SA from a Rich Function View.
 * `func-gen` webpack plugin — the generated RichFunctionView model output annotation appends the `DiffStudio Facet` viewer (last), alongside Grid and Line chart.
 * `grok stresstest` — run the ApiTests Node test runner directly via tsx (`src/package-test-node.ts`) instead of a compiled `dist-node` bundle; dropped the obsolete `npm run build-node` step and the `tsconfig-paths-bootstrap.js` / `dist-node` invocation.
 

package/bin/utils/python-celery-gen.js

@@ -8,6 +8,7 @@ exports.generateCeleryArtifacts = generateCeleryArtifacts;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var color = _interopRequireWildcard(require("./color-utils"));
+var _utils = require("./utils");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 // Header tags recognized in Python function metadata comments (ported from ScriptParser.headerTags)
 const headerTags = ['name', 'description', 'help-url', 'input', 'output', 'tags', 'sample', 'language', 'endpoint', 'requiresServer', 'param-csrfmiddlewaretoken', 'returns', 'test', 'sidebar', 'condition', 'top-menu', 'environment', 'require', 'editor-for', 'schedule', 'schedule.runAs', 'reference', 'editor'];
@@ -191,13 +192,16 @@ function copyDirContents(src, dest) {
 function useConda(dir) {
   return _fs.default.existsSync(_path.default.join(dir, 'environment.yaml')) || _fs.default.existsSync(_path.default.join(dir, 'environment.yml'));
 }
-function deployFolder(packageDir, folderPath, dirName) {
+
+// `dockerSubfolder` is the dockerfiles/ subdirectory name; the published image is
+// `<base>-<dockerSubfolder>` (see publish.discoverDockerfiles).
+function deployFolder(packageDir, folderPath, dockerSubfolder, base) {
   const tasks = scanPythonFunctions(folderPath, folderPath);
   if (tasks.length === 0) {
-    color.log(`No annotated Python functions found in ${dirName}`);
+    color.log(`No annotated Python functions found in ${dockerSubfolder}`);
     return false;
   }
-  const dockerfilesDir = _path.default.join(packageDir, 'dockerfiles', dirName);
+  const dockerfilesDir = _path.default.join(packageDir, 'dockerfiles', dockerSubfolder);
   _fs.default.mkdirSync(dockerfilesDir, {
     recursive: true
   });
@@ -211,8 +215,9 @@ function deployFolder(packageDir, folderPath, dirName) {
     tasks
   }, null, 2));
 
-  // Generate Celery entry point
-  const celeryName = dirName.replace(/-/g, '_');
+  // Entry point file name must equal $DATAGROK_CELERY_NAME (the image name, '-' -> '_'),
+  // so `celery -A $DATAGROK_CELERY_NAME` resolves it.
+  const celeryName = `${base}-${dockerSubfolder}`.replace(/-/g, '_');
   _fs.default.writeFileSync(_path.default.join(dockerfilesDir, celeryName + '.py'), TEMPLATE_PYTHON_ENTRY);
 
   // Copy Python source files
@@ -222,26 +227,27 @@ function deployFolder(packageDir, folderPath, dirName) {
   const containerJsonSrc = _path.default.join(folderPath, 'container.json');
   const containerJsonDest = _path.default.join(dockerfilesDir, 'container.json');
   if (_fs.default.existsSync(containerJsonSrc) && !_fs.default.existsSync(containerJsonDest)) _fs.default.copyFileSync(containerJsonSrc, containerJsonDest);
-  color.log(`Generated Celery Docker artifacts in dockerfiles/${dirName}/`);
+  color.log(`Generated Celery Docker artifacts in dockerfiles/${dockerSubfolder}/`);
   return true;
 }
 function generateCeleryArtifacts(packageDir) {
   const pythonDir = _path.default.join(packageDir, 'python');
   if (!_fs.default.existsSync(pythonDir)) return false;
+  const packageJson = JSON.parse(_fs.default.readFileSync(_path.default.join(packageDir, 'package.json'), 'utf-8'));
+  const base = (0, _utils.removeScope)(packageJson.name).toLowerCase();
   const entries = _fs.default.readdirSync(pythonDir, {
     withFileTypes: true
   });
-  const isNested = entries.length > 0 && entries.every(e => e.isDirectory);
+  const isNested = entries.length > 0 && entries.every(e => e.isDirectory());
   let generated = false;
   if (isNested) {
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
       const folderPath = _path.default.join(pythonDir, entry.name);
-      if (deployFolder(packageDir, folderPath, entry.name)) generated = true;
+      if (deployFolder(packageDir, folderPath, `${entry.name.toLowerCase()}-celery`, base)) generated = true;
     }
   } else {
-    const dirName = _path.default.basename(packageDir).toLowerCase();
-    if (deployFolder(packageDir, pythonDir, dirName)) generated = true;
+    if (deployFolder(packageDir, pythonDir, 'celery', base)) generated = true;
   }
   return generated;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datagrok-tools",
-  "version": "6.3.1",
+  "version": "6.3.3",
   "description": "Utility to upload and publish packages to Datagrok",
   "homepage": "https://github.com/datagrok-ai/public/tree/master/tools#readme",
   "dependencies": {

package/plugins/func-gen-plugin.js

@@ -48,20 +48,19 @@ function preparseIvpModel(parser, text) {
   }
   if (!ivp || !ivp.name) return null;
 
-  // User-facing input names carry no `_` prefix, so that `propagateChoice` lookups can map their
-  // dataframe columns to inputs by exact name. `scriptKey` is the name the generated DiffStudio
-  // script expects (arg bounds/step and the loop count are `_`-prefixed there) and is used only
-  // when forwarding values to `runDiffStudioModel`.
+  // Input names use the script-form names (arg bounds/step `_`-prefixed, loop count `_count`) so the
+  // run path, the diff-grok fitting/SA pipeline, and `propagateChoice` lookups all agree on one set
+  // of names. `scriptKey` mirrors `name`; it is kept only for the value-forwarding map below.
   const mk = (type, name, scriptKey, input) =>
     ({tsType: 'number', name, scriptKey,
       annotation: `//input: ${type} ${name} = ${input.value} ${input.annot ?? ''}`.trim()});
 
   const inputs = [];
   const a = ivp.arg.name;
-  if (ivp.loop) inputs.push(mk('int', 'count', '_count', ivp.loop.count));
-  inputs.push(mk('double', `${a}0`, `_${a}0`, ivp.arg.initial));
-  inputs.push(mk('double', `${a}1`, `_${a}1`, ivp.arg.final));
-  inputs.push(mk('double', 'h', '_h', ivp.arg.step));
+  if (ivp.loop) inputs.push(mk('int', '_count', '_count', ivp.loop.count));
+  inputs.push(mk('double', `_${a}0`, `_${a}0`, ivp.arg.initial));
+  inputs.push(mk('double', `_${a}1`, `_${a}1`, ivp.arg.final));
+  inputs.push(mk('double', '_h', '_h', ivp.arg.step));
   for (const [k, v] of ivp.inits) inputs.push(mk('double', k, k, v));
   if (ivp.params) for (const [k, v] of ivp.params) inputs.push(mk('double', k, k, v));