Skip to content

feat(provider): enhance plugin transformer support for [transformerName, options] format #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(provider): enhance plugin transformer support for [transformerName, options] format #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 29 additions & 23 deletions src/services/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TransformerConstructor } from "@/types/transformer";
import { Transformer, TransformerConstructor } from "@/types/transformer";
import {
LLMProvider,
RegisterProviderRequest,
Expand Down Expand Up @@ -40,36 +40,42 @@ export class ProviderService {

const transformer: LLMProvider["transformer"] = {}

const processTransformerArray = (transformers: (string | Array<any>)[]): (Transformer | TransformerConstructor | undefined)[] => {
return transformers.map((transformerItem) => {
// 处理 [transformerName, options] 格式
if (Array.isArray(transformerItem) && typeof transformerItem[0] === 'string') {
const [transformerName, options] = transformerItem;
const retrievedItem = this.transformerService.getTransformer(transformerName);
if (retrievedItem) {
const constructor = (retrievedItem instanceof Function ? retrievedItem : retrievedItem.constructor) as TransformerConstructor;
try {
return new constructor(options);
} catch (error) {
log(`Error re-instantiating transformer ${transformerName}:`, error);
return undefined;
}
}
}
// 处理字符串格式
if (typeof transformerItem === 'string') {
return this.transformerService.getTransformer(transformerItem);
}
return undefined;
});
};

if (providerConfig.transformer) {
Object.keys(providerConfig.transformer).forEach(key => {
if (key === 'use') {
if (Array.isArray(providerConfig.transformer.use)) {
transformer.use = providerConfig.transformer.use.map((transformer) => {
if (Array.isArray(transformer) && typeof transformer[0] === 'string') {
const Constructor = this.transformerService.getTransformer(transformer[0]);
if (Constructor) {
return new (Constructor as TransformerConstructor)(transformer[1]);
}
}
if (typeof transformer === 'string') {
return this.transformerService.getTransformer(transformer);
}
}).filter((transformer) => typeof transformer !== 'undefined');
const processedTransformers = processTransformerArray(providerConfig.transformer.use);
transformer.use = processedTransformers.filter((t): t is Transformer => t !== undefined);
}
} else {
if (Array.isArray(providerConfig.transformer[key]?.use)) {
const processedTransformers = processTransformerArray(providerConfig.transformer[key].use);
transformer[key] = {
use: providerConfig.transformer[key].use.map((transformer) => {
if (Array.isArray(transformer) && typeof transformer[0] === 'string') {
const Constructor = this.transformerService.getTransformer(transformer[0]);
if (Constructor) {
return new (Constructor as TransformerConstructor)(transformer[1]);
}
}
if (typeof transformer === 'string') {
return this.transformerService.getTransformer(transformer);
}
}).filter((transformer) => typeof transformer !== 'undefined')
use: processedTransformers.filter((t): t is Transformer => t !== undefined)
}
}
}
Expand Down