From 3ea374bf64ac0ed7094477da411282646a6ac5c0 Mon Sep 17 00:00:00 2001 From: Dmytro Liubarskyi Date: Thu, 27 Feb 2025 12:39:16 +0100 Subject: [PATCH] Remove old generate() API --- dbpedia-example/src/main/java/DbPediaSparqlExample.java | 4 ++-- .../main/java/GitHubModelsFunctionCallingExamples.java | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dbpedia-example/src/main/java/DbPediaSparqlExample.java b/dbpedia-example/src/main/java/DbPediaSparqlExample.java index 760f99a1..fbd61b5c 100644 --- a/dbpedia-example/src/main/java/DbPediaSparqlExample.java +++ b/dbpedia-example/src/main/java/DbPediaSparqlExample.java @@ -162,7 +162,7 @@ private static String extractSubject(AzureOpenAiChatModel model, String question // Applying the variables to the prompt template Prompt prompt = extractSubjectPromptTemplate.apply(variables); // Generating and returning the subject using the Azure OpenAI model - return model.generate(prompt.text()); + return model.chat(prompt.text()); } /** @@ -195,6 +195,6 @@ private static String generateAnswer(AzureOpenAiChatModel model, String subject, // Applying the variables to the prompt template Prompt prompt = extractAnswerPromptTemplate.apply(variables); // Generating and returning the answer using the Azure OpenAI model - return model.generate(prompt.text()); + return model.chat(prompt.text()); } } diff --git a/github-models-examples/src/main/java/GitHubModelsFunctionCallingExamples.java b/github-models-examples/src/main/java/GitHubModelsFunctionCallingExamples.java index 095c16e1..1dc580b2 100644 --- a/github-models-examples/src/main/java/GitHubModelsFunctionCallingExamples.java +++ b/github-models-examples/src/main/java/GitHubModelsFunctionCallingExamples.java @@ -3,6 +3,7 @@ import dev.langchain4j.data.message.ChatMessage; import dev.langchain4j.data.message.ToolExecutionResultMessage; import dev.langchain4j.data.message.UserMessage; +import dev.langchain4j.model.chat.request.ChatRequest; import dev.langchain4j.model.github.GitHubModelsChatModel; import dev.langchain4j.service.tool.DefaultToolExecutor; import dev.langchain4j.service.tool.ToolExecutor; @@ -47,9 +48,13 @@ public static void main(String[] args) { UserMessage userMessage = userMessage("What will the weather be like in London tomorrow?"); chatMessages.add(userMessage); + ChatRequest request = ChatRequest.builder() + .messages(chatMessages) + .toolSpecifications(toolSpecifications) + .build(); // STEP 2: Model generate function arguments - AiMessage aiMessage = model.generate(chatMessages, toolSpecifications).content(); + AiMessage aiMessage = model.chat(request).aiMessage(); List toolExecutionRequests = aiMessage.toolExecutionRequests(); System.out.println("Out of the " + toolSpecifications.size() + " functions declared in WeatherTools, " + toolExecutionRequests.size() + " will be invoked:"); toolExecutionRequests.forEach(toolExecutionRequest -> { @@ -70,7 +75,7 @@ public static void main(String[] args) { // STEP 4: Model generate final response - AiMessage finalResponse = model.generate(chatMessages).content(); + AiMessage finalResponse = model.chat(chatMessages).aiMessage(); System.out.println(finalResponse.text()); //According to the payment data, the payment status of transaction T1005 is Pending. } }