@anh3d0nic/qwen-code-termux-ice 21.0.1 → 21.2.0

package/core-dist/src/core/openaiContentGenerator/openaiContentGenerator.d.ts

@@ -0,0 +1,22 @@
+import type { ContentGenerator } from '../contentGenerator.js';
+import type { Config } from '../../config/config.js';
+import { type OpenAICompatibleProvider } from './provider/index.js';
+import type { CountTokensParameters, CountTokensResponse, EmbedContentParameters, EmbedContentResponse, GenerateContentParameters, GenerateContentResponse } from '@google/genai';
+import { ContentGenerationPipeline } from './pipeline.js';
+import type { ContentGeneratorConfig } from '../contentGenerator.js';
+export declare class OpenAIContentGenerator implements ContentGenerator {
+    protected pipeline: ContentGenerationPipeline;
+    constructor(contentGeneratorConfig: ContentGeneratorConfig, cliConfig: Config, provider: OpenAICompatibleProvider);
+    /**
+     * Hook for subclasses to customize error handling behavior
+     * @param error The error that occurred
+     * @param request The original request
+     * @returns true if error logging should be suppressed, false otherwise
+     */
+    protected shouldSuppressErrorLogging(error: unknown, request: GenerateContentParameters): boolean;
+    generateContent(request: GenerateContentParameters, userPromptId: string): Promise<GenerateContentResponse>;
+    generateContentStream(request: GenerateContentParameters, userPromptId: string): Promise<AsyncGenerator<GenerateContentResponse>>;
+    countTokens(request: CountTokensParameters): Promise<CountTokensResponse>;
+    embedContent(request: EmbedContentParameters): Promise<EmbedContentResponse>;
+    useSummarizedThinking(): boolean;
+}

package/core-dist/src/core/openaiContentGenerator/openaiContentGenerator.js

@@ -0,0 +1,117 @@
+import {} from './provider/index.js';
+import { ContentGenerationPipeline } from './pipeline.js';
+import { EnhancedErrorHandler } from './errorHandler.js';
+import { RequestTokenEstimator } from '../../utils/request-tokenizer/index.js';
+import { isAbortError } from '../../utils/errors.js';
+import { createDebugLogger } from '../../utils/debugLogger.js';
+const debugLogger = createDebugLogger('OPENAI');
+export class OpenAIContentGenerator {
+    pipeline;
+    constructor(contentGeneratorConfig, cliConfig, provider) {
+        // Create pipeline configuration
+        const pipelineConfig = {
+            cliConfig,
+            provider,
+            contentGeneratorConfig,
+            errorHandler: new EnhancedErrorHandler((error, request) => this.shouldSuppressErrorLogging(error, request)),
+        };
+        this.pipeline = new ContentGenerationPipeline(pipelineConfig);
+    }
+    /**
+     * Hook for subclasses to customize error handling behavior
+     * @param error The error that occurred
+     * @param request The original request
+     * @returns true if error logging should be suppressed, false otherwise
+     */
+    shouldSuppressErrorLogging(error, request) {
+        // Only suppress error logging for user-initiated cancellations.
+        // We check that BOTH:
+        // 1. The error is an AbortError
+        // 2. AND our abort signal was explicitly aborted (user-initiated)
+        //
+        // This ensures we don't suppress network-related abort errors that
+        // the user should be aware of.
+        if (isAbortError(error) && request.config?.abortSignal?.aborted) {
+            return true;
+        }
+        return false;
+    }
+    async generateContent(request, userPromptId) {
+        return this.pipeline.execute(request, userPromptId);
+    }
+    async generateContentStream(request, userPromptId) {
+        return this.pipeline.executeStream(request, userPromptId);
+    }
+    async countTokens(request) {
+        try {
+            // Use the request token estimator (character-based).
+            const estimator = new RequestTokenEstimator();
+            const result = await estimator.calculateTokens(request);
+            return {
+                totalTokens: result.totalTokens,
+            };
+        }
+        catch (error) {
+            debugLogger.warn('Failed to calculate tokens with new tokenizer, falling back to simple method:', error);
+            // Fallback to original simple method
+            const content = JSON.stringify(request.contents);
+            const totalTokens = Math.ceil(content.length / 4); // Rough estimate: 1 token ≈ 4 characters
+            return {
+                totalTokens,
+            };
+        }
+    }
+    async embedContent(request) {
+        // Extract text from contents
+        let text = '';
+        if (Array.isArray(request.contents)) {
+            text = request.contents
+                .map((content) => {
+                if (typeof content === 'string')
+                    return content;
+                if ('parts' in content && content.parts) {
+                    return content.parts
+                        .map((part) => typeof part === 'string'
+                        ? part
+                        : 'text' in part
+                            ? part.text || ''
+                            : '')
+                        .join(' ');
+                }
+                return '';
+            })
+                .join(' ');
+        }
+        else if (request.contents) {
+            if (typeof request.contents === 'string') {
+                text = request.contents;
+            }
+            else if ('parts' in request.contents && request.contents.parts) {
+                text = request.contents.parts
+                    .map((part) => typeof part === 'string' ? part : 'text' in part ? part.text : '')
+                    .join(' ');
+            }
+        }
+        try {
+            const embedding = await this.pipeline.client.embeddings.create({
+                model: 'text-embedding-ada-002', // Default embedding model
+                input: text,
+            });
+            return {
+                embeddings: [
+                    {
+                        values: embedding.data[0].embedding,
+                    },
+                ],
+            };
+        }
+        catch (error) {
+            debugLogger.error('OpenAI API Embedding Error:', error);
+            throw new Error(`OpenAI API error: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    useSummarizedThinking() {
+        return false;
+    }
+}
+//# sourceMappingURL=openaiContentGenerator.js.map

package/core-dist/src/core/openaiContentGenerator/openaiContentGenerator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openaiContentGenerator.js","sourceRoot":"","sources":["../../../../src/core/openaiContentGenerator/openaiContentGenerator.ts"],"names":[],"mappings":"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"}

package/core-dist/src/core/openaiContentGenerator/openaiContentGenerator.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/core-dist/src/core/openaiContentGenerator/openaiContentGenerator.test.js

@@ -0,0 +1,298 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+// Mock the request tokenizer module BEFORE importing the class that uses it
+const mockTokenizer = {
+    calculateTokens: vi.fn().mockResolvedValue({
+        totalTokens: 50,
+        breakdown: {
+            textTokens: 50,
+            imageTokens: 0,
+            audioTokens: 0,
+            otherTokens: 0,
+        },
+        processingTime: 1,
+    }),
+    dispose: vi.fn(),
+};
+vi.mock('../../../utils/request-tokenizer/index.js', () => ({
+    RequestTokenEstimator: vi.fn(() => mockTokenizer),
+}));
+// Now import the modules that depend on the mocked modules
+import { OpenAIContentGenerator } from './openaiContentGenerator.js';
+import { AuthType } from '../contentGenerator.js';
+describe('OpenAIContentGenerator (Refactored)', () => {
+    let generator;
+    let mockConfig;
+    beforeEach(() => {
+        // Reset mocks
+        vi.clearAllMocks();
+        // Mock config
+        mockConfig = {
+            getContentGeneratorConfig: vi.fn().mockReturnValue({
+                authType: 'openai',
+                enableOpenAILogging: false,
+                timeout: 120000,
+                maxRetries: 3,
+                samplingParams: {
+                    temperature: 0.7,
+                    max_tokens: 1000,
+                    top_p: 0.9,
+                },
+            }),
+            getCliVersion: vi.fn().mockReturnValue('1.0.0'),
+        };
+        // Create generator instance
+        const contentGeneratorConfig = {
+            model: 'gpt-4',
+            apiKey: 'test-key',
+            authType: AuthType.USE_OPENAI,
+            enableOpenAILogging: false,
+            timeout: 120000,
+            maxRetries: 3,
+            samplingParams: {
+                temperature: 0.7,
+                max_tokens: 1000,
+                top_p: 0.9,
+            },
+        };
+        // Create a minimal mock provider
+        const mockProvider = {
+            buildHeaders: vi.fn().mockReturnValue({}),
+            buildClient: vi.fn().mockReturnValue({
+                chat: {
+                    completions: {
+                        create: vi.fn(),
+                    },
+                },
+                embeddings: {
+                    create: vi.fn(),
+                },
+            }),
+            buildRequest: vi.fn().mockImplementation((req) => req),
+            getDefaultGenerationConfig: vi.fn().mockReturnValue({}),
+        };
+        generator = new OpenAIContentGenerator(contentGeneratorConfig, mockConfig, mockProvider);
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+    });
+    describe('constructor', () => {
+        it('should initialize with basic configuration', () => {
+            expect(generator).toBeDefined();
+        });
+    });
+    describe('generateContent', () => {
+        it('should delegate to pipeline.execute', async () => {
+            // This test verifies the method exists and can be called
+            expect(typeof generator.generateContent).toBe('function');
+        });
+    });
+    describe('generateContentStream', () => {
+        it('should delegate to pipeline.executeStream', async () => {
+            // This test verifies the method exists and can be called
+            expect(typeof generator.generateContentStream).toBe('function');
+        });
+    });
+    describe('countTokens', () => {
+        it('should count tokens using character-based estimation', async () => {
+            const request = {
+                contents: [{ role: 'user', parts: [{ text: 'Hello world' }] }],
+                model: 'gpt-4',
+            };
+            const result = await generator.countTokens(request);
+            // 'Hello world' = 11 ASCII chars
+            // 11 / 4 = 2.75 -> ceil = 3 tokens
+            expect(result.totalTokens).toBe(3);
+        });
+        it('should handle multimodal content', async () => {
+            const request = {
+                contents: [
+                    {
+                        role: 'user',
+                        parts: [{ text: 'Hello' }, { text: ' world' }],
+                    },
+                ],
+                model: 'gpt-4',
+            };
+            const result = await generator.countTokens(request);
+            // Parts are combined for estimation:
+            // 'Hello world' = 11 ASCII chars -> 11/4 = 2.75 -> ceil = 3 tokens
+            expect(result.totalTokens).toBe(3);
+        });
+    });
+    describe('embedContent', () => {
+        it('should delegate to pipeline.client.embeddings.create', async () => {
+            // This test verifies the method exists and can be called
+            expect(typeof generator.embedContent).toBe('function');
+        });
+    });
+    describe('shouldSuppressErrorLogging', () => {
+        // Create a test subclass to access the protected method
+        class TestGenerator extends OpenAIContentGenerator {
+            testShouldSuppressErrorLogging(error, request) {
+                return this.shouldSuppressErrorLogging(error, request);
+            }
+        }
+        let testGenerator;
+        beforeEach(() => {
+            const contentGeneratorConfig = {
+                model: 'gpt-4',
+                apiKey: 'test-key',
+                authType: AuthType.USE_OPENAI,
+                enableOpenAILogging: false,
+                timeout: 120000,
+                maxRetries: 3,
+                samplingParams: {
+                    temperature: 0.7,
+                    max_tokens: 1000,
+                    top_p: 0.9,
+                },
+            };
+            // Create a minimal mock provider
+            const mockProvider = {
+                buildHeaders: vi.fn().mockReturnValue({}),
+                buildClient: vi.fn().mockReturnValue({
+                    chat: {
+                        completions: {
+                            create: vi.fn(),
+                        },
+                    },
+                    embeddings: {
+                        create: vi.fn(),
+                    },
+                }),
+                buildRequest: vi.fn().mockImplementation((req) => req),
+                getDefaultGenerationConfig: vi.fn().mockReturnValue({}),
+            };
+            testGenerator = new TestGenerator(contentGeneratorConfig, mockConfig, mockProvider);
+        });
+        it('should return false for regular errors', () => {
+            const request = {
+                contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+                model: 'gpt-4',
+            };
+            const result = testGenerator.testShouldSuppressErrorLogging(new Error('Test error'), request);
+            expect(result).toBe(false);
+        });
+        it('should return true for AbortError when signal is also aborted (user cancellation)', () => {
+            const abortController = new AbortController();
+            abortController.abort();
+            const request = {
+                contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+                model: 'gpt-4',
+                config: {
+                    abortSignal: abortController.signal,
+                },
+            };
+            // Create an AbortError with aborted signal - this is user-initiated
+            const abortError = new Error('The operation was aborted');
+            abortError.name = 'AbortError';
+            const result = testGenerator.testShouldSuppressErrorLogging(abortError, request);
+            expect(result).toBe(true);
+        });
+        it('should return false for AbortError when signal is NOT aborted (network abort)', () => {
+            const abortController = new AbortController();
+            // Signal is NOT aborted - this simulates a network abort
+            const request = {
+                contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+                model: 'gpt-4',
+                config: {
+                    abortSignal: abortController.signal,
+                },
+            };
+            // AbortError but signal not aborted - could be network issue
+            const abortError = new Error('The operation was aborted');
+            abortError.name = 'AbortError';
+            const result = testGenerator.testShouldSuppressErrorLogging(abortError, request);
+            expect(result).toBe(false);
+        });
+        it('should return false for AbortError without any signal', () => {
+            const request = {
+                contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+                model: 'gpt-4',
+            };
+            // AbortError but no signal at all - unknown source
+            const abortError = new Error('The operation was aborted');
+            abortError.name = 'AbortError';
+            const result = testGenerator.testShouldSuppressErrorLogging(abortError, request);
+            expect(result).toBe(false);
+        });
+        it('should return false for non-AbortError even when signal is aborted', () => {
+            const abortController = new AbortController();
+            abortController.abort();
+            const request = {
+                contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+                model: 'gpt-4',
+                config: {
+                    abortSignal: abortController.signal,
+                },
+            };
+            // Regular error even though signal is aborted - should still be logged
+            const result = testGenerator.testShouldSuppressErrorLogging(new Error('Network error'), request);
+            expect(result).toBe(false);
+        });
+        it('should return false for errors with non-aborted signal', () => {
+            const abortController = new AbortController();
+            const request = {
+                contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+                model: 'gpt-4',
+                config: {
+                    abortSignal: abortController.signal,
+                },
+            };
+            const result = testGenerator.testShouldSuppressErrorLogging(new Error('Network error'), request);
+            expect(result).toBe(false);
+        });
+        it('should allow subclasses to override error suppression behavior', async () => {
+            class CustomTestGenerator extends OpenAIContentGenerator {
+                testShouldSuppressErrorLogging(error, request) {
+                    return this.shouldSuppressErrorLogging(error, request);
+                }
+                shouldSuppressErrorLogging(_error, _request) {
+                    return true; // Always suppress for this test
+                }
+            }
+            const contentGeneratorConfig = {
+                model: 'gpt-4',
+                apiKey: 'test-key',
+                authType: AuthType.USE_OPENAI,
+                enableOpenAILogging: false,
+                timeout: 120000,
+                maxRetries: 3,
+                samplingParams: {
+                    temperature: 0.7,
+                    max_tokens: 1000,
+                    top_p: 0.9,
+                },
+            };
+            // Create a minimal mock provider
+            const mockProvider = {
+                buildHeaders: vi.fn().mockReturnValue({}),
+                buildClient: vi.fn().mockReturnValue({
+                    chat: {
+                        completions: {
+                            create: vi.fn(),
+                        },
+                    },
+                    embeddings: {
+                        create: vi.fn(),
+                    },
+                }),
+                buildRequest: vi.fn().mockImplementation((req) => req),
+                getDefaultGenerationConfig: vi.fn().mockReturnValue({}),
+            };
+            const customGenerator = new CustomTestGenerator(contentGeneratorConfig, mockConfig, mockProvider);
+            const request = {
+                contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+                model: 'gpt-4',
+            };
+            const result = customGenerator.testShouldSuppressErrorLogging(new Error('Test error'), request);
+            expect(result).toBe(true);
+        });
+    });
+});
+//# sourceMappingURL=openaiContentGenerator.test.js.map

package/core-dist/src/core/openaiContentGenerator/openaiContentGenerator.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openaiContentGenerator.test.js","sourceRoot":"","sources":["../../../../src/core/openaiContentGenerator/openaiContentGenerator.test.ts"],"names":[],"mappings":"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"}

package/core-dist/src/core/openaiContentGenerator/pipeline.d.ts

@@ -0,0 +1,74 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import type OpenAI from 'openai';
+import { type GenerateContentParameters, GenerateContentResponse } from '@google/genai';
+import type { Config } from '../../config/config.js';
+import type { ContentGeneratorConfig } from '../contentGenerator.js';
+import type { OpenAICompatibleProvider } from './provider/index.js';
+import type { ErrorHandler } from './errorHandler.js';
+/**
+ * Error thrown when the API returns an error embedded as stream content
+ * instead of a proper HTTP error. Some providers (e.g., certain OpenAI-compatible
+ * endpoints) return throttling errors as a normal SSE chunk with
+ * finish_reason="error_finish" and the error message in delta.content.
+ */
+export declare class StreamContentError extends Error {
+    constructor(message: string);
+}
+export interface PipelineConfig {
+    cliConfig: Config;
+    provider: OpenAICompatibleProvider;
+    contentGeneratorConfig: ContentGeneratorConfig;
+    errorHandler: ErrorHandler;
+}
+export declare class ContentGenerationPipeline {
+    private config;
+    client: OpenAI;
+    private converter;
+    private contentGeneratorConfig;
+    constructor(config: PipelineConfig);
+    execute(request: GenerateContentParameters, userPromptId: string): Promise<GenerateContentResponse>;
+    executeStream(request: GenerateContentParameters, userPromptId: string): Promise<AsyncGenerator<GenerateContentResponse>>;
+    /**
+     * Stage 2: Process OpenAI stream with conversion and logging
+     * This method handles the complete stream processing pipeline:
+     * 1. Convert OpenAI chunks to Gemini format while preserving original chunks
+     * 2. Filter empty responses
+     * 3. Handle chunk merging for providers that send finishReason and usageMetadata separately
+     * 4. Collect both formats for logging
+     * 5. Handle success/error logging
+     */
+    private processStreamWithLogging;
+    /**
+     * Handle chunk merging for providers that send finishReason and usageMetadata separately.
+     *
+     * Strategy: When we encounter a finishReason chunk, we hold it and merge all subsequent
+     * chunks into it until the stream ends. This ensures the final chunk contains both
+     * finishReason and the most up-to-date usage information from any provider pattern.
+     *
+     * @param response Current Gemini response
+     * @param collectedGeminiResponses Array to collect responses for logging
+     * @param setPendingFinish Callback to set pending finish response
+     * @returns true if the response should be yielded, false if it should be held for merging
+     */
+    private handleChunkMerging;
+    private buildRequest;
+    private buildGenerateContentConfig;
+    private buildReasoningConfig;
+    /**
+     * Common error handling wrapper for execute methods
+     */
+    private executeWithErrorHandling;
+    /**
+     * Shared error handling logic for both executeWithErrorHandling and processStreamWithLogging
+     * This centralizes the common error processing steps to avoid duplication
+     */
+    private handleError;
+    /**
+     * Create request context with common properties
+     */
+    private createRequestContext;
+}