Skip to content

Commit 8d3fbec

Browse files
committed
Revert "Removed org.apache.commons.collections from OpenAI (#4304)" (#4305)
This reverts commit 7e3bfb7.
1 parent 7e3bfb7 commit 8d3fbec

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

extended-it/src/test/java/apoc/couchbase/CouchbaseIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.junit.Before;
1515
import org.junit.BeforeClass;
1616
import org.junit.ClassRule;
17+
import org.junit.Ignore;
1718
import org.junit.Test;
1819
import org.neo4j.graphdb.QueryExecutionException;
1920
import org.neo4j.test.rule.DbmsRule;
@@ -50,6 +51,7 @@
5051
import static org.junit.Assert.fail;
5152
import static org.neo4j.test.assertion.Assert.assertEventually;
5253

54+
@Ignore
5355
public class CouchbaseIT {
5456

5557
private static int numberConnections = 0;

extended/src/main/java/apoc/ml/OpenAI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import apoc.ApocConfig;
44
import apoc.Extended;
55
import apoc.result.MapResult;
6-
import apoc.util.ExtendedMapUtils;
76
import apoc.util.ExtendedUtil;
87
import apoc.util.JsonUtil;
98
import apoc.util.Util;
109
import com.fasterxml.jackson.core.JsonProcessingException;
10+
import org.apache.commons.collections.MapUtils;
1111
import org.apache.commons.lang3.StringUtils;
1212
import org.neo4j.graphdb.security.URLAccessChecker;
1313
import org.neo4j.procedure.Context;
@@ -225,7 +225,7 @@ public Stream<MapResult> completion(@Name("prompt") String prompt, @Name("api_ke
225225
public Stream<MapResult> chatCompletion(@Name("messages") List<Map<String, Object>> messages, @Name("api_key") String apiKey, @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration) throws Exception {
226226
boolean failOnError = isFailOnError(configuration);
227227
if (checkNullInput(messages, failOnError)) return Stream.empty();
228-
messages = messages.stream().filter(ExtendedMapUtils::isNotEmpty).toList();
228+
messages = messages.stream().filter(MapUtils::isNotEmpty).toList();
229229
if (checkEmptyInput(messages, failOnError)) return Stream.empty();
230230
configuration.putIfAbsent("model", GPT_4O_MODEL);
231231
return executeRequest(apiKey, configuration, "chat/completions", (String) configuration.get("model"), "messages", messages, "$", apocConfig, urlAccessChecker)

extended/src/main/java/apoc/util/ExtendedMapUtils.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,4 @@ public static int size(final Map<?, ?> map) {
1111
public static boolean isEmpty(final Map<?,?> map) {
1212
return map == null || map.isEmpty();
1313
}
14-
15-
public static boolean isNotEmpty(final Map<?,?> map) {
16-
return !isEmpty(map);
17-
}
1814
}

0 commit comments

Comments
 (0)