GithubProxy/coai
1
0
Fork 0
mirror of https://github.com/coaidev/coai.git synced 2025-05-22 14:30:14 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

update context length settings and admin pages

Browse Source
This commit is contained in:
Zhang Minghan 2023-11-29 10:58:59 +08:00
parent e79c29e24a
commit 7e7798d213
13 changed files with 101 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addition/web/utils.go
View File

@ -7,7 +7,7 @@ import (
)
func UsingWebSegment(instance *conversation.Conversation) []globals.Message {
segment := conversation.CopyMessage(instance.GetMessageSegment(12))
segment := conversation.CopyMessage(instance.GetChatMessage())
if instance.IsEnableWeb() {
segment = ChatWithWeb(func(message []globals.Message, token int) (string, error) {

4
app/src/api/connection.ts
View File

@ -4,6 +4,7 @@ import { getMemory } from "@/utils/memory.ts";
export const endpoint = `${ws_api}/chat`;
export type StreamMessage = {
conversation?: number;
keyword?: string;
quota?: number;
message: string;
@ -97,6 +98,9 @@ export class Connection {
}
protected triggerCallback(message: StreamMessage): void {
if (this.id === -1 && message.conversation) {
this.setId(message.conversation);
}
this.callback && this.callback(message);
}

11
app/src/components/admin/MenuBar.tsx
View File

@ -1,7 +1,7 @@
import { useDispatch, useSelector } from "react-redux";
import { closeMenu, selectMenu } from "@/store/menu.ts";
import React, { useMemo } from "react";
import { LayoutDashboard, Radio, Settings, Users } from "lucide-react";
import {CandlestickChart, LayoutDashboard, Radio, Settings, Users} from "lucide-react";
import router from "@/router.tsx";
import { useLocation } from "react-router-dom";
import { useTranslation } from "react-i18next";
@ -53,9 +53,14 @@ function MenuBar() {
path={"/broadcast"}
/>
<MenuItem
title={t("admin.settings")}
title={t("admin.channel")}
icon={<Settings />}
path={"/settings"}
path={"/channel"}
/>
<MenuItem
title={t("admin.prize")}
icon={<CandlestickChart />}
path={"/prize"}
/>
</div>
);

2
app/src/components/admin/UserTable.tsx
View File

@ -92,7 +92,7 @@ function OperationMenu({ id }: OperationMenuProps) {
}}
/>
<DropdownMenu>
<DropdownMenuTrigger>
<DropdownMenuTrigger asChild>
<Button variant={`outline`} size={`icon`}>
<MoreHorizontal className={`h-4 w-4`} />
</Button>

3
app/src/dialogs/SettingsDialog.tsx
View File

@ -34,6 +34,7 @@ import {
SelectValue,
} from "@/components/ui/select.tsx";
import { langs, setLanguage } from "@/i18n.ts";
import {cn} from "@/components/ui/lib/utils.ts";
function SettingsDialog() {
const { t, i18n } = useTranslation();
@ -140,7 +141,7 @@ function SettingsDialog() {
<div className={`name`}>{t("settings.history")}</div>
<div className={`grow`} />
<NumberInput
className={`value`}
className={cn(`value`, history === 0 && `text-red-500`)}
value={history}
acceptNaN={false}
min={0}

19
app/src/i18n.ts
View File

@ -127,9 +127,9 @@ const resources = {
go: "前往实名认证",
cert: "实名认证礼包",
"cert-desc": "实名认证后可获得 50 点数 （价值 5 元）",
teen: "未成年人福利",
teen: "学生福利",
"teen-desc":
"实名认证后未成年人（18 周岁及以下）可额外获得 150 点数 （价值 15 元），并且获得每天 100 次免费使用 Claude 100k 模型额度",
"实名认证后未成年人（18 周岁及以下）可额外获得 150 点数 （价值 15 元）",
close: "关闭",
state: {
true: "已领取",
@ -308,7 +308,8 @@ const resources = {
dashboard: "仪表盘",
users: "用户管理",
broadcast: "公告管理",
settings: "设置",
channel: "渠道设置",
prize: "价格设定",
"billing-today": "今日入账",
"billing-month": "本月入账",
"subscription-users": "订阅用户",
@ -491,9 +492,9 @@ const resources = {
cert: "Certification Package",
"cert-desc":
"After real-name certification, you can get 50 points (worth 5 CNY)",
teen: "Teenager Package",
teen: "Student Package",
"teen-desc":
"After real-name certification, teenagers (18 years old and below) can get an additional 150 points (worth 15 CNY) and 100 times of free use of Claude 100k model per day",
"After real-name certification, teenagers (18 years old and under) can get an additional 150 points (worth 15 CNY)",
close: "Close",
state: {
true: "Received",
@ -681,7 +682,8 @@ const resources = {
dashboard: "Dashboard",
users: "User Management",
broadcast: "Broadcast Management",
settings: "Settings",
channel: "Channel Settings",
prize: "Price Settings",
"billing-today": "Billing Today",
"billing-month": "Billing Month",
"subscription-users": "Subscription Users",
@ -870,7 +872,7 @@ const resources = {
"После сертификации подлинности вы можете получить 100 очков (стоимостью 5 CNY)",
teen: "Подростковый пакет",
"teen-desc":
"После сертификации подлинности подростки (до 18 лет) могут получить дополнительно 150 очков (стоимостью 15 CNY) и 100 раз бесплатно использовать модель Claude 100k в день",
"После сертификации подлинности подростки (до 18 лет) могут получить дополнительно 150 очков (стоимостью 15 CNY)",
close: "Закрыть",
state: {
true: "Получено",
@ -1057,7 +1059,8 @@ const resources = {
dashboard: "Панель управления",
users: "Управление пользователями",
broadcast: "Управление объявлениями",
settings: "Настройки",
channel: "Настройки канала",
prize: "Настройки цен",
"billing-today": "Сегодняшний доход",
"billing-month": "Доход за месяц",
"subscription-users": "Подписчики",

18
app/src/router.tsx
View File

@ -10,7 +10,8 @@ const Article = lazy(() => import("@/routes/Article.tsx"));
const Admin = lazy(() => import("@/routes/Admin.tsx"));
const Dashboard = lazy(() => import("@/routes/admin/DashBoard.tsx"));
const Settings = lazy(() => import("@/routes/admin/Settings.tsx"));
const Channel = lazy(() => import("@/routes/admin/Channel.tsx"));
const Prize = lazy(() => import("@/routes/admin/Prize.tsx"));
const Users = lazy(() => import("@/routes/admin/Users.tsx"));
const Broadcast = lazy(() => import("@/routes/admin/Broadcast.tsx"));
@ -85,11 +86,20 @@ const router = createBrowserRouter([
),
},
{
id: "admin-settings",
path: "settings",
id: "admin-channel",
path: "channel",
element: (
<Suspense>
<Settings />
<Channel />
</Suspense>
),
},
{
id: "admin-prize",
path: "prize",
element: (
<Suspense>
<Prize />
</Suspense>
),
},

5
app/src/routes/admin/Channel.tsx Normal file
View File

@ -0,0 +1,5 @@
function Channel() {
return <></>;
}
export default Channel;

5
app/src/routes/admin/Prize.tsx Normal file
View File

@ -0,0 +1,5 @@
function Prize() {
return <></>;
}
export default Prize;

5
app/src/routes/admin/Settings.tsx
View File

@ -1,5 +0,0 @@
function Settings() {
return <></>;
}
export default Settings;

11
globals/types.go
View File

@ -9,11 +9,12 @@ type Message struct {
}
type ChatSegmentResponse struct {
Quota float32 `json:"quota"`
Keyword string `json:"keyword"`
Message string `json:"message"`
End bool `json:"end"`
Plan bool `json:"plan"`
Conversation int64 `json:"conversation"`
Quota float32 `json:"quota"`
Keyword string `json:"keyword"`
Message string `json:"message"`
End bool `json:"end"`
Plan bool `json:"plan"`
}
type GenerationSegmentResponse struct {

3
manager/chat.go
View File

@ -63,6 +63,9 @@ func ChatHandler(conn *Connection, user *auth.User, instance *conversation.Conve
db := conn.GetDB()
cache := conn.GetCache()
check, plan := auth.CanEnableModelWithSubscription(db, cache, user, model)
conn.Send(globals.ChatSegmentResponse{
Conversation: instance.GetId(),
})
if !check {
conn.Send(globals.ChatSegmentResponse{

71
manager/conversation/conversation.go
View File

@ -10,17 +10,18 @@ import (
)
const defaultConversationName = "new chat"
const defaultConversationContext = 8
type Conversation struct {
Auth bool `json:"auth"`
UserID int64 `json:"user_id"`
Id int64 `json:"id"`
Name string `json:"name"`
Message []globals.Message `json:"message"`
Model string `json:"model"`
EnableWeb bool `json:"enable_web"`
Shared bool `json:"shared"`
IgnoreContext bool `json:"ignore_context"`
Auth bool `json:"auth"`
UserID int64 `json:"user_id"`
Id int64 `json:"id"`
Name string `json:"name"`
Message []globals.Message `json:"message"`
Model string `json:"model"`
EnableWeb bool `json:"enable_web"`
Shared bool `json:"shared"`
Context int `json:"context"`
}
type FormMessage struct {
@ -29,17 +30,18 @@ type FormMessage struct {
Web bool `json:"web"`
Model string `json:"model"`
IgnoreContext bool `json:"ignore_context"`
Context int `json:"context"`
}
func NewAnonymousConversation() *Conversation {
return &Conversation{
Auth: false,
UserID: -1,
Id: -1,
Name: defaultConversationName,
Message: []globals.Message{},
Model: globals.GPT3Turbo,
IgnoreContext: false,
Auth: false,
UserID: -1,
Id: -1,
Name: defaultConversationName,
Message: []globals.Message{},
Model: globals.GPT3Turbo,
Context: defaultConversationContext,
}
}
@ -89,8 +91,8 @@ func (c *Conversation) IsEnableWeb() bool {
return c.EnableWeb
}
func (c *Conversation) IsIgnoreContext() bool {
return c.IgnoreContext
func (c *Conversation) GetContextLength() int {
return c.Context
}
func (c *Conversation) SetModel(model string) {
@ -104,8 +106,8 @@ func (c *Conversation) SetEnableWeb(enable bool) {
c.EnableWeb = enable
}
func (c *Conversation) SetIgnoreContext(ignore bool) {
c.IgnoreContext = ignore
func (c *Conversation) SetContextLength(context int) {
c.Context = context
}
func (c *Conversation) GetName() string {
@ -142,20 +144,16 @@ func (c *Conversation) GetMessageLength() int {
}
func (c *Conversation) GetMessageSegment(length int) []globals.Message {
if c.IsIgnoreContext() {
if len(c.Message) >= 1 {
// get latest message
return []globals.Message{c.Message[len(c.Message)-1]}
}
// empty
return []globals.Message{}
}
if length > len(c.Message) {
return c.Message
}
return c.Message[len(c.Message)-length:]
}
func (c *Conversation) GetChatMessage() []globals.Message {
return c.GetMessageSegment(c.GetContextLength())
}
func CopyMessage(message []globals.Message) []globals.Message {
return utils.DeepCopy[[]globals.Message](message) // deep copy
}
@ -224,7 +222,14 @@ func (c *Conversation) AddMessageFromByte(data []byte) (string, error) {
c.AddMessageFromUser(form.Message)
c.SetModel(form.Model)
c.SetEnableWeb(form.Web)
c.SetIgnoreContext(form.IgnoreContext)
if form.IgnoreContext {
form.Context = 1
} else if form.Context <= 0 {
form.Context = defaultConversationContext
}
c.SetContextLength(form.Context)
return form.Message, nil
}
@ -236,7 +241,13 @@ func (c *Conversation) AddMessageFromForm(form *FormMessage) error {
c.AddMessageFromUser(form.Message)
c.SetModel(form.Model)
c.SetEnableWeb(form.Web)
c.SetIgnoreContext(form.IgnoreContext)
if form.IgnoreContext {
form.Context = 1
} else if form.Context <= 0 {
form.Context = defaultConversationContext
}
c.SetContextLength(form.Context)
return nil
}