Skip to content

feat: Adding API read/write timeout. #30

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.

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

Merged
merged 4 commits into from
May 28, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
kubectl get svc -A
curl $(minikube service chromadb --url)/api/v1
- name: Test with Maven
run: mvn clean test
run: mvn --batch-mode clean test
env:
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@
<version>${junit-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock-jre8</artifactId>
<version>2.35.1</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
19 changes: 0 additions & 19 deletions src/main/java/tech/amikos/Main.java

This file was deleted.

19 changes: 18 additions & 1 deletion src/main/java/tech/amikos/chromadb/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,29 @@
*/
public class Client {
final ApiClient apiClient = new ApiClient();

private int timeout = 60;
DefaultApi api;

public Client(String basePath) {
apiClient.setBasePath(basePath);
api = new DefaultApi(apiClient);
apiClient.setHttpClient(apiClient.getHttpClient().newBuilder()
.readTimeout(this.timeout, java.util.concurrent.TimeUnit.SECONDS)
.writeTimeout(this.timeout, java.util.concurrent.TimeUnit.SECONDS)
.build());
api.getApiClient().setUserAgent("Chroma-JavaClient/0.1.x");
}

/**
* Set the timeout for the client
* @param timeout timeout in seconds
*/
public void setTimeout(int timeout) {
this.timeout = timeout;
apiClient.setHttpClient(apiClient.getHttpClient().newBuilder()
.readTimeout(this.timeout, java.util.concurrent.TimeUnit.SECONDS)
.writeTimeout(this.timeout, java.util.concurrent.TimeUnit.SECONDS)
.build());
}

public Collection getCollection(String collectionName, EmbeddingFunction embeddingFunction) throws ApiException {
Expand Down
39 changes: 39 additions & 0 deletions src/test/java/TestAPI.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import com.github.tomakehurst.wiremock.junit.WireMockRule;
import com.google.gson.internal.LinkedTreeMap;
import org.junit.Rule;
import org.junit.Test;
import tech.amikos.chromadb.*;
import tech.amikos.chromadb.Collection;
Expand All @@ -8,11 +10,16 @@
import java.math.BigDecimal;
import java.util.*;

import static com.github.tomakehurst.wiremock.client.WireMock.*;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
import static org.junit.Assert.*;
import static org.junit.Assume.*;

public class TestAPI {

@Rule
public WireMockRule wireMockRule = new WireMockRule(8001);


@Test
public void testHeartbeat() throws ApiException, IOException {
Expand Down Expand Up @@ -396,4 +403,36 @@ public void testQueryExampleHF() throws ApiException {
}


@Test
public void testTimeoutOk() throws ApiException, IOException {
stubFor(get(urlEqualTo("/api/v1/heartbeat"))
.willReturn(aResponse()
.withHeader("Content-Type", "application/json")
.withBody("{\"nanosecond heartbeat\": 123456789}").withFixedDelay(2000)));

Utils.loadEnvFile(".env");
Client client = new Client("http://127.0.0.1:8001");
client.setTimeout(3);
Map<String, BigDecimal> hb = client.heartbeat();
assertTrue(hb.containsKey("nanosecond heartbeat"));
}

@Test(expected = ApiException.class)
public void testTimeoutExpires() throws ApiException, IOException{
stubFor(get(urlEqualTo("/api/v1/heartbeat"))
.willReturn(aResponse()
.withHeader("Content-Type", "application/json")
.withBody("{\"nanosecond heartbeat\": 123456789}").withFixedDelay(2000)));

Utils.loadEnvFile(".env");
Client client = new Client("http://127.0.0.1:8001");
client.setTimeout(1);
try {
client.heartbeat();
} catch (ApiException e) {
assertTrue(e.getMessage().contains("Read timed out") || e.getMessage().contains("timeout"));
throw e;
}

}
}
Loading