mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-03-15 22:27:34 +08:00
Rename prompt_id to job_id on asset_references
Rename the column in the DB model, migration, and service schemas. The API response emits both job_id and prompt_id (deprecated alias) for backward compatibility with the cloud API. Amp-Thread-ID: https://ampcode.com/threads/T-019cef41-60b0-752a-aa3c-ed7f20fda2f7 Co-authored-by: Amp <amp@ampcode.com>
This commit is contained in:
parent
c7ec6e0819
commit
dde5a60357
@ -1,8 +1,8 @@
|
|||||||
"""
|
"""
|
||||||
Add system_metadata and prompt_id columns to asset_references.
|
Add system_metadata and job_id columns to asset_references.
|
||||||
Change preview_id FK from assets.id to asset_references.id.
|
Change preview_id FK from assets.id to asset_references.id.
|
||||||
|
|
||||||
Revision ID: 0003_add_metadata_prompt
|
Revision ID: 0003_add_metadata_job_id
|
||||||
Revises: 0002_merge_to_asset_references
|
Revises: 0002_merge_to_asset_references
|
||||||
Create Date: 2026-03-09
|
Create Date: 2026-03-09
|
||||||
"""
|
"""
|
||||||
@ -12,7 +12,7 @@ import sqlalchemy as sa
|
|||||||
|
|
||||||
from app.database.models import NAMING_CONVENTION
|
from app.database.models import NAMING_CONVENTION
|
||||||
|
|
||||||
revision = "0003_add_metadata_prompt"
|
revision = "0003_add_metadata_job_id"
|
||||||
down_revision = "0002_merge_to_asset_references"
|
down_revision = "0002_merge_to_asset_references"
|
||||||
branch_labels = None
|
branch_labels = None
|
||||||
depends_on = None
|
depends_on = None
|
||||||
@ -24,7 +24,7 @@ def upgrade() -> None:
|
|||||||
sa.Column("system_metadata", sa.JSON(), nullable=True)
|
sa.Column("system_metadata", sa.JSON(), nullable=True)
|
||||||
)
|
)
|
||||||
batch_op.add_column(
|
batch_op.add_column(
|
||||||
sa.Column("prompt_id", sa.String(length=36), nullable=True)
|
sa.Column("job_id", sa.String(length=36), nullable=True)
|
||||||
)
|
)
|
||||||
|
|
||||||
# Change preview_id FK from assets.id to asset_references.id (self-ref).
|
# Change preview_id FK from assets.id to asset_references.id (self-ref).
|
||||||
@ -62,5 +62,5 @@ def downgrade() -> None:
|
|||||||
)
|
)
|
||||||
|
|
||||||
with op.batch_alter_table("asset_references") as batch_op:
|
with op.batch_alter_table("asset_references") as batch_op:
|
||||||
batch_op.drop_column("prompt_id")
|
batch_op.drop_column("job_id")
|
||||||
batch_op.drop_column("system_metadata")
|
batch_op.drop_column("system_metadata")
|
||||||
@ -171,7 +171,8 @@ def _build_asset_response(result: schemas.AssetDetailResult | schemas.UploadResu
|
|||||||
preview_id=result.ref.preview_id,
|
preview_id=result.ref.preview_id,
|
||||||
user_metadata=result.ref.user_metadata or {},
|
user_metadata=result.ref.user_metadata or {},
|
||||||
metadata=result.ref.system_metadata,
|
metadata=result.ref.system_metadata,
|
||||||
prompt_id=result.ref.prompt_id,
|
job_id=result.ref.job_id,
|
||||||
|
prompt_id=result.ref.job_id, # deprecated: mirrors job_id for cloud compat
|
||||||
created_at=result.ref.created_at,
|
created_at=result.ref.created_at,
|
||||||
updated_at=result.ref.updated_at,
|
updated_at=result.ref.updated_at,
|
||||||
last_access_time=result.ref.last_access_time,
|
last_access_time=result.ref.last_access_time,
|
||||||
|
|||||||
@ -16,7 +16,8 @@ class Asset(BaseModel):
|
|||||||
user_metadata: dict[str, Any] = Field(default_factory=dict)
|
user_metadata: dict[str, Any] = Field(default_factory=dict)
|
||||||
is_immutable: bool = False
|
is_immutable: bool = False
|
||||||
metadata: dict[str, Any] | None = None
|
metadata: dict[str, Any] | None = None
|
||||||
prompt_id: str | None = None
|
job_id: str | None = None
|
||||||
|
prompt_id: str | None = None # deprecated: use job_id
|
||||||
created_at: datetime
|
created_at: datetime
|
||||||
updated_at: datetime
|
updated_at: datetime
|
||||||
last_access_time: datetime | None = None
|
last_access_time: datetime | None = None
|
||||||
|
|||||||
@ -93,7 +93,7 @@ class AssetReference(Base):
|
|||||||
system_metadata: Mapped[dict[str, Any] | None] = mapped_column(
|
system_metadata: Mapped[dict[str, Any] | None] = mapped_column(
|
||||||
JSON(none_as_null=True), nullable=True, default=None
|
JSON(none_as_null=True), nullable=True, default=None
|
||||||
)
|
)
|
||||||
prompt_id: Mapped[str | None] = mapped_column(String(36), nullable=True, default=None)
|
job_id: Mapped[str | None] = mapped_column(String(36), nullable=True, default=None)
|
||||||
created_at: Mapped[datetime] = mapped_column(
|
created_at: Mapped[datetime] = mapped_column(
|
||||||
DateTime(timezone=False), nullable=False, default=get_utc_now
|
DateTime(timezone=False), nullable=False, default=get_utc_now
|
||||||
)
|
)
|
||||||
|
|||||||
@ -26,7 +26,7 @@ class ReferenceData:
|
|||||||
created_at: datetime
|
created_at: datetime
|
||||||
updated_at: datetime
|
updated_at: datetime
|
||||||
system_metadata: dict[str, Any] | None = None
|
system_metadata: dict[str, Any] | None = None
|
||||||
prompt_id: str | None = None
|
job_id: str | None = None
|
||||||
last_access_time: datetime | None = None
|
last_access_time: datetime | None = None
|
||||||
|
|
||||||
|
|
||||||
@ -96,7 +96,7 @@ def extract_reference_data(ref: AssetReference) -> ReferenceData:
|
|||||||
user_metadata=ref.user_metadata,
|
user_metadata=ref.user_metadata,
|
||||||
preview_id=ref.preview_id,
|
preview_id=ref.preview_id,
|
||||||
system_metadata=ref.system_metadata,
|
system_metadata=ref.system_metadata,
|
||||||
prompt_id=ref.prompt_id,
|
job_id=ref.job_id,
|
||||||
created_at=ref.created_at,
|
created_at=ref.created_at,
|
||||||
updated_at=ref.updated_at,
|
updated_at=ref.updated_at,
|
||||||
last_access_time=ref.last_access_time,
|
last_access_time=ref.last_access_time,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user