fix: timezone count (#4604)

* fix: timezone count

* fix: ts

* fix: test llm

packages/global/common/time/timezone.ts

@@ -30,7 +30,7 @@ export const getTimezoneOffset = (timeZone: string): number => {
  *
  * Generated by Trelent
  */
-export const timezoneList = () => {
+export const getTimeZoneList = () => {
   const result = timezones
     .map((timezone) => {
       try {
@@ -71,6 +71,23 @@ export const timezoneList = () => {
     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) => {
   const timezoneDiff = getTimezoneOffset(timeZone);

packages/global/support/wallet/usage/api.d.ts

@@ -7,8 +7,8 @@ export type CreateTrainingUsageProps = {
 };
 
 export type GetUsageProps = {
-  dateStart: Date;
-  dateEnd: Date;
+  dateStart: string;
+  dateEnd: string;
   sources?: UsageSourceEnum[];
   teamMemberIds?: string[];
   projectName?: string;

packages/service/core/ai/config.ts

@@ -10,6 +10,7 @@ import { addLog } from '../../common/system/log';
 import { i18nT } from '../../../web/i18n/utils';
 import { OpenaiAccountType } from '@fastgpt/global/support/user/team/type';
 import { getLLMModel } from './model';
+import { LLMModelItemType } from '@fastgpt/global/core/ai/model.d';
 
 const aiProxyBaseUrl = process.env.AIPROXY_API_ENDPOINT
   ? `${process.env.AIPROXY_API_ENDPOINT}/v1`
@@ -68,7 +69,11 @@ export const createChatCompletion = async ({
   )
 > => {
   try {
+    // Rewrite model
     const modelConstantsData = getLLMModel(body.model);
+    if (!modelConstantsData) {
+      return Promise.reject(`${body.model} not found`);
+    }
 
     const formatTimeout = timeout ? timeout : body.stream ? 60000 : 600000;
     const ai = getAIApi({

packages/service/core/ai/config/utils.ts

@@ -45,43 +45,42 @@ export const loadSystemModels = async (init = false) => {
 
     if (model.isActive) {
       global.systemActiveModelList.push(model);
-
-      if (model.type === ModelTypeEnum.llm) {
-        global.llmModelMap.set(model.model, model);
-        global.llmModelMap.set(model.name, model);
-        if (model.isDefault) {
-          global.systemDefaultModel.llm = model;
-        }
-        if (model.isDefaultDatasetTextModel) {
-          global.systemDefaultModel.datasetTextLLM = model;
-        }
-        if (model.isDefaultDatasetImageModel) {
-          global.systemDefaultModel.datasetImageLLM = model;
-        }
-      } else if (model.type === ModelTypeEnum.embedding) {
-        global.embeddingModelMap.set(model.model, model);
-        global.embeddingModelMap.set(model.name, model);
-        if (model.isDefault) {
-          global.systemDefaultModel.embedding = model;
-        }
-      } else if (model.type === ModelTypeEnum.tts) {
-        global.ttsModelMap.set(model.model, model);
-        global.ttsModelMap.set(model.name, model);
-        if (model.isDefault) {
-          global.systemDefaultModel.tts = model;
-        }
-      } else if (model.type === ModelTypeEnum.stt) {
-        global.sttModelMap.set(model.model, model);
-        global.sttModelMap.set(model.name, model);
-        if (model.isDefault) {
-          global.systemDefaultModel.stt = model;
-        }
-      } else if (model.type === ModelTypeEnum.rerank) {
-        global.reRankModelMap.set(model.model, model);
-        global.reRankModelMap.set(model.name, model);
-        if (model.isDefault) {
-          global.systemDefaultModel.rerank = model;
-        }
+    }
+    if (model.type === ModelTypeEnum.llm) {
+      global.llmModelMap.set(model.model, model);
+      global.llmModelMap.set(model.name, model);
+      if (model.isDefault) {
+        global.systemDefaultModel.llm = model;
+      }
+      if (model.isDefaultDatasetTextModel) {
+        global.systemDefaultModel.datasetTextLLM = model;
+      }
+      if (model.isDefaultDatasetImageModel) {
+        global.systemDefaultModel.datasetImageLLM = model;
+      }
+    } else if (model.type === ModelTypeEnum.embedding) {
+      global.embeddingModelMap.set(model.model, model);
+      global.embeddingModelMap.set(model.name, model);
+      if (model.isDefault) {
+        global.systemDefaultModel.embedding = model;
+      }
+    } else if (model.type === ModelTypeEnum.tts) {
+      global.ttsModelMap.set(model.model, model);
+      global.ttsModelMap.set(model.name, model);
+      if (model.isDefault) {
+        global.systemDefaultModel.tts = model;
+      }
+    } else if (model.type === ModelTypeEnum.stt) {
+      global.sttModelMap.set(model.model, model);
+      global.sttModelMap.set(model.name, model);
+      if (model.isDefault) {
+        global.systemDefaultModel.stt = model;
+      }
+    } else if (model.type === ModelTypeEnum.rerank) {
+      global.reRankModelMap.set(model.model, model);
+      global.reRankModelMap.set(model.name, model);
+      if (model.isDefault) {
+        global.systemDefaultModel.rerank = model;
       }
     }
   };

packages/web/components/common/MySelect/TimezoneSelect.tsx

@@ -1,9 +1,9 @@
 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';
 
 const TimezoneSelect = ({ value, onChange }: { value?: string; onChange: (e: string) => void }) => {
-  const timezones = useRef(timezoneList());
+  const timezones = useRef(getTimeZoneList());
 
   return (
     <Select