digiops/marketing-parser
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

target fix

Browse Source
This commit is contained in:
arys
2026-04-03 16:42:06 +05:00
parent d3f03d40ed
commit 131c4c08e0
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/kz/konturai/parser/service/CampaignPredictionService.java
+13 -6
View File
@@ -3,7 +3,6 @@ package kz.konturai.parser.service;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import kz.konturai.parser.exception.ClaudeApiException;
import kz.konturai.parser.model.CampaignPrediction; import kz.konturai.parser.model.CampaignPrediction;
import kz.konturai.parser.model.TargetingCampaign; import kz.konturai.parser.model.TargetingCampaign;
import kz.konturai.parser.repository.CampaignPredictionRepository; import kz.konturai.parser.repository.CampaignPredictionRepository;
@@ -24,7 +23,7 @@ import java.util.Optional;
@Slf4j @Slf4j
public class CampaignPredictionService { public class CampaignPredictionService {
private final ClaudeApiService claudeApiService; private final OpenAIAnalyticsService openAiService;
private final CampaignPredictionRepository predictionRepository; private final CampaignPredictionRepository predictionRepository;
private final TargetingCampaignRepository campaignRepository; private final TargetingCampaignRepository campaignRepository;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
@@ -93,7 +92,15 @@ public class CampaignPredictionService {
String userMessage = buildUserMessage(campaign); String userMessage = buildUserMessage(campaign);
try { try {
String rawJson = claudeApiService.call(SYSTEM_PROMPT, userMessage, 4000); String rawJson = openAiService.generateWithInstructionWithModel(
"",
userMessage,
"ru",
"gpt-4o",
SYSTEM_PROMPT,
4000,
120000L
);
CampaignPrediction prediction = parsePrediction(rawJson, campaign.getId()); CampaignPrediction prediction = parsePrediction(rawJson, campaign.getId());
// Снимаем флаг isLatest со старых предсказаний // Снимаем флаг isLatest со старых предсказаний
@@ -108,9 +115,9 @@ public class CampaignPredictionService {
prediction.getPredictionScore(), prediction.getPredictionLabel()); prediction.getPredictionScore(), prediction.getPredictionLabel());
return prediction; return prediction;
} catch (ClaudeApiException e) { } catch (Exception e) {
log.error("[Prediction] Ошибка Claude API: {}", e.getMessage()); log.error("[Prediction] Ошибка OpenAI API: {}", e.getMessage());
throw e; throw new RuntimeException("Ошибка генерации предсказания: " + e.getMessage(), e);
} }
} }
src/main/java/kz/konturai/parser/service/ClaudeApiService.java
+3 -3
View File
@@ -24,9 +24,9 @@ import java.util.Map;
@Slf4j @Slf4j
public class ClaudeApiService { public class ClaudeApiService {
private static final String CLAUDE_MODEL = "claude-sonnet-4-20250514"; private static final String CLAUDE_MODEL = "claude-sonnet-4-5";
private static final int MAX_RETRIES = 3; private static final int MAX_RETRIES = 2;
private static final Duration TIMEOUT = Duration.ofSeconds(60); private static final Duration TIMEOUT = Duration.ofSeconds(90);
private final WebClient webClient; private final WebClient webClient;
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;