Merge branch 'main' into feat/rag-pipeline

docker/.env.example

@@ -1055,7 +1055,7 @@ PLUGIN_MAX_EXECUTION_TIMEOUT=600
 PIP_MIRROR_URL=
 
 # https://github.com/langgenius/dify-plugin-daemon/blob/main/.env.example
-# Plugin storage type, local aws_s3 tencent_cos azure_blob
+# Plugin storage type, local aws_s3 tencent_cos azure_blob aliyun_oss
 PLUGIN_STORAGE_TYPE=local
 PLUGIN_STORAGE_LOCAL_ROOT=/app/storage
 PLUGIN_WORKING_PATH=/app/storage/cwd
@@ -1078,6 +1078,13 @@ PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING=
 PLUGIN_TENCENT_COS_SECRET_KEY=
 PLUGIN_TENCENT_COS_SECRET_ID=
 PLUGIN_TENCENT_COS_REGION=
+# Plugin oss aliyun oss
+PLUGIN_ALIYUN_OSS_REGION=
+PLUGIN_ALIYUN_OSS_ENDPOINT=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET=
+PLUGIN_ALIYUN_OSS_AUTH_VERSION=v4
+PLUGIN_ALIYUN_OSS_PATH=
 
 # ------------------------------
 # OTLP Collector Configuration

docker/docker-compose-template.yaml

@@ -178,6 +178,12 @@ services:
       TENCENT_COS_SECRET_KEY: ${PLUGIN_TENCENT_COS_SECRET_KEY:-}
       TENCENT_COS_SECRET_ID: ${PLUGIN_TENCENT_COS_SECRET_ID:-}
       TENCENT_COS_REGION: ${PLUGIN_TENCENT_COS_REGION:-}
+      ALIYUN_OSS_REGION: ${PLUGIN_ALIYUN_OSS_REGION:-}
+      ALIYUN_OSS_ENDPOINT: ${PLUGIN_ALIYUN_OSS_ENDPOINT:-}
+      ALIYUN_OSS_ACCESS_KEY_ID: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID:-}
+      ALIYUN_OSS_ACCESS_KEY_SECRET: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET:-}
+      ALIYUN_OSS_AUTH_VERSION: ${PLUGIN_ALIYUN_OSS_AUTH_VERSION:-v4}
+      ALIYUN_OSS_PATH: ${PLUGIN_ALIYUN_OSS_PATH:-}
     ports:
       - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}"
     volumes:

docker/docker-compose.middleware.yaml

@@ -115,6 +115,12 @@ services:
       TENCENT_COS_SECRET_KEY: ${PLUGIN_TENCENT_COS_SECRET_KEY:-}
       TENCENT_COS_SECRET_ID: ${PLUGIN_TENCENT_COS_SECRET_ID:-}
       TENCENT_COS_REGION: ${PLUGIN_TENCENT_COS_REGION:-}
+      ALIYUN_OSS_REGION: ${PLUGIN_ALIYUN_OSS_REGION:-}
+      ALIYUN_OSS_ENDPOINT: ${PLUGIN_ALIYUN_OSS_ENDPOINT:-}
+      ALIYUN_OSS_ACCESS_KEY_ID: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID:-}
+      ALIYUN_OSS_ACCESS_KEY_SECRET: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET:-}
+      ALIYUN_OSS_AUTH_VERSION: ${PLUGIN_ALIYUN_OSS_AUTH_VERSION:-v4}
+      ALIYUN_OSS_PATH: ${PLUGIN_ALIYUN_OSS_PATH:-}
     ports:
       - "${EXPOSE_PLUGIN_DAEMON_PORT:-5002}:${PLUGIN_DAEMON_PORT:-5002}"
       - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}"

docker/docker-compose.yaml

@@ -476,6 +476,12 @@ x-shared-env: &shared-api-worker-env
   PLUGIN_TENCENT_COS_SECRET_KEY: ${PLUGIN_TENCENT_COS_SECRET_KEY:-}
   PLUGIN_TENCENT_COS_SECRET_ID: ${PLUGIN_TENCENT_COS_SECRET_ID:-}
   PLUGIN_TENCENT_COS_REGION: ${PLUGIN_TENCENT_COS_REGION:-}
+  PLUGIN_ALIYUN_OSS_REGION: ${PLUGIN_ALIYUN_OSS_REGION:-}
+  PLUGIN_ALIYUN_OSS_ENDPOINT: ${PLUGIN_ALIYUN_OSS_ENDPOINT:-}
+  PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID:-}
+  PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET:-}
+  PLUGIN_ALIYUN_OSS_AUTH_VERSION: ${PLUGIN_ALIYUN_OSS_AUTH_VERSION:-v4}
+  PLUGIN_ALIYUN_OSS_PATH: ${PLUGIN_ALIYUN_OSS_PATH:-}
   ENABLE_OTEL: ${ENABLE_OTEL:-false}
   OTLP_BASE_ENDPOINT: ${OTLP_BASE_ENDPOINT:-http://localhost:4318}
   OTLP_API_KEY: ${OTLP_API_KEY:-}
@@ -669,6 +675,12 @@ services:
       TENCENT_COS_SECRET_KEY: ${PLUGIN_TENCENT_COS_SECRET_KEY:-}
       TENCENT_COS_SECRET_ID: ${PLUGIN_TENCENT_COS_SECRET_ID:-}
       TENCENT_COS_REGION: ${PLUGIN_TENCENT_COS_REGION:-}
+      ALIYUN_OSS_REGION: ${PLUGIN_ALIYUN_OSS_REGION:-}
+      ALIYUN_OSS_ENDPOINT: ${PLUGIN_ALIYUN_OSS_ENDPOINT:-}
+      ALIYUN_OSS_ACCESS_KEY_ID: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID:-}
+      ALIYUN_OSS_ACCESS_KEY_SECRET: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET:-}
+      ALIYUN_OSS_AUTH_VERSION: ${PLUGIN_ALIYUN_OSS_AUTH_VERSION:-v4}
+      ALIYUN_OSS_PATH: ${PLUGIN_ALIYUN_OSS_PATH:-}
     ports:
       - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}"
     volumes:

docker/middleware.env.example

@@ -145,3 +145,10 @@ PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING=
 PLUGIN_TENCENT_COS_SECRET_KEY=
 PLUGIN_TENCENT_COS_SECRET_ID=
 PLUGIN_TENCENT_COS_REGION=
+# Plugin oss aliyun oss
+PLUGIN_ALIYUN_OSS_REGION=
+PLUGIN_ALIYUN_OSS_ENDPOINT=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET=
+PLUGIN_ALIYUN_OSS_AUTH_VERSION=v4
+PLUGIN_ALIYUN_OSS_PATH=

web/app/components/workflow/nodes/_base/components/help-link.tsx

@@ -24,7 +24,7 @@ const HelpLink = ({
       <a
         href={link}
         target='_blank'
-        className='mr-1 flex h-6 w-6 items-center justify-center'
+        className='mr-1 flex h-6 w-6 items-center justify-center rounded-md hover:bg-state-base-hover'
       >
         <RiBookOpenLine className='h-4 w-4 text-gray-500' />
       </a>

web/app/components/workflow/nodes/_base/components/node-position.tsx

@@ -0,0 +1,54 @@
+import { memo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { RiCrosshairLine } from '@remixicon/react'
+import type { XYPosition } from 'reactflow'
+import { useReactFlow, useStoreApi } from 'reactflow'
+import TooltipPlus from '@/app/components/base/tooltip'
+import { useNodesSyncDraft } from '@/app/components/workflow-app/hooks'
+
+type NodePositionProps = {
+  nodePosition: XYPosition,
+  nodeWidth?: number | null,
+  nodeHeight?: number | null,
+}
+const NodePosition = ({
+  nodePosition,
+  nodeWidth,
+  nodeHeight,
+}: NodePositionProps) => {
+  const { t } = useTranslation()
+  const reactflow = useReactFlow()
+  const store = useStoreApi()
+  const { doSyncWorkflowDraft } = useNodesSyncDraft()
+
+  if (!nodePosition || !nodeWidth || !nodeHeight) return null
+
+  const workflowContainer = document.getElementById('workflow-container')
+  const { transform } = store.getState()
+  const zoom = transform[2]
+
+  const { clientWidth, clientHeight } = workflowContainer!
+  const { setViewport } = reactflow
+
+  return (
+    <TooltipPlus
+      popupContent={t('workflow.panel.moveToThisNode')}
+    >
+      <div
+        className='mr-1 flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-state-base-hover'
+        onClick={() => {
+          setViewport({
+            x: (clientWidth - 400 - nodeWidth * zoom) / 2 - nodePosition.x * zoom,
+            y: (clientHeight - nodeHeight * zoom) / 2 - nodePosition.y * zoom,
+            zoom: transform[2],
+          })
+          doSyncWorkflowDraft()
+        }}
+      >
+        <RiCrosshairLine className='h-4 w-4 text-text-tertiary' />
+      </div>
+    </TooltipPlus>
+  )
+}
+
+export default memo(NodePosition)

web/app/components/workflow/nodes/_base/panel.tsx

@@ -16,6 +16,7 @@ import { useTranslation } from 'react-i18next'
 import NextStep from './components/next-step'
 import PanelOperator from './components/panel-operator'
 import HelpLink from './components/help-link'
+import NodePosition from './components/node-position'
 import {
   DescriptionInput,
   TitleInput,
@@ -55,6 +56,9 @@ const BasePanel: FC<BasePanelProps> = ({
   id,
   data,
   children,
+  position,
+  width,
+  height,
 }) => {
   const { t } = useTranslation()
   const { showMessageLogModal } = useAppStore(useShallow(state => ({
@@ -150,6 +154,7 @@ const BasePanel: FC<BasePanelProps> = ({
                   </Tooltip>
                 )
               }
+              <NodePosition nodePosition={position} nodeWidth={width} nodeHeight={height}></NodePosition>
               <HelpLink nodeType={data.type} />
               <PanelOperator id={id} data={data} showHelpLink={false} />
               <div className='mx-3 h-3.5 w-[1px] bg-divider-regular' />

web/i18n/de-DE/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Blöcke organisieren',
     change: 'Ändern',
     optional: '(optional)',
+    moveToThisNode: 'Bewege zu diesem Knoten',
   },
   nodes: {
     common: {

web/i18n/en-US/workflow.ts

@@ -304,6 +304,7 @@ const translation = {
     addNextStep: 'Add the next block in this workflow',
     selectNextStep: 'Select Next Block',
     runThisStep: 'Run this step',
+    moveToThisNode: 'Move to this node',
     checklist: 'Checklist',
     checklistTip: 'Make sure all issues are resolved before publishing',
     checklistResolved: 'All issues are resolved',

web/i18n/es-ES/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Organizar bloques',
     change: 'Cambiar',
     optional: '(opcional)',
+    moveToThisNode: 'Mueve a este nodo',
   },
   nodes: {
     common: {

web/i18n/fa-IR/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'سازماندهی بلوک‌ها',
     change: 'تغییر',
     optional: '(اختیاری)',
+    moveToThisNode: 'به این گره بروید',
   },
   nodes: {
     common: {

web/i18n/fr-FR/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Organiser les blocs',
     change: 'Modifier',
     optional: '(facultatif)',
+    moveToThisNode: 'Déplacer vers ce nœud',
   },
   nodes: {
     common: {

web/i18n/hi-IN/workflow.ts

@@ -314,6 +314,7 @@ const translation = {
     organizeBlocks: 'ब्लॉक्स को व्यवस्थित करें',
     change: 'बदलें',
     optional: '(वैकल्पिक)',
+    moveToThisNode: 'इस नोड पर जाएं',
   },
   nodes: {
     common: {

web/i18n/it-IT/workflow.ts

@@ -317,6 +317,7 @@ const translation = {
     organizeBlocks: 'Organizza blocchi',
     change: 'Cambia',
     optional: '(opzionale)',
+    moveToThisNode: 'Sposta a questo nodo',
   },
   nodes: {
     common: {

web/i18n/ja-JP/workflow.ts

@@ -307,6 +307,7 @@ const translation = {
     organizeBlocks: 'ノード整理',
     change: '変更',
     optional: '（任意）',
+    moveToThisNode: 'このノードに移動する',
   },
   nodes: {
     common: {

web/i18n/ko-KR/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: '블록 정리',
     change: '변경',
     optional: '(선택사항)',
+    moveToThisNode: '이 노드로 이동',
   },
   nodes: {
     common: {

web/i18n/pl-PL/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Organizuj bloki',
     change: 'Zmień',
     optional: '(opcjonalne)',
+    moveToThisNode: 'Przenieś do tego węzła',
   },
   nodes: {
     common: {

web/i18n/pt-BR/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Organizar blocos',
     change: 'Mudar',
     optional: '(opcional)',
+    moveToThisNode: 'Mova-se para este nó',
   },
   nodes: {
     common: {

web/i18n/ro-RO/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Organizează blocurile',
     change: 'Schimbă',
     optional: '(opțional)',
+    moveToThisNode: 'Mutați la acest nod',
   },
   nodes: {
     common: {

web/i18n/ru-RU/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Организовать блоки',
     change: 'Изменить',
     optional: '(необязательно)',
+    moveToThisNode: 'Перейдите к этому узлу',
   },
   nodes: {
     common: {

web/i18n/sl-SI/workflow.ts

@@ -739,6 +739,7 @@ const translation = {
     checklistResolved: 'Vse težave so odpravljene',
     addNextStep: 'Dodajanje naslednjega bloka v ta potek dela',
     change: 'Spremeniti',
+    moveToThisNode: 'Premakni se na to vozlišče',
   },
   nodes: {
     common: {

web/i18n/th-TH/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'จัดระเบียบบล็อก',
     change: 'เปลี่ยน',
     optional: '(ไม่บังคับ)',
+    moveToThisNode: 'ย้ายไปที่โหนดนี้',
   },
   nodes: {
     common: {

web/i18n/tr-TR/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Blokları Düzenle',
     change: 'Değiştir',
     optional: '(isteğe bağlı)',
+    moveToThisNode: 'Bu düğüme geç',
   },
   nodes: {
     common: {

web/i18n/uk-UA/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Організувати блоки',
     change: 'Змінити',
     optional: '(необов\'язково)',
+    moveToThisNode: 'Перемістіть до цього вузла',
   },
   nodes: {
     common: {

web/i18n/vi-VN/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: 'Tổ chức các khối',
     change: 'Thay đổi',
     optional: '(tùy chọn)',
+    moveToThisNode: 'Di chuyển đến nút này',
   },
   nodes: {
     common: {

web/i18n/zh-Hans/workflow.ts

@@ -311,6 +311,7 @@ const translation = {
     organizeBlocks: '整理节点',
     change: '更改',
     optional: '（选填）',
+    moveToThisNode: '定位至此节点',
   },
   nodes: {
     common: {

web/i18n/zh-Hant/workflow.ts

@@ -302,6 +302,7 @@ const translation = {
     organizeBlocks: '整理節點',
     change: '更改',
     optional: '(選擇性)',
+    moveToThisNode: '定位至此節點',
   },
   nodes: {
     common: {