Skip to content

Commit

Permalink
Merge branch 'feat/workflow-parallel-support' into deploy/dev
Browse files Browse the repository at this point in the history
  • Loading branch information
zxhlyh committed Sep 10, 2024
2 parents ced560e + aaae6bd commit 5f2b382
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ jobs:
with:
images: ${{ env[matrix.image_name_env] }}
tags: |
type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
type=ref,event=branch
type=sha,enable=true,priority=100,prefix=,suffix=,format=long
type=raw,value=${{ github.ref_name }},enable=${{ startsWith(github.ref, 'refs/tags/') }}
Expand Down
2 changes: 1 addition & 1 deletion api/configs/packaging/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class PackagingInfo(BaseSettings):

CURRENT_VERSION: str = Field(
description="Dify version",
default="0.8.0-beta1",
default="0.8.0",
)

COMMIT_SHA: str = Field(
Expand Down
6 changes: 3 additions & 3 deletions docker-legacy/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'
services:
# API service
api:
image: langgenius/dify-api:0.8.0-beta1
image: langgenius/dify-api:0.8.0
restart: always
environment:
# Startup mode, 'api' starts the API server.
Expand Down Expand Up @@ -227,7 +227,7 @@ services:
# worker service
# The Celery worker for processing the queue.
worker:
image: langgenius/dify-api:0.8.0-beta1
image: langgenius/dify-api:0.8.0
restart: always
environment:
CONSOLE_WEB_URL: ''
Expand Down Expand Up @@ -396,7 +396,7 @@ services:

# Frontend web application.
web:
image: langgenius/dify-web:0.8.0-beta1
image: langgenius/dify-web:0.8.0
restart: always
environment:
# The base URL of console application api server, refers to the Console base URL of WEB service if console domain is
Expand Down
6 changes: 3 additions & 3 deletions docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ x-shared-env: &shared-api-worker-env
services:
# API service
api:
image: langgenius/dify-api:0.8.0-beta1
image: langgenius/dify-api:0.8.0
restart: always
environment:
# Use the shared environment variables.
Expand All @@ -228,7 +228,7 @@ services:
# worker service
# The Celery worker for processing the queue.
worker:
image: langgenius/dify-api:0.8.0-beta1
image: langgenius/dify-api:0.8.0
restart: always
environment:
# Use the shared environment variables.
Expand All @@ -247,7 +247,7 @@ services:

# Frontend web application.
web:
image: langgenius/dify-web:0.8.0-beta1
image: langgenius/dify-web:0.8.0
restart: always
environment:
CONSOLE_API_URL: ${CONSOLE_API_URL:-}
Expand Down
7 changes: 4 additions & 3 deletions web/app/components/workflow/hooks/use-nodes-interactions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
useReactFlow,
useStoreApi,
} from 'reactflow'
import { unionBy } from 'lodash-es'
import type { ToolDefaultValue } from '../block-selector/types'
import type {
Edge,
Expand Down Expand Up @@ -217,11 +218,11 @@ export const useNodesInteractions = () => {
const sourceConnectedEdges = getConnectedEdges([{ id: connectedEdges[i].source } as Node], edges).filter(edge => edge.source === connectedEdges[i].source && edge.sourceHandle === connectedEdges[i].sourceHandle)
targetNodes.push(...sourceConnectedEdges.map(edge => nodes.find(n => n.id === edge.target)!))
}

if (targetNodes.length > 1) {
const uniqTargetNodes = unionBy(targetNodes, 'id')
if (uniqTargetNodes.length > 1) {
const newNodes = produce(nodes, (draft) => {
draft.forEach((n) => {
if (targetNodes.some(targetNode => n.id === targetNode.id))
if (uniqTargetNodes.some(targetNode => n.id === targetNode.id))
n.data._inParallelHovering = true
})
})
Expand Down
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dify-web",
"version": "0.8.0-beta1",
"version": "0.8.0",
"private": true,
"engines": {
"node": ">=18.17.0"
Expand Down

0 comments on commit 5f2b382

Please sign in to comment.