From c82fabb67f8e4e98785fc5f6f1290d056007de21 Mon Sep 17 00:00:00 2001 From: Will Miao <13051207myq@gmail.com> Date: Tue, 22 Jul 2025 16:44:21 +0800 Subject: [PATCH] feat: Refactor model type determination to use state for saving metadata and handling events --- .../js/components/shared/ModelDescription.js | 6 ------ static/js/components/shared/ModelMetadata.js | 21 ++++--------------- static/js/components/shared/ModelModal.js | 7 ++----- static/js/components/shared/ModelTags.js | 5 ++--- 4 files changed, 8 insertions(+), 31 deletions(-) diff --git a/static/js/components/shared/ModelDescription.js b/static/js/components/shared/ModelDescription.js index a7275c20..05acc224 100644 --- a/static/js/components/shared/ModelDescription.js +++ b/static/js/components/shared/ModelDescription.js @@ -61,12 +61,6 @@ export async function loadModelDescription(modelId, filePath) { // Determine API endpoint based on file path or context let apiEndpoint = `/api/lora-model-description?model_id=${modelId}&file_path=${encodeURIComponent(filePath)}`; - // If this is a checkpoint (can be determined from file path or other context) - if (filePath.includes('.safetensors') || filePath.includes('.ckpt')) { - // For now, use the same endpoint - can be updated later if checkpoint-specific endpoint is needed - apiEndpoint = `/api/lora-model-description?model_id=${modelId}&file_path=${encodeURIComponent(filePath)}`; - } - // Try to get model description from API const response = await fetch(apiEndpoint); diff --git a/static/js/components/shared/ModelMetadata.js b/static/js/components/shared/ModelMetadata.js index 273d7df3..d6cdf1f4 100644 --- a/static/js/components/shared/ModelMetadata.js +++ b/static/js/components/shared/ModelMetadata.js @@ -114,9 +114,7 @@ export function setupModelNameEditing(filePath) { // Get the file path from the dataset const filePath = this.dataset.filePath; - // Determine model type based on file extension - const isCheckpoint = filePath.includes('.safetensors') || filePath.includes('.ckpt'); - const saveFunction = isCheckpoint ? saveCheckpointMetadata : saveLoraMetadata; + const saveFunction = state.currentPageType === 'checkpoints' ? saveCheckpointMetadata : saveLoraMetadata; await saveFunction(filePath, { model_name: newModelName }); @@ -297,9 +295,7 @@ async function saveBaseModel(filePath, originalValue) { } try { - // Determine model type based on file extension - const isCheckpoint = filePath.includes('.safetensors') || filePath.includes('.ckpt'); - const saveFunction = isCheckpoint ? saveCheckpointMetadata : saveLoraMetadata; + const saveFunction = state.currentPageType === 'checkpoints' ? saveCheckpointMetadata : saveLoraMetadata; await saveFunction(filePath, { base_model: newBaseModel }); @@ -421,19 +417,10 @@ export function setupFileNameEditing(filePath) { // Get the file path from the dataset const filePath = this.dataset.filePath; - // Determine model type and use appropriate rename function - const isCheckpoint = filePath.includes('.safetensors') || filePath.includes('.ckpt'); let result; - if (isCheckpoint) { - // Use checkpoint rename function if it exists, otherwise fallback to generic approach - if (typeof renameCheckpointFile === 'function') { - result = await renameCheckpointFile(filePath, newFileName); - } else { - // Fallback: use checkpoint metadata save function - await saveCheckpointMetadata(filePath, { file_name: newFileName }); - result = { success: true }; - } + if (state.currentPageType === 'checkpoints') { + result = await renameCheckpointFile(filePath, newFileName); } else { // Use LoRA rename function result = await renameLoraFile(filePath, newFileName); diff --git a/static/js/components/shared/ModelModal.js b/static/js/components/shared/ModelModal.js index 6951f281..e27c8e8c 100644 --- a/static/js/components/shared/ModelModal.js +++ b/static/js/components/shared/ModelModal.js @@ -150,12 +150,9 @@ export function showModelModal(model, modelType) { ${typeSpecificContent}
- +
${model.notes || 'Add your notes here...'}
- ${modelType === 'checkpoint' ? `` : ''}
@@ -283,7 +280,7 @@ function setupEventHandlers(filePath) { } /** - * Set up editable fields in the model modal + * Set up editable fields (notes and usage tips) in the model modal * @param {string} filePath - The full file path of the model * @param {string} modelType - Type of model ('lora' or 'checkpoint') */ diff --git a/static/js/components/shared/ModelTags.js b/static/js/components/shared/ModelTags.js index 22f47464..60da2244 100644 --- a/static/js/components/shared/ModelTags.js +++ b/static/js/components/shared/ModelTags.js @@ -5,6 +5,7 @@ import { showToast } from '../../utils/uiHelpers.js'; import { saveModelMetadata as saveLoraMetadata } from '../../api/loraApi.js'; import { saveModelMetadata as saveCheckpointMetadata } from '../../api/checkpointApi.js'; +import { state } from '../../state/index.js'; // Preset tag suggestions const PRESET_TAGS = [ @@ -164,9 +165,7 @@ async function saveTags() { } try { - // Determine model type and use appropriate save function - const isCheckpoint = filePath.includes('.safetensors') || filePath.includes('.ckpt'); - const saveFunction = isCheckpoint ? saveCheckpointMetadata : saveLoraMetadata; + const saveFunction = state.currentPageType === 'checkpoints' ? saveCheckpointMetadata : saveLoraMetadata; // Save tags metadata await saveFunction(filePath, { tags: tags });