Files
solvecraft/assets/render/physical/tools/export_library.py
selune 9e6e0b8df1 Render workspace: complete experimental ribbon, resources and effects integration (#5493) (#5494)
* wip(render): reconcile completed material and image pipeline source with 0.20 (#5493)

Source-only integration reference for staged review, not a merge-ready aggregate.
Donor: 0xlillith/solidcraft@aea20b0115.
Upstream: 858e5995d6.

Retain original CPU/material contracts and explicit GPU donor provenance in
docs/render-materials-lab.md (#2067, #2191, #2780, #3306). Preserve released
format migrations and current navigation/startup/shell behavior. New saved
records use pending descriptors. The physical-card descriptor follows the
maintainer's material-engineering-cards naming request, with a legacy-lab
format-29 regression. Replace raw new panel hosts with shared containers.

Repository checks, complete workspace/all-target Clippy, and the independent
physical/resource authoring checks pass for this source. The fresh full local
CI invocation has reached test compilation and is not yet complete. Do not
transfer donor native output or prior test totals to this integration.

Generated review screenshots, video, package ZIP and machine logs remain at
the immutable personal evidence pin. Uncommitted geometric displacement is
backed up separately, not silently included. No kernel/vendor change, direct
main write, release or independent contributor-branch rewrite.

Co-authored-by: Christian Svensson <blue@cmd.nu>

* test(cli): pin the Compact camera-sample admission diagnostic (#5493)

The bounded request still refuses 1024x1024x64 samples before host initialization and writes no output. Update only the stale expected diagnostic to the existing Compact budget wording; production limits and code are unchanged. Exact-tree CLI regression suite: 14 passed, 0 failed. The full repository gate has been invoked separately and is not yet complete.

* Normalize UI container violation paths across platforms

Report repository-relative paths with forward slashes so diagnostics and the existing nested-package regression assertions agree on Windows and Unix. Keep the container detection rules unchanged.

Validation: official ui-containers gate and all seven focused xtask tests passed; rustfmt and diff checks passed. Only xtask/dependencies were compiled; no application build or heavy tests.
(cherry picked from commit 44b58d8e10)

* fix(render): preserve camera contracts and correct acceptance regressions (#5493)

Preserve Design view.apply semantics with a separate strict Render camera command. Retain existing translations when English-only aliases collide; add material-axis entries and camera-specific pitch labels. Compare complete validated engineering cards and retain job handles before cancellation.

Focused and native acceptance is pinned to tree f8a423b21f. Full CI has been invoked separately and is not claimed green. Landing follows the render integration policy in #5493.

* fix(render): resolve showcase licence and upstream resource hygiene (#5493)

Record SychPL's explicit MIT OR Apache-2.0 grant, retaining source/model bytes and the Ubuntu lettering notice. Remove 80 absent attribution rows, personal fork records, dead delivery attributes and three fork/resource-only workflows. Existing xtask assets now performs bounded offline hash checks and rejects orphan render attribution; no parallel draft CI or package installation. Original authoring reproduction remains explicit. Scoped xtask tests, assets, Clippy, formatting and prepared SELENE validation pass; no application or renderer-wide result is inferred.

* fix(render): align saved bounds and progressive sample resolution (#5493)

Address review r4364211669/r4364211677/r4364211681/r4364211691/r4364211695. Persisted light/frame domains respect the existing 1e9 document bound; related LED/rectangle/direction cases use the same bound. Workstation primary resolve shares the 4096 admission cap and film counters use checked conversions. Exact candidate: 485 CPU render tests, 21 render document tests and strict scoped Clippy pass, including positive boundary round trips and 2048/4096 end-to-end checkpoints. No released format/migration edits, relaxed test limits or full-stack acceptance claim.

* wip(render): isolate optional resources and harden sample handling (#5493)

Review work in progress: opt-in encoded render library with reproducible runtime catalog exports; native-only robust dependency through the workspace; checked bloom slices; per-sample point-light diagnostics; independent area-light spatial/film keys. Resource-module binaries in both configurations, generation, Cargo production feature graphs and attribution checks pass. Full engine/render regression and combined acceptance are pending: do not merge this donor as a constituent or treat scoped resource proof as runtime acceptance.

* fix(gpu): preserve donor allocations through the scope-safety repair (#5722)

Port the native-validated #5723 scope-cleanup correction into the experimental donor, retaining its adaptive, volume, aging, photographic and bloom allocations. Same reverse-drain helper and regression cases; the donor combination still needs its own compile/test gate and is not covered retroactively by render-base results.

* claim: #1369

* Reject unknown pending concepts after format folding (#1369)

* test(render): close bounded sampling and bloom review regressions (#5493)

Validate the optional-resource/lighting/dependency donor at its exact tree. Required Vulkan GPU 127/0/3; CPU renderer 487/0; engine Render 72/0; document render 21/0; lean library 7/0; strict scoped Clippy, assets/layers/lists/containers and lean-engine WASM pass. Preserve original failed controller/typing attempts. This is the draft donor/disposition source, not a replacement for constituent render PRs or final main acceptance.

* wip(render): preserve stable aging target validation candidate

Exact staged source from prior review work on donor 3b892eab5e. This is a recovery/review checkpoint, NOT accepted delivery. An actual command-path regression currently fails because the selected executor refuses ordered surface aging. No assertion, capability or admission limit is weakened. Native/UI/full combination acceptance remains pending. Saved/runtime split adds one pending descriptor and retains original file scope; no main/render branch is changed.

* test(render): preserve numeric setup intent at the admitted coordinate bound

Follow up jyviko review on #5494 without weakening the corrected saved-coordinate contract. The positive clicked fixture uses 1e9 instead of inadmissible 2e9; explicit out-of-range cases still refuse, and the full saved setup round-trips through JSON and the native container. Exact-source Render workspace 95/0 and strict all-target UI Clippy pass. This does not incorporate the separately failing stable-aging candidate or claim full current-render acceptance.

* test(render): use the real GPU executor for saved aging

Move successful native cold-reopen Check/Start coverage from the CPU-backed protocol fixture into the production GPU executor tests. Verify capture-index changes preserve the stable target and that enabling aging changes both PNG and raw EXR output. Retain explicit, allocation-free refusal coverage for executors without aging support. Production capabilities and admission checks are unchanged.

* fix(render): persist stable identities for targeted aging (#5493)

Separate saved RenderBodyTarget identities from captured mesh ordinals. Reject legacy ambiguous targets, resolve Check/Start after visibility changes and preserve native reopening, copies and undo. Unsupported executors still refuse; real AMD Vulkan regression completes saved aging after reordered capture.

Source tree 6b84c8ad passes document 23, engine Render 75, GPU effects 5 and Render UI 95 with no failures; scoped strict Clippy, WASM and repository gates pass. Fresh CLI/native reopen and clean/aged GPU exports pass with identical physical totals and inspected actual images. Whole current-render integration is separate.

* fix(render): reconcile combined CPU/GPU contracts on current upstream

Unify captured resources/status and CPU-vs-GPU request schemas after the real two-parent integration; remove obsolete duplicate Vulkan selector and retain combined platform-filter regression. Deduplicate only identical or superseded test definitions, retaining the stronger card metadata and reserved-executor assertions. No assertions, admission limits or feature refusals are weakened.

All targets of render dependencies, GPU, engine, UI, CLI and native app pass cargo check with raytrace-cpu and bundled-render-library at tree c70d00d1. Native executable tests and full current-source acceptance remain pending. This is a private integration rehearsal for subsequent constituent PRs, not an aggregate official render/main merge.

* test(render): retain one complete host lifetime regression set

Deduplicate byte-identical DropProbe/task-lifetime tests and retain the adapted environment/texture ownership regressions with every assertion and complete memory estimate. Keep the registered-geometry admission regression once; only struct field order differed. Replace a one-element diagnostic loop with its equivalent block, preserving all wrap/width assertions.

Test-only integration repair. Formatting and diff checks pass; refreshed executable validation is required. No production behavior, limits, assertions or ignores changed.

* fix(doc): recognize the proven format-29 card descriptor alias

Normalize only the historical format-29 physical-material-cards spelling, and only when material-engineering-cards is registered. Admission and migration de-duplication use the same identity. Unknown concepts, wrong versions and incapable readers still refuse before mutation. Six controlled-history Rust regressions and actual CLI migration/no-clobber acceptance pass. No version, released migration or CI changes. Refs #5793, #1369, #5493.

* test(render): preserve grounding refusal before explicit instance moves

Update the two Render binding fixtures for upstream first-occurrence grounding. Verify grounded movement refuses without changing document/history, then explicitly unground through the public command before the intended move. Retain every target, resource, copy and persistence assertion. Refs #5493.

---------

Co-authored-by: Christian Svensson <blue@cmd.nu>
Co-authored-by: Victor Santos Oliveira <56417388+Vittuu@users.noreply.github.com>
Co-authored-by: cfaulkingham <colin.faulkingham@gmail.com>
2026-10-24 14:21:59 +00:00

179 lines
10 KiB
Python

#!/usr/bin/env python3
"""Export chosen reference materials through a trusted card-capable SolidCraft CLI.
A fresh command-line session creates no geometry or body assignments. The native
application owns library-v2 serialization and content revisions. All output stays
in a new review directory under target/. Older scalar-only executables refuse
before any material is created. Public reference data is not design certification.
"""
from __future__ import annotations
import argparse
from datetime import datetime, timezone
import hashlib
import json
from pathlib import Path
import subprocess
import sys
import tempfile
import physical as p
MAX_OUTPUT = 16 * 1024 * 1024
PACK_ID = "tangency.physical-references"
SOURCE_FILES = ("profiles.json", "sources.json", "bindings.json", "quantities.json",
"exports/native-cards.json", "tools/physical.py", "tools/export_library.py")
def input_pins() -> dict[str, str]:
return {name: p.sha(p.PACK/name) for name in SOURCE_FILES}
def selection(ids: list[str] | None, acknowledge: bool) -> dict:
p.require(acknowledge, "Explicit --acknowledge-reference is required")
before = input_pins()
p.validate()
profiles, sources, _ = p.load()
selected, omitted = [], []
names = sorted(profiles) if ids is None else ids
p.require(isinstance(names, list) and 0 < len(names) <= 256, "Select 1..256 profiles")
p.require(all(isinstance(name, str) for name in names) and len(names) == len(set(names)), "Duplicate or invalid selected profile")
for id in names:
p.require(id in profiles, f"Unknown profile: {id}")
native = p.native_card(profiles[id], sources)
density = next((row for row in native['card']['properties'] if row['data']['kind'] == 'density'), None)
if density is None:
omitted.append({'profile_id': id, 'reason': 'No supported point density; no nominal midpoint or unrelated substrate is substituted.'})
continue
selected.append({'profile_id': id, 'material_form': profiles[id]['material_form'],
'command': p.prepare(id, True)['commands'][0],
'extended_property_ids': [row['id'] for row in native['not_projected']]})
p.require(selected, "No selected reference has a supported point density")
p.require(before == input_pins(), "Source revision changed during plan preparation")
return {'schema': 'solidcraft-physical-library-plan/1', 'executed': False,
'reference_selection_required': True, 'assigns_bodies': False,
'id': PACK_ID, 'input_sha256': before, 'materials': selected, 'omitted': omitted,
'preserve_extended_profiles': True,
'required_contract': 'material.create physical_card, material.inspect, solidcraft-library/2'}
def registry_check(registry: object) -> None:
p.require(isinstance(registry, list) and len(registry) <= 4096, "Invalid native command registry")
p.require(all(isinstance(row, dict) and isinstance(row.get('id'), str) for row in registry), "Malformed native command record")
commands = {row['id']: row for row in registry}
p.require(len(commands) == len(registry), "Duplicate command ID")
for name in ('file.new', 'material.create', 'material.inspect', 'library.export', 'library.inspect'):
p.require(name in commands, f"Native command unavailable: {name}")
p.require(all(isinstance(commands[name].get('params'), str) for name in ('material.create', 'library.export')), 'Malformed native parameter documentation')
p.require('physical_card' in commands['material.create'].get('params', ''),
"This executable cannot preserve physical cards; scalar material creation is refused")
p.require('solidcraft-library/2' in commands['library.export'].get('params', ''),
"Native library-v2 export is required; scalar export would lose engineering data")
def invoke(cli: Path, arguments: list[str]) -> object:
# Capture into temporary files, then enforce the JSON byte budget before reading.
with tempfile.TemporaryFile() as out, tempfile.TemporaryFile() as err:
result = subprocess.run([str(cli), *arguments], cwd=p.ROOT, stdout=out, stderr=err, timeout=180)
p.require(out.tell() <= MAX_OUTPUT and err.tell() <= MAX_OUTPUT, "CLI output exceeds the diagnostic budget")
err.seek(0)
p.require(result.returncode == 0, 'Native command failed: ' + err.read(2048).decode(errors='replace'))
out.seek(0)
return json.load(out, object_pairs_hook=p.unique, parse_constant=p.reject_constant)
def verify_catalog(catalog: object, plan: dict) -> None:
p.require(isinstance(catalog, dict) and catalog.get('format') == 'solidcraft-library/2', "Native export did not produce library v2")
p.require(catalog.get('id') == PACK_ID, "Wrong native library identity")
entries = catalog.get('entries')
p.require(isinstance(entries, list) and len(entries) == len(plan['materials']), "Missing or extra native materials")
expected = {row['command']['params']['name']: row['command']['params'] for row in plan['materials']}
found = set()
for entry in entries:
p.require(isinstance(entry, dict), "Invalid native entry")
definition = entry.get('definition', {})
p.require(isinstance(definition, dict) and definition.get('kind') == 'material', "Unexpected appearance entry")
value = definition.get('value', {})
p.require(isinstance(value, dict), "Invalid material definition")
name = value.get('name')
p.require(name in expected and name not in found, "Unknown or duplicate exported material")
found.add(name)
reference = expected[name]
p.require(value.get('density_g_cm3') == reference['density_g_cm3'], "Assigned reference density changed")
p.require(value.get('physical_card') == reference['physical_card'], "A physical card, source or condition was changed or dropped")
p.require(value.get('appearance') is None, "Physical export must not assign a visual appearance")
revision = entry.get('revision', '')
p.require(isinstance(revision, str) and len(revision) == 64 and all(c in '0123456789abcdef' for c in revision), "Invalid native revision")
# Revisions are subsequently verified by the real library.inspect command,
# not a parallel Python approximation of serde's ordering/float formatting.
def library_command(path: Path) -> dict:
return {'command': 'library.export', 'params': {
'path': str(path), 'id': PACK_ID, 'name': 'Physical references - select grade and conditions',
'format': 'solidcraft-library/2', 'overwrite': False,
'provenance': {'license': 'MIT OR Apache-2.0', 'author': 'SolidCraft contributors',
'source_url': 'https://github.com/0xlillith/solidcraft/tree/assets/material-physical-properties/assets/render/physical'}}}
def export(cli: Path, plan: dict) -> dict:
cli = cli.resolve(strict=True)
p.require(cli.is_file(), "Trusted CLI executable not found")
p.require(plan.get("input_sha256") == input_pins(), "Stale physical reference plan")
registry_check(invoke(cli, ['commands']))
# No live app, existing document, source profile, output file or library is touched.
stamp = datetime.now(timezone.utc).strftime('%Y%m%dT%H%M%S.%fZ')
folder = p.ROOT / 'target/physical-library-exports' / stamp
p.require(not folder.exists(), "Review output already exists")
folder.mkdir(parents=True, exist_ok=False)
output, cold = folder/'physical-reference-library.json', folder/'cold-reopened-library.json'
design = folder/'physical-reference-library-design.json'
script = folder/'create.json'
commands = [{'command': 'file.new', 'params': {'name': 'Physical reference library'}}]
commands += [row['command'] for row in plan['materials']]
commands.append(library_command(output))
script.write_bytes(p.encoded({'commands': commands}))
before = input_pins()
p.require(before == plan['input_sha256'], 'Source changed after native preflight')
invoke(cli, ['run', str(script), '--results', '--save', str(design)])
catalog = p.read(output)
verify_catalog(catalog, plan)
inspected = invoke(cli, ['exec', 'library.inspect', json.dumps({'path': str(output)})])
p.require(isinstance(inspected, dict) and inspected.get('catalog') == catalog, "Native library inspection disagrees with its export")
# New process, cold document load and native re-export must preserve every card.
reopen = folder/'reopen.json'
reopen.write_bytes(p.encoded({'commands': [library_command(cold)]}))
invoke(cli, ['run', str(reopen), '--in', str(design), '--results'])
restored = p.read(cold)
verify_catalog(restored, plan)
p.require(restored == catalog, "Cold reopen changed the native material library")
p.require(before == input_pins(), "Source revision changed during library export")
receipt = {'schema': 'solidcraft-physical-library-export-receipt/1', 'status': 'pass',
'cli_sha256': p.sha(cli), 'input_sha256': before, 'library_sha256': p.sha(output),
'material_count': len(plan['materials']), 'omitted': plan['omitted'],
'native_inspection': True, 'cold_reopen': True, 'body_assignment': False,
'engineering_certification': False, 'extended_data_embedded': False,
'library': str(output.relative_to(p.ROOT))}
(folder/'receipt.json').write_bytes(p.encoded(receipt))
return receipt
def main() -> int:
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--profile', action='append', help='Exact reference ID; default selects all point-density references')
parser.add_argument('--acknowledge-reference', action='store_true')
parser.add_argument('--cli', type=Path, help='Trusted card-capable executable; absent means a non-executing JSON plan only')
args = parser.parse_args()
try:
plan = selection(args.profile, args.acknowledge_reference)
result = export(args.cli, plan) if args.cli else plan
print(json.dumps(result, indent=2, ensure_ascii=True, allow_nan=False))
return 0
except (OSError, ValueError, KeyError, TypeError, subprocess.SubprocessError) as error:
print(json.dumps({'status': 'fail', 'error': str(error)}), file=sys.stderr)
return 1
if __name__ == '__main__':
raise SystemExit(main())