+ >({})
+
useEffect(() => {
fetchSources()
}, [fetchSources])
@@ -131,6 +141,41 @@ function HubModelDetail() {
}
}
+ // Check model support function
+ const checkModelSupport = useCallback(
+ async (variant: ModelQuant) => {
+ const modelKey = variant.model_id
+
+ // Don't check again if already checking or checked
+ if (modelSupportStatus[modelKey]) {
+ return
+ }
+
+ // Set loading state
+ setModelSupportStatus((prev) => ({
+ ...prev,
+ [modelKey]: 'LOADING',
+ }))
+
+ try {
+ // Use the HuggingFace path for the model
+ const modelPath = variant.path
+ const supported = await isModelSupported(modelPath, 8192)
+ setModelSupportStatus((prev) => ({
+ ...prev,
+ [modelKey]: supported,
+ }))
+ } catch (error) {
+ console.error('Error checking model support:', error)
+ setModelSupportStatus((prev) => ({
+ ...prev,
+ [modelKey]: 'RED',
+ }))
+ }
+ },
+ [modelSupportStatus]
+ )
+
// Extract tags from quants (model variants)
const tags = useMemo(() => {
if (!modelData?.quants) return []
@@ -318,6 +363,7 @@ function HubModelDetail() {
|
Size
|
+ |
Action
|
@@ -372,7 +418,18 @@ function HubModelDetail() {
{variant.file_size}
-
+ |
+
+ |
+
{(() => {
if (isDownloading && !isDownloaded) {
return (
@@ -408,9 +465,11 @@ function HubModelDetail() {
addLocalDownloadingModel(
variant.model_id
)
- pullModel(
+ pullModelWithMetadata(
variant.model_id,
- variant.path
+ variant.path,
+ modelData.mmproj_models?.[0]?.path,
+ huggingfaceToken
)
}}
className={cn(isDownloading && 'hidden')}
diff --git a/web-app/src/routes/hub/index.tsx b/web-app/src/routes/hub/index.tsx
index 2e5db8ba2..07dd0f85b 100644
--- a/web-app/src/routes/hub/index.tsx
+++ b/web-app/src/routes/hub/index.tsx
@@ -31,6 +31,7 @@ import {
TooltipProvider,
TooltipTrigger,
} from '@/components/ui/tooltip'
+import { ModelInfoHoverCard } from '@/containers/ModelInfoHoverCard'
import Joyride, { CallBackProps, STATUS } from 'react-joyride'
import { CustomTooltipJoyRide } from '@/containers/CustomeTooltipJoyRide'
import {
@@ -41,9 +42,10 @@ import {
} from '@/components/ui/dropdown-menu'
import {
CatalogModel,
- pullModel,
+ pullModelWithMetadata,
fetchHuggingFaceRepo,
convertHfRepoToCatalogModel,
+ isModelSupported,
} from '@/services/models'
import { useDownloadStore } from '@/hooks/useDownloadStore'
import { Progress } from '@/components/ui/progress'
@@ -97,6 +99,9 @@ function Hub() {
const [huggingFaceRepo, setHuggingFaceRepo] = useState(
null
)
+ const [modelSupportStatus, setModelSupportStatus] = useState<
+ Record
+ >({})
const [joyrideReady, setJoyrideReady] = useState(false)
const [currentStepIndex, setCurrentStepIndex] = useState(0)
const addModelSourceTimeoutRef = useRef | null>(
@@ -270,6 +275,41 @@ function Hub() {
[navigate]
)
+ const checkModelSupport = useCallback(
+ async (variant: any) => {
+ const modelKey = variant.model_id
+
+ // Don't check again if already checking or checked
+ if (modelSupportStatus[modelKey]) {
+ return
+ }
+
+ // Set loading state
+ setModelSupportStatus((prev) => ({
+ ...prev,
+ [modelKey]: 'LOADING',
+ }))
+
+ try {
+ // Use the HuggingFace path for the model
+ const modelPath = variant.path
+ const supportStatus = await isModelSupported(modelPath, 8192)
+
+ setModelSupportStatus((prev) => ({
+ ...prev,
+ [modelKey]: supportStatus,
+ }))
+ } catch (error) {
+ console.error('Error checking model support:', error)
+ setModelSupportStatus((prev) => ({
+ ...prev,
+ [modelKey]: 'RED',
+ }))
+ }
+ },
+ [modelSupportStatus]
+ )
+
const DownloadButtonPlaceholder = useMemo(() => {
return ({ model }: ModelProps) => {
// Check if this is a HuggingFace repository (no quants)
@@ -313,7 +353,12 @@ function Hub() {
// Immediately set local downloading state
addLocalDownloadingModel(modelId)
const mmprojPath = model.mmproj_models?.[0]?.path
- pullModel(modelId, modelUrl, mmprojPath)
+ pullModelWithMetadata(
+ modelId,
+ modelUrl,
+ mmprojPath,
+ huggingfaceToken
+ )
}
return (
@@ -611,6 +656,14 @@ function Hub() {
)?.file_size
}
+
@@ -666,45 +719,47 @@ function Hub() {
?.length || 0}
- {filteredModels[virtualItem.index].tools && (
-
-
-
-
-
-
-
-
-
- {t('tools')}
-
-
-
-
-
-
-
-
-
-
-
-
- {t('vision')}
-
-
-
-
+ {filteredModels[virtualItem.index].num_mmproj >
+ 0 && (
+
+
+
+
+
+
+
+
+
+ {t('vision')}
+
+
+
+
+ )}
+ {filteredModels[virtualItem.index].tools && (
+
+
+
+
+
+
+
+
+
+ {t('tools')}
+
+
+
+
+ )}
+
@@ -739,12 +794,75 @@ function Hub() {
(variant) => (
+
+
+ {variant.model_id}
+
+ {filteredModels[virtualItem.index]
+ .num_mmproj > 0 && (
+
+
+
+
+
+
+
+
+
+ {t('vision')}
+
+
+
+
+ )}
+ {filteredModels[virtualItem.index]
+ .tools && (
+
+
+
+
+
+
+
+
+
+ {t('tools')}
+
+
+
+
+ )}
+
{variant.file_size}
+
{(() => {
const isDownloading =
localDownloadingModels.has(
@@ -812,12 +930,13 @@ function Hub() {
addLocalDownloadingModel(
variant.model_id
)
- pullModel(
+ pullModelWithMetadata(
variant.model_id,
variant.path,
filteredModels[
virtualItem.index
- ].mmproj_models?.[0]?.path
+ ].mmproj_models?.[0]?.path,
+ huggingfaceToken
)
}}
>
diff --git a/web-app/src/routes/settings/__tests__/general.test.tsx b/web-app/src/routes/settings/__tests__/general.test.tsx
index 96388b0fb..e21a28dcf 100644
--- a/web-app/src/routes/settings/__tests__/general.test.tsx
+++ b/web-app/src/routes/settings/__tests__/general.test.tsx
@@ -61,8 +61,6 @@ vi.mock('@/hooks/useGeneralSetting', () => ({
useGeneralSetting: () => ({
spellCheckChatInput: true,
setSpellCheckChatInput: vi.fn(),
- experimentalFeatures: false,
- setExperimentalFeatures: vi.fn(),
huggingfaceToken: 'test-token',
setHuggingfaceToken: vi.fn(),
}),
@@ -188,12 +186,14 @@ vi.mock('@tauri-apps/plugin-opener', () => ({
}))
vi.mock('@tauri-apps/api/webviewWindow', () => {
- const MockWebviewWindow = vi.fn().mockImplementation((label: string, options: any) => ({
- once: vi.fn(),
- setFocus: vi.fn(),
- }))
+ const MockWebviewWindow = vi
+ .fn()
+ .mockImplementation((label: string, options: any) => ({
+ once: vi.fn(),
+ setFocus: vi.fn(),
+ }))
MockWebviewWindow.getByLabel = vi.fn().mockReturnValue(null)
-
+
return {
WebviewWindow: MockWebviewWindow,
}
@@ -299,16 +299,6 @@ describe('General Settings Route', () => {
// expect(screen.getByTestId('language-switcher')).toBeInTheDocument()
// })
- it('should render switches for experimental features and spell check', async () => {
- const Component = GeneralRoute.component as React.ComponentType
- await act(async () => {
- render( )
- })
-
- const switches = screen.getAllByTestId('switch')
- expect(switches.length).toBeGreaterThanOrEqual(2)
- })
-
it('should render huggingface token input', async () => {
const Component = GeneralRoute.component as React.ComponentType
await act(async () => {
@@ -336,24 +326,6 @@ describe('General Settings Route', () => {
expect(switches[0]).toBeInTheDocument()
})
- it('should handle experimental features toggle', async () => {
- const Component = GeneralRoute.component as React.ComponentType
- await act(async () => {
- render( )
- })
-
- const switches = screen.getAllByTestId('switch')
- expect(switches.length).toBeGreaterThan(0)
-
- // Test that switches are interactive
- if (switches.length > 1) {
- await act(async () => {
- fireEvent.click(switches[1])
- })
- expect(switches[1]).toBeInTheDocument()
- }
- })
-
it('should handle huggingface token change', async () => {
const Component = GeneralRoute.component as React.ComponentType
await act(async () => {
@@ -514,16 +486,16 @@ describe('General Settings Route', () => {
act(() => {
fireEvent.click(checkUpdateButton)
})
-
+
// Now the button should be disabled while checking
expect(checkUpdateButton).toBeDisabled()
-
+
// Resolve the promise to finish the update check
await act(async () => {
resolveUpdate!(null)
await updatePromise
})
-
+
// Button should be enabled again
expect(checkUpdateButton).not.toBeDisabled()
}
diff --git a/web-app/src/routes/settings/general.tsx b/web-app/src/routes/settings/general.tsx
index 3ee558ae7..aa93f985a 100644
--- a/web-app/src/routes/settings/general.tsx
+++ b/web-app/src/routes/settings/general.tsx
@@ -46,9 +46,7 @@ import { stopAllModels } from '@/services/models'
import { SystemEvent } from '@/types/events'
import { Input } from '@/components/ui/input'
import { useHardware } from '@/hooks/useHardware'
-import { getConnectedServers } from '@/services/mcp'
-import { invoke } from '@tauri-apps/api/core'
-import { useMCPServers } from '@/hooks/useMCPServers'
+import LanguageSwitcher from '@/containers/LanguageSwitcher'
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export const Route = createFileRoute(route.settings.general as any)({
@@ -60,8 +58,6 @@ function General() {
const {
spellCheckChatInput,
setSpellCheckChatInput,
- experimentalFeatures,
- setExperimentalFeatures,
huggingfaceToken,
setHuggingfaceToken,
} = useGeneralSetting()
@@ -209,38 +205,6 @@ function General() {
}
}, [t, checkForUpdate])
- const handleStopAllMCPServers = async () => {
- try {
- const connectedServers = await getConnectedServers()
-
- // Stop each connected server
- const stopPromises = connectedServers.map((serverName) =>
- invoke('deactivate_mcp_server', { name: serverName }).catch((error) => {
- console.error(`Error stopping MCP server ${serverName}:`, error)
- return Promise.resolve() // Continue with other servers even if one fails
- })
- )
-
- await Promise.all(stopPromises)
-
- // Update server configs to set active: false for stopped servers
- const { mcpServers, editServer } = useMCPServers.getState()
- connectedServers.forEach((serverName) => {
- const serverConfig = mcpServers[serverName]
- if (serverConfig) {
- editServer(serverName, { ...serverConfig, active: false })
- }
- })
-
- if (connectedServers.length > 0) {
- toast.success(`Stopped ${connectedServers.length} MCP server(s)`)
- }
- } catch (error) {
- console.error('Error stopping MCP servers:', error)
- toast.error('Failed to stop MCP servers')
- }
- }
-
return (
@@ -282,10 +246,10 @@ function General() {
}
/>
)}
- {/* }
- /> */}
+ />
{/* Data folder */}
@@ -430,19 +394,6 @@ function General() {
{/* Advanced */}
- {
- await handleStopAllMCPServers()
- setExperimentalFeatures(e)
- }}
- />
- }
- />
{
+ try {
+ const stored = localStorage.getItem(localStorageKey.lastUsedModel)
+ return stored ? JSON.parse(stored) : null
+ } catch (error) {
+ console.debug('Failed to get last used model from localStorage:', error)
+ return null
+ }
+ }
+
+ // Helper function to determine which model to start
+ const getModelToStart = () => {
+ // Use last used model if available
+ const lastUsedModel = getLastUsedModel()
+ if (lastUsedModel) {
+ const provider = getProviderByName(lastUsedModel.provider)
+ if (
+ provider &&
+ provider.models.some((m) => m.id === lastUsedModel.model)
+ ) {
+ return { model: lastUsedModel.model, provider }
+ }
+ }
+
+ // Use selected model if available
+ if (selectedModel && selectedProvider) {
+ const provider = getProviderByName(selectedProvider)
+ if (provider) {
+ return { model: selectedModel.id, provider }
+ }
+ }
+
+ // Use first model from llamacpp provider
+ const llamacppProvider = getProviderByName('llamacpp')
+ if (
+ llamacppProvider &&
+ llamacppProvider.models &&
+ llamacppProvider.models.length > 0
+ ) {
+ return {
+ model: llamacppProvider.models[0].id,
+ provider: llamacppProvider,
+ }
+ }
+
+ return null
+ }
+
const toggleAPIServer = async () => {
// Validate API key before starting server
if (serverStatus === 'stopped') {
@@ -68,19 +122,33 @@ function LocalAPIServer() {
return
}
setShowApiKeyError(false)
- }
- setServerStatus('pending')
- if (serverStatus === 'stopped') {
- window.core?.api
- ?.startServer({
- host: serverHost,
- port: serverPort,
- prefix: apiPrefix,
- apiKey,
- trustedHosts,
- isCorsEnabled: corsEnabled,
- isVerboseEnabled: verboseLogs,
+ const modelToStart = getModelToStart()
+ // Only start server if we have a model to load
+ if (!modelToStart) {
+ console.warn(
+ 'Cannot start Local API Server: No model available to load'
+ )
+ return
+ }
+
+ setServerStatus('pending')
+
+ // Start the model first
+ startModel(modelToStart.provider, modelToStart.model)
+ .then(() => {
+ console.log(`Model ${modelToStart.model} started successfully`)
+
+ // Then start the server
+ return window.core?.api?.startServer({
+ host: serverHost,
+ port: serverPort,
+ prefix: apiPrefix,
+ apiKey,
+ trustedHosts,
+ isCorsEnabled: corsEnabled,
+ isVerboseEnabled: verboseLogs,
+ })
})
.then(() => {
setServerStatus('running')
@@ -90,6 +158,7 @@ function LocalAPIServer() {
setServerStatus('stopped')
})
} else {
+ setServerStatus('pending')
window.core?.api
?.stopServer()
.then(() => {
@@ -199,6 +268,26 @@ function LocalAPIServer() {
/>
+ {/* Startup Configuration */}
+
+ {
+ if (!apiKey || apiKey.toString().trim().length === 0) {
+ setShowApiKeyError(true)
+ return
+ }
+ setEnableOnStartup(checked)
+ }}
+ />
+ }
+ />
+
+
{/* Server Configuration */}
{
@@ -120,6 +121,7 @@ function MCPServers() {
const [loadingServers, setLoadingServers] = useState<{
[key: string]: boolean
}>({})
+ const { setErrorMessage } = useAppState()
const handleOpenDialog = (serverKey?: string) => {
if (serverKey) {
@@ -247,13 +249,13 @@ function MCPServers() {
getConnectedServers().then(setConnectedServers)
})
.catch((error) => {
- console.log(error, 'error.mcp')
editServer(serverKey, {
...(config ?? (mcpServers[serverKey] as MCPServerConfig)),
active: false,
})
- toast.error(error, {
- description: t('mcp-servers:checkParams'),
+ setErrorMessage({
+ message: error,
+ subtitle: t('mcp-servers:checkParams'),
})
})
.finally(() => {
diff --git a/web-app/src/routes/settings/providers/$providerName.tsx b/web-app/src/routes/settings/providers/$providerName.tsx
index 180b42c03..9d456cc40 100644
--- a/web-app/src/routes/settings/providers/$providerName.tsx
+++ b/web-app/src/routes/settings/providers/$providerName.tsx
@@ -22,6 +22,7 @@ import { useTranslation } from '@/i18n/react-i18next-compat'
import Capabilities from '@/containers/Capabilities'
import { DynamicControllerSetting } from '@/containers/dynamicControllerSetting'
import { RenderMarkdown } from '@/containers/RenderMarkdown'
+import { DialogEditModel } from '@/containers/dialogs/EditModel'
import { DialogAddModel } from '@/containers/dialogs/AddModel'
import { ModelSetting } from '@/containers/ModelSetting'
import { DialogDeleteModel } from '@/containers/dialogs/DeleteModel'
@@ -583,6 +584,10 @@ function ProviderDetail() {
}
actions={
+
{model.settings && (
{
expect(result).toEqual(mockRepoData)
expect(fetch).toHaveBeenCalledWith(
- 'https://huggingface.co/api/models/microsoft/DialoGPT-medium?blobs=true',
+ 'https://huggingface.co/api/models/microsoft/DialoGPT-medium?blobs=true&files_metadata=true',
{
headers: {},
}
@@ -344,7 +345,7 @@ describe('models service', () => {
'https://huggingface.co/microsoft/DialoGPT-medium'
)
expect(fetch).toHaveBeenCalledWith(
- 'https://huggingface.co/api/models/microsoft/DialoGPT-medium?blobs=true',
+ 'https://huggingface.co/api/models/microsoft/DialoGPT-medium?blobs=true&files_metadata=true',
{
headers: {},
}
@@ -353,7 +354,7 @@ describe('models service', () => {
// Test with domain prefix
await fetchHuggingFaceRepo('huggingface.co/microsoft/DialoGPT-medium')
expect(fetch).toHaveBeenCalledWith(
- 'https://huggingface.co/api/models/microsoft/DialoGPT-medium?blobs=true',
+ 'https://huggingface.co/api/models/microsoft/DialoGPT-medium?blobs=true&files_metadata=true',
{
headers: {},
}
@@ -362,7 +363,7 @@ describe('models service', () => {
// Test with trailing slash
await fetchHuggingFaceRepo('microsoft/DialoGPT-medium/')
expect(fetch).toHaveBeenCalledWith(
- 'https://huggingface.co/api/models/microsoft/DialoGPT-medium?blobs=true',
+ 'https://huggingface.co/api/models/microsoft/DialoGPT-medium?blobs=true&files_metadata=true',
{
headers: {},
}
@@ -391,7 +392,7 @@ describe('models service', () => {
expect(result).toBeNull()
expect(fetch).toHaveBeenCalledWith(
- 'https://huggingface.co/api/models/nonexistent/model?blobs=true',
+ 'https://huggingface.co/api/models/nonexistent/model?blobs=true&files_metadata=true',
{
headers: {},
}
@@ -845,4 +846,95 @@ describe('models service', () => {
expect(result.quants[0].file_size).toBe('Unknown size')
})
})
+
+ describe('isModelSupported', () => {
+ beforeEach(() => {
+ vi.clearAllMocks()
+ })
+
+ it('should return GREEN when model is fully supported', async () => {
+ const mockEngineWithSupport = {
+ ...mockEngine,
+ isModelSupported: vi.fn().mockResolvedValue('GREEN'),
+ }
+
+ mockEngineManager.get.mockReturnValue(mockEngineWithSupport)
+
+ const result = await isModelSupported('/path/to/model.gguf', 4096)
+
+ expect(result).toBe('GREEN')
+ expect(mockEngineWithSupport.isModelSupported).toHaveBeenCalledWith(
+ '/path/to/model.gguf',
+ 4096
+ )
+ })
+
+ it('should return YELLOW when model weights fit but KV cache does not', async () => {
+ const mockEngineWithSupport = {
+ ...mockEngine,
+ isModelSupported: vi.fn().mockResolvedValue('YELLOW'),
+ }
+
+ mockEngineManager.get.mockReturnValue(mockEngineWithSupport)
+
+ const result = await isModelSupported('/path/to/model.gguf', 8192)
+
+ expect(result).toBe('YELLOW')
+ expect(mockEngineWithSupport.isModelSupported).toHaveBeenCalledWith(
+ '/path/to/model.gguf',
+ 8192
+ )
+ })
+
+ it('should return RED when model is not supported', async () => {
+ const mockEngineWithSupport = {
+ ...mockEngine,
+ isModelSupported: vi.fn().mockResolvedValue('RED'),
+ }
+
+ mockEngineManager.get.mockReturnValue(mockEngineWithSupport)
+
+ const result = await isModelSupported('/path/to/large-model.gguf')
+
+ expect(result).toBe('RED')
+ expect(mockEngineWithSupport.isModelSupported).toHaveBeenCalledWith(
+ '/path/to/large-model.gguf',
+ undefined
+ )
+ })
+
+ it('should return YELLOW as fallback when engine method is not available', async () => {
+ const mockEngineWithoutSupport = {
+ ...mockEngine,
+ // isModelSupported method not available
+ }
+
+ mockEngineManager.get.mockReturnValue(mockEngineWithoutSupport)
+
+ const result = await isModelSupported('/path/to/model.gguf')
+
+ expect(result).toBe('YELLOW')
+ })
+
+ it('should return RED when engine is not available', async () => {
+ mockEngineManager.get.mockReturnValue(null)
+
+ const result = await isModelSupported('/path/to/model.gguf')
+
+ expect(result).toBe('YELLOW') // Should use fallback
+ })
+
+ it('should return RED when there is an error', async () => {
+ const mockEngineWithError = {
+ ...mockEngine,
+ isModelSupported: vi.fn().mockRejectedValue(new Error('Test error')),
+ }
+
+ mockEngineManager.get.mockReturnValue(mockEngineWithError)
+
+ const result = await isModelSupported('/path/to/model.gguf')
+
+ expect(result).toBe('RED')
+ })
+ })
})
diff --git a/web-app/src/services/models.ts b/web-app/src/services/models.ts
index 790620f22..df7dacf00 100644
--- a/web-app/src/services/models.ts
+++ b/web-app/src/services/models.ts
@@ -62,6 +62,11 @@ export interface HuggingFaceRepo {
rfilename: string
size?: number
blobId?: string
+ lfs?: {
+ sha256: string
+ size: number
+ pointerSize: number
+ }
}>
readme?: string
}
@@ -126,7 +131,7 @@ export const fetchHuggingFaceRepo = async (
}
const response = await fetch(
- `https://huggingface.co/api/models/${cleanRepoId}?blobs=true`,
+ `https://huggingface.co/api/models/${cleanRepoId}?blobs=true&files_metadata=true`,
{
headers: hfToken
? {
@@ -237,14 +242,103 @@ export const updateModel = async (
export const pullModel = async (
id: string,
modelPath: string,
- mmprojPath?: string
+ modelSha256?: string,
+ modelSize?: number,
+ mmprojPath?: string,
+ mmprojSha256?: string,
+ mmprojSize?: number
) => {
return getEngine()?.import(id, {
modelPath,
mmprojPath,
+ modelSha256,
+ modelSize,
+ mmprojSha256,
+ mmprojSize,
})
}
+/**
+ * Pull a model with real-time metadata fetching from HuggingFace.
+ * Extracts hash and size information from the model URL for both main model and mmproj files.
+ * @param id The model ID
+ * @param modelPath The model file URL (HuggingFace download URL)
+ * @param mmprojPath Optional mmproj file URL
+ * @param hfToken Optional HuggingFace token for authentication
+ * @returns A promise that resolves when the model download task is created.
+ */
+export const pullModelWithMetadata = async (
+ id: string,
+ modelPath: string,
+ mmprojPath?: string,
+ hfToken?: string
+) => {
+ let modelSha256: string | undefined
+ let modelSize: number | undefined
+ let mmprojSha256: string | undefined
+ let mmprojSize: number | undefined
+
+ // Extract repo ID from model URL
+ // URL format: https://huggingface.co/{repo}/resolve/main/{filename}
+ const modelUrlMatch = modelPath.match(
+ /https:\/\/huggingface\.co\/([^/]+\/[^/]+)\/resolve\/main\/(.+)/
+ )
+
+ if (modelUrlMatch) {
+ const [, repoId, modelFilename] = modelUrlMatch
+
+ try {
+ // Fetch real-time metadata from HuggingFace
+ const repoInfo = await fetchHuggingFaceRepo(repoId, hfToken)
+
+ if (repoInfo?.siblings) {
+ // Find the specific model file
+ const modelFile = repoInfo.siblings.find(
+ (file) => file.rfilename === modelFilename
+ )
+ if (modelFile?.lfs) {
+ modelSha256 = modelFile.lfs.sha256
+ modelSize = modelFile.lfs.size
+ }
+
+ // If mmproj path provided, extract its metadata too
+ if (mmprojPath) {
+ const mmprojUrlMatch = mmprojPath.match(
+ /https:\/\/huggingface\.co\/[^/]+\/[^/]+\/resolve\/main\/(.+)/
+ )
+ if (mmprojUrlMatch) {
+ const [, mmprojFilename] = mmprojUrlMatch
+ const mmprojFile = repoInfo.siblings.find(
+ (file) => file.rfilename === mmprojFilename
+ )
+ if (mmprojFile?.lfs) {
+ mmprojSha256 = mmprojFile.lfs.sha256
+ mmprojSize = mmprojFile.lfs.size
+ }
+ }
+ }
+ }
+ } catch (error) {
+ console.warn(
+ 'Failed to fetch HuggingFace metadata, proceeding without hash verification:',
+ error
+ )
+ // Continue with download even if metadata fetch fails
+ }
+ }
+
+ // Call the original pullModel with the fetched metadata
+ return pullModel(
+ id,
+ modelPath,
+ modelSha256,
+ modelSize,
+ mmprojPath,
+ mmprojSha256,
+ mmprojSize
+ )
+}
+
/**
* Aborts a model download.
* @param id
@@ -485,3 +579,35 @@ export const checkMmprojExists = async (modelId: string): Promise => {
}
return false
}
+
+/**
+ * Checks if a model is supported by analyzing memory requirements and system resources.
+ * @param modelPath - The path to the model file (local path or URL)
+ * @param ctxSize - The context size for the model (default: 4096)
+ * @returns Promise<'RED' | 'YELLOW' | 'GREEN'> - Support status:
+ * - 'RED': Model weights don't fit in available memory
+ * - 'YELLOW': Model weights fit, but KV cache doesn't
+ * - 'GREEN': Both model weights and KV cache fit in available memory
+ */
+export const isModelSupported = async (
+ modelPath: string,
+ ctxSize?: number
+): Promise<'RED' | 'YELLOW' | 'GREEN'> => {
+ try {
+ const engine = getEngine('llamacpp') as AIEngine & {
+ isModelSupported?: (
+ path: string,
+ ctx_size?: number
+ ) => Promise<'RED' | 'YELLOW' | 'GREEN'>
+ }
+ if (engine && typeof engine.isModelSupported === 'function') {
+ return await engine.isModelSupported(modelPath, ctxSize)
+ }
+ // Fallback if method is not available
+ console.warn('isModelSupported method not available in llamacpp engine')
+ return 'YELLOW' // Conservative fallback
+ } catch (error) {
+ console.error(`Error checking model support for ${modelPath}:`, error)
+ return 'RED' // Error state, assume not supported
+ }
+}
diff --git a/web-app/src/utils/__tests__/formatDate.test.ts b/web-app/src/utils/__tests__/formatDate.test.ts
index 1c36b1846..296d95da6 100644
--- a/web-app/src/utils/__tests__/formatDate.test.ts
+++ b/web-app/src/utils/__tests__/formatDate.test.ts
@@ -38,7 +38,7 @@ describe('formatDate', () => {
'2023-12-01T12:00:00Z'
]
- const formatted = dates.map(formatDate)
+ const formatted = dates.map((d) => formatDate(d))
expect(formatted[0]).toMatch(/Jan.*1.*2023/i)
expect(formatted[1]).toMatch(/Feb.*1.*2023/i)
@@ -81,4 +81,23 @@ describe('formatDate', () => {
// Should include abbreviated month name
expect(formatted).toMatch(/Jul/i)
})
+
+ it('supports date-only formatting when includeTime=false', () => {
+ const date = '2023-07-04T12:00:00Z'
+ const formatted = formatDate(date, { includeTime: false })
+
+ // Long month, no time
+ expect(formatted).toMatch(/July.*4.*2023/i)
+ expect(formatted).not.toMatch(/\d{1,2}:\d{2}/i)
+ expect(formatted).not.toMatch(/(AM|PM)/i)
+ })
+
+ it('date-only formatting includes a year and omits time across edge cases', () => {
+ const oldDate = '1900-01-01T00:00:00Z'
+ const formatted = formatDate(oldDate, { includeTime: false })
+
+ expect(formatted).toMatch(/\d{4}/)
+ expect(formatted).not.toMatch(/\d{1,2}:\d{2}/i)
+ expect(formatted).not.toMatch(/(AM|PM)/i)
+ })
})
\ No newline at end of file
diff --git a/web-app/src/utils/formatDate.ts b/web-app/src/utils/formatDate.ts
index 5f6547e07..c77f20097 100644
--- a/web-app/src/utils/formatDate.ts
+++ b/web-app/src/utils/formatDate.ts
@@ -1,10 +1,34 @@
-export const formatDate = (date: string | number | Date): string => {
- return new Date(date).toLocaleString('en-US', {
+type FormatDateOptions = {
+ includeTime?: boolean
+}
+
+export const formatDate = (
+ date: string | number | Date,
+ options?: FormatDateOptions
+): string => {
+ const includeTime = options?.includeTime ?? true
+
+ // Base options shared across both modes
+ const base: Intl.DateTimeFormatOptions = {
year: 'numeric',
- month: 'short',
day: 'numeric',
- hour: 'numeric',
- minute: 'numeric',
- hour12: true,
+ }
+
+ if (includeTime) {
+ // Time mode: short month + time, fixed UTC for stable output in tests
+ return new Date(date).toLocaleString('en-US', {
+ ...base,
+ month: 'short',
+ hour: 'numeric',
+ minute: 'numeric',
+ hour12: true,
+ timeZone: 'UTC',
+ })
+ }
+
+ // Date-only mode: long month, no timezone adjustment
+ return new Date(date).toLocaleDateString('en-US', {
+ ...base,
+ month: 'long',
})
}
|