Commit 405accc6 authored by ligaowei's avatar ligaowei

更新sse相关类的包结构

parent c9493204
......@@ -7,10 +7,10 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import pangea.hiagent.agent.processor.AgentProcessor;
import pangea.hiagent.agent.processor.AgentProcessorFactory;
import pangea.hiagent.agent.sse.UserSseService;
import pangea.hiagent.common.utils.UserUtils;
import pangea.hiagent.web.dto.ChatRequest;
import pangea.hiagent.model.Agent;
import pangea.hiagent.sse.WorkPanelSseService;
import pangea.hiagent.tool.AgentToolManager;
import pangea.hiagent.web.dto.AgentRequest;
import pangea.hiagent.workpanel.event.EventService;
......@@ -33,7 +33,7 @@ public class AgentChatService {
private final AgentProcessorFactory agentProcessorFactory;
private final StreamRequestService streamRequestService;
private final AgentToolManager agentToolManager;
private final WorkPanelSseService workPanelSseService;
private final UserSseService workPanelSseService;
public AgentChatService(
EventService eventService,
......@@ -42,7 +42,7 @@ public class AgentChatService {
AgentProcessorFactory agentProcessorFactory,
StreamRequestService streamRequestService,
AgentToolManager agentToolManager,
WorkPanelSseService workPanelSseService) {
UserSseService workPanelSseService) {
this.chatErrorHandler = chatErrorHandler;
this.agentValidationService = agentValidationService;
this.agentProcessorFactory = agentProcessorFactory;
......
......@@ -5,9 +5,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import pangea.hiagent.model.Agent;
import pangea.hiagent.sse.WorkPanelSseService;
import pangea.hiagent.agent.processor.AgentProcessor;
import pangea.hiagent.agent.processor.AgentProcessorFactory;
import pangea.hiagent.agent.sse.UserSseService;
import pangea.hiagent.common.utils.LogUtils;
import pangea.hiagent.common.utils.ValidationUtils;
import java.util.concurrent.atomic.AtomicBoolean;
......@@ -24,7 +24,7 @@ public class AgentProcessorService {
private AgentProcessorFactory agentProcessorFactory;
@Autowired
private WorkPanelSseService workPanelSseService;
private UserSseService workPanelSseService;
@Autowired
private ChatErrorHandler chatErrorHandler;
......
......@@ -8,9 +8,9 @@ import pangea.hiagent.model.Agent;
import pangea.hiagent.model.AgentDialogue;
import pangea.hiagent.common.utils.ValidationUtils;
import pangea.hiagent.agent.processor.AgentProcessor;
import pangea.hiagent.agent.sse.UserSseService;
import pangea.hiagent.common.utils.LogUtils;
import pangea.hiagent.common.utils.UserUtils;
import pangea.hiagent.sse.WorkPanelSseService;
import pangea.hiagent.web.dto.AgentRequest;
import pangea.hiagent.web.service.AgentService;
import pangea.hiagent.workpanel.event.EventService;
......@@ -28,7 +28,7 @@ public class CompletionHandlerService {
private AgentService agentService;
@Autowired
private WorkPanelSseService unifiedSseService;
private UserSseService unifiedSseService;
@Autowired
private EventService eventService;
......
......@@ -6,8 +6,8 @@ import org.springframework.stereotype.Service;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import pangea.hiagent.agent.processor.AgentProcessor;
import pangea.hiagent.agent.sse.UserSseService;
import pangea.hiagent.workpanel.event.EventService;
import pangea.hiagent.sse.WorkPanelSseService;
import pangea.hiagent.model.Agent;
import pangea.hiagent.common.utils.LogUtils;
import java.util.concurrent.atomic.AtomicBoolean;
......@@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class StreamRequestService {
@Autowired
private WorkPanelSseService unifiedSseService;
private UserSseService unifiedSseService;
@Autowired
private EventService eventService;
......@@ -85,7 +85,7 @@ public class StreamRequestService {
private String userId;
private CompletionHandlerService completionHandlerService;
public StreamTokenConsumer(SseEmitter emitter, AgentProcessor processor, WorkPanelSseService unifiedSseService, EventService eventService, CompletionHandlerService completionHandlerService) {
public StreamTokenConsumer(SseEmitter emitter, AgentProcessor processor, UserSseService unifiedSseService, EventService eventService, CompletionHandlerService completionHandlerService) {
this.emitter = emitter;
this.processor = processor;
this.eventService = eventService;
......
package pangea.hiagent.sse;
package pangea.hiagent.agent.sse;
import lombok.extern.slf4j.Slf4j;
import pangea.hiagent.web.dto.WorkPanelEvent;
......@@ -17,11 +17,11 @@ import java.util.concurrent.atomic.AtomicBoolean;
@Component
public class SseConnectionCoordinator {
private final WorkPanelSseService unifiedSseService;
private final UserSseService unifiedSseService;
private final EventService eventService;
public SseConnectionCoordinator(
WorkPanelSseService unifiedSseService,
UserSseService unifiedSseService,
EventService eventService) {
this.unifiedSseService = unifiedSseService;
this.eventService = eventService;
......
package pangea.hiagent.sse;
package pangea.hiagent.agent.sse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
......
package pangea.hiagent.sse;
package pangea.hiagent.agent.sse;
import lombok.extern.slf4j.Slf4j;
import pangea.hiagent.web.dto.WorkPanelEvent;
......@@ -21,7 +21,7 @@ import java.util.concurrent.ScheduledFuture;
*/
@Slf4j
@Service
public class WorkPanelSseService {
public class UserSseService {
// 存储所有活动的 emitter
private final List<SseEmitter> emitters = new CopyOnWriteArrayList<>();
......@@ -40,7 +40,7 @@ public class WorkPanelSseService {
private final EventService eventService;
public WorkPanelSseService(EventService eventService) {
public UserSseService(EventService eventService) {
this.eventService = eventService;
this.heartbeatExecutor = Executors.newScheduledThreadPool(2);
}
......
......@@ -3,8 +3,9 @@ package pangea.hiagent.web.controller;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import pangea.hiagent.agent.sse.UserSseService;
import pangea.hiagent.common.utils.UserUtils;
import pangea.hiagent.sse.WorkPanelSseService;
import pangea.hiagent.workpanel.event.EventService;
/**
......@@ -16,8 +17,8 @@ import pangea.hiagent.workpanel.event.EventService;
@RequestMapping("/api/v1/agent")
public class TimelineEventController {
private final WorkPanelSseService workPanelSseService;
public TimelineEventController(WorkPanelSseService workPanelSseService, EventService eventService) {
private final UserSseService workPanelSseService;
public TimelineEventController(UserSseService workPanelSseService, EventService eventService) {
this.workPanelSseService = workPanelSseService;
}
......
......@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import pangea.hiagent.workpanel.event.EventDeduplicationService;
import pangea.hiagent.workpanel.event.EventService;
import pangea.hiagent.sse.WorkPanelSseService;
import pangea.hiagent.agent.sse.UserSseService;
import pangea.hiagent.web.dto.LogEvent;
import pangea.hiagent.web.dto.ResultEvent;
import pangea.hiagent.web.dto.ThoughtEvent;
......@@ -58,7 +58,7 @@ public class WorkPanelDataCollector implements IWorkPanelDataCollector {
* SSE服务
*/
@Autowired
private WorkPanelSseService unifiedSseService;
private UserSseService unifiedSseService;
/**
* 最大事件数量,防止内存溢出
......
package pangea.hiagent.workpanel.event;
import lombok.extern.slf4j.Slf4j;
import pangea.hiagent.sse.WorkPanelSseService;
import pangea.hiagent.agent.sse.UserSseService;
import pangea.hiagent.web.dto.ToolEvent;
import pangea.hiagent.web.dto.WorkPanelEvent;
......@@ -23,7 +23,7 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
public class SseEventBroadcaster {
@Autowired
private WorkPanelSseService unifiedSseService;
private UserSseService unifiedSseService;
@Autowired
private EventService eventService;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment