del token exceed
This commit is contained in:
@@ -26,7 +26,6 @@ public class UserEvent {
|
|||||||
USER_CREATED,
|
USER_CREATED,
|
||||||
CHAT_CREATED,
|
CHAT_CREATED,
|
||||||
CHAT_DELETED,
|
CHAT_DELETED,
|
||||||
QUERY_SENT,
|
QUERY_SENT
|
||||||
RAG_CONTEXT_HIT
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,12 +65,6 @@ public class AnalyticsService {
|
|||||||
daily.setTotalTokensUsed(daily.getTotalTokensUsed() + event.getTokensUsed());
|
daily.setTotalTokensUsed(daily.getTotalTokensUsed() + event.getTokensUsed());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case RAG_CONTEXT_HIT -> {
|
|
||||||
daily.setTotalRagHits(daily.getTotalRagHits() + 1);
|
|
||||||
if (event.getDocumentsFound() != null) {
|
|
||||||
daily.setTotalDocumentsFound(daily.getTotalDocumentsFound() + event.getDocumentsFound());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dailyStatsRepository.save(daily);
|
dailyStatsRepository.save(daily);
|
||||||
@@ -93,7 +87,6 @@ public class AnalyticsService {
|
|||||||
userStats.setTotalTokensUsed(userStats.getTotalTokensUsed() + event.getTokensUsed());
|
userStats.setTotalTokensUsed(userStats.getTotalTokensUsed() + event.getTokensUsed());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case RAG_CONTEXT_HIT -> userStats.setTotalRagHits(userStats.getTotalRagHits() + 1);
|
|
||||||
default -> { /* no user-level aggregation needed */ }
|
default -> { /* no user-level aggregation needed */ }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,8 +41,7 @@ public class ChatEntryController {
|
|||||||
|
|
||||||
eventPublisher.publishQuerySent(
|
eventPublisher.publishQuerySent(
|
||||||
chat.getIdOwner().toString(),
|
chat.getIdOwner().toString(),
|
||||||
chatId.toString(),
|
chatId.toString());
|
||||||
0); // TODO: add tokensUsed when usage info is available from Groq response
|
|
||||||
|
|
||||||
return ResponseEntity.ok(entry);
|
return ResponseEntity.ok(entry);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,8 +22,6 @@ public class UserEvent {
|
|||||||
private EventType type;
|
private EventType type;
|
||||||
private String userId;
|
private String userId;
|
||||||
private String chatId;
|
private String chatId;
|
||||||
private Integer tokensUsed;
|
|
||||||
private Integer documentsFound;
|
|
||||||
|
|
||||||
@Builder.Default
|
@Builder.Default
|
||||||
private Instant timestamp = Instant.now();
|
private Instant timestamp = Instant.now();
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ public interface EventPublisher {
|
|||||||
|
|
||||||
void publishChatDeleted(String userId, String chatId);
|
void publishChatDeleted(String userId, String chatId);
|
||||||
|
|
||||||
void publishQuerySent(String userId, String chatId, int tokensUsed);
|
void publishQuerySent(String userId, String chatId);
|
||||||
|
|
||||||
void publishUserCreated(String userId);
|
void publishUserCreated(String userId);
|
||||||
}
|
}
|
||||||
@@ -38,12 +38,11 @@ public class EventPublisherImpl implements EventPublisher {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void publishQuerySent(String userId, String chatId, int tokensUsed) {
|
public void publishQuerySent(String userId, String chatId) {
|
||||||
publish(UserEvent.builder()
|
publish(UserEvent.builder()
|
||||||
.type(EventType.QUERY_SENT)
|
.type(EventType.QUERY_SENT)
|
||||||
.userId(userId)
|
.userId(userId)
|
||||||
.chatId(chatId)
|
.chatId(chatId)
|
||||||
.tokensUsed(tokensUsed)
|
|
||||||
.build());
|
.build());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user