Merge branch 'main' into feat/rag-pipeline

api/core/entities/provider_configuration.py

@@ -897,6 +897,7 @@ class ProviderConfiguration(BaseModel):
                             )
                         except Exception as ex:
                             logger.warning(f"get custom model schema failed, {ex}")
+                            continue
 
                         if not custom_model_schema:
                             continue
@@ -909,9 +910,7 @@ class ProviderConfiguration(BaseModel):
                             custom_model_schema.model_type in model_setting_map
                             and custom_model_schema.model in model_setting_map[custom_model_schema.model_type]
                         ):
-                                model_setting = model_setting_map[custom_model_schema.model_type][
+                            model_setting = model_setting_map[custom_model_schema.model_type][custom_model_schema.model]
-                                    custom_model_schema.model
-                                ]
                             if model_setting.enabled is False:
                                 status = ModelStatus.DISABLED
 

web/app/components/workflow/store/workflow/workflow-slice.ts

@@ -37,13 +37,8 @@ export type WorkflowSliceShape = {
 export const createWorkflowSlice: StateCreator<WorkflowSliceShape> = set => ({
   workflowRunningData: undefined,
   setWorkflowRunningData: workflowRunningData => set(() => ({ workflowRunningData })),
-  clipboardElements: (() => {
+  clipboardElements: [],
-    const storedElements = localStorage.getItem('clipboard_elements')
+  setClipboardElements: clipboardElements => set(() => ({ clipboardElements })),
-    return storedElements ? JSON.parse(storedElements) : []
-  })(),
-  setClipboardElements: (clipboardElements) => {
-    localStorage.setItem('clipboard_elements', JSON.stringify(clipboardElements))
-  },
   selection: null,
   setSelection: selection => set(() => ({ selection })),
   bundleNodeSize: null,