dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AI rule node: remove stop sequences as it is not used

Browse Source
This commit is contained in:
Dmytro Skarzhynets 2025-07-03 15:17:22 +03:00
parent f2278f86c9
commit 030f8ce974
No known key found for this signature in database
GPG Key ID: 2B51652F224037DF
9 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
View File

@ -64,7 +64,6 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.frequencyPenalty(modelConfig.frequencyPenalty()) .frequencyPenalty(modelConfig.frequencyPenalty())
.presencePenalty(modelConfig.presencePenalty()) .presencePenalty(modelConfig.presencePenalty())
.maxTokens(modelConfig.maxOutputTokens()) .maxTokens(modelConfig.maxOutputTokens())
.stop(modelConfig.stopSequences())
.timeout(toDuration(modelConfig.timeoutSeconds())) .timeout(toDuration(modelConfig.timeoutSeconds()))
.maxRetries(modelConfig.maxRetries()) .maxRetries(modelConfig.maxRetries())
.build(); .build();
@ -84,7 +83,6 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.frequencyPenalty(modelConfig.frequencyPenalty()) .frequencyPenalty(modelConfig.frequencyPenalty())
.presencePenalty(modelConfig.presencePenalty()) .presencePenalty(modelConfig.presencePenalty())
.maxTokens(modelConfig.maxOutputTokens()) .maxTokens(modelConfig.maxOutputTokens())
.stop(modelConfig.stopSequences())
.timeout(toDuration(modelConfig.timeoutSeconds())) .timeout(toDuration(modelConfig.timeoutSeconds()))
.maxRetries(modelConfig.maxRetries()) .maxRetries(modelConfig.maxRetries())
.build(); .build();
@ -102,7 +100,6 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.frequencyPenalty(modelConfig.frequencyPenalty()) .frequencyPenalty(modelConfig.frequencyPenalty())
.presencePenalty(modelConfig.presencePenalty()) .presencePenalty(modelConfig.presencePenalty())
.maxOutputTokens(modelConfig.maxOutputTokens()) .maxOutputTokens(modelConfig.maxOutputTokens())
.stopSequences(modelConfig.stopSequences())
.timeout(toDuration(modelConfig.timeoutSeconds())) .timeout(toDuration(modelConfig.timeoutSeconds()))
.maxRetries(modelConfig.maxRetries()) .maxRetries(modelConfig.maxRetries())
.build(); .build();
@ -175,9 +172,6 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
if (modelConfig.maxOutputTokens() != null) { if (modelConfig.maxOutputTokens() != null) {
generationConfigBuilder.setMaxOutputTokens(modelConfig.maxOutputTokens()); generationConfigBuilder.setMaxOutputTokens(modelConfig.maxOutputTokens());
} }
if (modelConfig.stopSequences() != null) {
generationConfigBuilder.addAllStopSequences(modelConfig.stopSequences());
}
var generationConfig = generationConfigBuilder.build(); var generationConfig = generationConfigBuilder.build();
// construct generative model instance // construct generative model instance
@ -205,7 +199,6 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.frequencyPenalty(modelConfig.frequencyPenalty()) .frequencyPenalty(modelConfig.frequencyPenalty())
.presencePenalty(modelConfig.presencePenalty()) .presencePenalty(modelConfig.presencePenalty())
.maxTokens(modelConfig.maxOutputTokens()) .maxTokens(modelConfig.maxOutputTokens())
.stopSequences(modelConfig.stopSequences())
.timeout(toDuration(modelConfig.timeoutSeconds())) .timeout(toDuration(modelConfig.timeoutSeconds()))
.maxRetries(modelConfig.maxRetries()) .maxRetries(modelConfig.maxRetries())
.build(); .build();
@ -221,7 +214,6 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.topP(modelConfig.topP()) .topP(modelConfig.topP())
.topK(modelConfig.topK()) .topK(modelConfig.topK())
.maxTokens(modelConfig.maxOutputTokens()) .maxTokens(modelConfig.maxOutputTokens())
.stopSequences(modelConfig.stopSequences())
.timeout(toDuration(modelConfig.timeoutSeconds())) .timeout(toDuration(modelConfig.timeoutSeconds()))
.maxRetries(modelConfig.maxRetries()) .maxRetries(modelConfig.maxRetries())
.build(); .build();
@ -245,7 +237,6 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.temperature(modelConfig.temperature()) .temperature(modelConfig.temperature())
.topP(modelConfig.topP()) .topP(modelConfig.topP())
.maxOutputTokens(modelConfig.maxOutputTokens()) .maxOutputTokens(modelConfig.maxOutputTokens())
.stopSequences(modelConfig.stopSequences())
.build(); .build();
return BedrockChatModel.builder() return BedrockChatModel.builder()
@ -268,7 +259,6 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.frequencyPenalty(modelConfig.frequencyPenalty()) .frequencyPenalty(modelConfig.frequencyPenalty())
.presencePenalty(modelConfig.presencePenalty()) .presencePenalty(modelConfig.presencePenalty())
.maxTokens(modelConfig.maxOutputTokens()) .maxTokens(modelConfig.maxOutputTokens())
.stop(modelConfig.stopSequences())
.timeout(toDuration(modelConfig.timeoutSeconds())) .timeout(toDuration(modelConfig.timeoutSeconds()))
.maxRetries(modelConfig.maxRetries()) .maxRetries(modelConfig.maxRetries())
.build(); .build();

3
common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AmazonBedrockChatModel.java
View File

@ -27,8 +27,6 @@ import org.thingsboard.server.common.data.ai.model.AiModelType;
import org.thingsboard.server.common.data.ai.provider.AiProvider; import org.thingsboard.server.common.data.ai.provider.AiProvider;
import org.thingsboard.server.common.data.ai.provider.AmazonBedrockProviderConfig; import org.thingsboard.server.common.data.ai.provider.AmazonBedrockProviderConfig;
import java.util.List;
public record AmazonBedrockChatModel( public record AmazonBedrockChatModel(
AiModelType modelType, AiModelType modelType,
@NotNull @Valid AmazonBedrockProviderConfig providerConfig, @NotNull @Valid AmazonBedrockProviderConfig providerConfig,
@ -46,7 +44,6 @@ public record AmazonBedrockChatModel(
@PositiveOrZero Double temperature, @PositiveOrZero Double temperature,
@Positive @Max(1) Double topP, @Positive @Max(1) Double topP,
@Positive Integer maxOutputTokens, @Positive Integer maxOutputTokens,
List<String> stopSequences,
@Positive Integer timeoutSeconds, @Positive Integer timeoutSeconds,
@PositiveOrZero Integer maxRetries @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig<AmazonBedrockChatModel.Config> {} ) implements AiChatModelConfig<AmazonBedrockChatModel.Config> {}

3
common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AnthropicChatModel.java
View File

@ -27,8 +27,6 @@ import org.thingsboard.server.common.data.ai.model.AiModelType;
import org.thingsboard.server.common.data.ai.provider.AiProvider; import org.thingsboard.server.common.data.ai.provider.AiProvider;
import org.thingsboard.server.common.data.ai.provider.AnthropicProviderConfig; import org.thingsboard.server.common.data.ai.provider.AnthropicProviderConfig;
import java.util.List;
public record AnthropicChatModel( public record AnthropicChatModel(
AiModelType modelType, AiModelType modelType,
@NotNull @Valid AnthropicProviderConfig providerConfig, @NotNull @Valid AnthropicProviderConfig providerConfig,
@ -47,7 +45,6 @@ public record AnthropicChatModel(
@Positive @Max(1) Double topP, @Positive @Max(1) Double topP,
@Positive Integer topK, @Positive Integer topK,
@Positive Integer maxOutputTokens, @Positive Integer maxOutputTokens,
List<String> stopSequences,
@Positive Integer timeoutSeconds, @Positive Integer timeoutSeconds,
@PositiveOrZero Integer maxRetries @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig<AnthropicChatModel.Config> {} ) implements AiChatModelConfig<AnthropicChatModel.Config> {}

3
common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AzureOpenAiChatModel.java
View File

@ -27,8 +27,6 @@ import org.thingsboard.server.common.data.ai.model.AiModelType;
import org.thingsboard.server.common.data.ai.provider.AiProvider; import org.thingsboard.server.common.data.ai.provider.AiProvider;
import org.thingsboard.server.common.data.ai.provider.AzureOpenAiProviderConfig; import org.thingsboard.server.common.data.ai.provider.AzureOpenAiProviderConfig;
import java.util.List;
public record AzureOpenAiChatModel( public record AzureOpenAiChatModel(
AiModelType modelType, AiModelType modelType,
@NotNull @Valid AzureOpenAiProviderConfig providerConfig, @NotNull @Valid AzureOpenAiProviderConfig providerConfig,
@ -48,7 +46,6 @@ public record AzureOpenAiChatModel(
Double frequencyPenalty, Double frequencyPenalty,
Double presencePenalty, Double presencePenalty,
@Positive Integer maxOutputTokens, @Positive Integer maxOutputTokens,
List<String> stopSequences,
@Positive Integer timeoutSeconds, @Positive Integer timeoutSeconds,
@PositiveOrZero Integer maxRetries @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig<AzureOpenAiChatModel.Config> {} ) implements AiChatModelConfig<AzureOpenAiChatModel.Config> {}

3
common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GitHubModelsChatModel.java
View File

@ -27,8 +27,6 @@ import org.thingsboard.server.common.data.ai.model.AiModelType;
import org.thingsboard.server.common.data.ai.provider.AiProvider; import org.thingsboard.server.common.data.ai.provider.AiProvider;
import org.thingsboard.server.common.data.ai.provider.GitHubModelsProviderConfig; import org.thingsboard.server.common.data.ai.provider.GitHubModelsProviderConfig;
import java.util.List;
public record GitHubModelsChatModel( public record GitHubModelsChatModel(
AiModelType modelType, AiModelType modelType,
@NotNull @Valid GitHubModelsProviderConfig providerConfig, @NotNull @Valid GitHubModelsProviderConfig providerConfig,
@ -48,7 +46,6 @@ public record GitHubModelsChatModel(
Double frequencyPenalty, Double frequencyPenalty,
Double presencePenalty, Double presencePenalty,
@Positive Integer maxOutputTokens, @Positive Integer maxOutputTokens,
List<String> stopSequences,
@Positive Integer timeoutSeconds, @Positive Integer timeoutSeconds,
@PositiveOrZero Integer maxRetries @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig<GitHubModelsChatModel.Config> {} ) implements AiChatModelConfig<GitHubModelsChatModel.Config> {}

3
common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleAiGeminiChatModel.java
View File

@ -27,8 +27,6 @@ import org.thingsboard.server.common.data.ai.model.AiModelType;
import org.thingsboard.server.common.data.ai.provider.AiProvider; import org.thingsboard.server.common.data.ai.provider.AiProvider;
import org.thingsboard.server.common.data.ai.provider.GoogleAiGeminiProviderConfig; import org.thingsboard.server.common.data.ai.provider.GoogleAiGeminiProviderConfig;
import java.util.List;
public record GoogleAiGeminiChatModel( public record GoogleAiGeminiChatModel(
AiModelType modelType, AiModelType modelType,
@NotNull @Valid GoogleAiGeminiProviderConfig providerConfig, @NotNull @Valid GoogleAiGeminiProviderConfig providerConfig,
@ -49,7 +47,6 @@ public record GoogleAiGeminiChatModel(
Double frequencyPenalty, Double frequencyPenalty,
Double presencePenalty, Double presencePenalty,
@Positive Integer maxOutputTokens, @Positive Integer maxOutputTokens,
List<String> stopSequences,
@Positive Integer timeoutSeconds, @Positive Integer timeoutSeconds,
@PositiveOrZero Integer maxRetries @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig<GoogleAiGeminiChatModel.Config> {} ) implements AiChatModelConfig<GoogleAiGeminiChatModel.Config> {}

3
common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleVertexAiGeminiChatModel.java
View File

@ -27,8 +27,6 @@ import org.thingsboard.server.common.data.ai.model.AiModelType;
import org.thingsboard.server.common.data.ai.provider.AiProvider; import org.thingsboard.server.common.data.ai.provider.AiProvider;
import org.thingsboard.server.common.data.ai.provider.GoogleVertexAiGeminiProviderConfig; import org.thingsboard.server.common.data.ai.provider.GoogleVertexAiGeminiProviderConfig;
import java.util.List;
public record GoogleVertexAiGeminiChatModel( public record GoogleVertexAiGeminiChatModel(
AiModelType modelType, AiModelType modelType,
@NotNull @Valid GoogleVertexAiGeminiProviderConfig providerConfig, @NotNull @Valid GoogleVertexAiGeminiProviderConfig providerConfig,
@ -49,7 +47,6 @@ public record GoogleVertexAiGeminiChatModel(
Double frequencyPenalty, Double frequencyPenalty,
Double presencePenalty, Double presencePenalty,
@Positive Integer maxOutputTokens, @Positive Integer maxOutputTokens,
List<String> stopSequences,
@Positive Integer timeoutSeconds, @Positive Integer timeoutSeconds,
@PositiveOrZero Integer maxRetries @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig<GoogleVertexAiGeminiChatModel.Config> {} ) implements AiChatModelConfig<GoogleVertexAiGeminiChatModel.Config> {}

3
common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/MistralAiChatModel.java
View File

@ -27,8 +27,6 @@ import org.thingsboard.server.common.data.ai.model.AiModelType;
import org.thingsboard.server.common.data.ai.provider.AiProvider; import org.thingsboard.server.common.data.ai.provider.AiProvider;
import org.thingsboard.server.common.data.ai.provider.MistralAiProviderConfig; import org.thingsboard.server.common.data.ai.provider.MistralAiProviderConfig;
import java.util.List;
public record MistralAiChatModel( public record MistralAiChatModel(
AiModelType modelType, AiModelType modelType,
@NotNull @Valid MistralAiProviderConfig providerConfig, @NotNull @Valid MistralAiProviderConfig providerConfig,
@ -48,7 +46,6 @@ public record MistralAiChatModel(
Double frequencyPenalty, Double frequencyPenalty,
Double presencePenalty, Double presencePenalty,
@Positive Integer maxOutputTokens, @Positive Integer maxOutputTokens,
List<String> stopSequences,
@Positive Integer timeoutSeconds, @Positive Integer timeoutSeconds,
@PositiveOrZero Integer maxRetries @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig<MistralAiChatModel.Config> {} ) implements AiChatModelConfig<MistralAiChatModel.Config> {}

3
common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OpenAiChatModel.java
View File

@ -27,8 +27,6 @@ import org.thingsboard.server.common.data.ai.model.AiModelType;
import org.thingsboard.server.common.data.ai.provider.AiProvider; import org.thingsboard.server.common.data.ai.provider.AiProvider;
import org.thingsboard.server.common.data.ai.provider.OpenAiProviderConfig; import org.thingsboard.server.common.data.ai.provider.OpenAiProviderConfig;
import java.util.List;
public record OpenAiChatModel( public record OpenAiChatModel(
AiModelType modelType, AiModelType modelType,
@NotNull @Valid OpenAiProviderConfig providerConfig, @NotNull @Valid OpenAiProviderConfig providerConfig,
@ -48,7 +46,6 @@ public record OpenAiChatModel(
Double frequencyPenalty, Double frequencyPenalty,
Double presencePenalty, Double presencePenalty,
@Positive Integer maxOutputTokens, @Positive Integer maxOutputTokens,
List<String> stopSequences,
@Positive Integer timeoutSeconds, @Positive Integer timeoutSeconds,
@PositiveOrZero Integer maxRetries @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig<OpenAiChatModel.Config> {} ) implements AiChatModelConfig<OpenAiChatModel.Config> {}