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

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

@@ -0,0 +1,321 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GenerateContentResponse, } from '@google/genai';
+import { ApiRequestEvent, ApiResponseEvent, ApiErrorEvent, } from '../../telemetry/types.js';
+import { logApiError, logApiRequest, logApiResponse, } from '../../telemetry/loggers.js';
+import { isStructuredError } from '../../utils/quotaErrorDetection.js';
+import { OpenAIContentConverter } from '../openaiContentGenerator/converter.js';
+import { OpenAILogger } from '../../utils/openaiLogger.js';
+/**
+ * A decorator that wraps a ContentGenerator to add logging to API calls.
+ */
+export class LoggingContentGenerator {
+    wrapped;
+    config;
+    openaiLogger;
+    schemaCompliance;
+    constructor(wrapped, config, generatorConfig) {
+        this.wrapped = wrapped;
+        this.config = config;
+        // Extract fields needed for initialization from passed config
+        // (config.getContentGeneratorConfig() may not be available yet during refreshAuth)
+        if (generatorConfig.enableOpenAILogging) {
+            this.openaiLogger = new OpenAILogger(generatorConfig.openAILoggingDir);
+            this.schemaCompliance = generatorConfig.schemaCompliance;
+        }
+    }
+    getWrapped() {
+        return this.wrapped;
+    }
+    logApiRequest(contents, model, promptId) {
+        const requestText = JSON.stringify(contents);
+        logApiRequest(this.config, new ApiRequestEvent(model, promptId, requestText));
+    }
+    _logApiResponse(responseId, durationMs, model, prompt_id, usageMetadata, responseText) {
+        logApiResponse(this.config, new ApiResponseEvent(responseId, model, durationMs, prompt_id, this.config.getAuthType(), usageMetadata, responseText));
+    }
+    _logApiError(responseId, durationMs, error, model, prompt_id) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorType = error?.type ||
+            (error instanceof Error ? error.name : 'unknown');
+        const errorResponseId = error?.requestID ||
+            error?.request_id ||
+            responseId;
+        const errorStatus = error?.code ??
+            error?.status ??
+            (isStructuredError(error)
+                ? error.status
+                : undefined);
+        logApiError(this.config, new ApiErrorEvent(errorResponseId, model, errorMessage, durationMs, prompt_id, this.config.getAuthType(), errorType, errorStatus));
+    }
+    async generateContent(req, userPromptId) {
+        const startTime = Date.now();
+        this.logApiRequest(this.toContents(req.contents), req.model, userPromptId);
+        const openaiRequest = await this.buildOpenAIRequestForLogging(req);
+        try {
+            const response = await this.wrapped.generateContent(req, userPromptId);
+            const durationMs = Date.now() - startTime;
+            this._logApiResponse(response.responseId ?? '', durationMs, response.modelVersion || req.model, userPromptId, response.usageMetadata);
+            await this.logOpenAIInteraction(openaiRequest, response);
+            return response;
+        }
+        catch (error) {
+            const durationMs = Date.now() - startTime;
+            this._logApiError('', durationMs, error, req.model, userPromptId);
+            await this.logOpenAIInteraction(openaiRequest, undefined, error);
+            throw error;
+        }
+    }
+    async generateContentStream(req, userPromptId) {
+        const startTime = Date.now();
+        this.logApiRequest(this.toContents(req.contents), req.model, userPromptId);
+        const openaiRequest = await this.buildOpenAIRequestForLogging(req);
+        let stream;
+        try {
+            stream = await this.wrapped.generateContentStream(req, userPromptId);
+        }
+        catch (error) {
+            const durationMs = Date.now() - startTime;
+            this._logApiError('', durationMs, error, req.model, userPromptId);
+            await this.logOpenAIInteraction(openaiRequest, undefined, error);
+            throw error;
+        }
+        return this.loggingStreamWrapper(stream, startTime, userPromptId, req.model, openaiRequest);
+    }
+    async *loggingStreamWrapper(stream, startTime, userPromptId, model, openaiRequest) {
+        const responses = [];
+        let lastUsageMetadata;
+        try {
+            for await (const response of stream) {
+                responses.push(response);
+                if (response.usageMetadata) {
+                    lastUsageMetadata = response.usageMetadata;
+                }
+                yield response;
+            }
+            // Only log successful API response if no error occurred
+            const durationMs = Date.now() - startTime;
+            this._logApiResponse(responses[0]?.responseId ?? '', durationMs, responses[0]?.modelVersion || model, userPromptId, lastUsageMetadata);
+            const consolidatedResponse = this.consolidateGeminiResponsesForLogging(responses);
+            await this.logOpenAIInteraction(openaiRequest, consolidatedResponse);
+        }
+        catch (error) {
+            const durationMs = Date.now() - startTime;
+            this._logApiError(responses[0]?.responseId ?? '', durationMs, error, responses[0]?.modelVersion || model, userPromptId);
+            await this.logOpenAIInteraction(openaiRequest, undefined, error);
+            throw error;
+        }
+    }
+    async buildOpenAIRequestForLogging(request) {
+        if (!this.openaiLogger) {
+            return undefined;
+        }
+        const converter = new OpenAIContentConverter(request.model, this.schemaCompliance);
+        const messages = converter.convertGeminiRequestToOpenAI(request, {
+            cleanOrphanToolCalls: false,
+        });
+        const openaiRequest = {
+            model: request.model,
+            messages,
+        };
+        if (request.config?.tools) {
+            openaiRequest.tools = await converter.convertGeminiToolsToOpenAI(request.config.tools);
+        }
+        if (request.config?.temperature !== undefined) {
+            openaiRequest.temperature = request.config.temperature;
+        }
+        if (request.config?.topP !== undefined) {
+            openaiRequest.top_p = request.config.topP;
+        }
+        if (request.config?.maxOutputTokens !== undefined) {
+            openaiRequest.max_tokens = request.config.maxOutputTokens;
+        }
+        if (request.config?.presencePenalty !== undefined) {
+            openaiRequest.presence_penalty = request.config.presencePenalty;
+        }
+        if (request.config?.frequencyPenalty !== undefined) {
+            openaiRequest.frequency_penalty = request.config.frequencyPenalty;
+        }
+        return openaiRequest;
+    }
+    async logOpenAIInteraction(openaiRequest, response, error) {
+        if (!this.openaiLogger || !openaiRequest) {
+            return;
+        }
+        const openaiResponse = response
+            ? this.convertGeminiResponseToOpenAIForLogging(response, openaiRequest)
+            : undefined;
+        await this.openaiLogger.logInteraction(openaiRequest, openaiResponse, error instanceof Error
+            ? error
+            : error
+                ? new Error(String(error))
+                : undefined);
+    }
+    convertGeminiResponseToOpenAIForLogging(response, openaiRequest) {
+        const converter = new OpenAIContentConverter(openaiRequest.model, this.schemaCompliance);
+        return converter.convertGeminiResponseToOpenAI(response);
+    }
+    consolidateGeminiResponsesForLogging(responses) {
+        if (responses.length === 0) {
+            return undefined;
+        }
+        const consolidated = new GenerateContentResponse();
+        const combinedParts = [];
+        const functionCallIndex = new Map();
+        let finishReason;
+        let usageMetadata;
+        for (const response of responses) {
+            if (response.usageMetadata) {
+                usageMetadata = response.usageMetadata;
+            }
+            const candidate = response.candidates?.[0];
+            if (candidate?.finishReason) {
+                finishReason = candidate.finishReason;
+            }
+            const parts = candidate?.content?.parts ?? [];
+            for (const part of parts) {
+                if (typeof part === 'string') {
+                    combinedParts.push({ text: part });
+                    continue;
+                }
+                if ('text' in part) {
+                    if (part.text) {
+                        combinedParts.push({
+                            text: part.text,
+                            ...(part.thought ? { thought: true } : {}),
+                            ...(part.thoughtSignature
+                                ? { thoughtSignature: part.thoughtSignature }
+                                : {}),
+                        });
+                    }
+                    continue;
+                }
+                if ('functionCall' in part && part.functionCall) {
+                    const callKey = part.functionCall.id || part.functionCall.name || 'tool_call';
+                    const existingIndex = functionCallIndex.get(callKey);
+                    const functionPart = { functionCall: part.functionCall };
+                    if (existingIndex !== undefined) {
+                        combinedParts[existingIndex] = functionPart;
+                    }
+                    else {
+                        functionCallIndex.set(callKey, combinedParts.length);
+                        combinedParts.push(functionPart);
+                    }
+                    continue;
+                }
+                if ('functionResponse' in part && part.functionResponse) {
+                    combinedParts.push({ functionResponse: part.functionResponse });
+                    continue;
+                }
+                combinedParts.push(part);
+            }
+        }
+        const lastResponse = responses[responses.length - 1];
+        const lastCandidate = lastResponse.candidates?.[0];
+        consolidated.responseId = lastResponse.responseId;
+        consolidated.createTime = lastResponse.createTime;
+        consolidated.modelVersion = lastResponse.modelVersion;
+        consolidated.promptFeedback = lastResponse.promptFeedback;
+        consolidated.usageMetadata = usageMetadata;
+        consolidated.candidates = [
+            {
+                content: {
+                    role: lastCandidate?.content?.role || 'model',
+                    parts: combinedParts,
+                },
+                ...(finishReason ? { finishReason } : {}),
+                index: 0,
+                safetyRatings: lastCandidate?.safetyRatings || [],
+            },
+        ];
+        return consolidated;
+    }
+    async countTokens(req) {
+        return this.wrapped.countTokens(req);
+    }
+    async embedContent(req) {
+        return this.wrapped.embedContent(req);
+    }
+    useSummarizedThinking() {
+        return this.wrapped.useSummarizedThinking();
+    }
+    toContents(contents) {
+        if (Array.isArray(contents)) {
+            // it's a Content[] or a PartsUnion[]
+            return contents.map((c) => this.toContent(c));
+        }
+        // it's a Content or a PartsUnion
+        return [this.toContent(contents)];
+    }
+    toContent(content) {
+        if (Array.isArray(content)) {
+            // it's a PartsUnion[]
+            return {
+                role: 'user',
+                parts: this.toParts(content),
+            };
+        }
+        if (typeof content === 'string') {
+            // it's a string
+            return {
+                role: 'user',
+                parts: [{ text: content }],
+            };
+        }
+        if ('parts' in content) {
+            // it's a Content - process parts to handle thought filtering
+            return {
+                ...content,
+                parts: content.parts
+                    ? this.toParts(content.parts.filter((p) => p != null))
+                    : [],
+            };
+        }
+        // it's a Part
+        return {
+            role: 'user',
+            parts: [this.toPart(content)],
+        };
+    }
+    toParts(parts) {
+        return parts.map((p) => this.toPart(p));
+    }
+    toPart(part) {
+        if (typeof part === 'string') {
+            // it's a string
+            return { text: part };
+        }
+        // Handle thought parts for CountToken API compatibility
+        // The CountToken API expects parts to have certain required "oneof" fields initialized,
+        // but thought parts don't conform to this schema and cause API failures
+        if ('thought' in part && part.thought) {
+            const thoughtText = `[Thought: ${part.thought}]`;
+            const newPart = { ...part };
+            delete newPart['thought'];
+            const hasApiContent = 'functionCall' in newPart ||
+                'functionResponse' in newPart ||
+                'inlineData' in newPart ||
+                'fileData' in newPart;
+            if (hasApiContent) {
+                // It's a functionCall or other non-text part. Just strip the thought.
+                return newPart;
+            }
+            // If no other valid API content, this must be a text part.
+            // Combine existing text (if any) with the thought, preserving other properties.
+            const text = newPart.text;
+            const existingText = text ? String(text) : '';
+            const combinedText = existingText
+                ? `${existingText}\n${thoughtText}`
+                : thoughtText;
+            return {
+                ...newPart,
+                text: combinedText,
+            };
+        }
+        return part;
+    }
+}
+//# sourceMappingURL=loggingContentGenerator.js.map

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

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

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

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

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

@@ -0,0 +1,287 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { GenerateContentResponse } from '@google/genai';
+import { AuthType } from '../contentGenerator.js';
+import { LoggingContentGenerator } from './index.js';
+import { OpenAIContentConverter } from '../openaiContentGenerator/converter.js';
+import { logApiRequest, logApiResponse, logApiError, } from '../../telemetry/loggers.js';
+import { OpenAILogger } from '../../utils/openaiLogger.js';
+vi.mock('../../telemetry/loggers.js', () => ({
+    logApiRequest: vi.fn(),
+    logApiResponse: vi.fn(),
+    logApiError: vi.fn(),
+}));
+vi.mock('../../utils/openaiLogger.js', () => ({
+    OpenAILogger: vi.fn().mockImplementation(() => ({
+        logInteraction: vi.fn().mockResolvedValue(undefined),
+    })),
+}));
+const convertGeminiRequestToOpenAISpy = vi
+    .spyOn(OpenAIContentConverter.prototype, 'convertGeminiRequestToOpenAI')
+    .mockReturnValue([{ role: 'user', content: 'converted' }]);
+const convertGeminiToolsToOpenAISpy = vi
+    .spyOn(OpenAIContentConverter.prototype, 'convertGeminiToolsToOpenAI')
+    .mockResolvedValue([{ type: 'function', function: { name: 'tool' } }]);
+const convertGeminiResponseToOpenAISpy = vi
+    .spyOn(OpenAIContentConverter.prototype, 'convertGeminiResponseToOpenAI')
+    .mockReturnValue({
+    id: 'openai-response',
+    object: 'chat.completion',
+    created: 123456789,
+    model: 'test-model',
+    choices: [],
+});
+const createConfig = (overrides = {}) => {
+    const configContent = {
+        authType: 'openai',
+        enableOpenAILogging: false,
+        ...overrides,
+    };
+    return {
+        getContentGeneratorConfig: () => configContent,
+        getAuthType: () => configContent.authType,
+    };
+};
+const createWrappedGenerator = (generateContent, generateContentStream) => ({
+    generateContent,
+    generateContentStream,
+    countTokens: vi.fn(),
+    embedContent: vi.fn(),
+    useSummarizedThinking: vi.fn().mockReturnValue(false),
+});
+const createResponse = (responseId, modelVersion, parts, usageMetadata, finishReason) => {
+    const response = new GenerateContentResponse();
+    response.responseId = responseId;
+    response.modelVersion = modelVersion;
+    response.usageMetadata = usageMetadata;
+    response.candidates = [
+        {
+            content: {
+                role: 'model',
+                parts: parts,
+            },
+            finishReason: finishReason,
+            index: 0,
+            safetyRatings: [],
+        },
+    ];
+    return response;
+};
+describe('LoggingContentGenerator', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    afterEach(() => {
+        convertGeminiRequestToOpenAISpy.mockClear();
+        convertGeminiToolsToOpenAISpy.mockClear();
+        convertGeminiResponseToOpenAISpy.mockClear();
+    });
+    it('logs request/response, normalizes thought parts, and logs OpenAI interaction', async () => {
+        const wrapped = createWrappedGenerator(vi.fn().mockResolvedValue(createResponse('resp-1', 'model-v2', [{ text: 'ok' }], {
+            promptTokenCount: 3,
+            candidatesTokenCount: 5,
+            totalTokenCount: 8,
+        }, 'STOP')), vi.fn());
+        const generatorConfig = {
+            model: 'test-model',
+            authType: AuthType.USE_OPENAI,
+            enableOpenAILogging: true,
+            openAILoggingDir: 'logs',
+            schemaCompliance: 'openapi_30',
+        };
+        const generator = new LoggingContentGenerator(wrapped, createConfig(), generatorConfig);
+        const request = {
+            model: 'test-model',
+            contents: [
+                {
+                    role: 'user',
+                    parts: [
+                        { text: 'Hello', thought: 'internal' },
+                        {
+                            functionCall: { id: 'call-1', name: 'tool', args: '{}' },
+                            thought: 'strip-me',
+                        },
+                        null,
+                    ],
+                },
+            ],
+            config: {
+                temperature: 0.3,
+                topP: 0.9,
+                maxOutputTokens: 256,
+                presencePenalty: 0.2,
+                frequencyPenalty: 0.1,
+                tools: [
+                    {
+                        functionDeclarations: [
+                            { name: 'tool', description: 'desc', parameters: {} },
+                        ],
+                    },
+                ],
+            },
+        };
+        const response = await generator.generateContent(request, 'prompt-1');
+        expect(response.responseId).toBe('resp-1');
+        expect(logApiRequest).toHaveBeenCalledTimes(1);
+        const [, requestEvent] = vi.mocked(logApiRequest).mock.calls[0];
+        const loggedContents = JSON.parse(requestEvent.request_text || '[]');
+        expect(loggedContents[0].parts[0]).toEqual({
+            text: 'Hello\n[Thought: internal]',
+        });
+        expect(loggedContents[0].parts[1]).toEqual({
+            functionCall: { id: 'call-1', name: 'tool', args: '{}' },
+        });
+        expect(logApiResponse).toHaveBeenCalledTimes(1);
+        const [, responseEvent] = vi.mocked(logApiResponse).mock.calls[0];
+        expect(responseEvent.response_id).toBe('resp-1');
+        expect(responseEvent.model).toBe('model-v2');
+        expect(responseEvent.prompt_id).toBe('prompt-1');
+        expect(responseEvent.input_token_count).toBe(3);
+        expect(convertGeminiRequestToOpenAISpy).toHaveBeenCalledTimes(1);
+        expect(convertGeminiToolsToOpenAISpy).toHaveBeenCalledTimes(1);
+        expect(convertGeminiResponseToOpenAISpy).toHaveBeenCalledTimes(1);
+        const openaiLoggerInstance = vi.mocked(OpenAILogger).mock.results[0]
+            ?.value;
+        expect(openaiLoggerInstance.logInteraction).toHaveBeenCalledTimes(1);
+        const [openaiRequest, openaiResponse, openaiError] = openaiLoggerInstance.logInteraction.mock.calls[0];
+        expect(openaiRequest).toEqual(expect.objectContaining({
+            model: 'test-model',
+            messages: [{ role: 'user', content: 'converted' }],
+            tools: [{ type: 'function', function: { name: 'tool' } }],
+            temperature: 0.3,
+            top_p: 0.9,
+            max_tokens: 256,
+            presence_penalty: 0.2,
+            frequency_penalty: 0.1,
+        }));
+        expect(openaiResponse).toEqual({
+            id: 'openai-response',
+            object: 'chat.completion',
+            created: 123456789,
+            model: 'test-model',
+            choices: [],
+        });
+        expect(openaiError).toBeUndefined();
+    });
+    it('logs errors with status code and request id, then rethrows', async () => {
+        const error = Object.assign(new Error('boom'), {
+            code: 429,
+            request_id: 'req-99',
+            type: 'rate_limit',
+        });
+        const wrapped = createWrappedGenerator(vi.fn().mockRejectedValue(error), vi.fn());
+        const generatorConfig = {
+            model: 'test-model',
+            authType: AuthType.USE_OPENAI,
+            enableOpenAILogging: true,
+        };
+        const generator = new LoggingContentGenerator(wrapped, createConfig(), generatorConfig);
+        const request = {
+            model: 'test-model',
+            contents: 'Hello',
+        };
+        await expect(generator.generateContent(request, 'prompt-2')).rejects.toThrow('boom');
+        expect(logApiError).toHaveBeenCalledTimes(1);
+        const [, errorEvent] = vi.mocked(logApiError).mock.calls[0];
+        expect(errorEvent.response_id).toBe('req-99');
+        expect(errorEvent.status_code).toBe(429);
+        expect(errorEvent.error_type).toBe('rate_limit');
+        expect(errorEvent.prompt_id).toBe('prompt-2');
+        const openaiLoggerInstance = vi.mocked(OpenAILogger).mock.results[0]
+            ?.value;
+        const [, , loggedError] = openaiLoggerInstance.logInteraction.mock.calls[0];
+        expect(loggedError).toBeInstanceOf(Error);
+        expect(loggedError.message).toBe('boom');
+    });
+    it('logs streaming responses and consolidates tool calls', async () => {
+        const usage1 = {
+            promptTokenCount: 1,
+        };
+        const usage2 = {
+            promptTokenCount: 2,
+            candidatesTokenCount: 4,
+            totalTokenCount: 6,
+        };
+        const response1 = createResponse('resp-1', 'model-stream', [
+            { text: 'Hello' },
+            { functionCall: { id: 'call-1', name: 'tool', args: '{}' } },
+        ], usage1);
+        const response2 = createResponse('resp-2', 'model-stream', [
+            { text: ' world' },
+            { functionCall: { id: 'call-1', name: 'tool', args: '{"x":1}' } },
+            { functionResponse: { name: 'tool', response: { output: 'ok' } } },
+        ], usage2, 'STOP');
+        const wrapped = createWrappedGenerator(vi.fn(), vi.fn().mockResolvedValue((async function* () {
+            yield response1;
+            yield response2;
+        })()));
+        const generatorConfig = {
+            model: 'test-model',
+            authType: AuthType.USE_OPENAI,
+            enableOpenAILogging: true,
+        };
+        const generator = new LoggingContentGenerator(wrapped, createConfig(), generatorConfig);
+        const request = {
+            model: 'test-model',
+            contents: 'Hello',
+        };
+        const stream = await generator.generateContentStream(request, 'prompt-3');
+        const seen = [];
+        for await (const item of stream) {
+            seen.push(item);
+        }
+        expect(seen).toHaveLength(2);
+        expect(logApiResponse).toHaveBeenCalledTimes(1);
+        const [, responseEvent] = vi.mocked(logApiResponse).mock.calls[0];
+        expect(responseEvent.response_id).toBe('resp-1');
+        expect(responseEvent.input_token_count).toBe(2);
+        expect(convertGeminiResponseToOpenAISpy).toHaveBeenCalledTimes(1);
+        const [consolidatedResponse] = convertGeminiResponseToOpenAISpy.mock.calls[0];
+        const consolidatedParts = consolidatedResponse.candidates?.[0]?.content?.parts || [];
+        expect(consolidatedParts).toEqual([
+            { text: 'Hello' },
+            { functionCall: { id: 'call-1', name: 'tool', args: '{"x":1}' } },
+            { text: ' world' },
+            { functionResponse: { name: 'tool', response: { output: 'ok' } } },
+        ]);
+        expect(consolidatedResponse.usageMetadata).toBe(usage2);
+        expect(consolidatedResponse.responseId).toBe('resp-2');
+        expect(consolidatedResponse.candidates?.[0]?.finishReason).toBe('STOP');
+    });
+    it('logs stream errors and skips response logging', async () => {
+        const response1 = createResponse('resp-1', 'model-stream', [
+            { text: 'partial' },
+        ]);
+        const streamError = new Error('stream-fail');
+        const wrapped = createWrappedGenerator(vi.fn(), vi.fn().mockResolvedValue((async function* () {
+            yield response1;
+            throw streamError;
+        })()));
+        const generatorConfig = {
+            model: 'test-model',
+            authType: AuthType.USE_OPENAI,
+            enableOpenAILogging: true,
+        };
+        const generator = new LoggingContentGenerator(wrapped, createConfig(), generatorConfig);
+        const request = {
+            model: 'test-model',
+            contents: 'Hello',
+        };
+        const stream = await generator.generateContentStream(request, 'prompt-4');
+        await expect(async () => {
+            for await (const _item of stream) {
+                // Consume stream to trigger error.
+            }
+        }).rejects.toThrow('stream-fail');
+        expect(logApiResponse).not.toHaveBeenCalled();
+        expect(logApiError).toHaveBeenCalledTimes(1);
+        const openaiLoggerInstance = vi.mocked(OpenAILogger).mock.results[0]
+            ?.value;
+        expect(openaiLoggerInstance.logInteraction).toHaveBeenCalledTimes(1);
+    });
+});
+//# sourceMappingURL=loggingContentGenerator.test.js.map

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

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