From 56ccc6ff4135bb47129ef814b37e228cf0f36300 Mon Sep 17 00:00:00 2001 From: Dmytro Skarzhynets Date: Fri, 11 Jul 2025 13:25:08 +0300 Subject: [PATCH] AI rule node: relax validation for provider configs --- .../data/ai/provider/AmazonBedrockProviderConfig.java | 10 +++++----- .../data/ai/provider/AnthropicProviderConfig.java | 4 ++-- .../data/ai/provider/AzureOpenAiProviderConfig.java | 6 +++--- .../data/ai/provider/GitHubModelsProviderConfig.java | 4 ++-- .../data/ai/provider/GoogleAiGeminiProviderConfig.java | 4 ++-- .../provider/GoogleVertexAiGeminiProviderConfig.java | 7 ++++--- .../data/ai/provider/MistralAiProviderConfig.java | 4 ++-- .../common/data/ai/provider/OpenAiProviderConfig.java | 4 ++-- 8 files changed, 22 insertions(+), 21 deletions(-) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AmazonBedrockProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AmazonBedrockProviderConfig.java index 097d82ea0f..e705b545c2 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AmazonBedrockProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AmazonBedrockProviderConfig.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.common.data.ai.provider; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; -public record AmazonBedrockProviderConfig( - @NotBlank String region, - @NotBlank String accessKeyId, - @NotBlank String secretAccessKey +public record AmazonBedrockProviderConfig( + @NotNull String region, + @NotNull String accessKeyId, + @NotNull String secretAccessKey ) implements AiProviderConfig {} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AnthropicProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AnthropicProviderConfig.java index f1a345fd47..d6db07941b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AnthropicProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AnthropicProviderConfig.java @@ -15,8 +15,8 @@ */ package org.thingsboard.server.common.data.ai.provider; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; public record AnthropicProviderConfig( - @NotBlank String apiKey + @NotNull String apiKey ) implements AiProviderConfig {} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AzureOpenAiProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AzureOpenAiProviderConfig.java index 3c31549181..ea7ffebe3a 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AzureOpenAiProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AzureOpenAiProviderConfig.java @@ -15,10 +15,10 @@ */ package org.thingsboard.server.common.data.ai.provider; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; public record AzureOpenAiProviderConfig( - @NotBlank String endpoint, + @NotNull String endpoint, String serviceVersion, - @NotBlank String apiKey + @NotNull String apiKey ) implements AiProviderConfig {} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GitHubModelsProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GitHubModelsProviderConfig.java index 076078d253..f5240fe836 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GitHubModelsProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GitHubModelsProviderConfig.java @@ -15,8 +15,8 @@ */ package org.thingsboard.server.common.data.ai.provider; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; public record GitHubModelsProviderConfig( - @NotBlank String personalAccessToken + @NotNull String personalAccessToken ) implements AiProviderConfig {} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GoogleAiGeminiProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GoogleAiGeminiProviderConfig.java index 8a07636aac..bfa729e66d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GoogleAiGeminiProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GoogleAiGeminiProviderConfig.java @@ -15,8 +15,8 @@ */ package org.thingsboard.server.common.data.ai.provider; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; public record GoogleAiGeminiProviderConfig( - @NotBlank String apiKey + @NotNull String apiKey ) implements AiProviderConfig {} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GoogleVertexAiGeminiProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GoogleVertexAiGeminiProviderConfig.java index a16b891c3a..b0efac764c 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GoogleVertexAiGeminiProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/GoogleVertexAiGeminiProviderConfig.java @@ -16,10 +16,11 @@ package org.thingsboard.server.common.data.ai.provider; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; public record GoogleVertexAiGeminiProviderConfig( @NotBlank String fileName, // not used on BE, but needed for UI - @NotBlank String projectId, - @NotBlank String location, - @NotBlank String serviceAccountKey + @NotNull String projectId, + @NotNull String location, + @NotNull String serviceAccountKey ) implements AiProviderConfig {} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/MistralAiProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/MistralAiProviderConfig.java index 0060e4779b..eb62557a15 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/MistralAiProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/MistralAiProviderConfig.java @@ -15,8 +15,8 @@ */ package org.thingsboard.server.common.data.ai.provider; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; public record MistralAiProviderConfig( - @NotBlank String apiKey + @NotNull String apiKey ) implements AiProviderConfig {} diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OpenAiProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OpenAiProviderConfig.java index 1e0653f3b5..09ffda837b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OpenAiProviderConfig.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OpenAiProviderConfig.java @@ -15,8 +15,8 @@ */ package org.thingsboard.server.common.data.ai.provider; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; public record OpenAiProviderConfig( - @NotBlank String apiKey + @NotNull String apiKey ) implements AiProviderConfig {}