Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion electron.vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default defineConfig({
main: {
plugins: [
externalizeDepsPlugin({
exclude: ['mermaid', 'dompurify']
exclude: ['mermaid']
}),
],
resolve: {
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "DeepChat",
"version": "0.3.6",
"version": "0.3.7",
"description": "DeepChat,一个简单易用的AI客户端",
"main": "./out/main/index.js",
"author": "ThinkInAIXYZ",
Expand Down Expand Up @@ -129,11 +129,11 @@
"autoprefixer": "^10.4.21",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"dompurify": "^3.2.6",
"electron": "^37.3.0",
"electron-builder": "26.0.12",
"electron-vite": "^4.0.0",
"jsdom": "^26.1.0",
"katex": "^0.16.22",
"lint-staged": "^16.1.6",
"lucide-vue-next": "^0.511.0",
"mermaid": "^11.10.1",
Expand All @@ -157,10 +157,10 @@
"vitest": "^3.2.4",
"vue": "^3.5.21",
"vue-i18n": "^11.1.11",
"vue-renderer-markdown": "0.0.54-beta.3",
"vue-renderer-markdown": "0.0.54-beta.6",
"vue-router": "4",
"vue-tsc": "^2.2.12",
"vue-use-monaco": "^0.0.29",
"vue-use-monaco": "^0.0.31",
"vue-virtual-scroller": "^2.0.0-beta.8",
"vuedraggable": "^4.1.0",
"yaml": "^2.8.1",
Expand Down
28 changes: 27 additions & 1 deletion src/main/presenter/configPresenter/providerModelSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2729,11 +2729,25 @@ export const providerModelSettings: Record<string, { models: ProviderModelSettin
searchStrategy: 'turbo'
},
// Qwen3 series models
{
id: 'qwen3-max-2025-09-23',
name: 'Qwen3 Max 20250923',
temperature: 0.7,
maxTokens: 65536,
contextLength: 262144,
match: ['qwen3-max-2025-09-23'],
vision: false,
functionCall: true,
reasoning: false,
enableSearch: true,
forcedSearch: false,
searchStrategy: 'turbo'
},
{
id: 'qwen3-max-preview',
name: 'Qwen3 Max Preview',
temperature: 0.7,
maxTokens: 32768,
maxTokens: 65536,
contextLength: 262144,
match: ['qwen3-max-preview'],
vision: false,
Expand Down Expand Up @@ -2863,6 +2877,18 @@ export const providerModelSettings: Record<string, { models: ProviderModelSettin
reasoning: true,
thinkingBudget: 20000
},
{
id: 'qwen3-vl-plus',
name: 'Qwen3 VL Plus',
temperature: 0.6,
maxTokens: 32768,
contextLength: 262144,
match: ['qwen3-vl-plus', 'qwen3-vl-plus-2025-09-23'],
vision: true,
functionCall: false,
reasoning: true,
thinkingBudget: 81920
},
// QwQ series models
{
id: 'qwq-plus',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export class DashscopeProvider extends OpenAICompatibleProvider {
'qwen3-1.7b',
'qwen3-0.6b',
// Commercial versions
'qwen3-vl-plus',
'qwen-plus',
'qwen-plus-latest',
'qwen-plus-2025-04-28',
Expand All @@ -36,6 +37,7 @@ export class DashscopeProvider extends OpenAICompatibleProvider {

// List of models that support enable_search parameter (internet search)
private static readonly ENABLE_SEARCH_MODELS: string[] = [
'qwen3-max-2025-09-23',
'qwen3-max-preview',
'qwen-max',
'qwen-plus',
Expand Down
20 changes: 16 additions & 4 deletions src/renderer/src/components/ChatConfig.vue
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ const showThinkingBudget = computed(() => {
'qwen3-1.7b',
'qwen3-0.6b',
// Commercial versions
'qwen3-vl-plus',
'qwen-plus',
'qwen-flash',
'qwen-turbo'
Expand All @@ -161,6 +162,7 @@ const showDashscopeSearchConfig = computed(() => {
// Dashscope - ENABLE_SEARCH_MODELS
const enableSearchModels = [
'qwen3-max-preview',
'qwen3-max-2025-09-23',
'qwen3-max',
'qwen-max',
'qwen-plus',
Expand Down Expand Up @@ -242,7 +244,11 @@ const getQwen3MaxBudget = (): number => {
const modelId = props.modelId?.toLowerCase() || ''

// 根据不同的 Qwen3 模型返回不同的最大值
if (modelId.includes('qwen3-235b-a22b') || modelId.includes('qwen3-30b-a3b')) {
if (
modelId.includes('qwen3-235b-a22b') ||
modelId.includes('qwen3-30b-a3b') ||
modelId.includes('qwen3-vl-plus')
) {
return 81920
} else if (
modelId.includes('qwen3-32b') ||
Expand All @@ -259,6 +265,11 @@ const getQwen3MaxBudget = (): number => {
return 81920
}

// 获取 Qwen3 模型的最小思考预算(统一为 1)
const getQwen3MinBudget = (): number => {
return 1
}

// 获取 Gemini 模型的思考预算配置范围
const getGeminiThinkingBudgetRange = () => {
const modelId = props.modelId?.toLowerCase() || ''
Expand Down Expand Up @@ -351,11 +362,12 @@ const qwen3ThinkingBudgetError = computed(() => {

const value = props.thinkingBudget
const maxBudget = getQwen3MaxBudget()
const minBudget = getQwen3MinBudget()

if (value === undefined || value === null) {
return ''
}
if (value < 1) {
if (value < minBudget) {
return t('settings.model.modelConfig.thinkingBudget.qwen3.validation.minValue')
}
if (value > maxBudget) {
Expand Down Expand Up @@ -579,7 +591,7 @@ const qwen3ThinkingBudgetError = computed(() => {
<Input
v-model.number="displayThinkingBudget"
type="number"
:min="1"
:min="getQwen3MinBudget()"
:max="getQwen3MaxBudget()"
:step="128"
:placeholder="t('settings.model.modelConfig.thinkingBudget.qwen3.placeholder')"
Expand All @@ -594,7 +606,7 @@ const qwen3ThinkingBudgetError = computed(() => {
displayThinkingBudget === undefined
? t('settings.model.modelConfig.currentUsingModelDefault')
: t('settings.model.modelConfig.thinkingBudget.range', {
min: 1,
min: getQwen3MinBudget(),
max: getQwen3MaxBudget()
})
}}
Expand Down
12 changes: 0 additions & 12 deletions src/renderer/src/components/artifacts/HTMLArtifact.vue
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@

<script setup lang="ts">
import { ref, onMounted, computed, watch, onUnmounted } from 'vue'
// import DOMPurify from 'dompurify'

const props = defineProps<{
block: {
Expand Down Expand Up @@ -527,17 +526,6 @@ const handleCornerDragMove = (e: MouseEvent) => {
})
}

// const sanitizedContent = computed(() => {
// if (!props.block.content) return ''
// return DOMPurify.sanitize(props.block.content, {
// WHOLE_DOCUMENT: true,
// ADD_TAGS: ['script', 'style'],
// ADD_ATTR: ['src', 'style', 'onclick'],
// ALLOWED_URI_REGEXP:
// /^(?:(?:(?:f|ht)tps?|mailto|tel|callto|cid|xmpp|xxx):|[^a-z]|[a-z+.]+(?:[^a-z+.:]|$))/i
// })
// })

const setupIframe = () => {
if (props.isPreview && iframeRef.value) {
const iframe = iframeRef.value
Expand Down
64 changes: 47 additions & 17 deletions src/renderer/src/components/markdown/MarkdownRenderer.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<!-- eslint-disable vue/no-v-html -->
<template>
<div class="prose prose-sm dark:prose-invert w-full max-w-none break-all">
<NodeRenderer
:custom-components="nodeComponents"
:content="content"
@copy="$emit('copy', $event)"
:typewriterEffect="true"
/>
<NodeRenderer :content="content" @copy="$emit('copy', $event)" />
</div>
</template>

<script setup lang="ts">
import NodeRenderer, { CodeBlockNode } from 'vue-renderer-markdown'
import ReferenceNode from './ReferenceNode.vue'
import { h } from 'vue'
import { usePresenter } from '@/composables/usePresenter'
import { useArtifactStore } from '@/stores/artifact'
import { useReferenceStore } from '@/stores/reference'
import { nanoid } from 'nanoid'
import { h, ref } from 'vue'
import NodeRenderer, {
CodeBlockNode,
ReferenceNode,
setCustomComponents
} from 'vue-renderer-markdown'

defineProps<{
content: string
Expand All @@ -27,14 +27,45 @@ const artifactStore = useArtifactStore()
// 生成唯一的 message ID 和 thread ID,用于 MarkdownRenderer
const messageId = `artifact-msg-${nanoid()}`
const threadId = `artifact-thread-${nanoid()}`
const nodeComponents = {
reference: ReferenceNode,
const referenceStore = useReferenceStore()
const threadPresenter = usePresenter('threadPresenter')
const referenceNode = ref<HTMLElement | null>(null)

setCustomComponents({
reference: (_props) =>
h(ReferenceNode, {
..._props,
messageId,
threadId,
onClick() {
threadPresenter.getSearchResults(_props.messageId ?? '').then((results) => {
const index = parseInt(_props.node.id)
if (index < results.length) {
window.open(results[index - 1].url, '_blank', 'noopener,noreferrer')
}
})
},
onMouseEnter() {
console.log('Mouse entered')
referenceStore.hideReference()
threadPresenter.getSearchResults(_props.messageId ?? '').then((results) => {
const index = parseInt(_props.node.id)
if (index - 1 < results.length && referenceNode.value) {
referenceStore.showReference(
results[index - 1],
referenceNode.value.getBoundingClientRect()
)
}
})
},
onMouseLeave() {
console.log('Mouse left')
referenceStore.hideReference()
}
}),
code_block: (_props) =>
h(CodeBlockNode, {
..._props,
// todo: 配置 custom themes
// darkTheme
// lightTheme
onPreviewCode(v) {
artifactStore.showArtifact(
{
Expand All @@ -50,15 +81,14 @@ const nodeComponents = {
)
}
})
}
})

defineEmits(['copy'])
</script>

<style>
<style lang="css">
.prose {
pre {
background: transparent !important;
margin-top: 0;
margin-bottom: 0;
}
Expand Down
61 changes: 0 additions & 61 deletions src/renderer/src/components/markdown/ReferenceNode.vue

This file was deleted.

Loading