Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfriesen
mfriesen committed Jan 25, 2025
1 parent 1b782b7 commit 99011c6
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 46 deletions.
63 changes: 32 additions & 31 deletions lambda-api/src/integration/java/com/formkiq/stacks/api/awstest/ChatGptRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,21 @@
*/
package com.formkiq.stacks.api.awstest;

import static com.formkiq.aws.dynamodb.objects.Objects.notNull;
import static com.formkiq.testutils.aws.FkqDocumentService.addDocument;
import static com.formkiq.testutils.aws.FkqDocumentService.waitForActions;
import static com.formkiq.testutils.aws.FkqDocumentService.waitForDocumentContent;
import static com.formkiq.testutils.aws.FkqDocumentService.waitForDocumentTag;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;

import com.formkiq.aws.dynamodb.ID;
import com.formkiq.client.model.DocumentTag;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
Expand All @@ -51,7 +53,6 @@
import com.formkiq.client.model.AddDocumentActionsRequest;
import com.formkiq.client.model.DocumentActionStatus;
import com.formkiq.client.model.DocumentActionType;
import com.formkiq.client.model.GetDocumentTagsResponse;
import com.formkiq.client.model.UpdateConfigurationRequest;
import com.formkiq.testutils.aws.AbstractAwsIntegrationTest;
import software.amazon.awssdk.utils.IoUtils;
Expand Down Expand Up @@ -92,48 +93,48 @@ public static void beforeClass() throws IOException, InterruptedException, URISy
* @throws Exception Exception
*/
@Test
@Timeout(unit = TimeUnit.SECONDS, value = TEST_TIMEOUT)
@Timeout(value = TEST_TIMEOUT)
public void testOcrAndChatGpt01() throws Exception {
// given
for (String siteId : Arrays.asList(null, ID.uuid())) {
List<ApiClient> clients = getApiClients(null);
ApiClient client = clients.get(0);

List<ApiClient> clients = getApiClients(siteId);
ApiClient client = clients.get(0);
byte[] content = toBytes();

byte[] content = toBytes("/ocr/receipt.png");
String documentId = addDocument(client, null, "receipt.png", content, "image/png", null);
waitForDocumentContent(client, null, documentId);

String documentId = addDocument(client, siteId, "receipt.png", content, "image/png", null);
waitForDocumentContent(client, siteId, documentId);
DocumentActionsApi api = new DocumentActionsApi(client);
String actionTags = "organization,location,person,subject,sentiment,document type";

DocumentActionsApi api = new DocumentActionsApi(client);
String actionTags = "organization,location,person,subject,sentiment,document type";
// when
api.addDocumentActions(documentId, null,
new AddDocumentActionsRequest()
.actions(Arrays.asList(new AddAction().type(DocumentActionType.OCR),
new AddAction().type(DocumentActionType.DOCUMENTTAGGING).parameters(
new AddActionParameters().engine(EngineEnum.CHATGPT).tags(actionTags)))));

// when
api.addDocumentActions(documentId, siteId,
new AddDocumentActionsRequest()
.actions(Arrays.asList(new AddAction().type(DocumentActionType.OCR),
new AddAction().type(DocumentActionType.DOCUMENTTAGGING).parameters(
new AddActionParameters().engine(EngineEnum.CHATGPT).tags(actionTags)))));
// then
waitForActions(client, null, documentId, List.of(DocumentActionStatus.COMPLETE));

// then
waitForActions(client, siteId, documentId, Arrays.asList(DocumentActionStatus.COMPLETE));
DocumentTagsApi tagsApi = new DocumentTagsApi(client);

DocumentTagsApi tagsApi = new DocumentTagsApi(client);
List<DocumentTag> tags1 =
notNull(tagsApi.getDocumentTags(documentId, null, null, null, null, null).getTags());
assertFalse(tags1.isEmpty());

waitForDocumentTag(client, siteId, documentId, "organization");
GetDocumentTagsResponse tags =
tagsApi.getDocumentTags(documentId, siteId, null, null, null, null);
waitForDocumentTag(client, null, documentId, "organization");
List<DocumentTag> tags =
notNull(tagsApi.getDocumentTags(documentId, null, null, null, null, null).getTags());

assertTrue(
tags.getTags().stream().filter(r -> r.getKey().equals("untagged")).findFirst().isEmpty());
assertTrue(tags.stream().filter(r -> "untagged".equals(r.getKey())).findFirst().isEmpty());

assertTrue(tags.getTags().stream()
.filter(r -> r.getKey().toLowerCase().equals("organization")).findFirst().isPresent());
}
assertTrue(tags.stream().anyMatch(r -> "organization".equalsIgnoreCase(r.getKey())));
}

private byte[] toBytes(final String name) throws IOException {
try (InputStream is = getClass().getResourceAsStream(name)) {
private byte[] toBytes() throws IOException {
try (InputStream is = getClass().getResourceAsStream("/ocr/receipt.png")) {
assertNotNull(is);
return IoUtils.toByteArray(is);
}
}
Expand Down
27 changes: 12 additions & 15 deletions .../integration/java/com/formkiq/stacks/api/awstest/DocumentsDocumentIdSyncsRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -62,14 +61,13 @@ private List<DocumentSync> find(final List<DocumentSync> list, final DocumentSyn
return list.stream().filter(s -> type.equals(s.getService())).collect(Collectors.toList());
}

private Optional<DocumentSync> find(final Collection<DocumentSync> list,
final DocumentSyncType type) {
return list.stream().filter(s -> type.equals(s.getType())).findFirst();
private DocumentSync find(final Collection<DocumentSync> list, final DocumentSyncType type) {
return list.stream().filter(s -> type.equals(s.getType())).findFirst().orElse(null);
}

private boolean isComplete(final GetDocumentSyncResponse syncs) {
int count = notNull(syncs.getSyncs()).size();
return count == 2;
return count == 4;
}

/**
Expand Down Expand Up @@ -105,19 +103,22 @@ public void testGetSyncs01() throws Exception {

for (DocumentSync sync : list) {
assertNotNull(sync.getUserId());
assertNotNull(sync.getSyncDate());
assertEquals(DocumentSyncStatus.COMPLETE, sync.getStatus());

if (!DocumentSyncService.EVENTBRIDGE.equals(sync.getService())) {
assertNotNull(sync.getSyncDate());
assertEquals(DocumentSyncStatus.COMPLETE, sync.getStatus());
}
}

List<DocumentSync> typesense = find(list, DocumentSyncService.TYPESENSE);
if (!typesense.isEmpty()) {
assertEquals(2, typesense.size());

DocumentSync sync = find(typesense, DocumentSyncType.CONTENT).get();
DocumentSync sync = find(typesense, DocumentSyncType.CONTENT);
assertEquals(DocumentSyncService.TYPESENSE, sync.getService());
assertEquals(DocumentSyncType.CONTENT, sync.getType());

sync = find(typesense, DocumentSyncType.METADATA).get();
sync = find(typesense, DocumentSyncType.METADATA);
assertEquals(DocumentSyncService.TYPESENSE, sync.getService());
assertEquals(DocumentSyncType.METADATA, sync.getType());
}
Expand All @@ -126,15 +127,11 @@ public void testGetSyncs01() throws Exception {
if (!opensearch.isEmpty()) {
assertEquals(2, opensearch.size());

DocumentSync sync = find(opensearch, DocumentSyncType.CONTENT).get();
DocumentSync sync = find(opensearch, DocumentSyncType.CONTENT);
assertEquals(DocumentSyncService.OPENSEARCH, sync.getService());
assertEquals(DocumentSyncType.CONTENT, sync.getType());

// sync = find(opensearch, DocumentSyncType.TAG).get();
// assertEquals(DocumentSyncService.OPENSEARCH, sync.getService());
// assertEquals(DocumentSyncType.TAG, sync.getType());

sync = find(opensearch, DocumentSyncType.METADATA).get();
sync = find(opensearch, DocumentSyncType.METADATA);
assertEquals(DocumentSyncService.OPENSEARCH, sync.getService());
assertEquals(DocumentSyncType.METADATA, sync.getType());
}
Expand Down

0 comments on commit 99011c6

Please sign in to comment.