Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions extensions/inference-cortex-extension/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ export default class JanInferenceCortexExtension extends LocalOAIEngine {
},
},
])
this.updateCortexConfig({
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider awaiting the asynchronous call to updateCortexConfig. Without await, localStorage marking migration as complete may occur before the config update finishes, potentially hiding backend update errors.

Suggested change
this.updateCortexConfig({
await this.updateCortexConfig({

huggingface_token: config.huggingface_token,
})
localStorage.setItem('cortex_migration_completed', 'true')
}
}
Expand Down
2 changes: 0 additions & 2 deletions web-app/src/providers/DataProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { useMCPServers } from '@/hooks/useMCPServers'
import { getMCPConfig } from '@/services/mcp'
import { useAssistant } from '@/hooks/useAssistant'
import { getAssistants } from '@/services/assistants'
import { migrateData } from '@/utils/migration'
import {
onOpenUrl,
getCurrent as getCurrentDeepLinkUrls,
Expand Down Expand Up @@ -45,7 +44,6 @@ export function DataProvider() {
.catch((error) => {
console.warn('Failed to load assistants, keeping default:', error)
})
migrateData()
getCurrentDeepLinkUrls().then(handleDeepLink)
onOpenUrl(handleDeepLink)
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand Down
39 changes: 38 additions & 1 deletion web-app/src/services/providers.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,52 @@
import { models as providerModels } from 'token.js'
import { mockModelProvider } from '@/mock/data'
import { EngineManager, SettingComponentProps } from '@janhq/core'
import {
EngineManagementExtension,
EngineManager,
ExtensionTypeEnum,
SettingComponentProps,
} from '@janhq/core'
import { ModelCapabilities } from '@/types/models'
import { modelSettings } from '@/lib/predefined'
import { fetchModels } from './models'
import { ExtensionManager } from '@/lib/extension'

export const getProviders = async (): Promise<ModelProvider[]> => {
const engines = !localStorage.getItem('migration_completed')
? await ExtensionManager.getInstance()
.get<EngineManagementExtension>(ExtensionTypeEnum.Engine)
?.getEngines()
: {}
const builtinProviders = mockModelProvider.map((provider) => {
let models = provider.models as Model[]
if (Object.keys(providerModels).includes(provider.provider)) {
const builtInModels = providerModels[
provider.provider as unknown as keyof typeof providerModels
].models as unknown as string[]

if (engines && Object.keys(engines).length > 0) {
for (const [key, value] of Object.entries(engines)) {
const providerName = key.replace('google_gemini', 'gemini')
if (provider.provider !== providerName) continue
const engine = value[0] as
| {
api_key?: string
url?: string
engine?: string
}
| undefined
if (engine && 'api_key' in engine) {
const settings = provider?.settings.map((e) => {
if (e.key === 'api-key')
e.controller_props.value = (engine.api_key as string) ?? ''
return e
})

provider.settings = settings
}
}
}

if (Array.isArray(builtInModels))
models = builtInModels.map((model) => {
const modelManifest = models.find((e) => e.id === model)
Expand All @@ -33,11 +66,15 @@ export const getProviders = async (): Promise<ModelProvider[]> => {
} as Model
})
}

return {
...provider,
models,
}
})
if (engines && Object.keys(engines).length > 0) {
localStorage.setItem('migration_completed', 'true')
}

const runtimeProviders: ModelProvider[] = []

Expand Down
68 changes: 0 additions & 68 deletions web-app/src/utils/migration.ts

This file was deleted.

Loading