mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2026-01-10 15:49:29 +08:00
refactor(types): consolidate video-related types into main types module
Move all video-related type definitions from '@renderer/types/video' to '@renderer/types' to centralize type definitions and reduce module fragmentation
This commit is contained in:
parent
999c077b3a
commit
ffc3b43dc5
@ -14,21 +14,19 @@ import { addSpan, endSpan } from '@renderer/services/SpanManagerService'
|
|||||||
import type { StartSpanParams } from '@renderer/trace/types/ModelSpanEntity'
|
import type { StartSpanParams } from '@renderer/trace/types/ModelSpanEntity'
|
||||||
import type {
|
import type {
|
||||||
Assistant,
|
Assistant,
|
||||||
|
CreateVideoParams,
|
||||||
|
CreateVideoResult,
|
||||||
DeleteVideoParams,
|
DeleteVideoParams,
|
||||||
DeleteVideoResult,
|
DeleteVideoResult,
|
||||||
GenerateImageParams,
|
GenerateImageParams,
|
||||||
Model,
|
Model,
|
||||||
Provider,
|
Provider,
|
||||||
RetrieveVideoContentParams
|
RetrieveVideoContentParams,
|
||||||
} from '@renderer/types'
|
|
||||||
import type { AiSdkModel, StreamTextParams } from '@renderer/types/aiCoreTypes'
|
|
||||||
import type {
|
|
||||||
CreateVideoParams,
|
|
||||||
CreateVideoResult,
|
|
||||||
RetrieveVideoContentResult,
|
RetrieveVideoContentResult,
|
||||||
RetrieveVideoParams,
|
RetrieveVideoParams,
|
||||||
RetrieveVideoResult
|
RetrieveVideoResult
|
||||||
} from '@renderer/types/video'
|
} from '@renderer/types'
|
||||||
|
import type { AiSdkModel, StreamTextParams } from '@renderer/types/aiCoreTypes'
|
||||||
import { buildClaudeCodeSystemModelMessage } from '@shared/anthropic'
|
import { buildClaudeCodeSystemModelMessage } from '@shared/anthropic'
|
||||||
import { type ImageModel, type LanguageModel, type Provider as AiSdkProvider, wrapLanguageModel } from 'ai'
|
import { type ImageModel, type LanguageModel, type Provider as AiSdkProvider, wrapLanguageModel } from 'ai'
|
||||||
|
|
||||||
|
|||||||
@ -15,6 +15,8 @@ import {
|
|||||||
import { isSupportDeveloperRoleProvider } from '@renderer/config/providers'
|
import { isSupportDeveloperRoleProvider } from '@renderer/config/providers'
|
||||||
import { estimateTextTokens } from '@renderer/services/TokenService'
|
import { estimateTextTokens } from '@renderer/services/TokenService'
|
||||||
import type {
|
import type {
|
||||||
|
CreateVideoParams,
|
||||||
|
DeleteVideoParams,
|
||||||
FileMetadata,
|
FileMetadata,
|
||||||
MCPCallToolResponse,
|
MCPCallToolResponse,
|
||||||
MCPTool,
|
MCPTool,
|
||||||
@ -22,6 +24,8 @@ import type {
|
|||||||
Model,
|
Model,
|
||||||
OpenAIServiceTier,
|
OpenAIServiceTier,
|
||||||
Provider,
|
Provider,
|
||||||
|
RetrieveVideoContentParams,
|
||||||
|
RetrieveVideoParams,
|
||||||
ToolCallResponse
|
ToolCallResponse
|
||||||
} from '@renderer/types'
|
} from '@renderer/types'
|
||||||
import { FileTypes, WebSearchSource } from '@renderer/types'
|
import { FileTypes, WebSearchSource } from '@renderer/types'
|
||||||
@ -35,12 +39,6 @@ import type {
|
|||||||
OpenAIResponseSdkTool,
|
OpenAIResponseSdkTool,
|
||||||
OpenAIResponseSdkToolCall
|
OpenAIResponseSdkToolCall
|
||||||
} from '@renderer/types/sdk'
|
} from '@renderer/types/sdk'
|
||||||
import type {
|
|
||||||
CreateVideoParams,
|
|
||||||
DeleteVideoParams,
|
|
||||||
RetrieveVideoContentParams,
|
|
||||||
RetrieveVideoParams
|
|
||||||
} from '@renderer/types/video'
|
|
||||||
import { addImageFileToContents } from '@renderer/utils/formats'
|
import { addImageFileToContents } from '@renderer/utils/formats'
|
||||||
import {
|
import {
|
||||||
isSupportedToolUse,
|
isSupportedToolUse,
|
||||||
|
|||||||
@ -6,21 +6,19 @@ import { getProviderByModel } from '@renderer/services/AssistantService'
|
|||||||
import { withSpanResult } from '@renderer/services/SpanManagerService'
|
import { withSpanResult } from '@renderer/services/SpanManagerService'
|
||||||
import type { StartSpanParams } from '@renderer/trace/types/ModelSpanEntity'
|
import type { StartSpanParams } from '@renderer/trace/types/ModelSpanEntity'
|
||||||
import type {
|
import type {
|
||||||
|
CreateVideoParams,
|
||||||
|
CreateVideoResult,
|
||||||
DeleteVideoParams,
|
DeleteVideoParams,
|
||||||
DeleteVideoResult,
|
DeleteVideoResult,
|
||||||
GenerateImageParams,
|
GenerateImageParams,
|
||||||
Model,
|
Model,
|
||||||
Provider,
|
Provider,
|
||||||
RetrieveVideoContentParams
|
RetrieveVideoContentParams,
|
||||||
} from '@renderer/types'
|
|
||||||
import type { RequestOptions, SdkModel } from '@renderer/types/sdk'
|
|
||||||
import type {
|
|
||||||
CreateVideoParams,
|
|
||||||
CreateVideoResult,
|
|
||||||
RetrieveVideoContentResult,
|
RetrieveVideoContentResult,
|
||||||
RetrieveVideoParams,
|
RetrieveVideoParams,
|
||||||
RetrieveVideoResult
|
RetrieveVideoResult
|
||||||
} from '@renderer/types/video'
|
} from '@renderer/types'
|
||||||
|
import type { RequestOptions, SdkModel } from '@renderer/types/sdk'
|
||||||
import { isSupportedToolUse } from '@renderer/utils/mcp-tools'
|
import { isSupportedToolUse } from '@renderer/utils/mcp-tools'
|
||||||
|
|
||||||
import { AihubmixAPIClient } from './clients/aihubmix/AihubmixAPIClient'
|
import { AihubmixAPIClient } from './clients/aihubmix/AihubmixAPIClient'
|
||||||
|
|||||||
@ -3,7 +3,7 @@ import { retrieveVideo } from '@renderer/services/ApiService'
|
|||||||
import { getProviderById } from '@renderer/services/ProviderService'
|
import { getProviderById } from '@renderer/services/ProviderService'
|
||||||
import { useAppDispatch, useAppSelector } from '@renderer/store'
|
import { useAppDispatch, useAppSelector } from '@renderer/store'
|
||||||
import { addVideoAction, setVideoAction, setVideosAction, updateVideoAction } from '@renderer/store/video'
|
import { addVideoAction, setVideoAction, setVideosAction, updateVideoAction } from '@renderer/store/video'
|
||||||
import type { Video } from '@renderer/types/video'
|
import type { Video } from '@renderer/types'
|
||||||
import { getErrorMessage } from '@renderer/utils'
|
import { getErrorMessage } from '@renderer/utils'
|
||||||
import { useCallback, useEffect, useRef } from 'react'
|
import { useCallback, useEffect, useRef } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import { cn, Progress, Spinner } from '@heroui/react'
|
import { cn, Progress, Spinner } from '@heroui/react'
|
||||||
import { DeleteIcon } from '@renderer/components/Icons'
|
import { DeleteIcon } from '@renderer/components/Icons'
|
||||||
import type { Video } from '@renderer/types/video'
|
import type { Video } from '@renderer/types'
|
||||||
import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger } from '@renderer/ui/context-menu'
|
import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger } from '@renderer/ui/context-menu'
|
||||||
import { CheckCircleIcon, CircleXIcon, ClockIcon, DownloadIcon, ImageDownIcon } from 'lucide-react'
|
import { CheckCircleIcon, CircleXIcon, ClockIcon, DownloadIcon, ImageDownIcon } from 'lucide-react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
|
|||||||
@ -7,8 +7,8 @@ import { useProvider } from '@renderer/hooks/useProvider'
|
|||||||
import { useProviderVideos } from '@renderer/hooks/video/useProviderVideos'
|
import { useProviderVideos } from '@renderer/hooks/video/useProviderVideos'
|
||||||
import { useVideoThumbnail } from '@renderer/hooks/video/useVideoThumbnail'
|
import { useVideoThumbnail } from '@renderer/hooks/video/useVideoThumbnail'
|
||||||
import { deleteVideo } from '@renderer/services/ApiService'
|
import { deleteVideo } from '@renderer/services/ApiService'
|
||||||
|
import type { CreateVideoParams } from '@renderer/types'
|
||||||
import { SystemProviderIds } from '@renderer/types'
|
import { SystemProviderIds } from '@renderer/types'
|
||||||
import type { CreateVideoParams } from '@renderer/types/video'
|
|
||||||
import { getErrorMessage } from '@renderer/utils'
|
import { getErrorMessage } from '@renderer/utils'
|
||||||
import { deepUpdate } from '@renderer/utils/deepUpdate'
|
import { deepUpdate } from '@renderer/utils/deepUpdate'
|
||||||
import { isVideoModel } from '@renderer/utils/model/video'
|
import { isVideoModel } from '@renderer/utils/model/video'
|
||||||
|
|||||||
@ -5,9 +5,8 @@ import { useAddOpenAIVideo } from '@renderer/hooks/video/useAddOpenAIVideo'
|
|||||||
import { useProviderVideos } from '@renderer/hooks/video/useProviderVideos'
|
import { useProviderVideos } from '@renderer/hooks/video/useProviderVideos'
|
||||||
import { createVideo, retrieveVideoContent } from '@renderer/services/ApiService'
|
import { createVideo, retrieveVideoContent } from '@renderer/services/ApiService'
|
||||||
import FileManager from '@renderer/services/FileManager'
|
import FileManager from '@renderer/services/FileManager'
|
||||||
import type { Provider, VideoFileMetadata } from '@renderer/types'
|
import type { CreateVideoParams, Provider, Video, VideoFileMetadata } from '@renderer/types'
|
||||||
import { FileTypes } from '@renderer/types'
|
import { FileTypes } from '@renderer/types'
|
||||||
import type { CreateVideoParams, Video } from '@renderer/types/video'
|
|
||||||
import { getErrorMessage } from '@renderer/utils'
|
import { getErrorMessage } from '@renderer/utils'
|
||||||
import { MB } from '@shared/config/constant'
|
import { MB } from '@shared/config/constant'
|
||||||
import type { DeepPartial } from 'ai'
|
import type { DeepPartial } from 'ai'
|
||||||
|
|||||||
@ -12,7 +12,7 @@ import {
|
|||||||
} from '@heroui/react'
|
} from '@heroui/react'
|
||||||
import { usePending } from '@renderer/hooks/usePending'
|
import { usePending } from '@renderer/hooks/usePending'
|
||||||
import FileManager from '@renderer/services/FileManager'
|
import FileManager from '@renderer/services/FileManager'
|
||||||
import type { Video, VideoDownloaded, VideoFailed } from '@renderer/types/video'
|
import type { Video, VideoDownloaded, VideoFailed } from '@renderer/types'
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
import { CheckCircleIcon, CircleXIcon, Clock9Icon } from 'lucide-react'
|
import { CheckCircleIcon, CircleXIcon, Clock9Icon } from 'lucide-react'
|
||||||
import { useEffect, useMemo, useRef, useState } from 'react'
|
import { useEffect, useMemo, useRef, useState } from 'react'
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import type { VideoSeconds, VideoSize } from '@cherrystudio/openai/resources'
|
import type { VideoSeconds, VideoSize } from '@cherrystudio/openai/resources'
|
||||||
import { Select, SelectItem } from '@heroui/react'
|
import { Select, SelectItem } from '@heroui/react'
|
||||||
import type { OpenAICreateVideoParams } from '@renderer/types/video'
|
import type { OpenAICreateVideoParams } from '@renderer/types'
|
||||||
import type { DeepPartial } from 'ai'
|
import type { DeepPartial } from 'ai'
|
||||||
import { useCallback } from 'react'
|
import { useCallback } from 'react'
|
||||||
import { useTranslation } from 'react-i18next'
|
import { useTranslation } from 'react-i18next'
|
||||||
|
|||||||
@ -30,7 +30,6 @@ import type { StreamTextParams } from '@renderer/types/aiCoreTypes'
|
|||||||
import { type Chunk, ChunkType } from '@renderer/types/chunk'
|
import { type Chunk, ChunkType } from '@renderer/types/chunk'
|
||||||
import type { Message } from '@renderer/types/newMessage'
|
import type { Message } from '@renderer/types/newMessage'
|
||||||
import type { SdkModel } from '@renderer/types/sdk'
|
import type { SdkModel } from '@renderer/types/sdk'
|
||||||
import {} from '@renderer/types/video'
|
|
||||||
import { removeSpecialCharactersForTopicName, uuid } from '@renderer/utils'
|
import { removeSpecialCharactersForTopicName, uuid } from '@renderer/utils'
|
||||||
import { abortCompletion, readyToAbort } from '@renderer/utils/abortController'
|
import { abortCompletion, readyToAbort } from '@renderer/utils/abortController'
|
||||||
import { isAbortError } from '@renderer/utils/error'
|
import { isAbortError } from '@renderer/utils/error'
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
import { loggerService } from '@logger'
|
import { loggerService } from '@logger'
|
||||||
import type { PayloadAction } from '@reduxjs/toolkit'
|
import type { PayloadAction } from '@reduxjs/toolkit'
|
||||||
import { createSlice } from '@reduxjs/toolkit'
|
import { createSlice } from '@reduxjs/toolkit'
|
||||||
import type { Video } from '@renderer/types/video'
|
import type { Video } from '@renderer/types'
|
||||||
|
|
||||||
const logger = loggerService.withContext('Store:video')
|
const logger = loggerService.withContext('Store:video')
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user