Merge branch 'main' into feat/rag-pipeline

api/core/entities/provider_configuration.py

@@ -897,37 +897,36 @@ class ProviderConfiguration(BaseModel):
                             )
                         except Exception as ex:
                             logger.warning(f"get custom model schema failed, {ex}")
-
+                            continue
-                            if not custom_model_schema:
+
-                                continue
+                        if not custom_model_schema:
-
+                            continue
-                            if custom_model_schema.model_type not in model_types:
+
-                                continue
+                        if custom_model_schema.model_type not in model_types:
-
+                            continue
-                            status = ModelStatus.ACTIVE
+
-                            if (
+                        status = ModelStatus.ACTIVE
-                                custom_model_schema.model_type in model_setting_map
+                        if (
-                                and custom_model_schema.model in model_setting_map[custom_model_schema.model_type]
+                            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][
+                        ):
-                                    custom_model_schema.model
+                            model_setting = model_setting_map[custom_model_schema.model_type][custom_model_schema.model]
-                                ]
+                            if model_setting.enabled is False:
-                                if model_setting.enabled is False:
+                                status = ModelStatus.DISABLED
-                                    status = ModelStatus.DISABLED
+
-
+                        provider_models.append(
-                            provider_models.append(
+                            ModelWithProviderEntity(
-                                ModelWithProviderEntity(
+                                model=custom_model_schema.model,
-                                    model=custom_model_schema.model,
+                                label=custom_model_schema.label,
-                                    label=custom_model_schema.label,
+                                model_type=custom_model_schema.model_type,
-                                    model_type=custom_model_schema.model_type,
+                                features=custom_model_schema.features,
-                                    features=custom_model_schema.features,
+                                fetch_from=FetchFrom.PREDEFINED_MODEL,
-                                    fetch_from=FetchFrom.PREDEFINED_MODEL,
+                                model_properties=custom_model_schema.model_properties,
-                                    model_properties=custom_model_schema.model_properties,
+                                deprecated=custom_model_schema.deprecated,
-                                    deprecated=custom_model_schema.deprecated,
+                                provider=SimpleModelProviderEntity(self.provider),
-                                    provider=SimpleModelProviderEntity(self.provider),
+                                status=status,
-                                    status=status,
-                                )
                             )
+                        )
 
             # if llm name not in restricted llm list, remove it
             restrict_model_names = [rm.model for rm in restrict_models]

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,