backdev/no-copy
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

dev add another client for google and yandex
Test Workflow / test (push) Waiting to run
Details

Browse Source
This commit is contained in:
vladp
2026-02-22 02:40:28 +07:00
parent a5c8d09fc4
commit b347958772
1 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/ru/soune/nocopy/service/search/SearchImageService.java
+89 -87
View File
@@ -49,10 +49,10 @@ public class SearchImageService {
public SearchImageService() { public SearchImageService() {
this.yandexHttpClient = new OkHttpClient.Builder() this.yandexHttpClient = new OkHttpClient.Builder()
.connectTimeout(18, TimeUnit.SECONDS) .connectTimeout(15, TimeUnit.SECONDS)
.writeTimeout(18, TimeUnit.SECONDS) .writeTimeout(15, TimeUnit.SECONDS)
.readTimeout(18, TimeUnit.SECONDS) .readTimeout(15, TimeUnit.SECONDS)
.callTimeout(18, TimeUnit.SECONDS) .callTimeout(15, TimeUnit.SECONDS)
.followRedirects(true) .followRedirects(true)
.followSslRedirects(true) .followSslRedirects(true)
.retryOnConnectionFailure(true) .retryOnConnectionFailure(true)
@@ -61,10 +61,10 @@ public class SearchImageService {
.build(); .build();
this.googleHttpClient = new OkHttpClient.Builder() this.googleHttpClient = new OkHttpClient.Builder()
.connectTimeout(18, TimeUnit.SECONDS) .connectTimeout(15, TimeUnit.SECONDS)
.writeTimeout(18, TimeUnit.SECONDS) .writeTimeout(15, TimeUnit.SECONDS)
.readTimeout(18, TimeUnit.SECONDS) .readTimeout(15, TimeUnit.SECONDS)
.callTimeout(18, TimeUnit.SECONDS) .callTimeout(15, TimeUnit.SECONDS)
.followRedirects(true) .followRedirects(true)
.followSslRedirects(true) .followSslRedirects(true)
.retryOnConnectionFailure(true) .retryOnConnectionFailure(true)
@@ -127,6 +127,72 @@ public class SearchImageService {
return mimeType != null && mimeType.startsWith("image"); return mimeType != null && mimeType.startsWith("image");
} }
// private String callReverseImageApiByUrl(String imageUrl, String engine, String searchType) throws IOException {
// if (searchApiKey == null || searchApiKey.isBlank()) {
// throw new IllegalStateException("SearchAPI key not configured");
// }
//
// OkHttpClient client = engine.contains("yandex_reverse_image") ? yandexHttpClient : googleHttpClient;
//
// HttpUrl url = HttpUrl.parse("https://www.searchapi.io/api/v1/search")
// .newBuilder()
// .addQueryParameter("engine", engine)
// .addQueryParameter("api_key", searchApiKey)
// .addQueryParameter("url", imageUrl)
// .addQueryParameter("search_type", searchType)
// .addQueryParameter("t_", String.valueOf(System.currentTimeMillis()))
// .build();
//
// Request request = new Request.Builder()
// .url(url)
// .header("Accept", "application/json")
// .header("User-Agent", "Mozilla/5.0")
// .build();
//
// int maxAttempts = 2;
// IOException lastException = null;
//
// for (int attempt = 1; attempt <= maxAttempts; attempt++) {
// long start = System.currentTimeMillis();
//
// try (Response response = client.newCall(request).execute()) {
// long duration = System.currentTimeMillis() - start;
// log.info("Yandex response code={}, duration={}ms, attempt={}",
// response.code(), duration, attempt);
//
// if (!response.isSuccessful()) {
// throw new IOException("API error: " + response.code());
// }
//
// ResponseBody body = response.body();
// if (body == null) {
// throw new IOException("Empty response body");
// }
//
// return body.string();
//
// } catch (IOException e) {
// lastException = e;
// log.warn("Attempt {} failed for image: {}, error: {}",
// attempt, imageUrl, e.getMessage());
//
// if (attempt == maxAttempts) {
// log.error("All {} attempts failed for image: {}", maxAttempts, imageUrl);
// throw lastException;
// }
//
// try {
// Thread.sleep(500L * attempt);
// } catch (InterruptedException ie) {
// Thread.currentThread().interrupt();
// throw new IOException("Retry interrupted", ie);
// }
// }
// }
//
// throw lastException;
// }
private String callReverseImageApiByUrl(String imageUrl, String engine, String searchType) throws IOException { private String callReverseImageApiByUrl(String imageUrl, String engine, String searchType) throws IOException {
if (searchApiKey == null || searchApiKey.isBlank()) { if (searchApiKey == null || searchApiKey.isBlank()) {
throw new IllegalStateException("SearchAPI key not configured"); throw new IllegalStateException("SearchAPI key not configured");
@@ -149,91 +215,27 @@ public class SearchImageService {
.header("User-Agent", "Mozilla/5.0") .header("User-Agent", "Mozilla/5.0")
.build(); .build();
int maxAttempts = 3; long start = System.currentTimeMillis();
IOException lastException = null;
for (int attempt = 1; attempt <= maxAttempts; attempt++) { try (Response response = client.newCall(request).execute()) {
long start = System.currentTimeMillis(); long duration = System.currentTimeMillis() - start;
log.info("SearchAPI response code={}, duration={}ms, engine={}",
response.code(), duration, engine);
try (Response response = client.newCall(request).execute()) { if (!response.isSuccessful()) {
long duration = System.currentTimeMillis() - start; String errorBody = response.body() != null ? response.body().string() : "null";
log.info("Yandex response code={}, duration={}ms, attempt={}", throw new IOException("API error " + response.code() + ": " + errorBody);
response.code(), duration, attempt);
if (!response.isSuccessful()) {
throw new IOException("API error: " + response.code());
}
ResponseBody body = response.body();
if (body == null) {
throw new IOException("Empty response body");
}
return body.string();
} catch (IOException e) {
lastException = e;
log.warn("Attempt {} failed for image: {}, error: {}",
attempt, imageUrl, e.getMessage());
if (attempt == maxAttempts) {
log.error("All {} attempts failed for image: {}", maxAttempts, imageUrl);
throw lastException;
}
try {
Thread.sleep(500L * attempt);
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
throw new IOException("Retry interrupted", ie);
}
} }
ResponseBody body = response.body();
if (body == null) {
throw new IOException("Empty response body");
}
return body.string();
} }
throw lastException;
} }
// private String callReverseImageApiByUrl(String imageUrl, String engine, String searchType) throws IOException {
//
// if (searchApiKey == null || searchApiKey.isBlank()) {
// throw new IllegalStateException("SearchAPI key not configured");
// }
//
// HttpUrl url = HttpUrl.parse("https://searchapi.io/api/v1/search")
// .newBuilder()
// .addQueryParameter("engine", engine)
// .addQueryParameter("api_key", searchApiKey)
// .addQueryParameter("url", imageUrl)
// .addQueryParameter("search_type", searchType)
// .build();
//
// Request request = new Request.Builder()
// .url(url)
// .header("Accept", "application/json")
// .header("User-Agent", "Mozilla/5.0")
// .build();
//
// long start = System.currentTimeMillis();
//
// try (Response response = httpClient.newCall(request).execute()) {
//
// long duration = System.currentTimeMillis() - start;
// log.info("Yandex response code={}, duration={}ms", response.code(), duration);
//
// if (!response.isSuccessful()) {
// throw new IOException("API error: " + response.code());
// }
//
// ResponseBody body = response.body();
// if (body == null) {
// throw new IOException("Empty response body");
// }
//
// return body.string();
// }
// }
public List<YandexSearchResponse.ImageResult> getAllImagesWithoutPagination(String searchApiJson, String findType) public List<YandexSearchResponse.ImageResult> getAllImagesWithoutPagination(String searchApiJson, String findType)
throws IOException { throws IOException {
JsonNode root = objectMapper.readTree(searchApiJson); JsonNode root = objectMapper.readTree(searchApiJson);