feat: update OllamaTools to include age function and integrate chat role handling

Author: caperaven

app/ollama-tools/ollama-tools.js

@@ -1,26 +1,24 @@
-import {OllamaModule} from "./../../src/modules/ollama.js";
+import {OllamaModule, ChatRoles} from "./../../src/modules/ollama.js";
 
 const tools = [
 	{
 		"type": "function",
 		"function": {
-			"name": "example_function",
-			"description": "This is an example function",
-			"parameters": [
-				{
-					"type": "object",
-					"properties": {
-						"option": {
-							"type": "string",
-							"description": "The value to return",
-							"enum": ["option1", "option2"]
-						}
+			"name": "age",
+			"description": "Return the age of a person",
+			"parameters": {
+				"type": "object",
+				"properties": {
+					"personAge": {
+						"type": "integer",
+						"description": "The age of the person"
 					}
-				}
-			],
+				},
+				"required": ["personAge"]
+			}
 		}
 	}
-]
+]  
 
 export default class OllamaToolsView extends HTMLElement {
 	static tag = "ollama-tools-view";
@@ -51,8 +49,50 @@ export default class OllamaToolsView extends HTMLElement {
 		}
 	}
 
-	callFunction(event) {
-		alert("click")
+	async callFunction(event) {
+		const result = [];
+
+		const message = await OllamaModule.create_message({
+			text: "Do you know how old the person is?"
+		});
+
+		const callResult = await OllamaModule.chat({
+			"model": "llama3.2",
+			"tools": tools,
+			"messages": [ message ], 
+			"stream": false
+		})
+
+		for await (const data of callResult) {
+			result.push(data);
+		}
+
+		const toolsJson = JSON.parse(result[0]);
+		const functionDefinition = toolsJson.message.tool_calls[0];
+		const functionName = functionDefinition.function.name;
+		const functionArgs = functionDefinition.function.arguments;
+
+		console.log(functionName, functionArgs);
+
+		const functionCallMessage = await OllamaModule.create_message({
+			role: ChatRoles.TOOL,
+			text: `22`
+		});
+
+		const finalResult = await OllamaModule.chat({
+			"model": "llama3.2",
+			"tools": tools,
+			"messages": [ message, functionCallMessage ],
+			"stream": false
+		});
+
+		result.length = 0;
+
+		for await (const data of finalResult) {
+			result.push(data);
+		}
+
+		this.shadowRoot.querySelector(".container").textContent = JSON.parse(result[0]).message.content;
 	}
 }
 

src/modules/ollama.js

@@ -41,6 +41,7 @@ export const ChatRoles = Object.freeze({
 	USER: "user",
 	ASSISTANT: "assistant",
 	SYSTEM: "system",
+	TOOL: "tool"
 });
 
 export class OllamaModule {
@@ -210,7 +211,7 @@ function createUrl(args, path) {
  * @returns {Object} - The decorated body
  */
 function decorateBody(body, properties, args) {
-	for (const key in properties) {
+	for (const key of properties) {
 		if (key in args) {
 			body[key] = args[key];
 		}