mirror of
https://github.com/amithkoujalgi/ollama4j.git
synced 2025-10-14 01:18:58 +02:00
f5ca5bdca3
This update modifies the OllamaAPI class and associated request classes to improve the handling of tools. The ToolRegistry now manages a list of Tools.Tool objects instead of ToolSpecification, streamlining tool registration and retrieval. The OllamaGenerateRequest and OllamaChatRequest classes have been updated to reflect this change, ensuring consistency across the API. Additionally, several deprecated methods and commented-out code have been removed for clarity. Integration tests have been adjusted to accommodate these changes, enhancing overall test reliability.
68 lines
3.0 KiB
Java
68 lines
3.0 KiB
Java
/*
|
|
* Ollama4j - Java library for interacting with Ollama server.
|
|
* Copyright (c) 2025 Amith Koujalgi and contributors.
|
|
*
|
|
* Licensed under the MIT License (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
*
|
|
*/
|
|
package io.github.ollama4j.unittests;
|
|
|
|
class TestToolsPromptBuilder {
|
|
//
|
|
// @Test
|
|
// void testPromptBuilderIncludesToolsAndPrompt() throws JsonProcessingException {
|
|
// Tools.PromptFuncDefinition.Property cityProp =
|
|
// Tools.PromptFuncDefinition.Property.builder()
|
|
// .type("string")
|
|
// .description("city name")
|
|
// .required(true)
|
|
// .build();
|
|
//
|
|
// Tools.PromptFuncDefinition.Property unitsProp =
|
|
// Tools.PromptFuncDefinition.Property.builder()
|
|
// .type("string")
|
|
// .description("units")
|
|
// .enumValues(List.of("metric", "imperial"))
|
|
// .required(false)
|
|
// .build();
|
|
//
|
|
// Tools.PromptFuncDefinition.Parameters params =
|
|
// Tools.PromptFuncDefinition.Parameters.builder()
|
|
// .type("object")
|
|
// .properties(Map.of("city", cityProp, "units", unitsProp))
|
|
// .build();
|
|
//
|
|
// Tools.PromptFuncDefinition.PromptFuncSpec spec =
|
|
// Tools.PromptFuncDefinition.PromptFuncSpec.builder()
|
|
// .name("getWeather")
|
|
// .description("Get weather for a city")
|
|
// .parameters(params)
|
|
// .build();
|
|
//
|
|
// Tools.PromptFuncDefinition def =
|
|
// Tools.PromptFuncDefinition.builder().type("function").function(spec).build();
|
|
//
|
|
// Tools.ToolSpecification toolSpec =
|
|
// Tools.ToolSpecification.builder()
|
|
// .functionName("getWeather")
|
|
// .functionDescription("Get weather for a city")
|
|
// .toolPrompt(def)
|
|
// .build();
|
|
//
|
|
// Tools.PromptBuilder pb =
|
|
// new Tools.PromptBuilder()
|
|
// .withToolSpecification(toolSpec)
|
|
// .withPrompt("Tell me the weather.");
|
|
//
|
|
// String built = pb.build();
|
|
// assertTrue(built.contains("[AVAILABLE_TOOLS]"));
|
|
// assertTrue(built.contains("[/AVAILABLE_TOOLS]"));
|
|
// assertTrue(built.contains("[INST]"));
|
|
// assertTrue(built.contains("Tell me the weather."));
|
|
// assertTrue(built.contains("\"name\":\"getWeather\""));
|
|
// assertTrue(built.contains("\"required\":[\"city\"]"));
|
|
// assertTrue(built.contains("\"enum\":[\"metric\",\"imperial\"]"));
|
|
// }
|
|
}
|