youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-04 09:28:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/install-preference-error' into deploy/dev

Browse Source
This commit is contained in:
NFish
2025-07-08 14:31:21 +08:00
parent 80b0d650bd 434c809866
commit 1feeea0abb
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/configs/packaging/__init__.py
View File

@ -10,7 +10,7 @@ class PackagingInfo(PyProjectTomlConfig):
CURRENT_VERSION: str = Field( CURRENT_VERSION: str = Field(
description="Dify version", description="Dify version",
default="1.5.0", default="1.5.1",
) )
COMMIT_SHA: str = Field( COMMIT_SHA: str = Field(

6
docker/docker-compose-template.yaml
View File

@ -2,7 +2,7 @@ x-shared-env: &shared-api-worker-env
services: services:
# API service # API service
api: api:
image: langgenius/dify-api:1.5.0 image: langgenius/dify-api:1.5.1
restart: always restart: always
environment: environment:
# Use the shared environment variables. # Use the shared environment variables.
@ -31,7 +31,7 @@ services:
# worker service # worker service
# The Celery worker for processing the queue. # The Celery worker for processing the queue.
worker: worker:
image: langgenius/dify-api:1.5.0 image: langgenius/dify-api:1.5.1
restart: always restart: always
environment: environment:
# Use the shared environment variables. # Use the shared environment variables.
@ -57,7 +57,7 @@ services:
# Frontend web application. # Frontend web application.
web: web:
image: langgenius/dify-web:1.5.0 image: langgenius/dify-web:1.5.1
restart: always restart: always
environment: environment:
CONSOLE_API_URL: ${CONSOLE_API_URL:-} CONSOLE_API_URL: ${CONSOLE_API_URL:-}

6
docker/docker-compose.yaml
View File

@ -517,7 +517,7 @@ x-shared-env: &shared-api-worker-env
services: services:
# API service # API service
api: api:
image: langgenius/dify-api:1.5.0 image: langgenius/dify-api:1.5.1
restart: always restart: always
environment: environment:
# Use the shared environment variables. # Use the shared environment variables.
@ -546,7 +546,7 @@ services:
# worker service # worker service
# The Celery worker for processing the queue. # The Celery worker for processing the queue.
worker: worker:
image: langgenius/dify-api:1.5.0 image: langgenius/dify-api:1.5.1
restart: always restart: always
environment: environment:
# Use the shared environment variables. # Use the shared environment variables.
@ -572,7 +572,7 @@ services:
# Frontend web application. # Frontend web application.
web: web:
image: langgenius/dify-web:1.5.0 image: langgenius/dify-web:1.5.1
restart: always restart: always
environment: environment:
CONSOLE_API_URL: ${CONSOLE_API_URL:-} CONSOLE_API_URL: ${CONSOLE_API_URL:-}

4
web/app/components/plugins/marketplace/list/card-wrapper.tsx
View File

@ -1,7 +1,7 @@
'use client' 'use client'
import { useTheme } from 'next-themes' import { useTheme } from 'next-themes'
import { RiArrowRightUpLine } from '@remixicon/react' import { RiArrowRightUpLine } from '@remixicon/react'
import { getPluginLinkInMarketplace } from '../utils' import { getPluginDetailLinkInMarketplace, getPluginLinkInMarketplace } from '../utils'
import Card from '@/app/components/plugins/card' import Card from '@/app/components/plugins/card'
import CardMoreInfo from '@/app/components/plugins/card/card-more-info' import CardMoreInfo from '@/app/components/plugins/card/card-more-info'
import type { Plugin } from '@/app/components/plugins/types' import type { Plugin } from '@/app/components/plugins/types'
@ -83,7 +83,7 @@ const CardWrapper = ({
return ( return (
<a <a
className='group relative inline-block cursor-pointer rounded-xl' className='group relative inline-block cursor-pointer rounded-xl'
href={getPluginLinkInMarketplace(plugin)} href={getPluginDetailLinkInMarketplace(plugin)}
> >
<Card <Card
key={plugin.name} key={plugin.name}

6
web/app/components/plugins/marketplace/utils.ts
View File

@ -38,6 +38,12 @@ export const getPluginLinkInMarketplace = (plugin: Plugin, params?: Record<strin
return getMarketplaceUrl(`/plugins/${plugin.org}/${plugin.name}`, params) return getMarketplaceUrl(`/plugins/${plugin.org}/${plugin.name}`, params)
} }
export const getPluginDetailLinkInMarketplace = (plugin: Plugin) => {
if (plugin.type === 'bundle')
return `/bundles/${plugin.org}/${plugin.name}`
return `/plugins/${plugin.org}/${plugin.name}`
}
export const getMarketplacePluginsByCollectionId = async (collectionId: string, query?: CollectionsAndPluginsSearchParams) => { export const getMarketplacePluginsByCollectionId = async (collectionId: string, query?: CollectionsAndPluginsSearchParams) => {
let plugins = [] as Plugin[] let plugins = [] as Plugin[]

2
web/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "dify-web", "name": "dify-web",
"version": "1.5.0", "version": "1.5.1",
"private": true, "private": true,
"engines": { "engines": {
"node": ">=v22.11.0" "node": ">=v22.11.0"