[feat] Add Civitai model upload wizard #6694
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <template> | ||
| <div class="flex flex-col gap-4"> | ||
| <!-- Model Info Section --> | ||
| <div class="flex flex-col gap-2"> | ||
| <p class="text-sm text-muted m-0"> | ||
| {{ $t('assetBrowser.modelAssociatedWithLink') }} | ||
| </p> | ||
| <p class="text-sm mt-0"> | ||
| {{ metadata?.name || metadata?.filename }} | ||
christian-byrne marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| </p> | ||
| </div> | ||
|
|
||
| <!-- Model Type Selection --> | ||
| <div class="flex flex-col gap-2"> | ||
| <label class="text-sm text-muted"> | ||
| {{ $t('assetBrowser.modelTypeSelectorLabel') }} | ||
| </label> | ||
| <SingleSelect | ||
luke-mino-altherr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| v-model="selectedModelType" | ||
| :label=" | ||
| isLoading | ||
| ? $t('g.loading') | ||
| : $t('assetBrowser.modelTypeSelectorPlaceholder') | ||
| " | ||
| :options="modelTypes" | ||
| :disabled="isLoading" | ||
| /> | ||
| <div class="flex items-center gap-2 text-sm text-muted"> | ||
| <i class="icon-[lucide--info]" /> | ||
| <span>{{ $t('assetBrowser.notSureLeaveAsIs') }}</span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { computed } from 'vue' | ||
| import SingleSelect from '@/components/input/SingleSelect.vue' | ||
| import { useModelTypes } from '@/platform/assets/composables/useModelTypes' | ||
| import type { AssetMetadata } from '@/platform/assets/schemas/assetSchema' | ||
| const props = defineProps<{ | ||
| modelValue: string | undefined | ||
| metadata: AssetMetadata | null | ||
| }>() | ||
| const emit = defineEmits<{ | ||
| 'update:modelValue': [value: string | undefined] | ||
| }>() | ||
| const { modelTypes, isLoading } = useModelTypes() | ||
| const selectedModelType = computed({ | ||
| get: () => props.modelValue ?? null, | ||
| set: (value: string | null) => emit('update:modelValue', value ?? undefined) | ||
| }) | ||
| </script> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| <template> | ||
|
There was a problem hiding this comment. [architecture] medium Priority Issue: Single Responsibility Principle violation - UploadModelDialog handles wizard logic, validation, API calls, and state management |
||
| <div class="upload-model-dialog flex flex-col justify-between gap-6 p-4 pt-6"> | ||
| <!-- Step 1: Enter URL --> | ||
| <UploadModelUrlInput | ||
| v-if="currentStep === 1" | ||
| v-model="wizardData.url" | ||
| :error="uploadError" | ||
| /> | ||
|
|
||
| <!-- Step 2: Confirm Metadata --> | ||
| <UploadModelConfirmation | ||
| v-else-if="currentStep === 2" | ||
| v-model="selectedModelType" | ||
| :metadata="wizardData.metadata" | ||
| /> | ||
|
|
||
| <!-- Step 3: Upload Progress --> | ||
| <UploadModelProgress | ||
| v-else-if="currentStep === 3" | ||
| :status="uploadStatus" | ||
| :error="uploadError" | ||
| :metadata="wizardData.metadata" | ||
| :model-type="selectedModelType" | ||
| /> | ||
|
|
||
| <!-- Navigation Footer --> | ||
| <UploadModelFooter | ||
| :current-step="currentStep" | ||
| :is-fetching-metadata="isFetchingMetadata" | ||
| :is-uploading="isUploading" | ||
| :can-fetch-metadata="canFetchMetadata" | ||
| :can-upload-model="canUploadModel" | ||
| :upload-status="uploadStatus" | ||
| @back="goToPreviousStep" | ||
| @fetch-metadata="handleFetchMetadata" | ||
| @upload="handleUploadModel" | ||
| @close="handleClose" | ||
| /> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { onMounted } from 'vue' | ||
|
|
||
| import UploadModelConfirmation from '@/platform/assets/components/UploadModelConfirmation.vue' | ||
| import UploadModelFooter from '@/platform/assets/components/UploadModelFooter.vue' | ||
| import UploadModelProgress from '@/platform/assets/components/UploadModelProgress.vue' | ||
| import UploadModelUrlInput from '@/platform/assets/components/UploadModelUrlInput.vue' | ||
| import { useModelTypes } from '@/platform/assets/composables/useModelTypes' | ||
| import { useUploadModelWizard } from '@/platform/assets/composables/useUploadModelWizard' | ||
| import { useDialogStore } from '@/stores/dialogStore' | ||
|
|
||
| const dialogStore = useDialogStore() | ||
| const { modelTypes, fetchModelTypes } = useModelTypes() | ||
|
|
||
| const emit = defineEmits<{ | ||
| 'upload-success': [] | ||
| }>() | ||
|
|
||
| const { | ||
| currentStep, | ||
| isFetchingMetadata, | ||
| isUploading, | ||
| uploadStatus, | ||
| uploadError, | ||
| wizardData, | ||
| selectedModelType, | ||
| canFetchMetadata, | ||
| canUploadModel, | ||
| fetchMetadata, | ||
| uploadModel, | ||
| goToPreviousStep | ||
| } = useUploadModelWizard(modelTypes) | ||
|
|
||
| async function handleFetchMetadata() { | ||
| await fetchMetadata() | ||
| } | ||
|
|
||
| async function handleUploadModel() { | ||
| const success = await uploadModel() | ||
| if (success) { | ||
| emit('upload-success') | ||
| } | ||
| } | ||
|
|
||
| function handleClose() { | ||
| dialogStore.closeDialog({ key: 'upload-model' }) | ||
| } | ||
|
|
||
| onMounted(() => { | ||
| fetchModelTypes() | ||
| }) | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| .upload-model-dialog { | ||
luke-mino-altherr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| width: 90vw; | ||
| max-width: 800px; | ||
| min-height: 400px; | ||
| } | ||
|
|
||
| @media (min-width: 640px) { | ||
| .upload-model-dialog { | ||
| width: auto; | ||
| min-width: 600px; | ||
| } | ||
| } | ||
| </style> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <template> | ||
| <div class="flex items-center gap-3 px-4 py-2 font-bold"> | ||
| <span>{{ $t('assetBrowser.uploadModelFromCivitai') }}</span> | ||
| <span | ||
| class="rounded-full bg-white px-1.5 py-0 text-xxs font-medium uppercase text-black" | ||
| > | ||
| {{ $t('g.beta') }} | ||
| </span> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"></script> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <template> | ||
| <div class="flex justify-end gap-2"> | ||
| <TextButton | ||
| v-if="currentStep !== 1 && currentStep !== 3" | ||
| :label="$t('g.back')" | ||
| type="secondary" | ||
| size="md" | ||
| :disabled="isFetchingMetadata || isUploading" | ||
| @click="emit('back')" | ||
| /> | ||
| <span v-else /> | ||
|
|
||
| <IconTextButton | ||
| v-if="currentStep === 1" | ||
| :label="$t('g.continue')" | ||
| type="primary" | ||
| size="md" | ||
| :disabled="!canFetchMetadata || isFetchingMetadata" | ||
| @click="emit('fetchMetadata')" | ||
| > | ||
| <template #icon> | ||
| <i | ||
| v-if="isFetchingMetadata" | ||
| class="icon-[lucide--loader-circle] animate-spin" | ||
| /> | ||
| </template> | ||
| </IconTextButton> | ||
| <IconTextButton | ||
| v-else-if="currentStep === 2" | ||
| :label="$t('assetBrowser.upload')" | ||
| type="primary" | ||
| size="md" | ||
| :disabled="!canUploadModel || isUploading" | ||
| @click="emit('upload')" | ||
| > | ||
| <template #icon> | ||
| <i | ||
| v-if="isUploading" | ||
| class="icon-[lucide--loader-circle] animate-spin" | ||
| /> | ||
| </template> | ||
| </IconTextButton> | ||
| <TextButton | ||
| v-else-if="currentStep === 3 && uploadStatus === 'success'" | ||
| :label="$t('assetBrowser.finish')" | ||
| type="primary" | ||
| size="md" | ||
| @click="emit('close')" | ||
| /> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import IconTextButton from '@/components/button/IconTextButton.vue' | ||
| import TextButton from '@/components/button/TextButton.vue' | ||
|
|
||
| defineProps<{ | ||
| currentStep: number | ||
| isFetchingMetadata: boolean | ||
| isUploading: boolean | ||
| canFetchMetadata: boolean | ||
| canUploadModel: boolean | ||
| uploadStatus: 'idle' | 'uploading' | 'success' | 'error' | ||
| }>() | ||
|
|
||
| const emit = defineEmits<{ | ||
| (e: 'back'): void | ||
| (e: 'fetchMetadata'): void | ||
| (e: 'upload'): void | ||
| (e: 'close'): void | ||
| }>() | ||
| </script> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[performance] high Priority
Issue: Race condition in URL validation - multiple simultaneous validation requests can cause state inconsistencies
Context: validateUrl function can be called multiple times concurrently without proper cancellation handling
Suggestion: Implement request cancellation using AbortController and debounce validation calls