Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Hk-Gosuto 2024-02-03 11:30:06 +08:00
commit f76e47931f
3 changed files with 25 additions and 5 deletions

View File

@ -269,7 +269,7 @@ function CheckButton() {
const syncStore = useSyncStore(); const syncStore = useSyncStore();
const couldCheck = useMemo(() => { const couldCheck = useMemo(() => {
return syncStore.coundSync(); return syncStore.cloudSync();
}, [syncStore]); }, [syncStore]);
const [checkState, setCheckState] = useState< const [checkState, setCheckState] = useState<
@ -473,7 +473,7 @@ function SyncItems() {
const promptStore = usePromptStore(); const promptStore = usePromptStore();
const maskStore = useMaskStore(); const maskStore = useMaskStore();
const couldSync = useMemo(() => { const couldSync = useMemo(() => {
return syncStore.coundSync(); return syncStore.cloudSync();
}, [syncStore]); }, [syncStore]);
const [showSyncConfigModal, setShowSyncConfigModal] = useState(false); const [showSyncConfigModal, setShowSyncConfigModal] = useState(false);

View File

@ -199,6 +199,24 @@ export const DEFAULT_MODELS = [
providerType: "openai", providerType: "openai",
}, },
}, },
{
name: "gpt-3.5-turbo-0125",
available: true,
provider: {
id: "openai",
providerName: "OpenAI",
providerType: "openai",
},
},
{
name: "gpt-3.5-turbo-0301",
available: true,
provider: {
id: "openai",
providerName: "OpenAI",
providerType: "openai",
},
},
{ {
name: "gpt-3.5-turbo-0613", name: "gpt-3.5-turbo-0613",
available: true, available: true,

View File

@ -48,7 +48,7 @@ const DEFAULT_SYNC_STATE = {
export const useSyncStore = createPersistStore( export const useSyncStore = createPersistStore(
DEFAULT_SYNC_STATE, DEFAULT_SYNC_STATE,
(set, get) => ({ (set, get) => ({
coundSync() { cloudSync() {
const config = get()[get().provider]; const config = get()[get().provider];
return Object.values(config).every((c) => c.toString().length > 0); return Object.values(config).every((c) => c.toString().length > 0);
}, },
@ -60,7 +60,9 @@ export const useSyncStore = createPersistStore(
export() { export() {
const state = getLocalAppState(); const state = getLocalAppState();
const datePart = isApp const datePart = isApp
? `${new Date().toLocaleDateString().replace(/\//g, '_')} ${new Date().toLocaleTimeString().replace(/:/g, '_')}` ? `${new Date().toLocaleDateString().replace(/\//g, "_")} ${new Date()
.toLocaleTimeString()
.replace(/:/g, "_")}`
: new Date().toLocaleString(); : new Date().toLocaleString();
const fileName = `Backup-${datePart}.json`; const fileName = `Backup-${datePart}.json`;