datagrok-tools 6.4.6 → 6.4.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +4 -0
- package/bin/commands/publish.js +8 -6
- package/bin/utils/queue-worker-gen.js +4 -3
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
# Datagrok-tools changelog
|
|
2
2
|
|
|
3
|
+
## 6.4.7 (2026-07-22)
|
|
4
|
+
|
|
5
|
+
* GROK-20452: `grok publish` — generate `dockerfiles/celery` / `dockerfiles/queue` **before** gathering files for the zip. They were generated after, so the generated Dockerfile never reached the server: `meta.queue` functions fell back to a server-side container named `<pkg>-queue-celery` while the client had built `<pkg>-queue` — image validation 404'd and the worker container never started ("Container is not started" on every call).
|
|
6
|
+
|
|
3
7
|
## 6.4.6 (2026-07-22)
|
|
4
8
|
|
|
5
9
|
* `grok test` — the whole-run Puppeteer cap (60 min) is now overridable via `GROK_TEST_INVOCATION_TIMEOUT_MS`. When the cap fires mid-pass all collected results are discarded (empty `test-report.csv`, "Passed tests: 0"), which CI reports as "no results produced"; loaded CI agents can now raise the cap instead.
|
package/bin/commands/publish.js
CHANGED
|
@@ -468,6 +468,14 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
|
|
|
468
468
|
const chunks = [];
|
|
469
469
|
zip.on('data', chunk => chunks.push(chunk));
|
|
470
470
|
|
|
471
|
+
// Generate Celery / Node-worker Docker artifacts BEFORE gathering files: the
|
|
472
|
+
// generated dockerfiles/<dir>/Dockerfile must land in the zip, or the server
|
|
473
|
+
// never binds the queue funcs to the client-built image and falls back to a
|
|
474
|
+
// differently-named server-side container that never starts
|
|
475
|
+
// (<pkg>-queue-celery vs the built <pkg>-queue).
|
|
476
|
+
(0, _pythonCeleryGen.generateCeleryArtifacts)(curDir);
|
|
477
|
+
(0, _queueWorkerGen.generateQueueArtifacts)(curDir);
|
|
478
|
+
|
|
471
479
|
// Gather the files
|
|
472
480
|
const localTimestamps = {};
|
|
473
481
|
const files = await (0, _ignoreWalk.default)({
|
|
@@ -558,12 +566,6 @@ async function processPackage(debug, rebuild, host, devKey, packageName, dropDb,
|
|
|
558
566
|
return 1;
|
|
559
567
|
}
|
|
560
568
|
|
|
561
|
-
// Generate Celery Docker artifacts from python/ if present
|
|
562
|
-
(0, _pythonCeleryGen.generateCeleryArtifacts)(curDir);
|
|
563
|
-
|
|
564
|
-
// Generate the Node worker container for meta.queue JS functions if present
|
|
565
|
-
(0, _queueWorkerGen.generateQueueArtifacts)(curDir);
|
|
566
|
-
|
|
567
569
|
// Process Docker images and inject image.json into the ZIP
|
|
568
570
|
let dockerVersion = json.version;
|
|
569
571
|
if (debug) {
|
|
@@ -9,9 +9,10 @@ var _fs = _interopRequireDefault(require("fs"));
|
|
|
9
9
|
var _path = _interopRequireDefault(require("path"));
|
|
10
10
|
var color = _interopRequireWildcard(require("./color-utils"));
|
|
11
11
|
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); }
|
|
12
|
-
// Matches `//meta.queue: true` in package.ts —
|
|
13
|
-
// in the Node worker
|
|
14
|
-
|
|
12
|
+
// Matches `//meta.queue: true` (or its alias `//meta.server: true`) in package.ts —
|
|
13
|
+
// functions executed as celery tasks in the Node worker
|
|
14
|
+
// (see help/develop/how-to/packages/js-server-functions.md).
|
|
15
|
+
const queueTrueRegex = /^\s*\/\/\s*meta\.(queue|server)\s*:\s*true\s*$/m;
|
|
15
16
|
const QUEUE_DIR = 'queue';
|
|
16
17
|
const TEMPLATE_NODE_DOCKER = `FROM datagrok/celery_node_worker:bleeding-edge
|
|
17
18
|
EXPOSE 8000
|
package/package.json
CHANGED