Skip to content

LangChain4j - Make modelName optional if providing ChatModel or StreamingChatModel #1126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marttp wants to merge 1 commit into
base: main
Choose a base branch
from
+77 −1
Open

LangChain4j - Make modelName optional if providing ChatModel or StreamingChatModel #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion contrib/langchain4j/src/main/java/com/google/adk/models/langchain4j/LangChain4j.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import org.jspecify.annotations.Nullable;

Expand All @@ -96,6 +97,7 @@ public abstract class LangChain4j extends BaseLlm {

public abstract ObjectMapper objectMapper();

@Nullable
public abstract String modelName();

@Nullable
Expand All @@ -122,7 +124,32 @@ public abstract static class Builder {

public abstract Builder modelName(String modelName);

public abstract LangChain4j build();
abstract @Nullable ChatModel chatModel();

abstract @Nullable StreamingChatModel streamingChatModel();

abstract @Nullable String modelName();

abstract LangChain4j autoBuild();

public LangChain4j build() {
if (Objects.isNull(modelName())) {
// Try to extract modelName from chatModel or streamingChatModel
if (!Objects.isNull(chatModel())
&& !Objects.isNull(chatModel().defaultRequestParameters())) {
modelName(chatModel().defaultRequestParameters().modelName());
} else if (!Objects.isNull(streamingChatModel())
&& !Objects.isNull(streamingChatModel().defaultRequestParameters())) {
modelName(streamingChatModel().defaultRequestParameters().modelName());
}
}
// Up to this step, if modelName still null - Fail fast
if (modelName() == null) {
throw new IllegalStateException(
"modelName is required. Either set it explicitly via modelName() or provide a ChatModel/StreamingChatModel");
}
return autoBuild();
}
}

public LangChain4j(ChatModel chatModel) {
Expand Down
49 changes: 49 additions & 0 deletions contrib/langchain4j/src/test/java/com/google/adk/models/langchain4j/LangChain4jTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import dev.langchain4j.model.chat.ChatModel;
import dev.langchain4j.model.chat.StreamingChatModel;
import dev.langchain4j.model.chat.request.ChatRequest;
import dev.langchain4j.model.chat.request.ChatRequestParameters;
import dev.langchain4j.model.chat.request.json.JsonObjectSchema;
import dev.langchain4j.model.chat.request.json.JsonStringSchema;
import dev.langchain4j.model.chat.response.ChatResponse;
Expand Down Expand Up @@ -993,4 +994,52 @@ void testGenerateContentWithNullAiMessageText() {
assertThat(response.content()).isPresent();
assertThat(response.content().get().parts().orElse(List.of())).isEmpty();
}

@Test
@DisplayName("Should auto-detect model name from ChatModel when not explicitly set")
void testBuilderAutoDetectsModelNameFromChatModel() {
// Given
final ChatRequestParameters params = mock(ChatRequestParameters.class);
when(params.modelName()).thenReturn("auto-detected-model");
when(chatModel.defaultRequestParameters()).thenReturn(params);

// When
final LangChain4j lc4j = LangChain4j.builder().chatModel(chatModel).build();

// Then
assertThat(lc4j.modelName()).isEqualTo("auto-detected-model");
assertThat(lc4j.model()).isEqualTo("auto-detected-model");
}

@Test
@DisplayName("Should auto-detect model name from StreamingChatModel when not explicitly set")
void testBuilderAutoDetectsModelNameFromStreamingChatModel() {
// Given
final ChatRequestParameters params = mock(ChatRequestParameters.class);
when(params.modelName()).thenReturn("auto-detected-streaming-model");
when(streamingChatModel.defaultRequestParameters()).thenReturn(params);

// When
final LangChain4j lc4j = LangChain4j.builder().streamingChatModel(streamingChatModel).build();

// Then
assertThat(lc4j.modelName()).isEqualTo("auto-detected-streaming-model");
assertThat(lc4j.model()).isEqualTo("auto-detected-streaming-model");
}

@Test
@DisplayName("Should prefer explicit model name over auto-detected one")
void testBuilderPrefersExplicitModelName() {
// Given
final ChatRequestParameters params = mock(ChatRequestParameters.class);
when(params.modelName()).thenReturn("auto-detected-model");
when(chatModel.defaultRequestParameters()).thenReturn(params);

// When
final LangChain4j lc4j =
LangChain4j.builder().chatModel(chatModel).modelName("explicit-model").build();

// Then
assertThat(lc4j.modelName()).isEqualTo("explicit-model");
}
}