MILAB-6915: structure update to v3

.changeset/config.json

@@ -2,7 +2,14 @@
   "$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "fixed": [],
+  "fixed": [
+    [
+      "@platforma-open/milaboratories.gpu-test",
+      "@platforma-open/milaboratories.gpu-test.model",
+      "@platforma-open/milaboratories.gpu-test.ui",
+      "@platforma-open/milaboratories.gpu-test.workflow"
+    ]
+  ],
   "linked": [],
   "access": "restricted",
   "baseBranch": "main",

.changeset/model-v3.md

@@ -0,0 +1,7 @@
+---
+"@platforma-open/milaboratories.gpu-test.model": minor
+"@platforma-open/milaboratories.gpu-test.ui": minor
+"@platforma-open/milaboratories.gpu-test": minor
+---
+
+Migrate block to BlockModelV3 with its kind. A template can preset the benchmark size and the CPU, RAM and GPU memory a run asks for; existing projects keep their settings through the legacy upgrade.

.changeset/structure-v3.md

@@ -0,0 +1,6 @@
+---
+"@platforma-open/milaboratories.gpu-test.gpu-info": patch
+"@platforma-open/milaboratories.gpu-test.workflow": patch
+---
+
+Structure updated to v3

.github/workflows/build.yaml

@@ -11,7 +11,7 @@ on:
   workflow_dispatch: {}
 jobs:
   init:
-    runs-on: ubuntu-latest
+    runs-on: hz-ubuntu-dind
     steps:
       - uses: milaboratory/github-ci/actions/context/init@v4
         with:
@@ -24,8 +24,10 @@ jobs:
     with:
       app-name: 'Block: Gpu Test'
       app-name-slug: 'block-gpu-test'
-      node-version: '20.x'
-      build-script-name: 'build'
+      node-version: '24.22.1'
+      gha-runner-label: hz-ubuntu-dind
+      build-script-name: 'build:dev-local'
+      build-before-publish-script-name: 'build:release'
       pnpm-recursive-build: false
 
       test: true
@@ -37,6 +39,11 @@ jobs:
       package-path: 'block'
       create-tag: 'true'
 
+      # Require the published `block` package to be bumped by a changeset on
+      # PRs (empty changeset or the `skip-changelog` label waives it). Needs
+      # the input to exist on the pinned `@v4` reusable workflow.
+      require-package-path-bump: true
+
       npmrc-config: |
         {
           "registries": {
@@ -56,6 +63,15 @@ jobs:
 
           "AWS_CI_IAM_MONOREPO_SIMPLE_ROLE": ${{ toJSON(secrets.AWS_CI_IAM_MONOREPO_SIMPLE_ROLE) }},
           "AWS_CI_TURBOREPO_S3_BUCKET": ${{ toJSON(secrets.AWS_CI_TURBOREPO_S3_BUCKET) }},
+
+          "HZ_CI_TURBO_S3_BUCKET": ${{ toJSON(vars.HZ_CI_TURBO_S3_BUCKET) }},
+          "HZ_CI_TURBO_S3_ENDPOINT": ${{ toJSON(vars.HZ_CI_TURBO_S3_ENDPOINT) }},
+          "HZ_CI_TURBO_S3_REGION": ${{ toJSON(vars.HZ_CI_TURBO_S3_REGION) }},
+          "HZ_CI_TURBO_S3_ACCESS_KEY": ${{ toJSON(secrets.HZ_CI_TURBO_S3_ACCESS_KEY) }},
+          "HZ_CI_TURBO_S3_SECRET_KEY": ${{ toJSON(secrets.HZ_CI_TURBO_S3_SECRET_KEY) }},
+          "HZ_CI_CACHE_S3_ACCESS_KEY": ${{ toJSON(secrets.HZ_CI_CACHE_S3_ACCESS_KEY) }},
+          "HZ_CI_CACHE_S3_SECRET_KEY": ${{ toJSON(secrets.HZ_CI_CACHE_S3_SECRET_KEY) }},
+
           "PL_REGISTRY_PLATFORMA_OPEN_UPLOAD_URL": ${{ toJSON(secrets.PL_REGISTRY_PLOPEN_UPLOAD_URL) }},
           "QUAY_USERNAME": ${{ toJSON(secrets.QUAY_USERNAME) }},
           "QUAY_ROBOT_TOKEN": ${{ toJSON(secrets.QUAY_ROBOT_TOKEN) }} }

.github/workflows/mark-stable.yaml

@@ -15,7 +15,7 @@ jobs:
     uses: milaboratory/github-ci/.github/workflows/block-mark-stable.yaml@v4
     with:
       app-name: 'Block: Gpu Test - Mark Stable'
-      node-version: '20.x'
+      node-version: '24.22.1'
       npmrc-config: |
         {
           "registries": {

.structure

@@ -1 +1 @@
-{"version":1}
+{"version":3}

block/package.json

@@ -19,13 +19,14 @@
   "scripts": {
     "build": "ts-builder build --target block-facade && block-tools pack",
     "prepublishOnly": "block-tools publish -r s3://milab-euce1-prod-pkgs-s3-block-registry/pub/releases/?region=eu-central-1 --registry-serve-url https://blocks.pl-open.science",
-    "do-pack": "pnpm pack && shx mv *.tgz package.tgz",
+    "do-pack": "shx rm -f package.tgz && pnpm pack && shx mv *.tgz package.tgz",
     "check": "ts-builder type-check --target block-facade"
   },
   "dependencies": {},
   "devDependencies": {
     "@milaboratories/ts-builder": "catalog:",
     "@milaboratories/ts-configs": "catalog:",
+    "@platforma-open/milaboratories.gpu-test.kind": "workspace:*",
     "@platforma-open/milaboratories.gpu-test.model": "workspace:*",
     "@platforma-open/milaboratories.gpu-test.ui": "workspace:*",
     "@platforma-open/milaboratories.gpu-test.workflow": "workspace:*",

kind/.oxfmtrc.json

@@ -0,0 +1,4 @@
+{
+  "extends": ["node_modules/@milaboratories/ts-builder/configs/oxfmt.json"],
+  "ignorePatterns": ["dist", "coverage", "CHANGELOG.md"]
+}

kind/.oxlintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["node_modules/@milaboratories/ts-builder/dist/configs/oxlint-node.json"]
+}

kind/package.json

@@ -0,0 +1,36 @@
+{
+  "name": "@platforma-open/milaboratories.gpu-test.kind",
+  "version": "1.0.0",
+  "private": true,
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "sources": "./src/index.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.js"
+    }
+  },
+  "scripts": {
+    "fmt": "ts-builder format",
+    "watch": "ts-builder build --target block-kind --watch",
+    "build": "ts-builder build --target block-kind && block-tools build-kind-manifest",
+    "check": "ts-builder check --target block-kind"
+  },
+  "dependencies": {
+    "@platforma-sdk/block-kind": "catalog:"
+  },
+  "devDependencies": {
+    "@milaboratories/ts-builder": "catalog:",
+    "@milaboratories/ts-configs": "catalog:",
+    "@platforma-sdk/block-tools": "catalog:"
+  },
+  "peerDependencies": {
+    "@types/node": "*",
+    "typescript": "*"
+  }
+}

kind/src/index.ts

@@ -0,0 +1,44 @@
+import { assertParamsObject, defineBlockKind } from "@platforma-sdk/block-kind";
+import { name, version } from "../package.json" with { type: "json" };
+
+/**
+ * This block's init-params contract — the shape a block of this kind receives
+ * at creation, and exactly what a project template serializes for it.
+ *
+ * The resources and the benchmark size a run asks for. The seed is left out: it
+ * only makes a run unique, so a template never carries one.
+ */
+export type BlockParams = {
+  matrixSize: string;
+  gpuMemory: string;
+  cpu: string;
+  mem: string;
+};
+
+/**
+ * The same contract at runtime, for params that arrive from a template file rather than
+ * from typed code. Each field is a string as the settings form holds it; an empty string
+ * means the default.
+ */
+function parseInitializationParams(value: unknown): BlockParams {
+  assertParamsObject(value);
+
+  const { matrixSize, gpuMemory, cpu, mem } = value;
+  if (typeof matrixSize !== "string")
+    throw new Error("'matrixSize' is required, and must be a string.");
+  if (typeof gpuMemory !== "string")
+    throw new Error("'gpuMemory' is required, and must be a string.");
+  if (typeof cpu !== "string") throw new Error("'cpu' is required, and must be a string.");
+  if (typeof mem !== "string") throw new Error("'mem' is required, and must be a string.");
+
+  return { matrixSize, gpuMemory, cpu, mem };
+}
+
+// Identity (`name`/`version`) comes from this package's own `package.json`, so
+// the on-wire `{name}@{version}` reference can never drift from what npm
+// publishes; the bundler inlines the JSON import.
+export const kind = defineBlockKind<BlockParams>({
+  name,
+  version,
+  parseInitializationParams,
+});

kind/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "@milaboratories/ts-configs/block/facade",
+  "compilerOptions": {
+    "outDir": "./dist",
+    "rootDir": ".",
+    "resolveJsonModule": true
+  },
+  "include": ["src/**/*", "package.json"],
+  "exclude": ["dist", "node_modules"]
+}

model/package.json

@@ -24,6 +24,7 @@
     "check": "ts-builder check --target block-model"
   },
   "dependencies": {
+    "@platforma-open/milaboratories.gpu-test.kind": "workspace:*",
     "@platforma-sdk/model": "catalog:"
   },
   "devDependencies": {

model/src/dataModel.ts

@@ -0,0 +1,25 @@
+import { kind } from "@platforma-open/milaboratories.gpu-test.kind";
+import { DataModelBuilder } from "@platforma-sdk/model";
+import type { BlockData, LegacyBlockArgs } from "./types";
+
+const randomSeed = () => Math.floor(Math.random() * 2147483647);
+
+export const blockDataModel = new DataModelBuilder({ kind })
+  .from<BlockData>("V20261105")
+  // The V1 block kept everything in args and had no UI state.
+  .upgradeLegacy<LegacyBlockArgs, Record<string, never>>(({ args }) => ({
+    seed: args?.seed ?? randomSeed(),
+    matrixSize: args?.matrixSize ?? "4000",
+    gpuMemory: args?.gpuMemory ?? "1GiB",
+    cpu: args?.cpu ?? "1",
+    mem: args?.mem ?? "1GiB",
+  }))
+  // `params` is absent when a block is created by hand rather than from a
+  // template, so every field the contract carries keeps its own default.
+  .init(({ params }) => ({
+    seed: randomSeed(),
+    matrixSize: params?.matrixSize ?? "4000",
+    gpuMemory: params?.gpuMemory ?? "1GiB",
+    cpu: params?.cpu ?? "1",
+    mem: params?.mem ?? "1GiB",
+  }));

model/src/index.ts

@@ -1,26 +1,29 @@
-import { BlockModel } from "@platforma-sdk/model";
+import { kind } from "@platforma-open/milaboratories.gpu-test.kind";
+import { BlockModelV3 } from "@platforma-sdk/model";
+import { blockDataModel } from "./dataModel";
+import type { BlockArgs } from "./types";
 
-export type BlockArgs = {
-  seed: number;
-  matrixSize: string;
-  gpuMemory: string;
-  cpu: string;
-  mem: string;
-};
+export type { BlockArgs, BlockData } from "./types";
 
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type -- UI state will be added in Step 8
-export type UiState = {};
+export const platforma = BlockModelV3.create({ dataModel: blockDataModel, kind })
+  // Every field is a run decision. Values are trimmed so stray whitespace
+  // typed into the form does not mark the block stale.
+  .args<BlockArgs>((data) => ({
+    seed: data.seed,
+    matrixSize: data.matrixSize.trim(),
+    gpuMemory: data.gpuMemory.trim(),
+    cpu: data.cpu.trim(),
+    mem: data.mem.trim(),
+  }))
 
-export const platforma = BlockModel.create()
-  .withArgs<BlockArgs>({
-    seed: Math.floor(Math.random() * 2147483647),
-    matrixSize: "4000",
-    gpuMemory: "1GiB",
-    cpu: "1",
-    mem: "1GiB",
-  })
-  .withUiState<UiState>({})
-  .argsValid(() => true)
+  // Inverse of `init`: the same fields, projected back out for template export.
+  // The seed stays behind — it only makes one run unique.
+  .templateParams((data) => ({
+    matrixSize: data.matrixSize,
+    gpuMemory: data.gpuMemory,
+    cpu: data.cpu,
+    mem: data.mem,
+  }))
 
   .output("gpuLog", (ctx) => ctx.outputs?.resolve("gpuLog")?.getLogHandle())
   .output("gpuInfo", (ctx) => ctx.outputs?.resolve("gpuInfo")?.getDataAsJson<GpuReport>())
@@ -29,7 +32,7 @@ export const platforma = BlockModel.create()
 
   .title(() => "GPU Detection")
   .sections(() => [{ type: "link" as const, href: "/" as const, label: "GPU Info" }])
-  .done(2);
+  .done();
 
 export interface GpuReport {
   seed: number;

model/src/types.ts

@@ -0,0 +1,27 @@
+/** The settings form, as the UI edits it. Strings as typed; an empty one means the default. */
+export type BlockData = {
+  /** Changes on every "Run again" so the run is not served from cache. */
+  seed: number;
+  matrixSize: string;
+  gpuMemory: string;
+  cpu: string;
+  mem: string;
+};
+
+/** What the workflow reads. */
+export type BlockArgs = {
+  seed: number;
+  matrixSize: string;
+  gpuMemory: string;
+  cpu: string;
+  mem: string;
+};
+
+/** Pre-V3 args shape, frozen snapshot for `upgradeLegacy`. */
+export type LegacyBlockArgs = {
+  seed: number;
+  matrixSize: string;
+  gpuMemory: string;
+  cpu: string;
+  mem: string;
+};

package.json

@@ -1,21 +1,23 @@
 {
   "scripts": {
-    "build": "turbo run build",
-    "build:dev": "env PL_PKG_DEV=local turbo run build",
-    "build:dev-remote": "env PL_PKG_DEV=local PL_DOCKER_BUILD=1 PL_DOCKER_AUTOPUSH=1 turbo run build",
+    "build:dev-remote": "env PL_BUILD_CHANNEL=dev PL_BUILD_VARIANT=all PL_BUILD_LOCATION=remote turbo run build",
     "lint": "turbo run lint",
     "type-check": "turbo run type-check",
-    "test": "env PL_PKG_DEV=local turbo run test --concurrency 1",
+    "test": "env PL_BUILD_CHANNEL=dev PL_BUILD_VARIANT=binary PL_BUILD_LOCATION=local turbo run test --concurrency 1",
     "do-pack": "turbo run do-pack",
     "watch": "turbo watch build",
     "changeset": "changeset",
     "version-packages": "changeset version",
     "update-sdk": "block-tools structure refresh --update-deps-only",
     "fmt": "turbo run fmt",
     "check": "turbo run check",
-    "test:dry-run": "env PL_PKG_DEV=local turbo run test --dry-run=json",
+    "test:dry-run": "env PL_BUILD_CHANNEL=dev PL_BUILD_VARIANT=binary PL_BUILD_LOCATION=local turbo run test --dry-run=json",
     "mark-stable": "turbo run mark-stable",
-    "upgrade-sdk": "block-tools structure refresh --update-deps-only && pnpm i && block-tools structure refresh && pnpm i && pnpm fmt"
+    "upgrade-sdk": "block-tools structure refresh --update-deps-only && pnpm i && block-tools structure refresh && pnpm i && pnpm fmt",
+    "build:dev-local": "env PL_BUILD_CHANNEL=dev PL_BUILD_VARIANT=all PL_BUILD_LOCATION=local turbo run build",
+    "build:dev-no-software": "env PL_BUILD_CHANNEL=dev PL_BUILD_VARIANT=none turbo run build",
+    "build:dev-binary-existing": "env PL_BUILD_CHANNEL=dev PL_BUILD_USE_PUBLISHED=true turbo run build",
+    "build:release": "env PL_BUILD_CHANNEL=release PL_BUILD_VARIANT=all PL_BUILD_LOCATION=remote turbo run build"
   },
   "devDependencies": {
     "@changesets/cli": "catalog:",
@@ -29,5 +31,12 @@
     "oxfmt": "*",
     "oxlint": "*"
   },
-  "packageManager": "pnpm@9.12.0"
+  "devEngines": {
+    "runtime": {
+      "name": "node",
+      "version": "24.22.1",
+      "onFail": "download"
+    }
+  },
+  "packageManager": "pnpm@12.16.1+sha512.091d1dee7927575661b25dab3c2ae31cafc1c54d6b71ed6a6600cf0c1cb10434a447eae14015f1b23e2e6bedeed79df94a932e2164d2832280dce3fb32f656d1"
 }