mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-06-28 02:39:26 +08:00
* [Partner Nodes] feat: add Krea 2 Medium Turbo model (#14280)
* [Partner Nodes] feat: add seed input to Flux Erase node (#14283)
Signed-off-by: bigcat88 <bigcat88@icloud.com>
* chore: update workflow templates to v0.9.98 (#14284)
* Bump comfyui-frontend-package to 1.45.15 (#14265)
* Fix ideogram if model dtype gets set to fp8. (#14291)
* Consolidate audio nodes into SaveAudioAdvanced node (CORE-202) (#13871)
* Enable cfg1 optimization for DualModelGuider with CFGGuider (#14290)
* Enable cfg1 optimization for DualModelGuider
* Fix CFG Override tooltip
* Fix interoperation with external source of pinned memory pressure (#14252)
* mm: split off registration helper to doer and headroom calc
* pinned_memory: implement registration comfy side
Move away from Aimdo buffer registrations which seem fraught with
danger and do it comfy side. Just start with the basic move.
* pinned_memory: do registrations as portable memory
* pinned_memory: discard async errors on registration fail
Like the good ol days.
* pinned_memory: implement abs shortfall retry
If pinned registration happens to fail despite the previous budget
ensures, consider the allocation shortfall, ensure it again, and
try again. This allows comfy pins to interoperate with other software
that might be doing substantive pinning.
* aimdo 049 (#14300)
* [Partner Nodes] feat: add new Gemini text node (#14299)
* [Partner Nodes] feat: add temperature and top_p to NanoBanan node (#14305)
* feat: add PreviewGaussianSplat + PreviewPointCloud nodes (#14194)
* Update AMD portable readme. (#14303)
* BE-1172 fix(3d): save Preview3DAdvanced / PreviewGaussianSplat / PreviewPointCloud to temp/, rename viewport input (#14294)
* feat(3d): reorder Preview3DAdvanced / PreviewGaussianSplat / PreviewPointCloud inputs and outputs (#14308)
* Update line endings check to ignore .ci files. (#14319)
* Use windows line endings for windows portable readmes. (#14334)
* Add SeedVR2 support (CORE-6) (#14110)
* chore: update embedded docs to v0.5.3 (#14350)
* Add Color primitive (#14260)
* Improve ResolutionSelector (#14309)
* feat(assets): extract image dimensions at ingest and emit on asset responses (#13991)
* feat(assets): extract image dimensions at ingest and emit on asset responses
Image assets now carry width/height under the existing `metadata` field on
asset responses, shaped as `{"kind": "image", "width": W, "height": H}`.
This lets consumers get original dimensions (e.g. for clients that render
server-side thumbnails and can't recover them from naturalWidth/Height)
without an extra round-trip.
Dimensions are written to AssetReference.system_metadata across three
ingest paths:
- Direct file ingest (upload, in-place registration): Pillow reads the
image header right after hashing, while the file is still in OS page
cache. Non-image MIME types are skipped without touching the file.
- From-hash registration: this path never reads the file bytes, so
dimensions are best-effort copied from any prior sibling reference of
the same asset that already carries kind=image metadata. Missing
siblings, non-image siblings, or absent dimension keys leave the new
reference's metadata unchanged.
- Scanner enrichment: extends the existing system_metadata write in
enrich_asset so scanner-registered images get the same treatment as
uploaded ones.
Existing system_metadata keys (e.g. safetensors fields written by the
enricher, download provenance) are preserved through merge. Existing
assets ingested before this change retain their current metadata — no
automatic backfill in this PR.
Tests cover image emission, non-image no-op, merge preservation, and the
from-hash sibling back-fill (including the no-sibling and non-image-sibling
cases).
* fix(assets): validate sibling dimensions before backfilling
Per CodeRabbit review on #13991: the previous loop accepted any sibling
with `kind == "image"` and copied whichever dimension keys happened to
be present, then returned. A partial sibling (kind set but missing or
invalid width/height) could persist incomplete metadata onto the new
reference even when a later sibling had valid dimensions.
Now we validate that the sibling has both width and height as positive
integers before adopting its dimensions, and continue scanning to the
next sibling otherwise.
* fix(assets): reject booleans in sibling dimension validation (use type-is)
Per CodeRabbit follow-up on #13991: bool is a subclass of int in Python,
so isinstance(True, int) is True. The previous strict-int gate would
have accepted width=True (truthy + > 0) as a valid dimension.
Realistic occurrence is low (extract_image_dimensions returns proper
ints, JSON doesn't serialize bools as numbers), but the validation gate
exists for defense-in-depth so it should be actually strict.
---------
Co-authored-by: guill <jacob.e.segal@gmail.com>
* Revert "Add SeedVR2 support (CORE-6) (#14110)" (#14359)
This reverts commit 7863cf0e53.
* chore(openapi): sync shared API contract from cloud@5273c30 (#14266)
* fix: Add back apply_rotary_emb for Qwen Image (#14364)
* Allow custom templates with Ideogram4 TE (#14374)
* main/server: Add --debug-hang (#14371)
Add an option to debug a hang with ctrl-C, dumping the backtraces to
see where its stuck or slow.
* Add LoRA key mapping for LTXV/LTXAV models (#14349)
* feat: Add model support for SCAIL-2 (#14373)
* initial SCAIL2 support
* Move bg_removal_model input socket to first position for nicer display (#14353)
* mm: dont reset cast buffers in cleanup_models_gc() (#14372)
cleanup_models_gc can be called once per load_models_gpu via
free_memory, which in turn can de-activate an active model via
this reset_cast_buffers.
cleanup_models_gc() could also come via obscure garbage collector
paths so limit reset_cast_buffers to the post-node callsite instead.
* Ensure conditions are not trainable to avoid bugs (#14368)
* feat: Add Bernini-R model support (Wan video) (CORE-279) (#14216)
* Depth anything 3 (Core-135) (#13853)
Co-authored-by: Alexis Rolland <alexisrolland@hotmail.com>
* Always enable cuda malloc on cu130 and higher. (#14381)
* chore(openapi): sync shared API contract from cloud@ca12913 (#14367)
* [Trainer/bug] Ensure model is not inference mode (CORE-72) (#13400)
* Ensure model is not inference mode
* force clone inside training mode to avoid inference tensor
* Allow force deepcopy for model patcher
* chore(assets): drop vestigial tags.tag_type column (#14248)
tag_type was always "user" in practice — no code path ever set it to anything
else (no system/seeded classification was wired up) and nothing queried it. The
column, its ix_tags_tag_type index, and the TagUsage.type API field were dead
weight, so they're removed. Adds alembic migration 0004 to drop the column and
index.
Verified: asset-seeder tests pass; migration applies cleanly on a fresh SQLite
(tags retains only name; tag_type column + index dropped).
Co-authored-by: guill <jacob.e.segal@gmail.com>
* feat(assets): cursor-based pagination on GET /api/assets (#14014)
* spec(assets): add cursor pagination params to GET /api/assets
Add 'after' query param and 'next_cursor' response field for keyset
pagination. Matches the cloud Go implementation (BE-893) so frontend
sees a unified contract across runtimes. Offset/limit remain as a
deprecated fallback.
* feat(assets): add cursor encode/decode helpers for keyset pagination
Port of cloud common/pagination/cursor.go. Wire format is base64url of
{"s", "v", "id"} JSON; times are Unix microseconds UTC to match
PostgreSQL timestamp precision.
Includes a byte-identity fixture pinned against the cloud Go wire
format so cross-runtime FE pagination can't silently drift.
* feat(assets): thread cursor through schemas, service, and query layer
list_assets_page accepts an opaque 'after' cursor and returns
next_cursor when more pages are available. The query applies a keyset
WHERE clause and a secondary ORDER BY id for deterministic tiebreak.
Cursor sort field is validated against the request sort, and a
last_access_time sort (OSS-only) falls back to offset/limit. Offset is
ignored whenever a cursor is supplied.
* feat(assets): wire cursor pagination through GET /api/assets handler
Adds integration tests for: full cursor walk, invalid-cursor 400,
sort/cursor mismatch 400, cursor-wins-over-offset, absent next_cursor
when no more results, and pagination stability across deletes.
* fix(assets): address cursor-review verified findings
- Mint next_cursor on every cursor-supported sort, not only when 'after'
was supplied. A first request (no 'after') previously returned
next_cursor=None, leaving cursor mode unreachable from a clean start.
- Over-fetch limit+1 so an exactly-full terminal page doesn't mint a
spurious cursor pointing at a phantom next page.
- Map crafted out-of-range microsecond cursors (OverflowError / OSError
in datetime construction) to 400 INVALID_CURSOR instead of leaking 500.
- Bump MAX_CURSOR_VALUE_LENGTH 256 -> 512 to match the AssetReference
name column max; without this, a long-named asset minted a cursor the
same server then refused on the next request. Cross-runtime byte
identity with cloud is unaffected because no cloud cursor ever carries
a value > 256 (cloud schema doesn't permit it).
- Return None from _encode_next_cursor when the boundary row carries a
NULL sort value (e.g. an Asset without size_bytes backfilled), instead
of silently encoding 0 and mis-positioning the keyset.
- Fix schemas_in.py comment so it matches actual handler behavior
(last_access_time + 'after' raises 400, does not fall back).
- Add AssetsApiError schema + 400 response to GET /api/assets in
openapi.yaml so generated clients know the INVALID_CURSOR envelope.
- Extend integration coverage: first-page mint, exact-multiple terminal
page, cursor walks for created_at/updated_at/size sorts, datetime
overflow surfaces as 400 not 500.
- Add unit coverage for datetime overflow and 512-char round-trip.
* feat(assets): bind cursor to sort order + Go-compat JSON escaping
Address three needs-judgment items from the cursor-review judge synthesis:
1. Cursor wire format now includes an "o" key carrying the sort
direction ("asc" / "desc") it was minted under. A request that
replays the cursor with a flipped `order` parameter is rejected
with 400 INVALID_CURSOR instead of silently walking the wrong
direction. Legacy cursors without "o" still decode (the binding
is best-effort until cloud mirrors the field — follow-up filed
separately).
2. JSON serialization now escapes `<`, `>`, `&`, U+2028, U+2029
to mirror Go's default `json.Marshal` behavior. Without this, an
asset name containing those characters produced different bytes on
Python vs cloud Go. The escaped form is what both runtimes emit.
3. Add direct query-layer tests for the keyset tiebreaker — the secondary
ORDER BY id branch was previously unexercised. Two scenarios: all
rows share a primary sort value, and mixed ties straddle page
boundaries. Both assert no row is dropped or duplicated across the
walk.
Wire-format note: Python cursors now differ from current cloud cursors
by exactly the "o" key. Cloud follow-up will bring the two back into
byte alignment.
* fix(assets): address bot review comments
- Soften offset param prose: it's not deprecated, just not preferred for
sequential walks. Random-access UIs (jump-to-page, item count displays)
legitimately still want offset, so dropping the 'deprecated' framing
rather than promoting it to a machine-readable deprecated:true flag.
- Add explicit HTTP status assertions before every json() / next_cursor
read in test_list_cursor.py so a failing request surfaces as an HTTP
error instead of a confusing KeyError on a 4xx/5xx body.
* feat(assets): require cursor o field, drop legacy permissive path
Cursor pagination hasn't shipped on either runtime yet — this PR is
still draft and cloud's mirror is just behind it — so there are no
legacy no-o cursors in the wild. Make o mandatory from day one
rather than landing permissive and tightening later.
decode_cursor now rejects any payload without o (or with a non-string
o) as malformed. CursorPayload.order becomes a required str. Tests
that constructed CursorPayload directly now pass order="desc";
test_legacy_cursor_without_order_accepted flips to
test_cursor_without_order_rejected.
* chore(assets): drop cross-repo prose from cursor comments
Strip prose references to sibling Go implementations and external
ticket IDs from cursor.py, the cursor tests, the keyset integration
tests, asset_management's sort-field comment, and the legacy
prompt_id alias comment. Pure docstring/comment scrub — no behavior
or wire-format changes. x-runtime: [cloud] field annotations in
openapi.yaml are unchanged; those are the spec's structural
cross-runtime convention, not internal references.
* test(assets): include 'o' in microsecond-boundary cursor payload
The boundary test was building a cursor without the required `o` key, so
decode failed on the missing-order branch before reaching the µs-overflow
path the test is asserting. Both paths return 400 INVALID_CURSOR so the
assertion passed for the wrong reason. Add `o` to the payload and matching
`order=` to the request so the decode reaches the intended branch.
* fix(assets): address ultrareview findings on cursor pagination
Six fact-checked findings from the multi-model review pass:
- Encoder/decoder length asymmetry: encode_cursor now rejects empty id,
oversized id (>128), oversized value (>512), and invalid order tokens
symmetrically with decode_cursor. Prevents the same server from minting
a cursor it then 400s on the next request (e.g. a filesystem-scanned
asset name >512 chars). The bad-order path now raises InvalidCursorError
(still subclasses ValueError) so route-layer handling stays uniform.
- Raw U+2028/U+2029 in cursor.py source: ripgrep treated those lines as
line-terminators, confirming the bytes were the actual separators. Any
editor save / autoformat / git tooling that normalizes invisibles would
silently break the encoder. Replaced with explicit
/
Python escape sequences.
- set(seen) == set(names) hid ordering regressions: a cursor walk that
dropped a row at a page boundary or returned duplicates could pass.
Reworked the assertion to (1) reject duplicates, (2) require full
coverage, and (3) assert strict positional order for size sort, the
only field with a clock-independent ordering.
- Flaky time.sleep(0.05) between inserts: Windows CI clock resolution is
~15ms, so back-to-back inserts under load could collide and exercise
the tiebreaker instead of the documented path. Removed the sleep and
let the strengthened assertion above carry coverage / no-duplicates,
with size sort carrying strict order.
- Cursor error envelope diverged from the rest of routes.py: cursor 400s
emitted {error: {code, message}} while every other 400 in the file
emits {error: {code, message, details}} via _build_error_response.
Switched to _build_error_response and added the details field to the
AssetsApiError schema in openapi.yaml.
- "Byte-identity fixtures" only checked substring containment, defeating
the test class's stated purpose of pinning the wire format. Switched
to exact-bytes equality against an inline expected payload string per
fixture, so any whitespace / key-order / escape drift fails loudly.
Also dropped Go / json.Marshal references from docstrings — the byte
format is the contract, not the runtime that mints it.
* fix(assets): cap cursors by encoded wire size, not just char count
Char-count guards on value/id can still let multibyte or escape-heavy
inputs blow past MAX_ENCODED_CURSOR_LENGTH once UTF-8 + escape expansion
+ base64url runs. A 512-character name of 'é' (2 bytes UTF-8) or '<'
(serializes to the 6-byte '<' escape) passes the char check, mints
a ~1500-byte cursor, then 400s when handed back on the next request.
Compute the final encoded form and reject it before returning if it
exceeds the wire cap. Adds regression tests for both inflation paths.
* refactor(assets): extract cursor JSON escaping helper; size wire cap above per-field caps
Addresses review feedback on cursor.py:
- Extract the inline escape chain into _apply_wire_compatible_json_escapes()
with a comment pinning it to the wire format's escape set, so the parity
intent is explicit rather than reading as an ad-hoc transform.
- Raise MAX_ENCODED_CURSOR_LENGTH to 8192 (comfortably above the ~5.2KB
worst-case the per-field caps can produce) and drop the mint-time length
guard. Encoder/decoder symmetry now holds by construction: the encoder
can't produce a cursor the decode path rejects, so there is no confusing
user-visible 'cursor too long' failure at mint time.
- Rewrite the two over-wire-cap tests to assert worst-case multibyte and
escape-heavy values mint and round-trip, instead of being rejected.
* refactor(assets): drop cross-runtime cursor escaping; cursors are opaque
The custom JSON escaping of <, >, &, U+2028, and U+2029 existed only to
keep the encoded cursor byte-identical with the Cloud implementation of
the same payload format. Cursors are opaque tokens, so byte-level
compatibility across implementations is not needed — plain json.dumps
output is sufficient. Remove the escaping helper and the byte-identity
test fixtures that pinned the wire format; keep round-trip coverage for
the affected characters.
---------
Co-authored-by: guill <jacob.e.segal@gmail.com>
* fix(assets): remove unused delete_content param from deleteAsset (#14241)
* fix(assets): remove unused delete_content param from deleteAsset
The delete_content query param on DELETE /api/assets/{id} was introduced
in #12125 and had its default flipped to false in #12621. In practice no
client sends it: the frontend issues a bare DELETE /assets/{id}, so every
real caller already gets the default soft-delete (the reference is hidden,
content preserved). The only thing that set delete_content=true was this
repo's own test teardown.
Remove the param from the route and the OpenAPI spec so the contract
matches what clients actually use (and lines up with the cloud surface).
The route now always soft-deletes. The underlying delete_asset_reference
helper keeps its delete_content_if_orphan option, so orphan reclamation
remains available internally for a future GC path — it's just no longer
exposed on the public endpoint. Tests that used delete_content=true for
hard cleanup now soft-delete; test_delete_upon_reference_count asserts
content preservation instead of orphan removal.
* test/docs: address review on deleteAsset delete_content removal
- Rename test_delete_upon_reference_count ->
test_soft_delete_preserves_asset_identity_across_references; the old name
implied last-ref cleanup, but it now verifies the opposite (soft delete
preserves identity across references).
- Strengthen the re-association assertion: also check asset_hash == src_hash
so it proves content reuse rather than relying on the now-tautological
created_new is False.
- Document delete_asset_reference: the orphan-reclamation branch is
intentionally internal-only; the public endpoint always soft-deletes.
- Normalize the soft-delete comment phrasing.
* test(assets): make seed content unique per test for isolation
Removing the delete_content param means delete is always a soft delete, so
content created by one test now survives into the next. The suite had been
relying on hard-delete teardown for isolation, so shared fixed-content
fixtures started colliding: seeded_asset (b"A"*4096) and
make_asset_bytes (deterministic on name) produced the same hash every test,
so the second seed deduped to the surviving asset and returned 200 instead
of 201, cascading into ~14 failures/errors.
Salt both fixtures with a per-test uuid so each test creates fresh content
(created_new True, 201), while keeping content deterministic within a test
(same name/size -> same bytes) and preserving exact byte length so size-based
list/sort assertions are unaffected.
* main: force cudnn.benchmark to false (#14390)
Some custom nodes try to set this true globally. It messes with dynamic
VRAM with one-off spikes that can OOM but this is also very high risk
for windows where such allocations might get serviced by shared memory
fallback.
Trump it.
* feat(assets): add job_ids filter to GET /api/assets (#13998)
* feat(assets): add job_ids filter to GET /api/assets
Mirrors the existing cloud `job_ids` query param on the local Python server:
clients can pass a comma-separated list (or repeated query params) of UUIDs
to filter assets by their associated job.
The `AssetReference.job_id` column already exists, so no migration is
needed — this just plumbs the filter through schema → service → query.
Marks the parameter as available in both runtimes by dropping the
`[cloud-only]` description prefix and the `x-runtime: [cloud]` tag from
the OpenAPI spec, per the OSS field-drift convention (absent runtime tag
= populated by both local and cloud).
* fix(assets): tighten job_ids — array schema, max_length, narrow except
From cursor-reviews on the parent commit:
- OpenAPI: declare job_ids as `type: array, items: string format: uuid`
with `style: form, explode: true` so it matches the documented
contract (and matches sibling include_tags/exclude_tags shape).
Description now states both accepted shapes explicitly.
- Schema: cap `job_ids` at 500 entries (max_length on the Pydantic
field) so a client can't splice an unbounded list into the IN clauses.
- Schema: drop `AttributeError` from the except — `raw` only contains
`str` items by construction, so `uuid.UUID(<str>)` raises `ValueError`
exclusively; the second clause was dead code.
* fix(assets): tighten job_ids validator + add schema-level tests
Aligns with the parallel hardening from draft PR #13848 (now closed as
a duplicate). The validator now:
- Raises ValueError on non-string list items (was: silently dropped).
- Raises ValueError on non-string / non-list top-level values like dict
or int (was: silently passed through to Pydantic's downstream coercion).
Adds tests-unit/assets_test/queries/test_list_assets_query.py covering
the validator end-to-end: CSV canonicalization, dedup order, default
empty, invalid UUID, non-string list item, non-string non-list value,
and the max_length=500 boundary.
* feat(prompt): enforce canonical UUID prompt_id at job creation
POST /prompt previously accepted any client-supplied prompt_id verbatim,
str()-coercing even non-strings, and minting the literal job id "None"
for an explicit JSON null. The new GET /api/assets job_ids filter matches
stored job ids as canonical UUIDs exactly, so a non-UUID id minted a job
whose assets could never be filtered.
- validate_job_id (comfy_execution/jobs.py): requires a string in the
canonical lowercase hyphenated UUID form; raises ValueError otherwise,
including parseable-but-non-canonical spellings (uppercase, braced, URN,
bare hex), which would otherwise be silently rewritten and then miss
every exact-match lookup downstream (history keys, websocket
correlation, /interrupt, the assets job_ids filter).
- POST /prompt: absent or null prompt_id means the server mints uuid4;
invalid means 400 invalid_prompt_id on the standard error envelope.
- openapi.yaml: document the request-side prompt_id (format uuid,
nullable) on PromptRequest.
- tests: unit matrix for validate_job_id; integration tests against the
booted server covering rejection, acceptance, and null handling.
---------
Co-authored-by: guill <jacob.e.segal@gmail.com>
* feat(assets): include asset id in executed WebSocket message (#13862)
* feat(assets): enrich executed WS message with asset metadata
When --enable-assets is set, each file-type output entry in the
`executed` WebSocket message now includes id, name, asset_hash, size,
and mime_type — matching the shape already returned by /upload/image.
The enrichment lives in comfy_execution/asset_enrichment.py (no torch
dependency) and is called from both send sites in execution.py: freshly
executed nodes register the file inline via register_file_in_place;
cached node re-sends look up the existing AssetReference by file path
to avoid re-hashing. Errors are caught per-entry so a failure never
blocks the WS message from sending.
* fix(assets): inject only id in executed WS message per Asset Identity RFC
Per the Asset Identity RFC, the executed WebSocket payload should carry
id alone — hash is already encoded in the filename, and name/preview_url/
size belong behind GET /api/assets/{id} rather than being pushed eagerly.
Simplifies the DB lookup path: we only need ref.id, so the asset.hash
null-check is no longer required as a fallback trigger.
* fix(assets): reject path traversal when resolving output abs_path
Subfolder/filename were joined and absolutized without containment check,
so '..' segments or an absolute filename could escape the type's base
directory and register an unrelated on-disk file as an asset.
Add commonpath-based containment check; skip enrichment (warn, leave
entry unchanged) when the resolved path escapes base. Catches ValueError
from cross-drive paths on Windows.
* docs(assets): drop Asset Identity RFC reference from docstring
* docs(assets): trim docstring to what enrichment does, not what it doesn't
* test(assets): use real platform paths so containment check works on Windows
The previous test setup patched os.path.abspath to identity and used a
POSIX-style '/output' base, which collided with Windows path separators
in os.path.commonpath. Drop the abspath/join patches and use a real
tempdir-rooted base so the containment check runs against actual
platform paths.
* refactor(assets): enrich at output-processing time, not in the WS send path
Per review: enrichment lived inside the client_id-guarded send sites, so a
headless run (no websocket client) never registered assets at all, and
ui_outputs/history stored the un-enriched entries.
Now output_ui is enriched once, right after the node produces it and before
it is stored in ui_outputs — so registration happens regardless of connected
clients, and the asset id flows into history and the execution cache for
free. _send_cached_ui re-sends the stored (already-enriched) dict verbatim,
which lets the DB-lookup-by-path fallback be deleted: every enrichment is
now a fresh output, and register_file_in_place re-hashes on upsert so an
overwritten path can never carry a stale id.
* revert(assets): drop job_ids filter from GET /api/assets (#14408)
The job_ids query filter added in #13998 has no live consumer: the
frontend Generated tab kept sourcing from GET /jobs, and the cloud side
removed its equivalent filter from the shared asset spec. Carrying it on
the local server only re-introduces Core<->Cloud drift on the shared
contract, so remove it to match.
Removed: the job_ids field + validator on ListAssetsQuery, the IN(...)
clauses in list_references_page, the service/route passthrough, and the
filter-only tests.
Kept: the canonical-UUID prompt_id enforcement at job creation (also
landed in #13998). It stands on its own -- job ids are matched verbatim
by history keys, websocket correlation, and /interrupt -- and cloud
inherits it by running core for execution, so no divergence is created.
* chore(openapi): sync shared API contract from cloud@e3c52ad (#14406)
* I don't think this actually works anymore. (#14403)
* ops: tolerate already force casted dynamic weight (#14410)
Some custom nodes .to weights completely out of load context which
can wreak havoc if its for a model that is not active. Detect this
condition and just let it fall-through to the non-dynamic loader
straight up.
---------
Signed-off-by: bigcat88 <bigcat88@icloud.com>
Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com>
Co-authored-by: Daxiong (Lin) <contact@comfyui-wiki.com>
Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com>
Co-authored-by: comfyanonymous <121283862+comfyanonymous@users.noreply.github.com>
Co-authored-by: Alexis Rolland <alexisrolland@hotmail.com>
Co-authored-by: Jukka Seppänen <40791699+kijai@users.noreply.github.com>
Co-authored-by: rattus <46076784+rattus128@users.noreply.github.com>
Co-authored-by: Terry Jia <terryjia88@gmail.com>
Co-authored-by: John Pollock <pollockjj@users.noreply.github.com>
Co-authored-by: Silver <65376327+silveroxides@users.noreply.github.com>
Co-authored-by: Matt Miller <mattmiller@comfy.org>
Co-authored-by: guill <jacob.e.segal@gmail.com>
Co-authored-by: kelseyee <971704395@qq.com>
Co-authored-by: Kohaku-Blueleaf <59680068+KohakuBlueleaf@users.noreply.github.com>
Co-authored-by: Talmaj <Talmaj@users.noreply.github.com>
1077 lines
31 KiB
Python
1077 lines
31 KiB
Python
"""Query functions for the unified AssetReference table.
|
|
|
|
This module replaces the separate asset_info.py and cache_state.py query modules,
|
|
providing a unified interface for the merged asset_references table.
|
|
"""
|
|
|
|
from collections import defaultdict
|
|
from datetime import datetime
|
|
from decimal import Decimal
|
|
from typing import NamedTuple, Sequence
|
|
|
|
import sqlalchemy as sa
|
|
from sqlalchemy import delete, select
|
|
from sqlalchemy.dialects import sqlite
|
|
from sqlalchemy.exc import IntegrityError
|
|
from sqlalchemy.orm import Session, noload
|
|
|
|
from app.assets.database.models import (
|
|
Asset,
|
|
AssetReference,
|
|
AssetReferenceMeta,
|
|
AssetReferenceTag,
|
|
Tag,
|
|
)
|
|
from app.assets.database.queries.common import (
|
|
MAX_BIND_PARAMS,
|
|
apply_metadata_filter,
|
|
apply_tag_filters,
|
|
build_prefix_like_conditions,
|
|
build_visible_owner_clause,
|
|
calculate_rows_per_statement,
|
|
iter_chunks,
|
|
)
|
|
from app.assets.helpers import escape_sql_like_string, get_utc_now
|
|
|
|
|
|
def _check_is_scalar(v):
|
|
if v is None:
|
|
return True
|
|
if isinstance(v, bool):
|
|
return True
|
|
if isinstance(v, (int, float, Decimal, str)):
|
|
return True
|
|
return False
|
|
|
|
|
|
def _scalar_to_row(key: str, ordinal: int, value) -> dict:
|
|
"""Convert a scalar value to a typed projection row."""
|
|
if isinstance(value, bool):
|
|
return {"key": key, "ordinal": ordinal, "val_bool": bool(value)}
|
|
if isinstance(value, (int, float, Decimal)):
|
|
num = value if isinstance(value, Decimal) else Decimal(str(value))
|
|
return {"key": key, "ordinal": ordinal, "val_num": num}
|
|
if isinstance(value, str):
|
|
return {"key": key, "ordinal": ordinal, "val_str": value}
|
|
return {"key": key, "ordinal": ordinal, "val_json": value}
|
|
|
|
|
|
def convert_metadata_to_rows(key: str, value) -> list[dict]:
|
|
"""Turn a metadata key/value into typed projection rows."""
|
|
if value is None:
|
|
return []
|
|
|
|
if _check_is_scalar(value):
|
|
return [_scalar_to_row(key, 0, value)]
|
|
|
|
if isinstance(value, list):
|
|
if all(_check_is_scalar(x) for x in value):
|
|
return [_scalar_to_row(key, i, x) for i, x in enumerate(value) if x is not None]
|
|
return [{"key": key, "ordinal": i, "val_json": x} for i, x in enumerate(value) if x is not None]
|
|
|
|
return [{"key": key, "ordinal": 0, "val_json": value}]
|
|
|
|
|
|
|
|
|
|
def get_reference_by_id(
|
|
session: Session,
|
|
reference_id: str,
|
|
) -> AssetReference | None:
|
|
return session.get(AssetReference, reference_id)
|
|
|
|
|
|
def get_reference_with_owner_check(
|
|
session: Session,
|
|
reference_id: str,
|
|
owner_id: str,
|
|
) -> AssetReference:
|
|
"""Fetch a reference and verify ownership.
|
|
|
|
Raises:
|
|
ValueError: if reference not found or soft-deleted
|
|
PermissionError: if owner_id doesn't match
|
|
"""
|
|
ref = get_reference_by_id(session, reference_id=reference_id)
|
|
if not ref or ref.deleted_at is not None:
|
|
raise ValueError(f"AssetReference {reference_id} not found")
|
|
if ref.owner_id and ref.owner_id != owner_id:
|
|
raise PermissionError("not owner")
|
|
return ref
|
|
|
|
|
|
def get_reference_by_file_path(
|
|
session: Session,
|
|
file_path: str,
|
|
) -> AssetReference | None:
|
|
"""Get a reference by its file path."""
|
|
return (
|
|
session.execute(
|
|
select(AssetReference).where(AssetReference.file_path == file_path).limit(1)
|
|
)
|
|
.scalars()
|
|
.first()
|
|
)
|
|
|
|
|
|
def count_active_siblings(
|
|
session: Session,
|
|
asset_id: str,
|
|
exclude_reference_id: str,
|
|
) -> int:
|
|
"""Count active (non-deleted) references to an asset, excluding one reference."""
|
|
return (
|
|
session.query(AssetReference)
|
|
.filter(
|
|
AssetReference.asset_id == asset_id,
|
|
AssetReference.id != exclude_reference_id,
|
|
AssetReference.deleted_at.is_(None),
|
|
)
|
|
.count()
|
|
)
|
|
|
|
|
|
def reference_exists_for_asset_id(
|
|
session: Session,
|
|
asset_id: str,
|
|
) -> bool:
|
|
q = (
|
|
select(sa.literal(True))
|
|
.select_from(AssetReference)
|
|
.where(AssetReference.asset_id == asset_id)
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.limit(1)
|
|
)
|
|
return session.execute(q).first() is not None
|
|
|
|
|
|
def reference_exists(
|
|
session: Session,
|
|
reference_id: str,
|
|
) -> bool:
|
|
"""Return True if a reference with the given ID exists (not soft-deleted)."""
|
|
q = (
|
|
select(sa.literal(True))
|
|
.select_from(AssetReference)
|
|
.where(AssetReference.id == reference_id)
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.limit(1)
|
|
)
|
|
return session.execute(q).first() is not None
|
|
|
|
|
|
def insert_reference(
|
|
session: Session,
|
|
asset_id: str,
|
|
name: str,
|
|
owner_id: str = "",
|
|
file_path: str | None = None,
|
|
mtime_ns: int | None = None,
|
|
preview_id: str | None = None,
|
|
) -> AssetReference | None:
|
|
"""Insert a new AssetReference. Returns None if unique constraint violated."""
|
|
now = get_utc_now()
|
|
try:
|
|
with session.begin_nested():
|
|
ref = AssetReference(
|
|
asset_id=asset_id,
|
|
name=name,
|
|
owner_id=owner_id,
|
|
file_path=file_path,
|
|
mtime_ns=mtime_ns,
|
|
preview_id=preview_id,
|
|
created_at=now,
|
|
updated_at=now,
|
|
last_access_time=now,
|
|
)
|
|
session.add(ref)
|
|
session.flush()
|
|
return ref
|
|
except IntegrityError:
|
|
return None
|
|
|
|
|
|
def get_or_create_reference(
|
|
session: Session,
|
|
asset_id: str,
|
|
name: str,
|
|
owner_id: str = "",
|
|
file_path: str | None = None,
|
|
mtime_ns: int | None = None,
|
|
preview_id: str | None = None,
|
|
) -> tuple[AssetReference, bool]:
|
|
"""Get existing or create new AssetReference.
|
|
|
|
For filesystem references (file_path is set), uniqueness is by file_path.
|
|
For API references (file_path is None), we look for matching
|
|
asset_id + owner_id + name.
|
|
|
|
Returns (reference, created).
|
|
"""
|
|
ref = insert_reference(
|
|
session,
|
|
asset_id=asset_id,
|
|
name=name,
|
|
owner_id=owner_id,
|
|
file_path=file_path,
|
|
mtime_ns=mtime_ns,
|
|
preview_id=preview_id,
|
|
)
|
|
if ref:
|
|
return ref, True
|
|
|
|
# Find existing - priority to file_path match, then name match
|
|
if file_path:
|
|
existing = get_reference_by_file_path(session, file_path)
|
|
else:
|
|
existing = (
|
|
session.execute(
|
|
select(AssetReference)
|
|
.where(
|
|
AssetReference.asset_id == asset_id,
|
|
AssetReference.name == name,
|
|
AssetReference.owner_id == owner_id,
|
|
AssetReference.file_path.is_(None),
|
|
)
|
|
.limit(1)
|
|
)
|
|
.unique()
|
|
.scalar_one_or_none()
|
|
)
|
|
if not existing:
|
|
raise RuntimeError("Failed to find AssetReference after insert conflict.")
|
|
return existing, False
|
|
|
|
|
|
def update_reference_timestamps(
|
|
session: Session,
|
|
reference: AssetReference,
|
|
preview_id: str | None = None,
|
|
) -> None:
|
|
"""Update timestamps and optionally preview_id on existing AssetReference."""
|
|
now = get_utc_now()
|
|
if preview_id and reference.preview_id != preview_id:
|
|
reference.preview_id = preview_id
|
|
reference.updated_at = now
|
|
|
|
|
|
def list_references_page(
|
|
session: Session,
|
|
owner_id: str = "",
|
|
limit: int = 100,
|
|
offset: int = 0,
|
|
name_contains: str | None = None,
|
|
include_tags: Sequence[str] | None = None,
|
|
exclude_tags: Sequence[str] | None = None,
|
|
metadata_filter: dict | None = None,
|
|
sort: str | None = None,
|
|
order: str | None = None,
|
|
after_cursor_value: object | None = None,
|
|
after_cursor_id: str | None = None,
|
|
) -> tuple[list[AssetReference], dict[str, list[str]], int]:
|
|
"""List references with pagination, filtering, and sorting.
|
|
|
|
When ``after_cursor_value``/``after_cursor_id`` are supplied the query uses
|
|
keyset pagination — ``offset`` is ignored and a WHERE clause selects rows
|
|
strictly after the given ``(sort_col, id)`` position in the active sort
|
|
direction. The cursor value must already be typed for the column
|
|
(datetime for time sorts, int for size, str for name); the caller decodes
|
|
the opaque cursor string and resolves to the typed value.
|
|
|
|
Returns (references, tag_map, total_count).
|
|
"""
|
|
base = (
|
|
select(AssetReference)
|
|
.join(Asset, Asset.id == AssetReference.asset_id)
|
|
.where(build_visible_owner_clause(owner_id))
|
|
.where(AssetReference.is_missing == False) # noqa: E712
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.options(noload(AssetReference.tags))
|
|
)
|
|
|
|
if name_contains:
|
|
escaped, esc = escape_sql_like_string(name_contains)
|
|
base = base.where(AssetReference.name.ilike(f"%{escaped}%", escape=esc))
|
|
|
|
base = apply_tag_filters(base, include_tags, exclude_tags)
|
|
base = apply_metadata_filter(base, metadata_filter)
|
|
|
|
sort = (sort or "created_at").lower()
|
|
order = (order or "desc").lower()
|
|
sort_map = {
|
|
"name": AssetReference.name,
|
|
"created_at": AssetReference.created_at,
|
|
"updated_at": AssetReference.updated_at,
|
|
"last_access_time": AssetReference.last_access_time,
|
|
"size": Asset.size_bytes,
|
|
}
|
|
sort_col = sort_map.get(sort, AssetReference.created_at)
|
|
descending = order == "desc"
|
|
|
|
# Keyset WHERE: (sort_col, id) strictly less-than / greater-than the cursor.
|
|
# Equivalent to: sort_col <op> v OR (sort_col = v AND id <op> cursor_id).
|
|
if after_cursor_value is not None and after_cursor_id is not None:
|
|
if descending:
|
|
keyset = sa.or_(
|
|
sort_col < after_cursor_value,
|
|
sa.and_(sort_col == after_cursor_value, AssetReference.id < after_cursor_id),
|
|
)
|
|
else:
|
|
keyset = sa.or_(
|
|
sort_col > after_cursor_value,
|
|
sa.and_(sort_col == after_cursor_value, AssetReference.id > after_cursor_id),
|
|
)
|
|
base = base.where(keyset)
|
|
|
|
# Secondary ORDER BY id (matching the primary direction) gives the keyset
|
|
# comparison a deterministic tiebreaker on duplicate sort_col values.
|
|
id_exp = AssetReference.id.desc() if descending else AssetReference.id.asc()
|
|
sort_exp = sort_col.desc() if descending else sort_col.asc()
|
|
|
|
base = base.order_by(sort_exp, id_exp).limit(limit)
|
|
if after_cursor_id is None:
|
|
base = base.offset(offset)
|
|
|
|
count_stmt = (
|
|
select(sa.func.count())
|
|
.select_from(AssetReference)
|
|
.join(Asset, Asset.id == AssetReference.asset_id)
|
|
.where(build_visible_owner_clause(owner_id))
|
|
.where(AssetReference.is_missing == False) # noqa: E712
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
)
|
|
if name_contains:
|
|
escaped, esc = escape_sql_like_string(name_contains)
|
|
count_stmt = count_stmt.where(
|
|
AssetReference.name.ilike(f"%{escaped}%", escape=esc)
|
|
)
|
|
count_stmt = apply_tag_filters(count_stmt, include_tags, exclude_tags)
|
|
count_stmt = apply_metadata_filter(count_stmt, metadata_filter)
|
|
|
|
total = int(session.execute(count_stmt).scalar_one() or 0)
|
|
refs = session.execute(base).unique().scalars().all()
|
|
|
|
id_list: list[str] = [r.id for r in refs]
|
|
tag_map: dict[str, list[str]] = defaultdict(list)
|
|
if id_list:
|
|
rows = session.execute(
|
|
select(AssetReferenceTag.asset_reference_id, Tag.name)
|
|
.join(Tag, Tag.name == AssetReferenceTag.tag_name)
|
|
.where(AssetReferenceTag.asset_reference_id.in_(id_list))
|
|
.order_by(AssetReferenceTag.tag_name.asc())
|
|
)
|
|
for ref_id, tag_name in rows.all():
|
|
tag_map[ref_id].append(tag_name)
|
|
|
|
return list(refs), tag_map, total
|
|
|
|
|
|
def fetch_reference_asset_and_tags(
|
|
session: Session,
|
|
reference_id: str,
|
|
owner_id: str = "",
|
|
) -> tuple[AssetReference, Asset, list[str]] | None:
|
|
stmt = (
|
|
select(AssetReference, Asset, Tag.name)
|
|
.join(Asset, Asset.id == AssetReference.asset_id)
|
|
.join(
|
|
AssetReferenceTag,
|
|
AssetReferenceTag.asset_reference_id == AssetReference.id,
|
|
isouter=True,
|
|
)
|
|
.join(Tag, Tag.name == AssetReferenceTag.tag_name, isouter=True)
|
|
.where(
|
|
AssetReference.id == reference_id,
|
|
AssetReference.deleted_at.is_(None),
|
|
build_visible_owner_clause(owner_id),
|
|
)
|
|
.options(noload(AssetReference.tags))
|
|
.order_by(Tag.name.asc())
|
|
)
|
|
|
|
rows = session.execute(stmt).all()
|
|
if not rows:
|
|
return None
|
|
|
|
first_ref, first_asset, _ = rows[0]
|
|
tags: list[str] = []
|
|
seen: set[str] = set()
|
|
for _ref, _asset, tag_name in rows:
|
|
if tag_name and tag_name not in seen:
|
|
seen.add(tag_name)
|
|
tags.append(tag_name)
|
|
return first_ref, first_asset, tags
|
|
|
|
|
|
def fetch_reference_and_asset(
|
|
session: Session,
|
|
reference_id: str,
|
|
owner_id: str = "",
|
|
) -> tuple[AssetReference, Asset] | None:
|
|
stmt = (
|
|
select(AssetReference, Asset)
|
|
.join(Asset, Asset.id == AssetReference.asset_id)
|
|
.where(
|
|
AssetReference.id == reference_id,
|
|
AssetReference.deleted_at.is_(None),
|
|
build_visible_owner_clause(owner_id),
|
|
)
|
|
.limit(1)
|
|
.options(noload(AssetReference.tags))
|
|
)
|
|
pair = session.execute(stmt).first()
|
|
if not pair:
|
|
return None
|
|
return pair[0], pair[1]
|
|
|
|
|
|
def update_reference_access_time(
|
|
session: Session,
|
|
reference_id: str,
|
|
ts: datetime | None = None,
|
|
only_if_newer: bool = True,
|
|
) -> None:
|
|
ts = ts or get_utc_now()
|
|
stmt = sa.update(AssetReference).where(AssetReference.id == reference_id)
|
|
if only_if_newer:
|
|
stmt = stmt.where(
|
|
sa.or_(
|
|
AssetReference.last_access_time.is_(None),
|
|
AssetReference.last_access_time < ts,
|
|
)
|
|
)
|
|
session.execute(stmt.values(last_access_time=ts))
|
|
|
|
|
|
def update_reference_name(
|
|
session: Session,
|
|
reference_id: str,
|
|
name: str,
|
|
) -> None:
|
|
"""Update the name of an AssetReference."""
|
|
now = get_utc_now()
|
|
session.execute(
|
|
sa.update(AssetReference)
|
|
.where(AssetReference.id == reference_id)
|
|
.values(name=name, updated_at=now)
|
|
)
|
|
|
|
|
|
def update_reference_updated_at(
|
|
session: Session,
|
|
reference_id: str,
|
|
ts: datetime | None = None,
|
|
) -> None:
|
|
"""Update the updated_at timestamp of an AssetReference."""
|
|
ts = ts or get_utc_now()
|
|
session.execute(
|
|
sa.update(AssetReference)
|
|
.where(AssetReference.id == reference_id)
|
|
.values(updated_at=ts)
|
|
)
|
|
|
|
|
|
def rebuild_metadata_projection(session: Session, ref: AssetReference) -> None:
|
|
"""Delete and rebuild AssetReferenceMeta rows from merged system+user metadata.
|
|
|
|
The merged dict is ``{**system_metadata, **user_metadata}`` so user keys
|
|
override system keys of the same name.
|
|
"""
|
|
session.execute(
|
|
delete(AssetReferenceMeta).where(
|
|
AssetReferenceMeta.asset_reference_id == ref.id
|
|
)
|
|
)
|
|
session.flush()
|
|
|
|
merged = {**(ref.system_metadata or {}), **(ref.user_metadata or {})}
|
|
if not merged:
|
|
return
|
|
|
|
rows: list[AssetReferenceMeta] = []
|
|
for k, v in merged.items():
|
|
for r in convert_metadata_to_rows(k, v):
|
|
rows.append(
|
|
AssetReferenceMeta(
|
|
asset_reference_id=ref.id,
|
|
key=r["key"],
|
|
ordinal=int(r["ordinal"]),
|
|
val_str=r.get("val_str"),
|
|
val_num=r.get("val_num"),
|
|
val_bool=r.get("val_bool"),
|
|
val_json=r.get("val_json"),
|
|
)
|
|
)
|
|
if rows:
|
|
session.add_all(rows)
|
|
session.flush()
|
|
|
|
|
|
def set_reference_metadata(
|
|
session: Session,
|
|
reference_id: str,
|
|
user_metadata: dict | None = None,
|
|
) -> None:
|
|
ref = session.get(AssetReference, reference_id)
|
|
if not ref:
|
|
raise ValueError(f"AssetReference {reference_id} not found")
|
|
|
|
ref.user_metadata = user_metadata or {}
|
|
ref.updated_at = get_utc_now()
|
|
session.flush()
|
|
|
|
rebuild_metadata_projection(session, ref)
|
|
|
|
|
|
def set_reference_system_metadata(
|
|
session: Session,
|
|
reference_id: str,
|
|
system_metadata: dict | None = None,
|
|
) -> None:
|
|
"""Set system_metadata on a reference and rebuild the merged projection."""
|
|
ref = session.get(AssetReference, reference_id)
|
|
if not ref:
|
|
raise ValueError(f"AssetReference {reference_id} not found")
|
|
|
|
ref.system_metadata = system_metadata or {}
|
|
ref.updated_at = get_utc_now()
|
|
session.flush()
|
|
|
|
rebuild_metadata_projection(session, ref)
|
|
|
|
|
|
def delete_reference_by_id(
|
|
session: Session,
|
|
reference_id: str,
|
|
owner_id: str,
|
|
) -> bool:
|
|
stmt = sa.delete(AssetReference).where(
|
|
AssetReference.id == reference_id,
|
|
build_visible_owner_clause(owner_id),
|
|
)
|
|
return int(session.execute(stmt).rowcount or 0) > 0
|
|
|
|
|
|
def soft_delete_reference_by_id(
|
|
session: Session,
|
|
reference_id: str,
|
|
owner_id: str,
|
|
) -> bool:
|
|
"""Mark a reference as soft-deleted by setting deleted_at timestamp.
|
|
|
|
Returns True if the reference was found and marked deleted.
|
|
"""
|
|
now = get_utc_now()
|
|
stmt = (
|
|
sa.update(AssetReference)
|
|
.where(
|
|
AssetReference.id == reference_id,
|
|
AssetReference.deleted_at.is_(None),
|
|
build_visible_owner_clause(owner_id),
|
|
)
|
|
.values(deleted_at=now)
|
|
)
|
|
return int(session.execute(stmt).rowcount or 0) > 0
|
|
|
|
|
|
def set_reference_preview(
|
|
session: Session,
|
|
reference_id: str,
|
|
preview_reference_id: str | None = None,
|
|
) -> None:
|
|
"""Set or clear preview_id and bump updated_at. Raises on unknown IDs."""
|
|
ref = session.get(AssetReference, reference_id)
|
|
if not ref:
|
|
raise ValueError(f"AssetReference {reference_id} not found")
|
|
|
|
if preview_reference_id is None:
|
|
ref.preview_id = None
|
|
else:
|
|
if not session.get(AssetReference, preview_reference_id):
|
|
raise ValueError(f"Preview AssetReference {preview_reference_id} not found")
|
|
ref.preview_id = preview_reference_id
|
|
|
|
ref.updated_at = get_utc_now()
|
|
session.flush()
|
|
|
|
|
|
class CacheStateRow(NamedTuple):
|
|
"""Row from reference query with cache state data."""
|
|
|
|
reference_id: str
|
|
file_path: str
|
|
mtime_ns: int | None
|
|
needs_verify: bool
|
|
asset_id: str
|
|
asset_hash: str | None
|
|
size_bytes: int | None
|
|
|
|
|
|
def list_references_by_asset_id(
|
|
session: Session,
|
|
asset_id: str,
|
|
) -> Sequence[AssetReference]:
|
|
return (
|
|
session.execute(
|
|
select(AssetReference)
|
|
.where(AssetReference.asset_id == asset_id)
|
|
.where(AssetReference.is_missing == False) # noqa: E712
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.order_by(AssetReference.id.asc())
|
|
)
|
|
.scalars()
|
|
.all()
|
|
)
|
|
|
|
|
|
def list_all_file_paths_by_asset_id(
|
|
session: Session,
|
|
asset_id: str,
|
|
) -> list[str]:
|
|
"""Return every file_path for an asset, including soft-deleted/missing refs.
|
|
|
|
Used for orphan cleanup where all on-disk files must be removed.
|
|
"""
|
|
return list(
|
|
session.execute(
|
|
select(AssetReference.file_path)
|
|
.where(AssetReference.asset_id == asset_id)
|
|
.where(AssetReference.file_path.isnot(None))
|
|
)
|
|
.scalars()
|
|
.all()
|
|
)
|
|
|
|
|
|
def upsert_reference(
|
|
session: Session,
|
|
asset_id: str,
|
|
file_path: str,
|
|
name: str,
|
|
mtime_ns: int,
|
|
owner_id: str = "",
|
|
) -> tuple[bool, bool]:
|
|
"""Upsert a reference by file_path. Returns (created, updated).
|
|
|
|
Also restores references that were previously marked as missing.
|
|
"""
|
|
now = get_utc_now()
|
|
vals = {
|
|
"asset_id": asset_id,
|
|
"file_path": file_path,
|
|
"name": name,
|
|
"owner_id": owner_id,
|
|
"mtime_ns": int(mtime_ns),
|
|
"is_missing": False,
|
|
"created_at": now,
|
|
"updated_at": now,
|
|
"last_access_time": now,
|
|
}
|
|
ins = (
|
|
sqlite.insert(AssetReference)
|
|
.values(**vals)
|
|
.on_conflict_do_nothing(index_elements=[AssetReference.file_path])
|
|
)
|
|
res = session.execute(ins)
|
|
created = int(res.rowcount or 0) > 0
|
|
|
|
if created:
|
|
return True, False
|
|
|
|
upd = (
|
|
sa.update(AssetReference)
|
|
.where(AssetReference.file_path == file_path)
|
|
.where(
|
|
sa.or_(
|
|
AssetReference.asset_id != asset_id,
|
|
AssetReference.mtime_ns.is_(None),
|
|
AssetReference.mtime_ns != int(mtime_ns),
|
|
AssetReference.is_missing == True, # noqa: E712
|
|
AssetReference.deleted_at.isnot(None),
|
|
)
|
|
)
|
|
.values(
|
|
asset_id=asset_id, mtime_ns=int(mtime_ns), is_missing=False,
|
|
deleted_at=None, updated_at=now,
|
|
)
|
|
)
|
|
res2 = session.execute(upd)
|
|
updated = int(res2.rowcount or 0) > 0
|
|
return False, updated
|
|
|
|
|
|
def mark_references_missing_outside_prefixes(
|
|
session: Session,
|
|
valid_prefixes: list[str],
|
|
) -> int:
|
|
"""Mark references as missing when file_path doesn't match any valid prefix.
|
|
|
|
Returns number of references marked as missing.
|
|
"""
|
|
if not valid_prefixes:
|
|
return 0
|
|
|
|
conds = build_prefix_like_conditions(valid_prefixes)
|
|
matches_valid_prefix = sa.or_(*conds)
|
|
result = session.execute(
|
|
sa.update(AssetReference)
|
|
.where(AssetReference.file_path.isnot(None))
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.where(~matches_valid_prefix)
|
|
.where(AssetReference.is_missing == False) # noqa: E712
|
|
.values(is_missing=True)
|
|
)
|
|
return result.rowcount
|
|
|
|
|
|
def restore_references_by_paths(session: Session, file_paths: list[str]) -> int:
|
|
"""Restore references that were previously marked as missing.
|
|
|
|
Returns number of references restored.
|
|
"""
|
|
if not file_paths:
|
|
return 0
|
|
|
|
total = 0
|
|
for chunk in iter_chunks(file_paths, MAX_BIND_PARAMS):
|
|
result = session.execute(
|
|
sa.update(AssetReference)
|
|
.where(AssetReference.file_path.in_(chunk))
|
|
.where(AssetReference.is_missing == True) # noqa: E712
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.values(is_missing=False)
|
|
)
|
|
total += result.rowcount
|
|
return total
|
|
|
|
|
|
def get_unreferenced_unhashed_asset_ids(session: Session) -> list[str]:
|
|
"""Get IDs of unhashed assets (hash=None) with no active references.
|
|
|
|
An asset is considered unreferenced if it has no references,
|
|
or all its references are marked as missing.
|
|
|
|
Returns list of asset IDs that are unreferenced.
|
|
"""
|
|
active_ref_exists = (
|
|
sa.select(sa.literal(1))
|
|
.where(AssetReference.asset_id == Asset.id)
|
|
.where(AssetReference.is_missing == False) # noqa: E712
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.correlate(Asset)
|
|
.exists()
|
|
)
|
|
unreferenced_subq = sa.select(Asset.id).where(
|
|
Asset.hash.is_(None), ~active_ref_exists
|
|
)
|
|
return [row[0] for row in session.execute(unreferenced_subq).all()]
|
|
|
|
|
|
def delete_assets_by_ids(session: Session, asset_ids: list[str]) -> int:
|
|
"""Delete assets and their references by ID.
|
|
|
|
Returns number of assets deleted.
|
|
"""
|
|
if not asset_ids:
|
|
return 0
|
|
total = 0
|
|
for chunk in iter_chunks(asset_ids, MAX_BIND_PARAMS):
|
|
session.execute(
|
|
sa.delete(AssetReference).where(AssetReference.asset_id.in_(chunk))
|
|
)
|
|
result = session.execute(sa.delete(Asset).where(Asset.id.in_(chunk)))
|
|
total += result.rowcount
|
|
return total
|
|
|
|
|
|
def get_references_for_prefixes(
|
|
session: Session,
|
|
prefixes: list[str],
|
|
*,
|
|
include_missing: bool = False,
|
|
) -> list[CacheStateRow]:
|
|
"""Get all references with file paths matching any of the given prefixes.
|
|
|
|
Args:
|
|
session: Database session
|
|
prefixes: List of absolute directory prefixes to match
|
|
include_missing: If False (default), exclude references marked as missing
|
|
|
|
Returns:
|
|
List of cache state rows with joined asset data
|
|
"""
|
|
if not prefixes:
|
|
return []
|
|
|
|
conds = build_prefix_like_conditions(prefixes)
|
|
|
|
query = (
|
|
sa.select(
|
|
AssetReference.id,
|
|
AssetReference.file_path,
|
|
AssetReference.mtime_ns,
|
|
AssetReference.needs_verify,
|
|
AssetReference.asset_id,
|
|
Asset.hash,
|
|
Asset.size_bytes,
|
|
)
|
|
.join(Asset, Asset.id == AssetReference.asset_id)
|
|
.where(AssetReference.file_path.isnot(None))
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.where(sa.or_(*conds))
|
|
)
|
|
|
|
if not include_missing:
|
|
query = query.where(AssetReference.is_missing == False) # noqa: E712
|
|
|
|
rows = session.execute(
|
|
query.order_by(AssetReference.asset_id.asc(), AssetReference.id.asc())
|
|
).all()
|
|
|
|
return [
|
|
CacheStateRow(
|
|
reference_id=row[0],
|
|
file_path=row[1],
|
|
mtime_ns=row[2],
|
|
needs_verify=row[3],
|
|
asset_id=row[4],
|
|
asset_hash=row[5],
|
|
size_bytes=int(row[6]) if row[6] is not None else None,
|
|
)
|
|
for row in rows
|
|
]
|
|
|
|
|
|
def bulk_update_needs_verify(
|
|
session: Session, reference_ids: list[str], value: bool
|
|
) -> int:
|
|
"""Set needs_verify flag for multiple references.
|
|
|
|
Returns: Number of rows updated
|
|
"""
|
|
if not reference_ids:
|
|
return 0
|
|
total = 0
|
|
for chunk in iter_chunks(reference_ids, MAX_BIND_PARAMS):
|
|
result = session.execute(
|
|
sa.update(AssetReference)
|
|
.where(AssetReference.id.in_(chunk))
|
|
.values(needs_verify=value)
|
|
)
|
|
total += result.rowcount
|
|
return total
|
|
|
|
|
|
def bulk_update_is_missing(
|
|
session: Session, reference_ids: list[str], value: bool
|
|
) -> int:
|
|
"""Set is_missing flag for multiple references.
|
|
|
|
Returns: Number of rows updated
|
|
"""
|
|
if not reference_ids:
|
|
return 0
|
|
total = 0
|
|
for chunk in iter_chunks(reference_ids, MAX_BIND_PARAMS):
|
|
result = session.execute(
|
|
sa.update(AssetReference)
|
|
.where(AssetReference.id.in_(chunk))
|
|
.values(is_missing=value)
|
|
)
|
|
total += result.rowcount
|
|
return total
|
|
|
|
|
|
def update_is_missing_by_asset_id(
|
|
session: Session, asset_id: str, value: bool
|
|
) -> int:
|
|
"""Set is_missing flag for ALL references belonging to an asset.
|
|
|
|
Returns: Number of rows updated
|
|
"""
|
|
result = session.execute(
|
|
sa.update(AssetReference)
|
|
.where(AssetReference.asset_id == asset_id)
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.values(is_missing=value)
|
|
)
|
|
return result.rowcount
|
|
|
|
|
|
def delete_references_by_ids(session: Session, reference_ids: list[str]) -> int:
|
|
"""Delete references by their IDs.
|
|
|
|
Returns: Number of rows deleted
|
|
"""
|
|
if not reference_ids:
|
|
return 0
|
|
total = 0
|
|
for chunk in iter_chunks(reference_ids, MAX_BIND_PARAMS):
|
|
result = session.execute(
|
|
sa.delete(AssetReference).where(AssetReference.id.in_(chunk))
|
|
)
|
|
total += result.rowcount
|
|
return total
|
|
|
|
|
|
def delete_orphaned_seed_asset(session: Session, asset_id: str) -> bool:
|
|
"""Delete a seed asset (hash is None) and its references.
|
|
|
|
Returns: True if asset was deleted, False if not found or has a hash
|
|
"""
|
|
asset = session.get(Asset, asset_id)
|
|
if not asset:
|
|
return False
|
|
if asset.hash is not None:
|
|
return False
|
|
session.execute(
|
|
sa.delete(AssetReference).where(AssetReference.asset_id == asset_id)
|
|
)
|
|
session.delete(asset)
|
|
return True
|
|
|
|
|
|
class UnenrichedReferenceRow(NamedTuple):
|
|
"""Row for references needing enrichment."""
|
|
|
|
reference_id: str
|
|
asset_id: str
|
|
file_path: str
|
|
enrichment_level: int
|
|
|
|
|
|
def get_unenriched_references(
|
|
session: Session,
|
|
prefixes: list[str],
|
|
max_level: int = 0,
|
|
limit: int = 1000,
|
|
) -> list[UnenrichedReferenceRow]:
|
|
"""Get references that need enrichment (enrichment_level <= max_level).
|
|
|
|
Args:
|
|
session: Database session
|
|
prefixes: List of absolute directory prefixes to scan
|
|
max_level: Maximum enrichment level to include (0=stubs, 1=metadata done)
|
|
limit: Maximum number of rows to return
|
|
|
|
Returns:
|
|
List of unenriched reference rows with file paths
|
|
"""
|
|
if not prefixes:
|
|
return []
|
|
|
|
conds = build_prefix_like_conditions(prefixes)
|
|
|
|
query = (
|
|
sa.select(
|
|
AssetReference.id,
|
|
AssetReference.asset_id,
|
|
AssetReference.file_path,
|
|
AssetReference.enrichment_level,
|
|
)
|
|
.where(AssetReference.file_path.isnot(None))
|
|
.where(AssetReference.deleted_at.is_(None))
|
|
.where(sa.or_(*conds))
|
|
.where(AssetReference.is_missing == False) # noqa: E712
|
|
.where(AssetReference.enrichment_level <= max_level)
|
|
.order_by(AssetReference.id.asc())
|
|
.limit(limit)
|
|
)
|
|
|
|
rows = session.execute(query).all()
|
|
return [
|
|
UnenrichedReferenceRow(
|
|
reference_id=row[0],
|
|
asset_id=row[1],
|
|
file_path=row[2],
|
|
enrichment_level=row[3],
|
|
)
|
|
for row in rows
|
|
]
|
|
|
|
|
|
def bulk_update_enrichment_level(
|
|
session: Session,
|
|
reference_ids: list[str],
|
|
level: int,
|
|
) -> int:
|
|
"""Update enrichment level for multiple references.
|
|
|
|
Returns: Number of rows updated
|
|
"""
|
|
if not reference_ids:
|
|
return 0
|
|
result = session.execute(
|
|
sa.update(AssetReference)
|
|
.where(AssetReference.id.in_(reference_ids))
|
|
.values(enrichment_level=level)
|
|
)
|
|
return result.rowcount
|
|
|
|
|
|
def bulk_insert_references_ignore_conflicts(
|
|
session: Session,
|
|
rows: list[dict],
|
|
) -> None:
|
|
"""Bulk insert reference rows with ON CONFLICT DO NOTHING on file_path.
|
|
|
|
Each dict should have: id, asset_id, file_path, name, owner_id, mtime_ns, etc.
|
|
The is_missing field is automatically set to False for new inserts.
|
|
"""
|
|
if not rows:
|
|
return
|
|
enriched_rows = [{**row, "is_missing": False} for row in rows]
|
|
ins = sqlite.insert(AssetReference).on_conflict_do_nothing(
|
|
index_elements=[AssetReference.file_path]
|
|
)
|
|
for chunk in iter_chunks(enriched_rows, calculate_rows_per_statement(14)):
|
|
session.execute(ins, chunk)
|
|
|
|
|
|
def get_references_by_paths_and_asset_ids(
|
|
session: Session,
|
|
path_to_asset: dict[str, str],
|
|
) -> set[str]:
|
|
"""Query references to find paths where our asset_id won the insert.
|
|
|
|
Args:
|
|
path_to_asset: Mapping of file_path -> asset_id we tried to insert
|
|
|
|
Returns:
|
|
Set of file_paths where our asset_id is present
|
|
"""
|
|
if not path_to_asset:
|
|
return set()
|
|
|
|
pairs = list(path_to_asset.items())
|
|
winners: set[str] = set()
|
|
|
|
# Each pair uses 2 bind params, so chunk at MAX_BIND_PARAMS // 2
|
|
for chunk in iter_chunks(pairs, MAX_BIND_PARAMS // 2):
|
|
pairwise = sa.tuple_(AssetReference.file_path, AssetReference.asset_id).in_(
|
|
chunk
|
|
)
|
|
result = session.execute(
|
|
select(AssetReference.file_path).where(pairwise)
|
|
)
|
|
winners.update(result.scalars().all())
|
|
|
|
return winners
|
|
|
|
|
|
def get_reference_ids_by_ids(
|
|
session: Session,
|
|
reference_ids: list[str],
|
|
) -> set[str]:
|
|
"""Query to find which reference IDs exist in the database."""
|
|
if not reference_ids:
|
|
return set()
|
|
|
|
found: set[str] = set()
|
|
for chunk in iter_chunks(reference_ids, MAX_BIND_PARAMS):
|
|
result = session.execute(
|
|
select(AssetReference.id).where(AssetReference.id.in_(chunk))
|
|
)
|
|
found.update(result.scalars().all())
|
|
return found
|