From 4d3314ab9487a1218d97248e978fe4e8ecac6b4e Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 13 Oct 2026 16:31:37 +0000 Subject: [PATCH 1/2] Require scoped local actors across workspace operations --- .github/workflows/tests.yml | 6 + README.md | 11 +- access.py | 402 +++++++++++++++ app.py | 203 ++++++-- audio_assets.py | 7 + bulk_import.py | 2 + caption_import.py | 4 + caption_proposals.py | 34 +- dataset_recipes.py | 1 + dataset_releases.py | 12 + docs/contracts/actors.md | 73 +++ docs/contracts/workspace-storage.md | 40 +- .../execution-ledger.md | 26 + .../plans/generic-scientific-projects/plan.md | 10 +- .../reports/p3a-admission.md | 220 ++++++++ .../reports/p3a-verification.md | 74 +++ .../reports/p3a/access-receipt.json | 10 + .../reports/p3a/domain-guard-inventory.json | 472 ++++++++++++++++++ .../reports/p3a/session-1280.jpg | Bin 0 -> 117915 bytes .../reports/p3a/session-390.jpg | Bin 0 -> 50686 bytes .../reports/p3a/source-files.json | 175 +++++++ grounded_candidates.py | 34 +- image_generation.py | 28 +- immutable_assets.py | 7 + meshes.py | 5 + metadata.py | 25 +- native_detection_import.py | 4 + native_text_import.py | 5 + pipeline.py | 29 ++ preferences.py | 16 +- projects.py | 8 + rheon_sequences.py | 1 + runs.py | 31 +- saved_searches.py | 10 + saved_selections.py | 10 + scientific_fields.py | 7 + scripts/prepare_caption_fixtures.py | 234 ++++----- scripts/qualify_grounded_local.py | 98 ++-- scripts/qualify_pumas_typed_actual.py | 108 ++-- sequence_assets.py | 2 + sequence_batch_import.py | 2 + spatial_assets.py | 5 + static/app.js | 4 +- static/audio-editor.js | 4 +- static/auth.css | 1 + static/auth.js | 93 ++++ static/bulk_import.js | 4 +- static/caption_import.js | 6 +- static/index.html | 2 +- static/meshes.js | 4 +- static/native_detection_import.js | 6 +- static/native_text_import.js | 6 +- static/pointclouds.js | 2 +- static/pumas-typed.js | 2 +- static/scientific-fields.js | 2 +- static/sequence-batch.js | 4 +- static/volume-editor.js | 2 +- static/workbench.html | 2 +- static/workbench.js | 2 +- static/workspace-projects.js | 2 +- static/workspace-real.js | 2 +- static/workspaces.html | 2 +- static/workspaces.js | 2 +- synthetic.py | 45 +- tests/auth_helpers.cjs | 39 ++ tests/auth_helpers.py | 53 ++ tests/browser.cjs | 5 + tests/browser_access.cjs | 53 ++ tests/browser_bulk_import.cjs | 5 + tests/browser_caption_dataset_integration.cjs | 5 + tests/browser_caption_import.cjs | 7 + tests/browser_caption_proposals.cjs | 5 + tests/browser_captions.cjs | 5 + ...classification_preferences_integration.cjs | 5 + tests/browser_combined_workbench.cjs | 5 + tests/browser_curation.cjs | 5 + tests/browser_curation_server.py | 24 +- tests/browser_dataset_integration.cjs | 5 + tests/browser_grounded.cjs | 5 + tests/browser_image_classification_export.cjs | 5 + tests/browser_image_classification_server.py | 10 +- tests/browser_images.cjs | 5 + tests/browser_images_real.cjs | 5 + tests/browser_instruction_responses.cjs | 5 + tests/browser_meshes.cjs | 5 + tests/browser_metadata_filters.cjs | 5 + tests/browser_metadata_server.py | 20 +- tests/browser_native_detection_import.cjs | 5 + tests/browser_native_text_import.cjs | 5 + tests/browser_preferences.cjs | 5 + tests/browser_pumas_gateways.cjs | 5 + tests/browser_pumas_typed.cjs | 11 +- tests/browser_pumas_typed_server.py | 8 +- tests/browser_release_preview.cjs | 5 + tests/browser_rights_note.cjs | 5 + tests/browser_saved_searches.cjs | 5 + tests/browser_saved_selection_intent.cjs | 5 + tests/browser_saved_selections.cjs | 5 + tests/browser_scientific_fields.cjs | 5 + tests/browser_sequence_batch.cjs | 5 + tests/browser_sequences.cjs | 5 + tests/browser_sequences_actual.cjs | 5 + .../browser_text_classification_proposals.cjs | 7 +- ...er_text_classification_proposals_server.py | 6 +- tests/browser_text_corpus_export.cjs | 5 + tests/browser_vlm_real.cjs | 5 + tests/browser_workbench.cjs | 5 + tests/browser_workspace_audio.cjs | 5 + tests/browser_workspace_audio_run.cjs | 5 + tests/browser_workspace_breadth.cjs | 5 + tests/browser_workspace_export_run.cjs | 5 + tests/browser_workspace_image_run.cjs | 5 + tests/browser_workspace_mesh.cjs | 5 + tests/browser_workspace_mesh_run.cjs | 5 + tests/browser_workspace_project.cjs | 5 + tests/browser_workspace_sequence_run.cjs | 5 + tests/browser_workspace_spatial.cjs | 5 + tests/browser_workspace_text.cjs | 5 + tests/browser_workspaces.cjs | 5 + tests/check_image_classification_consumer.py | 24 +- tests/check_text_corpus_consumer.py | 24 +- tests/qualify_spatial_retained_runs.py | 28 +- tests/test_access.py | 247 +++++++++ tests/test_access_http.py | 107 ++++ tests/test_ai.py | 3 +- tests/test_audio_data.py | 5 +- tests/test_audio_training.py | 14 +- tests/test_auth_controller.cjs | 35 ++ tests/test_auth_helpers.cjs | 24 + tests/test_bulk_import.py | 7 +- tests/test_caption_exports.py | 7 +- tests/test_caption_import.py | 69 +-- tests/test_caption_proposals.py | 22 +- tests/test_combined_workbench.py | 4 +- tests/test_curation.py | 5 +- tests/test_dataset.py | 3 +- tests/test_export_runs.py | 10 +- tests/test_generation_job_api.py | 5 +- tests/test_grounded_candidates.py | 17 +- tests/test_image_classification_export.py | 5 +- tests/test_image_generation.py | 26 +- tests/test_image_training.py | 3 +- tests/test_instruction_responses.py | 9 +- tests/test_mesh_release.py | 3 +- tests/test_mesh_runs.py | 12 +- tests/test_meshes.py | 17 +- tests/test_metadata_filters.py | 11 +- tests/test_metadata_migration.py | 7 +- tests/test_metadata_transactions.py | 18 +- tests/test_metadata_workers.py | 15 +- tests/test_native_detection_import.py | 52 +- tests/test_native_detection_stack.py | 3 +- tests/test_native_text_import.py | 32 +- tests/test_pipeline.py | 5 +- tests/test_preferences.py | 10 +- tests/test_projects.py | 9 +- tests/test_pumas_typed.py | 32 +- tests/test_pumas_vision.py | 9 +- tests/test_real_import_foundation.py | 42 +- tests/test_release_preview.py | 7 +- tests/test_rights_note.py | 24 +- tests/test_runs.py | 19 +- tests/test_saved_generation.py | 16 +- tests/test_saved_searches.py | 9 +- tests/test_saved_selections.py | 7 +- tests/test_scientific_fields.py | 4 +- tests/test_scientific_release.py | 3 +- tests/test_sequence_batch.py | 13 +- tests/test_sequence_release.py | 3 +- tests/test_sequence_runs.py | 3 +- tests/test_sequence_v2_runs.py | 3 +- tests/test_sequences.py | 24 +- tests/test_sequences_v2.py | 7 +- tests/test_spatial_release.py | 3 +- tests/test_spatial_storage.py | 25 +- tests/test_synthetic.py | 43 +- tests/test_text_classification_proposals.py | 18 +- tests/test_text_corpus_export.py | 20 +- tests/test_text_training.py | 5 +- tests/test_workbench.py | 15 +- tests/test_workspace_metadata.py | 18 +- text_classification_proposals.py | 34 +- upgrade_metadata.py | 7 +- workbench.py | 50 +- 184 files changed, 3754 insertions(+), 714 deletions(-) create mode 100644 access.py create mode 100644 docs/contracts/actors.md create mode 100644 docs/plans/generic-scientific-projects/reports/p3a-admission.md create mode 100644 docs/plans/generic-scientific-projects/reports/p3a-verification.md create mode 100644 docs/plans/generic-scientific-projects/reports/p3a/access-receipt.json create mode 100644 docs/plans/generic-scientific-projects/reports/p3a/domain-guard-inventory.json create mode 100644 docs/plans/generic-scientific-projects/reports/p3a/session-1280.jpg create mode 100644 docs/plans/generic-scientific-projects/reports/p3a/session-390.jpg create mode 100644 docs/plans/generic-scientific-projects/reports/p3a/source-files.json create mode 100644 static/auth.css create mode 100644 static/auth.js create mode 100644 tests/auth_helpers.cjs create mode 100644 tests/auth_helpers.py create mode 100644 tests/browser_access.cjs create mode 100644 tests/test_access.py create mode 100644 tests/test_access_http.py create mode 100644 tests/test_auth_controller.cjs create mode 100644 tests/test_auth_helpers.cjs diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e6eaaa63..2afce57d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,6 +50,12 @@ jobs: - run: build/workspace-training/bin/python -m unittest discover -s tests -p test_pointclouds.py - run: build/workspace-training/bin/python -m unittest discover -s tests -p test_volume_assets.py - run: python -m unittest discover -s tests + - run: node --check static/auth.js + - run: node tests/test_auth_helpers.cjs + - run: node tests/test_auth_controller.cjs + - run: node tests/browser_access.cjs + env: + BROWSER: /usr/bin/google-chrome - run: node --check static/scientific-fields.js - run: build/workspace-training/bin/python tests/qualify_scientific_fields.py --output build/qa/scientific-neutral.zip --report build/qa/scientific-neutral.json - run: node tests/browser_scientific_fields.cjs diff --git a/README.md b/README.md index d787dba9..2fb32657 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,15 @@ installer, with its `bin` directory on `PATH`. Initialize a private service once eval "$(.venv/bin/python scripts/local_postgres.py env)" .venv/bin/python app.py +In another terminal with the same database environment, create a private one-time +login file: `.venv/bin/python access.py login --data ./data --out /private/new-login-code`. +Use an existing private directory and a new filename, then enter its code in the +browser's Session dialog. Codes expire after ten minutes; sessions last eight +hours. Localhost is not an authenticated identity. Existing catalogs require the +explicit schema-7 upgrade before starting this version. See [actor access](docs/contracts/actors.md) +for scoped agent credentials and [storage upgrades](docs/contracts/workspace-storage.md). +Existing execution remains owner-only; agent execution approval is a later stage. + The setup script uses a Unix socket under `~/.local/share/tuldok/postgres`, generates private credentials, and creates a database role without superuser, role-creation or database-creation permissions. It opens no TCP listener. Stop the @@ -68,7 +77,7 @@ current record; saving/reviewing and freezing a new release leaves old results unchanged. Viewing test results records durable exposure; reused records or pixels cannot be presented as fresh holdout evidence. -Fresh catalogs use schema 6. Existing PostgreSQL schema-1 through schema-5 catalogs require an +Fresh catalogs use schema 7. Existing PostgreSQL schema-1 through schema-6 catalogs require an explicit stopped-writer backup and upgrade, never an automatic startup change: ```sh diff --git a/access.py b/access.py new file mode 100644 index 00000000..6b04d748 --- /dev/null +++ b/access.py @@ -0,0 +1,402 @@ +"""Explicit catalog actors and bounded job continuations; no implicit domain transactions.""" +import argparse +from contextlib import contextmanager +from contextvars import ContextVar +from dataclasses import dataclass +from functools import wraps +import hashlib +import json +import os +from pathlib import Path +import re +import secrets +import time +import uuid + +SCOPES = frozenset(('inspect', 'edit', 'execute', 'cancel', 'freeze', 'approve-review', + 'approve-execution', 'expose-holdout', 'admin')) +AGENT_SCOPES = SCOPES - {'approve-review', 'approve-execution', 'admin'} +SESSION_TTL = 8 * 3600 +LOGIN_TTL = 600 +MAX_TOKEN_TTL = 30 * 86400 +_CURRENT = ContextVar('tuldok_actor', default=None) +HASH = re.compile(r'^[a-f0-9]{64}$') + + +class AccessError(Exception): + def __init__(self, message, code='forbidden', status=403): + super().__init__(message) + self.code, self.status = code, status + self.audited = False + + +@dataclass(frozen=True) +class ActorContext: + catalog_id: str + actor_id: str | None + credential_id: str | None + mode: str = 'credential' + admission_id: str | None = None + kind: str | None = None + job_id: str | None = None + request_digest: str | None = None + + +def _json(value): + try: + raw = json.dumps(value, sort_keys=True, separators=(',', ':'), allow_nan=False) + if len(raw.encode('utf-8')) > 16384: + raise ValueError() + return raw + except (ValueError, TypeError, UnicodeError, RecursionError): + raise AccessError('Access evidence must be bounded finite JSON.', 'invalid', 400) from None + + +def _text(value, name, maximum=160): + if type(value) is not str or not value.strip() or len(value) > maximum or any(ord(c) < 32 or 0xD800 <= ord(c) <= 0xDFFF for c in value): + raise AccessError(name + ' must be bounded nonempty text.', 'invalid', 400) + return value + + +def authorized(scope, action, owner_only=False, target=None): + """Authorize before entering the domain owner; never wrap its transaction.""" + def decorate(function): + @wraps(function) + def guarded(self, *args, **kwargs): + access = self.access + subject = target(*args, **kwargs) if callable(target) else target + if target is None and args and isinstance(args[0], str): + subject = args[0] + try: + access.require(scope, action, subject, owner_only=owner_only) + return function(self, *args, **kwargs) + except AccessError as error: + access.denial(error, action, subject) + raise + return guarded + return decorate + + +class Access: + def __init__(self, db, catalog_path): + self.db, self.catalog_path = db, Path(catalog_path) + self.catalog_id, self.lock = db.dataset_id, db.lock + + def _credential(self, credential_id): + row = self.db.execute('''SELECT c.id,c.actor_id,c.kind AS credential_kind,c.scopes_json,c.expires_at, + c.revoked,c.consumed,a.kind,a.label FROM access_credentials c + JOIN access_actors a ON a.id=c.actor_id WHERE c.id=%s''', (credential_id,)).fetchone() + if row is None or row['revoked'] or row['consumed'] or row['expires_at'] <= int(time.time()) or row['credential_kind'] == 'login': + raise AccessError('Credential is unavailable, expired or revoked.', 'unauthenticated', 401) + return dict(row) + + def _resolve(self, token, *, login=False): + if type(token) is not str or not 32 <= len(token) <= 256 or not token.isascii(): + raise AccessError('A valid credential is required.', 'unauthenticated', 401) + row = self.db.execute('SELECT id,actor_id,kind,expires_at,revoked,consumed FROM access_credentials WHERE token_sha256=%s', + (hashlib.sha256(token.encode()).hexdigest(),)).fetchone() + if row is None or row['revoked'] or row['consumed'] or row['expires_at'] <= int(time.time()): + raise AccessError('A valid credential is required.', 'unauthenticated', 401) + if login != (row['kind'] == 'login'): + raise AccessError('Credential cannot be used for this authentication operation.', 'unauthenticated', 401) + return row + + @contextmanager + def bind(self, token): + try: + with self.lock: + row = self._resolve(token) + self._credential(row['id']) + except AccessError as error: + self.denial(error, 'access.authenticate', anonymous=True) + raise + marker = _CURRENT.set(ActorContext(self.catalog_id, row['actor_id'], row['id'])) + try: + yield self.identity() + finally: + _CURRENT.reset(marker) + + def _context(self): + context = _CURRENT.get() + if context is None: + raise AccessError('An explicit actor context is required.', 'unauthenticated', 401) + if context.catalog_id != self.catalog_id: + raise AccessError('Actor context belongs to another catalog.') + return context + + def _admission(self, context): + row = self.db.execute('SELECT * FROM access_admissions WHERE id=%s', (context.admission_id,)).fetchone() + if (row is None or row['catalog_id'] != self.catalog_id or row['kind'] != context.kind + or row['job_id'] != context.job_id or row['request_digest'] != context.request_digest + or row['actor_id'] != context.actor_id or row['credential_id'] != context.credential_id): + raise AccessError('Job continuation does not match its admitted request.') + return row + + def require(self, scope, action, target=None, *, owner_only=False): + if scope not in SCOPES: + raise AccessError('Unsupported authorization scope.', 'invalid', 400) + _text(action, 'Action') + if target is not None: + _text(target, 'Target', 512) + try: + with self.lock: + context = self._context() + if context.mode == 'job': + if owner_only or scope in ('approve-review', 'approve-execution', 'admin'): + raise AccessError('Job continuation cannot assume owner approval or administration.') + effects = json.loads(self._admission(context)['effects_json']) + if action not in effects or target not in effects[action]: + raise AccessError('Job continuation does not permit this action and target.') + return context + if context.mode == 'system': + if owner_only or scope not in ('inspect', 'cancel'): + raise AccessError('System reconciliation cannot admit ordinary work.') + return context + row = self._credential(context.credential_id) + if row['actor_id'] != context.actor_id: + raise AccessError('Credential actor identity changed.') + if scope not in json.loads(row['scopes_json']): + raise AccessError('Credential does not grant the required scope.') + if row['kind'] != 'owner' and (owner_only or scope in ('execute', 'approve-review', 'approve-execution', 'admin')): + raise AccessError('This operation requires an authenticated owner; agent execution approval is not yet supported.') + return context + except AccessError as error: + self.denial(error, action, target) + raise + + def identity(self): + with self.lock: + context = self._context() + if context.mode != 'credential': + return {'catalog_id': self.catalog_id, 'actor_id': context.actor_id, + 'credential_id': context.credential_id, 'kind': context.mode, + 'label': 'Admitted job' if context.mode == 'job' else 'System reconciliation', + 'scopes': [], 'expires_at': None, 'mode': context.mode, + 'job_kind': context.kind, 'job_id': context.job_id, + 'admission_id': context.admission_id, 'request_digest': context.request_digest} + row = self._credential(context.credential_id) + return {'catalog_id': self.catalog_id, 'actor_id': row['actor_id'], 'credential_id': row['id'], + 'kind': row['kind'], 'label': row['label'], 'scopes': json.loads(row['scopes_json']), + 'expires_at': row['expires_at']} + + def _insert_audit(self, action, target, details, result, context): + _text(action, 'Action') + if target is not None: + _text(target, 'Target', 512) + if result not in ('success', 'denied', 'failed', 'interrupted'): + raise AccessError('Invalid audit outcome.', 'invalid', 400) + self.db.execute('INSERT INTO access_audit VALUES (%s,%s,%s,%s,%s,%s,%s,%s)', + (uuid.uuid4().hex, context.actor_id if context else None, context.credential_id if context else None, + action, _json(target), _json(details or {}), result, int(time.time()))) + + def audit(self, action, target=None, details=None, result='success'): + if not self.db.in_transaction: + raise RuntimeError('Success audit must share its domain mutation transaction.') + context = self._context() + if context.mode == 'job': + effects = json.loads(self._admission(context)['effects_json']) + if action not in effects or target not in effects[action]: + raise AccessError('Job audit exceeds its admitted effect.') + elif context.mode == 'system': + if not action.endswith(('.reconcile', '.interrupt', '.drain', '.cancel')): + raise AccessError('System audit must describe reconciliation or shutdown.') + elif context.mode == 'credential': + self._credential(context.credential_id) + self._insert_audit(action, target, details, result, context) + + def denial(self, error, action, target=None, *, anonymous=False): + # Nested domain guards defer denial evidence until their owner rolls back. + if error.audited or self.db.in_transaction: + return + # Invalid caller targets must not break evidence of the original refusal. + try: + if target is not None: + _text(target, 'Target', 512) + except AccessError: + target = None + context = None if anonymous else _CURRENT.get() + if context and context.catalog_id != self.catalog_id: + context = None + with self.lock, self.db.transaction(): + self._insert_audit(action, target, {'code': error.code}, 'denied', context) + error.audited = True + + def _mint(self, actor_id, kind, scopes, ttl): + token = secrets.token_urlsafe(32) + credential_id = uuid.uuid4().hex + self.db.execute('INSERT INTO access_credentials VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s)', + (credential_id, actor_id, hashlib.sha256(token.encode()).hexdigest(), kind, + _json(sorted(scopes)), int(time.time()) + ttl, 0, 0, int(time.time()))) + return token, credential_id + + def _local_owner_token(self, *, initial=False): + """Explicit local administration only; never exposed by a transport route.""" + with self.lock, self.db.transaction(): + owners = self.db.execute("SELECT id FROM access_actors WHERE kind='owner'").fetchall() + if initial and owners: + raise AccessError('Owner already exists; use local login renewal.', 'conflict', 409) + if len(owners) > 1: + raise AccessError('Owner identity is ambiguous.', 'unavailable', 409) + actor_id = owners[0][0] if owners else uuid.uuid4().hex + if not owners: + self.db.execute('INSERT INTO access_actors VALUES (%s,%s,%s,%s)', + (actor_id, 'owner', 'Local owner', int(time.time()))) + token, credential_id = self._mint(actor_id, 'login', SCOPES, LOGIN_TTL) + self._insert_audit('access.local_login', credential_id, {'initial': not bool(owners)}, 'success', + ActorContext(self.catalog_id, actor_id, credential_id)) + return token + + def exchange(self, token): + try: + with self.lock, self.db.transaction(): + row = self._resolve(token, login=True) + changed = self.db.execute('UPDATE access_credentials SET consumed=1 WHERE id=%s AND consumed=0 AND revoked=0 RETURNING id', (row['id'],)).fetchone() + if changed is None: + raise AccessError('Login credential was already consumed.', 'unauthenticated', 401) + actor = self.db.execute('SELECT kind FROM access_actors WHERE id=%s', (row['actor_id'],)).fetchone() + if actor is None or actor[0] != 'owner': + raise AccessError('Login requires an existing owner.', 'unauthenticated', 401) + session, credential_id = self._mint(row['actor_id'], 'session', SCOPES, SESSION_TTL) + self._insert_audit('access.exchange', credential_id, {}, 'success', ActorContext(self.catalog_id, row['actor_id'], credential_id)) + with self.bind(session): + identity = self.identity() + return {'token': session, 'identity': identity} + except AccessError as error: + self.denial(error, 'access.exchange', anonymous=True) + raise + + @authorized('admin', 'access.issue', owner_only=True) + def issue(self, body): + if type(body) is not dict or set(body) - {'label', 'scopes', 'ttl_seconds'} or not {'label', 'scopes'} <= set(body): + raise AccessError('Credential fields must be label, scopes and optional ttl_seconds.', 'invalid', 400) + label = _text(body['label'], 'Label') + scopes, ttl = body['scopes'], body.get('ttl_seconds', 3600) + if type(scopes) is not list or any(type(s) is not str for s in scopes) or len(scopes) != len(set(scopes)) or not set(scopes) <= AGENT_SCOPES or 'inspect' not in scopes: + raise AccessError('Agent scopes require inspect and cannot grant approval or admin.', 'invalid', 400) + if type(ttl) is not int or not 60 <= ttl <= MAX_TOKEN_TTL: + raise AccessError('Credential lifetime must be 60 seconds through 30 days.', 'invalid', 400) + with self.lock, self.db.transaction(): + actor_id = uuid.uuid4().hex + self.db.execute('INSERT INTO access_actors VALUES (%s,%s,%s,%s)', (actor_id, 'agent', label, int(time.time()))) + token, credential_id = self._mint(actor_id, 'bearer', scopes, ttl) + self.audit('access.issue', credential_id, {'actor_id': actor_id, 'scopes': scopes, 'ttl_seconds': ttl}) + with self.bind(token): + identity = self.identity() + return {'token': token, 'identity': identity} + + @property + def access(self): + return self + + @authorized('admin', 'access.revoke', owner_only=True) + def revoke(self, credential_id): + with self.lock, self.db.transaction(): + changed = self.db.execute('UPDATE access_credentials SET revoked=1 WHERE id=%s RETURNING id', (credential_id,)).fetchone() + if changed is None: + raise AccessError('Credential not found.', 'unavailable', 404) + # Self-revocation still records the actor verified at admission. + self._insert_audit('access.revoke', credential_id, {}, 'success', self._context()) + return {'revoked': True, 'credential_id': credential_id} + + def logout(self): + context = self.require('inspect', 'access.logout') + if context.mode != 'credential': + raise AccessError('Only a credential session can log out.') + with self.lock, self.db.transaction(): + self.db.execute('UPDATE access_credentials SET revoked=1 WHERE id=%s', (context.credential_id,)) + self._insert_audit('access.logout', context.credential_id, {}, 'success', context) + return {'revoked': True} + + def admit_job(self, kind, job_id, request_digest, effects): + context = self.require('execute', 'access.admit_job', job_id, owner_only=True) + if context.mode != 'credential' or not self.db.in_transaction: + raise AccessError('Job admission requires an owner mutation transaction.') + _text(kind, 'Job kind') + _text(job_id, 'Job ID') + if type(request_digest) is not str or not HASH.fullmatch(request_digest): + raise AccessError('Job request digest must be SHA256.', 'invalid', 400) + if type(effects) is not dict or not 1 <= len(effects) <= 16: + raise AccessError('Job effects must be a finite action map.', 'invalid', 400) + for action, targets in effects.items(): + _text(action, 'Effect action') + if action.startswith('access.'): + raise AccessError('Jobs cannot receive authentication or admission effects.', 'invalid', 400) + if type(targets) is not list or not 1 <= len(targets) <= 256: + raise AccessError('Job effects require bounded exact targets.', 'invalid', 400) + for target in targets: + if target is not None: + _text(target, 'Effect target', 512) + admission_id = uuid.uuid4().hex + self.db.execute('INSERT INTO access_admissions VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s)', + (admission_id, self.catalog_id, context.actor_id, context.credential_id, kind, job_id, + request_digest, _json(effects), int(time.time()))) + self.audit('access.admit_job', job_id, {'admission_id': admission_id, 'kind': kind, 'request_digest': request_digest, 'effects': effects}) + return admission_id + + def require_job(self, kind, job_id, admission_id, request_digest): + context = self._context() + if (context.mode != 'job' or context.kind != kind or context.job_id != job_id + or context.admission_id != admission_id or context.request_digest != request_digest): + raise AccessError('This operation requires its exact admitted job continuation.') + with self.lock: + self._admission(context) + return context + + @contextmanager + def _job(self, kind, job_id, admission_id, request_digest): + with self.lock: + row = self.db.execute('SELECT actor_id,credential_id FROM access_admissions WHERE id=%s', (admission_id,)).fetchone() + if row is None: + raise AccessError('Job admission is unavailable.') + context = ActorContext(self.catalog_id, row['actor_id'], row['credential_id'], 'job', admission_id, kind, job_id, request_digest) + self._admission(context) + marker = _CURRENT.set(context) + try: + yield + finally: + _CURRENT.reset(marker) + + @contextmanager + def _reconcile(self): + marker = _CURRENT.set(ActorContext(self.catalog_id, None, None, 'system')) + try: + yield + finally: + _CURRENT.reset(marker) + + +def main(): + parser = argparse.ArgumentParser(description='Create a private one-time local owner login credential.') + parser.add_argument('command', choices=('bootstrap', 'login')) + parser.add_argument('--data', required=True, type=Path) + parser.add_argument('--out', required=True, type=Path) + args = parser.parse_args() + from metadata import Metadata + descriptor = os.open(args.out, os.O_WRONLY | os.O_CREAT | os.O_EXCL, 0o600) + try: + with os.fdopen(descriptor, 'w') as handle: + os.fchmod(handle.fileno(), 0o600) + db = Metadata(args.data, create=False) + try: + token = Access(db, args.data)._local_owner_token(initial=args.command == 'bootstrap') + finally: + db.close() + handle.write(token + '\n') + handle.flush() + os.fsync(handle.fileno()) + parent_fd = os.open(args.out.parent, os.O_RDONLY) + try: + os.fsync(parent_fd) + finally: + os.close(parent_fd) + except BaseException: + args.out.unlink(missing_ok=True) + raise + return 0 + + +if __name__ == '__main__': + try: + raise SystemExit(main()) + except (AccessError, OSError, ValueError) as error: + raise SystemExit(str(error)) from None diff --git a/app.py b/app.py index 42780131..345003db 100644 --- a/app.py +++ b/app.py @@ -27,6 +27,9 @@ import spatial_assets import pipeline import projects +import access +from access import authorized +from http.cookies import SimpleCookie, CookieError import runs import base64 import hashlib @@ -140,26 +143,28 @@ def __init__(self, path, *, dsn=None, project_roots=None): self.path.mkdir(parents=True, exist_ok=True) (self.path / 'images').mkdir(exist_ok=True) self.ai_lock = threading.Lock() - self.image_requests = image_generation.ImageRequests() self.db = Metadata(self.path, dsn=dsn) self.lock = self.db.lock + self.access = access.Access(self.db, self.path) + self.image_requests = image_generation.ImageRequests(self.access) try: - self.projects = projects.Projects(self, project_roots) - self.generation_jobs = synthetic.Jobs(self) - with self.lock: - self._recover_deletions() - self.workbench = workbench.Workbench(self) - self.releases = dataset_releases.Releases(self.workbench) - self.selections = saved_selections.SavedSelections(self.workbench) - self.searches = saved_searches.SavedSearches(self.workbench) - self.caption_imports = caption_import.CaptionImports(self.workbench) - self.native_text_imports = native_text_import.NativeTextImports(self.workbench) - self.native_detection_imports = native_detection_import.NativeDetectionImports(self.workbench) - self.grounded = grounded_candidates.Proposals(self.workbench) - self.caption_proposals = caption_proposals.CaptionProposals(self.workbench) - self.text_classification_proposals = text_classification_proposals.TextClassificationProposals(self.workbench) - self.pipelines = pipeline.Pipelines(self) - self.runs = runs.Runs(self, self.pipelines) + with self.access._reconcile(): + self.projects = projects.Projects(self, project_roots) + self.generation_jobs = synthetic.Jobs(self) + with self.lock: + self._recover_deletions() + self.workbench = workbench.Workbench(self) + self.releases = dataset_releases.Releases(self.workbench) + self.selections = saved_selections.SavedSelections(self.workbench) + self.searches = saved_searches.SavedSearches(self.workbench) + self.caption_imports = caption_import.CaptionImports(self.workbench) + self.native_text_imports = native_text_import.NativeTextImports(self.workbench) + self.native_detection_imports = native_detection_import.NativeDetectionImports(self.workbench) + self.grounded = grounded_candidates.Proposals(self.workbench) + self.caption_proposals = caption_proposals.CaptionProposals(self.workbench) + self.text_classification_proposals = text_classification_proposals.TextClassificationProposals(self.workbench) + self.pipelines = pipeline.Pipelines(self) + self.runs = runs.Runs(self, self.pipelines) except BaseException: if hasattr(self, 'projects'): self.projects.close() @@ -167,14 +172,16 @@ def __init__(self, path, *, dsn=None, project_roots=None): raise def close(self): - self.runs.close() - self.text_classification_proposals.close() - self.caption_proposals.close() - self.grounded.close() - self.generation_jobs.close() - self.projects.close() - self.db.close() + with self.access._reconcile(): + self.runs.close() + self.text_classification_proposals.close() + self.caption_proposals.close() + self.grounded.close() + self.generation_jobs.close() + self.projects.close() + self.db.close() + @authorized('inspect', 'dataset.rows') def rows(self): with self.lock: rows = [dict(r) for r in self.db.execute('SELECT * FROM samples ORDER BY created_at, id')] @@ -192,10 +199,11 @@ def rows(self): row['annotation'].setdefault('corner_reference', 'image') return rows + @authorized('inspect', 'dataset.sample') def sample(self, sample_id): return next((row for row in self.rows() if row['id'] == sample_id), None) - def resolve_split(self, meta, exclude=''): + def _resolve_split(self, meta, exclude=''): key = 'book_id' if meta['book_id'] else 'session_id' where = key + '=%s' + (" AND book_id=''" if key == 'session_id' else '') args = (meta[key], exclude) @@ -212,6 +220,13 @@ def resolve_split(self, meta, exclude=''): return chosen def add(self, body, generation=None, *, enrollment=None): + if generation is None: + self.access.require('edit', 'dataset.add') + else: + entry, job, generated_metadata = generation + self.access.require_job('synthetic', job['id'], job.get('admission_id'), + self.generation_jobs._request_digest(job)) + self.access.require('edit', 'dataset.add_generated', job['id']) meta = metadata(body) try: raw = base64.b64decode(body.get('image', ''), validate=True) @@ -246,7 +261,7 @@ def add(self, body, generation=None, *, enrollment=None): thumbnail.save(folder / 'thumb.jpg', 'JPEG', quality=85) with self.db.transaction(): self.db.on_rollback(lambda: shutil.rmtree(folder, ignore_errors=True)) - split = self.resolve_split(meta) + split = self._resolve_split(meta) self.db.execute('INSERT INTO samples VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)', (sample_id, digest, name, image.width, image.height, meta['book_id'], meta['session_id'], split, timestamp, timestamp, 1, None)) @@ -256,12 +271,20 @@ def add(self, body, generation=None, *, enrollment=None): # Imported Workbench source metadata shares acquisition's # commit and original-file cleanup on admission failure. self.workbench._enroll_import(sample_id, *enrollment) + self.access.audit('dataset.add_generated' if generation else 'dataset.add', + job['id'] if generation else sample_id, + {'sample_id': sample_id, 'revision': 1, 'source_sha256': digest}) + if generation is not None: + # Return only this admitted publication, without catalog-wide reads. + generated = dict(self.db.execute('SELECT * FROM samples WHERE id=%s', (sample_id,)).fetchone()) + generated['generation'] = {key: entry[key] for key in + ('job_id', 'ordinal', 'prompt', 'metadata', 'model', 'width', 'height', 'requested_seed') if key in entry} except CommitOutcomeUnknown: raise except Exception: shutil.rmtree(folder, ignore_errors=True) raise - return self.sample(sample_id) + return generated if generation is not None else self.sample(sample_id) def _recover_deletions(self): staging = self.path / '.deleting-images' @@ -275,6 +298,7 @@ def _recover_deletions(self): else: shutil.rmtree(folder) + @authorized('edit', 'dataset.delete') def delete(self, sample_id, body): with self.lock: row = self.db.execute('SELECT revision FROM samples WHERE id=%s', (sample_id,)).fetchone() @@ -312,6 +336,7 @@ def remove_files(): self.generation_jobs._entry(entry) self.workbench.preserve_deleted_source(sample_id) self.db.execute('DELETE FROM samples WHERE id=%s', (sample_id,)) + self.access.audit('dataset.delete', sample_id) except CommitOutcomeUnknown: raise except Exception: @@ -320,6 +345,7 @@ def remove_files(): return dict(self.generation_jobs.snapshot(), samples=self.rows(), deleted=sample_id, warning=cleanup_warning[0] if cleanup_warning else '') + @authorized('approve-review', 'dataset.save') def save(self, sample_id, body): annotation = validate_annotation(body.get('annotation', {})) meta = metadata(body) @@ -331,11 +357,14 @@ def save(self, sample_id, body): raise ValueError('Image not found.') if body.get('revision') != row['revision']: raise Conflict('This image changed in another tab. Reload it before saving.') - split = self.resolve_split(meta, sample_id) + split = self._resolve_split(meta, sample_id) self.db.execute('UPDATE samples SET annotation=%s,book_id=%s,session_id=%s,split=%s,updated_at=%s,revision=revision+1 WHERE id=%s', (json.dumps(annotation), meta['book_id'], meta['session_id'], split, now(), sample_id)) + self.access.audit('dataset.save', sample_id, {'before_revision': body['revision'], + 'revision': body['revision'] + 1, 'annotation_sha256': hashlib.sha256(workbench.encode(annotation).encode()).hexdigest()}) return self.sample(sample_id) + @authorized('execute', 'dataset.suggest', owner_only=True) def suggest(self, body): sample_id = body.get('sample_id') before = self.sample(sample_id) @@ -358,6 +387,7 @@ def suggest(self, body): finally: self.ai_lock.release() + @authorized('inspect', 'dataset.export') def export(self): with self.lock: return self._export() @@ -394,7 +424,7 @@ class Handler(BaseHTTPRequestHandler): def log_message(self, *_): pass - def reply(self, data, status=200, content_type='application/json'): + def reply(self, data, status=200, content_type='application/json', headers=()): if content_type == 'application/json' and not isinstance(data, bytes): data = json.dumps(data).encode() self.send_response(status) @@ -402,6 +432,8 @@ def reply(self, data, status=200, content_type='application/json'): self.send_header('Content-Length', str(len(data))) self.send_header('Cache-Control', 'no-store') self.send_header('X-Content-Type-Options', 'nosniff') + for key, value in headers: + self.send_header(key, value) self.end_headers() try: self.wfile.write(data) @@ -415,7 +447,108 @@ def project_access(self): not ipaddress.ip_address(self.client_address[0]).is_loopback): raise workbench.WorkbenchError('Project inspection requires a local loopback client and host.', 'forbidden', 403) + def _credential(self): + authorization = self.headers.get('Authorization') + if authorization is not None: + if self.headers.get('Cookie'): + raise access.AccessError('Use one credential transport per request.', 'forbidden', 403) + parts = authorization.split(' ') + if len(parts) != 2 or parts[0].lower() != 'bearer' or not parts[1]: + raise access.AccessError('Use an authenticated bearer credential.', 'unauthenticated', 401) + return parts[1], True + try: + cookies = SimpleCookie(self.headers.get('Cookie', '')) + token = cookies['tuldok_session'].value if 'tuldok_session' in cookies else '' + except CookieError: + token = '' + return token, False + + def _same_origin(self, required): + origin = self.headers.get('Origin') + if (required and not origin) or (origin and origin != 'http://' + self.headers.get('Host', '')): + raise access.AccessError('A same-origin request is required.', 'forbidden', 403) + + def _access_body(self): + if self.headers.get_content_type() != 'application/json': + raise access.AccessError('Send a JSON object.', 'invalid', 400) + try: + length = int(self.headers.get('Content-Length', '0')) + if not 0 < length <= 16384: + raise ValueError() + body = projects.decode(self.rfile.read(length)) + if not isinstance(body, dict): + raise ValueError() + return body + except (ValueError, workbench.WorkbenchError): + raise access.AccessError('Access requests require a bounded JSON object.', 'invalid', 400) from None + + def _access_error(self, error): + try: + dataset.access.denial(error, 'http.request', urlsplit(self.path).path[:512], anonymous=True) + except CommitOutcomeUnknown: + return self.reply({'error': 'Commit outcome is unknown; inspect state before retrying.', 'code': 'commit_unknown'}, 503) + except psycopg.Error: + return self.reply({'error': 'Metadata storage is unavailable.', 'code': 'storage'}, 503) + return self.reply({'error': str(error), 'code': error.code}, error.status) + def do_GET(self): + try: + if not urlsplit(self.path).path.startswith('/api/'): + return self._get() + token, _bearer = self._credential() + with dataset.access.bind(token): + dataset.access.require('inspect', 'http.inspect') + try: + self._same_origin(False) + except access.AccessError as error: + dataset.access.denial(error, 'http.get', urlsplit(self.path).path[:512]) + raise + if urlsplit(self.path).path == '/api/access/session': + return self.reply(dataset.access.identity()) + return self._get() + except access.AccessError as error: + return self._access_error(error) + except CommitOutcomeUnknown: + return self.reply({'error': 'Commit outcome is unknown; inspect state before retrying.', 'code': 'commit_unknown'}, 503) + except psycopg.Error: + return self.reply({'error': 'Metadata storage is unavailable.', 'code': 'storage'}, 503) + + def do_POST(self): + try: + path = urlsplit(self.path).path + if path == '/api/access/session': + self._same_origin(True) + body = self._access_body() + if set(body) != {'token'}: + raise access.AccessError('Provide one sign-in token.', 'invalid', 400) + result = dataset.access.exchange(body['token']) + cookie = 'tuldok_session=' + result['token'] + '; HttpOnly; SameSite=Strict; Path=/; Max-Age=28800' + return self.reply(result['identity'], headers=[('Set-Cookie', cookie)]) + token, bearer = self._credential() + with dataset.access.bind(token): + try: + self._same_origin(not bearer) + except access.AccessError as error: + dataset.access.denial(error, 'http.post', path) + raise + if path == '/api/access/logout': + self._access_body() + dataset.access.logout() + return self.reply({'signed_out': True}, headers=[('Set-Cookie', 'tuldok_session=; HttpOnly; SameSite=Strict; Path=/; Max-Age=0')]) + if path == '/api/access/credentials': + return self.reply(dataset.access.issue(self._access_body()), 201) + if path.startswith('/api/access/credentials/') and path.endswith('/revoke'): + self._access_body() + return self.reply(dataset.access.revoke(path.split('/')[-2])) + return self._post() + except access.AccessError as error: + return self._access_error(error) + except CommitOutcomeUnknown: + return self.reply({'error': 'Commit outcome is unknown; inspect state before retrying.', 'code': 'commit_unknown'}, 503) + except psycopg.Error: + return self.reply({'error': 'Metadata storage is unavailable.', 'code': 'storage'}, 503) + + def _get(self): path = urlsplit(self.path).path try: if path == '/api/workspace/projects' or path.startswith('/api/workspace/projects/'): @@ -561,6 +694,8 @@ def do_GET(self): assets = {'/native-detection-import.js': ('native_detection_import.js', 'text/javascript'), '/saved-searches.js': ('saved-searches.js', 'text/javascript'), '/sequence-batch.js': ('sequence-batch.js', 'text/javascript'), '/pumas-typed.js': ('pumas-typed.js', 'text/javascript'), '/pumas-gateways.js': ('pumas-gateways.js', 'text/javascript'), '/meshes.js': ('meshes.js', 'text/javascript'), '/sequences.js': ('sequences.js', 'text/javascript'), '/text-classification-proposals.js': ('text-classification-proposals.js', 'text/javascript'), '/caption-proposals.js': ('caption-proposals.js', 'text/javascript'), '/curation.js': ('curation.js', 'text/javascript'), '/caption-import.js': ('caption_import.js', 'text/javascript'), '/bulk-import.js': ('bulk_import.js', 'text/javascript'), '/saved-selections.js': ('saved-selections.js', 'text/javascript'), '/workbench': ('workbench.html', 'text/html'), '/workbench.js': ('workbench.js', 'text/javascript'), '/workbench.css': ('workbench.css', 'text/css'), '/': ('index.html', 'text/html'), '/app.js': ('app.js', 'text/javascript'), '/style.css': ('style.css', 'text/css'), '/rights-note.js': ('rights-note.js', 'text/javascript'), '/preferences.js': ('preferences.js', 'text/javascript'), '/instruction-responses.js': ('instruction-responses.js', 'text/javascript'), '/native-text-import.js': ('native_text_import.js', 'text/javascript')} # Opt-in workspace shell keeps fixture and real service boundaries distinct. assets.update({ + '/auth.js': ('auth.js', 'text/javascript'), + '/auth.css': ('auth.css', 'text/css'), '/workspace-projects.js': ('workspace-projects.js', 'text/javascript'), '/pointclouds.js': ('pointclouds.js', 'text/javascript'), '/volume-editor.js': ('volume-editor.js', 'text/javascript'), @@ -587,12 +722,14 @@ def do_GET(self): return self.reply({'error': 'Local PostgreSQL is unavailable. Restart the service and reopen Tuldok; inspect saved results before retrying writes.', 'code': 'storage'}, 503) except CommitOutcomeUnknown as error: return self.reply({'error': str(error), 'code': 'commit_unknown'}, 503) + except access.AccessError as error: + return self.reply({'error': str(error), 'code': error.code}, error.status) except workbench.WorkbenchError as error: return self.reply({'error': str(error), 'code': error.code}, error.status) except (ValueError, OSError) as error: return self.reply({'error': str(error)}, 400) - def do_POST(self): + def _post(self): body = {} try: # Same-origin JSON only; no cross-site form submissions. @@ -729,6 +866,10 @@ def do_POST(self): return self.reply(dataset.generation_jobs.cancel(body.get('job_id'))) if path == '/api/generation/jobs/resume': return self.reply(dataset.generation_jobs.resume(body.get('job_id'))) + if path in ('/api/generation/prompt-models', '/api/generation/typed-models', '/api/generation/typed-capabilities', + '/api/ai/scan', '/api/generation/scan', '/api/generation/advertised-gateways', + '/api/generation/inspect-gateway', '/api/generation/models', '/api/ai/models'): + dataset.access.require('execute', 'providers.inspect', owner_only=True) if path == '/api/generation/prompt-models': return self.reply(ai_http.text_models(body.get('server_url'))) if path == '/api/generation/typed-models': @@ -766,6 +907,8 @@ def do_POST(self): return self.reply({'error': 'Local PostgreSQL is unavailable. Restart the service and reopen Tuldok; inspect saved results before retrying writes.', 'code': 'storage'}, 503) except CommitOutcomeUnknown as error: return self.reply({'error': str(error), 'code': 'commit_unknown'}, 503) + except access.AccessError as error: + return self.reply({'error': str(error), 'code': error.code}, error.status) except workbench.WorkbenchError as error: return self.reply({'error': str(error), 'code': error.code}, error.status) except Conflict as error: diff --git a/audio_assets.py b/audio_assets.py index c36b06e5..09a325e5 100644 --- a/audio_assets.py +++ b/audio_assets.py @@ -1,4 +1,5 @@ """Bounded original PCM WAV assets; Workbench owns records, revisions and review.""" +from access import authorized import base64 import hashlib import io @@ -93,9 +94,11 @@ def validate_annotation(value, record): class AudioAssets: def __init__(self, workbench): + self.access = workbench.access self.workbench = workbench self.path = workbench.dataset.path / 'audio' + @authorized('edit', 'audio_assets.admit') def admit(self, body): from immutable_assets import publish_file if type(body) is not dict or set(body) - {'wav', 'name', 'rights', 'groups', 'parents'}: @@ -134,14 +137,17 @@ def admit(self, body): encode(origin), TASK, None, 'draft', 1, created, created)) record = w._get(record_id) w._history(record) + self.access.audit('audio_assets.admit', record_id, {'revision': record['revision'], 'source_sha256': digest}) return record + @authorized('inspect', 'audio_assets.metadata') def metadata(self, record_id, provenance): meta = provenance.get('audio') if not isinstance(meta, dict) or meta.get('schema_version') != 1: invalid('stored source metadata is unavailable.', 'unavailable', 409) return dict(meta), (self.path / record_id / 'source.wav').is_file() + @authorized('inspect', 'audio_assets.asset', target=lambda record: record.get('id') if isinstance(record, dict) else None) def asset(self, record): path = self.path / record['id'] / 'source.wav' try: @@ -157,6 +163,7 @@ def asset(self, record): invalid('retained source metadata does not match the original WAV.', 'conflict', 409) return raw, 'audio/wav' + @authorized('inspect', 'audio_assets.inspect') def inspect(self, record_id): w = self.workbench with w.lock: diff --git a/bulk_import.py b/bulk_import.py index 58614145..9f05ebda 100644 --- a/bulk_import.py +++ b/bulk_import.py @@ -66,6 +66,7 @@ def result(record): def find_result(workbench, request_id): + workbench.access.require('inspect', 'bulk_import.find_result', request_id) if not isinstance(request_id, str) or not REQUEST_ID.fullmatch(request_id): raise WorkbenchError('Invalid import request marker.') with workbench.lock: @@ -85,6 +86,7 @@ def find_result(workbench, request_id): def import_row(workbench, body): + workbench.access.require('edit', 'bulk_import.import_row') if set(body) - {'source_name', 'row_number', 'line', 'request_id', 'image_name', 'image'}: raise WorkbenchError('Unsupported row admission fields.') source_name = leaf_name(body.get('source_name'), 'Manifest name') diff --git a/caption_import.py b/caption_import.py index bbbc8baa..e2b74138 100644 --- a/caption_import.py +++ b/caption_import.py @@ -1,4 +1,5 @@ """One native image_caption_v1 decoder; asset/target owners remain canonical.""" +from access import authorized import base64 import hashlib import hmac @@ -117,6 +118,7 @@ def origin_groups(family): class CaptionImports: def __init__(self, workbench): + self.access = workbench.access self.workbench = workbench # Process-local integrity only. Restart invalidates preparation; no corpus # registry, persistent job, external credential or authenticity claim. @@ -140,6 +142,7 @@ def _open(self, token): except (ValueError, UnicodeError): invalid('Invalid or expired caption preparation envelope.') + @authorized('edit', 'caption_import.prepare') def prepare(self, body): if set(body) != {'manifest', 'metadata'} or not isinstance(body['metadata'], dict) or set(body['metadata']) != set(CAPTION_SPLITS.values()): invalid('Supply native manifest and exactly train/val/test metadata.') @@ -255,6 +258,7 @@ def prepare(self, body): invalid('Manifest and metadata do not contain the same exact asset set.') return {'format': CAPTION_FORMAT, 'rows': rows} + @authorized('edit', 'caption_import.admit') def admit(self, body): if set(body) != {'token', 'asset', 'image', 'request_id'}: invalid('Unsupported caption admission fields.') diff --git a/caption_proposals.py b/caption_proposals.py index df4bb3e5..d5e3be5b 100644 --- a/caption_proposals.py +++ b/caption_proposals.py @@ -6,6 +6,7 @@ from workbench import encode_retained import base64 import hashlib +from access import AccessError, authorized import io import json import threading @@ -116,11 +117,12 @@ def decode(data, source, request_id=None): class CaptionProposals: def __init__(self, workbench): self.workbench = workbench + self.access = workbench.dataset.access self.db, self.lock = workbench.db, workbench.lock self.worker, self.active_id = None, None self.stop = threading.Event() self.closed = False - with self.lock, self.db.transaction(): + with self.access._reconcile(), self.lock, self.db.transaction(): self.runtime_owner = self.db.claim_runtime('caption_proposals') if not self.runtime_owner: return @@ -131,6 +133,7 @@ def __init__(self, workbench): job['provider_outcome'] = 'not_admitted' if job['status'] == 'preparing' else 'unknown' job.update(status='interrupted', error='Server stopped; inspect this attempt. No automatic inference retry.') self._save(job) + self.access.audit('caption.reconcile', job['id'], {'status': job['status']}) def _save(self, job): previous = self.db.execute('SELECT data FROM caption_proposals WHERE id=%s', (job['id'],)).fetchone() @@ -146,10 +149,12 @@ def _get(self, job_id): raise WorkbenchError('Caption request not found.', 'unavailable', 404) return json.loads(row[0]) + @authorized('inspect', 'caption.get') def get(self, job_id): with self.lock: return self._get(job_id) + @authorized('inspect', 'caption.snapshot') def snapshot(self): with self.lock: # Project only the poll response; stored JSON remains byte-for-byte intact. @@ -195,6 +200,7 @@ def _source(self, body, *, capture_image=False): raise WorkbenchError('Source image bytes are missing.', 'unavailable', 409) from None return record, image_bytes + @authorized('execute', 'caption.start', owner_only=True) def start(self, body): fields = {'request_id', 'source_id', 'revision', 'source_revision', 'server_url', 'model', 'instruction', 'seed'} if not isinstance(body, dict) or not fields <= body.keys() or body.keys() - fields - {'protocol', 'profile'}: @@ -250,6 +256,10 @@ def start(self, body): job['canonical_request_sha256'] = hashlib.sha256(encode(payload(job)).encode()).hexdigest() if pumas.typed(config): job['provider_outcome'] = 'not_admitted' + job['request_digest'] = hashlib.sha256(encode({'config': job['config'], 'source': job['source'], 'payload': payload(job)}).encode()).hexdigest() + job['admission_id'] = self.access.admit_job('caption', job['id'], job['request_digest'], + {'caption.finish': [job['id']]}) + self.access.audit('caption.start', job['id'], {'request_digest': job['request_digest']}) self._save(job) # Persistence has committed; this lock serializes startup and shutdown. self.stop.clear() @@ -265,7 +275,21 @@ def start(self, body): return job def _run(self, job_id): - job = self.get(job_id) + with self.lock: + job = self._get(job_id) + request_digest = hashlib.sha256(encode({'config': job['config'], 'source': job['source'], 'payload': payload(job)}).encode()).hexdigest() + try: + with self.access._job('caption', job_id, job.get('admission_id'), request_digest): + self._run_admitted(job) + except AccessError: + with self.access._reconcile(), self.lock, self.db.transaction(): + job.update(status='interrupted', error='Job admission is missing or differs from the retained request; no inference started.') + self._save(job) + self.access.audit('caption.interrupt', job_id) + self.active_id = None + + def _run_admitted(self, job): + job_id = job['id'] try: if pumas.typed(job['config']): pumas_vision.prepare(job, payload(job), self.stop) @@ -297,15 +321,18 @@ def _run(self, job_id): self._source(dict(source_id=job['source']['id'], revision=job['source']['revision'], source_revision=job['source']['source_revision'])) job.update(status='completed', annotation=annotation, reported_model=reported) self._save(job) + self.access.audit('caption.finish', job_id, {'status': job['status'], 'response_sha256': job.get('response_sha256')}) except Exception as error: with self.lock, self.db.transaction(): pumas.failure_evidence(job, error) job.update(status='cancelled' if self.stop.is_set() else 'failed', error=str(error)[:800]) self._save(job) + self.access.audit('caption.finish', job_id, {'status': job['status']}) finally: with self.lock: self.active_id = None + @authorized('cancel', 'caption.cancel', target=lambda body: body.get('job_id') if isinstance(body, dict) else None) def cancel(self, body): if not isinstance(body, dict) or set(body) != {'job_id'}: raise WorkbenchError('Supply only the caption request ID.') @@ -316,8 +343,10 @@ def cancel(self, body): self.stop.set() job.update(status='stopping', error='Cancellation requested; late output cannot be applied.') self._save(job) + self.access.audit('caption.cancel', job['id']) return {'cancelled': True, 'job': job} + @authorized('edit', 'caption.decide') def decide(self, job_id, body): if not isinstance(body, dict) or set(body) != {'revision', 'decision'} or body['decision'] not in ('reject', 'apply_draft'): raise WorkbenchError('Choose reject or apply_draft with the current proposal revision.') @@ -347,6 +376,7 @@ def decide(self, job_id, body): else: job['status'] = 'rejected' self._save(job) + self.access.audit('caption.decide', job['id'], {'revision': job['revision'], 'decision': body['decision']}) return {'job': job, 'record': record, 'changed': True} def close(self): diff --git a/dataset_recipes.py b/dataset_recipes.py index a02f2f82..ba0ca81d 100644 --- a/dataset_recipes.py +++ b/dataset_recipes.py @@ -64,6 +64,7 @@ def candidates(recipe, seed, count): def generate(workbench, body): + workbench.access.require('execute', 'dataset_recipes.generate', owner_only=True) recipe, seed, count = body.get('recipe'), body.get('seed'), body.get('count') # Validate the recipe and materialize only the bounded candidate metadata/bytes. batch = list(candidates(recipe, seed, count)) diff --git a/dataset_releases.py b/dataset_releases.py index 7d4cf1f3..6d4a2a34 100644 --- a/dataset_releases.py +++ b/dataset_releases.py @@ -1,4 +1,5 @@ """Frozen, self-contained releases with connected-source split allocation.""" +from access import authorized import audio_export import hashlib import json @@ -154,10 +155,12 @@ def archive_asset(archive, asset, filename, expected_hash): class Releases: def __init__(self, workbench): + self.access = workbench.access self.workbench = workbench self.path = workbench.dataset.path / 'releases' self.path.mkdir(exist_ok=True) + @authorized('inspect', 'dataset_releases.locate') def locate(self, release_id): if not isinstance(release_id, str) or not RELEASE_ID.fullmatch(release_id): raise WorkbenchError('Invalid release ID.') @@ -166,6 +169,7 @@ def locate(self, release_id): raise WorkbenchError('Release not found.', 'unavailable', 404) return path + @authorized('inspect', 'dataset_releases.preview') def preview(self, body): """Inspect the exact selection without persisting even lazy image enrollment.""" workbench = self.workbench @@ -441,6 +445,7 @@ def _create_corpus(self, body): if os.path.exists(temporary): os.unlink(temporary) preview = prepared['preview'] + self.access.audit('dataset_releases.create', release_id, {'release_sha256': release_id, 'format': body.get('format', 'canonical_v1')}) return {'id': release_id, 'url': '/api/workbench/releases/' + release_id + '.zip', 'format': corpus_export.FORMAT, 'records': len(prepared['rows']), 'split_report': preview['split_report'], 'corpus_counts': preview['corpus_counts'], @@ -656,11 +661,13 @@ def _create_responses(self, body): if os.path.exists(temporary): os.unlink(temporary) preview = prepared['preview'] + self.access.audit('dataset_releases.create', release_id, {'release_sha256': release_id, 'format': body.get('format', 'canonical_v1')}) return {'id': release_id, 'url': '/api/workbench/releases/' + release_id + '.zip', 'format': body['format'], 'records': preview['example_count'], 'example_count': preview['example_count'], 'unique_prompt_count': preview['unique_prompt_count'], 'split_report': preview['split_report']} + @authorized('freeze', 'dataset_releases.create') def create(self, body): with self.workbench.lock: if self.workbench.db.in_transaction: @@ -747,6 +754,7 @@ def _create(self, body): finally: if os.path.exists(temporary): os.unlink(temporary) + self.access.audit('dataset_releases.create', release_id, {'release_sha256': release_id, 'format': body.get('format', 'canonical_v1')}) return {'id': release_id, 'url': '/api/workbench/releases/' + release_id + '.zip', 'records': len(rows), 'split_report': report} def _create_captions(self, body): @@ -796,6 +804,7 @@ def _create_captions(self, body): finally: if os.path.exists(temporary): os.unlink(temporary) + self.access.audit('dataset_releases.create', release_id, {'release_sha256': release_id, 'format': body.get('format', 'canonical_v1')}) return {'id': release_id, 'url': '/api/workbench/releases/' + release_id + '.zip', 'format': CAPTION_FORMAT, 'records': len(rows), 'split_report': report, 'warnings': manifest['warnings']} @@ -849,6 +858,7 @@ def _create_classification(self, body): finally: if os.path.exists(temporary): os.unlink(temporary) + self.access.audit('dataset_releases.create', release_id, {'release_sha256': release_id, 'format': body.get('format', 'canonical_v1')}) return {'id': release_id, 'url': '/api/workbench/releases/' + release_id + '.zip', 'format': classification_export.FORMAT, 'records': len(rows), 'split_report': preview['split_report'], 'class_vocabulary': vocabulary, @@ -871,6 +881,7 @@ def _create_text_classification(self, body): finally: if os.path.exists(temporary): os.unlink(temporary) + self.access.audit('dataset_releases.create', release_id, {'release_sha256': release_id, 'format': body.get('format', 'canonical_v1')}) return {'id': release_id, 'url': '/api/workbench/releases/' + release_id + '.zip', 'format': text_class_export.FORMAT, 'records': len(prepared['rows']), 'split_report': prepared['preview']['split_report'], @@ -902,6 +913,7 @@ def _create_audio_classification(self, body): finally: if os.path.exists(temporary): os.unlink(temporary) + self.access.audit('dataset_releases.create', release_id, {'release_sha256': release_id, 'format': body.get('format', 'canonical_v1')}) return {'id': release_id, 'url': '/api/workbench/releases/' + release_id + '.zip', 'format': audio_class_export.FORMAT, 'records': len(prepared['rows']), 'split_report': prepared['preview']['split_report'], diff --git a/docs/contracts/actors.md b/docs/contracts/actors.md new file mode 100644 index 00000000..19660632 --- /dev/null +++ b/docs/contracts/actors.md @@ -0,0 +1,73 @@ +# Catalog actors and admitted continuations + +Every domain operation requires an explicit catalog actor context. Localhost, +a Dataset constructor and a background thread do not imply owner authority. +`Access.bind(token)` resolves a stored SHA256 credential hash and binds a +ContextVar; nested contexts restore their predecessor and threads do not inherit +an actor. Each admission checks catalog identity, expiration and revocation. + +The owner has inspect, edit, execute, cancel, freeze, approve-review, +approve-execution, expose-holdout and admin scopes. An owner may issue an agent +bearer with inspect plus selected edit, execute, cancel, freeze and +expose-holdout scopes. Agents cannot issue credentials, approve human review or +approve execution. Current execution starts remain owner-only even when an +agent has execute; bounded approved agent execution is deferred to P3b. + +## Local owner login + +After creating or explicitly upgrading the catalog, stop unauthenticated old +clients and run a local administration command: + +```sh +python access.py bootstrap --data ./dataset --out /private/new-owner-code +python access.py login --data ./dataset --out /private/renewed-owner-code +``` + +Bootstrap refuses an existing owner; login explicitly renews local owner access. +Both create a new exclusive mode-0600 file containing only a one-time code, +flush it and its parent directory, and never print the code. No HTTP endpoint +can mint these login codes. Existing files are refused. Login codes expire in +10 minutes. Atomic exchange consumes a code once and creates an eight-hour +owner session. Agent credentials default to one hour and are bounded between +60 seconds and 30 days. Logout revokes the current credential; owner revocation +acts on a credential ID. Database/filesystem administrators remain trusted. + +HTTP exchanges return a session cookie; the transport enforces origin checks +and binds requests before protected body processing. The UI keeps session +authentication in the HttpOnly cookie, never URLs or browser localStorage. +Bearer clients may explicitly bind issued credentials. Identity responses contain +only catalog, actor and credential IDs, kind, label, scopes and expiry. + +## Transaction and audit custody + +`@authorized(scope, action, owner_only=False, target=None)` checks before calling +the domain owner and never creates an implicit transaction. The owner retains +its existing lock, transaction, savepoint and filesystem rollback semantics. +Successful mutation evidence is written by `Access.audit` in that same +transaction. Denial evidence is written after domain rollback, with one audit +per AccessError; anonymous failures have no actor. Audit details contain IDs, +revisions and request digests, not raw credentials, token hashes or provider +secrets. Audit/admission rows are append-only through the application API. + +## Closed asynchronous work + +An owner admits a job inside its mutation transaction using +`admit_job(kind, job_id, request_digest, effects)`, receiving a unique admission +ID for this exact attempt. The job document stores that ID. Effects are a +bounded map from action to exact target IDs (or explicitly declared null), +never wildcard capabilities. A resume/retry gets a new receipt. + +A worker enters `_job(kind, job_id, admission_id, request_digest)` only after +matching its frozen input to that digest. `require_job` checks that exact bound +receipt without owner fallback. A previously admitted job may finish its bounded +effects after credential revocation; it cannot start unrelated work, use +authentication effects, approve review/execution or exercise owner-only actions. +Existing jobs without receipts may be interrupted by private `_reconcile` +startup/shutdown custody, which permits inspect/cancel only. Reconciliation +cannot resume work, edit ordinary records or assume owner approval. + +`tests/test_access.py` verifies context isolation, cross-catalog refusal, +revocation/expiry, concurrent one-use exchange, agent scope limits, denial +rollback evidence, exact closed receipts, system restrictions, private CLI files +and schema-6 upgrade/schema-7 backup restoration. This stage does not claim +provider-process containment, approved agent execution or remote deployment. diff --git a/docs/contracts/workspace-storage.md b/docs/contracts/workspace-storage.md index ba6b1a07..227f8135 100644 --- a/docs/contracts/workspace-storage.md +++ b/docs/contracts/workspace-storage.md @@ -49,8 +49,8 @@ upgrade. ## Upgrade an existing catalog -Fresh catalogs use schema 6. Ordinary application startup **does not migrate** -an existing schema-1 through schema-5 catalog. It refuses with instructions to run the +Fresh catalogs use schema 7. Ordinary application startup **does not migrate** +an existing schema-1 through schema-6 catalog. It refuses with instructions to run the explicit upgrade. Stop every application, provider/training worker and artifact writer; keep them stopped throughout backup, upgrade and verification. The catalog advisory lock coordinates cooperating commands, but cannot fence an old binary @@ -66,7 +66,7 @@ python app.py --data ./dataset The backup destination must be new. Keep the complete backup and its receipt. The accepted transitions have stable identities `workspace-metadata-1-to-2`, -`audio-metadata-2-to-3`, `spatial-metadata-3-to-4`, `project-metadata-4-to-5` and `field-sequence-metadata-5-to-6`. The command applies the ordered steps needed by the +`audio-metadata-2-to-3`, `spatial-metadata-3-to-4`, `project-metadata-4-to-5`, `field-sequence-metadata-5-to-6` and `access-metadata-6-to-7`. The command applies the ordered steps needed by the recognized source, with the complete chain in one transaction. It verifies: 1. The manifest, catalog identity, version ledger and exact retained definition. @@ -83,26 +83,26 @@ recognized source, with the complete chain in one transaction. It verifies: All DDL and version ledger updates commit in one transaction under the existing dataset advisory lock. A failed second step rolls back the first step as well; the old kind constraint is never authoritatively absent. Only the known version-1, -version-2, version-3, version-4 or version-5 definitions are eligible. Unknown versions, altered constraints, +version-2, version-3, version-4, version-5 or version-6 definitions are eligible. Unknown versions, altered constraints, indexes, tables or triggers, malformed ledgers, missing catalogs and contradictory identities fail closed. No command refreshes a signature to bless unsupported drift. The manifest remains version 1; manifest and SQL schema versions are different contracts. The command prints the dataset identity, final migration name -(`field-sequence-metadata-5-to-6`), final schema version, definition/structure hashes and +(`access-metadata-6-to-7`), final schema version, definition/structure hashes and `upgraded` or `already_current`. A repeat on a -known schema-6 catalog verifies its structure and leaves rows/files unchanged. +known schema-7 catalog verifies its structure and leaves rows/files unchanged. Run one upgrade/transfer command at a time. A command failure rolls back its transaction. A lost commit acknowledgement is explicitly an unknown outcome: keep writers stopped, reopen, and rerun this same command to verify whether the -catalog is still the known source version or already known schema 6. Never +catalog is still the known source version or already known schema 7. Never manually change the ledger, delete a table or replay a training request to resolve it. ## Backup, restore and legacy imports The backup container remains `format_version: 1` and explicitly records -`schema_version: 1`, `2`, `3`, `4`, `5` or `6`. `backup_metadata.py` accepts each recognized schema. +`schema_version: 1`, `2`, `3`, `4`, `5`, `6` or `7`. `backup_metadata.py` accepts each recognized schema. Restore recreates **the exact backed-up schema version**, identity, rows, sequence states and ordinary files in an absent catalog/new directory. A retained schema-1, schema-2 or schema-3 backup remains restorable; upgrade that restored copy explicitly @@ -115,11 +115,11 @@ specified in [local storage and recovery](local-storage.md). `Metadata(..., schema_version=1)`, `schema_version=2`, `schema_version=3` and `schema_version=None` are tooling entry points for exact old-version restoration and recognized-version inspection. -Normal Dataset and Workbench callers omit that argument and require schema 6. +Normal Dataset and Workbench callers omit that argument and require schema 7. Version selection never authorizes an unsupported definition or structural drift. Legacy SQLite preflight still recognizes only the original 19 owner tables. -A new import creates schema 6 and leaves workspace/project tables empty. +A new import creates schema 7 and leaves workspace/project tables empty. A retained schema-1 or schema-2 migration receipt remains byte-for-byte authoritative: an interrupted import continues at its receipt's version, and a completed import can be reconciled after an explicit upgrade only while its original rows/files still @@ -128,7 +128,7 @@ never rewritten to imply that later workspace or audio writes belonged to the ol There is no automatic downgrade. Before any new writes, retain and restore the complete pre-upgrade backup to a separate destination/database if returning to -the older binary is necessary. After new writes, retain the schema-6 catalog and +the older binary is necessary. After new writes, retain the schema-7 catalog and artifacts and reconcile/export them under an explicit recovery decision; an old backup cannot represent those later writes. @@ -193,3 +193,21 @@ It compares exact source ZIP bytes, metadata rows, history and unchanged backup files after reopen. The retained schema-3 real Run qualification now verifies upgrade and restore into schema 6 without changing any saved result bytes. These are storage and numerical-custody claims, not physics qualification. + +## Scoped actors (schema 7) + +Schema 7 adds `access_actors`, `access_credentials`, `access_audit` and +`access_admissions`. The exact schema-6 definition remains +`e4ca8ba0b092834a3e7ba059f88fce223a66ad2f830ab7fb60c64fe6d1882cf5`. +The explicit quiesced `access-metadata-6-to-7` transition creates empty actor +tables; it does not silently create an owner or authorize old callers. Actor +and credential IDs, SHA256 token hashes, bounded scope JSON, expiration epochs, +0/1 revocation/consumption flags, mutation evidence and closed job receipts use +the existing lossless backup value types. Raw credentials are never stored. + +A complete schema-7 backup includes these rows. Restore preserves their original +identity and expiration/revocation state, so retained credentials can remain +valid until their original expiry; protect backups like the original catalog. +Old schema-6 backups restore exactly as schema 6 and require explicit upgrade. +The application owns append-only audit/admission behavior; direct database +access remains local administrative authority. See [actors](actors.md). diff --git a/docs/plans/generic-scientific-projects/execution-ledger.md b/docs/plans/generic-scientific-projects/execution-ledger.md index 629a843c..348aad83 100644 --- a/docs/plans/generic-scientific-projects/execution-ledger.md +++ b/docs/plans/generic-scientific-projects/execution-ledger.md @@ -47,3 +47,29 @@ Implemented typed CZYX float sequence custody, pinned observation import, stage/ Final stable-source suite is in progress; see [P2 verification](reports/p2-verification.md) for completed evidence and boundaries. No training/physics acceptance, merge or deployment. Read-only P3 preparation found existing Runs assumes childless trainers and cgroups are read-only; later external execution requires explicit descendant ownership qualification. P5 installedTorch2.8CPU differs from declaredPumas2.14 target, so actual runtime compatibility remains unqualified. P2 final stable source:696 tests passed in566.842s, three optional-reader skips independently covered by20 spatial and6 scientific-release tests without skips. Final source hash inventory unchanged. Plan validator/local links/Python-JavaScript syntax/whitespace pass. Ready to commit/push draft; hosted exact-head CI remains acceptance prerequisite before P3 implementation. + +## 2026-10-13 — P2 hosted qualification and P3a admission + +Draft PR46 exact2476a7d passed UI14/14 and lifecycle125/125 steps, including native-reader/browser and all retained Runs/export gates. Updated PR evidence, no merge. Created feature/scoped-local-actors-20261013. Independent review accepted splitting P3a explicit actor/client migration from P3b external custody, preserving owner-only existing execution first. Resolved startup reconciliation and durable one-job continuation authority; rejected implicit decorator-owned transactions because existing dispatch requires committed admission. Exact API/write assignments precede dependent edits. + +## 2026-10-13 — P3a local integration and review + +Implemented shared explicit actors, schema7, current-client migration, transactional +review attribution and exact bounded continuations. Existing execution remains +owner-only; P3b approval and descendant custody remain pending. Root integrated +HTTP/Dataset/Runs, volume_assets owned Access/schema, milestone_audit domain and +Pipeline guards, recipe_design existing worker owners, mesh_review Workbench, +mesh_ui session UI/browser migration, point_assets explicit Python/CLI fixtures. +Independent cross-owner review corrected transport audit gaps and mutation replay, +removed a public internal split mutator, and preserved strict authorization errors. + +The full708-test run found18 issues (15 fixture migrations and3 compatibility +defects); final31-test affected+Access+HTTP rerun passes, independent20 readers +cover2 optional skips. Final real session browser and18-check workspace baseline +pass;23 existing controller suites and new auth controller/helper checks pass. +Plan-contract validation, syntax and whitespace checks pass. See +[P3a verification](reports/p3a-verification.md). Exact-head hosted full regression +is the acceptance gate before P3b implementation. No merge/deployment. + +An environment disconnect notice did not remove the workspace or stop tool access. +Verified branch and pending sources at2476a7d before publication; work continued. diff --git a/docs/plans/generic-scientific-projects/plan.md b/docs/plans/generic-scientific-projects/plan.md index 457cfc84..70370c8b 100644 --- a/docs/plans/generic-scientific-projects/plan.md +++ b/docs/plans/generic-scientific-projects/plan.md @@ -2,9 +2,9 @@ **Plan status:** `Active` -**Current phase:** P1 qualified at published commit 46384fca; P2 implemented and undergoing final qualification on feature/scientific-field-sequences-20261013. +**Current phase:** P2 qualified at published commit2476a7d; P3a scoped local actors admitted on feature/scoped-local-actors-20261013. -**Next slice:** P2 — lossless scientific field sequences, source custody, review and freeze. +**Next slice:** P3a — shared actor authority and explicit current-client migration; P3b external process custody follows after this checkpoint. **Acceptance status:** `partial` @@ -186,13 +186,15 @@ Statuses below track the approved staged implementation. Before starting each mi **Acceptance gate:** G2 and data portion of G7; independent cold read, exact bytes, geometry/time checks, malformed/oversize inputs, restore and retained-history tests. Actual sample unavailability leaves G2 pending while negative fixtures can proceed. -**Status:** `Verifying` +**Status:** `Accepted` ### P3: Authorized external recipe execution +**Reviewed sub-stages:** P3a introduces shared local actors and explicitly migrates existing domain/HTTP/browser clients; existing execution remains owner-only. P3b adds material execution approvals and descendant-safe external recipes. Separate feature branches preserve runnable checkpoints. P3 remains unaccepted until both qualify. [P3a authority contract](reports/p3a-admission.md) governs implementation. + **Goal:** Pipeline preflight and Runs execute/cancel a bounded real local process using the shared permission and lifecycle boundary. -**Allowed write set:** proposed `access.py`, `recipe_process.py`, `docs/contracts/actors.md`, `docs/contracts/external-recipes.md`, corresponding unit/integration tests; existing `pipeline.py`, `runs.py`, `app.py`, metadata and artifact owners, all affected mutation endpoints, workspace UI/tests. Enumerate the complete privileged endpoint population before implementation. +**Allowed write set:** `access.py`, `tests/auth_helpers.py`, `tests/auth_helpers.cjs`, `tests/test_access.py`, `static/auth.js`, `static/auth.css`; all current domain/HTTP/browser owners and their affected authentication fixture callers inventoried in the P3a admission report (exact paths recorded before editing); proposed `access.py`, `recipe_process.py`, `docs/contracts/actors.md`, `docs/contracts/external-recipes.md`, corresponding unit/integration tests; existing `pipeline.py`, `runs.py`, `app.py`, metadata and artifact owners, all affected mutation endpoints, workspace UI/tests. Enumerate the complete privileged endpoint population before implementation. **Tasks:** Owner session and agent credential scopes; domain admission checks; bound approvals to material inputs; structured process protocol; execution preflight; descendant/restart qualification; update existing callers without bypass; expose queued/running/cancelling/failed/unknown states and bounded structured diagnostics. diff --git a/docs/plans/generic-scientific-projects/reports/p3a-admission.md b/docs/plans/generic-scientific-projects/reports/p3a-admission.md new file mode 100644 index 00000000..9ab48f87 --- /dev/null +++ b/docs/plans/generic-scientific-projects/reports/p3a-admission.md @@ -0,0 +1,220 @@ +# P3a authority admission + +P2 exacthead2476a7daa339597557d29eb6e691327895d8c48c passed hosted UI14/14 and lifecycle125/125 steps. PR46 remains a draft, unmerged. Refreshed main remainsc522bf6. P3a branch isolates current-client authorization; P3b external execution follows. + +P3a candidate: explicit local actors across current operations. P3b external custody follows on separate feature branch; P3 overall gate remains pending until both qualify. No implementation until P2 exact-head CI passes. This split contains the large existing-client migration and keeps runnable checkpoints. + +Canonical Access owner shares catalog PostgreSQL metadata, explicit schema7 with retained TABLES_V6; narrow actors,credentials,audit tables (approval storage deferred to P3b where first consumed). Random opaque >=256bit tokens stored only SHA256. Revocable credential scopes; actor kind owner/human or agent resolved solely from server state. No body actor/role; no localhost owner identity; no production testmode; no omitted-actor fallback. + +Explicit local CLI bootstrap using Metadata+Access (not full Dataset) creates initial owner and one-time bootstrap credential written to new mode0600 private file, no token logging or URLs. Refuse rebootstrap once owner exists. Browser session exchange consumes one-time secret and issues expiring opaque HttpOnly SameSiteStrict Path=/ cookie. Local HTTP no Secure flag; session grants authenticated owner. CLI can issue a fresh one-time login token under local admin filesystem authority; tokens never in project files/URLs/Library. Owner-authenticated credential issue/revoke operations issue agent scopes as allowed subset, never approve-review/approve-execution/admin. TTL bounded, live revocation checked on every admission. Raw token shown only once in explicit credential issue response; don't log it. + +Scopes: inspect; edit/propose; execute; cancel; freeze; approve-review; approve-execution; expose-holdout; admin. Owner has all. Agent can receive inspect/edit/execute/cancel/freeze/expose-holdout only where explicitly issued; humanreview denied regardless request booleans. P3a current inference operations require execute; any material privileged approval semantics must be decided explicitly rather than bypassed because legacy. + +ContextVar holds server-resolved immutable actor context, verifies catalog identity+credential current grants, reset at request end. Direct domain operations require explicit bound session. Multiple catalogs use explicit nested scopes (or reviewed catalog-keyed context if simpler and tests need it); no Dataset auto-binding. Every externally callable domain method requires named scope before IO/mutation; private internal methods are not public API. Composition among owners retains same context. Every HTTP API/read/download authenticates before route dispatch/body ingestion; static/login minimal closed exceptions. Owner/agent bearer supported; cookies same-origin POST mandatory by normalized Origin or strict same-origin Fetch Metadata with no cross-site fallback. Review exact browser behavior and script migration. Project configured-root/loopback defenses retained. + +Human approval: owner request to save human_reviewed is a fresh explicit approval bound transactionally to exact before record/source revisions plus proposed task/annotation/groups/review content. Audited target digest/revisions and actor persist separately; don't pretend historical review had authenticated actors. Preference/response reviews same boundary. Agent proposals remain drafts. Trusted procedural verification stays separate and cannot mint humanreview. No actor fields added to existing frozen row schemas merely to project attribution; audit lookup supplies current attribution, legacy missing labels explicitly. + +Execute approval P3b must bind project, graph/recipe/source/runtime/input identities, params/resources/permissions. Agent can consume owner-approved exact request once; idempotent reconciliation same actor returns existingadmission. P3a must either implement same approval owner for existing execute paths or keep those paths owner-only until P3b, with explicit client migration and no scope-only agent provider execution shortcut. Existing trusted internal generation continuations need durable admittedactor/request capability, not ambientowner. Public start authorizes before scheduling, continuation bound to the admitted exact job and effect; revocation blocks new admission, alreadyadmitted bounded work canfinish. Child thread gets explicit continuation context; cannot call unrelated edit/review/admin operations. Details require full owners inventory. + +Audit: actor, credential identifier (never secret/hash), action, target revisions/digest, approval, outcome; append-only. Success audit and mutation same transaction. Failed auth/permission audit durable without accidental partial mutation. Bound text/target sizes. Static/cold immutable file readers need no catalog actor. + +Tests: explicit fixture bootstrap and actor-binding helper; real HTTP bearer/cookie login and CDP session fixture with credentials limited exact application origins. No auth monkeypatch/injected handleractor. Migrate all current directdomain/HTTP/browser callers, fixturethreads and backgroundjobs. Denials: missingcontext, wrongcatalog, expired/revoked, scope escalation, forged humanreview, staleapproval, cross-origin, reusedbootstrap, unauthenticated legacyAPI. Existing realRun and old+new backuprestore gates. Independent review and exactheadCI before P3b. + +Decision for review: P3a existing inference/generation/training starts remain authenticated owner-only. Agents can inspect/propose/edit/freeze/cancel only as issued; even an execute-scoped agent receives an explicit unsupported/permission denial until P3b material approval consumption qualifies. Owner action itself binds its exact current request; P3b introduces durable transferable approval records for agent/external execution. This keeps existing owner workflows runnable without claiming agent execution complete. Store review actor attribution in audit joined by record/revision, not extra frozen-row keys; label missing historical attribution as legacy. Tests demonstrate all public execution starts deny agent role, including old legacy AI routes. + +Independent review resolutions: add one closed access_admissions table for existing asynchronous jobs (not future execution approvals): catalog, actor+credential IDs, job kind/ID, immutable request digest and finite allowed effects. Existing start/retry/resume binds this receipt transactionally before scheduling; jobs receive a one-job internal continuation context, never copied owner scopes. Only owner admissions can create these receipts. Domain guards match explicit action+job target against the retained receipt. Revocation denies new admission but bounded already-admitted work may finish. Narrow internal system reconciliation/shutdown context can only inspect/reconcile/interrupt/drain retained work; cannot start, replay, create ordinary data or grant review. Legacy interrupted jobs retain legacy attribution; resuming requires a fresh owner admission. These internal contexts are not transport endpoints or public agent operations. Cancellation scope explicitly permits cancellation of any job in that catalog; no implied cross-catalog authority. Bootstrap consume+session creation atomic and login exchange same-origin. Unauthenticated-denial audit actor null; authenticated denial records actual actor, never asserted request fields; denied mutations roll back before durable denial audit. + +Binding implementation refinement from independent review: @authorized(scope,action) is a small explicit guard/context only; it MUST NOT open an outer transaction. synthetic.start/grounded.start reject existing transactions, and Runs commits admission before dispatch. Preserve each owner's transaction/lifecycle boundary. Insert success audit/admission inside its existing mutation transaction, with exact record revisions/review digest; short helpers may be explicit opt-in, never implicit wrapping of spawn/network/filesystem lifetimes. Denial audit follows rollback, operational failure and CommitOutcomeUnknown remain distinct. Auth requires no catalog audit write for successful ordinary inspect; privileged actions and denials retain evidence. Pure module-level frozen validation functions remain unauthenticated/cold; stdlib-only access.py import added to each pinned worker closure if decorators require it. + +Inventory: three HTML entrypoints,27fetch calls across16JSfiles,four APIhelpers;48runnablebrowser suites; approximately60Python test/helper files with136Dataset construction sites and29handler-owningfiles. Both legacy and newer API surfaces require explicit authentication. Internal provider fixture endpoints also require access checks; no testmode. + +## Consolidated assigned write inventory + +The assignments were recorded before each owner edited its files; this consolidated integration inventory records the resulting exact paths. The initial broad migration estimate was not an exact path inventory. Root additionally authorized the three qualification scripts after the caller audit identified them, and the auth HTTP tests and CI gate. No unrelated changes are admitted. + +```text +.github/workflows/tests.yml +README.md +access.py +app.py +audio_assets.py +bulk_import.py +caption_import.py +caption_proposals.py +dataset_recipes.py +dataset_releases.py +docs/contracts/actors.md +docs/contracts/workspace-storage.md +docs/plans/generic-scientific-projects/execution-ledger.md +docs/plans/generic-scientific-projects/plan.md +docs/plans/generic-scientific-projects/reports/p3a-admission.md +docs/plans/generic-scientific-projects/reports/p3a-verification.md +docs/plans/generic-scientific-projects/reports/p3a/access-receipt.json +docs/plans/generic-scientific-projects/reports/p3a/domain-guard-inventory.json +docs/plans/generic-scientific-projects/reports/p3a/session-1280.jpg +docs/plans/generic-scientific-projects/reports/p3a/session-390.jpg +docs/plans/generic-scientific-projects/reports/p3a/source-files.json +grounded_candidates.py +image_generation.py +immutable_assets.py +meshes.py +metadata.py +native_detection_import.py +native_text_import.py +pipeline.py +preferences.py +projects.py +rheon_sequences.py +runs.py +saved_searches.py +saved_selections.py +scientific_fields.py +scripts/prepare_caption_fixtures.py +scripts/qualify_grounded_local.py +scripts/qualify_pumas_typed_actual.py +sequence_assets.py +sequence_batch_import.py +spatial_assets.py +static/app.js +static/audio-editor.js +static/auth.css +static/auth.js +static/bulk_import.js +static/caption_import.js +static/index.html +static/meshes.js +static/native_detection_import.js +static/native_text_import.js +static/pointclouds.js +static/pumas-typed.js +static/scientific-fields.js +static/sequence-batch.js +static/volume-editor.js +static/workbench.html +static/workbench.js +static/workspace-projects.js +static/workspace-real.js +static/workspaces.html +static/workspaces.js +synthetic.py +tests/auth_helpers.cjs +tests/auth_helpers.py +tests/browser.cjs +tests/browser_access.cjs +tests/browser_bulk_import.cjs +tests/browser_caption_dataset_integration.cjs +tests/browser_caption_import.cjs +tests/browser_caption_proposals.cjs +tests/browser_captions.cjs +tests/browser_classification_preferences_integration.cjs +tests/browser_combined_workbench.cjs +tests/browser_curation.cjs +tests/browser_curation_server.py +tests/browser_dataset_integration.cjs +tests/browser_grounded.cjs +tests/browser_image_classification_export.cjs +tests/browser_image_classification_server.py +tests/browser_images.cjs +tests/browser_images_real.cjs +tests/browser_instruction_responses.cjs +tests/browser_meshes.cjs +tests/browser_metadata_filters.cjs +tests/browser_metadata_server.py +tests/browser_native_detection_import.cjs +tests/browser_native_text_import.cjs +tests/browser_preferences.cjs +tests/browser_pumas_gateways.cjs +tests/browser_pumas_typed.cjs +tests/browser_pumas_typed_server.py +tests/browser_release_preview.cjs +tests/browser_rights_note.cjs +tests/browser_saved_searches.cjs +tests/browser_saved_selection_intent.cjs +tests/browser_saved_selections.cjs +tests/browser_scientific_fields.cjs +tests/browser_sequence_batch.cjs +tests/browser_sequences.cjs +tests/browser_sequences_actual.cjs +tests/browser_text_classification_proposals.cjs +tests/browser_text_classification_proposals_server.py +tests/browser_text_corpus_export.cjs +tests/browser_vlm_real.cjs +tests/browser_workbench.cjs +tests/browser_workspace_audio.cjs +tests/browser_workspace_audio_run.cjs +tests/browser_workspace_breadth.cjs +tests/browser_workspace_export_run.cjs +tests/browser_workspace_image_run.cjs +tests/browser_workspace_mesh.cjs +tests/browser_workspace_mesh_run.cjs +tests/browser_workspace_project.cjs +tests/browser_workspace_sequence_run.cjs +tests/browser_workspace_spatial.cjs +tests/browser_workspace_text.cjs +tests/browser_workspaces.cjs +tests/check_image_classification_consumer.py +tests/check_text_corpus_consumer.py +tests/qualify_spatial_retained_runs.py +tests/test_access.py +tests/test_access_http.py +tests/test_ai.py +tests/test_audio_data.py +tests/test_audio_training.py +tests/test_auth_controller.cjs +tests/test_auth_helpers.cjs +tests/test_bulk_import.py +tests/test_caption_exports.py +tests/test_caption_import.py +tests/test_caption_proposals.py +tests/test_combined_workbench.py +tests/test_curation.py +tests/test_dataset.py +tests/test_export_runs.py +tests/test_generation_job_api.py +tests/test_grounded_candidates.py +tests/test_image_classification_export.py +tests/test_image_generation.py +tests/test_image_training.py +tests/test_instruction_responses.py +tests/test_mesh_release.py +tests/test_mesh_runs.py +tests/test_meshes.py +tests/test_metadata_filters.py +tests/test_metadata_migration.py +tests/test_metadata_transactions.py +tests/test_metadata_workers.py +tests/test_native_detection_import.py +tests/test_native_detection_stack.py +tests/test_native_text_import.py +tests/test_pipeline.py +tests/test_preferences.py +tests/test_projects.py +tests/test_pumas_typed.py +tests/test_pumas_vision.py +tests/test_real_import_foundation.py +tests/test_release_preview.py +tests/test_rights_note.py +tests/test_runs.py +tests/test_saved_generation.py +tests/test_saved_searches.py +tests/test_saved_selections.py +tests/test_scientific_fields.py +tests/test_scientific_release.py +tests/test_sequence_batch.py +tests/test_sequence_release.py +tests/test_sequence_runs.py +tests/test_sequence_v2_runs.py +tests/test_sequences.py +tests/test_sequences_v2.py +tests/test_spatial_release.py +tests/test_spatial_storage.py +tests/test_synthetic.py +tests/test_text_classification_proposals.py +tests/test_text_corpus_export.py +tests/test_text_training.py +tests/test_workbench.py +tests/test_workspace_metadata.py +text_classification_proposals.py +upgrade_metadata.py +workbench.py +``` diff --git a/docs/plans/generic-scientific-projects/reports/p3a-verification.md b/docs/plans/generic-scientific-projects/reports/p3a-verification.md new file mode 100644 index 00000000..12b85a1d --- /dev/null +++ b/docs/plans/generic-scientific-projects/reports/p3a-verification.md @@ -0,0 +1,74 @@ +# P3a scoped local actors + +Branch `feature/scoped-local-actors-20261013` descends from qualified P2 commit +`2476a7daa339597557d29eb6e691327895d8c48c`. This checkpoint introduces the actor +boundary across existing operations. P3 remains incomplete until external process +custody and material execution approvals qualify in P3b. No merge or deployment. + +## Implemented boundary + +Schema 7 retains the exact schema 1–6 definitions and adds actors, hashed opaque +credentials, transactional audits and closed job admissions. Local CLI login +creates a private one-use code; browser exchange issues an expiring HttpOnly, +SameSite Strict cookie. HTTP and direct domain calls share explicit catalog-bound +actor checks. Missing, revoked, expired and cross-catalog credentials fail closed. +Mixed credential transports and explicit foreign origins are refused. + +Agents receive only owner-issued scopes. Human review requires a current owner +and audits exact content and revisions; agent response drafts retain agent +attribution. All current generation, inference, verification and training starts +remain owner-only. Workers receive exact durable job receipts and finite effects, +not inherited owner scopes. Revocation stops new admissions; bounded admitted +work can finish. Startup reconciliation cannot admit or replay work. + +The three browser entrypoints share compact session controls. Login never replays +a mutation, expired sessions retain edits, and stale identity responses cannot +replace a newer session. Forty-seven real browser suites and direct Python/CLI +callers use explicit production authentication; pure controller fixtures remain +isolated tests rather than authentication evidence. + +## Evidence and review + +- [Actual login browser receipt](p3a/access-receipt.json), [390px screenshot](p3a/session-390.jpg), + [desktop screenshot](p3a/session-1280.jpg). Root inspected the narrow view. + Existing workspace browser: all 18 checks pass (`run-qrJHY8`). +- Access/schema/storage focused regression: 40 tests pass; final Access-only + rerun: 9 pass. Closed asynchronous job owners: 74 tests pass. Runs: 13 pass. + Responses, rights and real HTTP access: 30 tests pass before the added response + draft-denial assertions, which are included in the full run. +- Auth controller/helper tests pass, including Request-object mutation refusal, + stale-session ownership and credential confinement to the exact application + origin. Twenty-three existing JS controller suites pass. +- [Domain inventory](p3a/domain-guard-inventory.json), independent root/domain/UI + reviews and plan-contract validation cover the shared boundary. Review fixes + removed a public split mutation path, preserved authorization exceptions, + audited transport refusals, and moved procedural execution admission before + asset creation. Guards do not change existing transaction ownership. +- The disposable PostgreSQL fixture exhausted its 64 MiB POSIX shared-memory + mount after accumulated test schemas. Switching only that fixture to mmap + restored capacity without deleting schemas. Interrupted runs are not passes. + +Full regression ran 708 tests in 643.073s: four failures and fourteen errors, +with two optional-reader skips. Fifteen failures were explicit-auth fixture +migrations; three exposed compatibility defects in the new boundary: structured +storage error codes, retained Unicode audit hashing and invalid preference-ID +guard targets. Those defects and all affected fixtures were corrected. The final +31-test rerun passes (all 18 failed cases, nine Access tests and four real HTTP +access tests). Independent point/volume readers pass all 20 tests, covering both +skips. No runtime source changed during the broad run; the final bounded source +corrections were independently reviewed. [Final source hashes](p3a/source-files.json) +bind the candidate. Hosted exact-head CI will rerun the full suite after publication. No static type-checker +or Standards Engine certificate is claimed. This milestone does not qualify ASR, +general 3D training, external process containment, remote deployment or scientific +model quality. + +## Next-stage prerequisite + +A scratch Linux probe demonstrated a start barrier, subreaper adoption of a +double-forked detached child, and pidfd-driven drain to ECHILD. Helper death left a +live descendant, requiring an unknown-state execution fence. The native Rheon +binary performed only an 8³ ready/stop exchange; no simulation/model acceptance +is claimed. `/proc/.../children` is unavailable, so the revised probe used PPID +scanning. An initial failed probe left a PID-1-owned zombie after its bounded +child exited; revised cases fully reaped their children. Production lifecycle +qualification is still P3b work, after P3a CI. diff --git a/docs/plans/generic-scientific-projects/reports/p3a/access-receipt.json b/docs/plans/generic-scientific-projects/reports/p3a/access-receipt.json new file mode 100644 index 00000000..50140a2f --- /dev/null +++ b/docs/plans/generic-scientific-projects/reports/p3a/access-receipt.json @@ -0,0 +1,10 @@ +{ + "checks": [ + "Anonymous legacy/current APIs denied; real one-time login consumed; cookie is HttpOnly and code cleared", + "Sign out and rejected mutation preserve draft; reauthentication does not replay mutation; deliberate retry commits", + "Real scoped agent identity cannot use owner human-review controls" + ], + "anonymous_denied": true, + "real_cli_login": true, + "no_mutation_replay": true +} \ No newline at end of file diff --git a/docs/plans/generic-scientific-projects/reports/p3a/domain-guard-inventory.json b/docs/plans/generic-scientific-projects/reports/p3a/domain-guard-inventory.json new file mode 100644 index 00000000..066f032a --- /dev/null +++ b/docs/plans/generic-scientific-projects/reports/p3a/domain-guard-inventory.json @@ -0,0 +1,472 @@ +{ + "projects.py": [ + { + "method": "Projects.close", + "line": 108, + "guards": [], + "exception": "process lifecycle cleanup" + }, + { + "method": "Projects.list", + "line": 171, + "guards": [ + "authorized('inspect', 'projects.list')" + ], + "exception": null + }, + { + "method": "Projects.open", + "line": 178, + "guards": [ + "authorized('edit', 'projects.open')" + ], + "exception": null + }, + { + "method": "Projects.get", + "line": 228, + "guards": [ + "authorized('inspect', 'projects.get')" + ], + "exception": null + }, + { + "method": "Projects.read_data_reference", + "line": 265, + "guards": [ + "authorized('inspect', 'projects.read_data_reference')" + ], + "exception": null + }, + { + "method": "Projects.evidence", + "line": 288, + "guards": [ + "authorized('inspect', 'projects.evidence')" + ], + "exception": null + } + ], + "immutable_assets.py": [ + { + "method": "ImmutableAssets.admit", + "line": 83, + "guards": [ + "authorized('edit', 'immutable_assets.admit')" + ], + "exception": null + }, + { + "method": "ImmutableAssets.check_selection", + "line": 113, + "guards": [ + "authorized('inspect', 'immutable_assets.check_selection')" + ], + "exception": null + }, + { + "method": "ImmutableAssets.metadata", + "line": 117, + "guards": [ + "authorized('inspect', 'immutable_assets.metadata')" + ], + "exception": null + }, + { + "method": "ImmutableAssets.asset", + "line": 122, + "guards": [ + "authorized('inspect', 'immutable_assets.asset', target=lambda record: record.get('id') if isinstance(record, dict) else None)" + ], + "exception": null + } + ], + "audio_assets.py": [ + { + "method": "AudioAssets.admit", + "line": 102, + "guards": [ + "authorized('edit', 'audio_assets.admit')" + ], + "exception": null + }, + { + "method": "AudioAssets.metadata", + "line": 144, + "guards": [ + "authorized('inspect', 'audio_assets.metadata')" + ], + "exception": null + }, + { + "method": "AudioAssets.asset", + "line": 151, + "guards": [ + "authorized('inspect', 'audio_assets.asset', target=lambda record: record.get('id') if isinstance(record, dict) else None)" + ], + "exception": null + }, + { + "method": "AudioAssets.inspect", + "line": 167, + "guards": [ + "authorized('inspect', 'audio_assets.inspect')" + ], + "exception": null + } + ], + "scientific_fields.py": [ + { + "method": "ScientificAssets.admit", + "line": 282, + "guards": [ + "authorized('edit', 'scientific_fields.admit')" + ], + "exception": null + }, + { + "method": "ScientificAssets.metadata", + "line": 344, + "guards": [ + "authorized('inspect', 'scientific_fields.metadata')" + ], + "exception": null + }, + { + "method": "ScientificAssets.asset", + "line": 356, + "guards": [ + "authorized('inspect', 'scientific_fields.asset', target=lambda record: record.get('id') if isinstance(record, dict) else None)" + ], + "exception": null + }, + { + "method": "ScientificAssets.inspect", + "line": 363, + "guards": [ + "authorized('inspect', 'scientific_fields.inspect')" + ], + "exception": null + } + ], + "sequence_assets.py": [ + { + "method": "SequenceAssets.admit", + "line": 15, + "guards": [ + "authorized('edit', 'sequence_assets.admit')" + ], + "exception": null + } + ], + "sequence_batch_import.py": [ + { + "method": "find_result", + "line": 50, + "guard": "'Confirm committed acquisition, not current bytes, review or scientific validity.'" + }, + { + "method": "import_item", + "line": 72, + "guard": "workbench.access.require('edit', 'sequence_batch_import.import_item')" + } + ], + "spatial_assets.py": [ + { + "method": "admit", + "line": 40, + "guard": "workbench.access.require('edit', 'spatial_assets.admit')" + }, + { + "method": "SpatialAssets.admit", + "line": 68, + "guards": [ + "authorized('edit', 'spatial_assets.admit')" + ], + "exception": null + }, + { + "method": "SpatialAssets.validated", + "line": 73, + "guards": [], + "exception": "pure validation of supplied bytes; no catalog reads or writes" + }, + { + "method": "SpatialAssets.asset", + "line": 90, + "guards": [ + "authorized('inspect', 'spatial_assets.asset', target=lambda record: record.get('id') if isinstance(record, dict) else None)" + ], + "exception": null + }, + { + "method": "SpatialAssets.inspect", + "line": 96, + "guards": [ + "authorized('inspect', 'spatial_assets.inspect')" + ], + "exception": null + } + ], + "meshes.py": [ + { + "method": "admit", + "line": 236, + "guard": "workbench.access.require('edit', 'meshes.admit')" + }, + { + "method": "MeshAssets.admit", + "line": 251, + "guards": [ + "authorized('edit', 'meshes.admit')" + ], + "exception": null + }, + { + "method": "MeshAssets.validated", + "line": 256, + "guards": [], + "exception": "pure validation of supplied bytes; no catalog reads or writes" + }, + { + "method": "MeshAssets.asset", + "line": 273, + "guards": [ + "authorized('inspect', 'meshes.asset', target=lambda record: record.get('id') if isinstance(record, dict) else None)" + ], + "exception": null + }, + { + "method": "MeshAssets.inspect", + "line": 279, + "guards": [ + "authorized('inspect', 'meshes.inspect')" + ], + "exception": null + } + ], + "dataset_releases.py": [ + { + "method": "Releases.locate", + "line": 164, + "guards": [ + "authorized('inspect', 'dataset_releases.locate')" + ], + "exception": null + }, + { + "method": "Releases.preview", + "line": 173, + "guards": [ + "authorized('inspect', 'dataset_releases.preview')" + ], + "exception": null + }, + { + "method": "Releases.create", + "line": 671, + "guards": [ + "authorized('freeze', 'dataset_releases.create')" + ], + "exception": null + } + ], + "dataset_recipes.py": [ + { + "method": "generate", + "line": 66, + "guard": "workbench.access.require('edit', 'dataset_recipes.generate')" + } + ], + "preferences.py": [ + { + "method": "Preferences.list", + "line": 51, + "guards": [ + "authorized('inspect', 'preferences.list')" + ], + "exception": null + }, + { + "method": "Preferences.history", + "line": 65, + "guards": [ + "authorized('inspect', 'preferences.history')" + ], + "exception": null + }, + { + "method": "Preferences.save", + "line": 72, + "guards": [ + "authorized('edit', 'preferences.save', target=lambda body: body.get('id') if isinstance(body, dict) else None)" + ], + "exception": null + }, + { + "method": "Preferences.delete", + "line": 110, + "guards": [ + "authorized('edit', 'preferences.delete', target=lambda body: body.get('id') if isinstance(body, dict) else None)" + ], + "exception": null + }, + { + "method": "Preferences.competing", + "line": 123, + "guards": [ + "authorized('inspect', 'preferences.competing')" + ], + "exception": null + }, + { + "method": "Preferences.selection", + "line": 142, + "guards": [ + "authorized('inspect', 'preferences.selection')" + ], + "exception": null + } + ], + "saved_selections.py": [ + { + "method": "SavedSelections.list", + "line": 30, + "guards": [ + "authorized('inspect', 'saved_selections.list')" + ], + "exception": null + }, + { + "method": "SavedSelections.create", + "line": 37, + "guards": [ + "authorized('edit', 'saved_selections.create')" + ], + "exception": null + }, + { + "method": "SavedSelections.load", + "line": 72, + "guards": [ + "authorized('inspect', 'saved_selections.load')" + ], + "exception": null + }, + { + "method": "SavedSelections.mutate", + "line": 114, + "guards": [ + "authorized('edit', 'saved_selections.mutate')" + ], + "exception": null + } + ], + "saved_searches.py": [ + { + "method": "SavedSearches.get", + "line": 84, + "guards": [ + "authorized('inspect', 'saved_searches.get')" + ], + "exception": null + }, + { + "method": "SavedSearches.list", + "line": 89, + "guards": [ + "authorized('inspect', 'saved_searches.list')" + ], + "exception": null + }, + { + "method": "SavedSearches.create", + "line": 97, + "guards": [ + "authorized('edit', 'saved_searches.create')" + ], + "exception": null + }, + { + "method": "SavedSearches.mutate", + "line": 112, + "guards": [ + "authorized('edit', 'saved_searches.mutate')" + ], + "exception": null + } + ], + "native_text_import.py": [ + { + "method": "NativeTextImports.prepare", + "line": 79, + "guards": [ + "authorized('edit', 'native_text_import.prepare')" + ], + "exception": null + }, + { + "method": "NativeTextImports.admit", + "line": 211, + "guards": [ + "authorized('edit', 'native_text_import.admit')" + ], + "exception": null + } + ], + "native_detection_import.py": [ + { + "method": "NativeDetectionImports.prepare", + "line": 109, + "guards": [ + "authorized('edit', 'native_detection_import.prepare')" + ], + "exception": null + }, + { + "method": "NativeDetectionImports.admit", + "line": 232, + "guards": [ + "authorized('edit', 'native_detection_import.admit')" + ], + "exception": null + } + ], + "caption_import.py": [ + { + "method": "CaptionImports.prepare", + "line": 146, + "guards": [ + "authorized('edit', 'caption_import.prepare')" + ], + "exception": null + }, + { + "method": "CaptionImports.admit", + "line": 262, + "guards": [ + "authorized('edit', 'caption_import.admit')" + ], + "exception": null + } + ], + "bulk_import.py": [ + { + "method": "find_result", + "line": 68, + "guard": "workbench.access.require('inspect', 'bulk_import.find_result', request_id)" + }, + { + "method": "import_row", + "line": 88, + "guard": "workbench.access.require('edit', 'bulk_import.import_row')" + } + ], + "rheon_sequences.py": [ + { + "method": "admit", + "line": 111, + "guard": "workbench.access.require('edit', 'rheon_sequences.admit')" + } + ] +} diff --git a/docs/plans/generic-scientific-projects/reports/p3a/session-1280.jpg b/docs/plans/generic-scientific-projects/reports/p3a/session-1280.jpg new file mode 100644 index 0000000000000000000000000000000000000000..393491ef59797b776c4e30f1cbd27ca5095bc05f GIT binary patch literal 117915 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

ijWvx?ia_6-VfnZYZLMt%1|m%XwgCkxX5%)Z*f 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 Rb)oeXK&(6!!Tf#Ve*p%0&eZ?_ literal 0 HcmV?d00001 diff --git a/docs/plans/generic-scientific-projects/reports/p3a/source-files.json b/docs/plans/generic-scientific-projects/reports/p3a/source-files.json new file mode 100644 index 00000000..a89089cd --- /dev/null +++ b/docs/plans/generic-scientific-projects/reports/p3a/source-files.json @@ -0,0 +1,175 @@ +{ + ".github/workflows/tests.yml": "816f06bbeb6a8e0d82ec9a8919058c3359b4e703a9c979690b2c579c6a7ad0c0", + "README.md": "4d6872fbeba6ae29a9ed442f8cafeca1bd6836a5f966f48adbc8d6a26da3d69c", + "access.py": "06922edc2feb48fd6b678dc566e80b130c65612092bfd3cba7be909ee4d5beda", + "app.py": "3320c9fb0f838e98d5d20049b0ea27a122c0813b14d43547b622c44b7edbf53e", + "audio_assets.py": "d69bfa94037ea132be4adebba26c4389d58925a408f2fc27c6984a71fc8dc1cd", + "bulk_import.py": "d09fe5973d4cd405b99423989a29de91fee710c56523f48f77a1c4e6fb03ed39", + "caption_import.py": "e6e16f3a4977f03491d119bd8ef67430526e4fb100a2a4161d600df2d6eb8acc", + "caption_proposals.py": "a74ca7993b6f3b7dc7fb867a871148f04c743c048a1e988ab517554a35ae901c", + "dataset_recipes.py": "78ae918228f15f9d5924985075cb96535b8953b4ad5faa821d0cacd0a50e3c88", + "dataset_releases.py": "97b2045fcfda2adfaedd98cb8d42ccd72f093bab4d12bb902b940ae8a060f5e0", + "grounded_candidates.py": "55bf111d7dfe951fea960f347ed4bfb498d15dcc604bf46fb1ae2505cc1354cc", + "image_generation.py": "c3a62b3cf0bf1d6f6d453a63f7f2a7d08de63864d880959bd0eab237d9856858", + "immutable_assets.py": "672c08d949f964fcd8cebd9a888092ab0163f022542df337e02bcb17f3c477c8", + "meshes.py": "abeca65f8a39af57352828169f90f767b6bc770fb5407fb3f18af53be8ff84e2", + "metadata.py": "f786718b6fa039160f877c2f434b0c8efdcc06616fd844e6436c76c548d7a539", + "native_detection_import.py": "80466232bd51f58bca9a00ef68e278da087b012e7f1b3b1171e6e51db3b8c572", + "native_text_import.py": "8e1d53558dca265812792a9ec0802994cf200fd448b6dd11560667d07f64af2c", + "pipeline.py": "db48dbcbbbdeaf54ad3c4e9f0e4e55a811b254e799a52b67a510f2bd2021a417", + "preferences.py": "d6279b18375fa8695584a02cfe962b56e77cf4f3521c5e33cc4baf09f8e4dab7", + "projects.py": "1dac3e60ff40c34e1d37210d7145f38347ea093c007bb72746e7ed016f0c8de7", + "rheon_sequences.py": "9e3013fb1b5f1baf3de73678a26f964bc2f802435e6fff26476f816847fd22a5", + "runs.py": "39c56d4d264b71969080a58c9f51270dc4d23a3fcd9507598dc855705bb739cb", + "saved_searches.py": "fcd4021fc20702568f1e44a165473aa752b9a9794a958ff31b33c42aba7114d5", + "saved_selections.py": "4e89ee272fc8a685ec76b3737879d6560661a73e03fca264c2057785905418a3", + "scientific_fields.py": "65d46550668e97cf51925298f18c4a9d0f0fe73d4a47389775ade457487cd608", + "scripts/prepare_caption_fixtures.py": "957632b83bb63917d0c8a4e52735fbc1f0d2c4638b6740fdf3c385cbd2597b15", + "scripts/qualify_grounded_local.py": "4c7cb6f56e3b54e38b263549aa500d124ece76e4fbb836d6a605279b3d660d7d", + "scripts/qualify_pumas_typed_actual.py": "813db7e80039fdf1c69b4312aba297e2e8328d9a8f18039ae960081e465554ac", + "sequence_assets.py": "3ac8361f5e24f6b2af93dbd9030bab864da7bddb32da975d937e852d89fff98d", + "sequence_batch_import.py": "3e7af45744ae7f8393059715dbf7012567d0bbb528c3682dd1b992141ae32b10", + "spatial_assets.py": "fdd3715025426024a4c8fa1704645d98940cab7e6002846b9e72a54352fe6ef8", + "static/app.js": "b82969e67e7a7792a11f239eff2fec959158e1dd78d08a84d68daedb93aad6bb", + "static/audio-editor.js": "d397bb98480077326b4c96035d891f1d8eb77cef8a04f3b2aef1eb34d5bbcf40", + "static/auth.css": "4ad4c7e8e4aaa04b4837698493b59365859b89f2cedd8717492ba6b57615f620", + "static/auth.js": "6a38fa7dabf57b2c99d293c6851a732af76a19193bea43f7d2a8b8460d71faec", + "static/bulk_import.js": "2d19443342dad5d083ad66e32f5b4877a825296f1a41d8996befd336cec7d367", + "static/caption_import.js": "280a116a086c3e8c69fcd17e24aba6630bb6c3d3c1e653a5ed84c184895ae850", + "static/index.html": "34ef87f168f4f1cd291be6c86464e02969b3c760316f0a59f01f50890ec973b3", + "static/meshes.js": "c2eb7622dd4e0a172db9db36e46a0ce66800d5b03aca989cd1f08dd40b8558c8", + "static/native_detection_import.js": "b07d3a9663d5b1534fca24dc7481caf4cb166bb4a83c4c97c2a78fb9c8d50d82", + "static/native_text_import.js": "1704549e9e5cf489e6351d5126858eb774ddd94d060e596a0bfba5fc00ea8773", + "static/pointclouds.js": "34851447f34ea0204887b6aae4a86d73f6f94c8d1726b8e82b892027336c0c84", + "static/pumas-typed.js": "50fd9fc961dafdd0c34cfcb1137d04f85a99f324f76fd5217f227b789c8835ad", + "static/scientific-fields.js": "96e6289ade2a634e9648cbe8aa899e5bfaddacddcea120835bda8cb6d65e14a6", + "static/sequence-batch.js": "36bbbdc07cc3a03856e6072e4141545c1c0f202805faedec76a2c7f20c0850f7", + "static/volume-editor.js": "d48806cd446ea05586b524c24340d87abe8c69063ea6b15c254f76b3e51c5db8", + "static/workbench.html": "6d1ab570aae02f781b905ffa2b6970843c297d6ffe671e8fe7cca620e2a46270", + "static/workbench.js": "7e31b8a0e916f1627cb523d84c6d98c732eb739617b3f3856cbc1c235a6829b2", + "static/workspace-projects.js": "8647ad81ac2bdde74fd8b484de331aad877a6bb2977aeec5659dddfc78fb753c", + "static/workspace-real.js": "055c65d5527f92d17e74d9d411e1c0e020e9447dea74cfccf251b1c1be2395e1", + "static/workspaces.html": "b8fc3865b7e3953131ff1489470a1c88e00d32d40cb8784390cf68237a5a7c7b", + "static/workspaces.js": "c4557905a37f2f8e52697f65d384c42dd067a0368fe7617a439c53ec349b10db", + "synthetic.py": "dc55737b0f55ff4ec8df56a3d6b4f4596f5067bfd75672ba6326453047cab5e9", + "tests/auth_helpers.cjs": "363ae493c121f2cc5e804c3774d6ee4c2078ccc936db1c37ddf749cf9b4e1a15", + "tests/auth_helpers.py": "27a40542686a8a56df04601d765b0d4bf815d65d327b49931696a0ed161b5a7e", + "tests/browser.cjs": "c4c5ae4aaa227207258be2f7ebd68e4d4ff046dd14c170ce8d5f60203bb25208", + "tests/browser_access.cjs": "b19ba3559cc8321c3a4d932f0c14a08c3763ca41ac8640fd965d346f95213159", + "tests/browser_bulk_import.cjs": "a7c8fea60c9a08b808cb7f26ec94a83be2b20f72b2605a5fe81ec5ee1de919e3", + "tests/browser_caption_dataset_integration.cjs": "02e531b8c183c2a6f6cd1db88b24dfe686bf65cfb5236e85e67b337f9bcccddb", + "tests/browser_caption_import.cjs": "1fe190836b28bbbe75e4ad037ddc105ab8274e4b58c94976c0bf56f963fdae5c", + "tests/browser_caption_proposals.cjs": "1e41aa2e33f0caca0bc23ec447710f9694535c303fadb9717c188c8c0dd3c78a", + "tests/browser_captions.cjs": "de73a2a845e503aa2c402e7be826fbe8a2d2c2e97b6c87967036436943ff54cd", + "tests/browser_classification_preferences_integration.cjs": "876fc48921112ad014cc2b406756100680aaf73a6a622ca9e78fcf4715c67898", + "tests/browser_combined_workbench.cjs": "775809ee600a2df52cc691cf05c16bf895a98635be05ba859d4ebdf06b048631", + "tests/browser_curation.cjs": "e6de80c9dfda22bbb81be8935903705320c94c7a8395fd062d9bb908976f677c", + "tests/browser_curation_server.py": "812eb92ca91e0c14e6a02a753e1554e5c499b198d659c90036fd2ee7ebef80d5", + "tests/browser_dataset_integration.cjs": "8145f21e137397111241495c21a80a96ff7b3b758698afa9ff51a6f1b0615d4c", + "tests/browser_grounded.cjs": "47eedca6a53ecabffe35155d7f53c1bce7b73cb390d306860b65a108be558d8e", + "tests/browser_image_classification_export.cjs": "3315d2eebeceef30f4789e6b1c9995e82d789c171c6fc13e8401ce276966a4c8", + "tests/browser_image_classification_server.py": "f5f3c3512823298afd6ea110b74bd617ef814e6e0d29cd35cd728760cbc32c34", + "tests/browser_images.cjs": "007da417cc70a024fb58ad35d741eaeecdedcced9e25f47ee3fa37ecbd4a3ab5", + "tests/browser_images_real.cjs": "a089ad6ca6c2ff189977b35531adc0af91630444b49f2ccfb686193e421d210e", + "tests/browser_instruction_responses.cjs": "db3713ef4a33391255f9ab3657ed2975e4c6bad144e84e78ef34b0695254205b", + "tests/browser_meshes.cjs": "f75733354082f24e3d3f369eb40386599705fb1b09c08e17cf2a005c16844dae", + "tests/browser_metadata_filters.cjs": "e8b88df0932f03cd748b47a23343545f5461dee48813934cb631e79c7d39ec0c", + "tests/browser_metadata_server.py": "7aa0e25bae8eb5bdd523ea1b568e5ac60d9420e3aa8acd97750f95053f07f053", + "tests/browser_native_detection_import.cjs": "8b45927d506612925aaa3d9bf47646031de1e99d43e6fb42293bff01bed5ee59", + "tests/browser_native_text_import.cjs": "5f8e5f2d20a66e35784702a37706b9daac53e73ad1c1e9719978086122e957f2", + "tests/browser_preferences.cjs": "63977d6ac0eaa390f5472cfe86a1943ebf07a6f1e32cb8338bed0128a4b4f70f", + "tests/browser_pumas_gateways.cjs": "e7659f2598680c15c89129df8e05ba4bd8019369d7fb03566616a2091f43b3c5", + "tests/browser_pumas_typed.cjs": "9813559dc88426a088e750d785ceaf0c4ed8458011abf58c6f20812613dc8883", + "tests/browser_pumas_typed_server.py": "fc729ef0b1e4cc107dab0fe5fe8a4b2e09fbb97d32f4f282ce5960f7e9f7ea35", + "tests/browser_release_preview.cjs": "bc990461fa95e59d87d75a0185e5fe16685b641ff9e24379f214dc582f558c3a", + "tests/browser_rights_note.cjs": "bee20ec43752ce03b274ef5b4bb35f3b9af1179cb0a723c4bbe081ef80a7fc6b", + "tests/browser_saved_searches.cjs": "6eedc0491497dbec262943cc0d3b0bc1b0aee959f1f4cd4dfe8b53b8cad94b25", + "tests/browser_saved_selection_intent.cjs": "381a2040096227ec0854f2b21519b29e086267e3bc57eec225977152d13821ca", + "tests/browser_saved_selections.cjs": "05276e39fc3744e969999f43d5f6bc9aa1a96c5b7b7e1512a80f111f752594e6", + "tests/browser_scientific_fields.cjs": "cd67c773023520ebad8ac54d09b0f4f0fb8f3bcd78eed6a8942bd6bcce24ac3f", + "tests/browser_sequence_batch.cjs": "eca3a2f69a54919394452dd8703e0584698af4c6fe6712571c69414169cd460a", + "tests/browser_sequences.cjs": "b84c8b41242e0b7ed125251d255de21699cd308e2a94fe755119438062576009", + "tests/browser_sequences_actual.cjs": "60c68f3c637cb394199e9565410981ccfe3daf79dd7b6e7e859df81ba5864c3c", + "tests/browser_text_classification_proposals.cjs": "4b2ce497d61759983d1182bc92fb6f2d19f7f84a12897ab28e14efe1b7373bc8", + "tests/browser_text_classification_proposals_server.py": "c21f65529ad95962d295153c0a1f7cb29f03937f1496efa02ea3add4a5f14203", + "tests/browser_text_corpus_export.cjs": "301577b087eb14f8520b93a795d5054f0b128603499dc229a675f9eb40359ea2", + "tests/browser_vlm_real.cjs": "52abd3b48dda40daf5a5efb207c83f5be286b49abda56d44adf1118a82ccff86", + "tests/browser_workbench.cjs": "c7a29ec267bc49c82777bea81af99caf38ea0a7eb0f9b7f7d1bc50d86d4fa218", + "tests/browser_workspace_audio.cjs": "e583d9beaddd01ebb799fc9d82dccd08d6e03f6adbfc53894fafab55436f3b36", + "tests/browser_workspace_audio_run.cjs": "2a15d61e0c1f9e46bd2c8c30e7cd2bcf36a31e0c11a50d1b5b0e9e9ef911f3b8", + "tests/browser_workspace_breadth.cjs": "6304ee3e1065f4fa1d6e52afad51905081f9590792671d37083ea7f573b0d8ff", + "tests/browser_workspace_export_run.cjs": "fd7737ab67642af283787cbcee8038bccb28660cfd73ac5fed206ee67387a41b", + "tests/browser_workspace_image_run.cjs": "a6156cfb2b3fc70b952e1e7b1be6162d010f064216b655fa5e524be64fd52e1b", + "tests/browser_workspace_mesh.cjs": "23d10526afe02d3564ea508f284e4f8f1526a05e5951fd0427a03457d678e882", + "tests/browser_workspace_mesh_run.cjs": "161735e1dffd95e325f00e4e8476d4de5d1322e11743590d81533698da6ae8bb", + "tests/browser_workspace_project.cjs": "6c26a5db25c7e4b9cf01f3defe0f2f6b7b4158074b8bd3487e33b53b2f0de9e8", + "tests/browser_workspace_sequence_run.cjs": "ecc5aa03a7be9d850d7904ec703958c98d29995b9ee5449774c417a895498400", + "tests/browser_workspace_spatial.cjs": "6a32f7d5c1a7c07338b3c915ca181956140076ddcd907883924e906ed920f16e", + "tests/browser_workspace_text.cjs": "ed4ecd4913a893b5e170ba9e20f78d6d29a4ddb125c0f926996350dbfdced1b5", + "tests/browser_workspaces.cjs": "e40c459a2aca337ffb9043762e8eda4e7c483ac1de816210aa068e368198c191", + "tests/check_image_classification_consumer.py": "b8894a0c903ede4217671d817ef4a1ccc081d1f6f8548d99d7c24d375a882697", + "tests/check_text_corpus_consumer.py": "00bca07ab03912f4e6208c22aba1842b3a0b98111d28bc443d3ea94e0bdd0a26", + "tests/qualify_spatial_retained_runs.py": "2c7fca75747ab4639c4d9415b6308c7a3a3a46c7a257b76f8d97cb01c32fb358", + "tests/test_access.py": "99027f9ccbf1bafeba06cf847d670f1e1e1df2d16e41b4d76437fcd7238acc4e", + "tests/test_access_http.py": "25071bf2647fc6d8d3aa6ed525d45f777c01b6a7831f9802958e26a2e57147a7", + "tests/test_ai.py": "71a1a4b653671ec0c37ecab1a34a69e8e523193741eecfbe1b6298ac8e964aee", + "tests/test_audio_data.py": "77af876b31b42efc68849b45272b696bf65b8d7b3adf4a125723f14125370f62", + "tests/test_audio_training.py": "1756d9bd3d80202d16fa48e07003e915111db470e7e557369cb0e779aff2f275", + "tests/test_auth_controller.cjs": "ad08a05093dd6a3c96915c265257ecf00dee4575d86c9de796b62bbcb65c6f26", + "tests/test_auth_helpers.cjs": "6e7b9110a84231e4ab34bcfca421e722c15005fa9c7bf51626a72c13dca1a25e", + "tests/test_bulk_import.py": "6c085c2a11bcd52e3a39a1c74a2fc84088160f970c22a99dea9eeec4c27a2d4b", + "tests/test_caption_exports.py": "170207224c2b2393b701058ff46f73f13f3c6be6d623e451e89f0c3b1e25c40f", + "tests/test_caption_import.py": "83d46023931d671035959dbdc45b1117f4c82b0d4abb110c35cd28274bf28fbf", + "tests/test_caption_proposals.py": "b199041df42538ab7bf15d15700a1639bef49104c33505fad3584db78dbd128e", + "tests/test_combined_workbench.py": "a6ff63d3dc3bb0ee02d2d94f390f4eff052008e2ecb08929e5be2d65b0921404", + "tests/test_curation.py": "d0d592e869fe6ce4dd923ad5e6df7ba0f4357d337a4584419fd1206c0c21f144", + "tests/test_dataset.py": "0938fcc8819dd0aaf4b400e8a715027a8d184c4dbe3f5789cc701ad1177383e4", + "tests/test_export_runs.py": "926d86a6331f90f61f846ca421aee0e6ebab650667788fa0c4ec2195c659d401", + "tests/test_generation_job_api.py": "bcb9c18eec21034eb1079c2a222e7a0d2ab447de2c2392833baac3902713151c", + "tests/test_grounded_candidates.py": "eacfca315f4d1046a3e23b5fc12213c8e75167a56d4cf58acd95a5224d0c2a5f", + "tests/test_image_classification_export.py": "f1a93a4c638a563cd481668b80d05ed48b0a57e58f021cccf8c3ded5c3d06e44", + "tests/test_image_generation.py": "2c4dc04957f25497c7b84cf4870efeba85f171aabbbc9c798ead0ee36c554e7f", + "tests/test_image_training.py": "1a1dcb3bf330ab3b9790cfbccbddebc5444e2c8703403cc40b5e3e81e882b01d", + "tests/test_instruction_responses.py": "f6754faa43b35b43839ac968acd7c05a2197576ff4e355e237e783a992ba0d7d", + "tests/test_mesh_release.py": "cc57a6d4b58cd96551d25a46631945a45c7dc39a21a869e563068a021ec89c20", + "tests/test_mesh_runs.py": "f03b012c0fa7649fb25ab2464977980066fa886fb26fc417111e802dcab47267", + "tests/test_meshes.py": "d9d36438aba8cce733e4a7a67559ea45095b797311d53392089389d0b1de5d38", + "tests/test_metadata_filters.py": "fef2682f8c6a2e7d1ed58dc08fba8d653edd98a76578d7cc012841a959b25631", + "tests/test_metadata_migration.py": "9de22c42dddf41066586bbde1c6852ad09bdb1730a3ce9a25826658924046e9c", + "tests/test_metadata_transactions.py": "14d9155639c6d613c75be318effe7413be14998c848c455cd92c87d266623c4c", + "tests/test_metadata_workers.py": "fd9b624410ad3d32aea5bc77b3739a9aa8207f6d9a0da3bec27b0f54d72462c5", + "tests/test_native_detection_import.py": "2eb4e8ab069bf2636ce9cfb17c2ed7286d82349324f8a073037906aa9c59a751", + "tests/test_native_detection_stack.py": "5e8e2e955f9b6ae0b0f702cd48fea922995bcfc296783df1abbe152836d69b25", + "tests/test_native_text_import.py": "86d347c27587214062a6cf7a0d1d8799d4422818117a6cc9e26b1bf90aff69d0", + "tests/test_pipeline.py": "bda005471eafc061482990a59d16ce91924bbf46e31b1a0f2a766e16be694bbc", + "tests/test_preferences.py": "f3c6591965b9a14e4623940ad02696339452ddd0910ffdff4d617ce1b40e28dd", + "tests/test_projects.py": "29fa8a8a421a764a13605a087a6432b7671b01a5ba6511948beadf112b9b7d2e", + "tests/test_pumas_typed.py": "9b53bd8792b1b2330bc326f626cc3f91e050a7d9687c512018c35c110b2d5edf", + "tests/test_pumas_vision.py": "0bc9d1d055ab60167fbf808cfa83e63b7a9e59694dd51bc00602218632bc54d4", + "tests/test_real_import_foundation.py": "92c10da87b4c0a6593ff0546f9a89656ad2516b590e1a5cde903785a46731b12", + "tests/test_release_preview.py": "ee8f1f2701c4cddc7d0c7fdd211894428620f0415d8caf0bbdc931a7e7936f79", + "tests/test_rights_note.py": "fbffc75b8651f739e1b98989e7c8e4708260580a73471a70d7d1b15e00b857b6", + "tests/test_runs.py": "15e0342e5f7b146c6cb70a28816756b9e1348b0ab152440ae32882c67e4eb501", + "tests/test_saved_generation.py": "546ea3db08c0d772a3616f4dc00757b2cd0c6c14ad056f5783527d391a122a5a", + "tests/test_saved_searches.py": "fc3f5b0a12835be2fa629e1622ab1413bdbae7cf7c3632caf7a5225fdb277300", + "tests/test_saved_selections.py": "560a1fcb6766abfa706dc642c73b8d91fb171a3e007e49604163f281f906dc8a", + "tests/test_scientific_fields.py": "868b4294fe3aaa258796a562eed44b49e49f29585e05107e9e2ce7a21b908154", + "tests/test_scientific_release.py": "f1c5a57dfd76f5758c9cf55f47c68c545a2483e971dcc041056fed12a2beb79f", + "tests/test_sequence_batch.py": "c8be7c857d37ca11d8e52878115eea5c93a21e7baa50ec2261c1a1fc1a6b7054", + "tests/test_sequence_release.py": "a7457466674f48bb08cde5237b80d5ca770128b22f5f359ecd4bc90d12d30819", + "tests/test_sequence_runs.py": "09b9861d05f0a5dc0b9da2390f1eff63dba25662ae599fd0ae59e7b7fddbf53a", + "tests/test_sequence_v2_runs.py": "c0a01076f9869f366bd9de96f6b8e338a747d8abc5a1867ab6cdab88869f6e5e", + "tests/test_sequences.py": "0e305b0eeb718893e857a355998345137fe043c5cbce46b29b91046e91d15688", + "tests/test_sequences_v2.py": "ebf96c2cf91e7e05e780f5d46f53f0eb98fc13cc197af818628ec8cd34958f40", + "tests/test_spatial_release.py": "823cd95654cfa8be17f07b6e6c84fe00b03024beee81f8ca9f5a3cbfa051f49d", + "tests/test_spatial_storage.py": "3fd1acaa363698d55d7305da7691a263343828769e06f0ce65355d14aef3c1f1", + "tests/test_synthetic.py": "7d077c66a532efd57ea29347641f7962b4687baa664b5d339a0ed2b1223fcd52", + "tests/test_text_classification_proposals.py": "7ecf4870d58e915dbcf74546e531ad28939eb837170401e88f07346ae4de51b3", + "tests/test_text_corpus_export.py": "c8f840ec9263c9e8f70b0e93da9632d1d1258b0690718ded9b3685ed9a3145c7", + "tests/test_text_training.py": "94481a278c29a056018fa27585ca712ea38ba7ba57663628ae4be10022ee374b", + "tests/test_workbench.py": "97fd968831531fc750f564f3e23dc3b021662a4d955939e82f5048dd87c69ef5", + "tests/test_workspace_metadata.py": "85931abe21e88d79f5cd427f3d77b1fd5e72d9f221fd492cf369e83c88fd4966", + "text_classification_proposals.py": "6a29dfe752be4ae2c69d7b2e4ca3e68e87dc511cfee2429093748b4ccc56c86d", + "upgrade_metadata.py": "a5dd88a6ff7e45402587a88a4ffcabcee7adfc7d7c39697051d252b399efafab", + "workbench.py": "71bbbaf56ae138c5a80ef4ee9854851470bae5effd20315c8fc4febc795fa643" +} diff --git a/grounded_candidates.py b/grounded_candidates.py index 998cbc8e..c50d1843 100644 --- a/grounded_candidates.py +++ b/grounded_candidates.py @@ -6,6 +6,7 @@ from workbench import encode_retained import base64 import hashlib +from access import AccessError, authorized import json import threading import time @@ -121,10 +122,11 @@ def decode(data, source, count, typed_request_id=None): class Proposals: def __init__(self, workbench): self.workbench = workbench + self.access = workbench.dataset.access self.db, self.lock = workbench.db, workbench.lock self.worker, self.active_id = None, None self.stop = threading.Event() - with self.lock, self.db.transaction(): + with self.access._reconcile(), self.lock, self.db.transaction(): self.runtime_owner = self.db.claim_runtime('grounded_jobs') if not self.runtime_owner: return @@ -134,6 +136,7 @@ def __init__(self, workbench): if pumas.typed(job['config']): job['provider_outcome'] = 'unknown' job.update(status='interrupted', error='Server stopped; no automatic retry. Start a new request after inspecting this attempt.') self._save(job) + self.access.audit('grounded.reconcile', job['id'], {'status': job['status']}) def _save(self, job): previous = self.db.execute('SELECT data FROM grounded_jobs WHERE id=%s', (job['id'],)).fetchone() @@ -149,12 +152,14 @@ def _get(self, job_id): raise WorkbenchError('Proposal request not found.', 'unavailable', 404) return json.loads(row[0]) + @authorized('inspect', 'grounded.get') def get(self, job_id): if not isinstance(job_id, str): raise WorkbenchError('Invalid proposal request ID.') with self.lock: return self._get(job_id) + @authorized('inspect', 'grounded.snapshot') def snapshot(self): with self.lock: jobs = [json.loads(row[0]) for row in self.db.execute('SELECT data FROM grounded_jobs ORDER BY ordinal DESC LIMIT 50')] @@ -178,6 +183,7 @@ def _source(self, body): raise WorkbenchError('Select a source of at most 20,000 code points; it will not be silently truncated.') return source + @authorized('execute', 'grounded.start', owner_only=True) def start(self, body): fields = {'source_id', 'revision', 'source_revision', 'server_url', 'model', 'instruction', 'count', 'seed'} if not isinstance(body, dict) or set(body) not in (fields, fields | {'protocol', 'profile'}): @@ -205,6 +211,10 @@ def start(self, body): 'verification': 'Schema and exact source quotes only; class/factual preservation requires human review.'} job['config'].update(mode) job['canonical_request_sha256'] = hashlib.sha256(encode(request_payload(job)).encode()).hexdigest() + job['request_digest'] = hashlib.sha256(encode({'config': job['config'], 'source': job['source'], 'payload': request_payload(job)}).encode()).hexdigest() + job['admission_id'] = self.access.admit_job('grounded', job['id'], job['request_digest'], + {'grounded.finish': [job['id']]}) + self.access.audit('grounded.start', job['id'], {'request_digest': job['request_digest']}) self._save(job) self.stop.clear(); self.active_id = job['id'] self.worker = threading.Thread(target=self._run, args=(job['id'],), daemon=True) @@ -218,7 +228,21 @@ def start(self, body): return job def _run(self, job_id): - job = self.get(job_id) + with self.lock: + job = self._get(job_id) + request_digest = hashlib.sha256(encode({'config': job['config'], 'source': job['source'], 'payload': request_payload(job)}).encode()).hexdigest() + try: + with self.access._job('grounded', job_id, job.get('admission_id'), request_digest): + self._run_admitted(job) + except AccessError: + with self.access._reconcile(), self.lock, self.db.transaction(): + job.update(status='interrupted', error='Job admission is missing or differs from the retained request; no inference started.') + self._save(job) + self.access.audit('grounded.interrupt', job_id) + self.active_id = None + + def _run_admitted(self, job): + job_id = job['id'] try: if pumas.typed(job['config']): pumas.prepare_chat(job, 6000) @@ -254,15 +278,18 @@ def _run(self, job_id): self._source({'source_id': job['source']['id'], 'revision': job['source']['revision'], 'source_revision': job['source']['source_revision']}) job.update(status='completed', candidates=candidates) self._save(job) + self.access.audit('grounded.finish', job_id, {'status': job['status'], 'response_sha256': job.get('response_sha256')}) except Exception as error: with self.lock, self.db.transaction(): pumas.failure_evidence(job, error) job.update(status='cancelled' if self.stop.is_set() else 'failed', error=str(error)[:800]) self._save(job) + self.access.audit('grounded.finish', job_id, {'status': job['status']}) finally: with self.lock: self.active_id = None + @authorized('cancel', 'grounded.cancel') def cancel(self, job_id): with self.lock, self.db.transaction(): job = self._get(job_id) @@ -271,8 +298,10 @@ def cancel(self, job_id): self.stop.set() job.update(status='stopping', error='Cancellation requested; late output will not be admitted.') self._save(job) + self.access.audit('grounded.cancel', job['id']) return {'cancelled': True, 'job': job} + @authorized('edit', 'grounded.review') def review(self, job_id, body): if set(body) != {'revision', 'candidate_id', 'decision', 'note'} or body['decision'] not in ('reject', 'admit_draft'): raise WorkbenchError('Choose reject or admit_draft with the current proposal revision and a review note.') @@ -313,6 +342,7 @@ def review(self, job_id, body): candidate['status'] = 'rejected' candidate['review_note'] = note self._save(job) + self.access.audit('grounded.review', job['id'], {'revision': job['revision'], 'decision': body['decision']}) return {'job': job, 'record': record} def close(self): diff --git a/image_generation.py b/image_generation.py index 4595aedc..76e37f2f 100644 --- a/image_generation.py +++ b/image_generation.py @@ -6,6 +6,7 @@ provider work stopped; lost requests are not retried. """ import base64 +import copy import hashlib import http.client import io @@ -16,6 +17,7 @@ from urllib.parse import urlsplit from PIL import Image +from access import AccessError, authorized import ai_http import pumas_operations as pumas from workbench import encode @@ -171,18 +173,42 @@ def watch_client(self, client): class ImageRequests: - def __init__(self): + def __init__(self, access): + self.access = access self.lock = threading.Lock() self.active = {} + @authorized('cancel', 'images.cancel') def cancel(self, request_id): with self.lock: operation = self.active.get(request_id) if operation: operation.cancel() + if operation: + with self.access.db.transaction(): + self.access.audit('images.cancel', request_id) return {'cancelled': operation is not None} + @authorized('execute', 'images.generate', owner_only=True) def generate(self, body, client=None, cancel_event=None, on_admission=None): + # Synchronous provider dispatch still requires a committed owner admission. + body = copy.deepcopy(body) + _base, request_id, _payload = validate(body) + request_digest = hashlib.sha256(encode(body).encode()).hexdigest() + with self.access.db.lock: + if self.access.db.in_transaction: + raise ValueError('Image dispatch requires its own committed transaction.') + with self.access.db.transaction(): + admission_id = self.access.admit_job('image_request', request_id, request_digest, + {'images.generate_admitted': [request_id]}) + self.access.audit('images.generate', request_id, {'request_digest': request_digest}) + with self.access._job('image_request', request_id, admission_id, request_digest): + return self._generate_admitted(body, request_id, client, cancel_event, on_admission) + + @authorized('execute', 'images.generate_admitted', target=lambda body, job_id, *args, **kwargs: job_id) + def _generate_admitted(self, body, job_id, client=None, cancel_event=None, on_admission=None): + if self.access.identity().get('mode') != 'job': + raise AccessError('Image continuation requires its exact admitted job.') base, request_id, payload = validate(body) operation = Operation() with self.lock: diff --git a/immutable_assets.py b/immutable_assets.py index a7bee93e..8faf990f 100644 --- a/immutable_assets.py +++ b/immutable_assets.py @@ -1,4 +1,5 @@ """Bounded immutable asset storage; Dataset transaction owns record publication.""" +from access import authorized from contextlib import contextmanager, nullcontext import hashlib import json @@ -71,12 +72,14 @@ def migrate_records(db): class ImmutableAssets: """Concrete facades select trusted table/task policy, adapters own file meaning.""" def __init__(self, workbench, *, kind, task, maximum, default_name): + self.access = workbench.access if kind not in ('sequence', 'mesh', 'pointcloud', 'volume'): raise ValueError('Unsupported immutable asset owner.') self.workbench, self.kind, self.task = workbench, kind, task self.maximum, self.default_name = maximum, default_name self.table = 'workbench_' + kind + '_assets' + @authorized('edit', 'immutable_assets.admit') def admit(self, prepared, body, origin): w = self.workbench name = text_value(body.get('name', self.default_name), 'Name') @@ -103,15 +106,19 @@ def admit(self, prepared, body, origin): origin, self.task, None, 'draft', 1, created, created)) record = w._get(record_id) w._history(record) + self.access.audit('immutable_assets.admit', record_id, {'revision': record['revision'], 'source_sha256': digest}) return record + @authorized('inspect', 'immutable_assets.check_selection') def check_selection(self, records): check_selection(records) + @authorized('inspect', 'immutable_assets.metadata') def metadata(self, record_id): row = self.workbench.db.execute(f'SELECT metadata_json,bundle_bytes FROM {self.table} WHERE id=%s', (record_id,)).fetchone() return None if row is None else dict(json.loads(row[0]), bundle_bytes=row[1]) + @authorized('inspect', 'immutable_assets.asset', target=lambda record: record.get('id') if isinstance(record, dict) else None) def asset(self, record): row = self.workbench.db.execute(f'SELECT bundle,bundle_bytes FROM {self.table} WHERE id=%s', (record['id'],)).fetchone() if row is None: diff --git a/meshes.py b/meshes.py index 7585ac1b..a16eef8c 100644 --- a/meshes.py +++ b/meshes.py @@ -1,4 +1,5 @@ """Tuldok-owned strict ASCII triangle PLY profile; raw bytes remain authoritative.""" +from access import authorized import base64 from decimal import Decimal, InvalidOperation from fractions import Fraction @@ -233,6 +234,7 @@ def decode_file(value, cap, name): def admit(workbench, body): + workbench.access.require('edit', 'meshes.admit') if type(body) is not dict or set(body) - {'files', 'name', 'groups', 'parents', 'rights'}: invalid('import envelope fields do not match the profile.') exact(body.get('files'), ('mesh.ply', 'mesh.json'), 'selected files') @@ -245,6 +247,7 @@ class MeshAssets(ImmutableAssets): def __init__(self, workbench): super().__init__(workbench, kind='mesh', task='mesh_geometry', maximum=BUNDLE_LIMIT, default_name='Static triangle mesh') + @authorized('edit', 'meshes.admit') def admit(self, prepared, body): value = prepared['metadata'] return super().admit(prepared, body, {'method': 'mesh_import', 'format': 'tuldok_mesh_v1', @@ -266,11 +269,13 @@ def validated(self, record, bundle): except (WorkbenchError, zipfile.BadZipFile, KeyError, RuntimeError, UnicodeError) as error: raise WorkbenchError('Mesh source or metadata changed outside Tuldok.', 'conflict', 409) from error + @authorized('inspect', 'meshes.asset', target=lambda record: record.get('id') if isinstance(record, dict) else None) def asset(self, record): bundle, mime = super().asset(record) self.validated(record, bundle) return bundle, mime + @authorized('inspect', 'meshes.inspect') def inspect(self, record_id): with self.workbench.lock: record = self.workbench._get(record_id) diff --git a/metadata.py b/metadata.py index 8ea6b988..48f97ac9 100644 --- a/metadata.py +++ b/metadata.py @@ -19,8 +19,8 @@ from psycopg import sql from psycopg.conninfo import conninfo_to_dict -SCHEMA_VERSION = 6 -SUPPORTED_SCHEMA_VERSIONS = (1, 2, 3, 4, 5, 6) +SCHEMA_VERSION = 7 +SUPPORTED_SCHEMA_VERSIONS = (1, 2, 3, 4, 5, 6, 7) MANIFEST = '.tuldok.json' CATALOG_VERSION_DDL = '''CREATE TABLE catalog_version ( version INTEGER PRIMARY KEY, dataset_id TEXT NOT NULL, @@ -415,7 +415,7 @@ def close(self): def tables_for_version(version): if type(version) is not int or version not in SUPPORTED_SCHEMA_VERSIONS: raise StorageError('Unsupported PostgreSQL catalog version.') - return {1: TABLES_V1, 2: TABLES_V2, 3: TABLES_V3, 4: TABLES_V4, 5: TABLES_V5, 6: TABLES}[version] + return {1: TABLES_V1, 2: TABLES_V2, 3: TABLES_V3, 4: TABLES_V4, 5: TABLES_V5, 6: TABLES_V6, 7: TABLES}[version] def definition_hash(version=SCHEMA_VERSION): @@ -529,8 +529,25 @@ def definition_hash(version=SCHEMA_VERSION): } TABLES_V5 = {**TABLES_V4, **PROJECT_TABLES} # The scientific source lives in the existing local artifact tree, not a new table. -TABLES = { +TABLES_V6 = { **TABLES_V5, 'workbench_records': TABLES_V5['workbench_records'].replace( "'pointcloud','volume'", "'pointcloud','volume','field_sequence'"), } + +ACCESS_TABLES = { + 'access_actors': '''CREATE TABLE access_actors ( + id TEXT PRIMARY KEY, kind TEXT NOT NULL CHECK(kind IN ('owner','agent')), + label TEXT NOT NULL, created_at BIGINT NOT NULL)''', + 'access_credentials': '''CREATE TABLE access_credentials ( + id TEXT PRIMARY KEY, actor_id TEXT NOT NULL, token_sha256 TEXT UNIQUE NOT NULL, + kind TEXT NOT NULL CHECK(kind IN ('login','session','bearer')), scopes_json TEXT NOT NULL, + expires_at BIGINT NOT NULL, revoked INTEGER NOT NULL CHECK(revoked IN (0,1)), consumed INTEGER NOT NULL CHECK(consumed IN (0,1)), created_at BIGINT NOT NULL)''', + 'access_audit': '''CREATE TABLE access_audit ( + id TEXT PRIMARY KEY, actor_id TEXT, credential_id TEXT, action TEXT NOT NULL, + target_json TEXT NOT NULL, details_json TEXT NOT NULL, result TEXT NOT NULL, created_at BIGINT NOT NULL)''', + 'access_admissions': '''CREATE TABLE access_admissions ( + id TEXT PRIMARY KEY, catalog_id TEXT NOT NULL, actor_id TEXT NOT NULL, credential_id TEXT NOT NULL, + kind TEXT NOT NULL, job_id TEXT NOT NULL, request_digest TEXT NOT NULL, effects_json TEXT NOT NULL, created_at BIGINT NOT NULL)''', +} +TABLES = {**TABLES_V6, **ACCESS_TABLES} diff --git a/native_detection_import.py b/native_detection_import.py index d292639b..6ea4961e 100644 --- a/native_detection_import.py +++ b/native_detection_import.py @@ -1,4 +1,5 @@ """Consume only the existing detection-only canonical_v1 ZIP export contract.""" +from access import authorized import base64 import hashlib import hmac @@ -82,6 +83,7 @@ def png(raw, row): class NativeDetectionImports: def __init__(self, workbench): + self.access = workbench.access self.workbench = workbench self._key = secrets.token_bytes(32) @@ -103,6 +105,7 @@ def _open(self, token): except ValueError: raise WorkbenchError('Detection preparation changed or expired. Choose the archive again.') from None + @authorized('edit', 'native_detection_import.prepare') def prepare(self, body): if set(body) != {'source_name', 'archive'}: raise WorkbenchError('Supply one selected native detection ZIP and its filename.') @@ -225,6 +228,7 @@ def prepare(self, body): except (zipfile.BadZipFile, EOFError, KeyError, RuntimeError, OSError, NotImplementedError): raise WorkbenchError('Native detection ZIP is damaged or incomplete.') from None + @authorized('edit', 'native_detection_import.admit') def admit(self, body): if set(body) != {'token', 'request_id'} or not isinstance(body['request_id'], str) or not REQUEST_ID.fullmatch(body['request_id']): raise WorkbenchError('Supply one prepared detection row and request marker.') diff --git a/native_text_import.py b/native_text_import.py index 177b5bb3..70062b0e 100644 --- a/native_text_import.py +++ b/native_text_import.py @@ -1,4 +1,5 @@ """Bounded canonical_v1 classification ZIP ingestion; Workbench owns insertion.""" +from access import authorized import base64 import hashlib import hmac @@ -47,6 +48,7 @@ def valid_hash(value): class NativeTextImports: def __init__(self, workbench): + self.access = workbench.access self.workbench = workbench self._key = secrets.token_bytes(32) @@ -73,6 +75,7 @@ def _open(self, token): except (ValueError, UnicodeError): raise WorkbenchError('Native text preparation changed or expired. Choose the archive again.') from None + @authorized('edit', 'native_text_import.prepare') def prepare(self, body): if set(body) != {'source_name', 'archive'}: raise WorkbenchError('Supply exactly one selected native release ZIP and its filename.') @@ -204,6 +207,7 @@ def _row(self, archive, row): raise WorkbenchError('Text asset, exported text and canonical hashes must match exactly.') return {'text': row['text'], 'name': name, 'groups': groups, 'annotation': target} + @authorized('edit', 'native_text_import.admit') def admit(self, body): if set(body) != {'token', 'request_id'} or not isinstance(body['request_id'], str) or not REQUEST_ID.fullmatch(body['request_id']): raise WorkbenchError('Supply one prepared native text token and request marker.') @@ -216,6 +220,7 @@ def admit(self, body): raise WorkbenchError('This import request marker was already admitted; inspect its saved result.', 'conflict', 409) record = w._insert_text(payload['text'], payload['name'], payload['groups'], [], 'unknown', provenance={'acquisition': context}, annotation=payload['annotation']) + self.access.audit('native_text_import.admit', record['id'], {'revision': record['revision'], 'source_sha256': record['source_sha256']}) receipt = result(record) return receipt except (OSError, psycopg.Error): diff --git a/pipeline.py b/pipeline.py index ef14a383..a27f7157 100644 --- a/pipeline.py +++ b/pipeline.py @@ -3,6 +3,7 @@ This owns closed classification and whole-asset validation recipes, not a general graph engine. Release custody and CPU adapter eligibility remain with their existing owners. """ +from access import authorized import copy import hashlib import json @@ -146,9 +147,11 @@ def source_content_hash(row): class Pipelines: def __init__(self, dataset): + self.access = dataset.access self.dataset, self.db, self.lock = dataset, dataset.db, dataset.lock self.source_path = Path(__file__).resolve().parent + @authorized('inspect', 'pipeline.definitions') def definitions(self): def definition(recipe, adapter): ports = ports_for_graph({'recipe': recipe}) @@ -180,15 +183,18 @@ def _get(self, graph_id): except (ValueError, TypeError, KeyError) as error: raise WorkbenchError('Stored graph is invalid: ' + str(error), 'unavailable', 409) from None + @authorized('inspect', 'pipeline.get') def get(self, graph_id): with self.lock: return self._get(graph_id) + @authorized('inspect', 'pipeline.list') def list(self): with self.lock: ids = [row[0] for row in self.db.execute('SELECT id FROM workspace_graphs ORDER BY id')] return [self._get(graph_id) for graph_id in ids] + @authorized('edit', 'pipeline.create') def create(self, body): closed(body, ('name', 'release_id'), ('recipe',)) recipe = body.get('recipe', 'image_classification') @@ -211,8 +217,12 @@ def create(self, body): with self.lock, self.db.transaction(): self.db.execute('INSERT INTO workspace_graphs(id,revision,document) VALUES(%s,%s,%s)', (graph['id'], graph['revision'], encode(graph))) + self.access.audit('pipeline.create', graph['id'], + {'revision': graph['revision'], 'document_sha256': digest(graph), + 'execution_sha256': execution_digest(graph)}) return graph + @authorized('edit', 'pipeline.save') def save(self, graph_id, body): closed(body, ('revision', 'document')) graph = decode_graph(body['document']) @@ -225,8 +235,12 @@ def save(self, graph_id, body): graph['revision'] += 1 self.db.execute('UPDATE workspace_graphs SET revision=%s,document=%s WHERE id=%s AND revision=%s', (graph['revision'], encode(graph), graph_id, current['revision'])) + self.access.audit('pipeline.save', graph_id, + {'revision': graph['revision'], 'document_sha256': digest(graph), + 'execution_sha256': execution_digest(graph)}) return graph + @authorized('edit', 'pipeline.clone') def clone(self, graph_id, body): closed(body, ('name',)) with self.lock, self.db.transaction(): @@ -234,8 +248,12 @@ def clone(self, graph_id, body): graph.update(id=uuid.uuid4().hex, revision=1, name=text_value(body['name'], 'Recipe name', 120)) self.db.execute('INSERT INTO workspace_graphs(id,revision,document) VALUES(%s,%s,%s)', (graph['id'], 1, encode(graph))) + self.access.audit('pipeline.clone', graph['id'], + {'source_graph_id': graph_id, 'revision': 1, + 'document_sha256': digest(graph), 'execution_sha256': execution_digest(graph)}) return graph + @authorized('inspect', 'pipeline.inspect_release') def inspect_release(self, release_id, *, private=False, recipe=None): selected_recipe = recipe path = self.dataset.releases.locate(release_id) @@ -306,6 +324,7 @@ def inspect_release(self, release_id, *, private=False, recipe=None): result['path'] = str(path) return result + @authorized('inspect', 'pipeline.exposures') def exposures(self, records): """Current reuse evidence is append-only and independent of a release snapshot.""" with self.lock: @@ -315,6 +334,7 @@ def exposures(self, records): ([row['id'] for row in records], [source_content_hash(row) for row in records]))] return {'exposed': bool(exposures), 'events': exposures} + @authorized('inspect', 'pipeline.releases') def releases(self): result = [] paths = sorted(self.dataset.releases.path.glob('*.zip'), key=lambda path: path.name)[:100] @@ -325,6 +345,7 @@ def releases(self): result.append({'id': path.stem, 'status': error.code, 'message': str(error)}) return result + @authorized('inspect', 'pipeline.probe', target=lambda recipe='image_classification': recipe) def probe(self, recipe='image_classification'): adapter = adapter_for_graph({'recipe': recipe}) if adapter is release_validation: @@ -334,6 +355,9 @@ def probe(self, recipe='image_classification'): runtime.update(available=False, problems=[{'code': 'stale', 'message': 'Integrity definitions changed after application import. Restart the application before admission.'}]) return dict(runtime, **identity) + # A native interpreter launch is execution even when its command only + # reports runtime capability. Pure integrity recipes above never spawn. + self.access.require('execute', 'pipeline.probe_native', recipe) worker_path = Path(adapter.__file__).resolve() executable = os.environ.get('TULDOK_TRAINING_PYTHON') or sys.executable try: @@ -354,6 +378,7 @@ def probe(self, recipe='image_classification'): probe.update(self.definition_identity(recipe)) return probe + @authorized('inspect', 'pipeline.definition_identity', target=lambda recipe='image_classification': recipe) def definition_identity(self, recipe='image_classification'): # The worker imports the existing frozen-export contract, which in turn # imports Workbench's annotation types. Pin that small actual import set. @@ -364,9 +389,11 @@ def definition_identity(self, recipe='image_classification'): if adapter is release_validation: files = release_validation.definition_files(self.source_path) return {'definition_files': files, 'adapter_definition_sha256': digest(files)} + names = (*names, 'access.py') files = {name: hashlib.sha256((self.source_path / name).read_bytes()).hexdigest() for name in names} return {'definition_files': files, 'adapter_definition_sha256': digest(files)} + @authorized('inspect', 'pipeline.validate_graph', target=lambda graph: graph.get('id') if isinstance(graph, dict) else None) def validate_graph(self, graph): graph = decode_graph(graph) adapter = adapter_for_graph(graph) @@ -425,6 +452,7 @@ def issue(path, message, code='invalid'): 'validation_token': token, 'graph_revision': graph['revision'], 'execution_sha256': execution_digest(graph), 'release': release, 'runtime': runtime} + @authorized('inspect', 'pipeline.validate') def validate(self, graph_id, body): closed(body, ('revision',)) graph = self.get(graph_id) @@ -435,6 +463,7 @@ def validate(self, graph_id, body): raise WorkbenchError('Graph changed during validation.', 'stale', 409) return result + @authorized('inspect', 'pipeline.snapshot') def snapshot(self, graph_id, revision, validation_token): graph = self.get(graph_id) result = self.validate(graph_id, {'revision': revision}) diff --git a/preferences.py b/preferences.py index 8fc438d4..0ff94b93 100644 --- a/preferences.py +++ b/preferences.py @@ -1,6 +1,8 @@ """Explicit comparative judgments; responses and source records retain ownership.""" +from access import authorized from workbench import encode_retained import json +import hashlib from workbench import WorkbenchError, IDENTIFIER, MAX_TEXT, MAX_SELECTED_TEXT_BYTES, encode, text_value, timestamp @@ -10,6 +12,7 @@ class Preferences: def __init__(self, workbench): + self.access = workbench.access self.w = workbench self.db, self.lock = workbench.db, workbench.lock @@ -44,6 +47,7 @@ def _bindings(self, value): raise WorkbenchError('Stale judgment: prompt or answer changed. Deliberately rejudge and review current revisions.', 'conflict', 409) return parent, left, right + @authorized('inspect', 'preferences.list') def list(self, prompt_id): with self.lock: parent = self.w._get(prompt_id) @@ -57,12 +61,14 @@ def list(self, prompt_id): result.append(dict(judgment, stale_warning=warning)) return {'parent': parent, 'judgments': result, 'responses': self.w.responses(prompt_id)['responses']} + @authorized('inspect', 'preferences.history') def history(self, identity): with self.lock: self._get(identity) return {'history': [json.loads(row[0]) for row in self.db.execute( 'SELECT snapshot FROM workbench_preference_history WHERE id=%s ORDER BY revision', (identity,))]} + @authorized('edit', 'preferences.save', target=lambda body: body.get('id') if isinstance(body, dict) and isinstance(body.get('id'), str) else None) def save(self, body): self._shape(body, SELECTION_FIELDS | {'outcome', 'rationale', 'review'}) if body['outcome'] not in ('left', 'right', 'tie', 'abstain'): @@ -70,6 +76,8 @@ def save(self, body): text_value(body['rationale'], 'Judgment rationale', 4000, empty=True) if body['review'] not in ('draft', 'human_reviewed'): raise WorkbenchError('Explicitly choose draft or human review of this judgment.') + if body['review'] == 'human_reviewed': + self.access.require('approve-review', 'preferences.approve_review', body['id'], owner_only=True) with self.lock, self.db.transaction(): parent, left, right = self._bindings(body) row = self.db.execute('SELECT data FROM workbench_preferences WHERE id=%s', (body['id'],)).fetchone() @@ -84,7 +92,7 @@ def save(self, body): now = timestamp() judgment = dict(body, revision=body['revision'] + 1, deleted=False, created_at=before['created_at'] if before else now, updated_at=now, - provenance={'method': 'human_comparative_judgment'}) + provenance={'method': 'human_comparative_judgment' if body['review'] == 'human_reviewed' else 'draft_comparative_judgment'}) self._persist(judgment, parent, left, right) return {'judgment': judgment, 'changed': True} @@ -94,7 +102,11 @@ def _persist(self, judgment, parent, left, right): (judgment['id'], judgment['prompt_id'], judgment['revision'], encode_retained(judgment))) self.db.execute('INSERT INTO workbench_preference_history (id, revision, snapshot) VALUES (%s,%s,%s)', (judgment['id'], judgment['revision'], encode_retained({'judgment': judgment, 'parent': parent, 'left': left, 'right': right}))) + self.access.audit('preferences.delete' if judgment['deleted'] else 'preferences.save', judgment['id'], + {'revision': judgment['revision'], 'review': judgment['review'], + 'binding_sha256': hashlib.sha256(encode_retained({'judgment': judgment, 'parent': parent, 'left': left, 'right': right}).encode()).hexdigest()}) + @authorized('edit', 'preferences.delete', target=lambda body: body.get('id') if isinstance(body, dict) and isinstance(body.get('id'), str) else None) def delete(self, body): self._shape(body, SELECTION_FIELDS) with self.lock, self.db.transaction(): @@ -107,6 +119,7 @@ def delete(self, body): self._persist(judgment, snapshot['parent'], snapshot['left'], snapshot['right']) return {'judgment': judgment, 'changed': True} + @authorized('inspect', 'preferences.competing') def competing(self, selected): """Only live reviewed judgments of selected exact bindings affect release proof.""" def key(row): @@ -125,6 +138,7 @@ def key(row): result.append(row) return sorted(result, key=lambda row: row['id']) + @authorized('inspect', 'preferences.selection') def selection(self, items): if not isinstance(items, list) or not 1 <= len(items) <= 5000: raise WorkbenchError('Select 1–5,000 explicit judgment revisions.') diff --git a/projects.py b/projects.py index a9130d6c..d5b89513 100644 --- a/projects.py +++ b/projects.py @@ -1,4 +1,5 @@ """Read-only project inspection; catalog registration never executes project code.""" +from access import authorized from contextlib import contextmanager import hashlib import json @@ -88,6 +89,7 @@ class Projects: """One catalog's immutable project snapshots and explicitly configured root handles.""" def __init__(self, dataset, roots=None): + self.access = dataset.access self.db, self.lock = dataset.db, dataset.lock self.roots = {} try: @@ -165,12 +167,14 @@ def _saved(self, project_id): def _summary(saved): return {key: saved[key] for key in ('id', 'name', 'root', 'manifest_path', 'manifest_sha256')} + @authorized('inspect', 'projects.list') def list(self): with self.lock: rows = self.db.execute('SELECT document FROM workspace_projects ORDER BY id').fetchall() return {'mode': 'inspection', 'roots': sorted(self.roots), 'projects': [self._summary(json.loads(row[0])) for row in rows]} + @authorized('edit', 'projects.open') def open(self, body): closed(body, ('root', 'manifest_path')) root, path = body['root'], relative_path(body['manifest_path']) @@ -191,6 +195,7 @@ def open(self, body): raise WorkbenchError('This project ID already names a different snapshot or root. Keep the original or use a new project ID.', 'conflict', 409) if not existing: self.db.execute('INSERT INTO workspace_projects VALUES (%s,%s)', (value['id'], document)) + self.access.audit('projects.open', value['id'], {'manifest_sha256': saved['manifest_sha256']}) return self.get(value['id']) def _bound(self, saved): @@ -219,6 +224,7 @@ def _inspect(self, root, ref, budget, limit=FILE_LIMIT): result.update(status='unavailable', reason='File cannot be safely inspected or changed during inspection.') return result + @authorized('inspect', 'projects.get') def get(self, project_id): saved = self._saved(project_id) result = {**self._summary(saved), 'mode': 'inspection', 'execution': 'unsupported', @@ -255,6 +261,7 @@ def get(self, project_id): result[group].append(item) return result + @authorized('inspect', 'projects.read_data_reference') def read_data_reference(self, project_id, reference_id, expected_sha256, limit): """Capture a selected saved reference; source owners interpret its bytes.""" if not isinstance(expected_sha256, str) or not SHA.fullmatch(expected_sha256): @@ -277,6 +284,7 @@ def read_data_reference(self, project_id, reference_id, expected_sha256, limit): return raw, {'project_id': project_id, 'manifest_sha256': saved['manifest_sha256'], 'reference_id': reference_id, 'path': ref['path'], 'measured_sha256': digest} + @authorized('inspect', 'projects.evidence') def evidence(self, project_id, reference_id): saved = self._saved(project_id) if not self._bound(saved): diff --git a/rheon_sequences.py b/rheon_sequences.py index 65fed107..7c41d65a 100644 --- a/rheon_sequences.py +++ b/rheon_sequences.py @@ -109,6 +109,7 @@ def prepare_files(files): def admit(workbench, body): + workbench.access.require('edit', 'rheon_sequences.admit') if type(body) is not dict or set(body) - {'files', 'name', 'groups', 'parents', 'rights'}: raise WorkbenchError('Supply supported sequence files and metadata.') return workbench.sequences.admit(prepare_files(body.get('files')), body) diff --git a/runs.py b/runs.py index 1ca3106c..6112703f 100644 --- a/runs.py +++ b/runs.py @@ -1,4 +1,5 @@ """Durable admission, one local worker, and verified immutable result custody.""" +from access import authorized import copy import hashlib import json @@ -70,6 +71,7 @@ def _sync(path): class Runs: def __init__(self, dataset, pipelines): self.dataset, self.pipelines = dataset, pipelines + self.access = dataset.access self.db, self.lock = dataset.db, dataset.lock self.path = dataset.path / 'workspace-runs' self.path.mkdir(exist_ok=True) @@ -103,6 +105,9 @@ def _load(self, run_id): def _save(self, run): self.db.execute('UPDATE workspace_runs SET document=%s WHERE id=%s', (encode(run), run['id'])) + action = 'runs.reconcile' if self.access.identity().get('mode') == 'system' else 'runs.update' + self.access.audit(action, run['id'], {'state': run['state'], 'request_sha256': run['request_sha256'], + 'graph_sha256': run['graph_sha256'], 'release_sha256': run['release_sha256']}) def _event(self, run, state, message): run['state'] = state @@ -161,7 +166,7 @@ def _reconcile_start(self, run): def _public(self, run): hidden = {'source_records', 'release_path', 'worker', 'python', 'request_sha256', 'graph_document_sha256', - 'worker_command', 'supervisor', 'process_phase'} + 'worker_command', 'supervisor', 'process_phase', 'admission_id'} result = {key: copy.deepcopy(value) for key, value in run.items() if key not in hidden} result['test_exposure'] = {'exposed': bool(run['exposure_events']), 'event_count': len(run['exposure_events'])} result['current_test_exposure'] = ({'exposed': False, 'events': []} if self._validation_run(run) @@ -175,6 +180,7 @@ def _public(self, run): 'url': f"/api/workspace/runs/{run['id']}/artifacts/release.zip"}] return result + @authorized('inspect', 'runs.list') def list(self): with self.lock: rows = [self._load(row[0]) for row in self.db.execute('SELECT id FROM workspace_runs')] @@ -191,6 +197,7 @@ def list(self): result.append(public) return result + @authorized('inspect', 'runs.get') def get(self, run_id): with self.lock: run = self._load(run_id) @@ -225,6 +232,7 @@ def _available(self): if sys.platform != 'linux': raise WorkbenchError('The qualified CPU worker lifecycle currently requires Linux.', 'unsupported', 400) + @authorized('execute', 'runs.submit', owner_only=True) def submit(self, body): key, request_hash = self._request(body, ('request_key', 'graph_id', 'graph_revision', 'validation_token')) with self.lock: @@ -276,12 +284,21 @@ def _admit(self, key, request_hash, graph, validation, release, parent=None): 'node_attempts': [{'node_id': node['id'], 'type': node['type'], 'state': 'pending'} for node in graph['nodes']]} if self._validation_run(run): run.update(result_kind='release_validation', validation_summary=copy.deepcopy(release['validation_summary'])) + recipe = graph.get('recipe', 'image_classification') + effects = {'pipeline.inspect_release': [release['id']], 'dataset_releases.locate': [release['id']], + 'pipeline.probe': [recipe], 'pipeline.probe_native': [recipe], + 'pipeline.definition_identity': [recipe], 'pipeline.exposures': [None], + 'runs.update': [run_id]} + run['admission_id'] = self.access.admit_job('runs', run_id, request_hash, effects) + self.access.audit('runs.admit', run_id, {'request_sha256': request_hash, + 'graph_sha256': run['graph_sha256'], 'release_sha256': run['release_sha256']}) self._event(run, 'queued', 'Frozen integrity attempt admitted.' if self._validation_run(run) else 'Real CPU attempt admitted. Training starts from scratch; no model download.') self.db.execute('INSERT INTO workspace_runs(id,request_key,request_sha256,document) VALUES(%s,%s,%s,%s)', (run_id, key, request_hash, encode(run))) return run + @authorized('execute', 'runs.retry', owner_only=True) def retry(self, run_id, body): closed(body, ('request_key',)) key, request_hash = self._request(dict(body, parent_run_id=run_id), ('request_key', 'parent_run_id')) @@ -308,6 +325,7 @@ def retry(self, run_id, body): self._start() return self._public(run) + @authorized('cancel', 'runs.cancel') def cancel(self, run_id): with self.lock, self.db.transaction(): run = self._load(run_id) @@ -344,10 +362,12 @@ def _loop(self): self._wake.clear() continue try: - self._execute(queued[0]['id']) + admitted = queued[0] + with self.access._job('runs', admitted['id'], admitted.get('admission_id'), admitted['request_sha256']): + self._execute(admitted['id']) except Exception as error: try: - with self.lock, self.db.transaction(): + with self.access._reconcile(), self.lock, self.db.transaction(): run = self._load(queued[0]['id']) if run['state'] in ACTIVE: run['error'] = {'code': 'failed', 'message': 'Run supervisor could not complete this attempt.'} @@ -363,6 +383,7 @@ def _execute(self, run_id): process = owner = None with self.lock, self.db.transaction(): run = self._load(run_id) + self.access.require_job('runs', run_id, run.get('admission_id'), run['request_sha256']) if run['state'] != 'queued': return self._event(run, 'running', 'Verifying frozen release and adapter before starting the CPU worker.') @@ -807,6 +828,7 @@ def _verified_artifacts(self, run): raise WorkbenchError('Published artifacts differ from the admitted result receipt.', 'unavailable', 409) return artifacts + @authorized('inspect', 'runs.artifact') def artifact(self, run_id, name): if name not in PAYLOADS | release_validation.PAYLOADS | {'model.json', 'artifact-manifest.json', 'release.zip'}: raise WorkbenchError('Unknown run artifact.', 'unavailable', 404) @@ -829,6 +851,7 @@ def artifact(self, run_id, name): raise WorkbenchError('Artifact changed during read.', 'unavailable', 409) return contents, item['media_type'] + @authorized('expose-holdout', 'runs.expose_test') def expose_test(self, run_id, body): closed(body, ('reason',)) reason = text_value(body['reason'], 'Exposure reason', 500) @@ -845,11 +868,13 @@ def expose_test(self, run_id, body): self.db.execute('INSERT INTO workspace_exposures(id,record_id,source_hash,reason,run_id,release_id,created_at) ' 'VALUES(%s,%s,%s,%s,%s,%s,%s)', (uuid.uuid4().hex, source['id'], source_content_hash(source), reason, run_id, run['release_id'], at)) + self.access.audit('runs.expose_test', run_id, {'event_id': event_id, 'release_sha256': run['release_sha256'], 'reason': reason}) run['exposure_events'].append({'id': event_id, 'created_at': at, 'reason': reason}) self._save(run) return {'id': event_id, 'run_id': run_id, 'release_id': run['release_id'], 'created_at': at, 'reason': reason, 'test_exposure': {'exposed': True, 'event_count': len(run['exposure_events'])}} + @authorized('inspect', 'runs.predictions') def predictions(self, run_id, split='validation'): if split not in ('validation', 'test'): raise WorkbenchError('Choose validation or test predictions.') diff --git a/saved_searches.py b/saved_searches.py index 582c1501..f9fd8119 100644 --- a/saved_searches.py +++ b/saved_searches.py @@ -1,6 +1,8 @@ """Named dynamic criteria; independent of fixed membership and review authority.""" +from access import authorized from workbench import encode_retained import json +import hashlib import math import re import uuid @@ -51,6 +53,7 @@ def criteria(value): class SavedSearches: def __init__(self, workbench): + self.access = workbench.access self.db, self.lock = workbench.db, workbench.lock def _get(self, search_id): @@ -77,10 +80,12 @@ def _get(self, search_id): result.update(mode='dynamic', schema_version=1) return result + @authorized('inspect', 'saved_searches.get') def get(self, search_id): with self.lock: return self._get(search_id) + @authorized('inspect', 'saved_searches.list') def list(self): with self.lock: ids = self.db.execute('SELECT id FROM saved_searches ORDER BY updated_at DESC,id LIMIT 101').fetchall() @@ -88,6 +93,7 @@ def list(self): raise WorkbenchError('Saved-search storage exceeds the supported count.') return {'searches': [self._get(row[0]) for row in ids]} + @authorized('edit', 'saved_searches.create') def create(self, body): if not isinstance(body, dict) or set(body) != {'name', 'criteria'}: raise WorkbenchError('Save a name and entered metadata criteria only.') @@ -99,8 +105,10 @@ def create(self, body): search_id, created = uuid.uuid4().hex, timestamp() self.db.execute('INSERT INTO saved_searches VALUES (%s,%s,%s,%s,%s,%s)', (search_id, name, 1, encode_retained(value), created, created)) + self.access.audit('saved_searches.create', search_id, {'revision': 1, 'content_sha256': hashlib.sha256(encode_retained(value).encode()).hexdigest()}) return self._get(search_id) + @authorized('edit', 'saved_searches.mutate') def mutate(self, search_id, action, body): expected = {'revision', 'name'} if action == 'rename' else {'revision'} if action not in ('rename', 'delete') or not isinstance(body, dict) or set(body) != expected: @@ -111,8 +119,10 @@ def mutate(self, search_id, action, body): raise WorkbenchError('Saved search changed. Refresh before renaming or deleting.', 'conflict', 409) if action == 'delete': self.db.execute('DELETE FROM saved_searches WHERE id=%s', (search_id,)) + self.access.audit('saved_searches.delete', search_id, {'revision': body['revision'], 'retired_sha256': hashlib.sha256(encode_retained(before).encode()).hexdigest()}) return {'deleted': search_id} name = text_value(body['name'], 'Search name', 120) self.db.execute('UPDATE saved_searches SET name=%s,revision=revision+1,updated_at=%s WHERE id=%s', (name, timestamp(), search_id)) + self.access.audit('saved_searches.rename', search_id, {'revision': body['revision'] + 1, 'name_sha256': hashlib.sha256(name.encode()).hexdigest()}) return self._get(search_id) diff --git a/saved_selections.py b/saved_selections.py index f1b19ab4..17aab52f 100644 --- a/saved_selections.py +++ b/saved_selections.py @@ -1,6 +1,8 @@ """Named fixed membership, independent of filters, review and frozen releases.""" +from access import authorized from workbench import encode_retained import json +import hashlib import uuid from workbench import IDENTIFIER, WorkbenchError, encode, file_hash, text_value, timestamp @@ -8,6 +10,7 @@ class SavedSelections: def __init__(self, workbench): + self.access = workbench.access self.workbench = workbench self.db, self.lock = workbench.db, workbench.lock @@ -23,12 +26,14 @@ def _get(self, selection_id): result['schema_version'] = 1 return result + @authorized('inspect', 'saved_selections.list') def list(self): with self.lock: return {'selections': [dict(row, mode='fixed', schema_version=1) for row in self.db.execute( '''SELECT id,name,revision,member_count,created_at,updated_at FROM saved_selections ORDER BY updated_at DESC,id''')]} + @authorized('edit', 'saved_selections.create') def create(self, body): if set(body) != {'name', 'items'}: raise WorkbenchError('Save a name and exact record revision pairs; filters are not membership.') @@ -60,8 +65,10 @@ def create(self, body): (id, name, revision, members_json, member_count, created_at, updated_at) VALUES (%s,%s,%s,%s,%s,%s,%s)''', (selection_id, name, 1, encode_retained(members), len(members), now, now)) + self.access.audit('saved_selections.create', selection_id, {'revision': 1, 'content_sha256': hashlib.sha256(encode_retained(members).encode()).hexdigest()}) return self._get(selection_id) + @authorized('inspect', 'saved_selections.load') def load(self, selection_id): """Keep every saved reference; current metadata never replaces a saved pair.""" with self.lock, self.db.transaction(): @@ -103,6 +110,7 @@ def load(self, selection_id): return {'selection': saved, 'members': members, 'current': all(member['status'] == 'ok' for member in members)} + @authorized('edit', 'saved_selections.mutate') def mutate(self, selection_id, action, body): expected = {'revision', 'name'} if action == 'rename' else {'revision'} if action not in ('rename', 'delete') or set(body) != expected: @@ -113,8 +121,10 @@ def mutate(self, selection_id, action, body): raise WorkbenchError('Saved selection changed. Refresh before renaming or deleting.', 'conflict', 409) if action == 'delete': self.db.execute('DELETE FROM saved_selections WHERE id=%s', (selection_id,)) + self.access.audit('saved_selections.delete', selection_id, {'revision': body['revision'], 'retired_sha256': hashlib.sha256(encode_retained(saved).encode()).hexdigest()}) return {'deleted': selection_id} name = text_value(body.get('name'), 'Selection name', 120) self.db.execute('UPDATE saved_selections SET name=%s,revision=revision+1,updated_at=%s WHERE id=%s', (name, timestamp(), selection_id)) + self.access.audit('saved_selections.rename', selection_id, {'revision': body['revision'] + 1, 'name_sha256': hashlib.sha256(name.encode()).hexdigest()}) return self._get(selection_id) diff --git a/scientific_fields.py b/scientific_fields.py index 1fc20a34..b43319e9 100644 --- a/scientific_fields.py +++ b/scientific_fields.py @@ -1,4 +1,5 @@ """Lossless bounded structured-grid fields; no producer execution or physics policy.""" +from access import authorized import ast from decimal import Decimal, InvalidOperation import hashlib @@ -273,9 +274,11 @@ def parse_bundle(raw): class ScientificAssets: def __init__(self, workbench): + self.access = workbench.access self.workbench = workbench self.path = workbench.dataset.path / 'field_sequence' + @authorized('edit', 'scientific_fields.admit') def admit(self, raw, body, source): from immutable_assets import publish_file if type(body) is not dict or set(body) - {'name','rights','groups','parents'}: @@ -312,6 +315,7 @@ def admit(self, raw, body, source): encode(origin),TASK,None,'draft',1,created,created)) record = w._get(record_id) w._history(record) + self.access.audit('scientific_fields.admit', record_id, {'revision': record['revision'], 'source_sha256': digest}) return record def _capture(self, record_id): @@ -336,6 +340,7 @@ def _capture(self, record_id): except OSError: invalid('Original scientific bundle is unavailable.', 'unavailable', 404) + @authorized('inspect', 'scientific_fields.metadata') def metadata(self, record_id, provenance): meta = provenance.get('field_sequence') if type(meta) is not dict or meta.get('schema_version') != 1 or meta.get('format') != FORMAT: @@ -347,12 +352,14 @@ def metadata(self, record_id, provenance): available = False return dict(meta), available + @authorized('inspect', 'scientific_fields.asset', target=lambda record: record.get('id') if isinstance(record, dict) else None) def asset(self, record): raw = self._capture(record['id']) if hashlib.sha256(raw).hexdigest() != record['content_hash'] or encode(parse_bundle(raw)) != encode(record['field_sequence']): invalid('Stored scientific bytes or metadata changed outside Tuldok.', 'conflict', 409) return raw, 'application/zip' + @authorized('inspect', 'scientific_fields.inspect') def inspect(self, record_id, frame=0, field=None, axis='z', index=0): w = self.workbench with w.lock: diff --git a/scripts/prepare_caption_fixtures.py b/scripts/prepare_caption_fixtures.py index 566700aa..2ee11db1 100644 --- a/scripts/prepare_caption_fixtures.py +++ b/scripts/prepare_caption_fixtures.py @@ -125,122 +125,126 @@ def main(): temporary = Path(temporary) source = Dataset(temporary / 'source') target = Dataset(temporary / 'target') - try: - def add(color, *, parents=None, oriented=False): - row = source.workbench.import_asset(dict(kind='image', - image=base64.b64encode(image_bytes(color, oriented)).decode('ascii'), - name=color + '.png', groups=['authored-' + color], parents=parents or [], - rights='Locally authored test image; fixture declaration')) - return save_caption(source, row, 'A ' + color + ' panel.' if color != 'red' - else 'A red panel — pula. 😀', 'human_reviewed') - - deleted = add('purple') - first = add('red', parents=[deleted['id']], oriented=True) - second = add('orange', parents=[first['id']]) - bridge = add('gray', parents=[second['id']]) - rows = [first, second, add('green'), add('blue')] - source.delete(deleted['id'], {'revision': source.sample(deleted['id'])['revision']}) - rows = [source.workbench.get(row['id']) for row in rows] - release = source.releases.create(release_body(rows)) - assert source.releases.create(release_body(rows))['id'] == release['id'] - positive = output / 'native-caption-release' - manifest = extract_authored_release(source, release, positive) - first_consumer = consumer(positive) - assert first_consumer['exit_code'] == 0, first_consumer - roots = connected_components([row for family in manifest['protected_components'].values() for row in family]) - for group, family in manifest['protected_components'].items(): - assert len({roots[row['id']] for row in family}) == 1 - assert group == 'component:' + hashlib.sha256(encode(sorted(row['id'] for row in family)).encode()).hexdigest() - family = manifest['protected_components'][next(r for r in manifest['records'] if r['id'] == first['id'])['export_group']] - assert deleted['id'] in {r['id'] for r in family if not r['source_available']} - assert bridge['id'] in {r['id'] for r in family} and bridge['id'] not in {r['id'] for r in manifest['records']} - - mappings, drafts = [], [] - for record in manifest['records']: - _, projection, index = metadata(positive, record) - assert projection[index]['text'] == record['annotation']['caption'] - assert projection[index]['group'] == record['export_group'] - family = manifest['protected_components'][record['export_group']] - assert next(r for r in family if r['id'] == record['id']) == {key: record[key] for key in SNAPSHOT_KEYS} - raw = (positive / record['asset']).read_bytes() - observed_hash = hashlib.sha256(raw).hexdigest() - assert observed_hash == record['asset_sha256'] == record['content_hash'] - groups = origin_tokens(family) - acquisition = {'format': 'image_caption_v1', - 'observed': {'asset_sha256': observed_hash}, - 'declared': {'record': copy.deepcopy(record), 'protected_component': copy.deepcopy(family)}} - # Fixture rehearsal uses existing image owner with explicit split, - # then existing caption save. Future production admission MUST - # commit asset + caption + draft history in one owner transaction. - admitted = target.add(dict(image=base64.b64encode(raw).decode('ascii'), - filename=record['id'] + '.png', session_id=groups[0], book_id='', split=record['split']), - enrollment=(groups, [], 'unknown', acquisition)) - draft = save_caption(target, target.workbench.get(admitted['id']), projection[index]['text'], 'draft') - assert draft['id'] != record['id'] and draft['review'] == 'draft' and draft['parents'] == [] - assert draft['source_sha256'] == observed_hash - assert draft['pixel_hash'] == record['exported_pixel_sha256'] - assert draft['source_split'] == record['split'] - assert draft['provenance']['rights'] == 'unknown' - assert validate_annotation('image_caption', draft['annotation'], draft) == record['annotation'] - mappings.append(dict(origin_record_id=record['id'], local_record_id=draft['id'], - origin_source_sha256=record['source_sha256'], imported_source_sha256=draft['source_sha256'], - origin_pixel_sha256=record['pixel_hash'], imported_pixel_sha256=draft['pixel_hash'], - split=draft['source_split'], local_groups=groups, - annotation=draft['annotation'], review=draft['review'])) - drafts.append(draft) - assert any(m['origin_source_sha256'] != m['imported_source_sha256'] for m in mappings) + source_session = source.access.exchange(source.access._local_owner_token())['token'] + target_session = target.access.exchange(target.access._local_owner_token())['token'] + with source.access.bind(source_session): try: - target.releases.create(release_body(drafts)) - raise AssertionError('Draft imported captions unexpectedly exported') - except WorkbenchError as error: - draft_blocker = str(error) - assert 'human-reviewed' in draft_blocker - # This is a test state transition, not a claim of actual human acceptance. - accepted = [save_caption(target, row, row['annotation']['caption'], 'human_reviewed') for row in drafts] - second_release = target.releases.create(release_body(accepted)) - second_manifest = extract_authored_release(target, second_release, output / 'reexport-after-fixture-review') - second_consumer = consumer(output / 'reexport-after-fixture-review') - assert second_consumer['exit_code'] == 0, second_consumer - projection = lambda m: sorted((r['exported_pixel_sha256'], r['annotation']['caption'], r['split']) for r in m['records']) - assert projection(manifest) == projection(second_manifest) - - # Consumer is authoritative for training shape, not admission integrity. - chosen = next(record for record in manifest['records'] if record['id'] == first['id']) - def change_text(root, m, rows, i): rows[i]['text'] = '' - def extra_review(root, m, rows, i): rows[i]['review'] = 'human_reviewed' - def path_escape(root, m, rows, i): - shutil.move(root / chosen['asset'], root / 'escaped.png') - rows[i]['file_name'] = '../escaped.png' - def changed_hash(root, m, rows, i): m['records'][0]['asset_sha256'] = '0' * 64 - def changed_caption(root, m, rows, i): rows[i]['text'] = 'Unrelated replacement caption.' - def too_long(root, m, rows, i): rows[i]['text'] = 'x' * 4001 - def crossed_group(root, m, rows, i): - other = next(r for r in m['records'] if r['split'] != chosen['split']) - rows[i]['group'] = other['export_group'] - cases = [negative_probe(positive, temporary, chosen, name, mutation, passed) - for name, mutation, passed in ( - ('empty-caption', change_text, False), - ('cross-split-group', crossed_group, False), - ('forged-review-field', extra_review, True), - ('path-escape', path_escape, True), - ('manifest-hash-mismatch', changed_hash, True), - ('manifest-caption-mismatch', changed_caption, True), - ('caption-over-4000', too_long, True))] - report = dict(base_head='7c43e9b8fe6ff23d3e75d356361fe616c8365d9c', - consumer=CAPTION_CONSUMER, source_release_id=release['id'], - reexport_release_id=second_release['id'], selected_records=len(rows), - complete_family_members=len(manifest['protected_components'][chosen['export_group']]), - draft_release_blocker=draft_blocker, - source_consumer=first_consumer, reexport_consumer=second_consumer, - mappings=mappings, malformed_probes=cases, - limits='Existing-owner fixture rehearsal; no HTTP/browser/importer/atomic target admission acceptance') - write_json(output / 'rehearsal-results.json', report) - print(json.dumps({'fixture_root': str(output), 'records': len(rows), - 'malformed_probes': len(cases), 'consumer_runs_passed': 2, - 'draft_export_blocked': True}, indent=2)) - finally: - target.close() - source.close() + def add(color, *, parents=None, oriented=False): + row = source.workbench.import_asset(dict(kind='image', + image=base64.b64encode(image_bytes(color, oriented)).decode('ascii'), + name=color + '.png', groups=['authored-' + color], parents=parents or [], + rights='Locally authored test image; fixture declaration')) + return save_caption(source, row, 'A ' + color + ' panel.' if color != 'red' + else 'A red panel — pula. 😀', 'human_reviewed') + + deleted = add('purple') + first = add('red', parents=[deleted['id']], oriented=True) + second = add('orange', parents=[first['id']]) + bridge = add('gray', parents=[second['id']]) + rows = [first, second, add('green'), add('blue')] + source.delete(deleted['id'], {'revision': source.sample(deleted['id'])['revision']}) + rows = [source.workbench.get(row['id']) for row in rows] + release = source.releases.create(release_body(rows)) + assert source.releases.create(release_body(rows))['id'] == release['id'] + positive = output / 'native-caption-release' + manifest = extract_authored_release(source, release, positive) + first_consumer = consumer(positive) + assert first_consumer['exit_code'] == 0, first_consumer + roots = connected_components([row for family in manifest['protected_components'].values() for row in family]) + for group, family in manifest['protected_components'].items(): + assert len({roots[row['id']] for row in family}) == 1 + assert group == 'component:' + hashlib.sha256(encode(sorted(row['id'] for row in family)).encode()).hexdigest() + family = manifest['protected_components'][next(r for r in manifest['records'] if r['id'] == first['id'])['export_group']] + assert deleted['id'] in {r['id'] for r in family if not r['source_available']} + assert bridge['id'] in {r['id'] for r in family} and bridge['id'] not in {r['id'] for r in manifest['records']} + + with target.access.bind(target_session): + mappings, drafts = [], [] + for record in manifest['records']: + _, projection, index = metadata(positive, record) + assert projection[index]['text'] == record['annotation']['caption'] + assert projection[index]['group'] == record['export_group'] + family = manifest['protected_components'][record['export_group']] + assert next(r for r in family if r['id'] == record['id']) == {key: record[key] for key in SNAPSHOT_KEYS} + raw = (positive / record['asset']).read_bytes() + observed_hash = hashlib.sha256(raw).hexdigest() + assert observed_hash == record['asset_sha256'] == record['content_hash'] + groups = origin_tokens(family) + acquisition = {'format': 'image_caption_v1', + 'observed': {'asset_sha256': observed_hash}, + 'declared': {'record': copy.deepcopy(record), 'protected_component': copy.deepcopy(family)}} + # Fixture rehearsal uses existing image owner with explicit split, + # then existing caption save. Future production admission MUST + # commit asset + caption + draft history in one owner transaction. + admitted = target.add(dict(image=base64.b64encode(raw).decode('ascii'), + filename=record['id'] + '.png', session_id=groups[0], book_id='', split=record['split']), + enrollment=(groups, [], 'unknown', acquisition)) + draft = save_caption(target, target.workbench.get(admitted['id']), projection[index]['text'], 'draft') + assert draft['id'] != record['id'] and draft['review'] == 'draft' and draft['parents'] == [] + assert draft['source_sha256'] == observed_hash + assert draft['pixel_hash'] == record['exported_pixel_sha256'] + assert draft['source_split'] == record['split'] + assert draft['provenance']['rights'] == 'unknown' + assert validate_annotation('image_caption', draft['annotation'], draft) == record['annotation'] + mappings.append(dict(origin_record_id=record['id'], local_record_id=draft['id'], + origin_source_sha256=record['source_sha256'], imported_source_sha256=draft['source_sha256'], + origin_pixel_sha256=record['pixel_hash'], imported_pixel_sha256=draft['pixel_hash'], + split=draft['source_split'], local_groups=groups, + annotation=draft['annotation'], review=draft['review'])) + drafts.append(draft) + assert any(m['origin_source_sha256'] != m['imported_source_sha256'] for m in mappings) + try: + target.releases.create(release_body(drafts)) + raise AssertionError('Draft imported captions unexpectedly exported') + except WorkbenchError as error: + draft_blocker = str(error) + assert 'human-reviewed' in draft_blocker + # This is a test state transition, not a claim of actual human acceptance. + accepted = [save_caption(target, row, row['annotation']['caption'], 'human_reviewed') for row in drafts] + second_release = target.releases.create(release_body(accepted)) + second_manifest = extract_authored_release(target, second_release, output / 'reexport-after-fixture-review') + second_consumer = consumer(output / 'reexport-after-fixture-review') + assert second_consumer['exit_code'] == 0, second_consumer + projection = lambda m: sorted((r['exported_pixel_sha256'], r['annotation']['caption'], r['split']) for r in m['records']) + assert projection(manifest) == projection(second_manifest) + + # Consumer is authoritative for training shape, not admission integrity. + chosen = next(record for record in manifest['records'] if record['id'] == first['id']) + def change_text(root, m, rows, i): rows[i]['text'] = '' + def extra_review(root, m, rows, i): rows[i]['review'] = 'human_reviewed' + def path_escape(root, m, rows, i): + shutil.move(root / chosen['asset'], root / 'escaped.png') + rows[i]['file_name'] = '../escaped.png' + def changed_hash(root, m, rows, i): m['records'][0]['asset_sha256'] = '0' * 64 + def changed_caption(root, m, rows, i): rows[i]['text'] = 'Unrelated replacement caption.' + def too_long(root, m, rows, i): rows[i]['text'] = 'x' * 4001 + def crossed_group(root, m, rows, i): + other = next(r for r in m['records'] if r['split'] != chosen['split']) + rows[i]['group'] = other['export_group'] + cases = [negative_probe(positive, temporary, chosen, name, mutation, passed) + for name, mutation, passed in ( + ('empty-caption', change_text, False), + ('cross-split-group', crossed_group, False), + ('forged-review-field', extra_review, True), + ('path-escape', path_escape, True), + ('manifest-hash-mismatch', changed_hash, True), + ('manifest-caption-mismatch', changed_caption, True), + ('caption-over-4000', too_long, True))] + report = dict(base_head='7c43e9b8fe6ff23d3e75d356361fe616c8365d9c', + consumer=CAPTION_CONSUMER, source_release_id=release['id'], + reexport_release_id=second_release['id'], selected_records=len(rows), + complete_family_members=len(manifest['protected_components'][chosen['export_group']]), + draft_release_blocker=draft_blocker, + source_consumer=first_consumer, reexport_consumer=second_consumer, + mappings=mappings, malformed_probes=cases, + limits='Existing-owner fixture rehearsal; no HTTP/browser/importer/atomic target admission acceptance') + write_json(output / 'rehearsal-results.json', report) + print(json.dumps({'fixture_root': str(output), 'records': len(rows), + 'malformed_probes': len(cases), 'consumer_runs_passed': 2, + 'draft_export_blocked': True}, indent=2)) + finally: + target.close() + source.close() if __name__ == '__main__': diff --git a/scripts/qualify_grounded_local.py b/scripts/qualify_grounded_local.py index 5aad5b04..a8afa903 100644 --- a/scripts/qualify_grounded_local.py +++ b/scripts/qualify_grounded_local.py @@ -28,54 +28,56 @@ def qualify(url, model): raise ValueError('Requested model is not in the real served catalog.') with tempfile.TemporaryDirectory(prefix='tuldok-pumas-smoke-') as root: data = Dataset(root) - try: - row = data.workbench.import_asset({'kind': 'text', 'text': 'Please cancel my meeting.', - 'name': 'Fictional smoke request', 'groups': ['fictional-smoke'], 'rights': 'Synthetic test fixture'}) - row = data.workbench.save(row['id'], {'revision': row['revision'], 'source_revision': row['source_revision'], - 'task': 'text_classification', 'annotation': {'label': 'cancel'}, 'groups': row['groups'], 'review': 'human_reviewed'}) - config = {'source_id': row['id'], 'revision': row['revision'], 'source_revision': row['source_revision'], - 'server_url': url, 'model': model, 'instruction': 'Rewrite politely without changing meaning.', 'count': 1, 'seed': 42} - job = data.grounded.start(config) - data.grounded.worker.join(190) - if data.grounded.worker.is_alive(): - data.grounded.cancel(job['id']);data.grounded.worker.join(20) - raise RuntimeError('Generation exceeded its bounded deadline.') - job = data.grounded.get(job['id']) - result['proposal'] = {'status': job['status'], 'error': job['error'], 'candidate_count': len(job['candidates']), - 'response_sha256': job['response_sha256'], 'reported_model': job.get('reported_model')} - if job.get('raw_response_base64'): - raw = base64.b64decode(job['raw_response_base64'], validate=True) - result['proposal']['exact_bytes_hash_matches'] = hashlib.sha256(raw).hexdigest() == job['response_sha256'] - result['proposal']['raw_response'] = json.loads(raw) - if job['status'] == 'completed': - candidate = job['candidates'][0] - # Explicit fixture-only inspection gate; do not label any model output human-reviewed. - admitted = data.grounded.review(job['id'], {'revision': job['revision'], 'candidate_id': candidate['id'], - 'decision': 'admit_draft', 'note': 'Automated integration fixture admission; semantic review remains required.'})['record'] - result['admission'] = {'review': admitted['review'], 'parent_matches': admitted['parents'] == [row['id']], - 'response_hash_matches': admitted['provenance']['response_sha256'] == job['response_sha256']} - else: - result['admission'] = {'status': 'not exercised: production proposal validation rejected output'} - cancel_job = data.grounded.start({**config, 'count': 10}) - deadline = time.monotonic() + 20 - while time.monotonic() < deadline: - current = data.grounded.get(cancel_job['id']) - if current['status'] != 'preparing':break - time.sleep(.02) - time.sleep(.2) - before = data.grounded.get(cancel_job['id'])['status'] - started = time.monotonic() - data.grounded.cancel(cancel_job['id']);data.grounded.worker.join(15) - cancelled = data.grounded.get(cancel_job['id']) - result['cancellation'] = {'before': before, 'after': cancelled['status'], - 'worker_stopped': not data.grounded.worker.is_alive(), 'elapsed_seconds': round(time.monotonic()-started, 3), - 'candidate_count': len(cancelled['candidates']), 'exercised_active_request': before in ACTIVE} - data.close();data = Dataset(root) - restored = data.grounded.get(job['id']) - result['reopen'] = {'status_matches': restored['status'] == job['status'], - 'exact_response_preserved': restored.get('raw_response_base64') == job.get('raw_response_base64')} - finally: - data.close() + session = data.access.exchange(data.access._local_owner_token())['token'] + with data.access.bind(session): + try: + row = data.workbench.import_asset({'kind': 'text', 'text': 'Please cancel my meeting.', + 'name': 'Fictional smoke request', 'groups': ['fictional-smoke'], 'rights': 'Synthetic test fixture'}) + row = data.workbench.save(row['id'], {'revision': row['revision'], 'source_revision': row['source_revision'], + 'task': 'text_classification', 'annotation': {'label': 'cancel'}, 'groups': row['groups'], 'review': 'human_reviewed'}) + config = {'source_id': row['id'], 'revision': row['revision'], 'source_revision': row['source_revision'], + 'server_url': url, 'model': model, 'instruction': 'Rewrite politely without changing meaning.', 'count': 1, 'seed': 42} + job = data.grounded.start(config) + data.grounded.worker.join(190) + if data.grounded.worker.is_alive(): + data.grounded.cancel(job['id']);data.grounded.worker.join(20) + raise RuntimeError('Generation exceeded its bounded deadline.') + job = data.grounded.get(job['id']) + result['proposal'] = {'status': job['status'], 'error': job['error'], 'candidate_count': len(job['candidates']), + 'response_sha256': job['response_sha256'], 'reported_model': job.get('reported_model')} + if job.get('raw_response_base64'): + raw = base64.b64decode(job['raw_response_base64'], validate=True) + result['proposal']['exact_bytes_hash_matches'] = hashlib.sha256(raw).hexdigest() == job['response_sha256'] + result['proposal']['raw_response'] = json.loads(raw) + if job['status'] == 'completed': + candidate = job['candidates'][0] + # Explicit fixture-only inspection gate; do not label any model output human-reviewed. + admitted = data.grounded.review(job['id'], {'revision': job['revision'], 'candidate_id': candidate['id'], + 'decision': 'admit_draft', 'note': 'Automated integration fixture admission; semantic review remains required.'})['record'] + result['admission'] = {'review': admitted['review'], 'parent_matches': admitted['parents'] == [row['id']], + 'response_hash_matches': admitted['provenance']['response_sha256'] == job['response_sha256']} + else: + result['admission'] = {'status': 'not exercised: production proposal validation rejected output'} + cancel_job = data.grounded.start({**config, 'count': 10}) + deadline = time.monotonic() + 20 + while time.monotonic() < deadline: + current = data.grounded.get(cancel_job['id']) + if current['status'] != 'preparing':break + time.sleep(.02) + time.sleep(.2) + before = data.grounded.get(cancel_job['id'])['status'] + started = time.monotonic() + data.grounded.cancel(cancel_job['id']);data.grounded.worker.join(15) + cancelled = data.grounded.get(cancel_job['id']) + result['cancellation'] = {'before': before, 'after': cancelled['status'], + 'worker_stopped': not data.grounded.worker.is_alive(), 'elapsed_seconds': round(time.monotonic()-started, 3), + 'candidate_count': len(cancelled['candidates']), 'exercised_active_request': before in ACTIVE} + data.close();data = Dataset(root) + restored = data.grounded.get(job['id']) + result['reopen'] = {'status_matches': restored['status'] == job['status'], + 'exact_response_preserved': restored.get('raw_response_base64') == job.get('raw_response_base64')} + finally: + data.close() return result diff --git a/scripts/qualify_pumas_typed_actual.py b/scripts/qualify_pumas_typed_actual.py index d32b51d9..8f63e993 100644 --- a/scripts/qualify_pumas_typed_actual.py +++ b/scripts/qualify_pumas_typed_actual.py @@ -49,60 +49,62 @@ def generate(request): return owner.get(job['id']) def check(condition,name,detail=None): assert condition,(name,detail);cases.append(name) - try: - control(text_mode='success',text_response='{"label":"positive"}',text_delay=0) - manifest=pumas.capabilities(gateway['gateway_url'],gateway['text_alias']) - check(manifest['capabilities']['profile']==gateway['text_profile'],'actual selected alias resolves exact profile') - row=source('classification');request=body(row);before=len(posts());job=generate(request);evidence.append(job) - check(job['status']=='completed' and job['canonical_request']['profile']==gateway['text_profile'], - 'classification actual typed result and captured profile',job['error']) - check(data.workbench.get(row['id'])['annotation'] is None,'proposal leaves source unchanged') - data.text_classification_proposals.start(request) - check(len(posts())==before+1,'local same-ID admission does not replay native provider') - applied=data.text_classification_proposals.decide(job['id'],dict(revision=job['revision'],decision='apply_draft',labels=request['labels']))['record'] - check(applied['review']=='draft' and applied['provenance']==row['provenance'],'classification draft preserves rights/history owner') + session = data.access.exchange(data.access._local_owner_token())['token'] + with data.access.bind(session): try: - data.releases.create(dict(items=[{k:applied[k] for k in ('id','revision','source_revision')}],ratios=dict(train=100,validation=0,test=0),seed=42)) - raise AssertionError('Draft was released') - except WorkbenchError: cases.append('draft cannot release before separate human review') - reviewed=data.workbench.save(applied['id'],dict(revision=applied['revision'],source_revision=applied['source_revision'], - task='text_classification',annotation=applied['annotation'],groups=applied['groups'],review='human_reviewed')) - control(text_response=json.dumps({'candidates':[{'text':'The confirmed meeting will take place, classification.', - 'label':'positive','evidence':[{'start':0,'end':len(reviewed['text']),'quote':reviewed['text']}]}]})) - rewrite={k:v for k,v in body(reviewed).items() if k not in ('request_id','labels')};rewrite['count']=1 - owner=data.grounded;proposal=owner.start(rewrite);owner.worker.join(10);proposal=owner.get(proposal['id']);evidence.append(proposal) - check(proposal['status']=='completed','actual typed grounded quotes validated',proposal['error']) - candidate=owner.review(proposal['id'],dict(revision=proposal['revision'],candidate_id=proposal['candidates'][0]['id'], - decision='admit_draft',note='Controlled source/quote reviewed; separate annotation review remains.'))['record'] - check(candidate['review']=='draft' and candidate['parents']==[reviewed['id']] and candidate['groups']==reviewed['groups'], - 'grounded candidate inherits source family and remains draft') - control(text_response='{"label":"positive"}',text_delay=3.2) - started=time.monotonic();slow=generate(body(source('long controlled response'))) - check(slow['status']=='completed' and time.monotonic()-started>=3,'finite generation outlives three-second discovery budget',slow['error']) - control(text_delay=0,text_mode='transport_loss');request=body(source('uncertain loss'));before=len(posts());lost=generate(request);evidence.append(lost) - check(lost['provider_outcome']=='unknown' and lost['status']=='failed','native authoritative unknown transport outcome',lost) - data.text_classification_proposals.start(request) - check(len(posts())==before+1,'unknown native provider attempt is never replayed by same local ID') - control(text_mode='hold');request=body(source('explicit cancellation'));before=len(posts());owner=data.text_classification_proposals;cancelled=owner.start(request) - end=time.monotonic()+3 - while len(posts())==before and time.monotonic()=3,'finite generation outlives three-second discovery budget',slow['error']) + control(text_delay=0,text_mode='transport_loss');request=body(source('uncertain loss'));before=len(posts());lost=generate(request);evidence.append(lost) + check(lost['provider_outcome']=='unknown' and lost['status']=='failed','native authoritative unknown transport outcome',lost) + data.text_classification_proposals.start(request) + check(len(posts())==before+1,'unknown native provider attempt is never replayed by same local ID') + control(text_mode='hold');request=body(source('explicit cancellation'));before=len(posts());owner=data.text_classification_proposals;cancelled=owner.start(request) + end=time.monotonic()+3 + while len(posts())==before and time.monotonic()JSON.parse(JSON.stringify(value)); function notice(message){clearTimeout(noticeTimer);$('notice').textContent=message;$('notice').hidden=!message;if(message)noticeTimer=setTimeout(()=>notice(''),12000);} $('notice').onclick=()=>notice(''); async function api(path,body){ - const response=await fetch(path,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); + const response=await (globalThis.TuldokAuth?.fetch || fetch)(path,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); const value=await response.json();if(!response.ok)throw Error(value.error||'Request failed.');return value; } async function run(action){ @@ -333,7 +333,7 @@ $('import').onchange=()=>run(async()=>{ if(failures.length)notice(success+' imported. '+failures.join(' · ')); }); $('export').onclick=()=>run(async()=>{ - const response=await fetch('/api/export'); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/export'); if(!response.ok)throw Error((await response.json()).error); const url=URL.createObjectURL(await response.blob()),a=document.createElement('a');a.href=url;a.download='tuldok-dataset.zip';a.click();setTimeout(()=>URL.revokeObjectURL(url),1000); }); diff --git a/static/audio-editor.js b/static/audio-editor.js index 8d5c8515..797bf755 100644 --- a/static/audio-editor.js +++ b/static/audio-editor.js @@ -92,7 +92,7 @@ function audioShown(record) { $('audio-status').textContent = 'Loading source-channel waveform…'; (async () => { try { - const response = await fetch('/api/workbench/audio-inspection/' + record.id, {signal:controller.signal}), raw = await response.json(); + const response = await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/audio-inspection/' + record.id, {signal:controller.signal}), raw = await response.json(); if (!response.ok) throw Error(raw.error || 'Audio inspection unavailable.'); const value = decodeAudioInspection(raw, record); if (!owns()) return; audioInspection = value; audioDraw(); $('audio-status').textContent = 'Original bytes retained. Waveform peaks summarize source frames; no transcript is inferred.'; @@ -119,7 +119,7 @@ action('audio-play-interval', async () => { const context = audioContext || new AudioContext({sampleRate:record.audio.sample_rate_hz}); audioContext = context; try { await context.resume(); - const response = await fetch('/api/workbench/asset/' + record.id); + const response = await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/asset/' + record.id); if (!response.ok) throw Error('Original audio unavailable.'); const buffer = await context.decodeAudioData(await response.arrayBuffer()); if (generation !== audioGeneration || playback !== audioPlaybackGeneration) return; diff --git a/static/auth.css b/static/auth.css new file mode 100644 index 00000000..129e33b2 --- /dev/null +++ b/static/auth.css @@ -0,0 +1 @@ +.session-bar{display:flex;align-items:center;justify-content:flex-end;gap:8px;padding:5px 12px;font:12px system-ui;background:#edf2ef;color:#263b32;flex-wrap:wrap}.session-bar button{font:inherit;padding:4px 8px}#session-dialog{width:min(420px,calc(100vw - 32px));box-sizing:border-box;border:1px solid #b8c9c0;border-radius:10px;padding:20px;color:#21382e;background:#fff}#session-dialog::backdrop{background:#122a2370}#session-dialog label{display:block}#session-token{display:block;width:100%;box-sizing:border-box;margin:8px 0 14px}#session-dialog button{margin:4px}#session-status,.session-help{overflow-wrap:anywhere;font:13px/1.5 system-ui} diff --git a/static/auth.js b/static/auth.js new file mode 100644 index 00000000..6276178b --- /dev/null +++ b/static/auth.js @@ -0,0 +1,93 @@ +'use strict'; +// Credentials are exchanged once and never retained by application JavaScript. +window.TuldokAuth=(()=>{ + let identity=null,initialResolve,checkedResolve,initial=true,busy=false,checkGeneration=0; + const checked=new Promise(resolve=>{checkedResolve=resolve;}); + const initialLogin=new Promise(resolve=>{initialResolve=resolve;}); + const $=id=>document.getElementById(id); + const canReview=()=>identity?.kind==='owner'&&identity.scopes.includes('approve-review'); + function controls(){ + for(const id of ['record-review','response-review','preference-review']){ + const node=$(id);if(!node)continue; + const denied=!canReview(); + if(denied&&!node.disabled){node.disabled=true;node.dataset.authDisabled='true';} + if(!denied&&node.dataset.authDisabled){node.disabled=false;delete node.dataset.authDisabled;} + node.title=denied?'Human review requires an owner session.':''; + } + } + function render(){ + $('session-identity').textContent=identity?`${identity.label} · ${identity.kind}`:'Signed out'; + $('session-logout').hidden=!identity;controls(); + } + function login(message='Enter the one-time code from your private local login file.'){ + $('session-status').textContent=message; + if(!$('session-dialog').open)$('session-dialog').showModal(); + $('session-token').focus(); + } + function notifyFrames(){ + if(window.parent!==window)window.parent.postMessage({type:'tuldok-session-changed'},location.origin); + for(const frame of document.querySelectorAll('iframe'))frame.contentWindow?.postMessage({type:'tuldok-session-changed'},location.origin); + } + function accept(value){ + if(!value||!['owner','agent'].includes(value.kind)||!Array.isArray(value.scopes)||typeof value.label!=='string')throw Error('Unsupported session identity.'); + identity=value;render();window.dispatchEvent(new CustomEvent('tuldok-session',{detail:{kind:value.kind,scopes:[...value.scopes]}})); + } + async function check(){ + if(busy)return;const generation=++checkGeneration; + try{ + const response=await globalThis.fetch('/api/access/session',{credentials:'same-origin',cache:'no-store'}); + if(generation!==checkGeneration)return; + if(response.status===401){identity=null;render();login();return;} + const value=await response.json();if(generation!==checkGeneration)return;if(!response.ok)throw Error(value.error||'Session unavailable.'); + accept(value);$('session-dialog').close();initialResolve();initial=false; + }catch(error){if(generation===checkGeneration){identity=null;render();login(error.message);}} + finally{checkedResolve();} + } + async function request(input,options={}){ + const url=new URL(typeof input==='string'?input:input.url,location.href); + if(url.origin!==location.origin||!url.pathname.startsWith('/api/'))return globalThis.fetch(input,options); + await checked; + if(initial){ + if((options.method||(typeof input==='string'?'GET':input.method)||'GET').toUpperCase()!=='GET')return new Response(JSON.stringify({error:'Sign in, then retry this action explicitly.'}),{status:401,headers:{'Content-Type':'application/json'}}); + await initialLogin; + } + const generation=checkGeneration; + const response=await globalThis.fetch(input,{...options,credentials:'same-origin'}); + if(response.status===401&&generation===checkGeneration){identity=null;render();login('Session expired or revoked. Your edits remain here. Sign in, then retry the action explicitly.');} + return response; + } + function mount(){ + const bar=document.createElement('div');bar.className='session-bar'; + bar.innerHTML='Checking session…'; + const dialog=document.createElement('dialog');dialog.id='session-dialog';dialog.setAttribute('aria-labelledby','session-title'); + dialog.innerHTML='

Local session

Generate a private code with python access.py login --data CATALOG --out FILE. Do not share that file.

'; + document.body.prepend(bar);document.body.append(dialog); + $('session-open').onclick=()=>login(identity?'Current session: '+identity.label+'. Enter a new one-time code to change sessions.':undefined); + $('session-close').onclick=()=>dialog.close(); + $('session-form').onsubmit=async event=>{ + event.preventDefault();if(busy)return;busy=true;++checkGeneration;$('session-submit').disabled=true; + const token=$('session-token').value;$('session-token').value=''; + try{ + const response=await globalThis.fetch('/api/access/session',{method:'POST',credentials:'same-origin',headers:{'Content-Type':'application/json'},body:JSON.stringify({token})}); + const value=await response.json();if(!response.ok)throw Error(value.error||'Login refused.'); + accept(value);dialog.close();initialResolve();initial=false; + notifyFrames(); + }catch(error){$('session-status').textContent=error.message;} + finally{busy=false;$('session-submit').disabled=false;} + }; + $('session-logout').onclick=async()=>{ + if(busy)return;busy=true;++checkGeneration;$('session-logout').disabled=true; + try{ + const response=await globalThis.fetch('/api/access/logout',{method:'POST',credentials:'same-origin',headers:{'Content-Type':'application/json'},body:'{}'}); + if(!response.ok&&response.status!==401)throw Error((await response.json()).error||'Sign out failed.'); + identity=null;render();login('Signed out. Your current edits remain here.');notifyFrames(); + }catch(error){login(error.message);} + finally{busy=false;$('session-logout').disabled=false;} + }; + new MutationObserver(controls).observe(document.body,{childList:true,subtree:true,attributes:true,attributeFilter:['disabled']}); + window.addEventListener('message',event=>{if(event.origin===location.origin&&event.data?.type==='tuldok-session-changed')check();}); + check(); + } + if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',mount,{once:true});else mount(); + return {fetch:request,identity:()=>identity,canReview}; +})(); diff --git a/static/bulk_import.js b/static/bulk_import.js index ff9c62e7..b011955c 100644 --- a/static/bulk_import.js +++ b/static/bulk_import.js @@ -74,7 +74,7 @@ $('bulk-form').addEventListener('submit',async event=>{ if(bulkStopped){state='Stopped';break;} counts.attempted++; try{ - const response=await fetch('/api/workbench/import-row',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/import-row',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); const result=await response.json(); if(!response.ok){ if([400,409].includes(response.status)){ @@ -104,7 +104,7 @@ $('bulk-check').addEventListener('click',async()=>{ if(bulkRunning || !bulkPending)return; const pending=bulkPending;bulkRunning=true;bulkControls(); try{ - const response=await fetch('/api/workbench/import-result/'+pending.request_id); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/import-result/'+pending.request_id); const result=await response.json(); if(!response.ok)throw Error(result.error||'Result check failed.'); if(!result.found){$('bulk-status').textContent='No saved result is visible yet. This does not prove the in-flight row stopped. Inspect the collection before retrying.';return;} diff --git a/static/caption_import.js b/static/caption_import.js index 5be38d5d..8a582ddf 100644 --- a/static/caption_import.js +++ b/static/caption_import.js @@ -46,7 +46,7 @@ $('caption-form').addEventListener('submit',async event=>{ try{ const paths=captionFiles(files),source=await captionSources(paths); if(captionStopped){captionSummary(counts,'Stopped before preparation');return;} - const prepared=await fetch('/api/workbench/caption-import/prepare',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(source)}); + const prepared=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/caption-import/prepare',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(source)}); const contract=await prepared.json(); if(!prepared.ok)throw Error(contract.error||'Native caption preparation failed.'); if(contract.format!=='image_caption_v1' || !Array.isArray(contract.rows) || !contract.rows.length || contract.rows.length>1000)throw Error('Invalid native preparation receipt.'); @@ -64,7 +64,7 @@ $('caption-form').addEventListener('submit',async event=>{ if(captionStopped){state='Stopped';break;} counts.attempted++; try{ - const response=await fetch('/api/workbench/caption-import/row',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}),receipt=await response.json(); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/caption-import/row',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}),receipt=await response.json(); if(!response.ok && [400,409].includes(response.status)){ counts.rejected++;captionRow(row,'rejected',receipt.error||'Caption admission failed.'); }else{ @@ -87,7 +87,7 @@ $('caption-check').addEventListener('click',async()=>{ if(captionRunning || !captionPending)return; const pending=captionPending;captionRunning=true;captionControls(); try{ - const response=await fetch('/api/workbench/import-result/'+pending.request_id),receipt=await response.json(); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/import-result/'+pending.request_id),receipt=await response.json(); if(!response.ok)throw Error(receipt.error||'Saved result lookup failed.'); if(!receipt.found){$('caption-status').textContent='No saved result is visible yet. This does not prove the in-flight row stopped. Inspect the collection before retrying.';return;} if(!bulkReceipt(receipt,pending) || receipt.kind!=='image')throw Error('Saved result does not match the pending caption row.'); diff --git a/static/index.html b/static/index.html index ab536f4d..31583767 100644 --- a/static/index.html +++ b/static/index.html @@ -1,5 +1,5 @@ -Tuldok · Dataset studio +Tuldok · Dataset studio
Dataset workbench ↗
Dataset workspaces · M1 previewtuldok●
diff --git a/static/meshes.js b/static/meshes.js index ec58fcfc..a847dc6f 100644 --- a/static/meshes.js +++ b/static/meshes.js @@ -89,7 +89,7 @@ function meshShown(record) { // Geometry owns only its projection; note/review/selection remain editor-owned. (async()=>{ try { - const response=await fetch('/api/workbench/mesh-inspection/'+record.id,{signal:controller.signal}); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/mesh-inspection/'+record.id,{signal:controller.signal}); const raw=await response.json();if(!response.ok)throw Error(raw.error||'Geometry inspection unavailable.'); const value=decodeMeshInspection(raw,record);if(!owns())return; renderMeshInspection(value); @@ -172,7 +172,7 @@ async function validateMeshRelease() { const owns=()=>generation===meshReleaseGeneration&&meshPublishedRelease?.id===release.id; $('mesh-validate-release').disabled=true;$('mesh-release-details').replaceChildren();$('mesh-release-status').textContent='Validating frozen mesh bytes and record projections…'; try{ - const response=await fetch('/api/workbench/mesh-release-validation/'+release.id,{signal:controller.signal}); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/mesh-release-validation/'+release.id,{signal:controller.signal}); const raw=await response.json();if(!response.ok)throw Error(raw.error||'Mesh release validation unavailable.'); const value=decodeMeshReleaseReport(raw,release);if(!owns())return; $('mesh-release-status').textContent=`Integrity verified: ${value.mesh_count} whole meshes · ${value.vertex_count} vertices · ${value.triangle_count} triangles. Selected-record family checks only.`; diff --git a/static/native_detection_import.js b/static/native_detection_import.js index d1247ec0..2c92f30f 100644 --- a/static/native_detection_import.js +++ b/static/native_detection_import.js @@ -53,7 +53,7 @@ $('native-detection-form').addEventListener('submit',async event=>{ if(buffer.byteLength!==size)throw Error('Selected archive size changed during reading.'); const bytes=new Uint8Array(buffer),parts=[]; for(let offset=0;offset{ counts.attempted++;const item=detectionRow(row.row_number,'importing','Validating native image and initial boxes…'); detectionFlight={...proof,counts,item}; try{ - const admission=await fetch('/api/workbench/native-detection-import/row',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); + const admission=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/native-detection-import/row',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); if(epoch!==detectionEpoch)return; const receipt=await admission.json();if(epoch!==detectionEpoch)return; if(!admission.ok){ @@ -101,7 +101,7 @@ $('native-detection-check').addEventListener('click',async()=>{ if(detectionRunning || !detectionPending)return; const pending=detectionPending,epoch=++detectionEpoch;detectionRunning=true;detectionControls(); try{ - const response=await fetch('/api/workbench/import-result/'+pending.request_id); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/import-result/'+pending.request_id); if(epoch!==detectionEpoch)return; const receipt=await response.json();if(epoch!==detectionEpoch)return; if(!response.ok)throw Error(receipt.error||'Saved result lookup failed.'); diff --git a/static/native_text_import.js b/static/native_text_import.js index bab349f2..5a51741e 100644 --- a/static/native_text_import.js +++ b/static/native_text_import.js @@ -32,7 +32,7 @@ $('native-text-form').addEventListener('submit',async event=>{ try{ const source=await nativeTextArchive(file); if(nativeTextStopped){nativeTextSummary(counts,'Stopped before preparation');return;} - const response=await fetch('/api/workbench/native-text-import/prepare',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(source)}); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/native-text-import/prepare',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(source)}); const prepared=await response.json(); if(!response.ok)throw Error(prepared.error||'Native release preparation failed.'); if(prepared.format!=='canonical_v1' || prepared.schema_version!==1 || prepared.input_basis!=='consumed_exported_text' || prepared.upstream_original!=='unavailable' || !/^[a-f0-9]{64}$/.test(prepared.archive_sha256) || !Array.isArray(prepared.rows) || !prepared.rows.length || prepared.rows.length>2000)throw Error('Invalid native classification preparation receipt.'); @@ -45,7 +45,7 @@ $('native-text-form').addEventListener('submit',async event=>{ const proof={request_id:body.request_id,row_number:row.row_number,row_sha256:row.row_sha256}; counts.attempted++; try{ - const admission=await fetch('/api/workbench/native-text-import/row',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}),receipt=await admission.json(); + const admission=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/native-text-import/row',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}),receipt=await admission.json(); if(!admission.ok && [400,409].includes(admission.status)){ counts.rejected++;nativeTextRow(row,'rejected',receipt.error||'Classification admission failed.'); }else{ @@ -68,7 +68,7 @@ $('native-text-check').addEventListener('click',async()=>{ if(nativeTextRunning || !nativeTextPending)return; const pending=nativeTextPending;nativeTextRunning=true;nativeTextControls(); try{ - const response=await fetch('/api/workbench/import-result/'+pending.request_id),receipt=await response.json(); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/import-result/'+pending.request_id),receipt=await response.json(); if(!response.ok)throw Error(receipt.error||'Saved result lookup failed.'); if(!receipt.found){$('native-text-status').textContent='No saved result is visible yet. This does not prove the in-flight record stopped. Inspect the collection before retrying.';return;} if(!bulkReceipt(receipt,pending) || receipt.kind!=='text')throw Error('Saved result does not match the pending classification row.'); diff --git a/static/pointclouds.js b/static/pointclouds.js index 90906661..7f42eaa8 100644 --- a/static/pointclouds.js +++ b/static/pointclouds.js @@ -54,7 +54,7 @@ function pointcloudShown(record) { const owns=()=>generation===pointcloudGeneration&¤t?.id===record.id&¤t.content_hash===record.content_hash; $('pointcloud-preview-status').textContent='Loading bounded point inspection…'; (async()=>{try { - const response=await fetch('/api/workbench/pointcloud-inspection/'+record.id,{signal:controller.signal});const raw=await response.json(); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/pointcloud-inspection/'+record.id,{signal:controller.signal});const raw=await response.json(); if(!response.ok)throw Error(raw.error||'Point inspection unavailable.'); const value=decodePointcloudInspection(raw,record);if(!owns())return;renderPointcloud(value); $('pointcloud-preview-status').textContent=`Showing first ${value.sample_count} of ${value.point_count} points in original order. Native XYZ: ${value.units}, ${value.coordinate_system.frame}, ${value.coordinate_system.handedness}-handed, ${value.coordinate_system.up_axis} up. Display rotation only; original values, colors and normals stay unchanged.`; diff --git a/static/pumas-typed.js b/static/pumas-typed.js index db5eafa0..10c89072 100644 --- a/static/pumas-typed.js +++ b/static/pumas-typed.js @@ -30,7 +30,7 @@ window.addEventListener('DOMContentLoaded',()=>{ output.hidden=false;output.textContent='Inspecting selected model capabilities…'; try { if(get('protocol').value!=='pumas_typed_v1')throw Error('Choose Pumas typed v1 to inspect its selected-model contract.'); - const response=await fetch('/api/generation/typed-capabilities',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/generation/typed-capabilities',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); const value=await response.json(); if(!response.ok)throw Error(value.error||'Capability observation failed.'); if(!current())return; diff --git a/static/scientific-fields.js b/static/scientific-fields.js index 7692fe68..0e4477e8 100644 --- a/static/scientific-fields.js +++ b/static/scientific-fields.js @@ -60,7 +60,7 @@ function scientificShown(record) { const owns=()=>generation===scientificGeneration&&scientificController===controller&¤t?.id===record.id&¤t.content_hash===record.content_hash; $('scientific-canvas').hidden=true;$('scientific-status').textContent='Loading exact numeric slice…';$('scientific-probe').textContent='';$('scientific-coordinates').textContent=''; try{ - const response=await fetch('/api/workbench/records/'+record.id+'/scientific?'+new URLSearchParams(request),{signal:controller.signal}),raw=await response.json(); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/records/'+record.id+'/scientific?'+new URLSearchParams(request),{signal:controller.signal}),raw=await response.json(); if(!response.ok)throw Error(raw.error||'Scientific slice unavailable.'); const value=decodeScientificSlice(raw,record,request);if(owns())drawScientificSlice(value); }catch(error){if(owns()&&error.name!=='AbortError')$('scientific-status').textContent=error.message;} diff --git a/static/sequence-batch.js b/static/sequence-batch.js index b0b91beb..1c16ee7d 100644 --- a/static/sequence-batch.js +++ b/static/sequence-batch.js @@ -115,7 +115,7 @@ $('sequence-batch-form').addEventListener('submit',async event=>{ const item=sequenceBatchItem(offset+1,pair.item_name,'importing','Validating the whole bounded trajectory…'); sequenceBatchFlight={...proof,counts,item}; try { - const response=await fetch('/api/workbench/sequence-import-item',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/sequence-import-item',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}); if(epoch!==sequenceBatchEpoch)return; const result=await response.json(); if(epoch!==sequenceBatchEpoch)return; @@ -148,7 +148,7 @@ $('sequence-batch-check').addEventListener('click',async()=>{ const pending=sequenceBatchPending,epoch=++sequenceBatchEpoch; sequenceBatchRunning=true;sequenceBatchControls(); try { - const response=await fetch('/api/workbench/sequence-import-result/'+pending.request_id); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workbench/sequence-import-result/'+pending.request_id); if(epoch!==sequenceBatchEpoch)return; const result=await response.json(); if(epoch!==sequenceBatchEpoch)return; diff --git a/static/volume-editor.js b/static/volume-editor.js index 95a0c84e..c52a842c 100644 --- a/static/volume-editor.js +++ b/static/volume-editor.js @@ -30,7 +30,7 @@ async function loadVolumeSlice(record,axis,index,generation) { const owns=()=>volumeRequests.get(axis)===controller&&generation===volumeGeneration&¤t?.id===record.id&¤t.content_hash===record.content_hash; $('volume-canvas-'+axis).hidden=true;$('volume-position-'+axis).textContent='Loading native index slice…'; try{ - const response=await fetch(`/api/workbench/volume-inspection/${record.id}?axis=${axis}&index=${index}`,{signal:controller.signal});const raw=await response.json(); + const response=await (globalThis.TuldokAuth?.fetch || fetch)(`/api/workbench/volume-inspection/${record.id}?axis=${axis}&index=${index}`,{signal:controller.signal});const raw=await response.json(); if(!response.ok)throw Error(raw.error||'Volume slice unavailable.'); const value=decodeVolumeSlice(raw,record,axis,index);if(owns())renderVolumeSlice(value); }catch(error){if(owns()&&error.name!=='AbortError')$('volume-position-'+axis).textContent=error.message;} diff --git a/static/workbench.html b/static/workbench.html index 36a696db..42cc806b 100644 --- a/static/workbench.html +++ b/static/workbench.html @@ -1,4 +1,4 @@ -Tuldok · Dataset workbench +Tuldok · Dataset workbench
Dataset workspaces · M1 preview · ← Corner studio

Dataset workbench

Real assets, explicit targets, reproducible releases.

Development workspace

Loading collection…

Collection

Exact, case-sensitive values; leave blank for any. For values with line breaks, choose JSON strings and enter double-quoted values: "first\nsecond" for LF, \r for CR and \r\n for CRLF. Escape literal backslashes as \\ and quotes as \". Groups match IDs stored on the record, not all related sources. Rights notes are metadata, not permission decisions. Missing notes appear as unknown. Filtered results are dynamic; saved fixed membership and release selection stay separate.

Saved searches · dynamic results

Save the entered search and filters. Open explicitly to search the current collection; new matching records can appear. Fixed selections, editor drafts and review decisions stay separate. Up to 100 searches. Search text is single-line; exact metadata values may contain line breaks.

Saved fixed selections

Save the chosen records at their exact revisions. Searches and filters stay separate; saving or opening never approves annotations.

    Curation diagnostics

    Inspect current metadata in all applied collection results or exact selected IDs. Selection revision pairs stay fixed. Counts describe metadata, not permission or model quality. Missing sources means deleted source records; file integrity is checked during release.

    Refresh to inspect current metadata.

      diff --git a/static/workbench.js b/static/workbench.js index 640f5bdc..9e133481 100644 --- a/static/workbench.js +++ b/static/workbench.js @@ -6,7 +6,7 @@ let selectionEpoch = 0; let page = null, offset = 0, current = null, targets = [], dirty = false, queryEpoch = 0, editorEpoch = 0; function notice(message, error = false) { $('notice').textContent = message; $('notice').classList.toggle('error', error); } async function api(path, body) { - const response = await fetch(path.startsWith('/') ? path : '/api/workbench/' + path, body === undefined ? {} : {method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify(body)}); + const response = await (globalThis.TuldokAuth?.fetch || fetch)(path.startsWith('/') ? path : '/api/workbench/' + path, body === undefined ? {} : {method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify(body)}); const result = await response.json(); if (!response.ok) { const error=Error(result.error || 'Request failed.');error.status=response.status;throw error; } return result; diff --git a/static/workspace-projects.js b/static/workspace-projects.js index 587f4922..6d0bf8f0 100644 --- a/static/workspace-projects.js +++ b/static/workspace-projects.js @@ -7,7 +7,7 @@ window.WorkspaceProjects = function ({select, roots, announce, switchSource, con let entries=[], aliases=[], listGeneration=0, opening=false, openGeneration=0; const currentSource=()=>select.value; async function api(path, options={}) { - const response=await fetch('/api/workspace/projects'+path,options), value=await response.json(); + const response=await (globalThis.TuldokAuth?.fetch || fetch)('/api/workspace/projects'+path,options), value=await response.json(); if(!response.ok)throw Error(value.error||'Project inspection unavailable.'); return value; } diff --git a/static/workspace-real.js b/static/workspace-real.js index cf60c568..769b90c7 100644 --- a/static/workspace-real.js +++ b/static/workspace-real.js @@ -8,7 +8,7 @@ encoded = encodeURIComponent, terminal = new Set(["completed", "failed", "cancelled", "interrupted", "unknown"]); async function api(route, body) { - const response = await fetch("/api/workspace/" + route, body === undefined ? {} : { + const response = await (globalThis.TuldokAuth?.fetch || fetch)("/api/workspace/" + route, body === undefined ? {} : { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(body), }); const value = await response.json(); diff --git a/static/workspaces.html b/static/workspaces.html index af9bc12c..ab37757e 100644 --- a/static/workspaces.html +++ b/static/workspaces.html @@ -5,7 +5,7 @@ Tuldok · Dataset workspaces - +
      diff --git a/static/workspaces.js b/static/workspaces.js index 1d3846fc..5c8940d3 100644 --- a/static/workspaces.js +++ b/static/workspaces.js @@ -432,7 +432,7 @@ window.workspaceEscape = (value) => $("retry-load").hidden = true; $("workspace-error").hidden = true; try { - const response = await fetch("/workspace-fixtures.json"); + const response = await (globalThis.TuldokAuth?.fetch || fetch)("/workspace-fixtures.json"); if (!response.ok) throw Error("Fixture request failed (" + response.status + ")."); const data = await response.json(); diff --git a/synthetic.py b/synthetic.py index d521784c..33d552ab 100644 --- a/synthetic.py +++ b/synthetic.py @@ -1,5 +1,8 @@ """Persistent synthetic dataset jobs; one worker owns sequential Pumas requests.""" import json +import copy +import hashlib +from access import AccessError, authorized import threading import time import uuid @@ -104,12 +107,13 @@ def validate(body): class Jobs: def __init__(self, dataset): self.dataset = dataset + self.access = dataset.access self.lock = dataset.lock self.db = dataset.db self.worker = None self.stop = threading.Event() self.request_id = None - with self.lock, self.db.transaction(): + with self.access._reconcile(), self.lock, self.db.transaction(): self.runtime_owner = self.db.claim_runtime('generation_jobs') if not self.runtime_owner: return @@ -133,6 +137,7 @@ def __init__(self, dataset): self._entry(entry) job['error'] = 'Server stopped. Inspect retained attempts; uncertain image work cannot replay.' self._save(job) + self.access.audit('synthetic.reconcile', job['id'], {'status': job['status']}) def _jobs(self): return [json.loads(r[0]) for r in self.db.execute('SELECT data FROM generation_jobs ORDER BY ordinal')] @@ -165,6 +170,8 @@ def _normalize_saved(self, job): def record_output(self, sample_id, entry, job, metadata): """Called only inside Dataset.add's sample-insert transaction and lock.""" + self.access.require_job('synthetic', job['id'], job.get('admission_id'), self._request_digest(job)) + self.access.require('edit', 'dataset.add_generated', job['id']) previous_entry, previous_job = dict(entry), dict(job) def restore_progress(): @@ -180,10 +187,12 @@ def restore_progress(): job['completed'] += 1 self._save(job) + @authorized('inspect', 'synthetic.snapshot') def snapshot(self): with self.lock: return {'jobs': self._jobs(), 'entries': [json.loads(r[0]) for r in self.db.execute('SELECT data FROM generation_entries ORDER BY storage_order')]} + @authorized('execute', 'synthetic.start', owner_only=True) def start(self, body): # Validate everything before starting billable work or persisting a job. from app import metadata @@ -194,6 +203,7 @@ def start(self, body): with self.db.transaction(): self._idle() job = dict(id=uuid.uuid4().hex, config=config, meta=meta, status='preparing', error='', completed=0) + self._admit(job, 'synthetic.start') self._save(job) # Dispatch only after durable admission, including a successful commit. self._launch(job) @@ -207,6 +217,7 @@ def _idle(self): if any(job['status'] in ACTIVE for job in self._jobs()): raise ValueError('A generation job is already starting.') + @authorized('execute', 'synthetic.resume', owner_only=True) def resume(self, job_id): with self.lock: if self.db.in_transaction: @@ -220,13 +231,25 @@ def resume(self, job_id): if pumas.typed(job['config']) and any(e.get('provider_outcome') == 'unknown' for e in self._entries(job_id)): raise ValueError('An image attempt has an unknown provider outcome. Inspect it; this queue cannot replay it.') job.update(status='preparing', error='') + self._admit(job, 'synthetic.resume') self._save(job) self._launch(job) return job + @staticmethod + def _request_digest(job): + return hashlib.sha256(json.dumps({'config': job['config'], 'meta': job['meta']}, + sort_keys=True, separators=(',', ':'), allow_nan=False).encode()).hexdigest() + + def _admit(self, job, action): + job['request_digest'] = self._request_digest(job) + job['admission_id'] = self.access.admit_job('synthetic', job['id'], job['request_digest'], + {'dataset.add_generated': [job['id']], 'images.generate_admitted': [job['id']], 'synthetic.finish': [job['id']]}) + self.access.audit(action, job['id'], {'request_digest': job['request_digest']}) + def _launch(self, job): self.stop.clear() - self.worker = threading.Thread(target=self._run, args=(job,), daemon=True) + self.worker = threading.Thread(target=self._run, args=(copy.deepcopy(job),), daemon=True) try: self.worker.start() except RuntimeError: @@ -235,6 +258,7 @@ def _launch(self, job): job.update(status='failed', error='Could not start the generation worker; no inference ran. Resume explicitly.') self._save(job) + @authorized('cancel', 'synthetic.cancel') def cancel(self, job_id): with self.lock, self.db.transaction(): if not self.runtime_owner: @@ -245,6 +269,7 @@ def cancel(self, job_id): self.stop.set() job['status'] = 'stopping' self._save(job) + self.access.audit('synthetic.cancel', job_id) if self.request_id: self.dataset.image_requests.cancel(self.request_id) return {'cancelled': True} @@ -252,7 +277,8 @@ def cancel(self, job_id): def close(self): self.stop.set() if self.request_id: - self.dataset.image_requests.cancel(self.request_id) + with self.access._reconcile(): + self.dataset.image_requests.cancel(self.request_id) if self.worker: self.worker.join() @@ -261,6 +287,16 @@ def _check(self): raise ValueError('Generation stopped. Resume to continue.') def _run(self, job): + try: + with self.access._job('synthetic', job['id'], job.get('admission_id'), self._request_digest(job)): + self._run_admitted(job) + except AccessError: + with self.access._reconcile(), self.lock, self.db.transaction(): + job.update(status='interrupted', error='Job admission is missing or differs from the retained request; no inference started.') + self._save(job) + self.access.audit('synthetic.interrupt', job['id']) + + def _run_admitted(self, job): config = job['config'] try: with self.lock: @@ -317,7 +353,7 @@ def retain_admission(evidence): raise pumas.OperationError('Cancelled before image provider admission.') entry['attempt_evidence'] = evidence self._entry(entry) - result = self.dataset.image_requests.generate(body, cancel_event=self.stop, + result = self.dataset.image_requests._generate_admitted(body, job['id'], cancel_event=self.stop, **({'on_admission': retain_admission} if pumas.typed(config) else {})) # Queue link and sample insert commit together, including across restarts. with self.lock: @@ -346,6 +382,7 @@ def retain_admission(evidence): with self.lock, self.db.transaction(): self.request_id = None self._save(job) + self.access.audit('synthetic.finish', job['id'], {'status': job['status'], 'completed': job['completed']}) @staticmethod def _new_entry(job, ordinal, prompt): diff --git a/tests/auth_helpers.cjs b/tests/auth_helpers.cjs new file mode 100644 index 00000000..d5f79e97 --- /dev/null +++ b/tests/auth_helpers.cjs @@ -0,0 +1,39 @@ +// Explicit real authority fixtures. No server hooks, runtime test modes, or global fetch patch. +'use strict'; +const fs=require('node:fs'),path=require('node:path'),crypto=require('node:crypto'); +const {execFileSync}=require('node:child_process'); +function authenticatedFixture(){ + const sessions=new Map(); + async function register(origin,data,root){ + origin=new URL(origin).origin; + if(sessions.has(origin))return; + const file=path.join(path.dirname(data),'owner-login-'+crypto.randomUUID()+'.txt'); + let token; + try{ + execFileSync('python3',['access.py','login','--data',data,'--out',file],{cwd:root,stdio:['ignore','pipe','pipe']}); + token=fs.readFileSync(file,'utf8').trim(); + }finally{if(fs.existsSync(file))fs.unlinkSync(file);} + const response=await globalThis.fetch(origin+'/api/access/session',{method:'POST',redirect:'error',headers:{Origin:origin,'Content-Type':'application/json'},body:JSON.stringify({token})}); + token=null; + if(!response.ok)throw Error('Fixture owner session exchange failed: HTTP '+response.status); + const cookie=response.headers.get('set-cookie'); + if(!cookie||!cookie.toLowerCase().includes('httponly'))throw Error('Fixture login did not issue HttpOnly session cookie'); + const pair=cookie.split(';')[0],position=pair.indexOf('='); + sessions.set(origin,{name:pair.slice(0,position),value:pair.slice(position+1),cookie:pair}); + await response.json(); + } + async function fetch(input,options={}){ + const url=new URL(typeof input==='string'?input:input.url),session=sessions.get(url.origin); + if(!session||!(url.pathname.startsWith('/api/')))return globalThis.fetch(input,options); + const headers=new Headers(options.headers);headers.set('Cookie',session.cookie);headers.set('Origin',url.origin); + return globalThis.fetch(input,{...options,headers,redirect:'error'}); + } + async function browser(send,origin){ + origin=new URL(origin).origin;const session=sessions.get(origin); + if(!session)throw Error('Register explicit application credentials before browser navigation'); + const result=await send('Network.setCookie',{name:session.name,value:session.value,url:origin+'/',httpOnly:true,sameSite:'Strict',path:'/'}); + if(result.success===false)throw Error('Browser fixture session cookie refused'); + } + return {register,fetch,browser}; +} +module.exports={authenticatedFixture}; diff --git a/tests/auth_helpers.py b/tests/auth_helpers.py new file mode 100644 index 00000000..c940f47b --- /dev/null +++ b/tests/auth_helpers.py @@ -0,0 +1,53 @@ +"""Explicit test actors using production bootstrap, exchange, and token binding. + +No Dataset constructors or HTTP handlers are patched. Callers choose every owner +context and authenticated request; anonymous requests remain anonymous. +""" +from contextlib import contextmanager +from urllib.request import Request + + +class ExplicitOwnerFixture: + def __init__(self, catalog_id, token, identity): + self.catalog_id = catalog_id + self.token = token + self.identity = identity + + @classmethod + def bootstrap(cls, dataset): + result = dataset.access.exchange(dataset.access._local_owner_token()) + return cls(dataset.db.dataset_id, result['token'], result['identity']) + + @contextmanager + def bound(self, dataset): + if dataset.db.dataset_id != self.catalog_id: + raise ValueError('Owner fixture belongs to another catalog.') + with dataset.access.bind(self.token): + yield self + + @property + def headers(self): + return {'Authorization': 'Bearer ' + self.token} + + def request(self, url, data=None, headers=None, method=None): + return Request(url, data=data, headers={**self.headers, **(headers or {})}, method=method) + + +def bind_owner(testcase, dataset): + """Explicit setUp admission; reuse the credential for a reopened catalog.""" + owners = getattr(testcase, '_explicit_owner_fixtures', None) + if owners is None: + owners = testcase._explicit_owner_fixtures = {} + fixture = owners.get(dataset.db.dataset_id) + if fixture is None: + fixture = owners[dataset.db.dataset_id] = ExplicitOwnerFixture.bootstrap(dataset) + testcase.enterContext(fixture.bound(dataset)) + return fixture + + +def execute_admitted(dataset, run_id): + """Drive a queued test run using its unchanged real admission envelope.""" + with dataset.lock: + run = dataset.runs._load(run_id) + with dataset.access._job('runs', run_id, run['admission_id'], run['request_sha256']): + dataset.runs._execute(run_id) diff --git a/tests/browser.cjs b/tests/browser.cjs index 4259e8ba..75da59ce 100644 --- a/tests/browser.cjs +++ b/tests/browser.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -13,6 +16,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/opt/brave.com/brave/brave',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:'ignore'}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -36,6 +40,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) navigator.mediaDevices.enumerateDevices=async()=>[]; window.confirm=()=>true; `}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:'http://127.0.0.1:'+port}); await until(()=>evaluate('!!document.getElementById("capture-session")?.value && !document.getElementById("start-camera").disabled')); await fill('capture-book','atlas-01');await fill('capture-session','desk-daylight'); diff --git a/tests/browser_access.cjs b/tests/browser_access.cjs new file mode 100644 index 00000000..bae9bae2 --- /dev/null +++ b/tests/browser_access.cjs @@ -0,0 +1,53 @@ +// Actual CLI bootstrap, HttpOnly browser login, denied writes, and preserved drafts. +'use strict'; +const assert=require('node:assert/strict'),fs=require('node:fs'),path=require('node:path'),os=require('node:os'); +const {spawn,execFileSync}=require('node:child_process'); +const {authenticatedFixture}=require('./auth_helpers.cjs'); +const {waitForDebugger}=require('./browser_startup.cjs'); +const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); +const root=path.resolve(__dirname,'..'),temporary=fs.mkdtempSync(path.join(os.tmpdir(),'tuldok-access-browser-')),data=path.join(temporary,'data'); +const report=qaDirectory(root,'access'),children=[],errors=[],checks=[],fixture=authenticatedFixture(); +const pause=ms=>new Promise(resolve=>setTimeout(resolve,ms));let ws,send,evaluate; +async function until(fn){for(let n=0;n<200;n++){const value=await fn();if(value)return value;await pause(100);}throw Error('Access browser wait timed out');} +function launch(command,args,options){const child=spawn(command,args,options);children.push(child);return child;} +function code(){const file=path.join(temporary,'login-'+Date.now());execFileSync('python3',['access.py','login','--data',data,'--out',file],{cwd:root});const value=fs.readFileSync(file,'utf8').trim();fs.unlinkSync(file);return value;} +(async()=>{ + const server=launch('python3',['-u','app.py','--port','0','--data',data],{cwd:root,stdio:['ignore','pipe','pipe']});let output='',serverErrors='';server.stdout.on('data',chunk=>output+=chunk);server.stderr.on('data',chunk=>serverErrors+=chunk); + const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + assert.equal((await fetch(base+'/api/workbench/records')).status,401); + assert.equal((await fetch(base+'/api/samples',{method:'POST',headers:{'Content-Type':'application/json',Origin:base},body:'{}'})).status,401); + await fixture.register(base,data,root); + const response=await fixture.fetch(base+'/api/workbench/import',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({kind:'text',name:'Retained owner draft',text:'Original immutable source',groups:['auth-fixture'],rights:'Authored test fixture'})});assert.equal(response.status,201);const record=await response.json(); + const browser=launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--remote-debugging-port=0','--window-size=1280,900','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:'ignore'}); + const debug=await waitForDebugger(browser,path.join(temporary,'browser','DevToolsActivePort')),tabs=await(await fetch('http://127.0.0.1:'+debug+'/json')).json();ws=new WebSocket(tabs.find(tab=>tab.type==='page').webSocketDebuggerUrl);await new Promise((resolve,reject)=>{ws.onopen=resolve;ws.onerror=reject;}); + let counter=0;const pending=new Map();ws.onmessage=event=>{const value=JSON.parse(event.data);if(value.id){const task=pending.get(value.id);pending.delete(value.id);value.error?task.reject(value.error):task.resolve(value.result);}else if(value.method==='Runtime.exceptionThrown')errors.push(value.params.exceptionDetails.text);}; + send=(method,params={})=>new Promise((resolve,reject)=>{pending.set(++counter,{resolve,reject});ws.send(JSON.stringify({id:counter,method,params}));}); + evaluate=async expression=>{const value=await send('Runtime.evaluate',{expression,awaitPromise:true,returnByValue:true});if(value.exceptionDetails)throw Error(JSON.stringify(value.exceptionDetails));return value.result.value;}; + async function click(selector){const box=await evaluate(`(()=>{const el=document.querySelector(${JSON.stringify(selector)});el.scrollIntoView({block:'center'});const r=el.getBoundingClientRect();return {x:r.x+r.width/2,y:r.y+r.height/2}})()`);await send('Input.dispatchMouseEvent',{type:'mousePressed',button:'left',clickCount:1,...box});await send('Input.dispatchMouseEvent',{type:'mouseReleased',button:'left',clickCount:1,...box});} + async function fill(selector,value){await click(selector);await evaluate(`document.querySelector(${JSON.stringify(selector)}).select()`);await send('Input.insertText',{text:value});} + async function login(){const token=code();await fill('#session-token',token);await click('#session-submit');await until(()=>evaluate('!document.getElementById("session-dialog").open'));assert.equal(await evaluate('document.getElementById("session-token").value'),'');assert.equal(await evaluate('document.cookie.includes("tuldok_session")'),false);return token;} + await send('Page.enable');await send('Runtime.enable');await send('Network.enable'); + // No fixture cookie is installed: this suite exercises actual interactive login. + await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("session-dialog")?.open')); + const oneTime=await login();await until(()=>evaluate('document.getElementById("notice").textContent==="Collection ready."')); + assert.equal((await fetch(base+'/api/access/session',{method:'POST',headers:{Origin:base,'Content-Type':'application/json'},body:JSON.stringify({token:oneTime})})).status,401); + checks.push('Anonymous legacy/current APIs denied; real one-time login consumed; cookie is HttpOnly and code cleared'); + await click('#records .record button');await until(()=>evaluate('!document.getElementById("editor").hidden'));await fill('#label','retained-draft'); + const before=(await(await fixture.fetch(base+'/api/workbench/records/'+record.id)).json()).revision; + await click('#session-logout');await until(()=>evaluate('document.getElementById("session-dialog").open'));await click('#session-close'); + await evaluate('window.deniedWrites=0;const original=window.fetch;window.fetch=async(...args)=>{if(args[0]==="/api/workbench/records/'+record.id+'"&&args[1]?.method==="POST")window.deniedWrites++;return original(...args)}'); + await click('#save');await until(()=>evaluate('document.getElementById("session-dialog").open')); + assert.equal(await evaluate('document.getElementById("label").value'),'retained-draft');await login();await pause(150); + assert.equal((await(await fixture.fetch(base+'/api/workbench/records/'+record.id)).json()).revision,before); + assert.equal(await evaluate('document.getElementById("label").value'),'retained-draft'); + await click('#save');await until(async()=>((await(await fixture.fetch(base+'/api/workbench/records/'+record.id)).json()).revision)>before); + checks.push('Sign out and rejected mutation preserve draft; reauthentication does not replay mutation; deliberate retry commits'); + for(const [width,height] of [[1280,900],[390,844]]){await send('Emulation.setDeviceMetricsOverride',{width,height,deviceScaleFactor:1,mobile:false});await click('#session-open');await pause(100);const shot=await send('Page.captureScreenshot',screenshotOptions);fs.writeFileSync(path.join(report,'session-'+width+'.jpg'),Buffer.from(shot.data,'base64'));await click('#session-close');} + const issued=await fixture.fetch(base+'/api/access/credentials',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({label:'Scoped browser agent',scopes:['inspect','edit']})});assert.equal(issued.status,201);const agent=await issued.json(); + const cookies=await send('Network.getCookies',{urls:[base]});const sessionCookie=cookies.cookies.find(cookie=>cookie.httpOnly&&cookie.name==='tuldok_session');assert.ok(sessionCookie); + await send('Network.setCookie',{name:sessionCookie.name,value:agent.token,url:base+'/',httpOnly:true,sameSite:'Strict',path:'/'}); + await send('Page.reload');await until(()=>evaluate('document.getElementById("session-identity")?.textContent.includes("Scoped browser agent")'));await until(()=>evaluate('document.getElementById("notice").textContent==="Collection ready."'));await click('#records .record button');await until(()=>evaluate('!document.getElementById("editor").hidden')); + assert.equal(await evaluate('document.getElementById("record-review").disabled'),true); + checks.push('Real scoped agent identity cannot use owner human-review controls'); + assert.deepEqual(errors,[]);assert.equal(serverErrors,'');fs.writeFileSync(path.join(report,'receipt.json'),JSON.stringify({checks,anonymous_denied:true,real_cli_login:true,no_mutation_replay:true},null,2));console.log('PASS access browser '+report); +})().catch(error=>{console.error(error);process.exitCode=1;}).finally(()=>{ws?.close();for(const child of children)child.kill('SIGTERM');fs.rmSync(temporary,{recursive:true,force:true});}); diff --git a/tests/browser_bulk_import.cjs b/tests/browser_bulk_import.cjs index 42db01e4..046708a1 100644 --- a/tests/browser_bulk_import.cjs +++ b/tests/browser_bulk_import.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real manifest files, HTTP admission, cancellation, persistence and Chromium. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -16,6 +19,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>{if(process.env.BULK_BROWSER_DEBUG)process.stderr.write(data);}); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Keep this editor intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -37,6 +41,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); console.log('Bulk browser targets:',JSON.stringify(tabs.map(tab=>({type:tab.type,url:tab.url})))); console.log('Bulk browser version:',JSON.stringify(await send('Browser.getVersion'))); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); assert.ok(!(await send('Page.navigate',{url:base+'/workbench'})).errorText); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await evaluate('openRecord('+JSON.stringify(seed.id)+')'); diff --git a/tests/browser_caption_dataset_integration.cjs b/tests/browser_caption_dataset_integration.cjs index 6073c3e6..e4cd45ca 100644 --- a/tests/browser_caption_dataset_integration.cjs +++ b/tests/browser_caption_dataset_integration.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real manifest files, HTTP admission, cancellation, persistence and Chromium. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -14,6 +17,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>{if(process.env.BULK_BROWSER_DEBUG)process.stderr.write(data);}); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); @@ -34,6 +38,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); console.log('Caption integration browser targets:',JSON.stringify(tabs.map(tab=>({type:tab.type,url:tab.url})))); console.log('Caption integration browser version:',JSON.stringify(await send('Browser.getVersion'))); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); assert.ok(!(await send('Page.navigate',{url:base+'/workbench'})).errorText); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); diff --git a/tests/browser_caption_import.cjs b/tests/browser_caption_import.cjs index d48494e8..0ab7ce72 100644 --- a/tests/browser_caption_import.cjs +++ b/tests/browser_caption_import.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Authored native folder files -> actual HTTP/PostgreSQL -> draft/review -> browser ZIP download. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -18,6 +21,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>{if(process.env.CAPTION_IMPORT_DEBUG)process.stderr.write(data);}); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Keep this draft editor intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -37,6 +41,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); console.log('Caption import browser targets:',JSON.stringify(tabs.map(tab=>({type:tab.type,url:tab.url})))); console.log('Caption import browser version:',JSON.stringify(await send('Browser.getVersion'))); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); assert.ok(!(await send('Page.navigate',{url:base+'/workbench'})).errorText); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await evaluate('openRecord('+JSON.stringify(seed.id)+')'); @@ -94,6 +99,8 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const legacyServer=launch('python3',['-u','app.py','--port','0','--data',legacyData],{cwd:root,stdio:['ignore','pipe','pipe']}); let legacyOutput='';legacyServer.stdout.on('data',data=>legacyOutput+=data); const legacyPort=await until(()=>legacyOutput.match(/127\.0\.0\.1:(\d+)/)?.[1]),legacyBase='http://127.0.0.1:'+legacyPort; + await fixtureAuth.register(legacyBase,legacyData,root); + await fixtureAuth.browser(send,legacyBase); const priorFrame=(await send('Page.getFrameTree')).frameTree.frame; await send('Page.navigate',{url:legacyBase+'/workbench'});await until(()=>tracker.reloaded(priorFrame));await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); const alternate=python("import base64,io,sys; from PIL import Image,PngImagePlugin; out=io.BytesIO(); info=PngImagePlugin.PngInfo(); info.add_text('fixture','corner import after workbench opened'); image=Image.open(sys.argv[1]); image.save(out,'PNG',pnginfo=info); print(base64.b64encode(out.getvalue()).decode())",path.join(fixture,assets[0])).trim(); diff --git a/tests/browser_caption_proposals.cjs b/tests/browser_caption_proposals.cjs index ba7eeb47..c040c336 100644 --- a/tests/browser_caption_proposals.cjs +++ b/tests/browser_caption_proposals.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -16,6 +19,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_caption_proposals_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -42,6 +46,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const saved=await request('selections',{name:'Fixed caption set',items:rows.map(ref)}); const modelPort=output.match(/CAPTION_MODEL_PORT=(\d+)/)[1]; await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); await evaluate('refreshSavedSets('+JSON.stringify(saved.id)+')');await click('load-selection');await until(()=>evaluate('!savedLoadBusy && selected.size===3')); const fixed=await evaluate('releaseBody().items'); diff --git a/tests/browser_captions.cjs b/tests/browser_captions.cjs index d8abf9cb..00fd4a3c 100644 --- a/tests/browser_captions.cjs +++ b/tests/browser_captions.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -14,6 +17,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -30,6 +34,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const click=id=>evaluate('document.getElementById('+JSON.stringify(id)+').click()'); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); await send('Page.enable');await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:'http://127.0.0.1:'+port+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); await fill('count',5);await evaluate('document.getElementById("generate-form").requestSubmit()'); diff --git a/tests/browser_classification_preferences_integration.cjs b/tests/browser_classification_preferences_integration.cjs index 1f98a706..ca8f0c71 100644 --- a/tests/browser_classification_preferences_integration.cjs +++ b/tests/browser_classification_preferences_integration.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Combined native ownership checks; bounded synthetic HTTP, no real inference. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -18,6 +21,7 @@ const hash=file=>crypto.createHash('sha256').update(fs.readFileSync(file)).diges const record=(name,data)=>{evidence.steps.push({name,...data});fs.writeFileSync(path.join(report,'session.json'),JSON.stringify(evidence,null,2));}; const server=launch('python3',['-u','tests/browser_text_classification_proposals_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']});let output='';server.stdout.on('data',data=>output+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),modelPort=output.match(/CLASSIFICATION_MODEL_PORT=(\d+)/)[1],base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const count=async()=> (await(await fetch('http://127.0.0.1:'+modelPort+'/test/request-count')).json()).requests; const uid=()=>crypto.randomUUID().replaceAll('-',''); @@ -35,6 +39,7 @@ const hash=file=>crypto.createHash('sha256').update(fs.readFileSync(file)).diges const run=async expression=>{const result=await send('Runtime.evaluate',{expression,awaitPromise:true,returnByValue:true});if(result.exceptionDetails)throw Error(JSON.stringify(result.exceptionDetails));return result.result.value;}; const click=id=>run('document.getElementById('+JSON.stringify(id)+').click()'),fill=(id,value)=>run('(()=>{const input=document.getElementById('+JSON.stringify(id)+');input.value='+JSON.stringify(value)+';input.dispatchEvent(new Event("input",{bubbles:true}));input.dispatchEvent(new Event("change",{bubbles:true}));})()'),submit=id=>run('document.getElementById('+JSON.stringify(id)+').requestSubmit()'); inspect=()=>run('({current:current?.id,revision:current?.revision,notice:document.getElementById("notice").textContent,classification:textClassificationProposalBusy,classificationStatus:document.getElementById("text-classification-proposal-status").textContent,preferenceBusy,preferenceDirty,responseBusy,responseDirty,held:integrationBarrier,posts:integrationPosts})'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable');if(classScriptOverride)await send('Fetch.enable',{patterns:[{urlPattern:'*text-classification-proposals.js',requestStage:'Request'}]});await send('Page.navigate',{url:base+'/workbench'});await until(()=>run('document.getElementById("notice")?.textContent==="Collection ready."')); await run(String.raw`window.integrationFetch=window.fetch;window.integrationPosts=[];window.integrationResponses=[];window.integrationHold=null;window.integrationBarrier='';window.integrationHoldPreferenceGets=false;window.integrationHeldGets=[];window.integrationLoseApply=false;window.integrationLoseAdmission=false;window.fetch=async(...args)=>{const route=String(args[0]),method=args[1]?.method||'GET';if(method==='POST')integrationPosts.push({route,body:JSON.parse(args[1].body)});const held=integrationHold&&integrationHold.route===route&&integrationHold.method===method?{...integrationHold}:null;if(held&&held.phase==='before'){integrationBarrier='before';await new Promise(resolve=>window.integrationRelease=resolve);}const response=await integrationFetch(...args);if(method==='POST')integrationResponses.push({route,status:response.status,body:await response.clone().json()});if(held&&held.phase==='after'){integrationBarrier='after';await new Promise(resolve=>window.integrationRelease=resolve);}if(method==='POST'&&integrationLoseApply&&route.includes('/text-classification-proposals/decide/')){integrationLoseApply=false;throw Error('Synthetic combined lost Apply acknowledgment');}if(method==='POST'&&integrationLoseAdmission&&route==='/api/workbench/text-classification-proposals'){integrationLoseAdmission=false;throw Error('Synthetic combined lost admission acknowledgment');}if(method==='GET'&&integrationHoldPreferenceGets&&route.endsWith('/preferences'))await new Promise(resolve=>integrationHeldGets.push(resolve));return response;};window.integrationReleaseGets=()=>{integrationHoldPreferenceGets=false;for(const release of integrationHeldGets.splice(0))release();};`); if(evidence.negative_apply_hook)await run('window.integrationOriginalInvalidate=invalidatePreferencePreview;invalidatePreferencePreview=function(){if(new Error().stack.includes("decideTextClassificationProposal"))return;integrationOriginalInvalidate();};'); diff --git a/tests/browser_combined_workbench.cjs b/tests/browser_combined_workbench.cjs index 6a428baf..97af8c46 100644 --- a/tests/browser_combined_workbench.cjs +++ b/tests/browser_combined_workbench.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real composed controls, delayed actual HTTP, fixed pairs and both downloaded formats. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -15,6 +18,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>{if(process.env.NATIVE_TEXT_BROWSER_DEBUG)process.stderr.write(data);}); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Keep this editor intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); const browser=launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -51,6 +55,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg }} const answerPairs=()=>evaluate('JSON.stringify(responseReleaseBody().items)'),recordPairs=()=>evaluate('JSON.stringify(releaseBody().items)'); const respond=async completion=>{await click('response-new');await fill('response-entry-format','json');await fill('response-completion',JSON.stringify(completion));await fill('response-review','human_reviewed');await evaluate('document.getElementById("response-form").requestSubmit()');await until(()=>evaluate('!responseBusy&&!responseDirty&&!responseListBusy'));}; + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await evaluate('openRecord('+JSON.stringify(seed.id)+')');await until(()=>evaluate('!responseListBusy && !!responseParent')); await respond(' exact answer\r\ne\u0301 😀\ufeff '+'x'.repeat(1100));await respond('Independent reviewed answer'); diff --git a/tests/browser_curation.cjs b/tests/browser_curation.cjs index 95d1794a..9aa92247 100644 --- a/tests/browser_curation.cjs +++ b/tests/browser_curation.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -14,6 +17,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_curation_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -41,6 +45,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) return request('records/'+row.id,{...row,task,annotation,review:'human_reviewed'}); } await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); const all=(await request('records?limit=100')).items,find=name=>all.find(r=>r.name===name); const first=find('Fictional 00'),second=find('Fictional 01'),a=find('Duplicate A'),b=find('Duplicate B'),deleted=all.find(r=>!r.source_available); diff --git a/tests/browser_curation_server.py b/tests/browser_curation_server.py index be78f0a0..b850a1bb 100644 --- a/tests/browser_curation_server.py +++ b/tests/browser_curation_server.py @@ -1,4 +1,5 @@ """Authored local fixtures for exact current metadata diagnostics; no model calls.""" +from auth_helpers import ExplicitOwnerFixture import argparse import base64 import io @@ -10,15 +11,16 @@ import app parser=argparse.ArgumentParser(add_help=False);parser.add_argument('--data',required=True) args,_=parser.parse_known_args();dataset=app.Dataset(args.data);w=dataset.workbench -try: - for i in range(41): - w.import_asset(dict(kind='text',name=f'Fictional {i:02}',text=f'Authored fictional source {i}',groups=['fictional'],rights='unknown')) - negative=w.import_asset(dict(kind='text',name='Reviewed negative',text='Fictional negative statement',groups=['negative'],rights='Authored fixture')) - w.save(negative['id'],dict(negative,task='text_entities',annotation={'spans':[]},review='human_reviewed')) - for name in ['Duplicate A','Duplicate B','Deleted source']: - out=io.BytesIO();info=PngImagePlugin.PngInfo();info.add_text('fixture',name) - Image.new('RGB',(16,16),'red' if name.startswith('Duplicate') else 'blue').save(out,'PNG',pnginfo=info) - row=w.import_asset(dict(kind='image',name=name,image=base64.b64encode(out.getvalue()).decode(),groups=['images'],rights='unknown')) - if name=='Deleted source': dataset.delete(row['id'],{'revision':row['source_revision']}) -finally:dataset.close() +with ExplicitOwnerFixture.bootstrap(dataset).bound(dataset): + try: + for i in range(41): + w.import_asset(dict(kind='text',name=f'Fictional {i:02}',text=f'Authored fictional source {i}',groups=['fictional'],rights='unknown')) + negative=w.import_asset(dict(kind='text',name='Reviewed negative',text='Fictional negative statement',groups=['negative'],rights='Authored fixture')) + w.save(negative['id'],dict(negative,task='text_entities',annotation={'spans':[]},review='human_reviewed')) + for name in ['Duplicate A','Duplicate B','Deleted source']: + out=io.BytesIO();info=PngImagePlugin.PngInfo();info.add_text('fixture',name) + Image.new('RGB',(16,16),'red' if name.startswith('Duplicate') else 'blue').save(out,'PNG',pnginfo=info) + row=w.import_asset(dict(kind='image',name=name,image=base64.b64encode(out.getvalue()).decode(),groups=['images'],rights='unknown')) + if name=='Deleted source': dataset.delete(row['id'],{'revision':row['source_revision']}) + finally:dataset.close() app.main() diff --git a/tests/browser_dataset_integration.cjs b/tests/browser_dataset_integration.cjs index 7c0c9cc1..11f4e0db 100644 --- a/tests/browser_dataset_integration.cjs +++ b/tests/browser_dataset_integration.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real manifest files, HTTP admission, cancellation, persistence and Chromium. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -16,6 +19,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>{if(process.env.BULK_BROWSER_DEBUG)process.stderr.write(data);}); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Keep this editor intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -37,6 +41,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); console.log('Integration browser targets:',JSON.stringify(tabs.map(tab=>({type:tab.type,url:tab.url})))); console.log('Integration browser version:',JSON.stringify(await send('Browser.getVersion'))); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); assert.ok(!(await send('Page.navigate',{url:base+'/workbench'})).errorText); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); diff --git a/tests/browser_grounded.cjs b/tests/browser_grounded.cjs index 99d9410c..35cc24a9 100644 --- a/tests/browser_grounded.cjs +++ b/tests/browser_grounded.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -15,6 +18,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_grounded_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -31,6 +35,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const click=id=>evaluate('document.getElementById('+JSON.stringify(id)+').click()'); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:'http://127.0.0.1:'+port+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); await fill('import-name','Cancellation source');await fill('import-group','source-family');await fill('import-text','Cancel the café meeting 😀.'); diff --git a/tests/browser_image_classification_export.cjs b/tests/browser_image_classification_export.cjs index b34193fb..fea78a46 100644 --- a/tests/browser_image_classification_export.cjs +++ b/tests/browser_image_classification_export.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native Chromium gate: real local HTTP service, immutable download, no inference. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); @@ -17,6 +20,7 @@ let ws,evaluate; let stdout='',stderr='';server.stdout.on('data',data=>stdout+=data);server.stderr.on('data',data=>stderr+=data); await until(()=>{if(server.exitCode!==null)throw Error(stderr);return /127\.0\.0\.1:(\d+)/.test(stdout);}); const url='http://127.0.0.1:'+stdout.match(/127\.0\.0\.1:(\d+)/)[1]; + await fixtureAuth.register(url,path.join(temporary,'data'),root); const browser=launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','pipe'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); let browserStderr='';browser.stderr.on('data',data=>browserStderr+=data); const port=await waitForDebugger(browser,path.join(temporary,'browser','DevToolsActivePort')).catch(error=>{throw Error(error.message+'\n'+browserStderr);}); @@ -31,6 +35,7 @@ let ws,evaluate; const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); const preview=async()=>{await click('preview-release');await until(()=>evaluate('!releaseBusy'));}; await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,url); await send('Page.navigate',{url:url+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await click('select-page'); diff --git a/tests/browser_image_classification_server.py b/tests/browser_image_classification_server.py index 59a640ae..4cfa10d1 100644 --- a/tests/browser_image_classification_server.py +++ b/tests/browser_image_classification_server.py @@ -1,4 +1,5 @@ """Local seeded service for the classifier export browser gate.""" +from auth_helpers import ExplicitOwnerFixture from pathlib import Path import sys sys.path.insert(0, str(Path(__file__).resolve().parents[1])) @@ -9,8 +10,9 @@ if __name__ == '__main__': folder = sys.argv[sys.argv.index('--data') + 1] dataset = Dataset(folder) - try: - populate(dataset) - finally: - dataset.close() + with ExplicitOwnerFixture.bootstrap(dataset).bound(dataset): + try: + populate(dataset) + finally: + dataset.close() main() diff --git a/tests/browser_images.cjs b/tests/browser_images.cjs index 05a4b342..a0ac16f0 100644 --- a/tests/browser_images.cjs +++ b/tests/browser_images.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real browser and Tuldok HTTP workflow against a controlled image gateway. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -14,6 +17,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_images_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/Tuldok: http:\/\/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const gateway=await until(()=>output.match(/FIXTURE_IMAGE_URL=(\S+)/)?.[1]); launch(process.env.BROWSER||'/opt/brave.com/brave/brave',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:'ignore'}); const active=path.join(temporary,'browser','DevToolsActivePort'); @@ -34,6 +38,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) console.log('Browser version:',JSON.stringify(await send('Browser.getVersion'))); const downloads=path.join(temporary,'downloads');fs.mkdirSync(downloads); await send('Browser.setDownloadBehavior',{behavior:'allow',downloadPath:downloads}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); const navigation=await send('Page.navigate',{url:'http://127.0.0.1:'+port}); assert.equal(navigation.errorText,undefined,'Navigate to the real Tuldok fixture'); await until(()=>evaluate('!!document.getElementById("capture-session")?.value&&!document.getElementById("generation-view").disabled')); diff --git a/tests/browser_images_real.cjs b/tests/browser_images_real.cjs index 9d3e7d66..c6e8d0f0 100644 --- a/tests/browser_images_real.cjs +++ b/tests/browser_images_real.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Explicit real-model acceptance: PUMAS_GATEWAY, PUMAS_MODEL and TULDOK_EVIDENCE_DIR are required. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -15,6 +18,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/Tuldok: http:\/\/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/opt/brave.com/brave/brave',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:'ignore'}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -29,6 +33,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) await send('Page.enable');await send('Runtime.enable'); const downloads=path.join(temporary,'downloads');fs.mkdirSync(downloads); await send('Browser.setDownloadBehavior',{behavior:'allow',downloadPath:downloads}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:'http://127.0.0.1:'+port}); await until(()=>evaluate('!!document.getElementById("capture-session")?.value&&!document.getElementById("generation-view").disabled')); await click('generation-view'); diff --git a/tests/browser_instruction_responses.cjs b/tests/browser_instruction_responses.cjs index 389d6fb6..aa03c8cc 100644 --- a/tests/browser_instruction_responses.cjs +++ b/tests/browser_instruction_responses.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real manifest files, HTTP admission, cancellation, persistence and Chromium. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -14,6 +17,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>{if(process.env.BULK_BROWSER_DEBUG)process.stderr.write(data);}); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); @@ -30,6 +34,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); console.log('Instruction browser targets:',JSON.stringify(tabs.map(tab=>({type:tab.type,url:tab.url})))); console.log('Instruction browser version:',JSON.stringify(await send('Browser.getVersion'))); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); assert.ok(!(await send('Page.navigate',{url:base+'/workbench'})).errorText); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); diff --git a/tests/browser_meshes.cjs b/tests/browser_meshes.cjs index 27c75826..26d52fbb 100644 --- a/tests/browser_meshes.cjs +++ b/tests/browser_meshes.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Actual authored PLY files; real loopback HTTP and Chromium, JPEG85 output only. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); @@ -14,6 +17,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',serverErrors='';server.stdout.on('data',chunk=>output+=chunk);server.stderr.on('data',chunk=>serverErrors+=chunk); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Independent editor stays intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','ignore'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -27,6 +31,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const fill=(id,value)=>evaluate(`(()=>{const e=document.getElementById(${JSON.stringify(id)});e.value=${JSON.stringify(value)};e.dispatchEvent(new Event('input',{bubbles:true}));e.dispatchEvent(new Event('change',{bubbles:true}));})()`); const choose=(id,name,raw)=>evaluate(`(()=>{const raw=Uint8Array.from(atob(${JSON.stringify(raw.toString('base64'))}),c=>c.charCodeAt(0)),dt=new DataTransfer();dt.items.add(new File([raw],${JSON.stringify(name)}));document.getElementById(${JSON.stringify(id)}).files=dt.files;})()`); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await evaluate('openRecord('+JSON.stringify(seed.id)+')');await fill('label','retain unsaved target'); await evaluate('document.querySelector(".record input").click();document.getElementById("mesh-import-panel").open=true'); diff --git a/tests/browser_metadata_filters.cjs b/tests/browser_metadata_filters.cjs index 24cd8d72..d5895c26 100644 --- a/tests/browser_metadata_filters.cjs +++ b/tests/browser_metadata_filters.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -14,6 +17,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_metadata_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -49,6 +53,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const endingRows=[]; for(let i=0;ievaluate('document.getElementById("notice")?.textContent === "Collection ready."')); const detection=await image('Detection source','red','image_detection',{boxes:[{label,x:0,y:0,width:4,height:4}]},['source-a-extra'],'UNKNOWN'); await image('Caption source','blue','image_caption',{caption:'A vehicle & café in a caption.'},['caption'],'unknown'); diff --git a/tests/browser_metadata_server.py b/tests/browser_metadata_server.py index 0729e13d..f468a8e0 100644 --- a/tests/browser_metadata_server.py +++ b/tests/browser_metadata_server.py @@ -1,4 +1,5 @@ """Local retained-metadata fixtures; no provider, external dataset or permission judgment.""" +from auth_helpers import ExplicitOwnerFixture import argparse import sys from pathlib import Path @@ -11,13 +12,14 @@ parser.add_argument('--data', required=True) args, _ = parser.parse_known_args() dataset = app.Dataset(args.data) -try: - for name, note in [('legacy-missing-note', {}), ('legacy-null-note', {'rights': None})]: - row = dataset.workbench.import_asset({'kind': 'text', 'name': name, 'text': 'Local retained fixture '+name, - 'groups': ['legacy-source']}) - origin = dict(row['provenance']); origin.pop('rights'); origin.update(note) - with dataset.lock, dataset.db.transaction(): - dataset.db.execute('UPDATE workbench_records SET provenance_json=%s WHERE id=%s', (encode(origin), row['id'])) -finally: - dataset.close() +with ExplicitOwnerFixture.bootstrap(dataset).bound(dataset): + try: + for name, note in [('legacy-missing-note', {}), ('legacy-null-note', {'rights': None})]: + row = dataset.workbench.import_asset({'kind': 'text', 'name': name, 'text': 'Local retained fixture '+name, + 'groups': ['legacy-source']}) + origin = dict(row['provenance']); origin.pop('rights'); origin.update(note) + with dataset.lock, dataset.db.transaction(): + dataset.db.execute('UPDATE workbench_records SET provenance_json=%s WHERE id=%s', (encode(origin), row['id'])) + finally: + dataset.close() app.main() diff --git a/tests/browser_native_detection_import.cjs b/tests/browser_native_detection_import.cjs index 4dcae988..67d60343 100644 --- a/tests/browser_native_detection_import.cjs +++ b/tests/browser_native_detection_import.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real manifest files, HTTP admission, cancellation, persistence and Chromium. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -16,6 +19,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>{if(process.env.NATIVE_DETECTION_BROWSER_DEBUG)process.stderr.write(data);}); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Keep this editor intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -36,6 +40,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const idle=()=>until(()=>evaluate('!detectionRunning')); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); console.log('Native browser stage: navigation'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await evaluate('document.getElementById("native-detection-import-panel").open=true'); diff --git a/tests/browser_native_text_import.cjs b/tests/browser_native_text_import.cjs index dcd232f8..251d70ca 100644 --- a/tests/browser_native_text_import.cjs +++ b/tests/browser_native_text_import.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real manifest files, HTTP admission, cancellation, persistence and Chromium. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -15,6 +18,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>{if(process.env.NATIVE_TEXT_BROWSER_DEBUG)process.stderr.write(data);}); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Keep this editor intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -35,6 +39,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const idle=()=>until(()=>evaluate('!document.getElementById("native-text-start").disabled')); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); console.log('Native browser stage: navigation'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await evaluate('document.getElementById("native-text-import-panel").open=true'); diff --git a/tests/browser_preferences.cjs b/tests/browser_preferences.cjs index ec8eb490..f51735c7 100644 --- a/tests/browser_preferences.cjs +++ b/tests/browser_preferences.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real manifest files, HTTP admission, cancellation, persistence and Chromium. 'use strict'; const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); @@ -14,6 +17,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>{if(process.env.BULK_BROWSER_DEBUG)process.stderr.write(data);}); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); @@ -30,6 +34,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); console.log('Preference browser targets:',JSON.stringify(tabs.map(tab=>({type:tab.type,url:tab.url})))); console.log('Preference browser version:',JSON.stringify(await send('Browser.getVersion'))); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); assert.ok(!(await send('Page.navigate',{url:base+'/workbench'})).errorText); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); diff --git a/tests/browser_pumas_gateways.cjs b/tests/browser_pumas_gateways.cjs index 8b5e8949..b9a4618f 100644 --- a/tests/browser_pumas_gateways.cjs +++ b/tests/browser_pumas_gateways.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Source-derived pinned PR51 payload; production decoder/routes and real Chromium, no Pumas inference. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); @@ -12,6 +15,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_pumas_gateways_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',serverErrors='';server.stdout.on('data',chunk=>output+=chunk);server.stderr.on('data',chunk=>serverErrors+=chunk); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Independent editor stays intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); const gatewayPort=await until(()=>output.match(/FIXTURE_PUMAS_PORT=(\d+)/)?.[1]),gateway='http://127.0.0.1:'+gatewayPort; @@ -30,6 +34,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const idle=()=>until(()=>evaluate('!document.getElementById("pumas-gateway-scan").disabled')); const before=await api('records/'+seed.id),history=await api('history/'+seed.id); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await evaluate('openRecord('+JSON.stringify(seed.id)+')');await fill('label','retain unsaved target'); await evaluate('document.querySelector(".record input").click();document.getElementById("pumas-gateway-panel").open=true'); diff --git a/tests/browser_pumas_typed.cjs b/tests/browser_pumas_typed.cjs index ae76a06a..29683ebb 100644 --- a/tests/browser_pumas_typed.cjs +++ b/tests/browser_pumas_typed.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -17,6 +20,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_pumas_typed_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/Tuldok: http:\/\/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -46,6 +50,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const source=await makeText('Typed source','The meeting is confirmed.'); const fixed=await request('selections',{name:'Typed fixed set',items:[ref(source)]}); await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); await evaluate('refreshSavedSets('+JSON.stringify(fixed.id)+')');await click('load-selection');await until(()=>evaluate('!savedLoadBusy && selected.size===1')); const selectedBefore=await evaluate('releaseBody().items'); @@ -89,7 +94,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) let row=await request('records/'+source.id);assert.equal(row.target_proposal.capability_observation.capabilities.profile,'controlled-text-cpu'); const reviewed=await request('records/'+source.id,{revision:row.revision,source_revision:row.source_revision,task:'text_classification',annotation:row.annotation,groups:row.groups,review:'human_reviewed'}); await evaluate('openRecord('+JSON.stringify(source.id)+')'); - await fetch(base+'/test/pumas-control',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({content:JSON.stringify({candidates:[{text:'The confirmed meeting will take place.',label:'positive',evidence:[{start:0,end:25,quote:source.text}]}]})})}); + await fetch(base+'/api/test/pumas-control',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({content:JSON.stringify({candidates:[{text:'The confirmed meeting will take place.',label:'positive',evidence:[{start:0,end:25,quote:source.text}]}]})})}); await fill('grounded-protocol','pumas_typed_v1');await fill('grounded-url',gateway);await click('grounded-models');await until(()=>evaluate('document.getElementById("grounded-model").options.length===2')); await fill('grounded-model','controlled-text');await fill('grounded-count','1');await fill('grounded-instruction','Rewrite clearly.'); await evaluate('document.getElementById("grounded-form").requestSubmit()'); @@ -126,7 +131,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const visionApplied=await until(async()=>{const row=await request('records/'+visionSource.id);return row.annotation?.caption==='A blue rectangle.'&&row;}); assert.equal(visionApplied.review,'draft');assert.equal(visionApplied.target_proposal.producer_contract_source,JSON.parse(fs.readFileSync(path.join(root,'tests/fixtures/pumas-image-to-text-v1/source.json'),'utf8')).producer_commit); assert.deepEqual(visionApplied.groups,visionSource.groups); - await fetch(base+'/test/pumas-vision',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({mode:'loss'})}); + await fetch(base+'/api/test/pumas-vision',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({mode:'loss'})}); await evaluate('openRecord('+JSON.stringify(visionApplied.id)+')'); await until(()=>evaluate('current?.revision === '+visionApplied.revision)); const visionRace=await evaluate('({busy:captionProposalBusy,revision:current.revision,validForm:document.getElementById("caption-proposal-form").checkValidity()})'); @@ -146,7 +151,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const visionLost=await until(async()=> (await request('caption-proposals')).jobs.find(j=>j.id===visionLossRequest.request_id && j.status==='failed')); assert.equal(visionLost.provider_outcome,'unknown'); await click('caption-proposal-refresh');await pause(150); - const visionControl=await(await fetch(base+'/test/pumas-vision',{method:'POST',headers:{'Content-Type':'application/json'},body:'{}'})).json(); + const visionControl=await(await fetch(base+'/api/test/pumas-vision',{method:'POST',headers:{'Content-Type':'application/json'},body:'{}'})).json(); assert.equal(visionControl.requests.length,2,'Refreshing an unknown outcome never replays inference'); assert.equal(await evaluate('visionAdmissionRequests.length'),1,'Only the ready physical click admits the second request'); await evaluate('window.fetch=visionApplyFetch'); diff --git a/tests/browser_pumas_typed_server.py b/tests/browser_pumas_typed_server.py index af8cfd96..8f1152d0 100644 --- a/tests/browser_pumas_typed_server.py +++ b/tests/browser_pumas_typed_server.py @@ -25,14 +25,14 @@ def configure(value):state['content']=value['content'];state['mode']='success' def make_handler(dataset): class Handler(original(dataset)): - def do_POST(self): - if self.path=='/test/pumas-control': + def _post(self): + if self.path=='/api/test/pumas-control': body=json.loads(self.rfile.read(int(self.headers['Content-Length'])));configure(body);return self.reply({'configured':True}) - if self.path=='/test/pumas-vision': + if self.path=='/api/test/pumas-vision': body=json.loads(self.rfile.read(int(self.headers['Content-Length']))) vision_state.update(mode=body.get('mode','success')) return self.reply({'configured':True,'requests':vision_state['requests']}) - return super().do_POST() + return super()._post() return Handler app.make_handler=make_handler print('TYPED_GATEWAY='+url,flush=True);print('TYPED_ORIGIN='+origin,flush=True) diff --git a/tests/browser_release_preview.cjs b/tests/browser_release_preview.cjs index 79bf6632..eafc848e 100644 --- a/tests/browser_release_preview.cjs +++ b/tests/browser_release_preview.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -13,6 +16,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -29,6 +33,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const click=id=>evaluate('document.getElementById('+JSON.stringify(id)+').click()'); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); await send('Page.enable');await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:'http://127.0.0.1:'+port+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); await fill('recipe','intent-requests-v1');await fill('count',6); diff --git a/tests/browser_rights_note.cjs b/tests/browser_rights_note.cjs index 8dd81b84..4296c4bc 100644 --- a/tests/browser_rights_note.cjs +++ b/tests/browser_rights_note.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -15,6 +18,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -47,6 +51,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const sibling=await request('import',{kind:'text',name:'Related context',text:'Fictional related context',groups:['rights-family'],rights:'unknown'}); const saved=await request('selections',{name:'Fixed rights set',items:[ref(row)]}); await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); await evaluate('refreshSavedSets('+JSON.stringify(saved.id)+')');await click('load-selection');await until(()=>evaluate('!savedLoadBusy && selected.size===1')); const fixed=await evaluate('releaseBody().items'); diff --git a/tests/browser_saved_searches.cjs b/tests/browser_saved_searches.cjs index e7b5cf66..fb64a638 100644 --- a/tests/browser_saved_searches.cjs +++ b/tests/browser_saved_searches.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -16,6 +19,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -32,6 +36,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const click=id=>evaluate('document.getElementById('+JSON.stringify(id)+').click()'); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:'http://127.0.0.1:'+port+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); const base='http://127.0.0.1:'+port; diff --git a/tests/browser_saved_selection_intent.cjs b/tests/browser_saved_selection_intent.cjs index 7ded6683..85b7993c 100644 --- a/tests/browser_saved_selection_intent.cjs +++ b/tests/browser_saved_selection_intent.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -14,6 +17,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -48,6 +52,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) try{const response=await original(...args);if(initial)await new Promise(resolve=>window.releaseInitialListing=resolve);return response;} finally{window.transportPending--;}}; })()`}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench#selection='+saved.id}); await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready." && typeof window.releaseInitialListing === "function"')); await verify('initial list cannot override newer manual selection',async()=>{ diff --git a/tests/browser_saved_selections.cjs b/tests/browser_saved_selections.cjs index 8c351d2a..cb38ba33 100644 --- a/tests/browser_saved_selections.cjs +++ b/tests/browser_saved_selections.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -14,6 +17,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -30,6 +34,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const click=id=>evaluate('document.getElementById('+JSON.stringify(id)+').click()'); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:'http://127.0.0.1:'+port+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); const submit=id=>evaluate('document.getElementById('+JSON.stringify(id)+').requestSubmit()'); diff --git a/tests/browser_scientific_fields.cjs b/tests/browser_scientific_fields.cjs index 5e34c68c..bd9a3c63 100644 --- a/tests/browser_scientific_fields.cjs +++ b/tests/browser_scientific_fields.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real project import and scientific inspection/review/freeze, with independent NumPy cold custody. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'),crypto=require('node:crypto'); @@ -25,6 +28,7 @@ const serverArgs=port=>['-u','app.py','--port',String(port),'--data',path.join(t let output='';server.stdout.on('data',chunk=>output+=chunk);server.stderr.on('data',chunk=>serverErrors+=chunk); const port=await until(()=>{if(server.exitCode!==null)throw Error('Project server exited: '+serverErrors);return output.match(/127\.0\.0\.1:(\d+)/)?.[1];}); const base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser=launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1440,900','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','ignore'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const debugPort=await waitForDebugger(browser,path.join(temporary,'browser','DevToolsActivePort')); const tabs=await(await fetch('http://127.0.0.1:'+debugPort+'/json')).json(),target=tabs.find(tab=>tab.type==='page'&&tab.url==='about:blank');assert.ok(target); @@ -55,6 +59,7 @@ const serverArgs=port=>['-u','app.py','--port',String(port),'--data',path.join(t async function openProject(manifest,name,id){await click('#open-project');await until(()=>evaluate('document.getElementById("project-open-dialog").open && !document.getElementById("project-open-submit").disabled'));await select('#project-root','sample');await fill('#project-manifest',manifest);await evaluate('document.getElementById("project-open-submit").focus()');await key('Enter');await until(()=>evaluate('document.getElementById("dataset").value==='+JSON.stringify('project:'+id)));await nav('data');assert.match(await text('#project-data-root'),new RegExp(name.replace(/[.*+?^${}()|[\]\\]/g,'\\$&')));} await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable');await send('Network.enable'); const offlineCanary=process.env.LD_PRELOAD?JSON.parse(execFileSync('python3',['-c',"import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"],{cwd:root,encoding:'utf8'})):null; + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workspaces'});await until(()=>evaluate('!!document.getElementById("open-project")')); await openProject('tuldok.project.json',first.name,first.id); assert.equal((await(await fetch(base+'/api/workbench/records')).json()).items.length,0,'Opening does not import'); diff --git a/tests/browser_sequence_batch.cjs b/tests/browser_sequence_batch.cjs index 2873ab28..8bb599b8 100644 --- a/tests/browser_sequence_batch.cjs +++ b/tests/browser_sequence_batch.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Frozen actual fee7b4a + explicitly source-derived fixtures; real HTTP and Chromium. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); @@ -16,6 +19,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',chunk=>output+=chunk); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Independent editor stays intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','ignore'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -30,6 +34,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const fill=(id,value)=>evaluate(`(()=>{const e=document.getElementById(${JSON.stringify(id)});e.value=${JSON.stringify(value)};e.dispatchEvent(new Event('input',{bubbles:true}));e.dispatchEvent(new Event('change',{bubbles:true}));})()`); const choose=(id,name,contents)=>evaluate(`(()=>{const raw=Uint8Array.from(atob(${JSON.stringify((contents||fs.readFileSync(path.join(temporary,name))).toString('base64'))}),c=>c.charCodeAt(0)),dt=new DataTransfer();dt.items.add(new File([raw],${JSON.stringify(name)}));document.getElementById(${JSON.stringify(id)}).files=dt.files;})()`); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); const actual=path.join(root,'tests/fixtures/rheon_actual_fee7b4a'); const source=(label,origin=temporary,changes={})=>{ diff --git a/tests/browser_sequences.cjs b/tests/browser_sequences.cjs index c98af617..ffb04388 100644 --- a/tests/browser_sequences.cjs +++ b/tests/browser_sequences.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Source-derived synthetic producer fixture; real loopback HTTP and Chromium. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); @@ -16,6 +19,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',chunk=>output+=chunk); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Independent editor stays intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','ignore'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -30,6 +34,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const fill=(id,value)=>evaluate(`(()=>{const e=document.getElementById(${JSON.stringify(id)});e.value=${JSON.stringify(value)};e.dispatchEvent(new Event('input',{bubbles:true}));e.dispatchEvent(new Event('change',{bubbles:true}));})()`); const choose=(id,name,contents)=>evaluate(`(()=>{const raw=Uint8Array.from(atob(${JSON.stringify((contents||fs.readFileSync(path.join(temporary,name))).toString('base64'))}),c=>c.charCodeAt(0)),dt=new DataTransfer();dt.items.add(new File([raw],${JSON.stringify(name)}));document.getElementById(${JSON.stringify(id)}).files=dt.files;})()`); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await evaluate('openRecord('+JSON.stringify(seed.id)+')');await fill('label','retain unsaved target'); await evaluate('document.querySelector(".record input").click();document.getElementById("sequence-import-panel").open=true'); diff --git a/tests/browser_sequences_actual.cjs b/tests/browser_sequences_actual.cjs index b1e6b869..1ec919ae 100644 --- a/tests/browser_sequences_actual.cjs +++ b/tests/browser_sequences_actual.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Recorded actual producer bytes. Never invokes an exporter or a simulation. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'),crypto=require('node:crypto'); @@ -27,6 +30,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',chunk=>output+=chunk); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const request=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});return {status:response.status,result:await response.json()};}; const api=async(route,body)=>{const response=await request(route,body);assert.ok(response.status<300,JSON.stringify(response));return response.result;}; const seed=await api('import',{kind:'text',text:'Independent dirty editor is preserved during actual import.',name:'Existing editor',groups:['existing-source']}); @@ -41,6 +45,7 @@ function python(code,...args){const result=spawnSync('python3',['-c',code,...arg const fill=(id,value)=>evaluate(`(()=>{const e=document.getElementById(${JSON.stringify(id)});e.value=${JSON.stringify(value)};e.dispatchEvent(new Event('input',{bubbles:true}));e.dispatchEvent(new Event('change',{bubbles:true}));})()`); const choose=(id,name,contents)=>evaluate(`(()=>{const raw=Uint8Array.from(atob(${JSON.stringify(contents.toString('base64'))}),c=>c.charCodeAt(0)),dt=new DataTransfer();dt.items.add(new File([raw],${JSON.stringify(name)}));document.getElementById(${JSON.stringify(id)}).files=dt.files;})()`); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); await evaluate('openRecord('+JSON.stringify(seed.id)+')');await fill('label','Retain unrelated unsaved target'); await evaluate('document.querySelector(".record input").click();document.getElementById("sequence-import-panel").open=true'); diff --git a/tests/browser_text_classification_proposals.cjs b/tests/browser_text_classification_proposals.cjs index d0fa116d..4b5caff7 100644 --- a/tests/browser_text_classification_proposals.cjs +++ b/tests/browser_text_classification_proposals.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -17,6 +20,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_text_classification_proposals_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','inherit'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -40,6 +44,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const modelPort=output.match(/CLASSIFICATION_MODEL_PORT=(\d+)/)[1],labels=['cancel','keep','café 😀']; const prefix='text-classification-proposal-',v='textClassificationProposal'; await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workbench'});await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); await evaluate('refreshSavedSets('+JSON.stringify(saved.id)+')');await click('load-selection');await until(()=>evaluate('!savedLoadBusy && selected.size===2')); const fixed=await evaluate('releaseBody().items'); @@ -244,7 +249,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) }; const dispatchEvidence=[]; const writeDispatch=()=>fs.writeFileSync(path.join(report,'cross-tab-dispatch-observation.json'),JSON.stringify({source_head:require('node:child_process').execFileSync('git',['rev-parse','HEAD'],{cwd:root,encoding:'utf8'}).trim(),runtime_sha256:digest(fs.readFileSync(path.join(root,'static/text-classification-proposals.js'))),cases:dispatchEvidence},null,2)); - const ledger=async()=> (await(await fetch(base+'/test/classification-dispatch')).json()).admissions; + const ledger=async()=> (await(await fetch(base+'/api/test/classification-dispatch')).json()).admissions; for(const outcome of ['success','lost-ack']){ const source=await makeText('Cross-tab '+outcome,'Exact cross-tab source '+outcome+'.'),baseline=await count(); const a=await nativeTab();await a.configure(source,'dispatch-refusal-'+outcome);await a.run('dispatchHoldMode="after"');await a.submit();await until(()=>a.run('dispatchBarrier==="after"')); diff --git a/tests/browser_text_classification_proposals_server.py b/tests/browser_text_classification_proposals_server.py index f4c8cc76..47d92141 100644 --- a/tests/browser_text_classification_proposals_server.py +++ b/tests/browser_text_classification_proposals_server.py @@ -43,12 +43,12 @@ def instrumented_start(self, body): def instrumented_handler(dataset): class Handler(original_handler(dataset)): - def do_GET(self): - if self.path == '/test/classification-dispatch': + def _get(self): + if self.path == '/api/test/classification-dispatch': with admission_lock: result = copy.deepcopy(admissions) return self.reply({'admissions': result}) - return super().do_GET() + return super()._get() return Handler diff --git a/tests/browser_text_corpus_export.cjs b/tests/browser_text_corpus_export.cjs index 7ccf24ce..7caf251b 100644 --- a/tests/browser_text_corpus_export.cjs +++ b/tests/browser_text_corpus_export.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native Chromium gate: real local HTTP service, immutable download, no inference. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); @@ -17,6 +20,7 @@ let ws,evaluate; let stdout='',stderr='';server.stdout.on('data',data=>stdout+=data);server.stderr.on('data',data=>stderr+=data); await until(()=>{if(server.exitCode!==null)throw Error(stderr);return /127\.0\.0\.1:(\d+)/.test(stdout);}); const url='http://127.0.0.1:'+stdout.match(/127\.0\.0\.1:(\d+)/)[1]; + await fixtureAuth.register(url,path.join(temporary,'data'),root); const browser=launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','pipe'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); let browserStderr='';browser.stderr.on('data',data=>browserStderr+=data); const port=await waitForDebugger(browser,path.join(temporary,'browser','DevToolsActivePort')).catch(error=>{throw Error(error.message+'\n'+browserStderr);}); @@ -31,6 +35,7 @@ let ws,evaluate; const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); const preview=async()=>{await click('preview-release');await until(()=>evaluate('!releaseBusy'));}; await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,url); await send('Page.navigate',{url:url+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent==="Collection ready."')); // Import and explicitly review actual text through the rendered forms. diff --git a/tests/browser_vlm_real.cjs b/tests/browser_vlm_real.cjs index def36c83..777c9762 100644 --- a/tests/browser_vlm_real.cjs +++ b/tests/browser_vlm_real.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Explicit real-model acceptance: PUMAS_GATEWAY, PUMAS_MODEL, TULDOK_IMAGE and TULDOK_EVIDENCE_DIR are required. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -15,6 +18,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/Tuldok: http:\/\/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); launch(process.env.BROWSER||'/opt/brave.com/brave/brave',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:'ignore'}); const active=path.join(temporary,'browser','DevToolsActivePort'); const debugPort=await until(()=>fs.existsSync(active)&&fs.readFileSync(active,'utf8').split('\n')[0]); @@ -33,6 +37,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const source=fs.readFileSync(process.env.TULDOK_IMAGE); const imported=await fetch('http://127.0.0.1:'+port+'/api/samples',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({image:source.toString('base64'),filename:'book-regression.png',session_id:'release-acceptance',book_id:'regression-book',split:'unassigned'})}); assert.equal(imported.status,201);const sample=await imported.json(); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:'http://127.0.0.1:'+port}); await until(()=>evaluate('!!document.querySelector("#samples .sample")')); await evaluate('document.querySelector("#samples .sample").click()'); diff --git a/tests/browser_workbench.cjs b/tests/browser_workbench.cjs index 21909dd1..b17ec840 100644 --- a/tests/browser_workbench.cjs +++ b/tests/browser_workbench.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Native browser smoke test. No npm dependencies. const {qaDirectory,screenshotOptions}=require('./qa_artifacts.cjs'); const assert=require('node:assert/strict'); @@ -14,6 +17,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','tests/browser_server.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',stderr='';server.stdout.on('data',data=>output+=data);server.stderr.on('data',data=>stderr+=data); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]); + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browserCommand=process.env.BROWSER||'/usr/bin/chromium'; const browser=launch(browserCommand,['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','pipe','pipe'],env:{...process.env,HOME:temporary,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); // Chrome wrappers can report startup failure on stdout. Retain bounded tails @@ -43,6 +47,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const click=id=>evaluate('document.getElementById('+JSON.stringify(id)+').click()'); const fill=(id,value)=>evaluate('(()=>{const e=document.getElementById('+JSON.stringify(id)+');e.value='+JSON.stringify(value)+';e.dispatchEvent(new Event("input",{bubbles:true}));e.dispatchEvent(new Event("change",{bubbles:true}));})()'); await send('Page.enable');await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:'http://127.0.0.1:'+port+'/workbench'}); await until(()=>evaluate('document.getElementById("notice")?.textContent === "Collection ready."')); await fill('import-name','Unicode note');await fill('import-group','doc-one');await fill('import-text','Hello 😀 café'); diff --git a/tests/browser_workspace_audio.cjs b/tests/browser_workspace_audio.cjs index 129eb22f..86269e99 100644 --- a/tests/browser_workspace_audio.cjs +++ b/tests/browser_workspace_audio.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Authored PCM WAV through the real Data UI, PostgreSQL metadata and frozen export. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); @@ -15,6 +18,7 @@ function launch(command,args,options){const child=spawn(command,args,options);ch const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='';server.stdout.on('data',chunk=>output+=chunk);server.stderr.on('data',chunk=>serverErrors+=chunk); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const value=await response.json();assert.ok(response.ok,JSON.stringify(value));return value;}; const browser=launch(process.env.BROWSER||'/usr/bin/chromium',[...(process.env.TULDOK_NATIVE_ZOOM?[]:['--headless']),'--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--autoplay-policy=no-user-gesture-required','--remote-debugging-port=0','--window-size=1440,1000','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','ignore'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const debugPort=await waitForDebugger(browser,path.join(temporary,'browser','DevToolsActivePort')); @@ -40,6 +44,7 @@ function launch(command,args,options){const child=spawn(command,args,options);ch const closeTools=()=>frame('document.querySelector("#embed-tools>button").click()'); async function capture(name,width,height){await send('Emulation.setDeviceMetricsOverride',{width,height,deviceScaleFactor:1,mobile:false});await frame('document.getElementById("audio-inspection").scrollIntoView({block:"start"})');await evaluate('new Promise(resolve=>requestAnimationFrame(()=>requestAnimationFrame(resolve)))');assert.ok(await evaluate('document.documentElement.scrollWidth<=innerWidth'),'workspace fits viewport');assert.ok(await frame('document.documentElement.scrollWidth<=innerWidth'),'audio editor fits viewport');const filename=name+'.jpg';fs.writeFileSync(path.join(report,filename),Buffer.from((await send('Page.captureScreenshot',screenshotOptions)).data,'base64'));captures.push(filename);} await send('Page.enable');await send('Runtime.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true}); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workspaces'});await until(()=>evaluate('!!document.getElementById("fixture-label")')); await evaluate('document.getElementById("dataset").value="catalog";document.getElementById("dataset").dispatchEvent(new Event("change",{bubbles:true}))'); await until(()=>evaluate('document.getElementById("catalog-frame")?.contentDocument?.getElementById("notice")?.textContent==="Collection ready."')); diff --git a/tests/browser_workspace_audio_run.cjs b/tests/browser_workspace_audio_run.cjs index 543d58e6..505e8d80 100644 --- a/tests/browser_workspace_audio_run.cjs +++ b/tests/browser_workspace_audio_run.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real authored PCM release, edited graph, CPU classification, exact frame results and correction/reopen. "use strict"; const assert = require("node:assert/strict"), @@ -43,6 +46,7 @@ function launch(command, args, options) { server.stderr.on("data", (chunk) => (serverErrors += chunk)); const port = await until(() => output.match(/127\.0\.0\.1:(\d+)/)?.[1]), base = "http://127.0.0.1:" + port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser = launch( process.env.BROWSER || "/usr/bin/chromium", [ @@ -258,6 +262,7 @@ function launch(command, args, options) { const offlineCanary = process.env.LD_PRELOAD ? JSON.parse(execFileSync("python3", ["-c", "import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"], {cwd:root,encoding:"utf8"})) : null; await send("DOM.enable"); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send("Page.navigate", { url: base + "/workspaces" }); await until(() => evaluate('!!document.getElementById("fixture-label")')); await select("#dataset", "catalog"); diff --git a/tests/browser_workspace_breadth.cjs b/tests/browser_workspace_breadth.cjs index 01232823..65c75c44 100644 --- a/tests/browser_workspace_breadth.cjs +++ b/tests/browser_workspace_breadth.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Authored native PLY → frozen release → edited graph → real integrity run/download/reopen. "use strict"; const assert = require("node:assert/strict"), @@ -43,6 +46,7 @@ function launch(command, args, options) { server.stderr.on("data", (chunk) => (serverErrors += chunk)); const port = await until(() => output.match(/127\.0\.0\.1:(\d+)/)?.[1]), base = "http://127.0.0.1:" + port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser = launch( process.env.BROWSER || "/usr/bin/chromium", [ @@ -260,6 +264,7 @@ function launch(command, args, options) { const offlineCanary = process.env.LD_PRELOAD ? JSON.parse(execFileSync("python3", ["-c", "import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"], {cwd:root,encoding:"utf8"})) : null; await send("DOM.enable"); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send("Page.navigate", { url: base + "/workspaces" }); await until(() => evaluate('!!document.getElementById("fixture-label")')); await select("#dataset", "catalog"); diff --git a/tests/browser_workspace_export_run.cjs b/tests/browser_workspace_export_run.cjs index 885a315a..a3f8b540 100644 --- a/tests/browser_workspace_export_run.cjs +++ b/tests/browser_workspace_export_run.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Authored native PLY → frozen release → edited graph → real integrity run/download/reopen. "use strict"; const assert = require("node:assert/strict"), @@ -44,6 +47,7 @@ function launch(command, args, options) { server.stderr.on("data", (chunk) => (serverErrors += chunk)); const port = await until(() => output.match(/127\.0\.0\.1:(\d+)/)?.[1]), base = "http://127.0.0.1:" + port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser = launch( process.env.BROWSER || "/usr/bin/chromium", [ @@ -256,6 +260,7 @@ function launch(command, args, options) { const offlineCanary = process.env.LD_PRELOAD ? JSON.parse(execFileSync("python3", ["-c", "import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"], {cwd:root,encoding:"utf8"})) : null; await send("DOM.enable"); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send("Page.navigate", { url: base + "/workspaces" }); await until(() => evaluate('!!document.getElementById("fixture-label")')); await select("#dataset", "catalog"); diff --git a/tests/browser_workspace_image_run.cjs b/tests/browser_workspace_image_run.cjs index 9af7b5a2..cf01e850 100644 --- a/tests/browser_workspace_image_run.cjs +++ b/tests/browser_workspace_image_run.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real authored image import, frozen release, edited graph, scratch CPU execution and immutable results. "use strict"; const assert = require("node:assert/strict"), @@ -43,6 +46,7 @@ function launch(command, args, options) { server.stderr.on("data", (chunk) => (serverErrors += chunk)); const port = await until(() => output.match(/127\.0\.0\.1:(\d+)/)?.[1]), base = "http://127.0.0.1:" + port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser = launch( process.env.BROWSER || "/usr/bin/chromium", [ @@ -260,6 +264,7 @@ function launch(command, args, options) { const offlineCanary = process.env.LD_PRELOAD ? JSON.parse(execFileSync("python3", ["-c", "import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"], {cwd:root,encoding:"utf8"})) : null; await send("DOM.enable"); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send("Page.navigate", { url: base + "/workspaces" }); await until(() => evaluate('!!document.getElementById("fixture-label")')); await select("#dataset", "catalog"); diff --git a/tests/browser_workspace_mesh.cjs b/tests/browser_workspace_mesh.cjs index d10d3829..fbe831bd 100644 --- a/tests/browser_workspace_mesh.cjs +++ b/tests/browser_workspace_mesh.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Actual authored PLY files; real loopback HTTP and Chromium, JPEG85 output only. 'use strict'; const assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); @@ -14,6 +17,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const server=launch('python3',['-u','app.py','--port','0','--data',path.join(temporary,'data')],{cwd:root,stdio:['ignore','pipe','pipe']}); let output='',serverErrors='';server.stdout.on('data',chunk=>output+=chunk);server.stderr.on('data',chunk=>serverErrors+=chunk); const port=await until(()=>output.match(/127\.0\.0\.1:(\d+)/)?.[1]),base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const api=async(route,body)=>{const response=await fetch(base+'/api/workbench/'+route,body===undefined?{}:{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)});const result=await response.json();assert.ok(response.ok,JSON.stringify(result));return result;}; const seed=await api('import',{kind:'text',text:'Independent editor stays intact.',name:'Existing editor',groups:['existing-source'],rights:'Authored'}); const browser=launch(process.env.BROWSER||'/usr/bin/chromium',[...(process.env.TULDOK_NATIVE_ZOOM?[]:['--headless']),'--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1400,950','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','ignore'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); @@ -28,6 +32,7 @@ function launch(command,args,options={}){const child=spawn(command,args,options) const fill=(id,value)=>evaluate(`(()=>{const e=document.getElementById(${JSON.stringify(id)});e.value=${JSON.stringify(value)};e.dispatchEvent(new Event('input',{bubbles:true}));e.dispatchEvent(new Event('change',{bubbles:true}));})()`); const choose=(id,name,raw)=>evaluate(`(()=>{const raw=Uint8Array.from(atob(${JSON.stringify(raw.toString('base64'))}),c=>c.charCodeAt(0)),dt=new DataTransfer();dt.items.add(new File([raw],${JSON.stringify(name)}));document.getElementById(${JSON.stringify(id)}).files=dt.files;})()`); await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable'); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workspaces'});await until(()=>page('!!document.getElementById("fixture-label")')); await page('document.getElementById("dataset").value="catalog";document.getElementById("dataset").dispatchEvent(new Event("change",{bubbles:true}))'); await until(()=>page('document.getElementById("catalog-frame")?.contentDocument?.getElementById("notice")?.textContent==="Collection ready."')); diff --git a/tests/browser_workspace_mesh_run.cjs b/tests/browser_workspace_mesh_run.cjs index a2921933..42fea2c8 100644 --- a/tests/browser_workspace_mesh_run.cjs +++ b/tests/browser_workspace_mesh_run.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Authored native PLY → frozen release → edited graph → real integrity run/download/reopen. "use strict"; const assert = require("node:assert/strict"), @@ -43,6 +46,7 @@ function launch(command, args, options) { server.stderr.on("data", (chunk) => (serverErrors += chunk)); const port = await until(() => output.match(/127\.0\.0\.1:(\d+)/)?.[1]), base = "http://127.0.0.1:" + port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser = launch( process.env.BROWSER || "/usr/bin/chromium", [ @@ -255,6 +259,7 @@ function launch(command, args, options) { const offlineCanary = process.env.LD_PRELOAD ? JSON.parse(execFileSync("python3", ["-c", "import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"], {cwd:root,encoding:"utf8"})) : null; await send("DOM.enable"); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send("Page.navigate", { url: base + "/workspaces" }); await until(() => evaluate('!!document.getElementById("fixture-label")')); await select("#dataset", "catalog"); diff --git a/tests/browser_workspace_project.cjs b/tests/browser_workspace_project.cjs index 156033fb..36a6f21a 100644 --- a/tests/browser_workspace_project.cjs +++ b/tests/browser_workspace_project.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real read-only project UI. Synthetic lifecycle fixture or copies of actual lab files; // neither mode executes project code or qualifies externally recorded science/training. 'use strict'; @@ -47,6 +50,7 @@ const serverArgs=port=>['-u','app.py','--port',String(port),'--data',path.join(t let output='';server.stdout.on('data',chunk=>output+=chunk);server.stderr.on('data',chunk=>serverErrors+=chunk); const port=await until(()=>{if(server.exitCode!==null)throw Error('Project server exited: '+serverErrors);return output.match(/127\.0\.0\.1:(\d+)/)?.[1];}); const base='http://127.0.0.1:'+port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser=launch(process.env.BROWSER||'/usr/bin/chromium',['--headless','--no-sandbox','--disable-gpu','--no-first-run','--no-default-browser-check','--remote-debugging-port=0','--window-size=1440,900','--user-data-dir='+path.join(temporary,'browser'),'about:blank'],{stdio:['ignore','ignore','ignore'],env:{...process.env,XDG_CONFIG_HOME:temporary,XDG_CACHE_HOME:temporary}}); const debugPort=await waitForDebugger(browser,path.join(temporary,'browser','DevToolsActivePort')); const tabs=await(await fetch('http://127.0.0.1:'+debugPort+'/json')).json(),target=tabs.find(tab=>tab.type==='page'&&tab.url==='about:blank');assert.ok(target); @@ -67,6 +71,7 @@ const serverArgs=port=>['-u','app.py','--port',String(port),'--data',path.join(t async function openProject(manifest,name,id){await click('#open-project');await until(()=>evaluate('document.getElementById("project-open-dialog").open && !document.getElementById("project-open-submit").disabled'));await select('#project-root','sample');await fill('#project-manifest',manifest);await evaluate('document.getElementById("project-open-submit").focus()');await key('Enter');await until(()=>evaluate('document.getElementById("dataset").value==='+JSON.stringify('project:'+id)));await nav('data');assert.match(await text('#project-data-root'),new RegExp(name.replace(/[.*+?^${}()|[\]\\]/g,'\\$&')));} await send('Page.enable');await send('Page.setLifecycleEventsEnabled',{enabled:true});await send('Runtime.enable');await send('Network.enable'); const offlineCanary=process.env.LD_PRELOAD?JSON.parse(execFileSync('python3',['-c',"import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"],{cwd:root,encoding:'utf8'})):null; + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send('Page.navigate',{url:base+'/workspaces'});await until(()=>evaluate('!!document.getElementById("open-project")')); await openProject('alpha.project.json',first.name,first.id); const details=await(await fetch(base+'/api/workspace/projects/'+first.id)).json();assert.equal(details.execution,'unsupported');assert.equal(details.manifest_status,'unchanged'); diff --git a/tests/browser_workspace_sequence_run.cjs b/tests/browser_workspace_sequence_run.cjs index bf5b588b..896335b0 100644 --- a/tests/browser_workspace_sequence_run.cjs +++ b/tests/browser_workspace_sequence_run.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Default: recorded actual Rheon v1. --authored-v2: synthetic transport only; no actual-packet/physics acceptance. "use strict"; const assert = require("node:assert/strict"), @@ -44,6 +47,7 @@ function launch(command, args, options) { server.stderr.on("data", (chunk) => (serverErrors += chunk)); const port = await until(() => output.match(/127\.0\.0\.1:(\d+)/)?.[1]), base = "http://127.0.0.1:" + port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser = launch( process.env.BROWSER || "/usr/bin/chromium", [ @@ -276,6 +280,7 @@ function launch(command, args, options) { const offlineCanary = process.env.LD_PRELOAD ? JSON.parse(execFileSync("python3", ["-c", "import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"], {cwd:root,encoding:"utf8"})) : null; await send("DOM.enable"); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send("Page.navigate", { url: base + "/workspaces" }); await until(() => evaluate('!!document.getElementById("fixture-label")')); await select("#dataset", "catalog"); diff --git a/tests/browser_workspace_spatial.cjs b/tests/browser_workspace_spatial.cjs index 595ef04b..09f795c5 100644 --- a/tests/browser_workspace_spatial.cjs +++ b/tests/browser_workspace_spatial.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Authored point and volume bytes through real Data and integrity workflows. "use strict"; const assert = require("node:assert/strict"), @@ -43,6 +46,7 @@ function launch(command, args, options) { server.stderr.on("data", (chunk) => (serverErrors += chunk)); const port = await until(() => output.match(/127\.0\.0\.1:(\d+)/)?.[1]), base = "http://127.0.0.1:" + port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser = launch( process.env.BROWSER || "/usr/bin/chromium", [ @@ -260,6 +264,7 @@ function launch(command, args, options) { const offlineCanary = process.env.LD_PRELOAD ? JSON.parse(execFileSync("python3", ["-c", "import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"], {cwd:root,encoding:"utf8"})) : null; await send("DOM.enable"); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send("Page.navigate", { url: base + "/workspaces" }); await until(() => evaluate('!!document.getElementById("fixture-label")')); await select("#dataset", "catalog"); diff --git a/tests/browser_workspace_text.cjs b/tests/browser_workspace_text.cjs index 090977f2..43876adf 100644 --- a/tests/browser_workspace_text.cjs +++ b/tests/browser_workspace_text.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real authored text import, frozen release, edited graph, TF-IDF/NB CPU execution and immutable results. "use strict"; const assert = require("node:assert/strict"), @@ -43,6 +46,7 @@ function launch(command, args, options) { server.stderr.on("data", (chunk) => (serverErrors += chunk)); const port = await until(() => output.match(/127\.0\.0\.1:(\d+)/)?.[1]), base = "http://127.0.0.1:" + port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser = launch( process.env.BROWSER || "/usr/bin/chromium", [ @@ -258,6 +262,7 @@ function launch(command, args, options) { const offlineCanary = process.env.LD_PRELOAD ? JSON.parse(execFileSync("python3", ["-c", "import sys;sys.path.insert(0,'tests');from test_workspace_offline import CANARY;exec(CANARY)"], {cwd:root,encoding:"utf8"})) : null; await send("DOM.enable"); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send("Page.navigate", { url: base + "/workspaces" }); await until(() => evaluate('!!document.getElementById("fixture-label")')); await select("#dataset", "catalog"); diff --git a/tests/browser_workspaces.cjs b/tests/browser_workspaces.cjs index 9d840556..f323c272 100644 --- a/tests/browser_workspaces.cjs +++ b/tests/browser_workspaces.cjs @@ -1,3 +1,6 @@ +'use strict'; +const fixtureAuth = require('./auth_helpers.cjs').authenticatedFixture(); +const fetch = fixtureAuth.fetch; // Real Chromium interactions, no npm dependency, no model or training execution. "use strict"; const assert = require("node:assert/strict"), @@ -44,6 +47,7 @@ function launch(command, args, options) { server.stderr.on("data", (chunk) => (serverErrors += chunk)); const port = await until(() => output.match(/127\.0\.0\.1:(\d+)/)?.[1]), base = "http://127.0.0.1:" + port; + await fixtureAuth.register('http://127.0.0.1:'+port,path.join(temporary,'data'),root); const browser = launch( process.env.BROWSER || "/usr/bin/chromium", [ @@ -264,6 +268,7 @@ function launch(command, args, options) { await send("Fetch.enable", { patterns: [{ urlPattern: "*workspace-fixtures.json" }], }); + await fixtureAuth.browser(send,'http://127.0.0.1:'+port); await send("Page.navigate", { url: base + "/workspaces" }); await until(() => pausedRequest); assert.match(await text("#workspace-status"), /Loading/); diff --git a/tests/check_image_classification_consumer.py b/tests/check_image_classification_consumer.py index bc4d96e6..1bd10cd8 100644 --- a/tests/check_image_classification_consumer.py +++ b/tests/check_image_classification_consumer.py @@ -3,6 +3,7 @@ No weights, datasets or models are downloaded. The six authored solid images test transport/reader compatibility only; their metrics do not measure quality. """ +from auth_helpers import ExplicitOwnerFixture import argparse import hashlib import importlib.metadata @@ -42,17 +43,18 @@ def main(): with tempfile.TemporaryDirectory(prefix='classifier-reader-', dir=args.output) as folder: folder = Path(folder) dataset = Dataset(str(folder / 'source')) - try: - rows = populate(dataset) - request = dict(format=projection.FORMAT, seed=42, ratios={'train': 34, 'validation': 33, 'test': 33}, - items=[{key: row[key] for key in ('id', 'revision', 'source_revision')} for row in rows]) - preview = dataset.releases.preview(request) - assert preview['eligible'], preview - result = dataset.releases.create(dict(request, preview_token=preview['preview_token'])) - archive_path = args.output / 'classification-consumer.zip' - shutil.copyfile(dataset.releases.locate(result['id']), archive_path) - finally: - dataset.close() + with ExplicitOwnerFixture.bootstrap(dataset).bound(dataset): + try: + rows = populate(dataset) + request = dict(format=projection.FORMAT, seed=42, ratios={'train': 34, 'validation': 33, 'test': 33}, + items=[{key: row[key] for key in ('id', 'revision', 'source_revision')} for row in rows]) + preview = dataset.releases.preview(request) + assert preview['eligible'], preview + result = dataset.releases.create(dict(request, preview_token=preview['preview_token'])) + archive_path = args.output / 'classification-consumer.zip' + shutil.copyfile(dataset.releases.locate(result['id']), archive_path) + finally: + dataset.close() data = folder / 'export' with zipfile.ZipFile(archive_path) as archive: archive.extractall(data) diff --git a/tests/check_text_corpus_consumer.py b/tests/check_text_corpus_consumer.py index 067e2ea5..54c8c003 100644 --- a/tests/check_text_corpus_consumer.py +++ b/tests/check_text_corpus_consumer.py @@ -3,6 +3,7 @@ Authored fixture data only. No network, weights or model downloads. Source hashes are pinned independently; tensor/shift assertions are not a replacement reader. """ +from auth_helpers import ExplicitOwnerFixture import argparse import ast import hashlib @@ -44,17 +45,18 @@ def main(): with tempfile.TemporaryDirectory(prefix='corpus-consumer-', dir=args.output) as temporary: folder = Path(temporary) dataset = Dataset(str(folder / 'source')) - try: - rows = populate(dataset) - request = dict(format=projection.FORMAT, seed=42, ratios=dict(train=67, validation=17, test=16), - items=[{key: row[key] for key in ('id', 'revision', 'source_revision')} for row in rows]) - preview = dataset.releases.preview(request) - assert preview['eligible'], preview - result = dataset.releases.create(dict(request, preview_token=preview['preview_token'])) - archive_path = args.output / 'corpus-consumer.zip' - shutil.copyfile(dataset.releases.locate(result['id']), archive_path) - finally: - dataset.close() + with ExplicitOwnerFixture.bootstrap(dataset).bound(dataset): + try: + rows = populate(dataset) + request = dict(format=projection.FORMAT, seed=42, ratios=dict(train=67, validation=17, test=16), + items=[{key: row[key] for key in ('id', 'revision', 'source_revision')} for row in rows]) + preview = dataset.releases.preview(request) + assert preview['eligible'], preview + result = dataset.releases.create(dict(request, preview_token=preview['preview_token'])) + archive_path = args.output / 'corpus-consumer.zip' + shutil.copyfile(dataset.releases.locate(result['id']), archive_path) + finally: + dataset.close() data = folder / 'export' with zipfile.ZipFile(archive_path) as archive: archive.extractall(data) diff --git a/tests/qualify_spatial_retained_runs.py b/tests/qualify_spatial_retained_runs.py index 33ad81d6..3c44ac31 100644 --- a/tests/qualify_spatial_retained_runs.py +++ b/tests/qualify_spatial_retained_runs.py @@ -3,6 +3,7 @@ Uses disposable catalogs only. The legacy checkout must be the exact pinned, unmodified source; no synthetic downgrade or mocked execution is accepted. """ +from auth_helpers import ExplicitOwnerFixture import argparse import hashlib import json @@ -69,19 +70,20 @@ def drop_fixture_schema(identity): def verify(path, receipt, artifacts): dataset = Dataset(path) - try: - assert dataset.db.schema_version == SCHEMA_VERSION - assert dataset.db.dataset_id == receipt['dataset_id'] - assert dataset.pipelines.get(receipt['graph']['id']) == receipt['graph'] - assert dataset.runs.get(receipt['run']['id']) == receipt['run'] - assert dataset.workbench.get(receipt['record']['id']) == receipt['record'] - for name, expected in artifacts.items(): - observed, _ = dataset.runs.artifact(receipt['run']['id'], name) - assert observed == expected, name - return {'schema_version': SCHEMA_VERSION, 'state': 'completed', 'run_id': receipt['run']['id'], - 'artifacts': {name: fingerprint(raw) for name, raw in artifacts.items()}} - finally: - dataset.close() + with ExplicitOwnerFixture.bootstrap(dataset).bound(dataset): + try: + assert dataset.db.schema_version == SCHEMA_VERSION + assert dataset.db.dataset_id == receipt['dataset_id'] + assert dataset.pipelines.get(receipt['graph']['id']) == receipt['graph'] + assert dataset.runs.get(receipt['run']['id']) == receipt['run'] + assert dataset.workbench.get(receipt['record']['id']) == receipt['record'] + for name, expected in artifacts.items(): + observed, _ = dataset.runs.artifact(receipt['run']['id'], name) + assert observed == expected, name + return {'schema_version': SCHEMA_VERSION, 'state': 'completed', 'run_id': receipt['run']['id'], + 'artifacts': {name: fingerprint(raw) for name, raw in artifacts.items()}} + finally: + dataset.close() def qualify(legacy_root): diff --git a/tests/test_access.py b/tests/test_access.py new file mode 100644 index 00000000..81b9b75d --- /dev/null +++ b/tests/test_access.py @@ -0,0 +1,247 @@ +"""Real catalog actors, one-use exchange and receipt-scoped continuations.""" +import hashlib +import json +import os +from pathlib import Path +import stat +import subprocess +import sys +import threading +import unittest +from unittest.mock import patch + +import psycopg + +from access import Access, AccessError, authorized +from backup_metadata import backup_catalog, restore_catalog, read_catalog, summaries +from metadata import Metadata, TABLES_V6, definition_hash, StorageError +import test_workspace_metadata as metadata_tests +from upgrade_metadata import UPGRADES, upgrade_catalog + + +class AccessContract(unittest.TestCase): + setUp = metadata_tests.WorkspaceMetadata.setUp + cleanup_schemas = metadata_tests.WorkspaceMetadata.cleanup_schemas + catalog = metadata_tests.WorkspaceMetadata.catalog + + def owner(self, db=None): + db = db or self.catalog(version=7) + access = Access(db, db.path) + login = access._local_owner_token(initial=True) + session = access.exchange(login) + return db, access, session['token'], login + + def test_missing_actor_wrong_catalog_nested_reset_and_thread_isolation(self): + db, access, token, _ = self.owner() + with self.assertRaises(AccessError): + access.require('inspect', 'catalog.read') + second = self.catalog('second', 7) + other = Access(second, second.path) + second_token = other.exchange(other._local_owner_token())['token'] + with access.bind(token): + identity = access.identity() + with self.assertRaises(AccessError): + other.require('inspect', 'catalog.read') + with other.bind(second_token): + other.require('inspect', 'catalog.read') + with self.assertRaises(AccessError): + access.require('inspect', 'catalog.read') + self.assertEqual(access.identity(), identity) + errors = [] + def worker(): + try: + access.require('inspect', 'catalog.read') + except AccessError as error: + errors.append(error.code) + thread = threading.Thread(target=worker) + thread.start(); thread.join(5) + self.assertEqual(errors, ['unauthenticated']) + with self.assertRaises(AccessError): + access.identity() + self.assertGreater(db.execute("SELECT count(*) FROM access_audit WHERE result='denied'").fetchone()[0], 0) + + def test_exchange_is_one_use_and_secrets_never_in_stored_rows(self): + db, access, token, login = self.owner() + with self.assertRaises(AccessError): + access.exchange(login) + with self.assertRaises(AccessError): + with access.bind(login): + pass + with self.assertRaises(AccessError): + access._local_owner_token(initial=True) + raw = repr(read_catalog(db)) + self.assertNotIn(login, raw) + self.assertNotIn(token, raw) + hashes = [row[0] for row in db.execute('SELECT token_sha256 FROM access_credentials')] + self.assertIn(hashlib.sha256(token.encode()).hexdigest(), hashes) + audits = repr(list(db.execute('SELECT * FROM access_audit'))) + for digest in hashes: + self.assertNotIn(digest, audits) + + def test_scope_escalation_revocation_expiry_and_owner_only_execute(self): + db, access, token, _ = self.owner() + with access.bind(token): + for scopes in (['inspect', 'admin'], ['inspect', 'approve-review'], ['inspect', 'approve-execution']): + with self.assertRaises(AccessError): + access.issue({'label': 'Agent', 'scopes': scopes}) + agent = access.issue({'label': 'Agent', 'scopes': ['inspect', 'edit', 'execute']}) + with access.bind(agent['token']): + access.require('edit', 'record.propose', 'record') + for scope in ('execute', 'approve-review', 'admin', 'cancel'): + with self.assertRaises(AccessError): + access.require(scope, 'record.' + scope, 'record') + with access.bind(token): + access.revoke(agent['identity']['credential_id']) + with self.assertRaises(AccessError): + access.require('inspect', 'catalog.read') + with access.bind(token): + expired = access.issue({'label': 'Expired', 'scopes': ['inspect']}) + db.execute('UPDATE access_credentials SET expires_at=0 WHERE id=%s', (expired['identity']['credential_id'],)) + with self.assertRaises(AccessError): + with access.bind(expired['token']): + pass + + def test_guard_does_not_open_transaction_and_denial_audit_follows_rollback(self): + db, access, token, _ = self.owner() + class Service: + def __init__(self): + self.access = access + @authorized('edit', 'service.edit') + def edit(self, target): + if db.in_transaction: + raise AssertionError('Guard added transaction') + with db.transaction(): + db.execute("INSERT INTO workspace_projects VALUES ('refused','{}')") + access.require('approve-review', 'service.review', target, owner_only=True) + with access.bind(token): + agent = access.issue({'label': 'Editor', 'scopes': ['inspect', 'edit']}) + with access.bind(agent['token']), self.assertRaises(AccessError): + Service().edit('refused') + self.assertEqual(db.execute("SELECT count(*) FROM workspace_projects WHERE id='refused'").fetchone()[0], 0) + audit = db.execute("SELECT actor_id,result FROM access_audit WHERE action='service.edit'").fetchone() + self.assertEqual(tuple(audit), (agent['identity']['actor_id'], 'denied')) + with access.bind(token): + with self.assertRaises(RuntimeError): + access.audit('service.edit') + with db.transaction(): + access.audit('service.edit', 'saved', {'revision': 3}) + self.assertEqual(db.execute("SELECT count(*) FROM access_audit WHERE action='service.edit' AND result='success'").fetchone()[0], 1) + + def test_job_receipt_exact_effects_survive_revocation_but_cannot_admit_new_work(self): + db, access, token, _ = self.owner() + request_digest = hashlib.sha256(b'bounded job request').hexdigest() + with access.bind(token): + with db.transaction(): + admission = access.admit_job('generate', 'job1', request_digest, {'job.finish': ['job1']}) + owner_identity = access.identity() + access.revoke(owner_identity['credential_id']) + with access._job('generate', 'job1', admission, request_digest): + access.require_job('generate', 'job1', admission, request_digest) + access.require('edit', 'job.finish', 'job1') + for scope in ('approve-review', 'approve-execution', 'admin'): + with self.assertRaises(AccessError): + access.require(scope, 'job.finish', 'job1') + with self.assertRaises(AccessError): + access.require('edit', 'job.finish', 'job1', owner_only=True) + with db.transaction(): + access.audit('job.finish', 'job1', {'state': 'completed'}) + for action, target in (('job.finish', 'job2'), ('record.review', 'job1'), ('access.issue', None)): + with self.assertRaises(AccessError): + access.require('edit', action, target) + with self.assertRaises(AccessError): + access.admit_job('generate', 'job2', request_digest, {'job.finish': ['job2']}) + with self.assertRaises(AccessError): + with access._job('generate', 'job1', admission, '0' * 64): + pass + fresh = access.exchange(access._local_owner_token())['token'] + with access.bind(fresh), self.assertRaises(AccessError): + access.require_job('generate', 'job1', admission, request_digest) + + def test_system_can_only_inspect_cancel_and_reconcile_audit(self): + db, access, _, _ = self.owner() + with access._reconcile(): + access.require('inspect', 'runs.list') + access.require('cancel', 'runs.cancel', 'job') + for scope in ('edit', 'execute', 'admin', 'freeze', 'approve-review'): + with self.assertRaises(AccessError): + access.require(scope, 'not.allowed') + with db.transaction(): + access.audit('runs.reconcile', 'job', {'attribution': 'legacy'}) + with self.assertRaises(AccessError): + access.audit('record.review', 'record') + + def test_concurrent_exchange_exactly_one_session(self): + db, access, _, _ = self.owner() + login = access._local_owner_token() + peer_db = Metadata(db.path, create=False) + self.addCleanup(peer_db.close) + peer = Access(peer_db, db.path) + outcomes = [] + def exchange(owner): + try: + owner.exchange(login) + outcomes.append('success') + except AccessError: + outcomes.append('denied') + threads = [threading.Thread(target=exchange, args=(owner,)) for owner in (access, peer)] + for thread in threads: thread.start() + for thread in threads: thread.join(10) + self.assertEqual(sorted(outcomes), ['denied', 'success']) + + def test_schema6_failed_upgrade_and_retained_backup_restore(self): + db = self.catalog(version=6) + with db.transaction(): + db.execute("INSERT INTO workspace_projects VALUES ('retained',' { \"id\": \"retained\" } ')") + before = summaries(read_catalog(db)) + ledger = db.execute('SELECT * FROM catalog_version').fetchall() + migration, statements = UPGRADES[6] + with patch.dict(UPGRADES, {6: (migration, (*statements, 'SELECT missing_access_upgrade()'))}): + with self.assertRaises(psycopg.Error): + upgrade_catalog(db.path, quiesced=True) + db.validate_schema() + self.assertEqual(db.execute('SELECT * FROM catalog_version').fetchall(), ledger) + self.assertEqual(summaries(read_catalog(db)), before) + backup = self.root / 'retained6' + self.assertEqual(backup_catalog(db.path, backup, quiesced=True)['schema_version'], 6) + self.drop(db) + destination = self.root / 'restore6' + restore_catalog(backup, destination) + restored = Metadata(destination, create=False, schema_version=6) + self.addCleanup(restored.close) + self.assertEqual(summaries(read_catalog(restored)), before) + with self.assertRaises(StorageError): + Metadata(destination, create=False) + + def test_cli_private_file_and_schema6_upgrade_backup_retains_access_rows(self): + db = self.catalog(version=6) + self.assertEqual(set(read_catalog(db)), set(TABLES_V6)) + before = summaries(read_catalog(db)) + with self.assertRaises(StorageError): + Metadata(db.path, create=False) + self.assertEqual(upgrade_catalog(db.path, quiesced=True)['schema_version'], 7) + db.close() + db = Metadata(db.path, create=False) + self.addCleanup(db.close) + self.assertEqual(summaries({k:v for k,v in read_catalog(db).items() if k in TABLES_V6}), before) + output = self.root / 'private-login' + command = [sys.executable, str(Path(__file__).resolve().parents[1] / 'access.py'), 'bootstrap', '--data', str(db.path), '--out', str(output)] + completed = subprocess.run(command, capture_output=True, text=True, timeout=20) + self.assertEqual(completed.returncode, 0, completed.stderr) + secret = output.read_text().strip() + self.assertEqual(stat.S_IMODE(output.stat().st_mode), 0o600) + self.assertNotIn(secret, completed.stdout + completed.stderr) + access = Access(db, db.path) + session = access.exchange(secret)['token'] + expected = summaries(read_catalog(db)) + backup = self.root / 'backup7' + backup_catalog(db.path, backup, quiesced=True) + self.drop(db) + restored = self.root / 'restored7' + restore_catalog(backup, restored) + other_db = Metadata(restored, create=False) + self.addCleanup(other_db.close) + self.assertEqual(summaries(read_catalog(other_db)), expected) + with Access(other_db, restored).bind(session): + self.assertEqual(Access(other_db, restored).identity()['kind'], 'owner') + + drop = metadata_tests.WorkspaceMetadata.drop diff --git a/tests/test_access_http.py b/tests/test_access_http.py new file mode 100644 index 00000000..cb9e5366 --- /dev/null +++ b/tests/test_access_http.py @@ -0,0 +1,107 @@ +"""Real transport and domain authorization, without injected request actors.""" +import json +import tempfile +import threading +import unittest +import uuid +from http.server import ThreadingHTTPServer +from urllib.error import HTTPError +from urllib.request import Request, urlopen + +from access import AccessError +from app import Dataset, make_handler +from auth_helpers import ExplicitOwnerFixture +from dataset_recipes import generate + + +class AccessHTTP(unittest.TestCase): + def setUp(self): + directory = tempfile.TemporaryDirectory() + self.addCleanup(directory.cleanup) + self.dataset = Dataset(directory.name) + self.addCleanup(self.dataset.close) + self.owner = ExplicitOwnerFixture.bootstrap(self.dataset) + self.server = ThreadingHTTPServer(('127.0.0.1', 0), make_handler(self.dataset)) + threading.Thread(target=self.server.serve_forever, daemon=True).start() + self.addCleanup(self.server.server_close) + self.addCleanup(self.server.shutdown) + self.root = f'http://127.0.0.1:{self.server.server_port}' + + def request(self, path, body=None, headers=None): + request = Request(self.root + path, data=None if body is None else json.dumps(body).encode(), + headers={'Content-Type': 'application/json', **(headers or {})}) + try: + response = urlopen(request) + except HTTPError as error: + response = error + with response: + return response.status, json.load(response), response.headers + + def test_all_legacy_and_current_reads_require_real_credentials(self): + for route in ('/api/samples', '/api/workbench/records', '/api/workspace/runs', '/api/access/session'): + with self.subTest(route=route): + self.assertEqual(self.request(route)[0], 401) + self.assertEqual(self.request('/api/access/session', headers=self.owner.headers)[0], 200) + with self.assertRaises(AccessError): + self.dataset.rows() + + def test_cookie_origin_mixed_transport_and_bootstrap_replay(self): + code = self.dataset.access._local_owner_token() + self.assertEqual(self.request('/api/access/session', {'token': code})[0], 403) + status, identity, headers = self.request('/api/access/session', {'token': code}, {'Origin': self.root}) + self.assertEqual(status, 200) + self.assertEqual(identity['kind'], 'owner') + cookie = headers['Set-Cookie'] + self.assertIn('HttpOnly', cookie) + self.assertIn('SameSite=Strict', cookie) + self.assertEqual(self.request('/api/access/session', {'token': code}, {'Origin': self.root})[0], 401) + session = {'Cookie': cookie.split(';')[0]} + self.assertEqual(self.request('/api/access/logout', {}, session)[0], 403) + self.assertEqual(self.request('/api/access/logout', {}, {**session, 'Origin': 'http://elsewhere.invalid'})[0], 403) + self.assertEqual(self.request('/api/access/logout', {}, {**session, **self.owner.headers})[0], 403) + self.assertEqual(self.request('/api/access/logout', {}, {**session, 'Origin': self.root})[0], 200) + self.assertEqual(self.request('/api/access/session', headers=session)[0], 401) + + def test_denial_audit_storage_outage_still_returns_structured_error(self): + self.dataset.db.connection.close() + status, body, _ = self.request('/api/access/session', headers={'Authorization': 'Bearer'}) + self.assertEqual((status, body['code']), (503, 'storage')) + + def test_agent_review_and_execution_denied_before_mutation(self): + with self.owner.bound(self.dataset): + agent = self.dataset.access.issue({'label': 'Editor', 'scopes': ['inspect', 'edit', 'execute']}) + row = self.dataset.workbench.import_asset({'kind': 'text', 'text': 'Bound review target', 'groups': ['source']}) + review = {'revision': row['revision'], 'source_revision': row['source_revision'], + 'task': 'text_classification', 'annotation': {'label': 'topic'}, + 'groups': row['groups'], 'review': 'human_reviewed'} + with self.dataset.access.bind(agent['token']): + with self.assertRaises(AccessError): + self.dataset.workbench.save(row['id'], review) + self.assertEqual(self.dataset.workbench.get(row['id'])['revision'], row['revision']) + response = {'id': uuid.uuid4().hex, 'prompt_id': row['id'], 'revision': 0, + 'parent_revision': row['revision'], 'source_revision': row['source_revision'], + 'completion': 'Agent draft', 'review': 'human_reviewed'} + with self.assertRaises(AccessError): + self.dataset.workbench.save_response(response) + draft = self.dataset.workbench.save_response(dict(response, review='draft'))['response'] + self.assertEqual(draft['provenance']['method'], 'agent_authored') + self.assertEqual(draft['review'], 'draft') + with self.assertRaises(AccessError): + self.dataset.workbench.save_response(dict(response, revision=draft['revision'])) + with self.assertRaises(AccessError): + generate(self.dataset.workbench, {}) + for start in (self.dataset.runs.submit, self.dataset.generation_jobs.start, + self.dataset.grounded.start, self.dataset.caption_proposals.start, + self.dataset.text_classification_proposals.start): + with self.assertRaises(AccessError): + start({}) + headers = {'Authorization': 'Bearer ' + agent['token']} + self.assertEqual(self.request('/api/workspace/runs', {}, headers)[0], 403) + self.assertEqual(self.request('/api/access/credentials', {'label': 'Forged', 'scopes': ['inspect']}, headers)[0], 403) + with self.owner.bound(self.dataset): + self.dataset.access.revoke(agent['identity']['credential_id']) + self.assertEqual(self.request('/api/access/session', headers=headers)[0], 401) + + +if __name__ == '__main__': + unittest.main() diff --git a/tests/test_ai.py b/tests/test_ai.py index 57b11fb3..dcf601ae 100644 --- a/tests/test_ai.py +++ b/tests/test_ai.py @@ -1,3 +1,4 @@ +from auth_helpers import bind_owner import base64 import io import json @@ -18,7 +19,7 @@ class AITests(unittest.TestCase): def setUp(self): self.tmp=tempfile.TemporaryDirectory();self.addCleanup(self.tmp.cleanup) - self.data=Dataset(self.tmp.name);self.addCleanup(self.data.close) + self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data);self.addCleanup(self.data.close) image=io.BytesIO();Image.new('RGB',(200,100),'beige').save(image,'PNG') self.sample=self.data.add(dict(image=base64.b64encode(image.getvalue()).decode(),session_id='s',book_id='b')) self.server,self.url,self.requests=start();self.addCleanup(self.server.server_close);self.addCleanup(self.server.shutdown) diff --git a/tests/test_audio_data.py b/tests/test_audio_data.py index cf0858e3..7805c6ae 100644 --- a/tests/test_audio_data.py +++ b/tests/test_audio_data.py @@ -1,4 +1,5 @@ """Source-frame WAV semantics and real PostgreSQL/filesystem review/export path.""" +from auth_helpers import bind_owner import base64 import copy import hashlib @@ -90,7 +91,7 @@ class AudioData(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(); self.addCleanup(self.tmp.cleanup) self.path = Path(self.tmp.name) / 'catalog' - self.dataset = Dataset(self.path) + self.dataset = Dataset(self.path); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.drop_schema) self.addCleanup(lambda: self.dataset.close()) self.w = self.dataset.workbench @@ -135,7 +136,7 @@ def test_import_review_history_rights_query_reload_export_and_independent_reader with wave.open(io.BytesIO(original)) as reader: reader.setpos(4000); samples = list(struct.iter_unpack('nodes.get(id),createElement:()=>new Element(),querySelectorAll:()=>[],body:{prepend(){},append(){}}}; +const owner={label:'Owner',kind:'owner',scopes:['inspect','edit','approve-review']},agent={label:'Agent',kind:'agent',scopes:['inspect','edit']}; +const defer=()=>{let resolve;const promise=new Promise(r=>{resolve=r;});return {promise,resolve};}; +const reply=(value,status=200)=>new Response(JSON.stringify(value),{status,headers:{'Content-Type':'application/json'}}); +const initial=defer();answers.push(initial.promise); +const context={document:doc,URL,Response,CustomEvent:class{},MutationObserver:class{observe(){}},location:{origin:'http://localhost:8091',href:'http://localhost:8091/workbench'},fetch:(input,options={})=>{requests.push({input,options});assert.ok(answers.length,'Unexpected fetch');return answers.shift();},addEventListener:(name,fn)=>handlers.set(name,fn),dispatchEvent(){},postMessage(){},window:null,globalThis:null};context.window=context;context.parent=context;context.globalThis=context; +vm.createContext(context);vm.runInContext(fs.readFileSync(path.join(__dirname,'../static/auth.js'),'utf8'),context); +const tick=()=>new Promise(resolve=>setImmediate(resolve)); +async function login(identity){nodes.get('session-token').value='private-code';answers.push(Promise.resolve(reply(identity)));await nodes.get('session-form').onsubmit({preventDefault(){}});assert.equal(nodes.get('session-token').value,'');} +(async()=>{ + initial.resolve(reply({error:'sign in'},401));await tick(); + const count=requests.length;const blocked=await context.TuldokAuth.fetch(new Request('http://localhost:8091/api/workbench/import',{method:'POST',body:'{}'}));assert.equal(blocked.status,401);assert.equal(requests.length,count,'Initial POST Request is refused before sending'); + await login(owner);assert.equal(context.TuldokAuth.identity().kind,'owner'); + // An older identity lookup must not replace the later successful login. + const stale=defer();answers.push(stale.promise);handlers.get('message')({origin:context.location.origin,data:{type:'tuldok-session-changed'}}); + await login(agent);stale.resolve(reply(owner));await tick();assert.equal(context.TuldokAuth.identity().kind,'agent');assert.equal(nodes.get('record-review').disabled,true); + // An old rejected write still returns its rejection, but cannot log out a newer session. + const rejected=defer();answers.push(rejected.promise);const attempt=context.TuldokAuth.fetch('/api/workbench/import',{method:'POST',body:'{}'});await tick();await login(owner);rejected.resolve(reply({error:'expired'},401));assert.equal((await attempt).status,401);assert.equal(context.TuldokAuth.identity().kind,'owner');assert.equal(nodes.get('record-review').disabled,false); + const before=requests.filter(item=>item.input==='/api/workbench/import').length; + answers.push(Promise.resolve(reply({error:'expired'},401)));assert.equal((await context.TuldokAuth.fetch('/api/workbench/import',{method:'POST',body:'{}'})).status,401);assert.equal(context.TuldokAuth.identity(),null);assert.equal(nodes.get('session-dialog').open,true); + await login(owner);assert.equal(requests.filter(item=>item.input==='/api/workbench/import').length,before+1,'Login never replays a rejected mutation'); + answers.push(Promise.reject(Error('Session lookup unavailable')));handlers.get('message')({origin:context.location.origin,data:{type:'tuldok-session-changed'}});await tick();assert.equal(context.TuldokAuth.identity(),null);assert.equal(nodes.get('record-review').disabled,true); + assert.equal(answers.length,0);console.log('PASS auth controller: stale identity/401 ownership, review scopes, code clearing, no mutation replay'); +})().catch(error=>{console.error(error);process.exitCode=1;}); diff --git a/tests/test_auth_helpers.cjs b/tests/test_auth_helpers.cjs new file mode 100644 index 00000000..7c781361 --- /dev/null +++ b/tests/test_auth_helpers.cjs @@ -0,0 +1,24 @@ +// Fixture credentials must never reach debugger/fake-provider or redirected origins. +'use strict'; +const assert=require('node:assert/strict'),fs=require('node:fs'),path=require('node:path'),vm=require('node:vm'); +const requests=[],files=new Map(),cookies=[]; +const filesystem={existsSync:p=>files.has(p),readFileSync:p=>files.get(p),unlinkSync:p=>files.delete(p)}; +const context={module:{exports:{}},URL,Headers,Response,globalThis:null,require:name=>{ + if(name==='node:fs')return filesystem; + if(name==='node:path')return path; + if(name==='node:crypto')return {randomUUID:()=>String(files.size)}; + if(name==='node:child_process')return {execFileSync:(program,args)=>{assert.equal(program,'python3');assert.deepEqual(Array.from(args.slice(0,2)),['access.py','login']);files.set(args[args.indexOf('--out')+1],'one-time-fixture\n');}}; + throw Error(name); +},fetch:async(input,options={})=>{requests.push({input:String(input),options});if(String(input).endsWith('/api/access/session'))return new Response('{}',{headers:{'Set-Cookie':'tuldok_session=opaque-fixture; HttpOnly; SameSite=Strict; Path=/'}});return new Response('{}');}}; +context.globalThis=context;vm.createContext(context);vm.runInContext(fs.readFileSync(path.join(__dirname,'auth_helpers.cjs'),'utf8'),context); +(async()=>{ + const fixture=context.module.exports.authenticatedFixture();await fixture.register('http://127.0.0.1:10001','/fixture/data','/fixture');assert.equal(files.size,0); + await fixture.fetch('http://127.0.0.1:10001/api/workbench/records',{method:'POST',headers:{'Content-Type':'application/json'},body:'{}'}); + let sent=requests.at(-1).options;assert.equal(sent.headers.get('Cookie'),'tuldok_session=opaque-fixture');assert.equal(sent.headers.get('Origin'),'http://127.0.0.1:10001');assert.equal(sent.redirect,'error'); + for(const url of ['http://127.0.0.1:10002/api/workbench/records','http://127.0.0.1:10002/json','http://localhost:10001/api/workbench/records','http://127.0.0.1:10001/fixture/control']){ + await fixture.fetch(url);sent=requests.at(-1).options;assert.equal(new Headers(sent.headers).get('Cookie'),null);assert.equal(new Headers(sent.headers).get('Origin'),null); + } + await fixture.browser(async(method,params)=>{cookies.push({method,params});return {success:true};},'http://127.0.0.1:10001');assert.equal(cookies[0].method,'Network.setCookie');assert.equal(cookies[0].params.httpOnly,true);assert.equal(cookies[0].params.sameSite,'Strict'); + await assert.rejects(fixture.browser(async()=>({}),'http://127.0.0.1:10002'),/Register explicit/); + console.log('PASS auth fixture exact-origin credential boundary, no forwarding to debugger/provider, no redirects, explicit CDP session'); +})().catch(error=>{console.error(error);process.exitCode=1;}); diff --git a/tests/test_bulk_import.py b/tests/test_bulk_import.py index 8df812cb..c9abbab8 100644 --- a/tests/test_bulk_import.py +++ b/tests/test_bulk_import.py @@ -1,4 +1,5 @@ """Native manifest admission traverses actual HTTP, PostgreSQL and original assets.""" +from auth_helpers import bind_owner from postgres_helpers import database_snapshot, in_transaction, install_failure_trigger import base64 import hashlib @@ -23,7 +24,7 @@ class BulkImportTests(unittest.TestCase): def setUp(self): self.temp = tempfile.TemporaryDirectory() self.addCleanup(self.temp.cleanup) - self.dataset = Dataset(self.temp.name) + self.dataset = Dataset(self.temp.name); self.actor = bind_owner(self, self.dataset) self.open_server() self.addCleanup(self.close) stream = io.BytesIO() @@ -43,7 +44,7 @@ def close(self): self.dataset.close() def request(self, route, body=None): - request = urllib.request.Request(self.root + route, + request = self.actor.request(self.root + route, data=json.dumps(body).encode() if body is not None else None, headers={'Content-Type': 'application/json'}) try: @@ -84,7 +85,7 @@ def test_mixed_sources_keep_originals_provenance_and_draft_review_after_restart( self.assertEqual(record['provenance']['source_sha256'], hashlib.sha256(self.raw).hexdigest()) before = [self.dataset.workbench.get(result['record_id']) for result in (text, image)] self.close() - self.dataset = Dataset(self.temp.name) + self.dataset = Dataset(self.temp.name); self.actor = bind_owner(self, self.dataset) self.open_server() for body, result, old in zip((text_body, image_body), (text, image), before): status, found = self.request('/api/workbench/import-result/' + body['request_id']) diff --git a/tests/test_caption_exports.py b/tests/test_caption_exports.py index ec899f3c..a34ab84c 100644 --- a/tests/test_caption_exports.py +++ b/tests/test_caption_exports.py @@ -6,6 +6,7 @@ SHA-256. Set TULDOK_CAPTION_CONSUMER to execute a separate checkout; its bytes must match the same pin. All generated datasets and images live in /tmp. """ +from auth_helpers import bind_owner import base64 import hashlib import io @@ -160,13 +161,13 @@ class CaptionReleaseTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(prefix='caption-release-', dir='/tmp') self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(lambda: self.dataset.close()) self.workbench = self.dataset.workbench def reopen(self): self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.workbench = self.dataset.workbench def image(self, color, groups=None, parents=None, size=(512, 512), @@ -520,7 +521,7 @@ def test_frozen_release_survives_annotation_edit_delete_and_reopen(self): def test_generation_prompt_remains_provenance_not_caption(self): prompt = 'Generate a dramatic blue panel; this is not its caption.' result = {'image': base64.b64encode(image_bytes('blue')).decode('ascii'), 'metadata': {'seed': 7}} - with patch.object(self.dataset.image_requests, 'generate', return_value=result) as generate: + with patch.object(self.dataset.image_requests, '_generate_admitted', return_value=result) as generate: self.dataset.generation_jobs.start(dict(server_url='http://localhost:1234', model='fixture-image-model', prompt=prompt, width=512, height=512, count=1, strategy='repeat', session_id='generated-panel', seed=7)) self.dataset.generation_jobs.worker.join(10) diff --git a/tests/test_caption_import.py b/tests/test_caption_import.py index 3d5891c7..6ea4be56 100644 --- a/tests/test_caption_import.py +++ b/tests/test_caption_import.py @@ -1,4 +1,5 @@ """Native caption admission through real HTTP/PostgreSQL/Pillow/frozen consumer.""" +from auth_helpers import bind_owner, ExplicitOwnerFixture from postgres_helpers import drop_failure_trigger, in_transaction, independent_reader, install_failure_trigger import base64 from concurrent.futures import ThreadPoolExecutor @@ -33,7 +34,7 @@ def setUp(self): self.temp = tempfile.TemporaryDirectory(prefix='caption-import-') self.addCleanup(self.temp.cleanup) self.path = Path(self.temp.name) - self.dataset = Dataset(self.path / 'dataset') + self.dataset = Dataset(self.path / 'dataset'); self.actor = bind_owner(self, self.dataset) self.open_server() self.addCleanup(self.close) self.source = dict(manifest=(FIXTURE / 'manifest.json').read_text(), metadata={ @@ -49,7 +50,7 @@ def close(self): self.server.shutdown(); self.server.server_close(); self.dataset.close() def request(self, route, body=None): - request = urllib.request.Request(self.root + route, + request = self.actor.request(self.root + route, data=json.dumps(body).encode() if body is not None else None, headers={'Content-Type': 'application/json'}) try: @@ -101,7 +102,7 @@ def test_native_roundtrip_persists_draft_identity_history_splits_and_requires_ne admitted.append((body, record, origin)) self.assertTrue(any(r['source_sha256'] != origin['source_sha256'] for _, r, origin in admitted)) before = self.dataset.workbench._all() - self.close(); self.dataset = Dataset(self.path / 'dataset'); self.open_server() + self.close(); self.dataset = Dataset(self.path / 'dataset'); self.actor = bind_owner(self, self.dataset); self.open_server() self.assertEqual(self.dataset.workbench._all(), before) for body, record, _ in admitted: status, saved = self.request('/api/workbench/import-result/' + body['request_id']) @@ -121,7 +122,7 @@ def test_native_roundtrip_persists_draft_identity_history_splits_and_requires_ne next(item for item in release_body['items'] if item['id'] == record['id'])['revision'] = reviewed['revision'] status, release = self.request('/api/workbench/releases', release_body) self.assertEqual(status, 201, release) - with urllib.request.urlopen(self.root + release['url']) as response: archive_bytes = response.read() + with urllib.request.urlopen(self.actor.request(self.root + release['url'])) as response: archive_bytes = response.read() self.assertEqual(hashlib.sha256(archive_bytes).hexdigest(), release['id']) destination = self.path / 'consumer'; destination.mkdir() with zipfile.ZipFile(io.BytesIO(archive_bytes)) as archive: archive.extractall(destination) @@ -272,35 +273,37 @@ def test_new_source_partition_does_not_reassign_existing_unassigned_legacy_asset def test_native_export_with_unselected_text_ancestor_preserves_foreign_lineage(self): producer = Dataset(self.path / 'producer') - try: - ancestor = producer.workbench.import_asset(dict(kind='text', text='Authored source notes.', - groups=['caption-source-notes'], rights='Authored')) - rows = [] - for index, record in enumerate(self.manifest['records'][:3]): - row = producer.workbench.import_asset(dict(kind='image', - image=base64.b64encode((FIXTURE / record['asset']).read_bytes()).decode(), - groups=['producer-image-' + str(index)], parents=[ancestor['id']] if index == 0 else [])) - rows.append(producer.workbench.save(row['id'], dict(revision=row['revision'], - source_revision=row['source_revision'], task='image_caption', annotation=record['annotation'], - groups=row['groups'], review='human_reviewed'))) - release = producer.releases.create(dict(format='image_caption_v1', seed=42, - ratios={'train':34,'validation':33,'test':33}, - items=[{key:row[key] for key in ('id','revision','source_revision')} for row in rows])) - with zipfile.ZipFile(producer.releases.locate(release['id'])) as archive: - source = dict(manifest=archive.read('manifest.json').decode(), metadata={ - split:archive.read(split+'/metadata.jsonl').decode() for split in ('train','val','test')}) - prepared = self.prepare(source) - selected = next(item for item in prepared if item['asset'].endswith(rows[0]['id'] + '.png')) - body = dict(token=selected['token'], asset=selected['asset'], request_id=uuid.uuid4().hex, - image=base64.b64encode(archive.read(selected['asset'])).decode()) - status, receipt = self.request('/api/workbench/caption-import/row', body) - self.assertEqual(status,201,receipt) - imported = self.dataset.workbench.get(receipt['record_id']) - self.assertEqual(imported['parents'],[]) - declared = imported['provenance']['acquisition']['declared']['protected_component'] - self.assertIn(ancestor['id'], [member['id'] for member in declared]) - self.assertIn('caption-origin:' + hashlib.sha256(('id:'+ancestor['id']).encode()).hexdigest(), imported['groups']) - finally: producer.close() + with ExplicitOwnerFixture.bootstrap(producer).bound(producer): + try: + ancestor = producer.workbench.import_asset(dict(kind='text', text='Authored source notes.', + groups=['caption-source-notes'], rights='Authored')) + rows = [] + for index, record in enumerate(self.manifest['records'][:3]): + row = producer.workbench.import_asset(dict(kind='image', + image=base64.b64encode((FIXTURE / record['asset']).read_bytes()).decode(), + groups=['producer-image-' + str(index)], parents=[ancestor['id']] if index == 0 else [])) + rows.append(producer.workbench.save(row['id'], dict(revision=row['revision'], + source_revision=row['source_revision'], task='image_caption', annotation=record['annotation'], + groups=row['groups'], review='human_reviewed'))) + release = producer.releases.create(dict(format='image_caption_v1', seed=42, + ratios={'train':34,'validation':33,'test':33}, + items=[{key:row[key] for key in ('id','revision','source_revision')} for row in rows])) + with zipfile.ZipFile(producer.releases.locate(release['id'])) as archive: + source = dict(manifest=archive.read('manifest.json').decode(), metadata={ + split:archive.read(split+'/metadata.jsonl').decode() for split in ('train','val','test')}) + prepared = self.prepare(source) + selected = next(item for item in prepared if item['asset'].endswith(rows[0]['id'] + '.png')) + body = dict(token=selected['token'], asset=selected['asset'], request_id=uuid.uuid4().hex, + image=base64.b64encode(archive.read(selected['asset'])).decode()) + status, receipt = self.request('/api/workbench/caption-import/row', body) + self.assertEqual(status,201,receipt) + with self.actor.bound(self.dataset): + imported = self.dataset.workbench.get(receipt['record_id']) + self.assertEqual(imported['parents'],[]) + declared = imported['provenance']['acquisition']['declared']['protected_component'] + self.assertIn(ancestor['id'], [member['id'] for member in declared]) + self.assertIn('caption-origin:' + hashlib.sha256(('id:'+ancestor['id']).encode()).hexdigest(), imported['groups']) + finally: producer.close() def test_unselected_lineage_and_context_bounds_fail_before_admission(self): family_key = next(key for key, family in self.manifest['protected_components'].items() if len(family)>1) diff --git a/tests/test_caption_proposals.py b/tests/test_caption_proposals.py index 87dc9930..55ad7a1e 100644 --- a/tests/test_caption_proposals.py +++ b/tests/test_caption_proposals.py @@ -1,3 +1,4 @@ +from auth_helpers import bind_owner import base64 from postgres_helpers import database_snapshot import hashlib @@ -26,7 +27,7 @@ class CaptionProposalTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(); self.addCleanup(self.tmp.cleanup) - self.data = Dataset(self.tmp.name); self.addCleanup(lambda: self.data.close()) + self.data = Dataset(self.tmp.name); self.actor = bind_owner(self, self.data); self.addCleanup(lambda: self.data.close()) self.server, self.url, self.requests = start() self.addCleanup(self.server.server_close); self.addCleanup(self.server.shutdown) self.row = self.image('blue') @@ -81,7 +82,7 @@ def test_actual_image_http_exact_evidence_draft_and_idempotent_apply(self): state=self.state();again=self.decide(job) self.assertFalse(again['changed']);self.assertEqual(self.state(),state) self.assertEqual(json.loads(self.data.db.execute('SELECT snapshot FROM workbench_history WHERE id=%s AND revision=%s',(row['id'],row['revision'])).fetchone()[0])['target_proposal'],row['target_proposal']) - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.caption_proposals.get(job['id'])['application']['revision'],row['revision']) self.assertEqual(self.data.workbench.get(row['id'])['target_proposal'],row['target_proposal']) @@ -176,6 +177,8 @@ def retained_hashes(): decode = json.loads decoded_sizes = [] def projected_only(data, *args, **kwargs): + if not data.lstrip().startswith('{'): + return decode(data, *args, **kwargs) self.assertNotIn('"input_image_base64"', data, 'Polling must not materialize retained image payloads in Python') self.assertNotIn('"raw_response_base64"', data, @@ -226,6 +229,8 @@ def update(): errors.append(error) def outside_lock(data, *args, **kwargs): nonlocal started + if not data.lstrip().startswith('{'): + return decode(data, *args, **kwargs) self.assertFalse(observed.held, 'Status JSON decoding must occur after releasing the shared lock') if not started: started = True @@ -338,12 +343,12 @@ def held(job,stop): self.data.caption_proposals.cancel({'job_id':job['id']});release.set();self.data.caption_proposals.worker.join(3) self.assertEqual(self.data.caption_proposals.get(job['id'])['status'],'cancelled') job=self.data.caption_proposals.start(self.config(instruction='slow'));self.wait(lambda:len(self.requests)>1) - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.caption_proposals.get(job['id'])['status'],'cancelled') # Persist the state a killed process would have left, then exercise startup. with self.data.lock,self.data.db.transaction(): interrupted=self.data.caption_proposals.get(job['id']);interrupted['status']='generating';self.data.caption_proposals._save(interrupted) - self.data.close();count=len(self.requests);self.data=Dataset(self.tmp.name) + self.data.close();count=len(self.requests);self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.caption_proposals.get(job['id'])['status'],'interrupted');self.assertEqual(len(self.requests),count) def test_review_export_consumer_evidence_history_and_fixed_selection(self): @@ -373,8 +378,9 @@ def test_review_export_consumer_evidence_history_and_fixed_selection(self): def test_concurrent_apply_produces_one_revision(self): job=self.generate();results=[];errors=[] def apply(): - try:results.append(self.decide(job)) - except Exception as error:errors.append(error) + with self.actor.bound(self.data): + try:results.append(self.decide(job)) + except Exception as error:errors.append(error) threads=[threading.Thread(target=apply) for _ in range(2)] for thread in threads:thread.start() for thread in threads:thread.join(3) @@ -386,7 +392,7 @@ def test_http_routes_reject_approval_and_return_persisted_receipt(self): thread=threading.Thread(target=server.serve_forever,daemon=True);thread.start() base=f'http://127.0.0.1:{server.server_port}/api/workbench/' def request(path,body=None): - req=urllib.request.Request(base+path,data=None if body is None else json.dumps(body).encode(),headers={'Content-Type':'application/json'}) + req=self.actor.request(base+path,data=None if body is None else json.dumps(body).encode(),headers={'Content-Type':'application/json'}) with urllib.request.urlopen(req,timeout=5) as response:return json.load(response) try: body=self.config();job=request('caption-proposals',body);self.data.caption_proposals.worker.join(3) @@ -445,6 +451,6 @@ def test_thread_launch_failure_terminalizes_attempt_and_keeps_shutdown_safe(self self.assertEqual(job['status'],'failed');self.assertIn('no inference ran',job['error']) self.assertIsNone(self.data.caption_proposals.worker);self.assertIsNone(self.data.caption_proposals.active_id) self.assertEqual(self.requests,[]) - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.caption_proposals.get(job['id'])['status'],'failed') self.assertEqual(self.generate()['status'],'completed') diff --git a/tests/test_combined_workbench.py b/tests/test_combined_workbench.py index 70b6da6a..f80ae170 100644 --- a/tests/test_combined_workbench.py +++ b/tests/test_combined_workbench.py @@ -98,7 +98,7 @@ def freeze(self, body): self.assertTrue(preview['eligible'], preview) release = self.call('releases', dict(body, preview_token=preview['preview_token'])) self.last_release_url = release['url'] - with urllib.request.urlopen(self.root+release['url']) as response: + with urllib.request.urlopen(self.actor.request(self.root+release['url'])) as response: return response.read() def test_native_draft_rights_answers_fixed_pairs_and_both_actual_exports(self): @@ -151,7 +151,7 @@ def test_native_draft_rights_answers_fixed_pairs_and_both_actual_exports(self): self.assertEqual(row['annotation'], parent['annotation']) self.assertEqual(row['provenance']['rights_note_correction']['note'], 'Local note') self.assertEqual(self.call('records/'+parent['id']+'/responses')['responses'], answers) - with urllib.request.urlopen(self.root+instruction_url) as response: + with urllib.request.urlopen(self.actor.request(self.root+instruction_url)) as response: self.assertEqual(response.read(), instruction, 'The older frozen answer archive remains immutable') def test_response_review_is_not_parent_annotation_and_legacy_reports_roll_back_all_tables(self): diff --git a/tests/test_curation.py b/tests/test_curation.py index 48082fea..e200437d 100644 --- a/tests/test_curation.py +++ b/tests/test_curation.py @@ -1,4 +1,5 @@ """Actual HTTP and SQL facts, including rollback-only legacy enrollment.""" +from auth_helpers import bind_owner from postgres_helpers import database_snapshot, in_transaction import base64 import io @@ -20,7 +21,7 @@ class CurationTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(); self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name); self.w = self.dataset.workbench + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset); self.w = self.dataset.workbench self.server = ThreadingHTTPServer(('127.0.0.1', 0), make_handler(self.dataset)) threading.Thread(target=self.server.serve_forever, daemon=True).start() self.addCleanup(self.close) @@ -30,7 +31,7 @@ def close(self): self.server.shutdown(); self.server.server_close(); self.dataset.close() def request(self, body): - req = urllib.request.Request(self.root+'/api/workbench/curation', data=json.dumps(body).encode(), + req = self.actor.request(self.root+'/api/workbench/curation', data=json.dumps(body).encode(), headers={'Content-Type':'application/json'}) try: with urllib.request.urlopen(req) as response: return response.status, json.load(response) diff --git a/tests/test_dataset.py b/tests/test_dataset.py index d2858b4f..f584325b 100644 --- a/tests/test_dataset.py +++ b/tests/test_dataset.py @@ -1,3 +1,4 @@ +from auth_helpers import bind_owner import base64 from postgres_helpers import install_failure_trigger import io @@ -30,7 +31,7 @@ class DatasetTests(unittest.TestCase): def setUp(self): self.tmp=tempfile.TemporaryDirectory() self.addCleanup(self.tmp.cleanup) - self.data=Dataset(self.tmp.name) + self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.addCleanup(self.data.close) def add(self,color='beige',book='book-a',session='desk',split='unassigned'): diff --git a/tests/test_export_runs.py b/tests/test_export_runs.py index e613f1a2..4141c5ec 100644 --- a/tests/test_export_runs.py +++ b/tests/test_export_runs.py @@ -1,4 +1,5 @@ """Actual PostgreSQL classification exports run without a training interpreter.""" +from auth_helpers import bind_owner, execute_admitted import copy import hashlib import json @@ -70,7 +71,7 @@ def test_real_export_without_training_runtime_and_reopen(self): self.dataset.runs.expose_test(run['id'], {'reason': 'No model exists'}) self.assertEqual(self.dataset.db.execute('SELECT count(*) FROM workspace_exposures').fetchone()[0], 0) self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(self.dataset.runs.get(run['id'])['artifacts'], result['artifacts']) self.assertEqual(json.loads(self.dataset.runs.artifact(run['id'], 'validation-report.json')[0]), report) @@ -103,7 +104,7 @@ def test_changed_source_after_admission_and_stale_definitions_do_not_publish(sel run = self.dataset.runs.submit(body) path = self.dataset.releases.locate(self.release['id']) path.write_bytes(path.read_bytes() + b'changed-after-admission') - self.dataset.runs._execute(run['id']) + execute_admitted(self.dataset, run['id']) result = self.dataset.runs.get(run['id']) self.assertEqual(result['state'], 'failed') self.assertEqual(result['artifacts'], []) @@ -116,10 +117,11 @@ def test_cancel_during_read_then_retry_fresh(self): inspect = self.dataset.pipelines.inspect_release def cancel_after_read(*args, **kwargs): result = inspect(*args, **kwargs) - self.dataset.runs.cancel(run['id']) + with self.actor.bound(self.dataset): + self.dataset.runs.cancel(run['id']) return result with patch.object(self.dataset.pipelines, 'inspect_release', side_effect=cancel_after_read): - self.dataset.runs._execute(run['id']) + execute_admitted(self.dataset, run['id']) self.assertEqual(self.dataset.runs.get(run['id'])['state'], 'cancelled') self.assertFalse((self.dataset.runs.path / run['id']).exists()) retry = self.dataset.runs.retry(run['id'], {'request_key': self.kind + '-export-retry-0001'}) diff --git a/tests/test_generation_job_api.py b/tests/test_generation_job_api.py index 2b9a8d5e..f21074ec 100644 --- a/tests/test_generation_job_api.py +++ b/tests/test_generation_job_api.py @@ -1,4 +1,5 @@ """New queued HTTP input cannot masquerade as a legacy saved generation job.""" +from auth_helpers import bind_owner import json import tempfile import threading @@ -18,7 +19,7 @@ def setUp(self): self.addCleanup(self.gateway.shutdown) self.temp = tempfile.TemporaryDirectory() self.addCleanup(self.temp.cleanup) - self.dataset = Dataset(self.temp.name) + self.dataset = Dataset(self.temp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.server = ThreadingHTTPServer(('127.0.0.1', 0), make_handler(self.dataset)) threading.Thread(target=self.server.serve_forever, daemon=True).start() @@ -31,7 +32,7 @@ def body(self): count=1, strategy='repeat', seed=40, session_id='queued-http') def post(self, route, body): - request = urllib.request.Request(self.root + route, data=json.dumps(body).encode(), + request = self.actor.request(self.root + route, data=json.dumps(body).encode(), headers={'Content-Type': 'application/json'}) with urllib.request.urlopen(request) as response: return response.status, json.load(response) diff --git a/tests/test_grounded_candidates.py b/tests/test_grounded_candidates.py index 32c08597..6c640add 100644 --- a/tests/test_grounded_candidates.py +++ b/tests/test_grounded_candidates.py @@ -1,3 +1,4 @@ +from auth_helpers import bind_owner import base64 import hashlib import json @@ -19,7 +20,7 @@ class GroundedTests(unittest.TestCase): def setUp(self): self.tmp=tempfile.TemporaryDirectory();self.addCleanup(self.tmp.cleanup) - self.data=Dataset(self.tmp.name);self.addCleanup(lambda:self.data.close()) + self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data);self.addCleanup(lambda:self.data.close()) self.server,self.url,self.requests=start() self.addCleanup(self.server.server_close);self.addCleanup(self.server.shutdown) self.source=self.data.workbench.import_asset(dict(kind='text',text='Please cancel the café meeting 😀.',name='Request',groups=['customer-1'],rights='User-owned fixture')) @@ -78,7 +79,7 @@ def test_short_http_body_with_valid_json_fails_before_candidates(self): self.assertIn('Content-Length',job['error']) self.assertEqual(job['candidates'],[]) self.assertEqual(self.data.workbench.query({})['total'],1) - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.grounded.get(job['id'])['status'],'failed') def test_utf16_response_keeps_exact_bytes_and_hash_after_reopen(self): @@ -91,7 +92,7 @@ def test_utf16_response_keeps_exact_bytes_and_hash_after_reopen(self): if mode=='utf16':self.assertIsNone(job['raw_response']) else:self.assertEqual(job['raw_response'].encode('utf-8'),raw) self.assertNotIn('raw_response_base64',self.data.grounded.snapshot()['jobs'][0]) - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.grounded.get(job['id'])['raw_response_base64'],job['raw_response_base64']) def test_cancel_stalled_catalog_releases_worker_without_chat(self): @@ -142,17 +143,17 @@ def test_cancel_transport_late_output_and_reopen(self): self.data.grounded.worker.join(3);self.assertFalse(self.data.grounded.worker.is_alive()) final=self.data.grounded.get(job['id']);self.assertEqual(final['status'],'cancelled');self.assertGreater(final['revision'],stopping['job']['revision']) self.assertEqual(final['candidates'],[]) - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.grounded.get(job['id'])['status'],'cancelled') with self.data.lock,self.data.db.transaction(): final['status']='generating';self.data.grounded._save(final) - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.grounded.get(job['id'])['status'],'interrupted') self.assertIsNone(self.data.grounded.worker) def test_admitted_identity_and_pending_candidates_survive_reopen(self): job=self.generate();record=self.data.grounded.review(job['id'],self.decision(job))['record'] - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) restored=self.data.grounded.get(job['id']) self.assertEqual(restored['candidates'][0]['record_id'],record['id']) self.assertEqual(restored['candidates'][1]['status'],'pending_review') @@ -174,7 +175,7 @@ def test_admitted_rejected_and_cancelled_request_survive_same_reopen(self): before=self.data.grounded.snapshot() self.assertEqual([candidate['status'] for candidate in rejected['candidates']],['admitted','rejected']) self.assertEqual(self.data.grounded.get(slow['id'])['status'],'cancelled') - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.grounded.snapshot(),before) restored=self.data.grounded.get(job['id']) self.assertEqual(restored['candidates'][0]['record_id'],record['id']) @@ -200,7 +201,7 @@ def test_http_models_jobs_review_and_release_boundary(self): self.addCleanup(server.server_close);self.addCleanup(server.shutdown) root=f'http://127.0.0.1:{server.server_port}/api/workbench/' def api(path,body=None): - request=urllib.request.Request((f'http://127.0.0.1:{server.server_port}'+path if path.startswith('/') else root+path),data=json.dumps(body).encode() if body is not None else None, + request=self.actor.request((f'http://127.0.0.1:{server.server_port}'+path if path.startswith('/') else root+path),data=json.dumps(body).encode() if body is not None else None, headers={'Content-Type':'application/json'}) with urllib.request.urlopen(request) as response:return json.load(response) self.assertEqual(api('/api/generation/prompt-models',{'server_url':self.url})['models'],[{'id':'grounded-text-test','name':'grounded-text-test'}]) diff --git a/tests/test_image_classification_export.py b/tests/test_image_classification_export.py index 931b3937..34613822 100644 --- a/tests/test_image_classification_export.py +++ b/tests/test_image_classification_export.py @@ -1,4 +1,5 @@ """Trainer-specific projection, custody, split and immutable release regressions.""" +from auth_helpers import bind_owner import base64 import hashlib import io @@ -27,7 +28,7 @@ class ClassificationReleaseTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(prefix='classification-export-') self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.workbench = self.dataset.workbench self.ordinal = 0 @@ -242,7 +243,7 @@ def test_actual_http_preview_freeze_download_and_stale_rejection(self): self.addCleanup(server.server_close) self.addCleanup(lambda: (server.shutdown(), thread.join())) def request(route, body=None): - req = urllib.request.Request(f'http://127.0.0.1:{server.server_port}' + route, + req = self.actor.request(f'http://127.0.0.1:{server.server_port}' + route, data=json.dumps(body).encode() if body is not None else None, headers={'Content-Type': 'application/json'}) try: diff --git a/tests/test_image_generation.py b/tests/test_image_generation.py index 90d78714..93e7f74b 100644 --- a/tests/test_image_generation.py +++ b/tests/test_image_generation.py @@ -1,3 +1,5 @@ +from auth_helpers import bind_owner +import tempfile import base64 import json import socket @@ -8,6 +10,7 @@ from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer from pathlib import Path sys.path.insert(0, str(Path(__file__).resolve().parents[1])) +from app import Dataset import image_generation from fake_images import png, start @@ -15,7 +18,10 @@ class ImageGenerationTests(unittest.TestCase): def setUp(self): self.server, self.url, self.requests = start() - self.manager = image_generation.ImageRequests() + temporary = tempfile.TemporaryDirectory(); self.addCleanup(temporary.cleanup) + self.dataset = Dataset(temporary.name); self.addCleanup(self.dataset.close) + self.actor = bind_owner(self, self.dataset) + self.manager = image_generation.ImageRequests(self.dataset.access) def tearDown(self): self.server.shutdown() self.server.server_close() @@ -105,10 +111,11 @@ def do_POST(self): def test_transport_closing_cancellation_reports_no_retry(self): errors = [] def generate(): - try: - self.manager.generate(self.body('slow')) - except ValueError as error: - errors.append(str(error)) + with self.actor.bound(self.dataset): + try: + self.manager.generate(self.body('slow')) + except ValueError as error: + errors.append(str(error)) worker = threading.Thread(target=generate) worker.start() wait_until = time.monotonic()+3 @@ -173,10 +180,11 @@ def test_additive_public_metadata_is_tolerated(self): def test_cancel_closes_transport_and_allows_next_request_without_retry(self): errors = [] def generate(): - try: - self.manager.generate(self.body('slow')) - except ValueError as error: - errors.append(str(error)) + with self.actor.bound(self.dataset): + try: + self.manager.generate(self.body('slow')) + except ValueError as error: + errors.append(str(error)) worker = threading.Thread(target=generate) worker.start() wait_until = time.monotonic()+3 diff --git a/tests/test_image_training.py b/tests/test_image_training.py index 42d6a0c1..ba630ec7 100644 --- a/tests/test_image_training.py +++ b/tests/test_image_training.py @@ -3,6 +3,7 @@ TULDOK_TRAINING_PYTHON selects the separately installed runtime. The real epoch test is skipped explicitly when absent; the M2 qualification job must set it. """ +from auth_helpers import bind_owner import hashlib import json import math @@ -89,7 +90,7 @@ def setUp(self): self.temporary = tempfile.TemporaryDirectory(prefix='image-training-') self.addCleanup(self.temporary.cleanup) self.root = Path(self.temporary.name) - self.dataset = Dataset(self.root / 'data') + self.dataset = Dataset(self.root / 'data'); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.records = populate(self.dataset) request = dict(format='image_classification_v1', seed=42, diff --git a/tests/test_instruction_responses.py b/tests/test_instruction_responses.py index a1779325..07f7d239 100644 --- a/tests/test_instruction_responses.py +++ b/tests/test_instruction_responses.py @@ -1,4 +1,5 @@ """Independent answers, real persistence/HTTP, exact proof and frozen artifacts.""" +from auth_helpers import bind_owner from concurrent.futures import ThreadPoolExecutor from postgres_helpers import install_failure_trigger import hashlib @@ -22,7 +23,7 @@ class InstructionResponsesTests(unittest.TestCase): def setUp(self): self.temp = tempfile.TemporaryDirectory(); self.addCleanup(self.temp.cleanup) self.path = Path(self.temp.name) - self.d = Dataset(self.path); self.addCleanup(lambda: self.d.close()) + self.d = Dataset(self.path); self.actor = bind_owner(self, self.d); self.addCleanup(lambda: self.d.close()) self.w, self.r = self.d.workbench, self.d.releases def prompt(self, name='prompt', groups=None, parents=None): @@ -77,7 +78,7 @@ def test_two_responses_preserve_existing_target_siblings_and_original_source(sel self.assertEqual(self.w.history(parent['id']), history) snapshots = self.w.response_history(a['id'])['history']; self.assertEqual(len(snapshots), 2) self.assertEqual(snapshots[0]['response'], a); self.assertEqual(snapshots[1]['parent'], parent) - self.d.close(); self.d = Dataset(self.path); self.w, self.r = self.d.workbench, self.d.releases + self.d.close(); self.d = Dataset(self.path); self.actor = bind_owner(self, self.d); self.w, self.r = self.d.workbench, self.d.releases self.assertEqual(self.w._response(a['id']), changed); self.assertEqual(self.w.get(parent['id']), parent) def test_exact_unicode_and_shared_text_bound_no_trimming_or_normalization(self): @@ -212,7 +213,7 @@ def test_http_end_to_end_and_concurrent_cas(self): server=ThreadingHTTPServer(('127.0.0.1',0),make_handler(self.d)) threading.Thread(target=server.serve_forever,daemon=True).start();self.addCleanup(server.server_close);self.addCleanup(server.shutdown) def request(route,body=None): - req=urllib.request.Request(f'http://127.0.0.1:{server.server_port}/api/workbench/'+route,data=None if body is None else json.dumps(body).encode(),headers={'Content-Type':'application/json'}) + req=self.actor.request(f'http://127.0.0.1:{server.server_port}/api/workbench/'+route,data=None if body is None else json.dumps(body).encode(),headers={'Content-Type':'application/json'}) try: with urllib.request.urlopen(req) as result:return result.status,json.load(result) except urllib.error.HTTPError as error:return error.code,json.load(error) @@ -225,4 +226,4 @@ def request(route,body=None): current=result['responses'][0];status,saved=request('responses',self.payload(parent,response=current,completion='Changed',review='human_reviewed'));self.assertEqual(status,200) body=self.body([(parent,saved['response'])]);status,preview=request('releases/preview',body);self.assertEqual(status,200);self.assertTrue(preview['eligible']) status,release=request('releases',dict(body,preview_token=preview['preview_token']));self.assertEqual(status,201,release) - with urllib.request.urlopen(f'http://127.0.0.1:{server.server_port}'+release['url']) as download:self.assertEqual(hashlib.sha256(download.read()).hexdigest(),release['id']) + with urllib.request.urlopen(self.actor.request(f'http://127.0.0.1:{server.server_port}'+release['url'])) as download:self.assertEqual(hashlib.sha256(download.read()).hexdigest(),release['id']) diff --git a/tests/test_mesh_release.py b/tests/test_mesh_release.py index a649f216..fa12a54e 100644 --- a/tests/test_mesh_release.py +++ b/tests/test_mesh_release.py @@ -1,4 +1,5 @@ """Real frozen exports with independent authored geometry and archive mutations.""" +from auth_helpers import bind_owner import copy import hashlib import io @@ -40,7 +41,7 @@ class MeshRelease(unittest.TestCase): def setUp(self): self.temporary = tempfile.TemporaryDirectory() self.addCleanup(self.temporary.cleanup) - self.dataset = Dataset(self.temporary.name) + self.dataset = Dataset(self.temporary.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.workbench = self.dataset.workbench diff --git a/tests/test_mesh_runs.py b/tests/test_mesh_runs.py index 07523317..866870b4 100644 --- a/tests/test_mesh_runs.py +++ b/tests/test_mesh_runs.py @@ -1,4 +1,5 @@ """Real mesh recipe admission, report custody and local supervisor lifecycle.""" +from auth_helpers import bind_owner, execute_admitted import copy import hashlib import json @@ -68,7 +69,7 @@ def test_actual_three_stage_run_and_durable_download(self): self.dataset.runs.expose_test(run['id'], {'reason': 'Not applicable'}) self.assertEqual(self.dataset.db.execute('SELECT count(*) FROM workspace_exposures').fetchone()[0], 0) self.dataset.close() - self.dataset = Dataset(self.temporary.name) + self.dataset = Dataset(self.temporary.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.assertEqual(self.dataset.runs.get(run['id'])['artifacts'], result['artifacts']) self.assertEqual(json.loads(self.dataset.runs.artifact(run['id'], 'validation-report.json')[0]), report) @@ -93,10 +94,11 @@ def test_cancel_during_validation_never_publishes_and_retry_is_fresh(self): inspect = self.dataset.pipelines.inspect_release def cancel_after_inspect(*args, **kwargs): result = inspect(*args, **kwargs) - self.dataset.runs.cancel(run['id']) + with self.actor.bound(self.dataset): + self.dataset.runs.cancel(run['id']) return result with patch.object(self.dataset.pipelines, 'inspect_release', side_effect=cancel_after_inspect): - self.dataset.runs._execute(run['id']) + execute_admitted(self.dataset, run['id']) self.assertEqual(self.dataset.runs.get(run['id'])['state'], 'cancelled') self.assertFalse((self.dataset.runs.path / run['id']).exists()) retry = self.dataset.runs.retry(run['id'], {'request_key': 'mesh-retry-0001'}) @@ -111,7 +113,7 @@ def test_interrupted_in_process_work_is_not_replayed(self): stored['state'] = 'running' self.dataset.runs._save(stored) self.dataset.close() - self.dataset = Dataset(self.temporary.name) + self.dataset = Dataset(self.temporary.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.assertEqual(self.dataset.runs.get(run['id'])['state'], 'interrupted') self.assertFalse((self.dataset.runs.path / run['id']).exists()) @@ -139,7 +141,7 @@ def test_stale_definition_fails_without_publication(self): probe = self.dataset.pipelines.probe(release_validation.RECIPE) probe['adapter_definition_sha256'] = '0' * 64 with patch.object(self.dataset.pipelines, 'probe', return_value=probe): - self.dataset.runs._execute(run['id']) + execute_admitted(self.dataset, run['id']) result = self.dataset.runs.get(run['id']) self.assertEqual(result['state'], 'failed') self.assertEqual(result['error']['code'], 'stale') diff --git a/tests/test_meshes.py b/tests/test_meshes.py index 233e6a1d..00933e19 100644 --- a/tests/test_meshes.py +++ b/tests/test_meshes.py @@ -1,4 +1,5 @@ """Actual authored ASCII PLY inputs; analytic oracles, no Rheon execution.""" +from auth_helpers import bind_owner from postgres_helpers import drop_failure_trigger, install_failure_trigger, observed_statements import base64 import copy @@ -47,7 +48,7 @@ def body(raw, sidecar, **options): class Meshes(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(); self.addCleanup(self.tmp.cleanup) - self.d = Dataset(self.tmp.name); self.addCleanup(lambda: self.d.close()); self.w = self.d.workbench + self.d = Dataset(self.tmp.name); self.actor = bind_owner(self, self.d); self.addCleanup(lambda: self.d.close()); self.w = self.d.workbench def add(self, name='tetrahedron', **options): return meshes.admit(self.w, body(*fixture(name), **options)) @@ -88,7 +89,7 @@ def test_actual_authored_fixture_raw_native_roundtrip_bounds_normals_review_righ corrected = self.w.correct_rights_note(row['id'], dict(revision=2, source_revision=1, note='Authored fixture; inspect project terms.'))['record'] self.assertEqual(corrected['review'], 'human_reviewed'); self.assertEqual(len(self.w.history(row['id'])), 3) with self.assertRaisesRegex(WorkbenchError, 'changed'): self.review(row) - self.d.close(); self.d = Dataset(self.tmp.name); self.w = self.d.workbench + self.d.close(); self.d = Dataset(self.tmp.name); self.actor = bind_owner(self, self.d); self.w = self.d.workbench self.assertEqual(self.w.get(row['id']), corrected); self.assertEqual(self.w.asset(row['id'])[0], bundle) def test_float_native_interpretation_and_equivalent_family_keeps_exact_raw(self): @@ -257,7 +258,7 @@ def test_reopen_sequence_preserves_all_bytes_history_rights_and_indexes(self): bundle=self.w.asset(seq['id'])[0];history=self.w.history(seq['id']) before_indexes = [tuple(row) for row in self.d.db.execute( 'SELECT indexname,indexdef FROM pg_indexes WHERE schemaname=current_schema() ORDER BY indexname')] - self.d.close();self.d=Dataset(self.tmp.name);self.w=self.d.workbench + self.d.close();self.d=Dataset(self.tmp.name); self.actor = bind_owner(self, self.d);self.w=self.d.workbench self.assertEqual(self.w.get(seq['id']),corrected);self.assertEqual(self.w.history(seq['id']),history) self.assertEqual(self.w.asset(seq['id'])[0],bundle);self.assertEqual(self.add()['review'],'draft') self.assertEqual([tuple(row) for row in self.d.db.execute( @@ -278,17 +279,17 @@ def test_http_real_import_inspection_duplicate_json_and_request_bound(self): server=ThreadingHTTPServer(('127.0.0.1',0),make_handler(self.d));thread=threading.Thread(target=server.serve_forever,daemon=True);thread.start() self.addCleanup(server.server_close);self.addCleanup(server.shutdown) base=f'http://127.0.0.1:{server.server_port}/api/workbench/' - request=urllib.request.Request(base+'mesh-import',json.dumps(body(*fixture())).encode(),{'Content-Type':'application/json'}) + request=self.actor.request(base+'mesh-import',json.dumps(body(*fixture())).encode(),{'Content-Type':'application/json'}) with urllib.request.urlopen(request) as response:self.assertEqual(response.status,201);row=json.load(response) - with urllib.request.urlopen(base+'mesh-inspection/'+row['id']) as response:self.assertEqual(json.load(response)['sample_count'],4) - request=urllib.request.Request(base+'mesh-import',b'{"files":{},"files":{}}',{'Content-Type':'application/json'}) + with urllib.request.urlopen(self.actor.request(base+'mesh-inspection/'+row['id'])) as response:self.assertEqual(json.load(response)['sample_count'],4) + request=self.actor.request(base+'mesh-import',b'{"files":{},"files":{}}',{'Content-Type':'application/json'}) with self.assertRaises(urllib.error.HTTPError) as error:urllib.request.urlopen(request) self.assertEqual(error.exception.code,400);self.assertIn('duplicate',error.exception.read().decode()) before=self.state() - request=urllib.request.Request(base+'mesh-import',b'{"unexpected":1e-99999999999999999999999999999}',{'Content-Type':'application/json'}) + request=self.actor.request(base+'mesh-import',b'{"unexpected":1e-99999999999999999999999999999}',{'Content-Type':'application/json'}) with self.assertRaises(urllib.error.HTTPError) as error:urllib.request.urlopen(request) self.assertEqual(error.exception.code,400);self.assertEqual(json.loads(error.exception.read())['code'],'invalid');self.assertEqual(self.state(),before) - request=urllib.request.Request(base+'mesh-import',b'{}',{'Content-Type':'application/json','Content-Length':str(meshes.MAX_REQUEST+1)}) + request=self.actor.request(base+'mesh-import',b'{}',{'Content-Type':'application/json','Content-Length':str(meshes.MAX_REQUEST+1)}) with self.assertRaises(urllib.error.HTTPError) as error:urllib.request.urlopen(request) self.assertEqual(error.exception.code,400);self.assertEqual(self.w.query({})['total'],1) diff --git a/tests/test_metadata_filters.py b/tests/test_metadata_filters.py index 76ed7259..0eba69f4 100644 --- a/tests/test_metadata_filters.py +++ b/tests/test_metadata_filters.py @@ -1,4 +1,5 @@ """Exact current-field filtering through real storage and HTTP, without permission inference.""" +from auth_helpers import bind_owner from postgres_helpers import table_names import base64 import io @@ -24,7 +25,7 @@ class MetadataFilterTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(); self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name); self.addCleanup(lambda: self.dataset.close()) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset); self.addCleanup(lambda: self.dataset.close()) self.w = self.dataset.workbench def text(self, name, label=None, groups=None, rights='unknown', parents=None): @@ -146,7 +147,7 @@ def test_validation_uses_existing_field_limits_and_rejects_bad_input(self): def test_current_metadata_queries_survive_reopen_without_schema_or_state_changes(self): row = self.text('reopen', 'é😀', ['case-sensitive'], 'Fixture rights note') tables = table_names(self.w.db) - self.dataset.close(); self.dataset = Dataset(self.tmp.name); self.w = self.dataset.workbench + self.dataset.close(); self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset); self.w = self.dataset.workbench before = database_snapshot(self.w.db) self.assertEqual(self.ids(label='é😀', group='case-sensitive', rights='Fixture rights note'), {row['id']}) self.assertEqual(database_snapshot(self.w.db), before) @@ -159,12 +160,12 @@ def test_real_http_percent_encoded_filters_and_invalid_field_diagnostics(self): self.addCleanup(server.server_close); self.addCleanup(thread.join); self.addCleanup(server.shutdown) options = dict(label='cat & café +😀', group='group &😀', rights='Owner note: ? & + permission unverified') url = f'http://127.0.0.1:{server.server_port}/api/workbench/records?' - with urllib.request.urlopen(url+urllib.parse.urlencode(options)) as response: + with urllib.request.urlopen(self.actor.request(url+urllib.parse.urlencode(options))) as response: result = json.load(response) self.assertEqual(result['total'], 1); self.assertEqual(result['items'][0]['id'], row['id']) self.assertEqual(result['items'][0]['rights_note'], options['rights']) with self.assertRaises(urllib.error.HTTPError) as caught: - urllib.request.urlopen(url+urllib.parse.urlencode({'label': 'x'*81})) + urllib.request.urlopen(self.actor.request(url+urllib.parse.urlencode({'label': 'x'*81}))) self.assertEqual(caught.exception.code, 400) self.assertEqual(json.load(caught.exception)['code'], 'invalid') @@ -180,7 +181,7 @@ def test_internal_line_endings_are_distinct_exact_values_through_storage_and_htt with self.subTest(codepoints=[ord(c) for c in value]): criteria = dict(label=value, group=value, rights=value) self.assertEqual(self.ids(**criteria), {row['id']}) - with urllib.request.urlopen(url+urllib.parse.urlencode(criteria)) as response: + with urllib.request.urlopen(self.actor.request(url+urllib.parse.urlencode(criteria))) as response: result = json.load(response) self.assertEqual([r['id'] for r in result['items']], [row['id']]) self.assertEqual(result['items'][0]['rights_note'], value) diff --git a/tests/test_metadata_migration.py b/tests/test_metadata_migration.py index 114d8381..ab154455 100644 --- a/tests/test_metadata_migration.py +++ b/tests/test_metadata_migration.py @@ -1,4 +1,5 @@ """Real SQLite snapshots and PostgreSQL transfer, recovery and byte-preservation proof.""" +from auth_helpers import bind_owner import json import os from pathlib import Path @@ -267,7 +268,7 @@ def test_archived_real_workflow_reopens_searches_selections_history_preferences_ from app import Dataset from workbench import WorkbenchError with patch('ai_http.request', side_effect=AssertionError('No provider replay')): - dataset = Dataset(self.root / 'dest') + dataset = Dataset(self.root / 'dest'); self.actor = bind_owner(self, dataset) try: row = expected['record']; workbench = dataset.workbench self.assertEqual(workbench.get(row['id']), row) @@ -291,7 +292,7 @@ def test_archived_real_workflow_reopens_searches_selections_history_preferences_ self.assertEqual(file_hash(release), file_hash(FIXTURE / 'releases' / release.name)) finally: dataset.close() - dataset = Dataset(self.root / 'dest') + dataset = Dataset(self.root / 'dest'); self.actor = bind_owner(self, dataset) try: self.assertEqual(dataset.workbench.get(row['id'])['revision'], row['revision'] + 1) finally: @@ -403,7 +404,7 @@ def cli(module, arguments, environment=None): self.assertEqual(cli('backup_metadata.py', ['restore', self.root / 'pg-backup', self.root / 'restored'], environment), restored) from app import Dataset with patch.dict(os.environ, {'TULDOK_DATABASE_URL': restored_dsn}), patch('ai_http.request', side_effect=AssertionError('No provider replay')): - dataset = Dataset(self.root / 'restored') + dataset = Dataset(self.root / 'restored'); self.actor = bind_owner(self, dataset) try: expected = json.loads((FIXTURE / 'expected.json').read_bytes()) self.assertEqual(dataset.workbench.get(expected['record']['id']), expected['record']) diff --git a/tests/test_metadata_transactions.py b/tests/test_metadata_transactions.py index 708b35e3..9d230c96 100644 --- a/tests/test_metadata_transactions.py +++ b/tests/test_metadata_transactions.py @@ -1,4 +1,5 @@ """Real PostgreSQL transaction, independent connection and file publication tests.""" +from auth_helpers import bind_owner import base64 from concurrent.futures import ThreadPoolExecutor from contextlib import contextmanager @@ -28,7 +29,7 @@ class MetadataTransactions(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory() self.addCleanup(self.tmp.cleanup) - self.first = Dataset(self.tmp.name) + self.first = Dataset(self.tmp.name); self.actor = bind_owner(self, self.first) self.addCleanup(self.first.close) def second(self): @@ -82,11 +83,12 @@ def test_two_connections_concurrent_admission_has_one_receipt(self): body = dict(source_name='fixture.jsonl', row_number=1, request_id='a'*32, line=json.dumps(dict(kind='text', text='Concurrent exact content', groups=['one']))) def admit(dataset): - barrier.wait(timeout=5) - try: - return bulk_import.import_row(dataset.workbench, body) - except WorkbenchError as error: - return error + with self.actor.bound(dataset): + barrier.wait(timeout=5) + try: + return bulk_import.import_row(dataset.workbench, body) + except WorkbenchError as error: + return error with ThreadPoolExecutor(max_workers=2) as executor: outcomes = list(executor.map(admit, [self.first, second])) self.assertEqual(sum(isinstance(item, dict) for item in outcomes), 1) @@ -202,8 +204,8 @@ def test_database_outage_returns_structured_http_error(self): self.first.db.connection.close() try: base = 'http://127.0.0.1:' + str(server.server_port) - requests = [urllib.request.Request(base+'/api/workbench/records'), - urllib.request.Request(base+'/api/workbench/import', + requests = [self.actor.request(base+'/api/workbench/records'), + self.actor.request(base+'/api/workbench/import', data=json.dumps(dict(kind='text', text='outage', groups=['one'])).encode(), headers={'Content-Type': 'application/json'})] for request in requests: diff --git a/tests/test_metadata_workers.py b/tests/test_metadata_workers.py index 70cc2668..c993ffbf 100644 --- a/tests/test_metadata_workers.py +++ b/tests/test_metadata_workers.py @@ -1,4 +1,5 @@ """Real PostgreSQL worker ownership and publication failures; no provider inference.""" +from auth_helpers import bind_owner import base64 from contextlib import contextmanager import io @@ -56,6 +57,7 @@ def tearDown(self): def open(self): data = Dataset(self.tmp.name) + self.actor = bind_owner(self, data) self.opened.append(data) return data @@ -141,11 +143,12 @@ def complete(job, stop): barrier, results, errors = threading.Barrier(2), [], [] def apply(owner): - try: - barrier.wait(5) - results.append(owner.decide(job['id'], dict(revision=job['revision'], decision='apply_draft'))) - except BaseException as error: - errors.append(error) + with self.actor.bound(self.data): + try: + barrier.wait(5) + results.append(owner.decide(job['id'], dict(revision=job['revision'], decision='apply_draft'))) + except BaseException as error: + errors.append(error) threads = [threading.Thread(target=apply, args=(data.caption_proposals,)) for data in (self.data, peer)] for thread in threads: @@ -289,7 +292,7 @@ def text_body(value): def test_failed_generation_completion_restores_progress_and_removes_files(self): with rejected_write(self.data.db, 'generation_jobs', condition="NEW.data::json ->> 'completed' = '1'"), \ - patch.object(self.data.image_requests, 'generate', return_value={'image': self.image(), 'metadata': {}}) as provider: + patch.object(self.data.image_requests, '_generate_admitted', return_value={'image': self.image(), 'metadata': {}}) as provider: self.data.generation_jobs.start(self.generation_body()) self.data.generation_jobs.worker.join(5) self.assertFalse(self.data.generation_jobs.worker.is_alive()) diff --git a/tests/test_native_detection_import.py b/tests/test_native_detection_import.py index 743d4860..7a1ed79c 100644 --- a/tests/test_native_detection_import.py +++ b/tests/test_native_detection_import.py @@ -1,4 +1,5 @@ """Actual unchanged native exporter fixtures; no authored COCO stand-in.""" +from auth_helpers import bind_owner, ExplicitOwnerFixture import base64 import hashlib from postgres_helpers import database_snapshot @@ -27,27 +28,28 @@ def native_fixture(path, count=3, name_prefix='Source', book='', programmatic=False, ratios=None): source = Dataset(path) - rows = [] - salt = hashlib.sha256(name_prefix.encode()).digest() - for number in range(count): - image = Image.new('RGB', (12, 8), ((salt[0] + number * 40) % 256, salt[1], salt[2])) - output = io.BytesIO(); exif = Image.Exif(); exif[274] = 6 - image.save(output, 'PNG', exif=exif) - sample = source.add(dict(image=base64.b64encode(output.getvalue()).decode(), filename=f'{name_prefix} {number}.png', - book_id=book, session_id=f'{name_prefix}-session-{number}', split='unassigned')) - row = source.workbench.get(sample['id']) - target = {'boxes': [] if number == 0 else [dict(label='Book é', x=1, y=2, width=3.5, height=4)]} - review = 'programmatically_verified' if programmatic else 'human_reviewed' - verification = dict(method='authored_geometry_fixture', rights='Authored fixture') if programmatic else None - rows.append(source.workbench.save(row['id'], dict(row, annotation=target, review=review), verified_provenance=verification)) - body = dict(items=[{key: row[key] for key in ('id', 'revision', 'source_revision')} for row in rows], - ratios=ratios or dict(train=100, validation=0, test=0), seed=7, format='canonical_v1') - preview = source.releases.preview(body) - assert preview['eligible'], preview - release = source.releases.create(dict(body, preview_token=preview['preview_token'])) - raw = source.releases.locate(release['id']).read_bytes() - source.close() - return raw + with ExplicitOwnerFixture.bootstrap(source).bound(source): + rows = [] + salt = hashlib.sha256(name_prefix.encode()).digest() + for number in range(count): + image = Image.new('RGB', (12, 8), ((salt[0] + number * 40) % 256, salt[1], salt[2])) + output = io.BytesIO(); exif = Image.Exif(); exif[274] = 6 + image.save(output, 'PNG', exif=exif) + sample = source.add(dict(image=base64.b64encode(output.getvalue()).decode(), filename=f'{name_prefix} {number}.png', + book_id=book, session_id=f'{name_prefix}-session-{number}', split='unassigned')) + row = source.workbench.get(sample['id']) + target = {'boxes': [] if number == 0 else [dict(label='Book é', x=1, y=2, width=3.5, height=4)]} + review = 'programmatically_verified' if programmatic else 'human_reviewed' + verification = dict(method='authored_geometry_fixture', rights='Authored fixture') if programmatic else None + rows.append(source.workbench.save(row['id'], dict(row, annotation=target, review=review), verified_provenance=verification)) + body = dict(items=[{key: row[key] for key in ('id', 'revision', 'source_revision')} for row in rows], + ratios=ratios or dict(train=100, validation=0, test=0), seed=7, format='canonical_v1') + preview = source.releases.preview(body) + assert preview['eligible'], preview + release = source.releases.create(dict(body, preview_token=preview['preview_token'])) + raw = source.releases.locate(release['id']).read_bytes() + source.close() + return raw class NativeDetectionImportTests(unittest.TestCase): @@ -55,7 +57,7 @@ def setUp(self): self.temp = tempfile.TemporaryDirectory(); self.addCleanup(self.temp.cleanup) self.path = Path(self.temp.name) self.raw = native_fixture(self.path/'source') - self.dataset = Dataset(self.path/'destination'); self.open_server(); self.addCleanup(self.close) + self.dataset = Dataset(self.path/'destination'); self.actor = bind_owner(self, self.dataset); self.open_server(); self.addCleanup(self.close) def open_server(self): self.server = ThreadingHTTPServer(('127.0.0.1', 0), make_handler(self.dataset)) @@ -66,7 +68,7 @@ def close(self): self.server.shutdown(); self.server.server_close(); self.dataset.close() def request(self, route, body=None): - req = urllib.request.Request(self.root+route, data=json.dumps(body).encode() if body is not None else None, + req = self.actor.request(self.root+route, data=json.dumps(body).encode() if body is not None else None, headers={'Content-Type': 'application/json'}) try: with urllib.request.urlopen(req) as response: @@ -120,7 +122,7 @@ def test_actual_export_roundtrip_review_history_restart_and_immutable_release(se self.assertEqual(context['declared']['upstream'], dict(record=origin, original_status='unavailable')) self.assertEqual(self.dataset.workbench.history(row['id']), [row]) self.assertFalse(self.dataset.releases.preview(self.selection(rows))['eligible']) - self.close(); self.dataset = Dataset(self.path/'destination'); self.open_server() + self.close(); self.dataset = Dataset(self.path/'destination'); self.actor = bind_owner(self, self.dataset); self.open_server() for body, receipt in admitted: self.assertEqual(self.request('import-result/'+body['request_id']), (200, dict(found=True, **receipt))) self.admit(prepared['rows'][0], expected=400) # Restart expires all preparation. @@ -332,7 +334,7 @@ def test_outer_requests_require_strict_utf8_unique_finite_bounded_json(self): for raw in (b'{"source_name":"a","source_name":"b"}', b'{"archive":1e999}', b'{"archive":NaN}', b'{"archive":"\\ud800"}', b'['*1200+b']'*1200, '{}'.encode('utf-16'), b'\xff'): - req = urllib.request.Request(self.root+route, data=raw, headers={'Content-Type':'application/json'}) + req = self.actor.request(self.root+route, data=raw, headers={'Content-Type':'application/json'}) with self.assertRaises(urllib.error.HTTPError) as caught: urllib.request.urlopen(req) self.assertEqual(caught.exception.code, 400) diff --git a/tests/test_native_detection_stack.py b/tests/test_native_detection_stack.py index 75022138..74045d6e 100644 --- a/tests/test_native_detection_stack.py +++ b/tests/test_native_detection_stack.py @@ -1,4 +1,5 @@ """Reconciled native detection changes the actual corpus family proof, not targets.""" +from auth_helpers import bind_owner import base64 import hashlib import io @@ -25,7 +26,7 @@ def setUp(self): with zipfile.ZipFile(io.BytesIO(self.raw)) as archive: self.origin = json.loads(archive.read('manifest.json'))['records'][0] self.link = 'native-text-origin:'+hashlib.sha256(self.origin['id'].encode()).hexdigest() - self.dataset = Dataset(self.path/'destination'); self.addCleanup(self.dataset.close) + self.dataset = Dataset(self.path/'destination'); self.actor = bind_owner(self, self.dataset); self.addCleanup(self.dataset.close) self.w = self.dataset.workbench self.documents = [] for index in range(3): diff --git a/tests/test_native_text_import.py b/tests/test_native_text_import.py index fd0a3993..e3433b2d 100644 --- a/tests/test_native_text_import.py +++ b/tests/test_native_text_import.py @@ -1,4 +1,5 @@ """Actual native ZIP -> HTTP admission -> review/selection/preview/frozen export.""" +from auth_helpers import bind_owner, ExplicitOwnerFixture import base64 import hashlib import http.client @@ -24,18 +25,19 @@ def native_fixture(path, texts=('Cafe\u0301\r\nSource one.', 'Source two.', 'Source three.'), name_prefix='Source'): source = Dataset(str(path)) - rows = [] - for number, text in enumerate(texts): - row = source.workbench.import_asset({'kind': 'text', 'text': text, 'name': f'{name_prefix} {number+1}', - 'groups': [f'native-family-{number+1}'], 'rights': 'Owned upstream'}) - rows.append(source.workbench.save(row['id'], dict(row, annotation={'label': f'class-{number+1}'}, review='human_reviewed'))) - body = {'items': [{key: row[key] for key in ('id', 'revision', 'source_revision')} for row in rows], - 'ratios': {'train': 100, 'validation': 0, 'test': 0}, 'seed': 7, 'format': 'canonical_v1'} - preview = source.releases.preview(body) - release = source.releases.create(dict(body, preview_token=preview['preview_token'])) - raw = source.releases.locate(release['id']).read_bytes() - source.close() - return raw + with ExplicitOwnerFixture.bootstrap(source).bound(source): + rows = [] + for number, text in enumerate(texts): + row = source.workbench.import_asset({'kind': 'text', 'text': text, 'name': f'{name_prefix} {number+1}', + 'groups': [f'native-family-{number+1}'], 'rights': 'Owned upstream'}) + rows.append(source.workbench.save(row['id'], dict(row, annotation={'label': f'class-{number+1}'}, review='human_reviewed'))) + body = {'items': [{key: row[key] for key in ('id', 'revision', 'source_revision')} for row in rows], + 'ratios': {'train': 100, 'validation': 0, 'test': 0}, 'seed': 7, 'format': 'canonical_v1'} + preview = source.releases.preview(body) + release = source.releases.create(dict(body, preview_token=preview['preview_token'])) + raw = source.releases.locate(release['id']).read_bytes() + source.close() + return raw def rewrite(raw, change): @@ -55,7 +57,7 @@ def setUp(self): self.addCleanup(self.temp.cleanup) self.path = Path(self.temp.name) self.raw = native_fixture(self.path/'source') - self.dataset = Dataset(str(self.path/'destination')) + self.dataset = Dataset(str(self.path/'destination')); self.actor = bind_owner(self, self.dataset) self.open_server() self.addCleanup(self.close) @@ -69,7 +71,7 @@ def close(self): self.server.shutdown(); self.server.server_close(); self.dataset.close() def request(self, route, body=None): - request = urllib.request.Request(self.root+'/api/workbench/'+route, + request = self.actor.request(self.root+'/api/workbench/'+route, data=json.dumps(body).encode() if body is not None else None, headers={'Content-Type': 'application/json'}) try: with urllib.request.urlopen(request) as response: @@ -128,7 +130,7 @@ def test_real_roundtrip_provenance_restart_review_selection_preview_export(self) differing = [record['source_sha256'] != native['source_sha256'] for record, native in zip(records, native_rows)] self.assertTrue(any(differing), 'Never assign omitted upstream original hash to new input') self.assertFalse(self.dataset.releases.preview(self.selection(records))['eligible']) - self.close(); self.dataset = Dataset(str(self.path/'destination')); self.open_server() + self.close(); self.dataset = Dataset(str(self.path/'destination')); self.actor = bind_owner(self, self.dataset); self.open_server() for (body, receipt), old in zip(admitted, records): self.assertEqual(self.request('import-result/'+body['request_id']), (200, dict(found=True, **receipt))) self.assertEqual(self.dataset.workbench.get(old['id']), old) diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py index 8ed16345..48693065 100644 --- a/tests/test_pipeline.py +++ b/tests/test_pipeline.py @@ -1,4 +1,5 @@ """Real PostgreSQL graph identity, editable drafts and admission contracts.""" +from auth_helpers import bind_owner import base64 import copy import hashlib @@ -23,7 +24,7 @@ class WorkspaceCase(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(prefix='workspace-contract-') self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(lambda: self.dataset.close()) self.pipelines = self.dataset.pipelines self.rows = [] @@ -71,7 +72,7 @@ def test_graph_cas_clone_and_presentation_digest(self): self.assertEqual(clone['revision'], 1) self.assertEqual(execution_digest(clone), original) self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(self.dataset.pipelines.get(saved['id']), saved) def test_invalid_disconnected_and_fixture_graphs_never_admit(self): diff --git a/tests/test_preferences.py b/tests/test_preferences.py index fdce77e1..666c8101 100644 --- a/tests/test_preferences.py +++ b/tests/test_preferences.py @@ -1,4 +1,5 @@ """Real owner/persistence/HTTP/frozen release behavior for explicit comparisons.""" +from auth_helpers import bind_owner from concurrent.futures import ThreadPoolExecutor from postgres_helpers import drop_failure_trigger, install_failure_trigger import hashlib @@ -22,7 +23,7 @@ class PreferenceTests(unittest.TestCase): def setUp(self): self.temp = tempfile.TemporaryDirectory(); self.addCleanup(self.temp.cleanup) - self.d = Dataset(Path(self.temp.name)); self.addCleanup(lambda: self.d.close()) + self.d = Dataset(Path(self.temp.name)); self.actor = bind_owner(self, self.d); self.addCleanup(lambda: self.d.close()) self.w, self.p, self.r = self.d.workbench, self.d.workbench.preferences, self.d.releases def prompt(self, name='first', **options): @@ -109,8 +110,9 @@ def test_stale_answers_rejudge_review_and_delete_retains_audit(self): def test_concurrent_cas_and_answer_save_blocks_stale_judgment(self): parent, left, right, body, row = self.fixture() def update(outcome): - try: return self.p.save(dict(body, revision=1, outcome=outcome, rationale=outcome))['changed'] - except WorkbenchError as error: return error.status + with self.actor.bound(self.d): + try: return self.p.save(dict(body, revision=1, outcome=outcome, rationale=outcome))['changed'] + except WorkbenchError as error: return error.status with ThreadPoolExecutor(max_workers=2) as pool: outcomes = list(pool.map(update, ['left', 'tie'])) self.assertEqual(sorted(outcomes, key=str), sorted([True, 409], key=str)) @@ -291,7 +293,7 @@ def test_http_admission_list_history_repeat_and_deleted_source(self): self.addCleanup(lambda: (server.shutdown(), server.server_close(), thread.join())) url = 'http://127.0.0.1:' + str(server.server_port) + '/api/workbench/' def call(route, payload=None): - request = urllib.request.Request(url+route, data=json.dumps(payload).encode() if payload is not None else None, + request = self.actor.request(url+route, data=json.dumps(payload).encode() if payload is not None else None, headers={'Content-Type':'application/json'}) with urllib.request.urlopen(request) as reply: return json.load(reply) self.assertEqual(call('records/'+parent['id']+'/preferences')['judgments'][0]['id'], row['id']) diff --git a/tests/test_projects.py b/tests/test_projects.py index 76433262..a7187ee1 100644 --- a/tests/test_projects.py +++ b/tests/test_projects.py @@ -1,4 +1,5 @@ """Real project registration and read-only filesystem/HTTP inspection boundaries.""" +from auth_helpers import bind_owner import copy import hashlib from http.server import ThreadingHTTPServer @@ -43,7 +44,7 @@ def setUp(self): 'requirements': [{'id': 'python', 'label': 'Declared Python'}, {'id': 'runtime', 'label': 'Runtime file', 'path': 'runtime.txt'}]} self.write_manifest() - self.dataset = Dataset(self.path / 'catalog', project_roots={'fixture': self.external}) + self.dataset = Dataset(self.path / 'catalog', project_roots={'fixture': self.external}); self.actor = bind_owner(self, self.dataset) self.addCleanup(lambda: self.dataset.close()) self.owner = self.dataset.projects @@ -58,7 +59,7 @@ def snapshot(self): def reopen(self, roots): self.dataset.close() - self.dataset = Dataset(self.path / 'catalog', project_roots=roots) + self.dataset = Dataset(self.path / 'catalog', project_roots=roots); self.actor = bind_owner(self, self.dataset) self.owner = self.dataset.projects def test_real_registration_reads_hashes_and_never_executes_or_mutates_sources(self): @@ -346,7 +347,7 @@ def test_real_http_registration_detail_evidence_and_no_execution_route(self): base = 'http://127.0.0.1:' + str(server.server_port) + '/api/workspace/projects' def request(suffix='', body=None, raw=None): raw = json.dumps(body).encode() if body is not None else raw - with urllib.request.urlopen(urllib.request.Request(base+suffix, data=raw, + with urllib.request.urlopen(self.actor.request(base+suffix, data=raw, headers={'Content-Type':'application/json'} if raw is not None else {})) as response: return response.status, json.load(response) self.assertEqual(request()[1]['roots'], ['fixture']) @@ -357,7 +358,7 @@ def request(suffix='', body=None, raw=None): self.assertEqual(request(project+'/evidence/note')[1]['text'], self.files['note.md'].decode()) for suffix, payload in (('', None), (project, None), (project+'/evidence/note', None), ('', json.dumps({'root':'fixture','manifest_path':'project.json'}).encode())): - hostile = urllib.request.Request(base+suffix, data=payload, + hostile = self.actor.request(base+suffix, data=payload, headers={'Host':'attacker.example', 'Content-Type':'application/json'}) with self.subTest(host='attacker.example', suffix=suffix, method=hostile.get_method()), self.assertRaises(urllib.error.HTTPError) as caught: urllib.request.urlopen(hostile) diff --git a/tests/test_pumas_typed.py b/tests/test_pumas_typed.py index 1378e358..b6b76be2 100644 --- a/tests/test_pumas_typed.py +++ b/tests/test_pumas_typed.py @@ -1,4 +1,5 @@ """PR54 exact contract fixtures, HTTP failure boundaries and existing owners.""" +from auth_helpers import bind_owner import copy import hashlib import json @@ -19,7 +20,7 @@ class TypedTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(); self.addCleanup(self.tmp.cleanup) - self.data = Dataset(self.tmp.name); self.addCleanup(lambda: self.data.close()) + self.data = Dataset(self.tmp.name); self.actor = bind_owner(self, self.data); self.addCleanup(lambda: self.data.close()) self.server, self.url, self.state = start() self.addCleanup(self.server.server_close); self.addCleanup(self.server.shutdown) self.row = self.data.workbench.import_asset({'kind':'text','name':'Positive','text':'The meeting is confirmed.', @@ -101,27 +102,37 @@ def test_image_bounds_and_unsupported_options_reject_before_post(self): def test_malformed_png_returns_http400_without_admission_or_replay(self): from http.server import ThreadingHTTPServer from urllib.error import HTTPError - from urllib.request import Request, urlopen + from urllib.request import urlopen from app import make_handler server = ThreadingHTTPServer(('127.0.0.1', 0), make_handler(self.data)) self.addCleanup(server.server_close); self.addCleanup(server.shutdown) threading.Thread(target=server.serve_forever, daemon=True).start() url = 'http://127.0.0.1:' + str(server.server_port) + '/api/generation/generate' - before = database_snapshot(self.data.db) + # Dispatch retains only its real admission/audit even if returned PNG is malformed. + def domain_state(): + return [row for row in database_snapshot(self.data.db) + if not row.startswith(("('access_admissions',", "('access_audit',"))] + before = domain_state() self.state['mode'] = 'malformed_png' body = self.image() - request = Request(url, encode(body).encode(), {'Content-Type': 'application/json'}) + request = self.actor.request(url, encode(body).encode(), {'Content-Type': 'application/json'}) with self.assertRaises(HTTPError) as rejected: urlopen(request, timeout=3) self.assertEqual(rejected.exception.code, 400) error = json.loads(rejected.exception.read()) self.assertIn('invalid PNG', error['error']) - self.assertEqual(database_snapshot(self.data.db), before) + self.assertEqual(domain_state(), before) + receipt = self.data.db.execute("SELECT request_digest,effects_json FROM access_admissions WHERE kind='image_request' AND job_id=%s", (body['request_id'],)).fetchall() + self.assertEqual(len(receipt), 1) + self.assertEqual(receipt[0][0], hashlib.sha256(encode(body).encode()).hexdigest()) + self.assertEqual(json.loads(receipt[0][1]), {'images.generate_admitted': [body['request_id']]}) + actions = {row[0] for row in self.data.db.execute('SELECT action FROM access_audit WHERE target_json=%s', (encode(body['request_id']),))} + self.assertEqual(actions, {'access.admit_job', 'images.generate'}) self.assertEqual(len(self.state['requests']), 1) self.assertFalse(self.data.image_requests.active) self.assertFalse(self.data.db.execute('SELECT id FROM samples').fetchall()) self.state['mode'] = 'success' - request = Request(url, encode(self.image()).encode(), {'Content-Type': 'application/json'}) + request = self.actor.request(url, encode(self.image()).encode(), {'Content-Type': 'application/json'}) with urlopen(request, timeout=3) as response: self.assertEqual(response.status, 200) self.assertEqual(json.loads(response.read())['width'], 16) @@ -141,7 +152,7 @@ def test_restart_preserves_unresolved_image_attempt_and_prevents_replay(self): job=dict(id=uuid.uuid4().hex,config=synthetic.validate(config),meta={},status='generating',error='',completed=0) entry=owner._new_entry(job,0,config['prompt']); entry.update(status='generating',request_id='retained-attempt') with self.data.lock,self.data.db.transaction(): owner._save(job); owner._entry(entry) - self.data.close(); self.data=Dataset(self.tmp.name) + self.data.close(); self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) saved=self.data.generation_jobs.snapshot()['entries'][0] self.assertEqual(saved['request_id'],'retained-attempt'); self.assertEqual(saved['provider_outcome'],'unknown') with self.assertRaises(ValueError): self.data.generation_jobs.resume(job['id']) @@ -150,10 +161,11 @@ def test_cancel_before_sample_commit_admits_no_image(self): owner=self.data.generation_jobs image=self.data.image_requests.generate(self.image()) def cancelled_generate(*args,**kwargs): - active=next(job for job in owner.snapshot()['jobs'] if job['status']=='generating') - self.assertTrue(owner.cancel(active['id'])['cancelled']) + with self.actor.bound(self.data): + active=next(job for job in owner.snapshot()['jobs'] if job['status']=='generating') + self.assertTrue(owner.cancel(active['id'])['cancelled']) return image - with patch.object(self.data.image_requests,'generate',side_effect=cancelled_generate): + with patch.object(self.data.image_requests,'_generate_admitted',side_effect=cancelled_generate): job=owner.start(dict(self.image(),count=1,strategy='repeat',session_id='fixture-family',split='unassigned')) owner.worker.join(3) self.assertEqual(owner.snapshot()['jobs'][0]['status'],'cancelled') diff --git a/tests/test_pumas_vision.py b/tests/test_pumas_vision.py index 7b5a055d..22f8a860 100644 --- a/tests/test_pumas_vision.py +++ b/tests/test_pumas_vision.py @@ -1,4 +1,5 @@ """Application acceptance of source-derived vision fixtures and actual DTO schema pins, not inference.""" +from auth_helpers import bind_owner import base64 import copy import hashlib @@ -114,7 +115,7 @@ def test_finite_options_and_correlated_typed_result_without_model(self): class VisionApplicationTests(unittest.TestCase): def setUp(self): self.tmp=tempfile.TemporaryDirectory();self.addCleanup(self.tmp.cleanup) - self.data=Dataset(self.tmp.name);self.addCleanup(lambda:self.data.close()) + self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data);self.addCleanup(lambda:self.data.close()) self.server,self.url,self.state=start() self.addCleanup(self.server.server_close);self.addCleanup(self.server.shutdown);self.addCleanup(self.state['release'].set) self.row=self.data.workbench.import_asset({'kind':'image','name':'Blue','image':image()['data_base64'], @@ -144,7 +145,7 @@ def test_application_caption_evidence_draft_history_exact_id_and_restart(self): self.assertEqual(applied['review'],'draft');self.assertEqual(applied['target_proposal']['producer_contract_source'],vision.SOURCE_COMMIT) self.assertNotIn('canonical_request',applied['target_proposal']) self.assertEqual(applied['groups'],self.row['groups']);self.assertEqual(applied['provenance'],self.row['provenance']) - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.data.workbench.get(self.row['id'])['target_proposal'],applied['target_proposal']) def test_build_selection_and_unavailability_refuse_without_post(self): for mode in ('missing_build','unavailable','wrong_profile','wrong_model'): @@ -170,7 +171,7 @@ def test_cancel_delivery_drains_consumer_actor_and_preserves_borrowed_gateway(se self.data.caption_proposals.cancel({'job_id':job['id']});worker.join(3) self.assertFalse(worker.is_alive());self.assertIsNone(self.data.caption_proposals.active_id) job=self.data.caption_proposals.get(job['id']);self.assertEqual(job['status'],'cancelled');self.assertEqual(job['provider_outcome'],'unknown') - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.data.caption_proposals.start(body);self.assertEqual(len(self.state['requests']),1) self.assertEqual(pumas.models(self.url)['models'][0]['id'],'controlled-vision') self.state['release'].set();self.state['mode']='success' @@ -181,7 +182,7 @@ def test_restart_keeps_possibly_dispatched_attempt_interrupted_without_replay(se with self.data.lock,self.data.db.transaction(): job.update(status='generating',provider_outcome='not_admitted') self.data.caption_proposals._save(job) - self.data.close();self.data=Dataset(self.tmp.name) + self.data.close();self.data=Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) retained=self.data.caption_proposals.get(job['id']) self.assertEqual(retained['status'],'interrupted');self.assertEqual(retained['provider_outcome'],'unknown') self.data.caption_proposals.start(body);self.assertEqual(len(self.state['requests']),1) diff --git a/tests/test_real_import_foundation.py b/tests/test_real_import_foundation.py index 308bf3e1..d06fbb26 100644 --- a/tests/test_real_import_foundation.py +++ b/tests/test_real_import_foundation.py @@ -1,4 +1,5 @@ """Existing admission authority reused by the proposed structured bulk importer.""" +from auth_helpers import bind_owner, ExplicitOwnerFixture from postgres_helpers import drop_failure_trigger, install_failure_trigger import base64 import hashlib @@ -16,7 +17,7 @@ class RealImportFoundationTests(unittest.TestCase): def setUp(self): self.temp = tempfile.TemporaryDirectory() self.addCleanup(self.temp.cleanup) - self.dataset = Dataset(self.temp.name) + self.dataset = Dataset(self.temp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) image = io.BytesIO() Image.new('RGB', (24, 18), '#467e9a').save(image, 'PNG') @@ -43,25 +44,26 @@ def test_import_cannot_grant_review_or_replace_verified_source_facts(self): # Each case uses fresh storage; duplicate rejection is tested separately. with tempfile.TemporaryDirectory() as folder: dataset = Dataset(folder) - try: - body = self.payload(kind) - body.update(review=review, annotation={'label': 'approved'}, - provenance={'method': 'verified', 'source_sha256': 'forged', 'verifier': 'caller'}) - record = dataset.workbench.import_asset(body) - self.assertEqual(record['review'], 'draft') - self.assertIsNone(record['annotation']) - self.assertEqual(record['groups'], ['owned-source']) - self.assertEqual(record['provenance']['method'], 'import') - self.assertNotIn('verifier', record['provenance']) - if kind == 'image': - raw = (Path(folder) / 'images' / record['id'] / 'source').read_bytes() - self.assertEqual(raw, self.image) - self.assertEqual(record['provenance']['source_sha256'], hashlib.sha256(raw).hexdigest()) - else: - self.assertEqual(dataset.db.execute('SELECT original_text FROM workbench_records WHERE id=%s', (record['id'],)).fetchone()[0], 'cafe\u0301\r\n') - self.assertEqual(record['text'], 'café\n') - finally: - dataset.close() + with ExplicitOwnerFixture.bootstrap(dataset).bound(dataset): + try: + body = self.payload(kind) + body.update(review=review, annotation={'label': 'approved'}, + provenance={'method': 'verified', 'source_sha256': 'forged', 'verifier': 'caller'}) + record = dataset.workbench.import_asset(body) + self.assertEqual(record['review'], 'draft') + self.assertIsNone(record['annotation']) + self.assertEqual(record['groups'], ['owned-source']) + self.assertEqual(record['provenance']['method'], 'import') + self.assertNotIn('verifier', record['provenance']) + if kind == 'image': + raw = (Path(folder) / 'images' / record['id'] / 'source').read_bytes() + self.assertEqual(raw, self.image) + self.assertEqual(record['provenance']['source_sha256'], hashlib.sha256(raw).hexdigest()) + else: + self.assertEqual(dataset.db.execute('SELECT original_text FROM workbench_records WHERE id=%s', (record['id'],)).fetchone()[0], 'cafe\u0301\r\n') + self.assertEqual(record['text'], 'café\n') + finally: + dataset.close() def test_repeated_import_cannot_overwrite_review_groups_or_source_provenance(self): for kind in ('image', 'text'): diff --git a/tests/test_release_preview.py b/tests/test_release_preview.py index a5def501..4eeaf0ca 100644 --- a/tests/test_release_preview.py +++ b/tests/test_release_preview.py @@ -1,4 +1,5 @@ """Exact-selection preflight, read-only snapshots, and freshness-bound exports.""" +from auth_helpers import bind_owner import base64 import io import json @@ -25,7 +26,7 @@ class ReleasePreviewTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory() self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.w = self.dataset.workbench self.r = self.dataset.releases @@ -272,7 +273,7 @@ def test_http_preview_export_and_stale_token_contract(self): self.addCleanup(server.shutdown) root = f'http://127.0.0.1:{server.server_port}' def post(route, payload): - request = urllib.request.Request(root+route, data=json.dumps(payload).encode(), + request = self.actor.request(root+route, data=json.dumps(payload).encode(), headers={'Content-Type': 'application/json'}) with urllib.request.urlopen(request) as response: return response.status, json.load(response) @@ -281,7 +282,7 @@ def post(route, payload): self.assertEqual(list(self.r.path.iterdir()), []) status, release = post('/api/workbench/releases', dict(body, preview_token=preview['preview_token'])) self.assertEqual(status, 201) - with urllib.request.urlopen(root+release['url']) as response: + with urllib.request.urlopen(self.actor.request(root+release['url'])) as response: self.assertEqual(response.status, 200); self.assertTrue(response.read().startswith(b'PK')) with self.assertRaises(urllib.error.HTTPError) as stale: post('/api/workbench/releases', dict(body, seed=8, preview_token=preview['preview_token'])) diff --git a/tests/test_rights_note.py b/tests/test_rights_note.py index fd5bb093..41800f00 100644 --- a/tests/test_rights_note.py +++ b/tests/test_rights_note.py @@ -1,4 +1,5 @@ """Note-only correction traverses HTTP, CAS, PostgreSQL and frozen source/history contracts.""" +from auth_helpers import bind_owner, ExplicitOwnerFixture from postgres_helpers import database_snapshot, in_transaction import base64 import hashlib @@ -20,7 +21,7 @@ class RightsNoteTests(unittest.TestCase): def setUp(self): self.tmp=tempfile.TemporaryDirectory();self.addCleanup(self.tmp.cleanup) - self.dataset=Dataset(self.tmp.name);self.w=self.dataset.workbench + self.dataset=Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset);self.w=self.dataset.workbench self.server=ThreadingHTTPServer(('127.0.0.1',0),make_handler(self.dataset)) threading.Thread(target=self.server.serve_forever,daemon=True).start();self.addCleanup(self.close) self.root=f'http://127.0.0.1:{self.server.server_port}' @@ -32,7 +33,7 @@ def row(self,name='fictional',rights='Declared origin note'): def request(self,row,note,**extra): body=dict(revision=row['revision'],source_revision=row['source_revision'],note=note,**extra) - req=urllib.request.Request(self.root+'/api/workbench/rights/'+row['id'],data=json.dumps(body).encode(),headers={'Content-Type':'application/json'}) + req=self.actor.request(self.root+'/api/workbench/rights/'+row['id'],data=json.dumps(body).encode(),headers={'Content-Type':'application/json'}) try: with urllib.request.urlopen(req) as response:return response.status,json.load(response) except urllib.error.HTTPError as error: @@ -204,15 +205,16 @@ def test_native_caption_import_note_correction_review_and_roundtrip_preserve_own self.assertFalse(self.dataset.releases.preview(body)['eligible']);self.assertEqual(archive.read_bytes(),frozen) # Existing strict native caption parser accepts the unchanged record shape and nested origin evidence. target=Dataset(Path(self.tmp.name)/'roundtrip') - try: - with zipfile.ZipFile(archive) as zip: - origin=dict(manifest=zip.read('manifest.json').decode(),metadata={split:zip.read(split+'/metadata.jsonl').decode() for split in ('train','val','test')}) - for item in target.caption_imports.prepare(origin)['rows']: - admitted=target.caption_imports.admit(dict(token=item['token'],asset=item['asset'],request_id=uuid.uuid4().hex,image=base64.b64encode(zip.read(item['asset'])).decode())) - admitted=target.workbench.get(admitted['record_id']) - self.assertEqual(admitted['review'],'draft');self.assertEqual(rights_note(admitted),'unknown') - self.assertEqual(target.workbench.query({'task':'image_caption'})['total'],4) - finally:target.close() + with ExplicitOwnerFixture.bootstrap(target).bound(target): + try: + with zipfile.ZipFile(archive) as zip: + origin=dict(manifest=zip.read('manifest.json').decode(),metadata={split:zip.read(split+'/metadata.jsonl').decode() for split in ('train','val','test')}) + for item in target.caption_imports.prepare(origin)['rows']: + admitted=target.caption_imports.admit(dict(token=item['token'],asset=item['asset'],request_id=uuid.uuid4().hex,image=base64.b64encode(zip.read(item['asset'])).decode())) + admitted=target.workbench.get(admitted['record_id']) + self.assertEqual(admitted['review'],'draft');self.assertEqual(rights_note(admitted),'unknown') + self.assertEqual(target.workbench.query({'task':'image_caption'})['total'],4) + finally:target.close() def test_feff_and_python_only_whitespace_untouched_noops_preserve_exact_origin(self): diff --git a/tests/test_runs.py b/tests/test_runs.py index 333fbc74..e8f53d0b 100644 --- a/tests/test_runs.py +++ b/tests/test_runs.py @@ -1,4 +1,5 @@ """Durable receipts, real process cessation, immutable outputs and holdout custody.""" +from auth_helpers import bind_owner import copy from contextlib import contextmanager import json @@ -146,7 +147,7 @@ def sleeping_worker(*args, **kwargs): self.dataset.close() self.assertFalse(self.dataset.runs._thread.is_alive()) self.assertIsNone(process_identity(worker['pid'])) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(self.dataset.runs.get(run['id'])['state'], 'interrupted') def test_unknown_attempt_fences_already_queued_work(self): @@ -186,7 +187,7 @@ def failed_worker(*args, **kwargs): def test_restart_does_not_replay_queue_or_signal_reused_pid(self): run = self.submit_queued() self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) with self.dataset.lock, self.dataset.db.transaction(): retained = self.dataset.runs._load(run['id']) retained['state'] = 'running' @@ -194,7 +195,7 @@ def test_restart_does_not_replay_queue_or_signal_reused_pid(self): retained['worker'] = dict(process_identity(os.getpid()), start_ticks='not-the-original-process') self.dataset.runs._save(retained) self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(self.dataset.runs.get(run['id'])['state'], 'interrupted') self.assertIsNone(self.dataset.runs._thread) self.assertFalse((self.dataset.runs.path / run['id']).exists()) @@ -202,7 +203,7 @@ def test_restart_does_not_replay_queue_or_signal_reused_pid(self): def test_recovery_keeps_observed_live_prior_process_unknown(self): run = self.submit_queued() self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) with self.dataset.lock, self.dataset.db.transaction(): retained = self.dataset.runs._load(run['id']) retained['state'] = 'running' @@ -210,7 +211,7 @@ def test_recovery_keeps_observed_live_prior_process_unknown(self): retained['worker'] = process_identity(os.getpid()) self.dataset.runs._save(retained) self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(self.dataset.runs.get(run['id'])['state'], 'unknown') with self.assertRaises(WorkbenchError): self.dataset.runs.retry(run['id'], {'request_key': 'retry-unknown-request'}) @@ -226,7 +227,7 @@ def test_restart_during_proven_pre_spawn_validation_is_interrupted(self): self.dataset.runs._save(retained) for _ in range(2): self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(self.dataset.runs.get(run['id'])['state'], 'interrupted') self.assertFalse(self.dataset.runs._blocked) @@ -251,13 +252,13 @@ def cleanup(): supervisor=dict(process_identity(os.getpid()), boot_id='previous-boot')) self.dataset.runs._save(retained) self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(self.dataset.runs.get(run['id'])['state'], 'unknown') self.assertTrue(self.dataset.runs._blocked) self.assertIsNone(child.poll(), 'Recovery must never signal a remembered/discovered PID.') cleanup() self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(self.dataset.runs.get(run['id'])['state'], 'interrupted') self.assertFalse(self.dataset.runs._blocked) @@ -301,7 +302,7 @@ def test_real_cpu_results_holdout_exposure_correction_restart_and_tamper(self): self.assertEqual(len(release['prior_test_exposure']['events']), 2) frozen = self.dataset.runs.artifact(run['id'], 'metrics.json')[0] self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(self.dataset.runs.artifact(run['id'], 'metrics.json')[0], frozen) self.assertEqual(self.dataset.runs.submit(body)['id'], run['id']) self.assertTrue(self.dataset.runs.get(run['id'])['test_exposure']['exposed']) diff --git a/tests/test_saved_generation.py b/tests/test_saved_generation.py index 2cd45001..6978a3dc 100644 --- a/tests/test_saved_generation.py +++ b/tests/test_saved_generation.py @@ -1,4 +1,5 @@ """Restart/resume actual on-disk PR3 size-only queues through the numeric gateway.""" +from auth_helpers import bind_owner import base64 import json import tempfile @@ -17,7 +18,7 @@ def setUp(self): self.addCleanup(self.server.shutdown) self.temp = tempfile.TemporaryDirectory() self.addCleanup(self.temp.cleanup) - self.dataset = Dataset(self.temp.name) + self.dataset = Dataset(self.temp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(lambda: self.dataset.close()) def legacy_job(self, size='512x768', **changes): @@ -46,7 +47,7 @@ def store(self, job, entries=()): def restart(self): self.dataset.close() - self.dataset = Dataset(self.temp.name) + self.dataset = Dataset(self.temp.name); self.actor = bind_owner(self, self.dataset) def resume(self, job): self.dataset.generation_jobs.resume(job['id']) @@ -61,8 +62,15 @@ def test_restart_resumes_partial_legacy_queue_and_preserves_source_provenance(se job = self.legacy_job() first = self.legacy_entry(job, 0) raw = png((512, 768), '#000028') - self.dataset.add(dict(job['meta'], image=base64.b64encode(raw).decode(), filename='old-output.png'), - generation=(first, job, {'seed': 40, 'duration_seconds': .01})) + # Author the retained output through an explicitly bounded fixture job. + # The retained configuration and entry still use legacy size-only fields. + digest = self.dataset.generation_jobs._request_digest(job) + with self.dataset.db.transaction(): + job['admission_id'] = self.dataset.access.admit_job('synthetic', job['id'], digest, + {'dataset.add_generated': [job['id']], 'synthetic.finish': [job['id']]}) + with self.dataset.access._job('synthetic', job['id'], job['admission_id'], digest): + self.dataset.add(dict(job['meta'], image=base64.b64encode(raw).decode(), filename='old-output.png'), + generation=(first, job, {'seed': 40, 'duration_seconds': .01})) pending = self.legacy_entry(job, 1) with self.dataset.db.transaction(): self.dataset.generation_jobs._entry(pending) diff --git a/tests/test_saved_searches.py b/tests/test_saved_searches.py index d166f262..652ba634 100644 --- a/tests/test_saved_searches.py +++ b/tests/test_saved_searches.py @@ -1,4 +1,5 @@ """Saved criteria against actual PostgreSQL/HTTP; fixed membership remains independent.""" +from auth_helpers import bind_owner from postgres_helpers import drop_failure_trigger, install_failure_trigger import json from pathlib import Path @@ -22,7 +23,7 @@ class SavedSearchTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory() self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(lambda: self.dataset.close()) self.w, self.s = self.dataset.workbench, self.dataset.searches @@ -55,7 +56,7 @@ def test_reopen_and_dynamic_growth_never_refresh_fixed_pairs(self): self.w.save(first['id'], dict(first, annotation={'label': 'other'}, review='draft')) self.assertEqual(self.w.query(saved['criteria'])['total'], 1) self.assertFalse(self.dataset.selections.load(fixed['id'])['current']) - self.dataset.close(); self.dataset = Dataset(self.tmp.name); self.w, self.s = self.dataset.workbench, self.dataset.searches + self.dataset.close(); self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset); self.w, self.s = self.dataset.workbench, self.dataset.searches self.assertEqual(self.s.get(saved['id']), saved); self.assertEqual(self.w.query(saved['criteria'])['items'][0]['id'], second['id']) def test_exact_metadata_and_existing_query_normalization_equivalence(self): @@ -99,7 +100,7 @@ def test_spatial_saved_criteria_match_native_imports_and_review_after_reopen(sel annotation={'note': 'Inspected native spatial fixture.'})) self.assertEqual([item['id'] for item in self.w.query(saved[kind]['criteria'])['items']], [row['id']]) self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.w, self.s = self.dataset.workbench, self.dataset.searches for kind, search in saved.items(): self.assertEqual(self.s.get(search['id']), search) @@ -150,7 +151,7 @@ def test_actual_http_routes_and_strict_json(self): self.addCleanup(server.server_close); self.addCleanup(lambda: (server.shutdown(), thread.join())) def request(route='', body=None, raw=None): if body is not None: raw = json.dumps(body).encode() - req = urllib.request.Request(f'http://127.0.0.1:{server.server_port}/api/workbench/searches'+route, data=raw, headers={'Content-Type': 'application/json'}) + req = self.actor.request(f'http://127.0.0.1:{server.server_port}/api/workbench/searches'+route, data=raw, headers={'Content-Type': 'application/json'}) try: response = urllib.request.urlopen(req) except urllib.error.HTTPError as error: response = error with response: return response.status, json.loads(response.read()) diff --git a/tests/test_saved_selections.py b/tests/test_saved_selections.py index fed8b828..b718eb4d 100644 --- a/tests/test_saved_selections.py +++ b/tests/test_saved_selections.py @@ -1,4 +1,5 @@ """Real PostgreSQL/HTTP fixed-membership contracts and release consumer checks.""" +from auth_helpers import bind_owner import base64 import io import json @@ -23,7 +24,7 @@ class SavedSelectionTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory() self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(lambda: self.dataset.close()) self.w, self.s = self.dataset.workbench, self.dataset.selections @@ -60,7 +61,7 @@ def test_repeat_save_load_and_process_reopen_preserve_fixed_membership(self): self.assertEqual([m['status'] for m in result['members']], ['ok', 'ok']) self.save(text, name='Another set') self.assertEqual(len(self.s.list()['selections']), 2) - self.dataset.close(); self.dataset = Dataset(self.tmp.name) + self.dataset.close(); self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.w, self.s = self.dataset.workbench, self.dataset.selections self.assertEqual(self.s.load(saved['id'])['selection'], saved) self.assertEqual({rid: self.w.get(rid) for rid in before}, before) @@ -178,7 +179,7 @@ def test_real_http_contract_lists_opens_renames_deletes_and_checks_revisions(sel thread = threading.Thread(target=server.serve_forever, daemon=True); thread.start() self.addCleanup(server.server_close); self.addCleanup(thread.join); self.addCleanup(server.shutdown) def request(path='', body=None): - req = urllib.request.Request(f'http://127.0.0.1:{server.server_port}/api/workbench/selections'+path, + req = self.actor.request(f'http://127.0.0.1:{server.server_port}/api/workbench/selections'+path, data=None if body is None else json.dumps(body).encode(), headers={'Content-Type': 'application/json'}) with urllib.request.urlopen(req) as response: return response.status, json.load(response) status, saved = request(body={'name': 'HTTP set', 'items': [self.ref(row)]}) diff --git a/tests/test_scientific_fields.py b/tests/test_scientific_fields.py index 26a11201..d5332300 100644 --- a/tests/test_scientific_fields.py +++ b/tests/test_scientific_fields.py @@ -1,4 +1,5 @@ """Strict native custody and real PostgreSQL project-to-field inspection.""" +from auth_helpers import bind_owner import copy import hashlib from http.server import ThreadingHTTPServer @@ -117,6 +118,7 @@ class ScientificStorage(unittest.TestCase): def dataset(self, roots=None): result = Dataset(self.root/'catalog', project_roots=roots) + self.actor = bind_owner(self, result) self.addCleanup(result.close) return result @@ -168,7 +170,7 @@ def test_http_selected_project_import_and_inspection(self): self.addCleanup(server.server_close); self.addCleanup(server.shutdown) base='http://127.0.0.1:'+str(server.server_address[1]) def request(path,body=None): - req=urllib.request.Request(base+path,data=None if body is None else json.dumps(body).encode(),headers={'Content-Type':'application/json'}) + req=self.actor.request(base+path,data=None if body is None else json.dumps(body).encode(),headers={'Content-Type':'application/json'}) with urllib.request.urlopen(req) as response: return json.load(response) request('/api/workspace/projects',dict(root='fixture',manifest_path='project.json')) route=f'/api/workspace/projects/{project_id}/import-data/fields' diff --git a/tests/test_scientific_release.py b/tests/test_scientific_release.py index dfdcbdc2..b6cdcd1a 100644 --- a/tests/test_scientific_release.py +++ b/tests/test_scientific_release.py @@ -1,4 +1,5 @@ """Frozen generic fields: independent numerical oracle and immutable custody.""" +from auth_helpers import bind_owner import hashlib import io import json @@ -76,7 +77,7 @@ def setUp(self): self.addCleanup(self.temporary.cleanup) self.project_root = Path(self.temporary.name) / 'project' self.project_root.mkdir() - self.dataset = Dataset(Path(self.temporary.name) / 'catalog', project_roots={'fixture': self.project_root}) + self.dataset = Dataset(Path(self.temporary.name) / 'catalog', project_roots={'fixture': self.project_root}); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.workbench = self.dataset.workbench diff --git a/tests/test_sequence_batch.py b/tests/test_sequence_batch.py index b0c4e84f..1a247ad2 100644 --- a/tests/test_sequence_batch.py +++ b/tests/test_sequence_batch.py @@ -1,4 +1,5 @@ """Actual frozen fee7b4a pair + explicitly source-derived synthetic controls.""" +from auth_helpers import bind_owner from postgres_helpers import drop_failure_trigger, install_failure_trigger, observed_statements import base64 import hashlib @@ -51,7 +52,7 @@ class SequenceBatch(unittest.TestCase): def setUp(self): self.temp = tempfile.TemporaryDirectory() self.addCleanup(self.temp.cleanup) - self.d = Dataset(self.temp.name) + self.d = Dataset(self.temp.name); self.actor = bind_owner(self, self.d) self.addCleanup(lambda: self.d.close()) self.w = self.d.workbench @@ -86,7 +87,7 @@ def test_actual_bytes_admission_receipt_reopen_and_no_blob_lookup(self): self.assertFalse(any('SELECT bundle' in sql for sql in statements)) self.assertNotIn('sequence', result) self.assertNotIn('review', result) - self.d.close(); self.d = Dataset(self.temp.name); self.w = self.d.workbench + self.d.close(); self.d = Dataset(self.temp.name); self.actor = bind_owner(self, self.d); self.w = self.d.workbench self.assertEqual(batch.find_result(self.w, request['request_id']), dict(found=True, **result)) self.assertEqual(self.w.asset(row['id'])[0], raw) @@ -115,8 +116,9 @@ def test_marker_race_and_raw_namespace_are_distinct(self): def prepared(*args): value = original(*args); barrier.wait(timeout=5); return value def worker(request): - try: outcomes.append(batch.import_item(self.w, request)) - except WorkbenchError as error: outcomes.append(error.status) + with self.actor.bound(self.d): + try: outcomes.append(batch.import_item(self.w, request)) + except WorkbenchError as error: outcomes.append(error.status) with patch.object(batch.rheon, 'prepare', side_effect=prepared): workers = [threading.Thread(target=worker, args=(request,)) for request in (body(request_id=marker), body(*synthetic(), request_id=marker, item_name='source-derived'))] @@ -212,7 +214,7 @@ def test_http_strict_envelope_limits_storage_failure_and_lookup(self): self.addCleanup(server.server_close); self.addCleanup(lambda: thread.join(3)); self.addCleanup(server.shutdown) base = 'http://127.0.0.1:' + str(server.server_port) + '/api/workbench/' def request(route, raw=None): - value = urllib.request.Request(base + route, raw, headers={'Content-Type': 'application/json'}) + value = self.actor.request(base + route, raw, headers={'Content-Type': 'application/json'}) try: with urllib.request.urlopen(value, timeout=5) as response: return response.status, json.load(response) except urllib.error.HTTPError as response: return response.code, json.load(response) @@ -221,6 +223,7 @@ def request(route, raw=None): # The size gate rejects headers before reading any oversized request body. connection = http.client.HTTPConnection('127.0.0.1', server.server_port, timeout=5) connection.putrequest('POST', '/api/workbench/sequence-import-item') + connection.putheader('Authorization', self.actor.headers['Authorization']) connection.putheader('Content-Type', 'application/json') connection.putheader('Content-Length', str(batch.rheon.MAX_REQUEST + 1)) connection.endheaders() diff --git a/tests/test_sequence_release.py b/tests/test_sequence_release.py index ef6452f0..4473c365 100644 --- a/tests/test_sequence_release.py +++ b/tests/test_sequence_release.py @@ -1,4 +1,5 @@ """Actual retained producer bytes, full native contract and frozen custody checks.""" +from auth_helpers import bind_owner import hashlib import io import json @@ -29,7 +30,7 @@ class SequenceRelease(unittest.TestCase): def setUp(self): self.temporary = tempfile.TemporaryDirectory() self.addCleanup(self.temporary.cleanup) - self.dataset = Dataset(self.temporary.name) + self.dataset = Dataset(self.temporary.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.workbench = self.dataset.workbench self.sources = [(FIXTURE / name).read_bytes() for name in ('run.json', 'frames.jsonl')] diff --git a/tests/test_sequence_runs.py b/tests/test_sequence_runs.py index bf2ba361..ebf2650e 100644 --- a/tests/test_sequence_runs.py +++ b/tests/test_sequence_runs.py @@ -1,4 +1,5 @@ """Actual retained Rheon producer bytes through real graph/run/export custody.""" +from auth_helpers import bind_owner import copy import hashlib import io @@ -71,7 +72,7 @@ def test_actual_sequence_report_source_bits_units_times_and_reopen(self): self.dataset.runs.expose_test(run['id'], {'reason': 'No model evaluation'}) self.assertEqual(self.dataset.db.execute('SELECT count(*) FROM workspace_exposures').fetchone()[0], 0) self.dataset.close() - self.dataset = Dataset(self.temporary.name) + self.dataset = Dataset(self.temporary.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.assertEqual(self.dataset.runs.get(run['id'])['validation_summary'], summary) self.assertEqual(self.dataset.runs.artifact(run['id'], 'validation-report.json')[0], raw_report) diff --git a/tests/test_sequence_v2_runs.py b/tests/test_sequence_v2_runs.py index 5eaa32a2..cb6c7d0b 100644 --- a/tests/test_sequence_v2_runs.py +++ b/tests/test_sequence_v2_runs.py @@ -1,4 +1,5 @@ """Authored v2 transport through PostgreSQL and Runs; no real-packet/physics claim.""" +from auth_helpers import bind_owner import base64 import copy import hashlib @@ -39,7 +40,7 @@ class SequenceV2Runs(unittest.TestCase): wait = test_mesh_runs.MeshRuns.wait def open_dataset(self, path='catalog'): - self.dataset = Dataset(self.root / path) + self.dataset = Dataset(self.root / path); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) return self.dataset diff --git a/tests/test_sequences.py b/tests/test_sequences.py index 77a649dc..2fafba6d 100644 --- a/tests/test_sequences.py +++ b/tests/test_sequences.py @@ -3,6 +3,7 @@ Constructor and accepted-state formula come directly from draft PR 20 fee7b4a's tools/test_dense3d_sequence_import.py. Provenance placeholders remain synthetic. """ +from auth_helpers import bind_owner, ExplicitOwnerFixture from postgres_helpers import database_snapshot, drop_failure_trigger, install_failure_trigger, observed_statements import base64 import copy @@ -52,7 +53,7 @@ class Sequences(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory() self.addCleanup(self.tmp.cleanup) - self.d = Dataset(self.tmp.name) + self.d = Dataset(self.tmp.name); self.actor = bind_owner(self, self.d) self.addCleanup(lambda: self.d.close()) self.w = self.d.workbench self.run, self.raw = fixture() @@ -107,7 +108,7 @@ def test_raw_roundtrip_native_fields_index_review_history_rights_reopen(self): self.assertEqual(len(self.w.history(row['id'])), 3) self.assertEqual(self.w.history(row['id'])[-1], row) with self.assertRaises(WorkbenchError): self.review(row) - self.d.close(); self.d = Dataset(self.tmp.name); self.w = self.d.workbench + self.d.close(); self.d = Dataset(self.tmp.name); self.actor = bind_owner(self, self.d); self.w = self.d.workbench self.assertEqual(self.w.get(row['id']), corrected) self.assertEqual(self.w.asset(row['id'])[0], bundle) @@ -294,22 +295,23 @@ def test_mixed_sequence_release_keeps_native_classification_importable(self): self.assertEqual(sum('token' in row for row in prepared['rows']), 1) self.assertEqual(sum('error' in row for row in prepared['rows']), 1) destination = Dataset(Path(self.tmp.name) / 'destination'); self.addCleanup(destination.close) - prepared = destination.native_text_imports.prepare(dict(source_name='mixed.zip', - archive=base64.b64encode(self.d.releases.locate(release['id']).read_bytes()).decode())) - token = next(row['token'] for row in prepared['rows'] if 'token' in row) - destination.native_text_imports.admit(dict(token=token, request_id=uuid.uuid4().hex)) - self.assertEqual(destination.workbench.query({})['total'], 1) - self.assertEqual(destination.workbench.query({})['items'][0]['kind'], 'text') + source_archive = base64.b64encode(self.d.releases.locate(release['id']).read_bytes()).decode() + with ExplicitOwnerFixture.bootstrap(destination).bound(destination): + prepared = destination.native_text_imports.prepare(dict(source_name='mixed.zip', archive=source_archive)) + token = next(row['token'] for row in prepared['rows'] if 'token' in row) + destination.native_text_imports.admit(dict(token=token, request_id=uuid.uuid4().hex)) + self.assertEqual(destination.workbench.query({})['total'], 1) + self.assertEqual(destination.workbench.query({})['items'][0]['kind'], 'text') def test_http_admission_and_endpoint_request_bound(self): server = ThreadingHTTPServer(('127.0.0.1', 0), make_handler(self.d)) thread = threading.Thread(target=server.serve_forever, daemon=True); thread.start() self.addCleanup(server.server_close); self.addCleanup(server.shutdown) url = f'http://127.0.0.1:{server.server_port}/api/workbench/sequence-import' - request = urllib.request.Request(url, json.dumps(body(self.run, self.raw)).encode(), {'Content-Type': 'application/json'}) + request = self.actor.request(url, json.dumps(body(self.run, self.raw)).encode(), {'Content-Type': 'application/json'}) with urllib.request.urlopen(request) as response: self.assertEqual(response.status, 201); self.assertEqual(json.load(response)['review'], 'draft') - oversized = urllib.request.Request(url, b'{}', {'Content-Type': 'application/json', 'Content-Length': str(adapter.MAX_REQUEST + 1)}) + oversized = self.actor.request(url, b'{}', {'Content-Type': 'application/json', 'Content-Length': str(adapter.MAX_REQUEST + 1)}) with self.assertRaises(urllib.error.HTTPError) as raised: urllib.request.urlopen(oversized) self.assertEqual(raised.exception.code, 400) self.assertEqual(self.w.query({})['total'], 1) @@ -319,7 +321,7 @@ class PostgreSQLSchema(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory() self.addCleanup(self.tmp.cleanup) - self.data = Dataset(self.tmp.name) + self.data = Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.addCleanup(self.data.close) def test_validation_is_idempotent_and_transactional_ddl_preserves_exact_rows(self): diff --git a/tests/test_sequences_v2.py b/tests/test_sequences_v2.py index 9fc11f80..5998f918 100644 --- a/tests/test_sequences_v2.py +++ b/tests/test_sequences_v2.py @@ -1,4 +1,5 @@ """Synthetic v2 transport refusal/custody proofs; NOT actual-packet acceptance.""" +from auth_helpers import bind_owner import base64 import copy import hashlib @@ -125,7 +126,7 @@ class ControlsCustody(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory() self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(lambda: self.dataset.close()) def test_batch_import_receipt_review_release_and_reopen_preserve_three_files(self): @@ -152,7 +153,7 @@ def test_batch_import_receipt_review_release_and_reopen_preserve_three_files(sel with self.assertRaises(WorkbenchError): sequence_release.validate_bytes(changed, hashlib.sha256(changed).hexdigest()) self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.assertEqual(batch.find_result(self.dataset.workbench, request['request_id'])['controls_sha256'], receipt['controls_sha256']) bundle, _ = self.dataset.workbench.asset(row['id']) with zipfile.ZipFile(io.BytesIO(bundle)) as archive: @@ -175,7 +176,7 @@ def test_actual_http_envelopes_fail_before_storage_then_single_v2_imports_draft( self.addCleanup(server.shutdown) base = 'http://127.0.0.1:' + str(server.server_port) + '/api/workbench/' def request(route, raw): - value = urllib.request.Request(base + route, raw, headers={'Content-Type': 'application/json'}) + value = self.actor.request(base + route, raw, headers={'Content-Type': 'application/json'}) try: with urllib.request.urlopen(value, timeout=5) as response: return response.status, json.load(response) diff --git a/tests/test_spatial_release.py b/tests/test_spatial_release.py index d07c5afb..d2b825d8 100644 --- a/tests/test_spatial_release.py +++ b/tests/test_spatial_release.py @@ -1,4 +1,5 @@ """Real spatial import/review/freeze with original-byte and coordinate custody.""" +from auth_helpers import bind_owner import base64 import hashlib import io @@ -23,7 +24,7 @@ class SpatialRelease(unittest.TestCase): def setUp(self): self.temporary = tempfile.TemporaryDirectory() self.addCleanup(self.temporary.cleanup) - self.dataset = Dataset(self.temporary.name) + self.dataset = Dataset(self.temporary.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.workbench = self.dataset.workbench diff --git a/tests/test_spatial_storage.py b/tests/test_spatial_storage.py index 74a5ea97..c701272f 100644 --- a/tests/test_spatial_storage.py +++ b/tests/test_spatial_storage.py @@ -14,6 +14,7 @@ import zipfile from app import Dataset, make_handler +from auth_helpers import bind_owner from backup_metadata import backup_catalog, restore_catalog, read_catalog, summaries, tree_manifest from metadata import SCHEMA_VERSION, Metadata, StorageError, definition_hash, TABLES_V3, TABLES_V5, SPATIAL_TABLES from upgrade_metadata import upgrade_catalog, UPGRADES @@ -44,6 +45,7 @@ class SpatialStorage(unittest.TestCase): def dataset(self, name='catalog'): dataset = Dataset(self.root / name) self.addCleanup(dataset.close) + bind_owner(self, dataset) return dataset def review(self, dataset, row): @@ -61,17 +63,17 @@ def test_schema5_exact_definition_upgrade_preserves_projects_and_history(self): with self.assertRaisesRegex(StorageError, 'Stop all'): upgrade_catalog(old.path) result = upgrade_catalog(old.path, quiesced=True) - self.assertEqual(result['migration'], 'field-sequence-metadata-5-to-6') + self.assertEqual(result['migration'], 'access-metadata-6-to-7') current = Metadata(old.path, create=False) self.addCleanup(current.close) - self.assertEqual(current.schema_version, 6) - self.assertEqual(summaries(read_catalog(current)), before) + self.assertEqual(current.schema_version, 7) + self.assertEqual(summaries({k:v for k,v in read_catalog(current).items() if k in before}), before) with current.transaction(): current.execute("""INSERT INTO workbench_records (id,kind,content_hash,groups_json,parents_json,provenance_json,task,review,revision,created_at,updated_at) VALUES ('science','field_sequence','hash','[]','[]','{}','field_sequence_fields','draft',1,'now','now')""") backup = self.root / 'backup6' - self.assertEqual(backup_catalog(current.path, backup, quiesced=True)['schema_version'], 6) + self.assertEqual(backup_catalog(current.path, backup, quiesced=True)['schema_version'], 7) def test_failed_schema6_transition_rolls_back_exact_schema5(self): import psycopg @@ -146,7 +148,7 @@ def test_schema3_requires_explicit_upgrade_and_preserves_old_evidence(self): with self.assertRaises(StorageError): upgrade_catalog(path) result = upgrade_catalog(path, quiesced=True) - self.assertEqual(result['migration'], 'field-sequence-metadata-5-to-6') + self.assertEqual(result['migration'], 'access-metadata-6-to-7') current = Metadata(path, create=False) self.addCleanup(current.close) after = read_catalog(current) @@ -190,7 +192,7 @@ def test_schema6_scientific_backup_restore_retains_exact_source_review_and_histo dataset.close() backup = self.root / 'scientific-backup' receipt = backup_catalog(path, backup, quiesced=True) - self.assertEqual(receipt['schema_version'], 6) + self.assertEqual(receipt['schema_version'], 7) filename = 'field_sequence/' + row['id'] + '/source.zip' self.assertEqual(receipt['files'][filename]['sha256'], hashlib.sha256(raw).hexdigest()) backup_files = tree_manifest(backup) @@ -244,23 +246,24 @@ def test_real_http_routes_bound_inspection_and_reject_duplicate_envelope(self): thread = threading.Thread(target=server.serve_forever, daemon=True); thread.start() self.addCleanup(server.server_close); self.addCleanup(server.shutdown) base = 'http://127.0.0.1:' + str(server.server_port) + owner = bind_owner(self, dataset) for kind in ('pointcloud','volume'): - request = urllib.request.Request(base + '/api/workbench/' + kind + '-import', data=json.dumps(body(kind)).encode(), headers={'Content-Type':'application/json'}) + request = owner.request(base + '/api/workbench/' + kind + '-import', data=json.dumps(body(kind)).encode(), headers={'Content-Type':'application/json'}) with urllib.request.urlopen(request) as response: self.assertEqual(response.status, 201) row = json.load(response) - with urllib.request.urlopen(base + '/api/workbench/' + kind + '-inspection/' + row['id']) as response: + with urllib.request.urlopen(owner.request(base + '/api/workbench/' + kind + '-inspection/' + row['id'])) as response: self.assertEqual(json.load(response)['content_hash'], row['content_hash']) for query in ('?axis=z&index=999', '?axis=nope', '?index=bad', '?axis=x&axis=y'): with self.assertRaises(urllib.error.HTTPError) as caught: - urllib.request.urlopen(base + '/api/workbench/volume-inspection/' + row['id'] + query) + urllib.request.urlopen(owner.request(base + '/api/workbench/volume-inspection/' + row['id'] + query)) self.assertEqual(caught.exception.code, 400) - request = urllib.request.Request(base + '/api/workbench/volume-import', data=b'{"files":{},"files":{}}', headers={'Content-Type':'application/json'}) + request = owner.request(base + '/api/workbench/volume-import', data=b'{"files":{},"files":{}}', headers={'Content-Type':'application/json'}) with self.assertRaises(urllib.error.HTTPError) as caught: urllib.request.urlopen(request) self.assertEqual(caught.exception.code, 400) - request = urllib.request.Request(base + '/api/workbench/volume-import', data=b'{"nested":' + b'[' * 1200 + b'0' + b']' * 1200 + b'}', headers={'Content-Type':'application/json'}) + request = owner.request(base + '/api/workbench/volume-import', data=b'{"nested":' + b'[' * 1200 + b'0' + b']' * 1200 + b'}', headers={'Content-Type':'application/json'}) with self.assertRaises(urllib.error.HTTPError) as caught: urllib.request.urlopen(request) self.assertEqual(caught.exception.code, 400) diff --git a/tests/test_synthetic.py b/tests/test_synthetic.py index 0ad44f4b..ab49076e 100644 --- a/tests/test_synthetic.py +++ b/tests/test_synthetic.py @@ -1,3 +1,4 @@ +from auth_helpers import bind_owner import base64 import json import sys @@ -16,7 +17,7 @@ class SyntheticTests(unittest.TestCase): def setUp(self): self.temp = tempfile.TemporaryDirectory() - self.dataset = Dataset(self.temp.name) + self.dataset = Dataset(self.temp.name); self.actor = bind_owner(self, self.dataset) self.jobs = self.dataset.generation_jobs self.addCleanup(self.temp.cleanup) self.addCleanup(lambda: self.dataset.close()) @@ -30,7 +31,7 @@ def wait(self): self.assertFalse(self.jobs.worker.is_alive()) return self.jobs.snapshot() - def image(self, body, **kwargs): + def image(self, body, job_id=None, **kwargs): return dict(image=base64.b64encode(png(color='#%06x' % body.get('seed', 1))).decode(), metadata={'seed': body.get('seed')}) def test_500_unique_prompts_are_batched_and_exist_before_first_render(self): @@ -38,14 +39,15 @@ def test_500_unique_prompts_are_batched_and_exist_before_first_render(self): def prompts(config, offset, count, previous): batches.append((offset, count, len(previous))) return ['Book at location ' + str(i) for i in range(offset, offset + count)] - def render(body, **kwargs): - state = self.jobs.snapshot() + def render(body, job_id, **kwargs): + with self.actor.bound(self.dataset): + state = self.jobs.snapshot() self.assertEqual(len(state['entries']), 500) self.assertEqual(len({e['prompt'] for e in state['entries']}), 500) raise ValueError('Stop after checking preparation') config = self.config() config.update(strategy='varied', count=500, prompt_model='text-test') - with patch('synthetic.prompt_batch', side_effect=prompts), patch.object(self.dataset.image_requests, 'generate', side_effect=render): + with patch('synthetic.prompt_batch', side_effect=prompts), patch.object(self.dataset.image_requests, '_generate_admitted', side_effect=render): self.jobs.start(config) state = self.wait() self.assertEqual(len(batches), 50) @@ -53,12 +55,13 @@ def render(body, **kwargs): self.assertEqual(state['jobs'][0]['status'], 'failed') def test_repeat_creates_one_pending_entry_then_links_images_and_labels(self): - def render(body, **kwargs): - entries = self.jobs.snapshot()['entries'] + def render(body, job_id, **kwargs): + with self.actor.bound(self.dataset): + entries = self.jobs.snapshot()['entries'] self.assertEqual(sum(not e['sample_id'] for e in entries), 1) self.assertEqual(body['prompt'], 'open books') return self.image(body) - with patch.object(self.dataset.image_requests, 'generate', side_effect=render): + with patch.object(self.dataset.image_requests, '_generate_admitted', side_effect=render): self.jobs.start(self.config(seed=20)) state = self.wait() self.assertEqual(state['jobs'][0]['status'], 'completed') @@ -74,21 +77,21 @@ def render(body, **kwargs): def test_cancel_and_resume_does_not_regenerate_completed_images(self): started = threading.Event() calls = [] - def render(body, cancel_event): + def render(body, job_id, cancel_event, **kwargs): calls.append(body['seed']) if body['seed'] == 21: started.set() cancel_event.wait(5) raise ValueError('cancelled') return self.image(body) - with patch.object(self.dataset.image_requests, 'generate', side_effect=render): + with patch.object(self.dataset.image_requests, '_generate_admitted', side_effect=render): job = self.jobs.start(self.config(seed=20)) self.assertTrue(started.wait(5)) with self.assertRaises(ValueError): self.jobs.start(self.config()) self.jobs.cancel(job['id']) self.assertEqual(self.wait()['jobs'][0]['status'], 'cancelled') - with patch.object(self.dataset.image_requests, 'generate', side_effect=self.image): + with patch.object(self.dataset.image_requests, '_generate_admitted', side_effect=self.image): self.jobs.resume(job['id']) state = self.wait() self.assertEqual(state['jobs'][0]['completed'], 3) @@ -104,15 +107,15 @@ def test_duplicates_are_bounded_and_saved_prompts_survive_restart(self): self.assertEqual(len(state['entries']), 1) self.assertIn('duplicates', state['jobs'][0]['error']) self.dataset.close() - self.dataset = Dataset(self.temp.name) + self.dataset = Dataset(self.temp.name); self.actor = bind_owner(self, self.dataset) self.jobs = self.dataset.generation_jobs self.assertEqual(self.jobs.snapshot()['entries'], state['entries']) - with patch('synthetic.prompt_batch', return_value=['second', 'third']), patch.object(self.dataset.image_requests, 'generate', side_effect=ValueError('fixture stop')): + with patch('synthetic.prompt_batch', return_value=['second', 'third']), patch.object(self.dataset.image_requests, '_generate_admitted', side_effect=ValueError('fixture stop')): self.jobs.resume(job['id']) self.assertEqual(len(self.wait()['entries']), 3) def test_server_interruption_preserves_completed_links_on_resume(self): - with patch.object(self.dataset.image_requests, 'generate', side_effect=self.image): + with patch.object(self.dataset.image_requests, '_generate_admitted', side_effect=self.image): job = self.jobs.start(self.config(seed=10)) state = self.wait() first_ids = [e['sample_id'] for e in state['entries']] @@ -121,10 +124,10 @@ def test_server_interruption_preserves_completed_links_on_resume(self): with self.jobs.lock, self.jobs.db.transaction(): self.jobs._save(job) self.dataset.close() - self.dataset = Dataset(self.temp.name) + self.dataset = Dataset(self.temp.name); self.actor = bind_owner(self, self.dataset) self.jobs = self.dataset.generation_jobs self.assertEqual(self.jobs.snapshot()['jobs'][0]['status'], 'interrupted') - with patch.object(self.dataset.image_requests, 'generate') as render: + with patch.object(self.dataset.image_requests, '_generate_admitted') as render: self.jobs.resume(job['id']) state = self.wait() render.assert_not_called() @@ -132,7 +135,7 @@ def test_server_interruption_preserves_completed_links_on_resume(self): self.assertEqual([e['sample_id'] for e in state['entries']], first_ids) def test_duplicate_images_stop_without_losing_saved_image_or_queue(self): - with patch.object(self.dataset.image_requests, 'generate', side_effect=self.image): + with patch.object(self.dataset.image_requests, '_generate_admitted', side_effect=self.image): self.jobs.start(self.config()) state = self.wait() self.assertEqual(state['jobs'][0]['status'], 'failed') @@ -143,19 +146,19 @@ def test_duplicate_images_stop_without_losing_saved_image_or_queue(self): def test_deleted_generated_image_is_not_recreated_on_resume(self): calls = [] - def render(body, **kwargs): + def render(body, job_id, **kwargs): calls.append(body['seed']) if body['seed'] == 21: raise ValueError('fixture stop') return self.image(body) - with patch.object(self.dataset.image_requests, 'generate', side_effect=render): + with patch.object(self.dataset.image_requests, '_generate_admitted', side_effect=render): job = self.jobs.start(self.config(seed=20)) self.wait() sample = self.dataset.rows()[0] result = self.dataset.delete(sample['id'], {'revision': sample['revision']}) self.assertEqual(result['entries'][0]['status'], 'deleted') self.assertIsNone(result['entries'][0]['sample_id']) - with patch.object(self.dataset.image_requests, 'generate', side_effect=self.image) as resumed: + with patch.object(self.dataset.image_requests, '_generate_admitted', side_effect=self.image) as resumed: self.jobs.resume(job['id']) state = self.wait() self.assertEqual([call.args[0]['seed'] for call in resumed.call_args_list], [21, 22]) diff --git a/tests/test_text_classification_proposals.py b/tests/test_text_classification_proposals.py index b2ab5e91..a185cbfc 100644 --- a/tests/test_text_classification_proposals.py +++ b/tests/test_text_classification_proposals.py @@ -1,4 +1,5 @@ """Synthetic HTTP classification contracts; no model downloads or inference.""" +from auth_helpers import bind_owner from postgres_helpers import database_snapshot import base64 import hashlib @@ -22,7 +23,7 @@ class TextClassificationProposalTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(); self.addCleanup(self.tmp.cleanup) - self.data = Dataset(self.tmp.name); self.addCleanup(lambda: self.data.close()) + self.data = Dataset(self.tmp.name); self.actor = bind_owner(self, self.data); self.addCleanup(lambda: self.data.close()) self.server, self.url, self.requests = start() self.addCleanup(self.server.server_close); self.addCleanup(self.server.shutdown) self.row = self.data.workbench.import_asset(dict(kind='text', name='Request', text='Please cancel the café meeting 😀.\nKeep exact source.', groups=['authored-1'], rights='Authored synthetic fixture')) @@ -78,7 +79,7 @@ def test_exact_http_frozen_evidence_and_atomic_idempotent_draft(self): self.assertEqual(row['target_proposal']['job_id'], job['id']) state = self.state(); again = self.decide(job) self.assertFalse(again['changed']); self.assertEqual(self.state(), state) - self.data.close(); self.data = Dataset(self.tmp.name) + self.data.close(); self.data = Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.owner.get(job['id'])['application']['revision'], row['revision']) self.assertEqual(self.data.workbench.get(row['id'])['target_proposal'], row['target_proposal']) self.assertFalse(self.decide(job)['changed']) @@ -123,7 +124,7 @@ def test_explicit_abstention_retains_evidence_unappliable_and_rejectable(self): with self.assertRaises(WorkbenchError): self.decide(job) self.assertEqual(self.data.workbench.get(self.row['id']), before) self.assertTrue(self.decide(job, 'reject')['changed']); self.assertFalse(self.decide(job, 'reject')['changed']) - self.data.close(); self.data = Dataset(self.tmp.name) + self.data.close(); self.data = Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.owner.get(job['id'])['status'], 'rejected'); self.assertEqual(self.data.workbench.get(self.row['id']), before) def test_exact_labels_are_validated_before_admission_and_apply(self): @@ -177,8 +178,9 @@ def test_atomic_failure_and_concurrent_apply_commit_once(self): self.assertEqual(self.state(), state) results, errors = [], [] def apply(): - try: results.append(self.decide(job)) - except Exception as error: errors.append(error) + with self.actor.bound(self.data): + try: results.append(self.decide(job)) + except Exception as error: errors.append(error) workers = [threading.Thread(target=apply) for _ in range(2)] for worker in workers: worker.start() for worker in workers: worker.join(3); self.assertFalse(worker.is_alive()) @@ -205,7 +207,7 @@ def held(job, stop): self.assertEqual(self.owner.get(job['id'])['status'], 'cancelled') with self.data.lock, self.data.db.transaction(): interrupted = self.owner.get(job['id']); interrupted['status']='generating'; self.owner._save(interrupted) - count = len(self.requests); self.data.close(); self.data = Dataset(self.tmp.name) + count = len(self.requests); self.data.close(); self.data = Dataset(self.tmp.name); self.actor = bind_owner(self, self.data) self.assertEqual(self.owner.get(job['id'])['status'], 'interrupted'); self.assertEqual(len(self.requests), count) self.assertEqual(self.generate()['status'], 'completed') @@ -235,6 +237,8 @@ def test_summary_projects_large_evidence_and_source_without_decoding_retained_pa owner._save(job); ids.append(job['id']) before = self.state(); decode = json.loads; sizes = [] def projected(data, *args, **kwargs): + if not data.lstrip().startswith('{'): + return decode(data, *args, **kwargs) self.assertNotIn('"raw_response_base64"', data) self.assertNotIn(full_text[:1000], data) sizes.append(len(data)); return decode(data, *args, **kwargs) @@ -259,7 +263,7 @@ def test_http_routes_and_exact_admission_id_404_before_start(self): self.addCleanup(server.server_close); self.addCleanup(server.shutdown) root = f'http://127.0.0.1:{server.server_port}/api/workbench/text-classification-proposals' def api(path='', body=None): - request = urllib.request.Request(root+path, data=json.dumps(body).encode() if body is not None else None, headers={'Content-Type':'application/json'}) + request = self.actor.request(root+path, data=json.dumps(body).encode() if body is not None else None, headers={'Content-Type':'application/json'}) with urllib.request.urlopen(request) as response: return json.load(response) body = self.config() with self.assertRaises(urllib.error.HTTPError) as early: api('/'+body['request_id']) diff --git a/tests/test_text_corpus_export.py b/tests/test_text_corpus_export.py index 07a2d753..b1b05b53 100644 --- a/tests/test_text_corpus_export.py +++ b/tests/test_text_corpus_export.py @@ -1,4 +1,5 @@ """Exact corpus bytes, explicit review, whole-family allocation and immutable HTTP releases.""" +from auth_helpers import bind_owner import base64 import hashlib import io @@ -27,7 +28,7 @@ class CorpusReleaseTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(prefix='corpus-export-') self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(self.dataset.close) self.wb = self.dataset.workbench self.ordinal = 0 @@ -118,8 +119,19 @@ def test_exact_unicode_offsets_separators_counts_hashes_and_evidence(self): def test_deterministic_readonly_preview_and_immutable_reopen(self): rows = self.corpus() before = database_snapshot(self.dataset.db) - result, preview = self.freeze(rows) - self.assertEqual(before, database_snapshot(self.dataset.db)) + body = self.body(rows) + preview = self.dataset.releases.preview(body) + self.assertTrue(preview['eligible'], preview) + self.assertEqual(before, database_snapshot(self.dataset.db), 'Preview remains exactly read-only') + audit_before = self.dataset.db.execute('SELECT count(*) FROM access_audit').fetchone()[0] + result = self.dataset.releases.create(dict(body, preview_token=preview['preview_token'])) + unchanged = lambda rows: [row for row in rows if not row.startswith("('access_audit',")] + self.assertEqual(unchanged(before), unchanged(database_snapshot(self.dataset.db))) + self.assertEqual(self.dataset.db.execute('SELECT count(*) FROM access_audit').fetchone()[0], audit_before + 1) + audit = self.dataset.db.execute('SELECT action,details_json FROM access_audit WHERE target_json=%s', + (json.dumps(result['id']),)).fetchall() + self.assertEqual([(row[0], json.loads(row[1])) for row in audit], + [('dataset_releases.create', {'release_sha256': result['id'], 'format': projection.FORMAT})]) data = self.dataset.releases.locate(result['id']).read_bytes() self.assertEqual(self.freeze(list(reversed(rows)))[0]['id'], result['id']) self.wb.correct_rights_note(rows[0]['id'], dict(revision=rows[0]['revision'], source_revision=1, note='Later correction')) @@ -297,7 +309,7 @@ def test_actual_http_import_review_preview_freeze_and_reopen(self): self.addCleanup(server.server_close) self.addCleanup(lambda: (server.shutdown(), thread.join())) def request(route, body=None): - req = urllib.request.Request(f'http://127.0.0.1:{server.server_port}' + route, + req = self.actor.request(f'http://127.0.0.1:{server.server_port}' + route, data=json.dumps(body).encode() if body is not None else None, headers={'Content-Type': 'application/json'}) try: response = urllib.request.urlopen(req) diff --git a/tests/test_text_training.py b/tests/test_text_training.py index badb8245..f0c2d78f 100644 --- a/tests/test_text_training.py +++ b/tests/test_text_training.py @@ -1,4 +1,5 @@ """Real text export/reader/trainer and durable graph/run custody contracts.""" +from auth_helpers import bind_owner import copy import base64 import hashlib @@ -24,7 +25,7 @@ class TextCase(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory(prefix='workspace-text-contract-') self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(lambda: self.dataset.close()) self.rows = [] for index in range(18): @@ -285,7 +286,7 @@ def test_real_fit_results_restart_exposure_and_frozen_correction(self): self.dataset.workbench.save(source['id'], dict(revision=source['revision'], source_revision=source['source_revision'], task=source['task'], annotation={'label': 'corrected draft'}, groups=source['groups'], review='draft')) self.dataset.close() - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) restored = self.dataset.runs.get(run['id']) self.assertEqual(restored['state'], 'completed') self.assertEqual(len(self.dataset.runs.list()), 1) diff --git a/tests/test_workbench.py b/tests/test_workbench.py index 8d0ef40c..52928a8d 100644 --- a/tests/test_workbench.py +++ b/tests/test_workbench.py @@ -1,3 +1,4 @@ +from auth_helpers import bind_owner import base64 import hashlib import io @@ -20,7 +21,7 @@ class WorkbenchTests(unittest.TestCase): def setUp(self): self.tmp = tempfile.TemporaryDirectory() self.addCleanup(self.tmp.cleanup) - self.dataset = Dataset(self.tmp.name) + self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset) self.addCleanup(lambda: self.dataset.close()) self.workbench = self.dataset.workbench @@ -42,7 +43,7 @@ def test_normalized_unicode_revisions_and_reopen(self): self.assertEqual(saved['revision'], 2) with self.assertRaises(WorkbenchError): self.review(row) with self.assertRaises(WorkbenchError): self.text('Hello 😀 café\n') - self.dataset.close(); self.dataset = Dataset(self.tmp.name); self.workbench = self.dataset.workbench + self.dataset.close(); self.dataset = Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset); self.workbench = self.dataset.workbench self.assertEqual(len(self.workbench.history(row['id'])), 2) self.assertEqual(self.workbench.get(row['id'])['annotation'], saved['annotation']) @@ -131,7 +132,7 @@ def test_frozen_mixed_release_consumer_and_tamper(self): with self.assertRaises(WorkbenchError):self.release(rows) sample=self.dataset.sample(rows[0]['id']); self.dataset.delete(sample['id'], {'revision':sample['revision']}) self.assertEqual(path.read_bytes(),original) - self.dataset.close(); self.dataset=Dataset(self.tmp.name); self.workbench=self.dataset.workbench + self.dataset.close(); self.dataset=Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset); self.workbench=self.dataset.workbench self.assertEqual(self.dataset.releases.locate(release['id']).read_bytes(),original) with self.assertRaises(WorkbenchError):self.release([rows[0]]) (Path(self.tmp.name)/'images'/rows[1]['id']/'image.png').write_bytes(b'tampered') @@ -159,7 +160,7 @@ def test_deleted_source_retains_live_legacy_lineage_after_reopen(self): annotation=dict(book_present=False,crop_suitable=False,corners=[]))) sample=self.dataset.sample(first['id']) self.dataset.delete(first['id'],dict(revision=sample['revision'])) - self.dataset.close();self.dataset=Dataset(self.tmp.name);self.workbench=self.dataset.workbench + self.dataset.close();self.dataset=Dataset(self.tmp.name); self.actor = bind_owner(self, self.dataset);self.workbench=self.dataset.workbench retained=self.workbench.get(first['id']) self.assertFalse(retained['source_available']);self.assertTrue(retained['source_lineage_known']) self.assertEqual((retained['book_id'],retained['source_split']),('shared-book','test')) @@ -183,8 +184,8 @@ def test_http_static_export_and_errors(self): self.addCleanup(server.server_close);self.addCleanup(server.shutdown) root=f'http://127.0.0.1:{server.server_port}' for route in ('/workbench','/workbench.js','/workbench.css'): - with urllib.request.urlopen(root+route) as response:self.assertEqual(response.status,200) + with urllib.request.urlopen(self.actor.request(root+route)) as response:self.assertEqual(response.status,200) release=self.release([self.review(self.text())]) - with urllib.request.urlopen(root+release['url']) as response:self.assertTrue(response.read().startswith(b'PK')) - with self.assertRaises(urllib.error.HTTPError) as error:urllib.request.urlopen(root+'/api/workbench/releases/invalid.zip') + with urllib.request.urlopen(self.actor.request(root+release['url'])) as response:self.assertTrue(response.read().startswith(b'PK')) + with self.assertRaises(urllib.error.HTTPError) as error:urllib.request.urlopen(self.actor.request(root+'/api/workbench/releases/invalid.zip')) self.assertEqual(error.exception.code,400) diff --git a/tests/test_workspace_metadata.py b/tests/test_workspace_metadata.py index 41b69d57..224668d3 100644 --- a/tests/test_workspace_metadata.py +++ b/tests/test_workspace_metadata.py @@ -33,7 +33,7 @@ def test_retained_v1_definition_is_exactly_the_qualified_19_table_contract(self) self.assertEqual(len(TABLES_V1), 19) self.assertEqual(definition_hash(1), '859a04c5ee618faae689885bee79054d5e92098e746d058fd2bcb599da4c80db') - self.assertEqual(SCHEMA_VERSION, 6) + self.assertEqual(SCHEMA_VERSION, 7) self.assertEqual(set(WORKSPACE_TABLES), {'workspace_graphs', 'workspace_runs', 'workspace_exposures'}) @@ -53,6 +53,7 @@ def test_retained_v3_v4_definitions_and_additive_v5_project_table(self): self.assertEqual(set(PROJECT_TABLES), {'workspace_projects'}) self.assertEqual(UPGRADES[4], ('project-metadata-4-to-5', tuple(PROJECT_TABLES.values()))) self.assertNotEqual(definition_hash(5), definition_hash(4)) + self.assertEqual(definition_hash(6), 'e4ca8ba0b092834a3e7ba059f88fce223a66ad2f830ab7fb60c64fe6d1882cf5') @unittest.skipUnless(os.environ.get('TULDOK_DATABASE_URL'), 'Requires disposable PostgreSQL TULDOK_DATABASE_URL') @@ -125,9 +126,12 @@ def test_default_startup_refuses_v1_until_explicit_upgrade_preserving_history_id self.assertEqual(read_sequences(reopened), sequences) self.assertTrue(all(current[name]['count'] == 0 for name in WORKSPACE_TABLES)) self.assertEqual(reopened.dataset_id, identity) - self.assertEqual(reopened.schema_version, 6) + self.assertEqual(reopened.schema_version, 7) from app import Dataset dataset = Dataset(self.root / 'catalog') + from auth_helpers import bind_owner + bind_owner(self, dataset) + current = read_catalog(reopened) try: expected = json.loads((FIXTURE / 'expected.json').read_bytes()) row = expected['record'] @@ -193,8 +197,8 @@ def test_v2_upgrade_preserves_populated_catalog_and_only_then_admits_audio(self) with self.assertRaisesRegex(StorageError, 'Stop all'): upgrade_catalog(metadata.path) result = upgrade_catalog(metadata.path, quiesced=True) - self.assertEqual(result['migration'], 'field-sequence-metadata-5-to-6') - self.assertEqual(result['schema_version'], 6) + self.assertEqual(result['migration'], 'access-metadata-6-to-7') + self.assertEqual(result['schema_version'], 7) current = Metadata(metadata.path, create=False) self.addCleanup(current.close) self.assertEqual(current.dataset_id, metadata.dataset_id) @@ -372,7 +376,7 @@ def transaction(*inner_args, **inner_kwargs): upgrade_catalog(metadata.path, quiesced=True) reopened = Metadata(metadata.path, create=False) self.addCleanup(reopened.close) - self.assertEqual(reopened.schema_version, 6) + self.assertEqual(reopened.schema_version, 7) self.assertEqual(upgrade_catalog(metadata.path, quiesced=True)['status'], 'already_current') def test_v1_backup_restores_exact_v1_and_can_explicitly_upgrade_with_backup_unchanged(self): @@ -516,7 +520,7 @@ def test_v4_to_v5_preserves_history_and_only_explicitly_admits_projects(self): with self.assertRaisesRegex(StorageError, 'Stop all'): upgrade_catalog(metadata.path) result = upgrade_catalog(metadata.path, quiesced=True) - self.assertEqual((result['schema_version'], result['migration']), (6, 'field-sequence-metadata-5-to-6')) + self.assertEqual((result['schema_version'], result['migration']), (7, 'access-metadata-6-to-7')) current = Metadata(metadata.path, create=False) self.addCleanup(current.close) self.assertEqual(current.dataset_id, identity) @@ -569,7 +573,7 @@ def test_retained_v4_backup_restores_exact_old_schema_then_requires_upgrade(self self.addCleanup(old.close) self.assertEqual(summaries(read_catalog(old)), before) old.close() - self.assertEqual(upgrade_catalog(restored, quiesced=True)['schema_version'], 6) + self.assertEqual(upgrade_catalog(restored, quiesced=True)['schema_version'], 7) self.assertEqual(tree_manifest(backup), backup_files) def test_v5_backup_restore_preserves_exact_project_snapshot_and_history(self): diff --git a/text_classification_proposals.py b/text_classification_proposals.py index 56ef38e0..12557487 100644 --- a/text_classification_proposals.py +++ b/text_classification_proposals.py @@ -2,6 +2,7 @@ from workbench import encode_retained import base64 import hashlib +from access import AccessError, authorized import json import threading import time @@ -107,11 +108,12 @@ def decode(data, labels, typed_request_id=None): class TextClassificationProposals: def __init__(self, workbench): self.workbench = workbench + self.access = workbench.dataset.access self.db, self.lock = workbench.db, workbench.lock self.worker, self.active_id = None, None self.stop = threading.Event() self.closed = False - with self.lock, self.db.transaction(): + with self.access._reconcile(), self.lock, self.db.transaction(): self.runtime_owner = self.db.claim_runtime('text_classification_proposals') if not self.runtime_owner: return @@ -121,6 +123,7 @@ def __init__(self, workbench): if pumas.typed(job['config']): job['provider_outcome'] = 'unknown' job.update(status='interrupted', error='Server stopped; inspect this attempt. No automatic inference retry.') self._save(job) + self.access.audit('text_classification.reconcile', job['id'], {'status': job['status']}) def _save(self, job): previous = self.db.execute('SELECT data FROM text_classification_proposals WHERE id=%s', (job['id'],)).fetchone() @@ -136,10 +139,12 @@ def _get(self, job_id): raise WorkbenchError('Classification request not found.', 'unavailable', 404) return json.loads(row[0]) + @authorized('inspect', 'text_classification.get') def get(self, job_id): with self.lock: return self._get(job_id) + @authorized('inspect', 'text_classification.snapshot') def snapshot(self): with self.lock: # Retain escaped Unicode that PostgreSQL JSON processing cannot decode. @@ -179,6 +184,7 @@ def _source(self, body, *, captured=None): raise WorkbenchError('Text or target changed. Reload before applying a classification.', 'conflict', 409) return record + @authorized('execute', 'text_classification.start', owner_only=True) def start(self, body): fields = {'request_id', 'source_id', 'revision', 'source_revision', 'server_url', 'model', 'instruction', 'seed', 'labels'} if not isinstance(body, dict) or set(body) not in (fields, fields | {'protocol', 'profile'}): @@ -228,6 +234,10 @@ def start(self, body): 'verification': 'Exact offered label or abstention shape only; semantic correctness requires human review.', 'application': None} job['canonical_request_sha256'] = hashlib.sha256(encode(payload(job)).encode()).hexdigest() + job['request_digest'] = hashlib.sha256(encode({'config': job['config'], 'source': job['source'], 'payload': payload(job)}).encode()).hexdigest() + job['admission_id'] = self.access.admit_job('text_classification', job['id'], job['request_digest'], + {'text_classification.finish': [job['id']]}) + self.access.audit('text_classification.start', job['id'], {'request_digest': job['request_digest']}) self._save(job) self.stop.clear() self.active_id = job['id'] @@ -242,7 +252,21 @@ def start(self, body): return job def _run(self, job_id): - job = self.get(job_id) + with self.lock: + job = self._get(job_id) + request_digest = hashlib.sha256(encode({'config': job['config'], 'source': job['source'], 'payload': payload(job)}).encode()).hexdigest() + try: + with self.access._job('text_classification', job_id, job.get('admission_id'), request_digest): + self._run_admitted(job) + except AccessError: + with self.access._reconcile(), self.lock, self.db.transaction(): + job.update(status='interrupted', error='Job admission is missing or differs from the retained request; no inference started.') + self._save(job) + self.access.audit('text_classification.interrupt', job_id) + self.active_id = None + + def _run_admitted(self, job): + job_id = job['id'] try: if pumas.typed(job['config']): pumas.prepare_chat(job, 2000) @@ -272,15 +296,18 @@ def _run(self, job_id): source_revision=job['source']['source_revision']), captured=job['source']) job.update(status='abstained' if annotation is None else 'completed', annotation=annotation, reported_model=reported) self._save(job) + self.access.audit('text_classification.finish', job_id, {'status': job['status'], 'response_sha256': job.get('response_sha256')}) except Exception as error: with self.lock, self.db.transaction(): pumas.failure_evidence(job, error) job.update(status='cancelled' if self.stop.is_set() else 'failed', error=str(error)[:800]) self._save(job) + self.access.audit('text_classification.finish', job_id, {'status': job['status']}) finally: with self.lock: self.active_id = None + @authorized('cancel', 'text_classification.cancel', target=lambda body: body.get('job_id') if isinstance(body, dict) else None) def cancel(self, body): if not isinstance(body, dict) or set(body) != {'job_id'}: raise WorkbenchError('Supply only the classification request ID.') @@ -291,8 +318,10 @@ def cancel(self, body): self.stop.set() job.update(status='stopping', error='Cancellation requested; late output cannot be applied.') self._save(job) + self.access.audit('text_classification.cancel', job['id']) return {'cancelled': True, 'job': job} + @authorized('edit', 'text_classification.decide') def decide(self, job_id, body): if (not isinstance(body, dict) or set(body) not in ({'revision', 'decision'}, {'revision', 'decision', 'labels'}) or body['decision'] not in ('reject', 'apply_draft')): @@ -332,6 +361,7 @@ def decide(self, job_id, body): else: job['status'] = 'rejected' self._save(job) + self.access.audit('text_classification.decide', job['id'], {'revision': job['revision'], 'decision': body['decision']}) return {'job': job, 'record': record, 'changed': True} def close(self): diff --git a/upgrade_metadata.py b/upgrade_metadata.py index 09ca3f60..f88595a7 100644 --- a/upgrade_metadata.py +++ b/upgrade_metadata.py @@ -1,15 +1,16 @@ -"""Explicit quiesced PostgreSQL schema 1–5 to 6 upgrade, without data rewriting.""" +"""Explicit quiesced PostgreSQL schema 1–6 to 7 upgrade, without data rewriting.""" import argparse import json import psycopg -from metadata import (Metadata, SCHEMA_VERSION, StorageError, WORKSPACE_TABLES, SPATIAL_TABLES, PROJECT_TABLES, +from metadata import (Metadata, SCHEMA_VERSION, StorageError, WORKSPACE_TABLES, SPATIAL_TABLES, PROJECT_TABLES, ACCESS_TABLES, definition_hash) # Accepted ordered transitions, with stable identities. The complete chain is # one transaction: no intermediate version is published if a later step fails. UPGRADES = { + 6: ('access-metadata-6-to-7', tuple(ACCESS_TABLES.values())), 5: ('field-sequence-metadata-5-to-6', ( 'ALTER TABLE workbench_records DROP CONSTRAINT workbench_records_kind_check', "ALTER TABLE workbench_records ADD CONSTRAINT workbench_records_kind_check CHECK(kind IN ('image','text','sequence','mesh','audio','pointcloud','volume','field_sequence'))", @@ -33,7 +34,7 @@ def upgrade_catalog(path, *, dsn=None, quiesced=False): Stop every old/new app and artifact writer before calling. The advisory lock coordinates cooperating commands; it is not a fence against a live old app. - Re-entry verifies current schema 6, including its independently known shape, + Re-entry verifies current schema 7, including its independently known shape, and performs no writes to domain rows, artifacts or the dataset manifest. """ if not quiesced: diff --git a/workbench.py b/workbench.py index 8e1d0820..13a12d15 100644 --- a/workbench.py +++ b/workbench.py @@ -1,6 +1,7 @@ """Image/text dataset lifecycle, sharing Tuldok's existing image authority.""" from collections import Counter from datetime import datetime, timezone +from access import authorized import hashlib import json import math @@ -152,6 +153,7 @@ class Workbench: """ def __init__(self, dataset): self.dataset = dataset + self.access = dataset.access self.db, self.lock = dataset.db, dataset.lock from sequence_assets import SequenceAssets from meshes import MeshAssets @@ -200,10 +202,20 @@ def _sync_images(self, record_id=None): 'draft', 1, row['created_at'], row['created_at'])) self._history(self._get(row['id'])) + @authorized('edit', 'workbench.preserve_deleted_source') def preserve_deleted_source(self, record_id): """Called in Dataset's deletion transaction before removing source authority.""" + before = self._get(record_id) self.db.execute('''INSERT INTO workbench_deleted_sources SELECT id, book_id, session_id, split FROM samples WHERE id=%s''', (record_id,)) + self._audit_record('workbench.preserve_deleted_source', before) + + def _audit_record(self, action, record, before=None): + evidence = {'revision': record['revision'], 'source_revision': record['source_revision'], + 'content_sha256': hashlib.sha256(encode_retained(record).encode()).hexdigest()} + if before is not None: + evidence.update(before_revision=before['revision'], before_source_revision=before['source_revision']) + self.access.audit(action, record['id'], evidence) def _get(self, record_id): row = self.db.execute('''SELECT w.*, s.filename AS image_name, s.width, s.height, @@ -259,6 +271,7 @@ def _get(self, record_id): result['corner_annotation'] = json.loads(result['corner_annotation']) return result + @authorized('inspect', 'workbench.get') def get(self, record_id): if not isinstance(record_id, str) or not IDENTIFIER.fullmatch(record_id): raise WorkbenchError('Invalid record ID.') @@ -270,6 +283,7 @@ def _history(self, record): self.db.execute('INSERT INTO workbench_history VALUES (%s,%s,%s)', (record['id'], record['revision'], encode_retained(record))) + @authorized('inspect', 'workbench.history') def history(self, record_id): self.get(record_id) with self.lock: @@ -299,6 +313,7 @@ def _filtered(self, options): criteria['q'] = query return filtered, criteria + @authorized('inspect', 'workbench.query') def query(self, options): """Page metadata and excerpts. Asset bytes are never loaded for browsing.""" try: @@ -320,6 +335,7 @@ def query(self, options): return {'items': page, 'total': len(filtered), 'offset': offset, 'limit': limit, 'analysis': summary, 'criteria': criteria} + @authorized('edit', 'workbench.import_asset') def import_asset(self, body, *, acquisition=None, annotation=None, annotation_task='image_caption', source_split='unassigned', source_session=None): kind = body.get('kind') groups = strings(body.get('groups', []), 'Protected groups') @@ -351,6 +367,7 @@ def import_asset(self, body, *, acquisition=None, annotation=None, annotation_ta provenance={'acquisition': acquisition} if acquisition is not None else None) else: raise WorkbenchError('Asset kind must be image or text.') + self._audit_record('workbench.import_asset', self._get(row['id'])) # Receipt projection is after the owning commit. Failure to return it # cannot roll back an already admitted row or remove its image bytes. return self._get(row['id']) @@ -396,12 +413,18 @@ def _insert_text(self, source, name, groups, parents, rights, *, provenance=None self._history(record) return record + @authorized('edit', 'workbench.save') def save(self, record_id, body, *, verified_provenance=None): with self.lock, self.db.transaction(): return self._save_annotation(record_id, body, verified_provenance=verified_provenance) def _save_annotation(self, record_id, body, *, verified_provenance=None, proposal_evidence=None): """Trusted caller owns the lock/transaction, including proposal linkage.""" + self.access.require('edit', 'workbench.save', record_id) + if body.get('review') == 'human_reviewed': + self.access.require('approve-review', 'workbench.approve_review', record_id, owner_only=True) + if verified_provenance or body.get('review') == 'programmatically_verified': + self.access.require('execute', 'workbench.verify', record_id, owner_only=True) self._sync_images() before = self._get(record_id) for key in ('revision', 'source_revision'): @@ -460,9 +483,12 @@ def _save_annotation(self, record_id, body, *, verified_provenance=None, proposa self.db.execute('DELETE FROM workbench_target_proposals WHERE id=%s', (record_id,)) record = self._get(record_id) self._history(record) + self._audit_record('workbench.approve_review' if review == 'human_reviewed' else + 'workbench.verify' if verified_provenance else 'workbench.save', record, before) return record + @authorized('edit', 'workbench.correct_rights_note') def correct_rights_note(self, record_id, body): """One note correction, CAS-bound to record/source revisions; no annotation grant.""" if not isinstance(record_id, str) or not IDENTIFIER.fullmatch(record_id): @@ -487,6 +513,7 @@ def correct_rights_note(self, record_id, body): self.db.execute('UPDATE workbench_records SET revision=revision+1,updated_at=%s WHERE id=%s', (timestamp(), record_id)) record = self._get(record_id) self._history(record) + self._audit_record('workbench.correct_rights_note', record, before) return {'record': record, 'changed': True} def _response(self, response_id): row = self.db.execute('SELECT * FROM workbench_responses WHERE id=%s', (response_id,)).fetchone() @@ -496,6 +523,7 @@ def _response(self, response_id): response['provenance'] = json.loads(response.pop('provenance_json')) return response + @authorized('inspect', 'workbench.responses') def responses(self, prompt_id): with self.lock: parent = self._get(prompt_id) @@ -504,12 +532,14 @@ def responses(self, prompt_id): ids = self.db.execute('SELECT id FROM workbench_responses WHERE prompt_id=%s ORDER BY created_at,id', (prompt_id,)) return {'parent': parent, 'responses': [self._response(row['id']) for row in ids]} + @authorized('inspect', 'workbench.response_history') def response_history(self, response_id): with self.lock: self._response(response_id) return {'history': [json.loads(row[0]) for row in self.db.execute( 'SELECT snapshot FROM workbench_response_history WHERE id=%s ORDER BY revision', (response_id,))]} + @authorized('edit', 'workbench.save_response') def save_response(self, body): """An independent target with immutable prompt identity and explicit CAS.""" fields = {'id', 'prompt_id', 'revision', 'parent_revision', 'source_revision', 'completion', 'review'} @@ -524,7 +554,10 @@ def save_response(self, body): text_value(completion, 'Completion', MAX_TEXT) if body['review'] not in ('draft', 'human_reviewed'): raise WorkbenchError('Explicitly choose draft or review this exact completion.') + if body['review'] == 'human_reviewed': + self.access.require('approve-review', 'workbench.approve_response', body['id'], owner_only=True) with self.lock, self.db.transaction(): + actor_kind = self.access.identity()['kind'] parent = self._get(body['prompt_id']) if parent['kind'] != 'text' or not parent['source_available']: raise WorkbenchError('Instruction responses require an available text prompt.') @@ -539,20 +572,31 @@ def save_response(self, body): raise WorkbenchError('The response changed or belongs to another prompt. Reload before saving.', 'conflict', 409) if before['completion'] == completion and before['review'] == body['review']: return {'response': before, 'parent': parent, 'changed': False} + origin = dict(before['provenance']) + if before['completion'] != completion: + origin['method'] = 'agent_authored' if actor_kind == 'agent' else 'human_authored' self.db.execute('''UPDATE workbench_responses SET completion=%s,review=%s,revision=revision+1, - updated_at=%s WHERE id=%s''', (completion, body['review'], created, body['id'])) + updated_at=%s,provenance_json=%s WHERE id=%s''', + (completion, body['review'], created, encode_retained(origin), body['id'])) else: if body['revision'] != 0: raise WorkbenchError('Response no longer exists.', 'unavailable', 409) - origin = {'method': 'human_authored', 'prompt_id': parent['id'], + origin = {'method': 'agent_authored' if actor_kind == 'agent' else 'human_authored', 'prompt_id': parent['id'], 'prompt_sha256': parent['content_hash'], 'source_sha256': parent['source_sha256']} self.db.execute('INSERT INTO workbench_responses VALUES (%s,%s,%s,%s,%s,%s,%s,%s)', (body['id'], parent['id'], 1, completion, body['review'], encode_retained(origin), created, created)) response = self._response(body['id']) self.db.execute('INSERT INTO workbench_response_history VALUES (%s,%s,%s)', (response['id'], response['revision'], encode_retained({'response': response, 'parent': parent}))) + self.access.audit('workbench.approve_response' if body['review'] == 'human_reviewed' else + 'workbench.save_response', response['id'], + {'before_revision': body['revision'], 'revision': response['revision'], + 'prompt_id': parent['id'], 'parent_revision': parent['revision'], + 'source_revision': parent['source_revision'], + 'content_sha256': hashlib.sha256(encode_retained({'response': response, 'parent': parent}).encode()).hexdigest()}) return {'response': response, 'parent': parent, 'changed': True} + @authorized('inspect', 'workbench.response_selection') def response_selection(self, items): if not isinstance(items, list) or not 1 <= len(items) <= 5000: raise WorkbenchError('Select 1–5,000 explicit response revisions per synchronous release.') @@ -590,6 +634,7 @@ def check_immutable_selection(self, records): from immutable_assets import check_selection check_selection(records) + @authorized('inspect', 'workbench.asset') def asset(self, record_id): """Return a trusted source handle; the caller holds the shared lock while reading.""" record = self._get(record_id) @@ -608,6 +653,7 @@ def asset(self, record_id): raise WorkbenchError('Source image unavailable.', 'unavailable', 404) return path, 'image/png' + @authorized('inspect', 'workbench.selection') def selection(self, items, *, max_snapshot_bytes=None): if not isinstance(items, list) or not 1 <= len(items) <= 5000: raise WorkbenchError('Select 1–5,000 records per synchronous release.') From d3c0e09908643b1b05a307a4c573df1458b97b29 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 13 Oct 2026 16:48:31 +0000 Subject: [PATCH 2/2] Keep authenticated corner workspace inside desktop viewport --- .../reports/p3a-admission.md | 1 + .../reports/p3a-verification.md | 12 ++++++++++++ .../reports/p3a/source-files.json | 1 + static/style.css | 2 ++ 4 files changed, 16 insertions(+) diff --git a/docs/plans/generic-scientific-projects/reports/p3a-admission.md b/docs/plans/generic-scientific-projects/reports/p3a-admission.md index 9ab48f87..7f5dbd19 100644 --- a/docs/plans/generic-scientific-projects/reports/p3a-admission.md +++ b/docs/plans/generic-scientific-projects/reports/p3a-admission.md @@ -88,6 +88,7 @@ static/native_text_import.js static/pointclouds.js static/pumas-typed.js static/scientific-fields.js +static/style.css static/sequence-batch.js static/volume-editor.js static/workbench.html diff --git a/docs/plans/generic-scientific-projects/reports/p3a-verification.md b/docs/plans/generic-scientific-projects/reports/p3a-verification.md index 12b85a1d..94073d7d 100644 --- a/docs/plans/generic-scientific-projects/reports/p3a-verification.md +++ b/docs/plans/generic-scientific-projects/reports/p3a-verification.md @@ -72,3 +72,15 @@ is claimed. `/proc/.../children` is unavailable, so the revised probe used PPID scanning. An initial failed probe left a PID-1-owned zombie after its bounded child exited; revised cases fully reaped their children. Production lifecycle qualification is still P3b work, after P3a CI. + +## Hosted regression correction + +PR47 initial head4d3314a passed all14 workspace-UI steps and the full hosted Python +suite, new authentication browser gate and scientific/project browser gates. +Lifecycle run38431312561 then failed the legacy corner-studio viewport assertion: +the new session bar added height above an existing fixed-height workspace. A +scoped desktop CSS flex layout shares the viewport among session bar, header and +main content. The complete legacy browser passes locally with Chromium after the +fix, including its narrow-screen image-fit check and four local provider fixtures. +GitHub log retrieval returned403; diagnosis used local reproduction, not an +assumed failure cause. Final-head CI must repeat before P3b admission. diff --git a/docs/plans/generic-scientific-projects/reports/p3a/source-files.json b/docs/plans/generic-scientific-projects/reports/p3a/source-files.json index a89089cd..fed3b548 100644 --- a/docs/plans/generic-scientific-projects/reports/p3a/source-files.json +++ b/docs/plans/generic-scientific-projects/reports/p3a/source-files.json @@ -44,6 +44,7 @@ "static/pumas-typed.js": "50fd9fc961dafdd0c34cfcb1137d04f85a99f324f76fd5217f227b789c8835ad", "static/scientific-fields.js": "96e6289ade2a634e9648cbe8aa899e5bfaddacddcea120835bda8cb6d65e14a6", "static/sequence-batch.js": "36bbbdc07cc3a03856e6072e4141545c1c0f202805faedec76a2c7f20c0850f7", + "static/style.css": "25103299f9add27eafbee40c9a12634d7640a6c54a785c981066b6403de0603d", "static/volume-editor.js": "d48806cd446ea05586b524c24340d87abe8c69063ea6b15c254f76b3e51c5db8", "static/workbench.html": "6d1ab570aae02f781b905ffa2b6970843c297d6ffe671e8fe7cca620e2a46270", "static/workbench.js": "7e31b8a0e916f1627cb523d84c6d98c732eb739617b3f3856cbc1c235a6829b2", diff --git a/static/style.css b/static/style.css index b6c61e95..16c3e528 100644 --- a/static/style.css +++ b/static/style.css @@ -32,3 +32,5 @@ .workspace-bar{flex-wrap:wrap} button.danger{color:#9b352b;border-color:#d6b3ac}button.danger:hover:not(:disabled){background:#fae8e4} +/* The session bar and header share the desktop viewport with the camera workspace. */ +@media(min-width:761px){body{display:flex;flex-direction:column;height:100dvh}body>header,body>.session-bar{flex:none}body>main{height:auto;flex:1}}