refactor: openaiContentGenerator

packages/core/src/qwen/qwenContentGenerator.test.ts

@@ -22,7 +22,7 @@ import {
 import { QwenContentGenerator } from './qwenContentGenerator.js';
 import { SharedTokenManager } from './sharedTokenManager.js';
 import { Config } from '../config/config.js';
-import { AuthType, ContentGeneratorConfig } from '../core/contentGenerator.js';
+import { AuthType } from '../core/contentGenerator.js';
 
 // Mock SharedTokenManager
 vi.mock('./sharedTokenManager.js', () => ({
@@ -132,20 +132,21 @@ vi.mock('./sharedTokenManager.js', () => ({
 }));
 
 // Mock the OpenAIContentGenerator parent class
-vi.mock('../core/openaiContentGenerator.js', () => ({
+vi.mock('../core/refactor/openaiContentGenerator.js', () => ({
   OpenAIContentGenerator: class {
-    client: {
-      apiKey: string;
-      baseURL: string;
+    pipeline: {
+      client: {
+        apiKey: string;
+        baseURL: string;
+      };
     };
 
-    constructor(
-      contentGeneratorConfig: ContentGeneratorConfig,
-      _config: Config,
-    ) {
-      this.client = {
-        apiKey: contentGeneratorConfig.apiKey || 'test-key',
-        baseURL: contentGeneratorConfig.baseUrl || 'https://api.openai.com/v1',
+    constructor(_config: Config, _provider: unknown) {
+      this.pipeline = {
+        client: {
+          apiKey: 'test-key',
+          baseURL: 'https://api.openai.com/v1',
+        },
       };
     }
 
@@ -220,7 +221,10 @@ describe('QwenContentGenerator', () => {
     // Mock Config
     mockConfig = {
       getContentGeneratorConfig: vi.fn().mockReturnValue({
+        model: 'qwen-turbo',
+        apiKey: 'test-api-key',
         authType: 'qwen',
+        baseUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1',
         enableOpenAILogging: false,
         timeout: 120000,
         maxRetries: 3,
@@ -230,6 +234,9 @@ describe('QwenContentGenerator', () => {
           top_p: 0.9,
         },
       }),
+      getCliVersion: vi.fn().mockReturnValue('1.0.0'),
+      getSessionId: vi.fn().mockReturnValue('test-session-id'),
+      getUsageStatisticsEnabled: vi.fn().mockReturnValue(false),
     } as unknown as Config;
 
     // Mock QwenOAuth2Client
@@ -245,7 +252,11 @@ describe('QwenContentGenerator', () => {
     // Create QwenContentGenerator instance
     const contentGeneratorConfig = {
       model: 'qwen-turbo',
+      apiKey: 'test-api-key',
       authType: AuthType.QWEN_OAUTH,
+      baseUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1',
+      timeout: 120000,
+      maxRetries: 3,
     };
     qwenContentGenerator = new QwenContentGenerator(
       mockQwenClient,

packages/core/src/qwen/qwenContentGenerator.ts

@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { OpenAIContentGenerator } from '../core/openaiContentGenerator.js';
+import { OpenAIContentGenerator } from '../core/refactor/openaiContentGenerator.js';
+import { DashScopeOpenAICompatibleProvider } from '../core/refactor/provider/dashscope.js';
 import { IQwenOAuth2Client } from './qwenOAuth2.js';
 import { SharedTokenManager } from './sharedTokenManager.js';
 import { Config } from '../config/config.js';
@@ -33,15 +34,24 @@ export class QwenContentGenerator extends OpenAIContentGenerator {
   constructor(
     qwenClient: IQwenOAuth2Client,
     contentGeneratorConfig: ContentGeneratorConfig,
-    config: Config,
+    cliConfig: Config,
   ) {
-    // Initialize with empty API key, we'll override it dynamically
-    super(contentGeneratorConfig, config);
+    // Create DashScope provider for Qwen
+    const dashscopeProvider = new DashScopeOpenAICompatibleProvider(
+      contentGeneratorConfig,
+      cliConfig,
+    );
+
+    // Initialize with DashScope provider
+    super(contentGeneratorConfig, cliConfig, dashscopeProvider);
     this.qwenClient = qwenClient;
     this.sharedManager = SharedTokenManager.getInstance();
 
     // Set default base URL, will be updated dynamically
-    this.client.baseURL = DEFAULT_QWEN_BASE_URL;
+    if (contentGeneratorConfig?.baseUrl && contentGeneratorConfig?.apiKey) {
+      this.pipeline.client.baseURL = contentGeneratorConfig?.baseUrl;
+      this.pipeline.client.apiKey = contentGeneratorConfig?.apiKey;
+    }
   }
 
   /**
@@ -106,46 +116,24 @@ export class QwenContentGenerator extends OpenAIContentGenerator {
    * Execute an operation with automatic credential management and retry logic.
    * This method handles:
    * - Dynamic token and endpoint retrieval
-   * - Temporary client configuration updates
-   * - Automatic restoration of original configuration
+   * - Client configuration updates
    * - Retry logic on authentication errors with token refresh
    *
    * @param operation - The operation to execute with updated client configuration
-   * @param restoreOnCompletion - Whether to restore original config after operation completes
    * @returns The result of the operation
    */
   private async executeWithCredentialManagement<T>(
     operation: () => Promise<T>,
-    restoreOnCompletion: boolean = true,
   ): Promise<T> {
     // Attempt the operation with credential management and retry logic
     const attemptOperation = async (): Promise<T> => {
       const { token, endpoint } = await this.getValidToken();
 
-      // Store original configuration
-      const originalApiKey = this.client.apiKey;
-      const originalBaseURL = this.client.baseURL;
-
       // Apply dynamic configuration
-      this.client.apiKey = token;
-      this.client.baseURL = endpoint;
+      this.pipeline.client.apiKey = token;
+      this.pipeline.client.baseURL = endpoint;
 
-      try {
-        const result = await operation();
-
-        // For streaming operations, we may need to keep the configuration active
-        if (restoreOnCompletion) {
-          this.client.apiKey = originalApiKey;
-          this.client.baseURL = originalBaseURL;
-        }
-
-        return result;
-      } catch (error) {
-        // Always restore on error
-        this.client.apiKey = originalApiKey;
-        this.client.baseURL = originalBaseURL;
-        throw error;
-      }
+      return await operation();
     };
 
     // Execute with retry logic for auth errors
@@ -182,17 +170,14 @@ export class QwenContentGenerator extends OpenAIContentGenerator {
   }
 
   /**
-   * Override to use dynamic token and endpoint with automatic retry.
-   * Note: For streaming, the client configuration is not restored immediately
-   * since the generator may continue to be used after this method returns.
+   * Override to use dynamic token and endpoint with automatic retry
    */
   override async generateContentStream(
     request: GenerateContentParameters,
     userPromptId: string,
   ): Promise<AsyncGenerator<GenerateContentResponse>> {
-    return this.executeWithCredentialManagement(
-      () => super.generateContentStream(request, userPromptId),
-      false, // Don't restore immediately for streaming
+    return this.executeWithCredentialManagement(() =>
+      super.generateContentStream(request, userPromptId),
     );
   }