Skip to content

Commit 0e6969a

Browse files
authored
Fixes #4169: $path configuration parameter adds terminating slash (#4191)
1 parent 65cc9b7 commit 0e6969a

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public String getEndpoint(Map<String, Object> procConfig, ApocConfig apocConfig)
4040
public String getFullUrl(String method, Map<String, Object> procConfig, ApocConfig apocConfig) {
4141
return Stream.of(getEndpoint(procConfig, apocConfig), method, getApiVersion(procConfig, apocConfig))
4242
.filter(StringUtils::isNotBlank)
43-
.collect(Collectors.joining("/"));
43+
.collect(Collectors.joining("/"))
44+
.replaceAll("/\\?", "?"); // Remove terminating endpoint
4445
}
4546

4647
enum Type {

extended/src/test/java/apoc/ml/OpenAIAzureIT.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.util.stream.Stream;
1313

1414
import static apoc.ml.OpenAI.API_TYPE_CONF_KEY;
15+
import static apoc.ml.OpenAI.PATH_CONF_KEY;
1516
import static apoc.ml.MLUtil.*;
1617
import static apoc.ml.OpenAITestResultUtils.CHAT_COMPLETION_QUERY;
1718
import static apoc.ml.OpenAITestResultUtils.COMPLETION_QUERY;
@@ -63,6 +64,19 @@ public void embedding() {
6364
OpenAITestResultUtils::assertEmbeddings);
6465
}
6566

67+
@Test
68+
public void embeddingFixPath() {
69+
Map<String, Object> params = Map.of("apiKey", OPENAI_KEY,
70+
"conf", Map.of(ENDPOINT_CONF_KEY, OPENAI_EMBEDDING_URL,
71+
API_TYPE_CONF_KEY, OpenAIRequestHandler.Type.AZURE.name(),
72+
API_VERSION_CONF_KEY, OPENAI_AZURE_API_VERSION,
73+
PATH_CONF_KEY, "openai/deployments/text-embedding-ada-002/embeddings"
74+
));
75+
testCall(db, EMBEDDING_QUERY,
76+
params,
77+
OpenAITestResultUtils::assertEmbeddings);
78+
}
79+
6680

6781
@Test
6882
@Ignore("It returns wrong answers sometimes")

0 commit comments

Comments
 (0)