Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/platform/assets/utils/assetMetadataUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,13 @@ export function getAssetUserDescription(asset: AssetItem): string {
? asset.user_metadata.user_description
: ''
}

/**
* Gets the filename for an asset with fallback chain
* Checks user_metadata.filename first, then metadata.filename, then asset.name
* @param asset - The asset to extract filename from
* @returns The filename string
*/
export function getAssetFilename(asset: AssetItem): string {
return getStringProperty(asset, 'filename') ?? asset.name
}
10 changes: 0 additions & 10 deletions src/platform/assets/utils/createModelNodeFromAsset.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -282,16 +282,6 @@ describe('createModelNodeFromAsset', () => {
expectedCode: 'INVALID_ASSET' as const,
errorPattern: /Invalid filename.*expected non-empty string/
},
{
case: 'non-string filename',
overrides: {
user_metadata: { filename: 123 },
metadata: undefined,
name: ''
},
expectedCode: 'INVALID_ASSET' as const,
errorPattern: /Invalid filename.*expected non-empty string, got number/
},
{
case: 'empty filename with no fallback',
overrides: {
Expand Down
8 changes: 3 additions & 5 deletions src/platform/assets/utils/createModelNodeFromAsset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
MISSING_TAG,
MODELS_TAG
} from '@/platform/assets/services/assetService'
import { getAssetFilename } from '@/platform/assets/utils/assetMetadataUtils'
import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore'
import { app } from '@/scripts/app'
import { useLitegraphService } from '@/services/litegraphService'
Expand Down Expand Up @@ -69,11 +70,8 @@ export function createModelNodeFromAsset(

const validAsset = validatedAsset.data

const userMetadata = validAsset.user_metadata ?? {}

const filename =
userMetadata.filename || validAsset.metadata?.filename || validAsset.name
if (typeof filename !== 'string' || filename.length === 0) {
const filename = getAssetFilename(validAsset)
if (filename.length === 0) {
console.error(
`Asset ${validAsset.id} has invalid user_metadata.filename (expected non-empty string, got ${typeof filename})`
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
assetFilenameSchema,
assetItemSchema
} from '@/platform/assets/schemas/assetSchema'
import { getAssetFilename } from '@/platform/assets/utils/assetMetadataUtils'
import { assetService } from '@/platform/assets/services/assetService'
import { isCloud } from '@/platform/distribution/types'
import { useSettingStore } from '@/platform/settings/settingStore'
Expand Down Expand Up @@ -115,7 +116,7 @@ const createAssetBrowserWidget = (
return
}

const filename = validatedAsset.data.user_metadata?.filename
const filename = getAssetFilename(validatedAsset.data)
const validatedFilename = assetFilenameSchema.safeParse(filename)

if (!validatedFilename.success) {
Expand Down
Loading