Skip to content
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

Add examples and utility function to deal with Cassio #689

Merged
merged 3 commits into from
Nov 4, 2023
Merged

Add examples and utility function to deal with Cassio #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54c2c68
Add examples and utility function to deal with Cassio
eolivelli Nov 3, 2023
4b32489
More work
eolivelli Nov 4, 2023
30a83dd
Fix test
eolivelli Nov 4, 2023
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
26 changes: 23 additions & 3 deletions ...ream-agents-commons/src/main/java/ai/langstream/ai/agents/commons/jstl/JstlEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@ private void registerFunctions() {
this.expressionContext
.getFunctionMapper()
.mapFunction(
"fn",
"concat",
JstlFunctions.class.getMethod("concat", Object.class, Object.class));
"fn", "concat", JstlFunctions.class.getMethod("concat", Object[].class));
this.expressionContext
.getFunctionMapper()
.mapFunction(
Expand Down Expand Up @@ -127,6 +125,10 @@ private void registerFunctions() {
"fn",
"addAll",
JstlFunctions.class.getMethod("addAll", Object.class, Object.class));
this.expressionContext
.getFunctionMapper()
.mapFunction(
"fn", "listOf", JstlFunctions.class.getMethod("listOf", Object[].class));
this.expressionContext
.getFunctionMapper()
.mapFunction("fn", "emptyList", JstlFunctions.class.getMethod("emptyList"));
Expand All @@ -153,6 +155,24 @@ private void registerFunctions() {
this.expressionContext
.getFunctionMapper()
.mapFunction("fn", "emptyMap", JstlFunctions.class.getMethod("emptyMap"));
this.expressionContext
.getFunctionMapper()
.mapFunction(
"fn",
"mapPut",
JstlFunctions.class.getMethod(
"mapPut", Object.class, Object.class, Object.class));
this.expressionContext
.getFunctionMapper()
.mapFunction("fn", "mapOf", JstlFunctions.class.getMethod("mapOf", Object[].class));

this.expressionContext
.getFunctionMapper()
.mapFunction(
"fn",
"mapRemove",
JstlFunctions.class.getMethod("mapRemove", Object.class, Object.class));

this.expressionContext
.getFunctionMapper()
.mapFunction("fn", "toInt", JstlFunctions.class.getMethod("toInt", Object.class));
Expand Down
59 changes: 56 additions & 3 deletions ...ream-agents-commons/src/main/java/ai/langstream/ai/agents/commons/jstl/JstlFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -164,6 +165,52 @@ public static Map<String, Object> emptyMap() {
return Map.of();
}

public static Map<String, Object> mapOf(Object... field) {
Map<String, Object> result = new HashMap<>();
for (int i = 0; i < field.length; i += 2) {
result.put(field[i].toString(), field[i + 1]);
}
return result;
}

public static List<Object> listOf(Object... field) {
List<Object> result = new ArrayList<>();
result.addAll(Arrays.asList(field));
return result;
}

public static Map<String, Object> mapPut(Object map, Object field, Object value) {
Map<String, Object> result = new HashMap<>();
if (map != null) {
if (map instanceof Map m) {
result.putAll(m);
} else {
throw new IllegalArgumentException("mapPut doesn't allow a non-map value");
}
}
if (field == null || field.toString().isEmpty()) {
throw new IllegalArgumentException("mapPut doesn't allow a null field");
}
result.put(field.toString(), value);
return result;
}

public static Map<String, Object> mapRemove(Object map, Object field) {
Map<String, Object> result = new HashMap<>();
if (map != null) {
if (map instanceof Map m) {
result.putAll(m);
} else {
throw new IllegalArgumentException("mapPut doesn't allow a non-map value");
}
}
if (field == null || field.toString().isEmpty()) {
throw new IllegalArgumentException("mapPut doesn't allow a null field");
}
result.remove(field.toString());
return result;
}

public static List<Object> mapToListOfStructs(Object object, String fields) {
if (object == null) {
throw new IllegalArgumentException("listOf doesn't allow a null value");
Expand Down Expand Up @@ -282,12 +329,18 @@ public static String trim(Object input) {
return input == null ? null : toString(input).trim();
}

public static String concat(Object first, Object second) {
return toString(first) + toString(second);
public static String concat(Object... elements) {
StringBuilder sb = new StringBuilder();
for (Object o : elements) {
if (o != null) {
sb.append(toString(o));
}
}
return sb.toString();
}

public static String concat3(Object first, Object second, Object third) {
return toString(first) + toString(second) + toString(third);
return concat(first, second, third);
}

public static Object coalesce(Object value, Object valueIfNull) {
Expand Down
10 changes: 10 additions & 0 deletions ...-agents/langstream-ai-agents/src/main/java/com/datastax/oss/streaming/ai/ComputeStep.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,9 @@ private Schema getAvroSchema(ComputeFieldType type, Object value) {
case BYTES:
schemaType = Schema.Type.BYTES;
break;
case MAP:
schemaType = Schema.Type.MAP;
break;
case ARRAY:
schemaType = Schema.Type.ARRAY;
break;
Expand All @@ -342,6 +345,10 @@ private Schema getAvroSchema(ComputeFieldType type, Object value) {
return Schema.createArray(
Schema.createMap(Schema.create(Schema.Type.STRING)));
}
if (schemaType == Schema.Type.MAP) {
// we don't know the element type of the array, so we can't create a schema
return Schema.createMap(Schema.create(Schema.Type.STRING));
}

// Handle logical types:
// https://avro.apache.org/docs/1.10.2/spec.html#Logical+Types
Expand Down Expand Up @@ -517,6 +524,9 @@ private ComputeFieldType getFieldType(Object value) {
if (List.class.isAssignableFrom(value.getClass())) {
return ComputeFieldType.ARRAY;
}
if (Map.class.isAssignableFrom(value.getClass())) {
return ComputeFieldType.MAP;
}
throw new UnsupportedOperationException("Got an unsupported type: " + value.getClass());
}
}
3 changes: 2 additions & 1 deletion ...gstream-ai-agents/src/main/java/com/datastax/oss/streaming/ai/model/ComputeFieldType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ public enum ComputeFieldType {
DATETIME,
BYTES,
DECIMAL,
ARRAY
ARRAY,
MAP
}
17 changes: 10 additions & 7 deletions ...am-vector-agents/src/main/java/ai/langstream/agents/vector/cassandra/CassandraWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -176,15 +176,15 @@ public void initialise(Map<String, Object> agentConfiguration) {
processor.start(configuration);
}

private final AtomicReference<CompletableFuture<?>> currentRecordStatus =
new AtomicReference<>();
private final Map<Record, CompletableFuture<?>> currentRecordStatus =
new ConcurrentHashMap<>();

@Override
public CompletableFuture<?> upsert(Record record, Map<String, Object> context) {
// we must handle one record at a time
// so we block until the record is processed
CompletableFuture<?> handle = new CompletableFuture();
currentRecordStatus.set(handle);
currentRecordStatus.put(record, handle);
processor.put(List.of(new LangStreamSinkRecordAdapter(record)));
return handle;
}
Expand All @@ -208,7 +208,8 @@ public String applicationName() {
@Override
protected void handleSuccess(AbstractSinkRecord abstractRecord) {
Record record = ((LangStreamSinkRecordAdapter) abstractRecord).getRecord();
currentRecordStatus.get().complete(null);
CompletableFuture<?> remove = currentRecordStatus.remove(record);
remove.complete(null);
}

@Override
Expand Down Expand Up @@ -242,12 +243,14 @@ protected void handleFailure(
log.warn("Error decoding/mapping Kafka record {}: {}", record, e.getMessage());
}

CompletableFuture<?> remove = currentRecordStatus.remove(record);

if (ignoreErrors == CassandraSinkConfig.IgnoreErrorsPolicy.NONE
|| (ignoreErrors == CassandraSinkConfig.IgnoreErrorsPolicy.DRIVER
&& !driverFailure)) {
currentRecordStatus.get().completeExceptionally(e);
remove.completeExceptionally(e);
} else {
currentRecordStatus.get().complete(null);
remove.complete(null);
}

failCounter.run();
Expand Down
Loading
Loading