Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: message length control #30

Merged
merged 2 commits into from
Jun 29, 2024
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
81 changes: 79 additions & 2 deletions src/components/ChatInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ const doChat = async () => {
messages: [...props.localMessages, {role: 'user', content: promptForm.value.content, file: promptForm.value.file}],
model: model.value,
};
// max message length control
params.messages = params.messages.slice(-(maxMessage.value + 1));
// system define
if (props.systemDefine) {
params.messages.unshift({role: 'system', content: props.systemDefine});
Expand Down Expand Up @@ -330,6 +332,34 @@ const doSelectSystemPreset = (id) => {
}
});
};
const chosenPreset = ref('');
watch(() => presetVisible.value, () => {
if (!presetVisible.value) {
presetVisible.value = false;
chosenPreset.value = '';
}
});

// message length
const maxMessageVisible = ref(false);
const messageLength = ref([0, 32]);
const maxMessage = ref(10);
watch(() => maxMessage.value, () => {
if (maxMessage.value % 2 !== 0) {
maxMessage.value++;
}
localStorage.setItem(localMaxMessageKey.value, JSON.stringify(maxMessage.value));
});
const showMaxMessage = () => maxMessageVisible.value = true;
const localMaxMessageKey = ref('local-max-message');
onMounted(() => {
const value = localStorage.getItem(localMaxMessageKey.value);
if (value) {
try {
maxMessage.value = JSON.parse(value);
} catch (_) {}
}
});

defineExpose({reGenerate, promptForm});
</script>
Expand Down Expand Up @@ -410,6 +440,19 @@ defineExpose({reGenerate, promptForm});
</a-button>
</a-space>
<a-space>
<a-button
v-if="showEditBox"
:disabled="chatLoading"
@click="showMaxMessage"
class="chat-input-left-button"
>
<a-space :size="2">
<icon-history />
<span>
{{ maxMessage }}
</span>
</a-space>
</a-button>
<a-button
v-if="showEditBox"
type="primary"
Expand Down Expand Up @@ -444,11 +487,43 @@ defineExpose({reGenerate, promptForm});
</a-spin>
</a-form-item>
</a-form>
<a-modal
v-model:visible="maxMessageVisible"
:footer="false"
:esc-to-close="true"
>
<template #title>
<div style="text-align: left; width: 100%">
{{ $t('MaxMessagesCount') }}
</div>
</template>
<a-space
direction="vertical"
>
<a-input-number
v-model="maxMessage"
:mode="'button'"
:style="{ width: '100%' }"
:step="2"
:min="messageLength[0]"
:max="messageLength[1]"
/>
<a-slider
v-model:model-value="maxMessage"
:style="{ width: '100%' }"
:step="2"
:min="messageLength[0]"
:max="messageLength[1]"
/>
<div class="model-context-tips">
{{ $t('ModelContextLengthTips') }}
</div>
</a-space>
</a-modal>
<a-modal
v-model:visible="presetVisible"
:footer="false"
:esc-to-close="true"
@cancel="presetVisible = false"
>
<template #title>
<div style="text-align: left; width: 100%">
Expand All @@ -465,6 +540,7 @@ defineExpose({reGenerate, promptForm});
@change="doSelectSystemPreset"
:placeholder="$t('PleaseChoosePreset')"
:allow-search="true"
v-model="chosenPreset"
>
<a-option
v-for="item in systemPresets"
Expand Down Expand Up @@ -534,7 +610,8 @@ defineExpose({reGenerate, promptForm});
width: 100%;
}

.model-ignore-system-tips {
.model-ignore-system-tips,
.model-context-tips {
color: var(--color-neutral-6);
font-size: 12px;
}
Expand Down
2 changes: 2 additions & 0 deletions src/locale/en-us.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const mEnUS = {
PleaseChoosePreset: 'Please choose one preset',
Remove: 'Remove',
ModelIgnoreSystemDefineTips: 'Some models may ignore presets, if the output does not meet expectations, try switching models.',
MaxMessagesCount: 'Max Context',
ModelContextLengthTips: 'Context refers to historical messages and related information within a conversation. By carrying context, ChatGPT can better understand the user’s intent and adjust the content of its responses accordingly.',
};

export default mEnUS;
2 changes: 2 additions & 0 deletions src/locale/zh-cn.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ const mZhCN = {
PleaseChoosePreset: '请选择预设',
Remove: '移除',
ModelIgnoreSystemDefineTips: '部分模型可能会忽略预设,如果输出不符合预期,请切换模型',
MaxMessagesCount: '对话上下文数量',
ModelContextLengthTips: '上下文是指对话中的历史消息和相关信息。通过携带上下文,模型可以更好地理解用户的意图,并对回复内容进行调整',
};

export default mZhCN;
1 change: 0 additions & 1 deletion src/views/Chat.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ onMounted(() => {
try {
setSystemDefine(JSON.parse(value));
} catch (e) {
console.log(e);
setSystemDefine('');
}
} else {
Expand Down
3 changes: 1 addition & 2 deletions src/views/Login.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<script setup>
import {signInAPI} from '../api/user';
import {signInAPI} from '@/api/user';
import {onMounted} from 'vue';
import {Message} from '@arco-design/web-vue';

const doLogin = () => {
const url = new URL(window.location.href);
const next = url.searchParams.get('next');
const code = url.searchParams.get('code');
console.log(next);
signInAPI({code}).then(
() => {},
(err) => {
Expand Down
Loading