This is an automated email from the ASF dual-hosted git repository. gongchao pushed a commit to branch new-startup in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 82334a31a138b2eb9c1c54d6d020ff41294b286d Author: tomsun28 <[email protected]> AuthorDate: Sat Oct 25 16:16:34 2025 +0800 refactor ai-agent name to ai Signed-off-by: tomsun28 <[email protected]> --- {hertzbeat-ai-agent => hertzbeat-ai}/pom.xml | 2 +- .../hertzbeat/ai}/adapters/AlertDefineServiceAdapter.java | 6 +++--- .../apache/hertzbeat/ai}/adapters/AlertServiceAdapter.java | 4 ++-- .../hertzbeat/ai}/adapters/MetricsServiceAdapter.java | 4 ++-- .../hertzbeat/ai}/adapters/MonitorServiceAdapter.java | 2 +- .../ai}/adapters/impl/AlertDefineServiceAdapterImpl.java | 12 ++++++------ .../ai}/adapters/impl/AlertServiceAdapterImpl.java | 8 ++++---- .../ai}/adapters/impl/MetricsServiceAdapterImpl.java | 8 ++++---- .../ai}/adapters/impl/MonitorServiceAdapterImpl.java | 8 ++++---- .../hertzbeat/ai}/config/CustomSseServerTransport.java | 2 +- .../apache/hertzbeat/ai}/config/DynamicOpenAiApiKey.java | 4 ++-- .../java/org/apache/hertzbeat/ai}/config/LlmConfig.java | 4 ++-- .../org/apache/hertzbeat/ai}/config/McpContextHolder.java | 2 +- .../org/apache/hertzbeat/ai}/config/PromptProvider.java | 4 ++-- .../apache/hertzbeat/ai}/controller/ChatController.java | 14 +++++++------- .../java/org/apache/hertzbeat/ai}/entity/OpenAiConfig.java | 4 ++-- .../apache/hertzbeat/ai}/pojo/dto/ChatRequestContext.java | 4 ++-- .../org/apache/hertzbeat/ai}/pojo/dto/ChatResponseDto.java | 4 ++-- .../org/apache/hertzbeat/ai}/pojo/dto/ConversationDto.java | 4 ++-- .../java/org/apache/hertzbeat/ai}/pojo/dto/Hierarchy.java | 2 +- .../java/org/apache/hertzbeat/ai}/pojo/dto/MessageDto.java | 4 ++-- .../apache/hertzbeat/ai}/pojo/dto/ModelProviderConfig.java | 2 +- .../org/apache/hertzbeat/ai}/service/AiConfigService.java | 2 +- .../hertzbeat/ai}/service/ChatClientProviderService.java | 4 ++-- .../apache/hertzbeat/ai}/service/ConversationService.java | 8 ++++---- .../org/apache/hertzbeat/ai}/service/McpServerService.java | 4 ++-- .../hertzbeat/ai}/service/impl/AiConfigServiceImpl.java | 4 ++-- .../ai}/service/impl/ChatClientProviderServiceImpl.java | 12 ++++++------ .../ai}/service/impl/ConversationServiceImpl.java | 14 +++++++------- .../hertzbeat/ai}/service/impl/McpServerServiceImpl.java | 14 +++++++------- .../org/apache/hertzbeat/ai}/tools/AlertDefineTools.java | 4 ++-- .../java/org/apache/hertzbeat/ai}/tools/AlertTools.java | 2 +- .../java/org/apache/hertzbeat/ai}/tools/MetricsTools.java | 2 +- .../java/org/apache/hertzbeat/ai}/tools/MonitorTools.java | 4 ++-- .../hertzbeat/ai}/tools/impl/AlertDefineToolsImpl.java | 14 +++++++------- .../apache/hertzbeat/ai}/tools/impl/AlertToolsImpl.java | 10 +++++----- .../apache/hertzbeat/ai}/tools/impl/MetricsToolsImpl.java | 12 ++++++------ .../apache/hertzbeat/ai}/tools/impl/MonitorToolsImpl.java | 10 +++++----- .../java/org/apache/hertzbeat/ai}/utils/UtilityClass.java | 4 ++-- hertzbeat-manager/pom.xml | 2 +- .../service/impl/ModelProviderConfigServiceImpl.java | 2 +- pom.xml | 2 +- 42 files changed, 119 insertions(+), 119 deletions(-) diff --git a/hertzbeat-ai-agent/pom.xml b/hertzbeat-ai/pom.xml similarity index 98% rename from hertzbeat-ai-agent/pom.xml rename to hertzbeat-ai/pom.xml index 9bb22303a..0fe8dc158 100644 --- a/hertzbeat-ai-agent/pom.xml +++ b/hertzbeat-ai/pom.xml @@ -23,7 +23,7 @@ <artifactId>hertzbeat</artifactId> <version>2.0-SNAPSHOT</version> </parent> - <artifactId>hertzbeat-ai-agent</artifactId> + <artifactId>hertzbeat-ai</artifactId> <version>${hertzbeat.version}</version> <properties> <spring-ai.version>1.0.3</spring-ai.version> diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/AlertDefineServiceAdapter.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/AlertDefineServiceAdapter.java similarity index 96% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/AlertDefineServiceAdapter.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/AlertDefineServiceAdapter.java index d11adc343..63ac256b6 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/AlertDefineServiceAdapter.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/AlertDefineServiceAdapter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.adapters; +package org.apache.hertzbeat.ai.adapters; -import org.apache.hertzbeat.ai.agent.pojo.dto.Hierarchy; +import org.apache.hertzbeat.ai.pojo.dto.Hierarchy; import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.springframework.data.domain.Page; @@ -78,4 +78,4 @@ public interface AlertDefineServiceAdapter { */ List<Hierarchy> getAppHierarchy(String app, String lang); -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/AlertServiceAdapter.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/AlertServiceAdapter.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/AlertServiceAdapter.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/AlertServiceAdapter.java index 534463b31..b4dbb196c 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/AlertServiceAdapter.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/AlertServiceAdapter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.adapters; +package org.apache.hertzbeat.ai.adapters; import org.apache.hertzbeat.alert.dto.AlertSummary; import org.apache.hertzbeat.common.entity.alerter.GroupAlert; @@ -57,4 +57,4 @@ public interface AlertServiceAdapter { * @return Alert summary information */ AlertSummary getAlertsSummary(); -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/MetricsServiceAdapter.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/MetricsServiceAdapter.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/MetricsServiceAdapter.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/MetricsServiceAdapter.java index 9df04de39..f40959673 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/MetricsServiceAdapter.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/MetricsServiceAdapter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.adapters; +package org.apache.hertzbeat.ai.adapters; import org.apache.hertzbeat.common.entity.dto.MetricsData; import org.apache.hertzbeat.common.entity.dto.MetricsHistoryData; @@ -52,4 +52,4 @@ public interface MetricsServiceAdapter { * @return Historical metrics data */ MetricsHistoryData getMetricHistoryData(Long monitorId, String app, String metrics, String metric, String label, String history, Boolean interval); -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/MonitorServiceAdapter.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/MonitorServiceAdapter.java similarity index 98% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/MonitorServiceAdapter.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/MonitorServiceAdapter.java index b8f1fb172..aad0e2a72 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/MonitorServiceAdapter.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/MonitorServiceAdapter.java @@ -16,7 +16,7 @@ */ -package org.apache.hertzbeat.ai.agent.adapters; +package org.apache.hertzbeat.ai.adapters; import org.springframework.data.domain.Page; import org.apache.hertzbeat.common.entity.manager.Monitor; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/AlertDefineServiceAdapterImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/AlertDefineServiceAdapterImpl.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/AlertDefineServiceAdapterImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/AlertDefineServiceAdapterImpl.java index 68840e502..a22093c62 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/AlertDefineServiceAdapterImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/AlertDefineServiceAdapterImpl.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.adapters.impl; +package org.apache.hertzbeat.ai.adapters.impl; import com.usthe.sureness.subject.SubjectSum; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.adapters.AlertDefineServiceAdapter; -import org.apache.hertzbeat.ai.agent.config.McpContextHolder; -import org.apache.hertzbeat.ai.agent.pojo.dto.Hierarchy; -import org.apache.hertzbeat.ai.agent.utils.UtilityClass; +import org.apache.hertzbeat.ai.adapters.AlertDefineServiceAdapter; +import org.apache.hertzbeat.ai.config.McpContextHolder; +import org.apache.hertzbeat.ai.pojo.dto.Hierarchy; +import org.apache.hertzbeat.ai.utils.UtilityClass; import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.apache.hertzbeat.common.support.SpringContextHolder; import org.springframework.data.domain.Page; @@ -254,4 +254,4 @@ public class AlertDefineServiceAdapterImpl implements AlertDefineServiceAdapter } } -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/AlertServiceAdapterImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/AlertServiceAdapterImpl.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/AlertServiceAdapterImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/AlertServiceAdapterImpl.java index 101cf70ac..8caf902f5 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/AlertServiceAdapterImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/AlertServiceAdapterImpl.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.adapters.impl; +package org.apache.hertzbeat.ai.adapters.impl; import com.usthe.sureness.subject.SubjectSum; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.adapters.AlertServiceAdapter; -import org.apache.hertzbeat.ai.agent.config.McpContextHolder; +import org.apache.hertzbeat.ai.adapters.AlertServiceAdapter; +import org.apache.hertzbeat.ai.config.McpContextHolder; import org.apache.hertzbeat.alert.dto.AlertSummary; import org.apache.hertzbeat.common.entity.alerter.GroupAlert; import org.apache.hertzbeat.common.entity.alerter.SingleAlert; @@ -138,4 +138,4 @@ public class AlertServiceAdapterImpl implements AlertServiceAdapter { throw new RuntimeException("Failed to invoke getAlertsSummary via adapter: " + e.getMessage(), e); } } -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/MetricsServiceAdapterImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/MetricsServiceAdapterImpl.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/MetricsServiceAdapterImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/MetricsServiceAdapterImpl.java index c64286ab5..d225ba87f 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/MetricsServiceAdapterImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/MetricsServiceAdapterImpl.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.adapters.impl; +package org.apache.hertzbeat.ai.adapters.impl; import com.usthe.sureness.subject.SubjectSum; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.adapters.MetricsServiceAdapter; -import org.apache.hertzbeat.ai.agent.config.McpContextHolder; +import org.apache.hertzbeat.ai.adapters.MetricsServiceAdapter; +import org.apache.hertzbeat.ai.config.McpContextHolder; import org.apache.hertzbeat.common.entity.dto.MetricsData; import org.apache.hertzbeat.common.entity.dto.MetricsHistoryData; import org.apache.hertzbeat.common.support.SpringContextHolder; @@ -133,4 +133,4 @@ public class MetricsServiceAdapterImpl implements MetricsServiceAdapter { throw new RuntimeException("Failed to invoke getMetricHistoryData via adapter: " + e.getMessage(), e); } } -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/MonitorServiceAdapterImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/MonitorServiceAdapterImpl.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/MonitorServiceAdapterImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/MonitorServiceAdapterImpl.java index 28f6b0756..8a4f381fc 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/adapters/impl/MonitorServiceAdapterImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/adapters/impl/MonitorServiceAdapterImpl.java @@ -16,12 +16,12 @@ */ -package org.apache.hertzbeat.ai.agent.adapters.impl; +package org.apache.hertzbeat.ai.adapters.impl; import com.usthe.sureness.subject.SubjectSum; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.adapters.MonitorServiceAdapter; -import org.apache.hertzbeat.ai.agent.config.McpContextHolder; +import org.apache.hertzbeat.ai.adapters.MonitorServiceAdapter; +import org.apache.hertzbeat.ai.config.McpContextHolder; import org.springframework.data.domain.Page; import org.apache.hertzbeat.common.entity.manager.Monitor; import org.apache.hertzbeat.common.entity.manager.Param; @@ -211,4 +211,4 @@ public class MonitorServiceAdapterImpl implements MonitorServiceAdapter { throw new RuntimeException("Failed to invoke getAppParamDefines via adapter: " + e.getMessage(), e); } } -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/CustomSseServerTransport.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/CustomSseServerTransport.java similarity index 99% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/CustomSseServerTransport.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/CustomSseServerTransport.java index 7eacfb90b..825985e86 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/CustomSseServerTransport.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/CustomSseServerTransport.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.config; +package org.apache.hertzbeat.ai.config; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/DynamicOpenAiApiKey.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/DynamicOpenAiApiKey.java similarity index 95% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/DynamicOpenAiApiKey.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/DynamicOpenAiApiKey.java index bad25be51..3750db9dd 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/DynamicOpenAiApiKey.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/DynamicOpenAiApiKey.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.config; +package org.apache.hertzbeat.ai.config; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.pojo.dto.ModelProviderConfig; +import org.apache.hertzbeat.ai.pojo.dto.ModelProviderConfig; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.common.entity.manager.GeneralConfig; import org.apache.hertzbeat.common.util.JsonUtil; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/LlmConfig.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/LlmConfig.java similarity index 98% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/LlmConfig.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/LlmConfig.java index 7f8c65733..60a6db740 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/LlmConfig.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/LlmConfig.java @@ -16,11 +16,11 @@ */ -package org.apache.hertzbeat.ai.agent.config; +package org.apache.hertzbeat.ai.config; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.support.event.AiProviderConfigChangeEvent; -import org.apache.hertzbeat.ai.agent.pojo.dto.ModelProviderConfig; +import org.apache.hertzbeat.ai.pojo.dto.ModelProviderConfig; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.common.entity.manager.GeneralConfig; import org.apache.hertzbeat.common.util.JsonUtil; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/McpContextHolder.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/McpContextHolder.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/McpContextHolder.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/McpContextHolder.java index 2fd201c8a..3c07f9c14 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/McpContextHolder.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/McpContextHolder.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.config; +package org.apache.hertzbeat.ai.config; import com.usthe.sureness.subject.SubjectSum; import org.springframework.core.NamedInheritableThreadLocal; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/PromptProvider.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/PromptProvider.java similarity index 99% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/PromptProvider.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/PromptProvider.java index 8dbd1d6fe..1cdf69f0f 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/config/PromptProvider.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/config/PromptProvider.java @@ -16,7 +16,7 @@ */ -package org.apache.hertzbeat.ai.agent.config; +package org.apache.hertzbeat.ai.config; import org.springframework.stereotype.Component; @@ -179,4 +179,4 @@ public class PromptProvider { Keep responses focused on monitoring topics and HertzBeat's comprehensive capabilities. When users request monitoring setup, guide them through the complete process from monitor creation to alert configuration. """; -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/controller/ChatController.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/controller/ChatController.java similarity index 95% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/controller/ChatController.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/controller/ChatController.java index 58ef87460..dea6ffe6b 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/controller/ChatController.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/controller/ChatController.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.controller; +package org.apache.hertzbeat.ai.controller; import com.usthe.sureness.subject.SubjectSum; import com.usthe.sureness.util.SurenessContextHolder; @@ -23,11 +23,11 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.config.McpContextHolder; -import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext; -import org.apache.hertzbeat.ai.agent.pojo.dto.ChatResponseDto; -import org.apache.hertzbeat.ai.agent.pojo.dto.ConversationDto; -import org.apache.hertzbeat.ai.agent.service.ConversationService; +import org.apache.hertzbeat.ai.config.McpContextHolder; +import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext; +import org.apache.hertzbeat.ai.pojo.dto.ChatResponseDto; +import org.apache.hertzbeat.ai.pojo.dto.ConversationDto; +import org.apache.hertzbeat.ai.service.ConversationService; import org.apache.hertzbeat.common.entity.dto.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; @@ -194,4 +194,4 @@ public class ChatController { } } -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/entity/OpenAiConfig.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/entity/OpenAiConfig.java similarity index 98% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/entity/OpenAiConfig.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/entity/OpenAiConfig.java index 933cb63f9..7795acea7 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/entity/OpenAiConfig.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/entity/OpenAiConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.entity; +package org.apache.hertzbeat.ai.entity; import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_WRITE; @@ -77,4 +77,4 @@ public class OpenAiConfig { @Schema(title = "Record the latest modification time (timestamp in milliseconds)", accessMode = READ_ONLY) @LastModifiedDate private LocalDateTime gmtUpdate; -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ChatRequestContext.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ChatRequestContext.java similarity index 96% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ChatRequestContext.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ChatRequestContext.java index 6d6b9e046..0ca317d9b 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ChatRequestContext.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ChatRequestContext.java @@ -16,7 +16,7 @@ */ -package org.apache.hertzbeat.ai.agent.pojo.dto; +package org.apache.hertzbeat.ai.pojo.dto; import lombok.AllArgsConstructor; import lombok.Builder; @@ -46,4 +46,4 @@ public class ChatRequestContext { * Conversation history messages for context */ private List<MessageDto> conversationHistory; -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ChatResponseDto.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ChatResponseDto.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ChatResponseDto.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ChatResponseDto.java index 210d39b6b..1e154d253 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ChatResponseDto.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ChatResponseDto.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.pojo.dto; +package org.apache.hertzbeat.ai.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -44,4 +44,4 @@ public class ChatResponseDto { @Schema(description = "Assistant message ID", example = "msg-assistant-123") private String assistantMessageId; -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ConversationDto.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ConversationDto.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ConversationDto.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ConversationDto.java index 33fe49aaa..9b54af525 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ConversationDto.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ConversationDto.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.pojo.dto; +package org.apache.hertzbeat.ai.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -50,4 +50,4 @@ public class ConversationDto { @Schema(description = "Message count") private Integer messageCount; -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/Hierarchy.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/Hierarchy.java similarity index 98% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/Hierarchy.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/Hierarchy.java index ee62bbf2f..2d750fe52 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/Hierarchy.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/Hierarchy.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.pojo.dto; +package org.apache.hertzbeat.ai.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/MessageDto.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/MessageDto.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/MessageDto.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/MessageDto.java index cb6c0fca5..857b31aef 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/MessageDto.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/MessageDto.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.pojo.dto; +package org.apache.hertzbeat.ai.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; @@ -49,4 +49,4 @@ public class MessageDto { @Schema(description = "Message timestamp") private LocalDateTime timestamp; -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ModelProviderConfig.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ModelProviderConfig.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ModelProviderConfig.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ModelProviderConfig.java index af96cfd03..e463dfda2 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/pojo/dto/ModelProviderConfig.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/pojo/dto/ModelProviderConfig.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.pojo.dto; +package org.apache.hertzbeat.ai.pojo.dto; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/AiConfigService.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/AiConfigService.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/AiConfigService.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/AiConfigService.java index 796c46986..03134f7a8 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/AiConfigService.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/AiConfigService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.service; +package org.apache.hertzbeat.ai.service; /** * Ai Configuration Service diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/ChatClientProviderService.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/ChatClientProviderService.java similarity index 92% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/ChatClientProviderService.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/ChatClientProviderService.java index 4b6de16f1..9946ba307 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/ChatClientProviderService.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/ChatClientProviderService.java @@ -16,9 +16,9 @@ */ -package org.apache.hertzbeat.ai.agent.service; +package org.apache.hertzbeat.ai.service; -import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext; +import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext; import reactor.core.publisher.Flux; /** diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/ConversationService.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/ConversationService.java similarity index 93% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/ConversationService.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/ConversationService.java index c481b7563..a33a044eb 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/ConversationService.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/ConversationService.java @@ -16,10 +16,10 @@ */ -package org.apache.hertzbeat.ai.agent.service; +package org.apache.hertzbeat.ai.service; -import org.apache.hertzbeat.ai.agent.pojo.dto.ChatResponseDto; -import org.apache.hertzbeat.ai.agent.pojo.dto.ConversationDto; +import org.apache.hertzbeat.ai.pojo.dto.ChatResponseDto; +import org.apache.hertzbeat.ai.pojo.dto.ConversationDto; import org.springframework.http.codec.ServerSentEvent; import reactor.core.publisher.Flux; @@ -77,4 +77,4 @@ public interface ConversationService { * @return true if conversation exists, false otherwise */ boolean conversationExists(String conversationId); -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/McpServerService.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/McpServerService.java similarity index 94% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/McpServerService.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/McpServerService.java index 51da725a1..6b518413d 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/McpServerService.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/McpServerService.java @@ -16,10 +16,10 @@ */ -package org.apache.hertzbeat.ai.agent.service; +package org.apache.hertzbeat.ai.service; import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.hertzbeat.ai.agent.config.CustomSseServerTransport; +import org.apache.hertzbeat.ai.config.CustomSseServerTransport; import org.springframework.ai.mcp.server.autoconfigure.McpServerProperties; import org.springframework.ai.tool.ToolCallbackProvider; import org.springframework.web.servlet.function.RouterFunction; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/AiConfigServiceImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/AiConfigServiceImpl.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/AiConfigServiceImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/AiConfigServiceImpl.java index 1c4031a68..17cb772fe 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/AiConfigServiceImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/AiConfigServiceImpl.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.service.impl; +package org.apache.hertzbeat.ai.service.impl; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.service.AiConfigService; +import org.apache.hertzbeat.ai.service.AiConfigService; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/ChatClientProviderServiceImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/ChatClientProviderServiceImpl.java similarity index 92% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/ChatClientProviderServiceImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/ChatClientProviderServiceImpl.java index d8593a363..565740711 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/ChatClientProviderServiceImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/ChatClientProviderServiceImpl.java @@ -16,18 +16,18 @@ */ -package org.apache.hertzbeat.ai.agent.service.impl; +package org.apache.hertzbeat.ai.service.impl; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.config.PromptProvider; -import org.apache.hertzbeat.ai.agent.pojo.dto.MessageDto; -import org.apache.hertzbeat.ai.agent.pojo.dto.ModelProviderConfig; -import org.apache.hertzbeat.ai.agent.service.ChatClientProviderService; +import org.apache.hertzbeat.ai.config.PromptProvider; +import org.apache.hertzbeat.ai.pojo.dto.MessageDto; +import org.apache.hertzbeat.ai.pojo.dto.ModelProviderConfig; +import org.apache.hertzbeat.ai.service.ChatClientProviderService; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.common.entity.manager.GeneralConfig; import org.apache.hertzbeat.common.util.JsonUtil; import org.springframework.stereotype.Service; -import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext; +import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext; import org.springframework.ai.chat.client.ChatClient; import org.springframework.ai.chat.messages.AssistantMessage; import org.springframework.ai.chat.messages.Message; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/ConversationServiceImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/ConversationServiceImpl.java similarity index 96% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/ConversationServiceImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/ConversationServiceImpl.java index 86ff84ff5..9c3530768 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/ConversationServiceImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/ConversationServiceImpl.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.service.impl; +package org.apache.hertzbeat.ai.service.impl; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.pojo.dto.ChatRequestContext; -import org.apache.hertzbeat.ai.agent.pojo.dto.ChatResponseDto; -import org.apache.hertzbeat.ai.agent.pojo.dto.ConversationDto; -import org.apache.hertzbeat.ai.agent.pojo.dto.MessageDto; -import org.apache.hertzbeat.ai.agent.service.ChatClientProviderService; -import org.apache.hertzbeat.ai.agent.service.ConversationService; +import org.apache.hertzbeat.ai.pojo.dto.ChatRequestContext; +import org.apache.hertzbeat.ai.pojo.dto.ChatResponseDto; +import org.apache.hertzbeat.ai.pojo.dto.ConversationDto; +import org.apache.hertzbeat.ai.pojo.dto.MessageDto; +import org.apache.hertzbeat.ai.service.ChatClientProviderService; +import org.apache.hertzbeat.ai.service.ConversationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.codec.ServerSentEvent; import org.springframework.stereotype.Service; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/McpServerServiceImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/McpServerServiceImpl.java similarity index 88% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/McpServerServiceImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/McpServerServiceImpl.java index f946eee6b..6af80b1b1 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/service/impl/McpServerServiceImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/service/impl/McpServerServiceImpl.java @@ -16,14 +16,14 @@ */ -package org.apache.hertzbeat.ai.agent.service.impl; +package org.apache.hertzbeat.ai.service.impl; -import org.apache.hertzbeat.ai.agent.config.CustomSseServerTransport; -import org.apache.hertzbeat.ai.agent.service.McpServerService; -import org.apache.hertzbeat.ai.agent.tools.AlertDefineTools; -import org.apache.hertzbeat.ai.agent.tools.AlertTools; -import org.apache.hertzbeat.ai.agent.tools.MetricsTools; -import org.apache.hertzbeat.ai.agent.tools.MonitorTools; +import org.apache.hertzbeat.ai.config.CustomSseServerTransport; +import org.apache.hertzbeat.ai.service.McpServerService; +import org.apache.hertzbeat.ai.tools.AlertDefineTools; +import org.apache.hertzbeat.ai.tools.AlertTools; +import org.apache.hertzbeat.ai.tools.MetricsTools; +import org.apache.hertzbeat.ai.tools.MonitorTools; import org.springframework.ai.mcp.server.autoconfigure.McpServerProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Primary; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/AlertDefineTools.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/AlertDefineTools.java similarity index 98% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/AlertDefineTools.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/AlertDefineTools.java index 59c401464..19dbd6c6f 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/AlertDefineTools.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/AlertDefineTools.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.tools; +package org.apache.hertzbeat.ai.tools; /** * Tools for alert definition and threshold configuration operations @@ -88,4 +88,4 @@ public interface AlertDefineTools { * @return Result message indicating success or failure */ String bindMonitorsToAlertRule(Long ruleId, String monitorIds); -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/AlertTools.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/AlertTools.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/AlertTools.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/AlertTools.java index 24cab1b20..0aa9688c8 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/AlertTools.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/AlertTools.java @@ -16,7 +16,7 @@ */ -package org.apache.hertzbeat.ai.agent.tools; +package org.apache.hertzbeat.ai.tools; /** * Tools for alert operations and alarm data queries diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/MetricsTools.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/MetricsTools.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/MetricsTools.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/MetricsTools.java index 65c8cf6ea..dcf7dafc5 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/MetricsTools.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/MetricsTools.java @@ -16,7 +16,7 @@ */ -package org.apache.hertzbeat.ai.agent.tools; +package org.apache.hertzbeat.ai.tools; /** * Tools for metrics data operations and queries diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/MonitorTools.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/MonitorTools.java similarity index 98% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/MonitorTools.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/MonitorTools.java index 6cec9e5b8..95d6cfe67 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/MonitorTools.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/MonitorTools.java @@ -16,7 +16,7 @@ */ -package org.apache.hertzbeat.ai.agent.tools; +package org.apache.hertzbeat.ai.tools; import java.util.List; @@ -94,4 +94,4 @@ public interface MonitorTools { * @return Formatted string with parameter definitions including field names, types, and requirements */ String getMonitorAdditionalParams(String app); -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/AlertDefineToolsImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertDefineToolsImpl.java similarity index 98% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/AlertDefineToolsImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertDefineToolsImpl.java index 08a4a5571..2fd8257b9 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/AlertDefineToolsImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertDefineToolsImpl.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.tools.impl; +package org.apache.hertzbeat.ai.tools.impl; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.usthe.sureness.subject.SubjectSum; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.adapters.AlertDefineServiceAdapter; -import org.apache.hertzbeat.ai.agent.pojo.dto.Hierarchy; -import org.apache.hertzbeat.ai.agent.config.McpContextHolder; -import org.apache.hertzbeat.ai.agent.tools.AlertDefineTools; -import org.apache.hertzbeat.ai.agent.utils.UtilityClass; +import org.apache.hertzbeat.ai.adapters.AlertDefineServiceAdapter; +import org.apache.hertzbeat.ai.pojo.dto.Hierarchy; +import org.apache.hertzbeat.ai.config.McpContextHolder; +import org.apache.hertzbeat.ai.tools.AlertDefineTools; +import org.apache.hertzbeat.ai.utils.UtilityClass; import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.springframework.ai.tool.annotation.Tool; import org.springframework.ai.tool.annotation.ToolParam; @@ -662,4 +662,4 @@ public class AlertDefineToolsImpl implements AlertDefineTools { } } -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/AlertToolsImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertToolsImpl.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/AlertToolsImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertToolsImpl.java index 1ada893a1..176876999 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/AlertToolsImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertToolsImpl.java @@ -16,14 +16,14 @@ */ -package org.apache.hertzbeat.ai.agent.tools.impl; +package org.apache.hertzbeat.ai.tools.impl; import com.usthe.sureness.subject.SubjectSum; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.adapters.AlertServiceAdapter; -import org.apache.hertzbeat.ai.agent.config.McpContextHolder; -import org.apache.hertzbeat.ai.agent.tools.AlertTools; -import org.apache.hertzbeat.ai.agent.utils.UtilityClass; +import org.apache.hertzbeat.ai.adapters.AlertServiceAdapter; +import org.apache.hertzbeat.ai.config.McpContextHolder; +import org.apache.hertzbeat.ai.tools.AlertTools; +import org.apache.hertzbeat.ai.utils.UtilityClass; import org.apache.hertzbeat.alert.dto.AlertSummary; import org.apache.hertzbeat.common.entity.alerter.GroupAlert; import org.apache.hertzbeat.common.entity.alerter.SingleAlert; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/MetricsToolsImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/MetricsToolsImpl.java similarity index 97% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/MetricsToolsImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/MetricsToolsImpl.java index 1a8d03c29..beb0cb180 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/MetricsToolsImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/MetricsToolsImpl.java @@ -16,14 +16,14 @@ */ -package org.apache.hertzbeat.ai.agent.tools.impl; +package org.apache.hertzbeat.ai.tools.impl; import com.usthe.sureness.subject.SubjectSum; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.adapters.MetricsServiceAdapter; -import org.apache.hertzbeat.ai.agent.adapters.MonitorServiceAdapter; -import org.apache.hertzbeat.ai.agent.config.McpContextHolder; -import org.apache.hertzbeat.ai.agent.tools.MetricsTools; +import org.apache.hertzbeat.ai.adapters.MetricsServiceAdapter; +import org.apache.hertzbeat.ai.adapters.MonitorServiceAdapter; +import org.apache.hertzbeat.ai.config.McpContextHolder; +import org.apache.hertzbeat.ai.tools.MetricsTools; import org.apache.hertzbeat.common.entity.dto.Field; import org.apache.hertzbeat.common.entity.dto.MetricsData; import org.apache.hertzbeat.common.entity.dto.MetricsHistoryData; @@ -260,4 +260,4 @@ public class MetricsToolsImpl implements MetricsTools { } } -} \ No newline at end of file +} diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/MonitorToolsImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/MonitorToolsImpl.java similarity index 98% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/MonitorToolsImpl.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/MonitorToolsImpl.java index 12e73985f..cd3a47962 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/tools/impl/MonitorToolsImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/MonitorToolsImpl.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.tools.impl; +package org.apache.hertzbeat.ai.tools.impl; import com.usthe.sureness.subject.SubjectSum; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.adapters.MonitorServiceAdapter; -import org.apache.hertzbeat.ai.agent.config.McpContextHolder; -import org.apache.hertzbeat.ai.agent.utils.UtilityClass; +import org.apache.hertzbeat.ai.adapters.MonitorServiceAdapter; +import org.apache.hertzbeat.ai.config.McpContextHolder; +import org.apache.hertzbeat.ai.utils.UtilityClass; import org.springframework.ai.tool.annotation.Tool; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; -import org.apache.hertzbeat.ai.agent.tools.MonitorTools; +import org.apache.hertzbeat.ai.tools.MonitorTools; import org.springframework.ai.tool.annotation.ToolParam; import org.springframework.beans.factory.annotation.Autowired; import org.apache.hertzbeat.common.entity.manager.Monitor; diff --git a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/utils/UtilityClass.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/utils/UtilityClass.java similarity index 99% rename from hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/utils/UtilityClass.java rename to hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/utils/UtilityClass.java index db108dfb4..64c1a06f8 100644 --- a/hertzbeat-ai-agent/src/main/java/org/apache/hertzbeat/ai/agent/utils/UtilityClass.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/utils/UtilityClass.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.hertzbeat.ai.agent.utils; +package org.apache.hertzbeat.ai.utils; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.ai.agent.pojo.dto.Hierarchy; +import org.apache.hertzbeat.ai.pojo.dto.Hierarchy; import java.lang.reflect.Method; import java.time.Instant; diff --git a/hertzbeat-manager/pom.xml b/hertzbeat-manager/pom.xml index 6140b34d7..90ee461f8 100644 --- a/hertzbeat-manager/pom.xml +++ b/hertzbeat-manager/pom.xml @@ -217,7 +217,7 @@ </dependency> <dependency> <groupId>org.apache.hertzbeat</groupId> - <artifactId>hertzbeat-ai-agent</artifactId> + <artifactId>hertzbeat-ai</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ModelProviderConfigServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ModelProviderConfigServiceImpl.java index 82c637e36..22d93909d 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ModelProviderConfigServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ModelProviderConfigServiceImpl.java @@ -20,7 +20,7 @@ package org.apache.hertzbeat.manager.service.impl; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import java.lang.reflect.Type; -import org.apache.hertzbeat.ai.agent.pojo.dto.ModelProviderConfig; +import org.apache.hertzbeat.ai.pojo.dto.ModelProviderConfig; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.common.support.event.AiProviderConfigChangeEvent; diff --git a/pom.xml b/pom.xml index 7f7cfaf0e..98449bb0a 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ <module>hertzbeat-base</module> <module>hertzbeat-mcp</module> <module>hertzbeat-log</module> - <module>hertzbeat-ai-agent</module> + <module>hertzbeat-ai</module> </modules> <properties> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
