@theia/ai-ollama 1.77.0-next.7 → 1.77.0-next.71

package/lib/node/ollama-backend-module.d.ts

@@ -1,5 +1,4 @@
 import { ContainerModule } from '@theia/core/shared/inversify';
-export declare const OllamaModelFactory: unique symbol;
 declare const _default: ContainerModule;
 export default _default;
 //# sourceMappingURL=ollama-backend-module.d.ts.map

package/lib/node/ollama-backend-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/ollama-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAO/D,eAAO,MAAM,kBAAkB,eAA+B,CAAC;;AAW/D,wBAGG"}
+{"version":3,"file":"ollama-backend-module.d.ts","sourceRoot":"","sources":["../../src/node/ollama-backend-module.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAa,eAAe,EAAE,MAAM,8BAA8B,CAAC;;AA0B1E,wBAGG"}

package/lib/node/ollama-backend-module.js

@@ -15,18 +15,24 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OllamaModelFactory = void 0;
 const inversify_1 = require("@theia/core/shared/inversify");
 const ollama_language_models_manager_1 = require("../common/ollama-language-models-manager");
 const core_1 = require("@theia/core");
 const ollama_language_models_manager_impl_1 = require("./ollama-language-models-manager-impl");
+const ollama_language_model_1 = require("./ollama-language-model");
 const connection_container_module_1 = require("@theia/core/lib/node/messaging/connection-container-module");
 const ollama_preferences_1 = require("../common/ollama-preferences");
-exports.OllamaModelFactory = Symbol('OllamaModelFactory');
 // We use a connection module to handle AI services separately for each frontend.
 const ollamaConnectionModule = connection_container_module_1.ConnectionContainerModule.create(({ bind, bindBackendService, bindFrontendService }) => {
     bind(ollama_language_models_manager_impl_1.OllamaLanguageModelsManagerImpl).toSelf().inSingletonScope();
     bind(ollama_language_models_manager_1.OllamaLanguageModelsManager).toService(ollama_language_models_manager_impl_1.OllamaLanguageModelsManagerImpl);
+    bind(ollama_language_model_1.OllamaModel).toSelf().inTransientScope();
+    bind(ollama_language_model_1.OllamaLanguageModelFactory).toFactory(({ container }) => params => {
+        const child = new inversify_1.Container();
+        child.parent = container;
+        child.bind(ollama_language_model_1.OllamaModelParams).toConstantValue(params);
+        return child.get(ollama_language_model_1.OllamaModel);
+    });
     bind(core_1.ConnectionHandler).toDynamicValue(ctx => new core_1.RpcConnectionHandler(ollama_language_models_manager_1.OLLAMA_LANGUAGE_MODELS_MANAGER_PATH, () => ctx.container.get(ollama_language_models_manager_1.OllamaLanguageModelsManager))).inSingletonScope();
 });
 exports.default = new inversify_1.ContainerModule(bind => {

package/lib/node/ollama-backend-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"ollama-backend-module.js","sourceRoot":"","sources":["../../src/node/ollama-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,mCAAmC;AACnC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,4DAA+D;AAC/D,6FAA4H;AAC5H,sCAA8F;AAC9F,+FAAwF;AACxF,4GAAuG;AACvG,qEAAuE;AAE1D,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AAE/D,iFAAiF;AACjF,MAAM,sBAAsB,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAClH,IAAI,CAAC,qEAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,4DAA2B,CAAC,CAAC,SAAS,CAAC,qEAA+B,CAAC,CAAC;IAC7E,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,2BAAoB,CAAC,oEAAmC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,4DAA2B,CAAC,CAAC,CACtH,CAAC,gBAAgB,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,6BAAsB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,4CAAuB,EAAE,CAAC,CAAC;IAClF,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC"}
+{"version":3,"file":"ollama-backend-module.js","sourceRoot":"","sources":["../../src/node/ollama-backend-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,mCAAmC;AACnC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,4DAA0E;AAC1E,6FAA4H;AAC5H,sCAA8F;AAC9F,+FAAwF;AACxF,mEAAqG;AACrG,4GAAuG;AACvG,qEAAuE;AAEvE,iFAAiF;AACjF,MAAM,sBAAsB,GAAG,uDAAyB,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,EAAE,EAAE;IAClH,IAAI,CAAC,qEAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,4DAA2B,CAAC,CAAC,SAAS,CAAC,qEAA+B,CAAC,CAAC;IAC7E,IAAI,CAAC,mCAAW,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9C,IAAI,CAAC,kDAA0B,CAAC,CAAC,SAAS,CACtC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE;QACxB,MAAM,KAAK,GAAG,IAAI,qBAAS,EAAE,CAAC;QAC9B,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC;QACzB,KAAK,CAAC,IAAI,CAAC,yCAAiB,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC,GAAG,CAAC,mCAAW,CAAC,CAAC;IAClC,CAAC,CACJ,CAAC;IACF,IAAI,CAAC,wBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,2BAAoB,CAAC,oEAAmC,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,4DAA2B,CAAC,CAAC,CACtH,CAAC,gBAAgB,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,kBAAe,IAAI,2BAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,6BAAsB,CAAC,CAAC,eAAe,CAAC,EAAE,MAAM,EAAE,4CAAuB,EAAE,CAAC,CAAC;IAClF,IAAI,CAAC,uDAAyB,CAAC,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC;AAC5E,CAAC,CAAC,CAAC"}

package/lib/node/ollama-language-model.d.ts

@@ -1,23 +1,32 @@
-import { LanguageModel, LanguageModelParsedResponse, LanguageModelMessage, LanguageModelResponse, LanguageModelStreamResponse, ReasoningSettings, ReasoningSupport, ToolRequest, ToolRequestParameterProperty, ToolRequestParametersProperties, LanguageModelRequest, LanguageModelStatus, UserRequest } from '@theia/ai-core';
-import { CancellationToken } from '@theia/core';
+import { LanguageModel, LanguageModelParsedResponse, LanguageModelMessage, LanguageModelResponse, LanguageModelStreamResponse, ReasoningSettings, ReasoningSupport, ToolCall, ToolCallExecutor, ToolInvocationContext, ToolRequest, ToolRequestParameterProperty, ToolRequestParametersProperties, LanguageModelRequest, LanguageModelStatus, UserRequest } from '@theia/ai-core';
+import { CancellationToken, ILogger } from '@theia/core';
 import { ChatRequest, Message, Ollama, Tool } from 'ollama';
 export declare const OllamaModelIdentifier: unique symbol;
-export declare class OllamaModel implements LanguageModel {
-    readonly id: string;
-    protected readonly model: string;
+export interface OllamaModelParams {
+    id: string;
+    model: string;
     status: LanguageModelStatus;
-    protected host: () => string | undefined;
-    proxy?: string | undefined;
-    reasoningSupport?: ReasoningSupport | undefined;
+    host: () => string | undefined;
+    proxy?: string;
+    reasoningSupport?: ReasoningSupport;
+}
+export declare const OllamaModelParams: unique symbol;
+export declare const OllamaLanguageModelFactory: unique symbol;
+export type OllamaLanguageModelFactory = (params: OllamaModelParams) => OllamaModel;
+export declare class OllamaModel implements LanguageModel {
     protected readonly DEFAULT_REQUEST_SETTINGS: Partial<Omit<ChatRequest, 'stream' | 'model'>>;
     readonly providerId = "ollama";
     readonly vendor: string;
-    /**
-     * @param id the unique id for this language model. It will be used to identify the model in the UI.
-     * @param model the unique model name as used in the Ollama environment.
-     * @param hostProvider a function to provide the host URL for the Ollama server.
-     */
-    constructor(id: string, model: string, status: LanguageModelStatus, host: () => string | undefined, proxy?: string | undefined, reasoningSupport?: ReasoningSupport | undefined);
+    id: string;
+    protected model: string;
+    status: LanguageModelStatus;
+    protected host: () => string | undefined;
+    proxy?: string;
+    reasoningSupport?: ReasoningSupport;
+    protected readonly params: OllamaModelParams;
+    protected readonly toolCallExecutor: ToolCallExecutor;
+    protected readonly logger: ILogger;
+    protected init(): void;
     request(request: UserRequest, cancellationToken?: CancellationToken): Promise<LanguageModelResponse>;
     /**
      * Retrieves the settings for the chat request, merging the request-specific settings with the default settings.
@@ -43,7 +52,7 @@ export declare class OllamaModel implements LanguageModel {
     protected handleStructuredOutputRequest(ollama: Ollama, chatRequest: ChatRequest): Promise<LanguageModelParsedResponse>;
     protected handleNonStreamingRequest(ollama: Ollama, chatRequest: ExtendedNonStreamingChatRequest, cancellation?: CancellationToken, reasoning?: ReasoningSettings): Promise<LanguageModelResponse>;
     private createToolCalls;
-    private processToolCalls;
+    protected processToolCalls(toolCalls: ToolCall[], chatRequest: ExtendedChatRequest, cancellation?: CancellationToken): Promise<ToolCall[]>;
     protected initializeOllama(): Ollama;
     protected toOllamaTool(tool: ToolRequest): ToolWithHandler;
     protected normalizeProp(prop: ToolRequestParameterProperty): ToolRequestParameterProperty;
@@ -59,7 +68,7 @@ export declare class OllamaModel implements LanguageModel {
  * @see Tool
  */
 type ToolWithHandler = Tool & {
-    handler: (arg_string: string) => Promise<unknown>;
+    handler: (arg_string: string, ctx?: ToolInvocationContext) => Promise<unknown>;
 };
 /**
  * Extended chat request with mandatory messages and ToolWithHandler tools

package/lib/node/ollama-language-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama-language-model.d.ts","sourceRoot":"","sources":["../../src/node/ollama-language-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ollama-language-model.d.ts","sourceRoot":"","sources":["../../src/node/ollama-language-model.ts"],"names":[],"mappings":"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"}

package/lib/node/ollama-language-model.js

@@ -15,25 +15,19 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OllamaModel = exports.OllamaModelIdentifier = void 0;
+exports.OllamaModel = exports.OllamaLanguageModelFactory = exports.OllamaModelParams = exports.OllamaModelIdentifier = void 0;
+const tslib_1 = require("tslib");
 const ai_core_1 = require("@theia/ai-core");
+const core_1 = require("@theia/core");
+const inversify_1 = require("@theia/core/shared/inversify");
 const ollama_1 = require("ollama");
 const node_1 = require("@theia/ai-core/lib/node");
 const ollama_reasoning_1 = require("./ollama-reasoning");
 exports.OllamaModelIdentifier = Symbol('OllamaModelIdentifier');
-class OllamaModel {
-    /**
-     * @param id the unique id for this language model. It will be used to identify the model in the UI.
-     * @param model the unique model name as used in the Ollama environment.
-     * @param hostProvider a function to provide the host URL for the Ollama server.
-     */
-    constructor(id, model, status, host, proxy, reasoningSupport) {
-        this.id = id;
-        this.model = model;
-        this.status = status;
-        this.host = host;
-        this.proxy = proxy;
-        this.reasoningSupport = reasoningSupport;
+exports.OllamaModelParams = Symbol('OllamaModelParams');
+exports.OllamaLanguageModelFactory = Symbol('OllamaLanguageModelFactory');
+let OllamaModel = class OllamaModel {
+    constructor() {
         this.DEFAULT_REQUEST_SETTINGS = {
             keep_alive: '15m',
             // options see: https://github.com/ollama/ollama/blob/main/docs/modelfile.md#valid-parameters-and-values
@@ -42,6 +36,15 @@ class OllamaModel {
         this.providerId = 'ollama';
         this.vendor = 'Ollama';
     }
+    init() {
+        const params = this.params;
+        this.id = params.id;
+        this.model = params.model;
+        this.status = params.status;
+        this.host = params.host;
+        this.proxy = params.proxy;
+        this.reasoningSupport = params.reasoningSupport;
+    }
     async request(request, cancellationToken) {
         const settings = this.getSettings(request);
         const ollama = this.initializeOllama();
@@ -138,7 +141,7 @@ class OllamaModel {
                         const toolCallsForResponse = that.createToolCalls(toolCalls, lastUpdated);
                         yield { tool_calls: toolCallsForResponse };
                         // Now handle the tool calls
-                        const processedToolCallsForResponse = await that.processToolCalls(toolCallsForResponse, chatRequest);
+                        const processedToolCallsForResponse = await that.processToolCalls(toolCallsForResponse, chatRequest, cancellation);
                         yield { tool_calls: processedToolCallsForResponse };
                         // Continue the conversation with tool results
                         const continuedResponse = await that.handleStreamingRequest(ollama, chatRequest, cancellation, reasoning);
@@ -149,7 +152,7 @@ class OllamaModel {
                     }
                 }
                 catch (error) {
-                    console.error('Error in Ollama streaming:', error.message);
+                    that.logger.error('Error in Ollama streaming:', error.message);
                     throw error;
                 }
             }
@@ -193,8 +196,7 @@ class OllamaModel {
             return result;
         }
         catch (error) {
-            // TODO use ILogger
-            console.log('Failed to parse structured response from the language model.', error);
+            this.logger.warn('Failed to parse structured response from the language model.', error);
             const result = {
                 content: response.message.content,
                 parsed: {}
@@ -250,7 +252,7 @@ class OllamaModel {
                     tool_calls: toolCalls
                 });
                 const preparedToolCalls = this.createToolCalls(toolCalls, lastUpdated);
-                await this.processToolCalls(preparedToolCalls, chatRequest);
+                await this.processToolCalls(preparedToolCalls, chatRequest, cancellation);
                 if (cancellation?.isCancellationRequested) {
                     return { text: '' };
                 }
@@ -265,7 +267,7 @@ class OllamaModel {
             return result;
         }
         catch (error) {
-            console.error('Error in ollama call:', error.message);
+            this.logger.error('Error in ollama call:', error.message);
             throw error;
         }
     }
@@ -284,19 +286,22 @@ class OllamaModel {
         }
         return toolCallsForResponse;
     }
-    async processToolCalls(toolCalls, chatRequest) {
+    async processToolCalls(toolCalls, chatRequest, cancellation) {
         const tools = chatRequest.tools ?? [];
+        // The tools have already been converted for Ollama, so only the `ExecutableTool` shape is recovered here.
+        const executableTools = tools.map(tool => ({
+            name: tool.function.name ?? '',
+            handler: async (argString, ctx) => (await tool.handler(argString, ctx))
+        }));
+        const results = await this.toolCallExecutor.executeToolCalls(toolCalls.map(call => ({ id: call.id ?? call.function.name, name: call.function.name, arguments: call.function.arguments })), executableTools, { cancellationToken: cancellation });
+        // Build the messages and response entries from the input-ordered results so that the
+        // next turn sees a deterministic ordering.
         const toolCallsForResponse = [];
-        for (const call of toolCalls) {
-            const functionToCall = tools.find(tool => tool.function.name === call.function.name);
-            let funcResult;
-            if (functionToCall) {
-                const rawResult = await functionToCall.handler(call.function.arguments);
-                funcResult = typeof rawResult === 'string' ? rawResult : JSON.stringify(rawResult);
-            }
-            else {
-                funcResult = 'error: Tool not found';
-            }
+        toolCalls.forEach((call, index) => {
+            const outcome = results[index];
+            const funcResult = outcome.notFound
+                ? 'error: Tool not found'
+                : typeof outcome.result === 'string' ? outcome.result : JSON.stringify(outcome.result);
             chatRequest.messages.push({
                 role: 'tool',
                 content: `Tool call ${call.function.name} returned: ${String(funcResult)}`,
@@ -307,7 +312,7 @@ class OllamaModel {
                 result: String(funcResult),
                 finished: true
             });
-        }
+        });
         return toolCallsForResponse;
     }
     initializeOllama() {
@@ -403,7 +408,7 @@ class OllamaModel {
             return undefined;
         }
         else {
-            console.log(`Unknown message type encountered when converting message to Ollama format: ${JSON.stringify(message)}. Ignoring message.`);
+            this.logger.warn(`Unknown message type encountered when converting message to Ollama format: ${JSON.stringify(message)}. Ignoring message.`);
             return undefined;
         }
         return result;
@@ -462,11 +467,33 @@ class OllamaModel {
         if (actor === 'system') {
             return 'system';
         }
-        console.log(`Unknown actor encountered when converting message to Ollama format: ${actor}. Falling back to 'user'.`);
+        this.logger.warn(`Unknown actor encountered when converting message to Ollama format: ${actor}. Falling back to 'user'.`);
         return 'user'; // default fallback
     }
-}
+};
 exports.OllamaModel = OllamaModel;
+tslib_1.__decorate([
+    (0, inversify_1.inject)(exports.OllamaModelParams),
+    tslib_1.__metadata("design:type", Object)
+], OllamaModel.prototype, "params", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(ai_core_1.ToolCallExecutor),
+    tslib_1.__metadata("design:type", Object)
+], OllamaModel.prototype, "toolCallExecutor", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(core_1.ILogger),
+    (0, inversify_1.named)('ai-ollama:OllamaModel'),
+    tslib_1.__metadata("design:type", Object)
+], OllamaModel.prototype, "logger", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.postConstruct)(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", void 0)
+], OllamaModel.prototype, "init", null);
+exports.OllamaModel = OllamaModel = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], OllamaModel);
 function isNonStreaming(request) {
     return !request.stream;
 }

package/lib/node/ollama-language-model.js.map

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

package/lib/node/ollama-language-model.spec.js

@@ -15,12 +15,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 const chai_1 = require("chai");
+const inversify_1 = require("@theia/core/shared/inversify");
+const core_1 = require("@theia/core");
+const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
+const ai_core_1 = require("@theia/ai-core");
 const ollama_language_model_1 = require("./ollama-language-model");
-class TestableOllamaModel extends ollama_language_model_1.OllamaModel {
-    constructor() {
-        super('test-id', 'test-model', { status: 'ready' }, () => 'http://localhost:11434');
-    }
+let TestableOllamaModel = class TestableOllamaModel extends ollama_language_model_1.OllamaModel {
     callMergeConsecutiveAssistantMessages(messages) {
         return this.mergeConsecutiveAssistantMessages(messages);
     }
@@ -31,9 +33,27 @@ class TestableOllamaModel extends ollama_language_model_1.OllamaModel {
             stream: true
         });
     }
+};
+TestableOllamaModel = tslib_1.__decorate([
+    (0, inversify_1.injectable)()
+], TestableOllamaModel);
+function createModel() {
+    const parent = new inversify_1.Container();
+    parent.bind(ai_core_1.ToolCallExecutor).to(ai_core_1.ToolCallExecutorImpl);
+    parent.bind(core_1.ILogger).to(mock_logger_1.MockLogger);
+    parent.bind(TestableOllamaModel).toSelf().inTransientScope();
+    const child = new inversify_1.Container();
+    child.parent = parent;
+    child.bind(ollama_language_model_1.OllamaModelParams).toConstantValue({
+        id: 'test-id',
+        model: 'test-model',
+        status: { status: 'ready' },
+        host: () => 'http://localhost:11434'
+    });
+    return child.get(TestableOllamaModel);
 }
 describe('OllamaModel - mergeConsecutiveAssistantMessages', () => {
-    const model = new TestableOllamaModel();
+    const model = createModel();
     it('should merge an assistant text message followed by an assistant tool_use into a single message', () => {
         const messages = [
             { role: 'user', content: 'do something' },
@@ -121,7 +141,7 @@ describe('OllamaModel - mergeConsecutiveAssistantMessages', () => {
 });
 describe('OllamaModel - handleStreamingRequest', () => {
     it('should accept tool_calls as a valid done reason', async () => {
-        const model = new TestableOllamaModel();
+        const model = createModel();
         const responseStream = {
             async *[Symbol.asyncIterator]() {
                 yield {

package/lib/node/ollama-language-model.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"ollama-language-model.spec.js","sourceRoot":"","sources":["../../src/node/ollama-language-model.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ollama-language-model.spec.js","sourceRoot":"","sources":["../../src/node/ollama-language-model.spec.ts"],"names":[],"mappings":"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"}

package/lib/node/ollama-language-models-manager-impl.d.ts

@@ -1,10 +1,12 @@
 import { LanguageModelRegistry, LanguageModelStatus } from '@theia/ai-core';
+import { OllamaLanguageModelFactory } from './ollama-language-model';
 import { OllamaLanguageModelsManager, OllamaModelDescription } from '../common';
 import { ILogger } from '@theia/core';
 export declare class OllamaLanguageModelsManagerImpl implements OllamaLanguageModelsManager {
     protected _host: string | undefined;
     protected _proxyUrl: string | undefined;
     protected readonly languageModelRegistry: LanguageModelRegistry;
+    protected readonly ollamaLanguageModelFactory: OllamaLanguageModelFactory;
     protected readonly logger: ILogger;
     get host(): string | undefined;
     protected calculateStatus(host: string | undefined): LanguageModelStatus;

package/lib/node/ollama-language-models-manager-impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama-language-models-manager-impl.d.ts","sourceRoot":"","sources":["../../src/node/ollama-language-models-manager-impl.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAI5E,OAAO,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,+BAAgC,YAAW,2BAA2B;IAE/E,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAID,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,mBAAmB;IAIlE,4BAA4B,CAAC,GAAG,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCtF,oBAAoB,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAIjD,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAQzC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CASzD"}
+{"version":3,"file":"ollama-language-models-manager-impl.d.ts","sourceRoot":"","sources":["../../src/node/ollama-language-models-manager-impl.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAG5E,OAAO,EAAE,0BAA0B,EAAe,MAAM,yBAAyB,CAAC;AAClF,OAAO,EAAE,2BAA2B,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,qBACa,+BAAgC,YAAW,2BAA2B;IAE/E,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAGxC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,qBAAqB,CAAC;IAGhE,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,0BAA0B,CAAC;IAG1E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,IAAI,IAAI,IAAI,MAAM,GAAG,SAAS,CAE7B;IAID,SAAS,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,mBAAmB;IAIlE,4BAA4B,CAAC,GAAG,MAAM,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoCtF,oBAAoB,CAAC,GAAG,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI;IAIjD,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAQzC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CASzD"}

package/lib/node/ollama-language-models-manager-impl.js

@@ -53,7 +53,14 @@ let OllamaLanguageModelsManagerImpl = class OllamaLanguageModelsManagerImpl {
             else {
                 const status = this.calculateStatus(host);
                 this.languageModelRegistry.addLanguageModels([
-                    new ollama_language_model_1.OllamaModel(modelDescription.id, modelDescription.model, status, hostProvider, proxyUrl, modelDescription.reasoningSupport)
+                    this.ollamaLanguageModelFactory({
+                        id: modelDescription.id,
+                        model: modelDescription.model,
+                        status,
+                        host: hostProvider,
+                        proxy: proxyUrl,
+                        reasoningSupport: modelDescription.reasoningSupport
+                    })
                 ]);
             }
         }
@@ -84,6 +91,10 @@ tslib_1.__decorate([
     (0, inversify_1.inject)(ai_core_1.LanguageModelRegistry),
     tslib_1.__metadata("design:type", Object)
 ], OllamaLanguageModelsManagerImpl.prototype, "languageModelRegistry", void 0);
+tslib_1.__decorate([
+    (0, inversify_1.inject)(ollama_language_model_1.OllamaLanguageModelFactory),
+    tslib_1.__metadata("design:type", Function)
+], OllamaLanguageModelsManagerImpl.prototype, "ollamaLanguageModelFactory", void 0);
 tslib_1.__decorate([
     (0, inversify_1.inject)(core_1.ILogger),
     (0, inversify_1.named)('ai-ollama:OllamaLanguageModelsManagerImpl'),

package/lib/node/ollama-language-models-manager-impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"ollama-language-models-manager-impl.js","sourceRoot":"","sources":["../../src/node/ollama-language-models-manager-impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ollama-language-models-manager-impl.js","sourceRoot":"","sources":["../../src/node/ollama-language-models-manager-impl.ts"],"names":[],"mappings":"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"}