Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 4ac2a2f4 by Archer Committed by GitHub
Options

fix: timezone count (#4604) 

* fix: timezone count

* fix: ts

* fix: test llm
parent 61aa91b3
Showing with 73 additions and 50 deletions
docSite/content/zh-cn/docs/development/upgrading/497.md
...@@ -18,4 +18,7 @@ weight: 793 ...@@ -18,4 +18,7 @@ weight: 793
## 🐛 修复 ## 🐛 修复
1. 文件上传分块大小限制，避免超出 MongoDB 限制。 1. 文件上传分块大小限制，避免超出 MongoDB 限制。
2. 使用记录仪表盘，无法获取指定成员的使用统计。
3. 仪表盘接口，因未考虑时区问题，统计异常。
4. LLM 模型测试接口，无法测试未启用的 LLM。
packages/global/common/time/timezone.ts
...@@ -30,7 +30,7 @@ export const getTimezoneOffset = (timeZone: string): number => { ...@@ -30,7 +30,7 @@ export const getTimezoneOffset = (timeZone: string): number => {
* *
* Generated by Trelent * Generated by Trelent
*/ */
export const timezoneList = () => { export const getTimeZoneList = () => {
const result = timezones const result = timezones
.map((timezone) => { .map((timezone) => {
try { try {
...@@ -71,6 +71,23 @@ export const timezoneList = () => { ...@@ -71,6 +71,23 @@ export const timezoneList = () => {
time: number; time: number;
}[]; }[];
}; };
export const timeZoneList = getTimeZoneList();
export const getMongoTimezoneCode = (timeString: string) => {
if (!timeString.includes(':')) {
return '+00:00';
}
if (timeString.includes('+')) {
const timezoneMatch = timeString.split('+');
return `+${timezoneMatch[1]}`;
} else if (timeString.includes('-')) {
const timezoneMatch = timeString.split('-');
return `-${timezoneMatch[1]}`;
} else {
return '+00:00';
}
};
export const getSystemTime = (timeZone: string) => { export const getSystemTime = (timeZone: string) => {
const timezoneDiff = getTimezoneOffset(timeZone); const timezoneDiff = getTimezoneOffset(timeZone);
......
packages/global/support/wallet/usage/api.d.ts
...@@ -7,8 +7,8 @@ export type CreateTrainingUsageProps = { ...@@ -7,8 +7,8 @@ export type CreateTrainingUsageProps = {
}; };
export type GetUsageProps = { export type GetUsageProps = {
dateStart: Date; dateStart: string;
dateEnd: Date; dateEnd: string;
sources?: UsageSourceEnum[]; sources?: UsageSourceEnum[];
teamMemberIds?: string[]; teamMemberIds?: string[];
projectName?: string; projectName?: string;
......
packages/service/core/ai/config.ts
...@@ -10,6 +10,7 @@ import { addLog } from '../../common/system/log'; ...@@ -10,6 +10,7 @@ import { addLog } from '../../common/system/log';
import { i18nT } from '../../../web/i18n/utils'; import { i18nT } from '../../../web/i18n/utils';
import { OpenaiAccountType } from '@fastgpt/global/support/user/team/type'; import { OpenaiAccountType } from '@fastgpt/global/support/user/team/type';
import { getLLMModel } from './model'; import { getLLMModel } from './model';
import { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
const aiProxyBaseUrl = process.env.AIPROXY_API_ENDPOINT const aiProxyBaseUrl = process.env.AIPROXY_API_ENDPOINT
? `${process.env.AIPROXY_API_ENDPOINT}/v1` ? `${process.env.AIPROXY_API_ENDPOINT}/v1`
...@@ -68,7 +69,11 @@ export const createChatCompletion = async ({ ...@@ -68,7 +69,11 @@ export const createChatCompletion = async ({
) )
> => { > => {
try { try {
// Rewrite model
const modelConstantsData = getLLMModel(body.model); const modelConstantsData = getLLMModel(body.model);
if (!modelConstantsData) {
return Promise.reject(`${body.model} not found`);
}
const formatTimeout = timeout ? timeout : body.stream ? 60000 : 600000; const formatTimeout = timeout ? timeout : body.stream ? 60000 : 600000;
const ai = getAIApi({ const ai = getAIApi({
......
packages/service/core/ai/config/utils.ts
...@@ -45,43 +45,42 @@ export const loadSystemModels = async (init = false) => { ...@@ -45,43 +45,42 @@ export const loadSystemModels = async (init = false) => {
if (model.isActive) { if (model.isActive) {
global.systemActiveModelList.push(model); global.systemActiveModelList.push(model);
}
if (model.type === ModelTypeEnum.llm) { if (model.type === ModelTypeEnum.llm) {
global.llmModelMap.set(model.model, model); global.llmModelMap.set(model.model, model);
global.llmModelMap.set(model.name, model); global.llmModelMap.set(model.name, model);
if (model.isDefault) { if (model.isDefault) {
global.systemDefaultModel.llm = model; global.systemDefaultModel.llm = model;
} }
if (model.isDefaultDatasetTextModel) { if (model.isDefaultDatasetTextModel) {
global.systemDefaultModel.datasetTextLLM = model; global.systemDefaultModel.datasetTextLLM = model;
} }
if (model.isDefaultDatasetImageModel) { if (model.isDefaultDatasetImageModel) {
global.systemDefaultModel.datasetImageLLM = model; global.systemDefaultModel.datasetImageLLM = model;
} }
} else if (model.type === ModelTypeEnum.embedding) { } else if (model.type === ModelTypeEnum.embedding) {
global.embeddingModelMap.set(model.model, model); global.embeddingModelMap.set(model.model, model);
global.embeddingModelMap.set(model.name, model); global.embeddingModelMap.set(model.name, model);
if (model.isDefault) { if (model.isDefault) {
global.systemDefaultModel.embedding = model; global.systemDefaultModel.embedding = model;
} }
} else if (model.type === ModelTypeEnum.tts) { } else if (model.type === ModelTypeEnum.tts) {
global.ttsModelMap.set(model.model, model); global.ttsModelMap.set(model.model, model);
global.ttsModelMap.set(model.name, model); global.ttsModelMap.set(model.name, model);
if (model.isDefault) { if (model.isDefault) {
global.systemDefaultModel.tts = model; global.systemDefaultModel.tts = model;
} }
} else if (model.type === ModelTypeEnum.stt) { } else if (model.type === ModelTypeEnum.stt) {
global.sttModelMap.set(model.model, model); global.sttModelMap.set(model.model, model);
global.sttModelMap.set(model.name, model); global.sttModelMap.set(model.name, model);
if (model.isDefault) { if (model.isDefault) {
global.systemDefaultModel.stt = model; global.systemDefaultModel.stt = model;
} }
} else if (model.type === ModelTypeEnum.rerank) { } else if (model.type === ModelTypeEnum.rerank) {
global.reRankModelMap.set(model.model, model); global.reRankModelMap.set(model.model, model);
global.reRankModelMap.set(model.name, model); global.reRankModelMap.set(model.name, model);
if (model.isDefault) { if (model.isDefault) {
global.systemDefaultModel.rerank = model; global.systemDefaultModel.rerank = model;
}
} }
} }
}; };
......
packages/web/components/common/MySelect/TimezoneSelect.tsx
import React, { useRef } from 'react'; import React, { useRef } from 'react';
import { timezoneList } from '@fastgpt/global/common/time/timezone'; import { getTimeZoneList } from '@fastgpt/global/common/time/timezone';
import { Select } from '@chakra-ui/react'; import { Select } from '@chakra-ui/react';
const TimezoneSelect = ({ value, onChange }: { value?: string; onChange: (e: string) => void }) => { const TimezoneSelect = ({ value, onChange }: { value?: string; onChange: (e: string) => void }) => {
const timezones = useRef(timezoneList()); const timezones = useRef(getTimeZoneList());
return ( return (
<Select <Select
......
projects/app/src/pageComponents/account/usage/Dashboard.tsx
...@@ -70,11 +70,11 @@ const UsageDashboard = ({ ...@@ -70,11 +70,11 @@ const UsageDashboard = ({
() => () =>
getDashboardData({ getDashboardData({
dateStart: dateRange.from dateStart: dateRange.from
? new Date(dateRange.from.setHours(0, 0, 0, 0)) ? dayjs(dateRange.from.setHours(0, 0, 0, 0)).format()
: new Date(new Date().setHours(0, 0, 0, 0)), : dayjs(new Date().setHours(0, 0, 0, 0)).format(),
dateEnd: dateRange.to dateEnd: dateRange.to
? new Date(addDays(dateRange.to, 1).setHours(0, 0, 0, 0)) ? dayjs(addDays(dateRange.to, 1).setHours(0, 0, 0, 0)).format()
: new Date(addDays(new Date(), 1).setHours(0, 0, 0, 0)), : dayjs(addDays(new Date(), 1).setHours(0, 0, 0, 0)).format(),
sources: isSelectAllSource ? undefined : usageSources, sources: isSelectAllSource ? undefined : usageSources,
teamMemberIds: isSelectAllTmb ? undefined : selectTmbIds, teamMemberIds: isSelectAllTmb ? undefined : selectTmbIds,
unit unit
......
projects/app/src/pageComponents/account/usage/UsageTable.tsx
...@@ -45,8 +45,8 @@ const UsageTableList = ({ ...@@ -45,8 +45,8 @@ const UsageTableList = ({
filterParams; filterParams;
const requestParams = useMemo(() => { const requestParams = useMemo(() => {
return { return {
dateStart: dateRange.from || new Date(), dateStart: dayjs(dateRange.from || new Date()).format(),
dateEnd: addDays(dateRange.to || new Date(), 1), dateEnd: dayjs(addDays(dateRange.to || new Date(), 1)).format(),
sources: isSelectAllSource ? undefined : usageSources, sources: isSelectAllSource ? undefined : usageSources,
teamMemberIds: isSelectAllTmb ? undefined : selectTmbIds, teamMemberIds: isSelectAllTmb ? undefined : selectTmbIds,
projectName projectName
......
projects/app/src/pages/account/usage/index.tsx
...@@ -16,8 +16,6 @@ import FillRowTabs from '@fastgpt/web/components/common/Tabs/FillRowTabs'; ...@@ -16,8 +16,6 @@ import FillRowTabs from '@fastgpt/web/components/common/Tabs/FillRowTabs';
import MultipleSelect, { import MultipleSelect, {
useMultipleSelect useMultipleSelect
} from '@fastgpt/web/components/common/MySelect/MultipleSelect'; } from '@fastgpt/web/components/common/MySelect/MultipleSelect';
import SearchInput from '@fastgpt/web/components/common/Input/SearchInput';
import MySelect from '@fastgpt/web/components/common/MySelect';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import dynamic from 'next/dynamic'; import dynamic from 'next/dynamic';
......
projects/app/src/service/common/system/index.ts
...@@ -51,6 +51,7 @@ export const readConfigData = async (name: string) => { ...@@ -51,6 +51,7 @@ export const readConfigData = async (name: string) => {
export function initGlobalVariables() { export function initGlobalVariables() {
function initPlusRequest() { function initPlusRequest() {
global.textCensorHandler = function textCensorHandler({ text }: { text: string }) { global.textCensorHandler = function textCensorHandler({ text }: { text: string }) {
if (!isProVersion()) return Promise.resolve({ code: 200 });
return POST<{ code: number; message?: string }>('/common/censor/check', { text }); return POST<{ code: number; message?: string }>('/common/censor/check', { text });
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment