Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
import dev.langchain4j.data.embedding.Embedding;
import dev.langchain4j.data.segment.TextSegment;
import dev.langchain4j.model.embedding.EmbeddingModel;
import dev.langchain4j.model.output.Response;
import dev.langchain4j.model.embedding.request.EmbeddingRequest;
import dev.langchain4j.model.embedding.response.EmbeddingResponse;
import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
import org.apache.camel.Message;
Expand Down Expand Up @@ -84,13 +85,14 @@ private void processSingle(Exchange exchange, EmbeddingModel model, Message mess
.build();
GenAiObservation observation = GenAiObservability.start(exchange, observationContext);
try {
final Response<Embedding> result = model.embed(in);
final EmbeddingResponse result = model.embed(EmbeddingRequest.builder().textSegment(in).build());
populateHeaders(message, result, in, observationContext.requestModel());
// an EmbeddingResponse has no finish reason
observation.recordSuccess(GenAiUsage.of(
result.tokenUsage() != null ? result.tokenUsage().inputTokenCount() : null,
result.tokenUsage() != null ? result.tokenUsage().outputTokenCount() : null,
result.finishReason(),
null));
null,
result.modelName()));
} catch (RuntimeException e) {
GenAiErrorSupport.apply(exchange, e);
observation.recordError(e);
Expand All @@ -116,14 +118,15 @@ private void processBatch(Exchange exchange, EmbeddingModel model, Message messa
.build();
GenAiObservation observation = GenAiObservability.start(exchange, observationContext);
try {
final Response<List<Embedding>> result = model.embedAll(segments);
final EmbeddingResponse result = model.embed(EmbeddingRequest.builder().textSegments(segments).build());

populateBatchHeaders(message, result, segments, observationContext.requestModel());
// an EmbeddingResponse has no finish reason
observation.recordSuccess(GenAiUsage.of(
result.tokenUsage() != null ? result.tokenUsage().inputTokenCount() : null,
result.tokenUsage() != null ? result.tokenUsage().outputTokenCount() : null,
result.finishReason(),
null));
null,
result.modelName()));
} catch (RuntimeException e) {
GenAiErrorSupport.apply(exchange, e);
observation.recordError(e);
Expand Down Expand Up @@ -183,6 +186,7 @@ private static String typeOf(Object value) {
private static void removeResultHeaders(Message message) {
message.removeHeader(LangChain4jEmbeddingsHeaders.REQUEST_MODEL);
message.removeHeader(LangChain4jEmbeddingsHeaders.FINISH_REASON);
message.removeHeader(LangChain4jEmbeddingsHeaders.RESPONSE_MODEL);
message.removeHeader(LangChain4jEmbeddingsHeaders.INPUT_TOKEN_COUNT);
message.removeHeader(LangChain4jEmbeddingsHeaders.OUTPUT_TOKEN_COUNT);
message.removeHeader(LangChain4jEmbeddingsHeaders.TOTAL_TOKEN_COUNT);
Expand All @@ -194,14 +198,13 @@ private static void removeResultHeaders(Message message) {
}

private static void populateHeaders(
Message message, Response<Embedding> result, TextSegment textSegment, String requestModel) {
Message message, EmbeddingResponse result, TextSegment textSegment, String requestModel) {
removeResultHeaders(message);
if (requestModel != null) {
message.setHeader(LangChain4jEmbeddingsHeaders.REQUEST_MODEL, requestModel);
}

if (result.finishReason() != null) {
message.setHeader(LangChain4jEmbeddingsHeaders.FINISH_REASON, result.finishReason());
if (result.modelName() != null) {
message.setHeader(LangChain4jEmbeddingsHeaders.RESPONSE_MODEL, result.modelName());
}

if (result.tokenUsage() != null) {
Expand All @@ -210,20 +213,23 @@ private static void populateHeaders(
message.setHeader(LangChain4jEmbeddingsHeaders.TOTAL_TOKEN_COUNT, result.tokenUsage().totalTokenCount());
}

message.setHeader(LangChain4jEmbeddingsHeaders.VECTOR, result.content().vector());
if (result.embeddings() == null || result.embeddings().isEmpty()) {
throw new IllegalStateException("The embedding model returned no embedding");
}
Embedding embedding = result.embeddings().get(0);
message.setHeader(LangChain4jEmbeddingsHeaders.VECTOR, embedding.vector());
message.setHeader(LangChain4jEmbeddingsHeaders.TEXT_SEGMENT, textSegment);
message.setHeader(LangChain4jEmbeddingsHeaders.EMBEDDING, result.content());
message.setHeader(LangChain4jEmbeddingsHeaders.EMBEDDING, embedding);
}

private static void populateBatchHeaders(
Message message, Response<List<Embedding>> result, List<TextSegment> segments, String requestModel) {
Message message, EmbeddingResponse result, List<TextSegment> segments, String requestModel) {
removeResultHeaders(message);
if (requestModel != null) {
message.setHeader(LangChain4jEmbeddingsHeaders.REQUEST_MODEL, requestModel);
}

if (result.finishReason() != null) {
message.setHeader(LangChain4jEmbeddingsHeaders.FINISH_REASON, result.finishReason());
if (result.modelName() != null) {
message.setHeader(LangChain4jEmbeddingsHeaders.RESPONSE_MODEL, result.modelName());
}

if (result.tokenUsage() != null) {
Expand All @@ -232,8 +238,7 @@ private static void populateBatchHeaders(
message.setHeader(LangChain4jEmbeddingsHeaders.TOTAL_TOKEN_COUNT, result.tokenUsage().totalTokenCount());
}

List<Embedding> embeddings = result.content();
message.setHeader(LangChain4jEmbeddingsHeaders.EMBEDDINGS, embeddings);
message.setHeader(LangChain4jEmbeddingsHeaders.EMBEDDINGS, result.embeddings());
// Preserve text segments so downstream embedding store can associate them with embeddings
message.setHeader(LangChain4jEmbeddingsHeaders.TEXT_SEGMENTS, segments);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.camel.component.langchain4j.embeddings;

import java.util.List;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
Expand Down Expand Up @@ -96,7 +97,7 @@ public String modelName() {
}

@Override
public Response<Embedding> embed(TextSegment textSegment) {
public Response<List<Embedding>> embedAll(List<TextSegment> textSegments) {
throw new RateLimitException("quota exceeded");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,22 @@ void shouldEmitGenAiSpanFromEmbeddingsProducer() throws Exception {
assertThat(tags.get(GenAiAttributes.OPERATION_NAME)).isEqualTo("embeddings");
assertThat(tags.get(GenAiAttributes.REQUEST_MODEL)).isEqualTo("text-embedding-3-small");
assertThat(tags.get(GenAiAttributes.CAMEL_COMPONENT)).isEqualTo("langchain4j-embeddings");
assertThat(tags.get(GenAiAttributes.RESPONSE_MODEL)).isEqualTo("text-embedding-3-small");
}

@Test
void shouldSetResponseModelHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);

template.sendBody("direct:start", TextSegment.from("Hello"));
template.sendBody("direct:start", List.of("Hello"));

mock.assertIsSatisfied(10, TimeUnit.SECONDS);
for (var exchange : mock.getReceivedExchanges()) {
assertThat(exchange.getMessage().getHeader(LangChain4jEmbeddingsHeaders.RESPONSE_MODEL))
.isEqualTo("text-embedding-3-small");
}
}

private static final class StubEmbeddingModel implements EmbeddingModel {
Expand All @@ -103,8 +119,8 @@ public String modelName() {
}

@Override
public Response<Embedding> embed(TextSegment textSegment) {
return Response.from(Embedding.from(new float[] { 0.1f, 0.2f }),
public Response<List<Embedding>> embedAll(List<TextSegment> textSegments) {
return Response.from(List.of(Embedding.from(new float[] { 0.1f, 0.2f })),
new TokenUsage(4, 0, 4));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7681,6 +7681,17 @@ simple language) no longer has `"deprecationNote": ""`. The key is now present o
already the case for options without `@Metadata`. Tools that read the catalog JSON get no key (null with
`camel-tooling-model`) instead of an empty string.

=== camel-langchain4j-embeddings - the producer uses the EmbeddingRequest API of LangChain4j

The producer now calls `EmbeddingModel.embed(EmbeddingRequest)` instead of `embed(TextSegment)` and
`embedAll(List<TextSegment>)`, so the `CamelLangChain4jEmbeddingsResponseModel` header is now set with the
model name of the response. `EmbeddingResponse` has no finish reason, so the
`CamelLangChain4jEmbeddingsFinishReason` header is no longer set.

A custom `EmbeddingModel` must implement `embedAll(List<TextSegment>)` (or `doEmbed(EmbeddingRequest)`), as
the LangChain4j models do. A model that only overrides `embed(TextSegment)` is no longer called, and the
default methods of LangChain4j then fail with a `StackOverflowError`.

=== Jackson 3

Camel 4.24 moves its own code to Jackson 3 (`tools.jackson`, version 3.2). The `camel-jackson`, `camel-jacksonxml`,
Expand Down
Loading