NCBACK-3 Add found by yandex image #10
@@ -31,6 +31,10 @@ dependencies {
|
|||||||
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
implementation 'org.mapstruct:mapstruct:1.5.5.Final'
|
||||||
implementation 'commons-validator:commons-validator:1.7'
|
implementation 'commons-validator:commons-validator:1.7'
|
||||||
|
|
||||||
|
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
|
||||||
|
implementation 'tools.jackson.core:jackson-core:3.0.3'
|
||||||
|
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
|
||||||
|
|
||||||
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
|
||||||
annotationProcessor 'org.projectlombok:lombok'
|
annotationProcessor 'org.projectlombok:lombok'
|
||||||
|
|
||||||
|
|||||||
+5
-3
@@ -65,6 +65,8 @@ services:
|
|||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: postgres
|
||||||
POSTGRES_PORT: 5432
|
POSTGRES_PORT: 5432
|
||||||
POSTGRES_HOST: db
|
POSTGRES_HOST: db
|
||||||
|
YANDEX_SEARCH_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
|
||||||
|
YANDEX_SEARCH_FOLDER_ID: b1gokpdbm6qfpsou8pcd
|
||||||
STORAGE_SERVICE_URL: http://storage:8081
|
STORAGE_SERVICE_URL: http://storage:8081
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
@@ -121,7 +123,7 @@ services:
|
|||||||
prometheus:
|
prometheus:
|
||||||
image: prom/prometheus:latest
|
image: prom/prometheus:latest
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
@@ -149,7 +151,7 @@ services:
|
|||||||
loki:
|
loki:
|
||||||
image: grafana/loki:2.9.2
|
image: grafana/loki:2.9.2
|
||||||
container_name: loki
|
container_name: loki
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '1.0'
|
cpus: '1.0'
|
||||||
@@ -174,7 +176,7 @@ services:
|
|||||||
tempo:
|
tempo:
|
||||||
image: grafana/tempo:2.4.1
|
image: grafana/tempo:2.4.1
|
||||||
container_name: tempo
|
container_name: tempo
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: '0.5'
|
cpus: '0.5'
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ public class HandlerConfig {
|
|||||||
LoginRequestHandler login,
|
LoginRequestHandler login,
|
||||||
FileUploadHandler upload,
|
FileUploadHandler upload,
|
||||||
FileEntityHandler file,
|
FileEntityHandler file,
|
||||||
LogoutRequestHandler logoutHandler
|
LogoutRequestHandler logoutHandler,
|
||||||
|
ImageFoundRequestHandler imageFoundRequestHandler
|
||||||
) {
|
) {
|
||||||
Map<Integer, RequestHandler> map = new HashMap<>();
|
Map<Integer, RequestHandler> map = new HashMap<>();
|
||||||
map.put(20001, login);
|
map.put(20001, login);
|
||||||
@@ -24,6 +25,7 @@ public class HandlerConfig {
|
|||||||
map.put(20004, upload);
|
map.put(20004, upload);
|
||||||
map.put(20005, file);
|
map.put(20005, file);
|
||||||
map.put(20006, logoutHandler);
|
map.put(20006, logoutHandler);
|
||||||
|
map.put(20007, imageFoundRequestHandler);
|
||||||
|
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,8 @@ public class JacksonConfig {
|
|||||||
|
|
||||||
mapper.registerModule(javaTimeModule);
|
mapper.registerModule(javaTimeModule);
|
||||||
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
|
||||||
|
mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
mapper.enable(SerializationFeature.INDENT_OUTPUT);
|
||||||
|
|
||||||
return mapper;
|
return mapper;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ public enum MessageCode {
|
|||||||
FILE_UPLOAD_ERROR(2, "File upload error"),
|
FILE_UPLOAD_ERROR(2, "File upload error"),
|
||||||
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
FILE_DOWNLOAD_ERROR(2, "File download error"),
|
||||||
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
|
||||||
|
IMAGE_FOUND_ERROR(2, "Image found error"),
|
||||||
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
|
||||||
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
INCOMPLETE_UPLOAD(2, "Not load all chunks"),
|
||||||
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
MSG_ID_NOT_FOUND(4, "Message id not found"),
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class ImageSearchRequest {
|
||||||
|
@JsonProperty("file_id")
|
||||||
|
private String fileId;
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package ru.soune.nocopy.dto.file;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public class YandexSearchResponse {
|
||||||
|
|
||||||
|
@JsonProperty("images")
|
||||||
|
private List<ImageResult> images;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
@JsonIgnoreProperties(ignoreUnknown = true)
|
||||||
|
public static class ImageResult {
|
||||||
|
@JsonProperty("url")
|
||||||
|
private String url;
|
||||||
|
|
||||||
|
@JsonProperty("pageUrl")
|
||||||
|
private String pageUrl;
|
||||||
|
|
||||||
|
@JsonProperty("pageTitle")
|
||||||
|
private String pageTitle;
|
||||||
|
|
||||||
|
@JsonProperty("width")
|
||||||
|
private Integer width;
|
||||||
|
|
||||||
|
@JsonProperty("height")
|
||||||
|
private Integer height;
|
||||||
|
|
||||||
|
@JsonProperty("host")
|
||||||
|
private String host;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package ru.soune.nocopy.handler;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
import ru.soune.nocopy.dto.BaseRequest;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.file.ImageSearchRequest;
|
||||||
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
|
import ru.soune.nocopy.service.YandexSearchService;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Component
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class ImageFoundRequestHandler implements RequestHandler {
|
||||||
|
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
private final YandexSearchService yandexSearchService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseResponse handle(BaseRequest request) throws Exception {
|
||||||
|
ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
|
||||||
|
ImageSearchRequest.class);
|
||||||
|
|
||||||
|
String fileId = imageSearchRequest.getFileId();
|
||||||
|
|
||||||
|
YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
|
||||||
|
|
||||||
|
return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
|
||||||
|
MessageCode.SUCCESS.getDescription(), response);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ import java.util.Optional;
|
|||||||
public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
|
public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
|
||||||
|
|
||||||
List<FileEntity> findByUserId(Long userId);
|
List<FileEntity> findByUserId(Long userId);
|
||||||
|
Optional<FileEntity> findByUserIdAndChecksum(Long userId, String imageHash);
|
||||||
|
|
||||||
List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
|
List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,162 @@
|
|||||||
|
package ru.soune.nocopy.service;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||||
|
import jakarta.annotation.PostConstruct;
|
||||||
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import ru.soune.nocopy.dto.BaseResponse;
|
||||||
|
import ru.soune.nocopy.dto.MessageCode;
|
||||||
|
import ru.soune.nocopy.dto.file.YandexSearchResponse;
|
||||||
|
import ru.soune.nocopy.entity.file.FileEntity;
|
||||||
|
import ru.soune.nocopy.exception.FileEntityNotFoundException;
|
||||||
|
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||||
|
import ru.soune.nocopy.repository.FileEntityRepository;
|
||||||
|
|
||||||
|
import java.io.*;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
@Service
|
||||||
|
@RequiredArgsConstructor
|
||||||
|
public class YandexSearchService {
|
||||||
|
|
||||||
|
private final FileEntityRepository fileEntityRepository;
|
||||||
|
private final ObjectMapper objectMapper;
|
||||||
|
|
||||||
|
@Value("${yandex.api-key}")
|
||||||
|
private String apiKey;
|
||||||
|
|
||||||
|
@Value("${yandex.folder-id}")
|
||||||
|
private String folderId;
|
||||||
|
|
||||||
|
@Value("${yandex.search-url}")
|
||||||
|
private String searchUrl;
|
||||||
|
|
||||||
|
@PostConstruct
|
||||||
|
public void init() {
|
||||||
|
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||||
|
objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public YandexSearchResponse searchByFileEntity(String fileId) throws IOException {
|
||||||
|
FileEntity fileEntity = fileEntityRepository.findById(fileId)
|
||||||
|
.orElseThrow(() -> {
|
||||||
|
throw new NotValidFieldException("File not found", new BaseResponse(20007,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
Map.of("fileId",fileId)));
|
||||||
|
});
|
||||||
|
byte[] fileBytes;
|
||||||
|
|
||||||
|
if (!isImageFile(fileEntity)) {
|
||||||
|
log.error("File not image: {}", fileEntity.getMimeType());
|
||||||
|
throw new NotValidFieldException("File not image", new BaseResponse(20007,
|
||||||
|
MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
|
||||||
|
Map.of("file_type", fileEntity.getMimeType())));
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
fileBytes = readFileFromDisk(fileEntity);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007,
|
||||||
|
MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
|
||||||
|
Map.of("fileId", fileId,
|
||||||
|
"filePath", fileEntity.getFilePath())));
|
||||||
|
}
|
||||||
|
|
||||||
|
return callYandexApi(fileBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean isImageFile(FileEntity fileEntity) {
|
||||||
|
String mimeType = fileEntity.getMimeType();
|
||||||
|
return mimeType != null && mimeType.startsWith("image");
|
||||||
|
}
|
||||||
|
|
||||||
|
private byte[] readFileFromDisk(FileEntity fileEntity) throws IOException {
|
||||||
|
Path filePath = Path.of(fileEntity.getFilePath());
|
||||||
|
|
||||||
|
if (!Files.exists(filePath)) {
|
||||||
|
throw new IOException("File not found: " + fileEntity.getFilePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Files.isReadable(filePath)) {
|
||||||
|
throw new IOException("Cannot read file: " + fileEntity.getFilePath());
|
||||||
|
}
|
||||||
|
|
||||||
|
return Files.readAllBytes(filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
private YandexSearchResponse callYandexApi(byte[] imageBytes) throws IOException {
|
||||||
|
String imageBase64 = Base64.getEncoder().encodeToString(imageBytes);
|
||||||
|
String jsonRequest = String.format("{\"folderId\":\"%s\",\"data\":\"%s\",\"page\":0,\"showSimilarImages\":true}",
|
||||||
|
folderId, imageBase64);
|
||||||
|
|
||||||
|
URL url = new URL(searchUrl);
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||||
|
|
||||||
|
try {
|
||||||
|
connection.setRequestMethod("POST");
|
||||||
|
connection.setRequestProperty("Authorization", "Api-Key " + apiKey);
|
||||||
|
connection.setRequestProperty("Content-Type", "application/json");
|
||||||
|
connection.setRequestProperty("Accept", "application/json");
|
||||||
|
connection.setConnectTimeout(30000);
|
||||||
|
connection.setReadTimeout(30000);
|
||||||
|
connection.setDoOutput(true);
|
||||||
|
|
||||||
|
try (OutputStream os = connection.getOutputStream()) {
|
||||||
|
byte[] input = jsonRequest.getBytes("utf-8");
|
||||||
|
os.write(input, 0, input.length);
|
||||||
|
os.flush();
|
||||||
|
}
|
||||||
|
|
||||||
|
int responseCode = connection.getResponseCode();
|
||||||
|
|
||||||
|
String responseBody;
|
||||||
|
if (responseCode == HttpURLConnection.HTTP_OK) {
|
||||||
|
try (BufferedReader br = new BufferedReader(
|
||||||
|
new InputStreamReader(connection.getInputStream(), "utf-8"))) {
|
||||||
|
responseBody = readAll(br);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
try (BufferedReader br = new BufferedReader(
|
||||||
|
new InputStreamReader(connection.getErrorStream(), "utf-8"))) {
|
||||||
|
responseBody = readAll(br);
|
||||||
|
}
|
||||||
|
throw new IOException("Error Yandex API: " + responseCode + " - " + responseBody);
|
||||||
|
}
|
||||||
|
|
||||||
|
return parseJsonResponse(responseBody);
|
||||||
|
|
||||||
|
} finally {
|
||||||
|
connection.disconnect();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String readAll(BufferedReader reader) throws IOException {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
String line;
|
||||||
|
while ((line = reader.readLine()) != null) {
|
||||||
|
sb.append(line);
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private YandexSearchResponse parseJsonResponse(String json) {
|
||||||
|
YandexSearchResponse response = null;
|
||||||
|
try {
|
||||||
|
response = objectMapper.readValue(json, YandexSearchResponse.class);
|
||||||
|
} catch (JsonProcessingException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -40,6 +40,11 @@ security:
|
|||||||
allowed-headers: "*"
|
allowed-headers: "*"
|
||||||
allow-credentials: true
|
allow-credentials: true
|
||||||
|
|
||||||
|
yandex:
|
||||||
|
api-key: ${YANDEX_SEARCH_API_KEY}
|
||||||
|
folder-id: ${YANDEX_SEARCH_FOLDER_ID}
|
||||||
|
search-url: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
|
||||||
|
|
||||||
server:
|
server:
|
||||||
port: ${SERVER_PORT:8080}
|
port: ${SERVER_PORT:8080}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user