llmconfig 0.0.2 → 0.0.4

package/dist/index.d.mts

@@ -11,19 +11,14 @@ declare const LLMBilities: readonly ["text", "image", "image_modify", "video", "
 //#endregion
 //#region src/types/llmconfig.d.ts
 type LLMBility = typeof LLMBilities[number];
-interface LLMProvider {
-  id: string;
-  name: string;
-  apiKey: string;
-  createdAt: number;
-  baseUrl?: string;
-}
 /**
  * LLM配置接口
  */
 interface LLMConfig {
   id: string;
-  pid: string;
+  provider: string;
+  apiKey: string;
+  baseUrl?: string;
   model: string;
   bility: LLMBility;
   createdAt: number;
@@ -114,12 +109,11 @@ type WrapperPredicate = (wrapper: ILLMWrapper) => boolean;
 declare class Manager {
   #private;
   get configs(): LLMConfig[];
-  get providers(): LLMProvider[];
   get wrappers(): ILLMWrapper[];
   getWrapper(id: string): ILLMWrapper | undefined;
   filterWrapper(pred: WrapperPredicate): ILLMWrapper[];
   findWrapper(pred: WrapperPredicate): ILLMWrapper | undefined;
-  reLoad(models: LLMConfig[], provides: LLMProvider[]): void;
+  reLoad(models: LLMConfig[]): void;
   upsertWrapper(cfg: LLMConfig): boolean;
   delWrapper(id: string): void;
   private getMatchingWrapper;
@@ -132,16 +126,13 @@ declare class Manager {
 declare class Library extends Manager {
   #private;
   get modelTable(): Table<LLMConfig>;
-  get providerTable(): Table<LLMProvider>;
-  init(models: Table<LLMConfig>, providers: Table<LLMProvider>): Promise<void>;
+  init(models: Table<LLMConfig>): Promise<void>;
   upsertModel(cfg: LLMConfig): Promise<boolean>;
   delModel(id: string): Promise<void>;
-  upsertProvider(provider: LLMProvider): Promise<boolean>;
-  delProvider(pid: string): Promise<void>;
 }
 declare const llmcfgInst: Library;
 //#endregion
 //#region src/wrapper/providers.d.ts
-declare function listModels(provider: LLMProvider): Promise<string[]>;
+declare function listModels(config: LLMConfig): Promise<string[]>;
 //#endregion
-export { type CallResult, type GenerateObjectOptions, type GenerateObjectResult, type ILLMWrapper, type ITextLLMWrapper, type JSONCallResult, LLMBilities, type LLMBility, type LLMConfig, type LLMProvider, TableSchema, llmcfgInst as default, llmcfgInst, listModels };
+export { type CallResult, type GenerateObjectOptions, type GenerateObjectResult, type ILLMWrapper, type ITextLLMWrapper, type JSONCallResult, LLMBilities, type LLMBility, type LLMConfig, TableSchema, llmcfgInst as default, llmcfgInst, listModels };

package/dist/index.mjs

@@ -131,12 +131,12 @@ const PROVIDER_CONFIG = {
 	}
 };
 const ProviderNames = Object.keys(PROVIDER_CONFIG);
-async function listModels(provider) {
-	const providerConfig = PROVIDER_CONFIG[provider.name];
-	if (!providerConfig) throw new Error(`不支持的提供商: ${provider.name}`);
+async function listModels(config) {
+	const providerConfig = PROVIDER_CONFIG[config.provider];
+	if (!providerConfig) throw new Error(`不支持的提供商: ${config.provider}`);
 	const baseURL = providerConfig.baseURL.trim();
 	const response = await fetch(`${baseURL}/models`, { headers: {
-		"Authorization": `Bearer ${provider.apiKey}`,
+		"Authorization": `Bearer ${config.apiKey}`,
 		"Content-Type": "application/json"
 	} });
 	if (!response.ok) throw new Error(`获取模型列表失败: ${response.statusText}`);
@@ -152,18 +152,18 @@ var ModelFactory = class {
 	/**
 	* 创建 AI SDK 模型实例
 	*/
-	static createModel(config, provider) {
-		const constProvider = PROVIDER_CONFIG[provider.name];
-		if (!constProvider) throw new Error(`不支持的提供商: ${config.pid}`);
+	static createModel(config) {
+		const constProvider = PROVIDER_CONFIG[config.provider];
+		if (!constProvider) throw new Error(`不支持的提供商: ${config.provider}`);
 		const modelName = config.model.trim();
-		const apiKey = provider.apiKey;
+		const apiKey = config.apiKey;
 		const baseURL = constProvider.baseURL?.trim();
 		const protocol = constProvider.protocal || "openai";
 		try {
 			return this.createModelByProtocol(protocol, modelName, apiKey, baseURL);
 		} catch (error) {
-			console.error(`创建模型失败 (${config.pid}):`, error);
-			throw new Error(`无法创建模型: ${config.pid} - ${modelName}`);
+			console.error(`创建模型失败 (${config.provider}):`, error);
+			throw new Error(`无法创建模型: ${config.provider} - ${modelName}`);
 		}
 	}
 	/**
@@ -264,10 +264,9 @@ var TextWrapper = class {
 	get callCount() {
 		return this.#callCount;
 	}
-	constructor(config, provider) {
+	constructor(config) {
 		this.config = config;
-		this.provider = provider;
-		this.model = ModelFactory.createModel(config, provider);
+		this.model = ModelFactory.createModel(config);
 	}
 	/**
 	* 将输入转换为消息格式
@@ -438,10 +437,10 @@ var WrapperFactory = class {
 	/**
 	* 根据 tag 创建相应的包装器
 	*/
-	static createWrapper(config, provider) {
+	static createWrapper(config) {
 		const bility = this.getModelTypeFromTag(config.bility);
 		switch (bility) {
-			case "text": return new TextWrapper(config, provider);
+			case "text": return new TextWrapper(config);
 			case "image": break;
 		}
 		throw new Error(`不支持的模型标签: ${bility}`);
@@ -465,14 +464,10 @@ const CallError = {
 	error: /* @__PURE__ */ new Error("Not Found or All Error")
 };
 var Manager = class {
-	#providers = [];
 	#wrappers = /* @__PURE__ */ new Map();
 	get configs() {
 		return Array.from(this.#wrappers.values()).map((wrapper) => wrapper.getConfig());
 	}
-	get providers() {
-		return this.#providers;
-	}
 	get wrappers() {
 		return Array.from(this.#wrappers.values());
 	}
@@ -485,8 +480,7 @@ var Manager = class {
 	findWrapper(pred) {
 		return Array.from(this.#wrappers.values()).find(pred);
 	}
-	reLoad(models, provides) {
-		this.#providers = [...provides];
+	reLoad(models) {
 		this.#wrappers.clear();
 		models.forEach((model) => {
 			this.upsertWrapper(model);
@@ -495,9 +489,7 @@ var Manager = class {
 	upsertWrapper(cfg) {
 		if (this.#wrappers.has(cfg.id)) this.#wrappers.delete(cfg.id);
 		if (!cfg.enabled) return true;
-		const provider = this.#providers.find((p) => p.id === cfg.pid);
-		if (!provider) return false;
-		const wrapper = WrapperFactory.createWrapper(cfg, provider);
+		const wrapper = WrapperFactory.createWrapper(cfg);
 		this.#wrappers.set(cfg.id, wrapper);
 		return true;
 	}
@@ -540,19 +532,13 @@ var Manager = class {
 //#region src/library.ts
 var Library = class extends Manager {
 	#modelTable;
-	#providerTable;
 	get modelTable() {
 		return this.#modelTable;
 	}
-	get providerTable() {
-		return this.#providerTable;
-	}
-	async init(models, providers) {
+	async init(models) {
 		this.#modelTable = models;
-		this.#providerTable = providers;
 		const allModels = await models.toArray();
-		const allProviders = await providers.toArray();
-		super.reLoad(allModels, allProviders);
+		super.reLoad(allModels);
 	}
 	async upsertModel(cfg) {
 		if (!super.upsertWrapper(cfg)) return false;
@@ -562,32 +548,6 @@ var Library = class extends Manager {
 		super.delWrapper(id);
 		await this.#modelTable.delete(id);
 	}
-	async upsertProvider(provider) {
-		const idx = super.providers.findIndex((p) => p.id === provider.id);
-		await this.#providerTable.put(provider);
-		if (idx >= 0) {
-			super.providers[idx] = { ...provider };
-			super.configs.filter((cfg) => cfg.pid === provider.id).forEach((model) => {
-				super.upsertWrapper(model);
-			});
-		} else super.providers.push({ ...provider });
-		return true;
-	}
-	async delProvider(pid) {
-		const idx = super.providers.findIndex((p) => p.id === pid);
-		if (idx !== -1) {
-			await this.#providerTable.delete(pid);
-			super.providers.splice(idx, 1);
-			const affectModels = super.configs.filter((cfg) => cfg.pid === pid);
-			if (affectModels.length > 0) {
-				const ids = affectModels.map((model) => {
-					super.delWrapper(model.id);
-					return model.id;
-				});
-				await this.#modelTable.bulkDelete(ids);
-			}
-		}
-	}
 };
 const llmcfgInst = new Library();
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "llmconfig",
   "type": "module",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "基于@ai-sdk,允许封装多个llm provider.使得配置与调用分离。",
   "author": "lizhutang",
   "license": "MIT",