mirror of
https://github.com/stackblitz-labs/bolt.diy
synced 2025-06-26 18:26:38 +00:00
fix Removed circular dependency by removing the import of LLMManager from BaseProvider
This commit is contained in:
parent
9b46d0b892
commit
ffd15746c5
@ -2,7 +2,6 @@ import type { LanguageModelV1 } from 'ai';
|
||||
import type { ProviderInfo, ProviderConfig, ModelInfo } from './types';
|
||||
import type { IProviderSetting } from '~/types/model';
|
||||
import { createOpenAI } from '@ai-sdk/openai';
|
||||
import { LLMManager } from './manager';
|
||||
|
||||
export abstract class BaseProvider implements ProviderInfo {
|
||||
abstract name: string;
|
||||
@ -26,7 +25,6 @@ export abstract class BaseProvider implements ProviderInfo {
|
||||
}) {
|
||||
const { apiKeys, providerSettings, serverEnv, defaultBaseUrlKey, defaultApiTokenKey } = options;
|
||||
let settingsBaseUrl = providerSettings?.baseUrl;
|
||||
const manager = LLMManager.getInstance();
|
||||
|
||||
if (settingsBaseUrl && settingsBaseUrl.length == 0) {
|
||||
settingsBaseUrl = undefined;
|
||||
@ -37,7 +35,6 @@ export abstract class BaseProvider implements ProviderInfo {
|
||||
settingsBaseUrl ||
|
||||
serverEnv?.[baseUrlKey] ||
|
||||
process?.env?.[baseUrlKey] ||
|
||||
manager.env?.[baseUrlKey] ||
|
||||
this.config.baseUrl;
|
||||
|
||||
if (baseUrl && baseUrl.endsWith('/')) {
|
||||
@ -46,7 +43,7 @@ export abstract class BaseProvider implements ProviderInfo {
|
||||
|
||||
const apiTokenKey = this.config.apiTokenKey || defaultApiTokenKey;
|
||||
const apiKey =
|
||||
apiKeys?.[this.name] || serverEnv?.[apiTokenKey] || process?.env?.[apiTokenKey] || manager.env?.[apiTokenKey];
|
||||
apiKeys?.[this.name] || serverEnv?.[apiTokenKey] || process?.env?.[apiTokenKey];
|
||||
|
||||
return {
|
||||
baseUrl,
|
||||
|
Loading…
Reference in New Issue
Block a user