Skip to content

Commit 8cdb2a4

Browse files
clunclun
committed
Run test
1 parent 2fe47dc commit 8cdb2a4

File tree

5 files changed

+123
-51
lines changed

5 files changed

+123
-51
lines changed

‎.github/workflows/test-astra-dev.yml

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
# run: |
8383
# cd astra-db-java
8484
# mvn test -Dtest=com.datastax.astra.test.integration.dev.*Test
85-
AWS_US_WEST2_OPEN_AI:
85+
AWS_OPEN_AI:
8686
needs: AWS_US_WEST2_CORE
8787
runs-on: ubuntu-latest
8888
steps:
@@ -103,8 +103,7 @@ jobs:
103103
run: |
104104
cd astra-db-java
105105
mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeEmbeddingApiKeyITTest
106-
107-
AWS_US_WEST2_AZURE_OPEN_AI:
106+
AWS_AZURE_OPEN_AI:
108107
needs: AWS_US_WEST2_CORE
109108
runs-on: ubuntu-latest
110109
steps:
@@ -124,4 +123,25 @@ jobs:
124123
EMBEDDING_API_KEY: ${{ secrets.AZURE_OPENAI_API_KEY }}
125124
run: |
126125
cd astra-db-java
127-
mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeEmbeddingApiKeyITTest
126+
mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeEmbeddingApiKeyITTest
127+
AWS_HUGGING_FACE:
128+
needs: AWS_US_WEST2_CORE
129+
runs-on: ubuntu-latest
130+
steps:
131+
- name: Checkout repository
132+
uses: actions/checkout@v2
133+
- name: Set up JDK
134+
uses: actions/setup-java@v2
135+
with:
136+
distribution: 'adopt'
137+
java-version: 11
138+
- name: Maven Test
139+
env:
140+
ASTRA_DB_APPLICATION_TOKEN_DEV: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN_DEV }}
141+
ASTRA_CLOUD_PROVIDER_DEV: AWS
142+
ASTRA_CLOUD_REGION_DEV: us-west-2
143+
EMBEDDING_PROVIDER: huggingface
144+
EMBEDDING_API_KEY: ${{ secrets.HF_API_KEY }}
145+
run: |
146+
cd astra-db-java
147+
mvn test -Dtest=com.datastax.astra.test.integration.dev_vectorize.AstraDevVectorizeEmbeddingApiKeyITTest

‎astra-db-java/src/test/java/com/datastax/astra/test/integration/dev_vectorize/AstraDevVectorizeEmbeddingApiKeyITTest.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,14 @@ public String getRegion() {
3838
}
3939

4040
@Test
41-
public void testOneProvider() {
42-
shouldTestOneProvider(System.getenv("EMBEDDING_PROVIDER"), System.getenv("EMBEDDING_API_KEY"));
41+
public void should_test_embedding_providers() {
42+
shouldTestOneProvider(
43+
System.getenv("EMBEDDING_PROVIDER"),
44+
System.getenv("EMBEDDING_API_KEY"));
45+
// Flush the collections
46+
getDatabase()
47+
.listCollectionNames()
48+
.forEach(name -> getDatabase().dropCollection(name));
4349
}
4450

4551
}

‎astra-db-java/src/test/java/com/datastax/astra/test/integration/dev_vectorize/AstraDevVectorizeITTest.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,13 @@
4444
@EnabledIfEnvironmentVariable(named = "ASTRA_CLOUD_REGION_DEV", matches = ".*")
4545
public class AstraDevVectorizeITTest extends AbstractVectorizeITTest {
4646

47-
@Override
47+
4848
protected Database initDatabase() {
49-
Database usWest2 = initAstraDatabase(AstraEnvironment.DEV, "aws_us-west-2", CloudProviderType.AWS, "us-west-2");
50-
Database usCentral1 = initAstraDatabase(AstraEnvironment.DEV, "gcp_us_central1", CloudProviderType.GCP, "us-central1");
51-
Database europeWest4 = initAstraDatabase(AstraEnvironment.DEV, "gcp_europe_west4", CloudProviderType.GCP, "europe-west4");
52-
return europeWest4;
49+
//Database usWest2 = initAstraDatabase(AstraEnvironment.DEV, "aws_us-west-2", CloudProviderType.AWS, "us-west-2");
50+
//Database usCentral1 = initAstraDatabase(AstraEnvironment.DEV, "gcp_us_central1", CloudProviderType.GCP, "us-central1");
51+
//Database europeWest4 = initAstraDatabase(AstraEnvironment.DEV, "gcp_europe_west4", CloudProviderType.GCP, "europe-west4");
52+
//return europeWest4;
53+
return null;
5354
}
5455

5556
@Test
@@ -202,4 +203,18 @@ public void shouldTestAwsBedRock() {
202203
}
203204

204205

206+
@Override
207+
public AstraEnvironment getAstraEnvironment() {
208+
return AstraEnvironment.DEV;
209+
}
210+
211+
@Override
212+
public CloudProviderType getCloudProvider() {
213+
return CloudProviderType.valueOf(System.getenv("ASTRA_CLOUD_PROVIDER_DEV"));
214+
}
215+
216+
@Override
217+
public String getRegion() {
218+
return System.getenv("ASTRA_CLOUD_REGION_DEV");
219+
}
205220
}

‎astra-db-java/src/test/java/com/datastax/astra/test/integration/local/LocalVectorizeITTest.java

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.datastax.astra.client.Database;
55
import com.datastax.astra.client.model.EmbeddingProvider;
66
import com.datastax.astra.test.integration.AbstractVectorizeITTest;
7+
import com.dtsx.astra.sdk.db.domain.CloudProviderType;
8+
import com.dtsx.astra.sdk.utils.AstraEnvironment;
79
import lombok.extern.slf4j.Slf4j;
810
import org.junit.jupiter.api.Disabled;
911
import org.junit.jupiter.api.Test;
@@ -15,10 +17,10 @@
1517
@EnabledIfEnvironmentVariable(named = "ENABLED_TEST_DATA_API_LOCAL", matches = "true")
1618
public class LocalVectorizeITTest extends AbstractVectorizeITTest {
1719

18-
@Override
19-
protected Database initDatabase() {
20-
return DataAPIClients.createDefaultLocalDatabase();
21-
}
20+
// @Override
21+
// protected Database initDatabase() {
22+
// return DataAPIClients.createDefaultLocalDatabase();
23+
// }
2224

2325
@Test
2426
public void testOneProvider() {
@@ -41,4 +43,18 @@ public void shouldTestAllProviders() {
4143
}
4244
}
4345

46+
@Override
47+
protected AstraEnvironment getAstraEnvironment() {
48+
return null;
49+
}
50+
51+
@Override
52+
protected CloudProviderType getCloudProvider() {
53+
return null;
54+
}
55+
56+
@Override
57+
protected String getRegion() {
58+
return "";
59+
}
4460
}

‎astra-db-java/src/test/java/com/datastax/astra/test/integration/prod/AstraProdVectorizeITTest.java

Lines changed: 51 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,42 @@
1818
@EnabledIfEnvironmentVariable(named = "ASTRA_DB_APPLICATION_TOKEN", matches = "Astra.*")
1919
public class AstraProdVectorizeITTest extends AbstractVectorizeITTest {
2020

21-
@Override
22-
protected Database initDatabase() {
23-
return testVectorizeDb();
24-
//return gcpUsEast1();
25-
//return azureEastUs();
26-
//return awsUSWest1();
27-
}
28-
29-
private Database gcpUsEast1() {
30-
Database db = initAstraDatabase(AstraEnvironment.PROD, "gcp_us_east1", CloudProviderType.GCP, "us-east1");
31-
db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
32-
return db;
33-
}
34-
private Database awsUSWest1() {
35-
Database db = initAstraDatabase(AstraEnvironment.PROD, "aws_us-west-1", CloudProviderType.AWS, "us-west-1");
36-
db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
37-
return db;
38-
}
39-
40-
private Database testVectorizeDb() {
41-
Database db = initAstraDatabase(AstraEnvironment.PROD, "test_vectorize", CloudProviderType.AWS, " us-east-2");
42-
db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
43-
return db;
44-
}
45-
46-
private Database gcpEuropeWest4() {
47-
Database db = initAstraDatabase(AstraEnvironment.DEV, "gcp_europe_west4", CloudProviderType.GCP, "europe-west4");
48-
db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
49-
return db;
50-
}
51-
52-
private Database azureEastUs() {
53-
Database db = initAstraDatabase(AstraEnvironment.DEV, "azure_eastus", CloudProviderType.AZURE, "eastus");
54-
db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
55-
return db;
56-
}
21+
// @Override
22+
// protected Database initDatabase() {
23+
// return testVectorizeDb();
24+
// //return gcpUsEast1();
25+
// //return azureEastUs();
26+
// //return awsUSWest1();
27+
// }
28+
//
29+
// private Database gcpUsEast1() {
30+
// Database db = initAstraDatabase(AstraEnvironment.PROD, "gcp_us_east1", CloudProviderType.GCP, "us-east1");
31+
// db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
32+
// return db;
33+
// }
34+
// private Database awsUSWest1() {
35+
// Database db = initAstraDatabase(AstraEnvironment.PROD, "aws_us-west-1", CloudProviderType.AWS, "us-west-1");
36+
// db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
37+
// return db;
38+
// }
39+
//
40+
// private Database testVectorizeDb() {
41+
// Database db = initAstraDatabase(AstraEnvironment.PROD, "test_vectorize", CloudProviderType.AWS, " us-east-2");
42+
// db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
43+
// return db;
44+
// }
45+
//
46+
// private Database gcpEuropeWest4() {
47+
// Database db = initAstraDatabase(AstraEnvironment.DEV, "gcp_europe_west4", CloudProviderType.GCP, "europe-west4");
48+
// db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
49+
// return db;
50+
// }
51+
//
52+
// private Database azureEastUs() {
53+
// Database db = initAstraDatabase(AstraEnvironment.DEV, "azure_eastus", CloudProviderType.AZURE, "eastus");
54+
// db.getCommandOptions().getObservers().put("logging", new LoggingCommandObserver(DataAPIClient.class));
55+
// return db;
56+
// }
5757

5858
@Test
5959
public void testOneProvider() {
@@ -100,4 +100,19 @@ public void shouldTestAllProviders() {
100100
System.out.println("Provider: " + entry.getKey());
101101
}
102102
}
103+
104+
@Override
105+
protected AstraEnvironment getAstraEnvironment() {
106+
return null;
107+
}
108+
109+
@Override
110+
protected CloudProviderType getCloudProvider() {
111+
return null;
112+
}
113+
114+
@Override
115+
protected String getRegion() {
116+
return "";
117+
}
103118
}

0 commit comments

Comments
 (0)