Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

Merge branch 'RED-3813-hotfix' into 'master'

Browse Source 
RED-3813: image similarity hotifx

Closes RED-3813

See merge request redactmanager/persistence-service!675
This commit is contained in:
Yannik Hampe 2024-08-19 09:00:19 +02:00
commit 9bcf2d177e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/ImageSimilaritySearchController.java vendored
View File

@ -34,7 +34,7 @@ public class ImageSimilaritySearchController implements ImageSimilaritySearchRes
public ResponseEntity<ImageSimilaritySearchResponse> getSimilarImages(@RequestBody ImageSimilaritySearchRequest imageSimilaritySearchRequest) { public ResponseEntity<ImageSimilaritySearchResponse> getSimilarImages(@RequestBody ImageSimilaritySearchRequest imageSimilaritySearchRequest) {
log.info("received similiar image search request {}", imageSimilaritySearchRequest); log.info("received similiar image search request {}", imageSimilaritySearchRequest);
List<ImageDocument> similarImages = this.imageSimilarityService.findSimilarImages(imageSimilaritySearchRequest.getCentroId(), List<ImageDocument> similarImages = this.imageSimilarityService.findSimilarImages(imageSimilaritySearchRequest.getAnnotationId(),
imageSimilaritySearchRequest.getDistance(), imageSimilaritySearchRequest.getDistance(),
imageSimilaritySearchRequest.getScope()); imageSimilaritySearchRequest.getScope());
List<String> similarImagesIds = new ArrayList<>(); List<String> similarImagesIds = new ArrayList<>();

6
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/ImageSimilarityService.java
View File

@ -58,10 +58,10 @@ public class ImageSimilarityService {
} }
public List<ImageDocument> findSimilarImages(String centroId, double distance, Scope scope) throws Exception { public List<ImageDocument> findSimilarImages(String annotationId, double distance, Scope scope) throws Exception {
ImageDocument centroImage = this.imageMongoService.findById(centroId); ImageDocument centroImage = this.imageMongoService.findById(annotationId);
log.info("image received with id {}: {}", centroId, centroImage); log.info("image received with id {}: {}", annotationId, centroImage);
List<ImageDocument> similarImages = this.imageMongoService.findSimilarImages(centroImage, distance, scope); List<ImageDocument> similarImages = this.imageMongoService.findSimilarImages(centroImage, distance, scope);
log.info("received similar images: {}", similarImages); log.info("received similar images: {}", similarImages);
return similarImages.stream() return similarImages.stream()

2
persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/image/ImageSimilaritySearchRequest.java
View File

@ -20,7 +20,7 @@ public class ImageSimilaritySearchRequest {
@NonNull @NonNull
@Schema(description = "id of the central image") @Schema(description = "id of the central image")
private String centroId; private String annotationId;
@NonNull @NonNull
@Schema(description = "the manhattan distance used in the similiarity search") @Schema(description = "the manhattan distance used in the similiarity search")
private double distance; private double distance;