Skip to content

Commit

Permalink
Fix Format 2
Browse files Browse the repository at this point in the history
  • Loading branch information
humcqc committed Jun 12, 2024
1 parent 9f951e7 commit 19f2157
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package io.quarkiverse.langchain4j.ollama.tools;

import dev.langchain4j.service.SystemMessage;
import dev.langchain4j.service.UserMessage;
import io.quarkiverse.langchain4j.RegisterAiService;
import io.quarkus.test.junit.QuarkusTest;
import static org.assertj.core.api.Assertions.assertThat;

import jakarta.enterprise.context.control.ActivateRequestContext;
import jakarta.inject.Inject;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;
import dev.langchain4j.service.SystemMessage;
import dev.langchain4j.service.UserMessage;
import io.quarkiverse.langchain4j.RegisterAiService;
import io.quarkus.test.junit.QuarkusTest;

@Disabled("Integration tests that need an ollama server running")
@DisplayName("LLM Tools test - " + Llama3ToolsTest.MODEL_NAME)
Expand Down Expand Up @@ -49,6 +51,7 @@ public interface Assistant {
""")
String answer(String condominium, String request);
}

@Inject
Assistant assistant;

Expand All @@ -71,8 +74,8 @@ void should_not_calls_tool() {
public interface PoemService {
@SystemMessage("You are a professional poet")
@UserMessage("""
Write a poem about {topic}. The poem should be {lines} lines long. Then send this poem by email.
""")
Write a poem about {topic}. The poem should be {lines} lines long. Then send this poem by email.
""")
String writeAPoem(String topic, int lines);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package io.quarkiverse.langchain4j.ollama.tools;

import dev.langchain4j.agent.tool.Tool;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Singleton;

import dev.langchain4j.agent.tool.Tool;
import io.quarkus.logging.Log;

public class Tools {

@Singleton
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
package io.quarkiverse.langchain4j.ollama;

import static io.quarkiverse.langchain4j.ollama.ChatRequest.Builder;

import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import dev.langchain4j.agent.tool.ToolExecutionRequest;
import dev.langchain4j.agent.tool.ToolParameters;
import dev.langchain4j.agent.tool.ToolSpecification;
Expand All @@ -8,13 +15,6 @@
import dev.langchain4j.model.input.Prompt;
import dev.langchain4j.model.input.PromptTemplate;

import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import static io.quarkiverse.langchain4j.ollama.ChatRequest.Builder;

public abstract class AbstractToolsHandler implements ToolsHandler {

static final Pattern PATTERN1 = Pattern.compile("Tool (.?) called with parameters");
Expand Down

0 comments on commit 19f2157

Please sign in to comment.