{
diff --git a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
index 1a3c2bf181..c730850474 100644
--- a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
@@ -151,7 +151,7 @@
}
@if (providerFieldsList.includes('baseUrl')) {
-
+
ai-models.baseurl
@@ -264,15 +264,18 @@
-
- warning
-
+ type="number" step="1" placeholder="{{ 'ai-models.set' | translate }}">
+
+
+ }
+ @if (modelFieldsList.includes('contextLength')) {
+
}
diff --git a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts
index e6490cd84d..3294c6ac76 100644
--- a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts
@@ -108,7 +108,8 @@ export class AIModelDialogComponent extends DialogComponent, 'label'>, HasTenantId
frequencyPenalty?: number;
presencePenalty?: number;
maxOutputTokens?: number;
+ contextLength?: number;
}
}
@@ -91,7 +92,7 @@ export const ProviderFieldsAllList = [
'baseUrl'
];
-export const ModelFieldsAllList = ['temperature', 'topP', 'topK', 'frequencyPenalty', 'presencePenalty', 'maxOutputTokens'];
+export const ModelFieldsAllList = ['temperature', 'topP', 'topK', 'frequencyPenalty', 'presencePenalty', 'maxOutputTokens', 'contextLength'];
export const AiModelMap = new Map([
[
@@ -200,7 +201,7 @@ export const AiModelMap = new Map
Date: Mon, 22 Sep 2025 12:18:06 +0300
Subject: [PATCH 09/31] AI models: add auth support for Ollama
---
.../Langchain4jChatModelConfigurerImpl.java | 28 +++++++++++++---
.../ai/provider/OllamaProviderConfig.java | 32 +++++++++++++++++--
2 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
index 84b09b9188..2cb6c2097f 100644
--- a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
@@ -35,6 +35,7 @@ import dev.langchain4j.model.mistralai.MistralAiChatModel;
import dev.langchain4j.model.ollama.OllamaChatModel;
import dev.langchain4j.model.openai.OpenAiChatModel;
import dev.langchain4j.model.vertexai.gemini.VertexAiGeminiChatModel;
+import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.ai.model.chat.AmazonBedrockChatModelConfig;
import org.thingsboard.server.common.data.ai.model.chat.AnthropicChatModelConfig;
@@ -49,6 +50,7 @@ import org.thingsboard.server.common.data.ai.model.chat.OpenAiChatModelConfig;
import org.thingsboard.server.common.data.ai.provider.AmazonBedrockProviderConfig;
import org.thingsboard.server.common.data.ai.provider.AzureOpenAiProviderConfig;
import org.thingsboard.server.common.data.ai.provider.GoogleVertexAiGeminiProviderConfig;
+import org.thingsboard.server.common.data.ai.provider.OllamaProviderConfig;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.regions.Region;
@@ -56,7 +58,11 @@ import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.time.Duration;
+import java.util.Base64;
+
+import static java.util.Collections.singletonMap;
@Component
class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigurer {
@@ -136,7 +142,7 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
// set request timeout from model config
if (chatModelConfig.timeoutSeconds() != null) {
- retrySettings.setTotalTimeout(org.threeten.bp.Duration.ofSeconds(chatModelConfig.timeoutSeconds()));
+ retrySettings.setTotalTimeoutDuration(Duration.ofSeconds(chatModelConfig.timeoutSeconds()));
}
// set updated retry settings
@@ -266,7 +272,7 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
@Override
public ChatModel configureChatModel(OllamaChatModelConfig chatModelConfig) {
- return OllamaChatModel.builder()
+ var builder = OllamaChatModel.builder()
.baseUrl(chatModelConfig.providerConfig().baseUrl())
.modelName(chatModelConfig.modelId())
.temperature(chatModelConfig.temperature())
@@ -275,8 +281,22 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.numCtx(chatModelConfig.contextLength())
.numPredict(chatModelConfig.maxOutputTokens())
.timeout(toDuration(chatModelConfig.timeoutSeconds()))
- .maxRetries(chatModelConfig.maxRetries())
- .build();
+ .maxRetries(chatModelConfig.maxRetries());
+
+ var auth = chatModelConfig.providerConfig().auth();
+ if (auth instanceof OllamaProviderConfig.OllamaAuth.Basic basicAuth) {
+ String credentials = basicAuth.username() + ":" + basicAuth.password();
+ String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.UTF_8));
+ builder.customHeaders(singletonMap(HttpHeaders.AUTHORIZATION, "Basic " + encodedCredentials));
+ } else if (auth instanceof OllamaProviderConfig.OllamaAuth.Token tokenAuth) {
+ builder.customHeaders(singletonMap(HttpHeaders.AUTHORIZATION, "Bearer " + tokenAuth.token()));
+ } else if (auth instanceof OllamaProviderConfig.OllamaAuth.None) {
+ // do nothing
+ } else {
+ throw new UnsupportedOperationException("Unknown authentication type: " + auth.getClass().getSimpleName());
+ }
+
+ return builder.build();
}
private static Duration toDuration(Integer timeoutSeconds) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java
index fc0a2d6fd8..39bb57834c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java
@@ -15,8 +15,34 @@
*/
package org.thingsboard.server.common.data.ai.provider;
-import jakarta.validation.constraints.NotBlank;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
public record OllamaProviderConfig(
- @NotBlank String baseUrl
-) implements AiProviderConfig {}
+ @NotNull String baseUrl,
+ @NotNull @Valid OllamaAuth auth
+) implements AiProviderConfig {
+
+ @JsonTypeInfo(
+ use = JsonTypeInfo.Id.NAME,
+ include = JsonTypeInfo.As.PROPERTY,
+ property = "type"
+ )
+ @JsonSubTypes({
+ @JsonSubTypes.Type(value = OllamaAuth.None.class, name = "NONE"),
+ @JsonSubTypes.Type(value = OllamaAuth.Basic.class, name = "BASIC"),
+ @JsonSubTypes.Type(value = OllamaAuth.Token.class, name = "TOKEN")
+ })
+ public sealed interface OllamaAuth {
+
+ record None() implements OllamaAuth {}
+
+ record Basic(@NotNull String username, @NotNull String password) implements OllamaAuth {}
+
+ record Token(@NotNull String token) implements OllamaAuth {}
+
+ }
+
+}
From 329534df61f80eee17e6536cec449dd08028a8ea Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko
Date: Thu, 25 Sep 2025 15:44:50 +0300
Subject: [PATCH 10/31] UI: Add authentication for Ollama model
---
.../ai-model/ai-model-dialog.component.html | 87 +++++++++++++++----
.../ai-model/ai-model-dialog.component.ts | 67 +++++++++++---
.../src/app/shared/models/ai-model.models.ts | 11 +++
.../assets/locale/locale.constant-en_US.json | 16 +++-
4 files changed, 153 insertions(+), 28 deletions(-)
diff --git a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
index c730850474..abfe8500b4 100644
--- a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
@@ -55,31 +55,34 @@
-
diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
index 552c4f1f71..9d1de180e9 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
+++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.ts
@@ -14,7 +14,18 @@
/// limitations under the License.
///
-import { Component, ElementRef, forwardRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
+import {
+ Component,
+ ElementRef,
+ EventEmitter,
+ forwardRef,
+ Input,
+ OnChanges,
+ OnInit,
+ Output,
+ SimpleChanges,
+ ViewChild
+} from '@angular/core';
import {
ControlValueAccessor,
NG_VALIDATORS,
@@ -93,6 +104,7 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, OnChan
}
@Input()
+ @coerceBoolean()
disabled: boolean;
@Input()
@@ -109,6 +121,13 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, OnChan
@coerceBoolean()
inlineField: boolean;
+ @Input()
+ @coerceBoolean()
+ allowCreateNew: boolean;
+
+ @Output()
+ createNew = new EventEmitter();
+
@ViewChild('entityInput') entityInput: ElementRef;
@ViewChild('entityAutocomplete') matAutocomplete: MatAutocomplete;
@ViewChild('chipList', {static: true}) chipList: MatChipGrid;
@@ -136,6 +155,11 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, OnChan
this.entityListFormGroup.get('entities').updateValueAndValidity();
}
+ createNewEntity($event: Event, searchText?: string) {
+ $event.stopPropagation();
+ this.createNew.emit(searchText);
+ }
+
registerOnChange(fn: any): void {
this.propagateChange = fn;
}
@@ -201,6 +225,9 @@ export class EntityListComponent implements ControlValueAccessor, OnInit, OnChan
this.modelValue = null;
}
this.dirty = true;
+ if (this.entityInput) {
+ this.entityInput.nativeElement.value = '';
+ }
}
validate(): ValidationErrors | null {
diff --git a/ui-ngx/src/app/shared/models/resource.models.ts b/ui-ngx/src/app/shared/models/resource.models.ts
index 0419e40a7c..3495bf9eac 100644
--- a/ui-ngx/src/app/shared/models/resource.models.ts
+++ b/ui-ngx/src/app/shared/models/resource.models.ts
@@ -24,7 +24,8 @@ export enum ResourceType {
LWM2M_MODEL = 'LWM2M_MODEL',
PKCS_12 = 'PKCS_12',
JKS = 'JKS',
- JS_MODULE = 'JS_MODULE'
+ JS_MODULE = 'JS_MODULE',
+ TEXT = 'TEXT',
}
export enum ResourceSubType {
@@ -57,7 +58,8 @@ export const ResourceTypeTranslationMap = new Map(
[ResourceType.LWM2M_MODEL, 'resource.type.lwm2m-model'],
[ResourceType.PKCS_12, 'resource.type.pkcs-12'],
[ResourceType.JKS, 'resource.type.jks'],
- [ResourceType.JS_MODULE, 'resource.type.js-module']
+ [ResourceType.JS_MODULE, 'resource.type.js-module'],
+ [ResourceType.TEXT, 'resource.type.text'],
]
);
@@ -76,8 +78,8 @@ export interface TbResourceInfo extends Omit, 'name' |
title?: string;
resourceType: ResourceType;
resourceSubType?: ResourceSubType;
- fileName: string;
- public: boolean;
+ fileName?: string;
+ public?: boolean;
publicResourceKey?: string;
readonly link?: string;
readonly publicLink?: string;
@@ -87,7 +89,7 @@ export interface TbResourceInfo extends Omit, 'name' |
export type ResourceInfo = TbResourceInfo;
export interface Resource extends ResourceInfo {
- data: string;
+ data?: string;
name?: string;
}
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 80328181f6..d4bfd4ea06 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4488,7 +4488,8 @@
"jks": "JKS",
"js-module": "JS module",
"lwm2m-model": "LWM2M model",
- "pkcs-12": "PKCS #12"
+ "pkcs-12": "PKCS #12",
+ "text": "Text"
},
"resource-sub-type": "Sub-type",
"sub-type": {
@@ -5467,7 +5468,8 @@
"timeout-required": "Timeout is required",
"timeout-validation": "Must be from 1 second to 10 minutes.",
"force-acknowledgement": "Force acknowledgement",
- "force-acknowledgement-hint": "If enabled, the incoming message is acknowledged immediately. The model's response is then enqueued as a separate, new message."
+ "force-acknowledgement-hint": "If enabled, the incoming message is acknowledged immediately. The model's response is then enqueued as a separate, new message.",
+ "ai-resources": "AI resources"
}
},
"timezone": {
From cd6063fd097e8c2db83b87e392011ad34866065c Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko
Date: Wed, 10 Sep 2025 09:41:47 +0300
Subject: [PATCH 12/31] UI: General resources
---
ui-ngx/src/app/core/http/entity.service.ts | 6 +-
ui-ngx/src/app/core/http/resource.service.ts | 14 +++--
.../resources/resources-dialog.component.html | 4 +-
.../resources/resources-dialog.component.ts | 3 +
.../resources-library.component.html | 61 ++++++++++---------
.../resources/resources-library.component.ts | 13 +++-
.../external/ai-config.component.html | 2 +-
.../rule-node/external/ai-config.component.ts | 2 +-
.../resources-table-header.component.ts | 2 +-
.../shared/components/file-input.component.ts | 14 ++++-
.../src/app/shared/models/resource.models.ts | 4 +-
.../assets/locale/locale.constant-en_US.json | 2 +-
12 files changed, 77 insertions(+), 50 deletions(-)
diff --git a/ui-ngx/src/app/core/http/entity.service.ts b/ui-ngx/src/app/core/http/entity.service.ts
index 53a55bfe7f..c652ba39ba 100644
--- a/ui-ngx/src/app/core/http/entity.service.ts
+++ b/ui-ngx/src/app/core/http/entity.service.ts
@@ -299,9 +299,7 @@ export class EntityService {
entityIds);
break;
case EntityType.TB_RESOURCE:
- observable = this.getEntitiesByIdsObservable(
- (id) => this.resourceService.getResource(id, config),
- entityIds);
+ observable = this.resourceService.getResourcesByIds(entityIds, config);
break;
}
return observable;
@@ -478,7 +476,7 @@ export class EntityService {
break;
case EntityType.TB_RESOURCE:
pageLink.sortOrder.property = 'title';
- entitiesObservable = this.resourceService.getTenantResources(pageLink, subType as ResourceType, config);
+ entitiesObservable = this.resourceService.getResources(pageLink, subType as ResourceType, null, config);
break;
case EntityType.QUEUE_STATS:
pageLink.sortOrder.property = 'createdTime';
diff --git a/ui-ngx/src/app/core/http/resource.service.ts b/ui-ngx/src/app/core/http/resource.service.ts
index 52c92d96e4..90335758dd 100644
--- a/ui-ngx/src/app/core/http/resource.service.ts
+++ b/ui-ngx/src/app/core/http/resource.service.ts
@@ -24,6 +24,7 @@ import { Resource, ResourceInfo, ResourceSubType, ResourceType, TBResourceScope
import { catchError, mergeMap } from 'rxjs/operators';
import { isNotEmptyStr } from '@core/utils';
import { ResourcesService } from '@core/services/resources.service';
+import { NotificationTarget } from "@shared/models/notification.models";
@Injectable({
providedIn: 'root'
@@ -47,12 +48,8 @@ export class ResourceService {
return this.http.get>(url, defaultHttpOptionsFromConfig(config));
}
- public getTenantResources(pageLink: PageLink, resourceType?: ResourceType, config?: RequestConfig): Observable> {
- let url = `/api/resource${pageLink.toQuery()}`;
- if (isNotEmptyStr(resourceType)) {
- url += `&resourceType=${resourceType}`;
- }
- return this.http.get>(url, defaultHttpOptionsFromConfig(config));
+ public getTenantResources(pageLink: PageLink, config?: RequestConfig): Observable> {
+ return this.http.get>(`/api/resource/tenant${pageLink.toQuery()}`, defaultHttpOptionsFromConfig(config))
}
public getResource(resourceId: string, config?: RequestConfig): Observable {
@@ -98,4 +95,9 @@ export class ResourceService {
return this.http.delete(`/api/resource/${resourceId}?force=${force}`, defaultHttpOptionsFromConfig(config));
}
+ public getResourcesByIds(ids: string[], config?: RequestConfig): Observable> {
+ return this.http.get>(`/api/resource?resourceIds=${ids.join(',')}`,
+ defaultHttpOptionsFromConfig(config));
+ }
+
}
diff --git a/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.html b/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.html
index c6813ff0f2..0062cfa9ac 100644
--- a/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.html
@@ -32,8 +32,8 @@
diff --git a/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.ts b/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.ts
index a06c72827a..6216f087b1 100644
--- a/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.ts
@@ -106,6 +106,9 @@ export class ResourcesDialogComponent extends DialogComponent response[0])
).subscribe(result => this.dialogRef.close(result));
} else {
+ if (resource.resourceType !== ResourceType.GENERAL) {
+ delete resource.descriptor;
+ }
this.resourceService.saveResource(resource).subscribe(result => this.dialogRef.close(result));
}
}
diff --git a/ui-ngx/src/app/modules/home/components/resources/resources-library.component.html b/ui-ngx/src/app/modules/home/components/resources/resources-library.component.html
index c602906be1..4737b75ef2 100644
--- a/ui-ngx/src/app/modules/home/components/resources/resources-library.component.html
+++ b/ui-ngx/src/app/modules/home/components/resources/resources-library.component.html
@@ -48,14 +48,16 @@
diff --git a/ui-ngx/src/app/modules/home/components/resources/resources-library.component.ts b/ui-ngx/src/app/modules/home/components/resources/resources-library.component.ts
index 0b50e45a7a..e3ad0e15f3 100644
--- a/ui-ngx/src/app/modules/home/components/resources/resources-library.component.ts
+++ b/ui-ngx/src/app/modules/home/components/resources/resources-library.component.ts
@@ -44,7 +44,7 @@ export class ResourcesLibraryComponent extends EntityComponent impleme
standalone = false;
@Input()
- resourceTypes = [ResourceType.LWM2M_MODEL, ResourceType.PKCS_12, ResourceType.JKS, ResourceType.TEXT];
+ resourceTypes = [ResourceType.LWM2M_MODEL, ResourceType.PKCS_12, ResourceType.JKS, ResourceType.GENERAL];
@Input()
defaultResourceType = ResourceType.LWM2M_MODEL;
@@ -90,10 +90,19 @@ export class ResourcesLibraryComponent extends EntityComponent impleme
title: [entity ? entity.title : '', [Validators.required, Validators.maxLength(255)]],
resourceType: [entity?.resourceType ? entity.resourceType : ResourceType.LWM2M_MODEL, Validators.required],
fileName: [entity ? entity.fileName : null, Validators.required],
- data: [entity ? entity.data : null, this.isAdd ? [Validators.required] : []]
+ data: [entity ? entity.data : null, this.isAdd ? [Validators.required] : []],
+ descriptor: this.fb.group({
+ mediaType: ['']
+ })
});
}
+ mediaTypeChange(mediaType: string): void {
+ if (this.entityForm.get('resourceType').value === ResourceType.GENERAL) {
+ this.entityForm.get('descriptor').get('mediaType').patchValue(mediaType);
+ }
+ }
+
updateForm(entity: Resource): void {
this.entityForm.patchValue(entity);
}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html
index d259d57ef3..5381fc770b 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html
@@ -76,7 +76,7 @@
placeholderText="{{ 'rule-node-config.ai.ai-resources' | translate }}"
[inlineField]="true"
[entityType]="EntityType.TB_RESOURCE"
- [subType]="ResourceType.TEXT"
+ [subType]="ResourceType.GENERAL"
(createNew)="createAiResources($event, 'resourceIds')"
formControlName="resourceIds">
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.ts
index a4d973e998..07bcb86fdf 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.ts
@@ -129,7 +129,7 @@ export class AiConfigComponent extends RuleNodeConfigurationComponent {
disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: {
- resources: {title: name, resourceType: ResourceType.TEXT},
+ resources: {title: name, resourceType: ResourceType.GENERAL},
isAdd: true
}
}).afterClosed()
diff --git a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-table-header.component.ts b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-table-header.component.ts
index d4b5d18493..136c143e3c 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-table-header.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-table-header.component.ts
@@ -28,7 +28,7 @@ import { PageLink } from '@shared/models/page/page-link';
})
export class ResourcesTableHeaderComponent extends EntityTableHeaderComponent {
- readonly resourceTypes = [ResourceType.LWM2M_MODEL, ResourceType.PKCS_12, ResourceType.JKS, ResourceType.TEXT];
+ readonly resourceTypes = [ResourceType.LWM2M_MODEL, ResourceType.PKCS_12, ResourceType.JKS, ResourceType.GENERAL];
readonly resourceTypesTranslationMap = ResourceTypeTranslationMap;
constructor(protected store: Store) {
diff --git a/ui-ngx/src/app/shared/components/file-input.component.ts b/ui-ngx/src/app/shared/components/file-input.component.ts
index bbe68bb9c6..6960db73dd 100644
--- a/ui-ngx/src/app/shared/components/file-input.component.ts
+++ b/ui-ngx/src/app/shared/components/file-input.component.ts
@@ -129,10 +129,15 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
@Output()
fileNameChanged = new EventEmitter();
+ @Output()
+ mediaTypeChanged = new EventEmitter();
+
fileName: string | string[];
fileContent: any;
files: File[];
+ mediaType: string;
+
@ViewChild('flow', {static: true})
flow: FlowDirective;
@@ -180,6 +185,7 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
this.fileContent = files[0].fileContent;
this.fileName = files[0].fileName;
this.files = files[0].files;
+ this.mediaType = files[0].mediaType;
this.updateModel();
} else if (files.length > 1) {
this.fileContent = files.map(content => content.fileContent);
@@ -203,6 +209,7 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
let fileName = null;
let fileContent = null;
let files = null;
+ let mediaType = null;
if (reader.readyState === reader.DONE) {
if (!this.workFromFileObj) {
fileContent = reader.result;
@@ -211,16 +218,18 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
fileContent = this.contentConvertFunction(fileContent);
}
fileName = fileContent ? file.name : null;
+ mediaType = file?.file?.type || null;
}
} else if (file.name || file.file){
files = file.file;
fileName = file.name;
+ mediaType = file.file.type || null;
}
}
- resolve({fileContent, fileName, files});
+ resolve({fileContent, fileName, files, mediaType});
};
reader.onerror = () => {
- resolve({fileContent: null, fileName: null, files: null});
+ resolve({fileContent: null, fileName: null, files: null, mediaType: null});
};
if (this.readAsBinary) {
reader.readAsBinaryString(file.file);
@@ -283,6 +292,7 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
this.propagateChange(this.files);
} else {
this.propagateChange(this.fileContent);
+ this.mediaTypeChanged.emit(this.mediaType);
this.fileNameChanged.emit(this.fileName);
}
}
diff --git a/ui-ngx/src/app/shared/models/resource.models.ts b/ui-ngx/src/app/shared/models/resource.models.ts
index 3495bf9eac..12590e7608 100644
--- a/ui-ngx/src/app/shared/models/resource.models.ts
+++ b/ui-ngx/src/app/shared/models/resource.models.ts
@@ -25,7 +25,7 @@ export enum ResourceType {
PKCS_12 = 'PKCS_12',
JKS = 'JKS',
JS_MODULE = 'JS_MODULE',
- TEXT = 'TEXT',
+ GENERAL = 'GENERAL',
}
export enum ResourceSubType {
@@ -59,7 +59,7 @@ export const ResourceTypeTranslationMap = new Map(
[ResourceType.PKCS_12, 'resource.type.pkcs-12'],
[ResourceType.JKS, 'resource.type.jks'],
[ResourceType.JS_MODULE, 'resource.type.js-module'],
- [ResourceType.TEXT, 'resource.type.text'],
+ [ResourceType.GENERAL, 'resource.type.general'],
]
);
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index d4bfd4ea06..d79bb81ae5 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4489,7 +4489,7 @@
"js-module": "JS module",
"lwm2m-model": "LWM2M model",
"pkcs-12": "PKCS #12",
- "text": "Text"
+ "general": "General"
},
"resource-sub-type": "Sub-type",
"sub-type": {
From caf90636382db5418dd59703c52ceed0a0aaf0e5 Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko
Date: Fri, 12 Sep 2025 16:23:53 +0300
Subject: [PATCH 13/31] UI: Add resources in use dialog with force to delete
---
.../resources-library-table-config.resolve.ts | 180 +++++++++++++++++-
.../assets/locale/locale.constant-en_US.json | 7 +-
2 files changed, 177 insertions(+), 10 deletions(-)
diff --git a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
index dc85ca4914..d92355fbac 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
@@ -22,7 +22,13 @@ import {
EntityTableConfig
} from '@home/models/entity/entities-table-config.models';
import { Router } from '@angular/router';
-import { Resource, ResourceInfo, ResourceType, ResourceTypeTranslationMap } from '@shared/models/resource.models';
+import {
+ Resource,
+ ResourceInfo, ResourceInfoWithReferences,
+ ResourceType,
+ ResourceTypeTranslationMap,
+ toResourceDeleteResult
+} from '@shared/models/resource.models';
import { EntityType, entityTypeResources, entityTypeTranslations } from '@shared/models/entity-type.models';
import { NULL_UUID } from '@shared/models/id/has-uuid';
import { DatePipe } from '@angular/common';
@@ -35,9 +41,19 @@ import { Authority } from '@shared/models/authority.enum';
import { ResourcesLibraryComponent } from '@home/components/resources/resources-library.component';
import { PageLink } from '@shared/models/page/page-link';
import { EntityAction } from '@home/models/entity/entity-component.models';
-import { map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs/operators';
import { ResourcesTableHeaderComponent } from '@home/pages/admin/resource/resources-table-header.component';
import { ResourceLibraryTabsComponent } from '@home/pages/admin/resource/resource-library-tabs.component';
+import { forkJoin, of } from "rxjs";
+import {
+ ResourcesInUseDialogComponent,
+ ResourcesInUseDialogData
+} from "@shared/components/resource/resources-in-use-dialog.component";
+import { parseHttpErrorMessage } from "@core/utils";
+import { ActionNotificationShow } from "@core/notification/notification.actions";
+import { ResourcesDatasource } from "@home/pages/admin/resource/resources-datasource";
+import { MatDialog } from "@angular/material/dialog";
+import { DialogService } from "@core/services/dialog.service";
@Injectable()
export class ResourcesLibraryTableConfigResolver {
@@ -49,6 +65,8 @@ export class ResourcesLibraryTableConfigResolver {
private resourceService: ResourceService,
private translate: TranslateService,
private router: Router,
+ private dialog: MatDialog,
+ private dialogService: DialogService,
private datePipe: DatePipe) {
this.config.entityType = EntityType.TB_RESOURCE;
@@ -76,19 +94,27 @@ export class ResourcesLibraryTableConfigResolver {
icon: 'file_download',
isEnabled: () => true,
onAction: ($event, entity) => this.downloadResource($event, entity)
- }
+ },
+ {
+ name: this.translate.instant('resource.delete'),
+ icon: 'delete',
+ isEnabled: (resource) => this.config.deleteEnabled(resource),
+ onAction: ($event, entity) => this.deleteResource($event, entity)
+ },
);
- this.config.deleteEntityTitle = resource => this.translate.instant('resource.delete-resource-title',
- { resourceTitle: resource.title });
- this.config.deleteEntityContent = () => this.translate.instant('resource.delete-resource-text');
- this.config.deleteEntitiesTitle = count => this.translate.instant('resource.delete-resources-title', {count});
- this.config.deleteEntitiesContent = () => this.translate.instant('resource.delete-resources-text');
+ this.config.groupActionDescriptors = [{
+ name: this.translate.instant('action.delete'),
+ icon: 'delete',
+ isEnabled: true,
+ onAction: ($event, entities) => this.deleteResources($event, entities)
+ }];
+
+ this.config.entitiesDeleteEnabled = false;
this.config.entitiesFetchFunction = pageLink => this.resourceService.getResources(pageLink, this.config.componentsData.resourceType);
this.config.loadEntity = id => this.resourceService.getResourceInfoById(id.id);
this.config.saveEntity = resource => this.saveResource(resource);
- this.config.deleteEntity = id => this.resourceService.deleteResource(id.id);
this.config.onEntityAction = action => this.onResourceAction(action);
}
@@ -147,6 +173,8 @@ export class ResourcesLibraryTableConfigResolver {
case 'downloadResource':
this.downloadResource(action.event, action.entity);
return true;
+ case 'deleteLibrary':
+ this.deleteResource(action.event, action.entity);
}
return false;
}
@@ -165,4 +193,138 @@ export class ResourcesLibraryTableConfigResolver {
return authority === Authority.SYS_ADMIN;
}
}
+
+ private deleteResource($event: Event, resource: ResourceInfo) {
+ if ($event) {
+ $event.stopPropagation();
+ }
+ this.dialogService.confirm(
+ this.translate.instant('resource.delete-resource-title', { resourceTitle: resource.title }),
+ this.translate.instant('resource.delete-resource-text'),
+ this.translate.instant('action.no'),
+ this.translate.instant('action.yes'),
+ true
+ ).subscribe((result) => {
+ if (result) {
+ this.resourceService.deleteResource(resource.id.id, false, {ignoreErrors: true}).pipe(
+ map(() => toResourceDeleteResult(resource)),
+ catchError((err) => of(toResourceDeleteResult(resource, err)))
+ ).subscribe(
+ (deleteResult) => {
+ if (deleteResult.success) {
+ if (this.config.getEntityDetailsPage()) {
+ this.config.getEntityDetailsPage().goBack();
+ } else {
+ this.config.updateData(true);
+ }
+ } else if (deleteResult.resourceIsReferencedError) {
+ const resources: ResourceInfoWithReferences[] = [{...resource, ...{references: deleteResult.references}}];
+ const data = {
+ multiple: false,
+ resources,
+ configuration: {
+ title: 'resource.resource-is-in-use',
+ message: this.translate.instant('resource.resource-is-in-use-text', {title: resources[0].title}),
+ deleteText: 'resource.delete-resource-in-use-text',
+ selectedText: 'resource.selected-resources',
+ columns: ['select', 'title', 'references']
+ }
+ };
+ this.dialog.open(ResourcesInUseDialogComponent, {
+ disableClose: true,
+ panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
+ data
+ }).afterClosed().subscribe((resources) => {
+ if (resources) {
+ this.resourceService.deleteResource(resource.id.id, true).subscribe(() => {
+ if (this.config.getEntityDetailsPage()) {
+ this.config.getEntityDetailsPage().goBack();
+ } else {
+ this.config.updateData(true);
+ }
+ });
+ }
+ });
+ } else {
+ const errorMessageWithTimeout = parseHttpErrorMessage(deleteResult.error, this.translate);
+ setTimeout(() => {
+ this.store.dispatch(new ActionNotificationShow({message: errorMessageWithTimeout.message, type: 'error'}));
+ }, errorMessageWithTimeout.timeout);
+ }
+ }
+ );
+ }
+ });
+ }
+
+ private deleteResources($event: Event, resources: ResourceInfo[]) {
+ if ($event) {
+ $event.stopPropagation();
+ }
+ if (resources && resources.length) {
+ const title = this.translate.instant('resource.delete-resources-title', {count: resources.length});
+ const content = this.translate.instant('resource.delete-resources-text');
+ this.dialogService.confirm(title, content,
+ this.translate.instant('action.no'),
+ this.translate.instant('action.yes')).subscribe((result) => {
+ if (result) {
+ const tasks = resources.map((resource) =>
+ this.resourceService.deleteResource(resource.id.id, false, {ignoreErrors: true}).pipe(
+ map(() => toResourceDeleteResult(resource)),
+ catchError((err) => of(toResourceDeleteResult(resource, err)))
+ )
+ );
+ forkJoin(tasks).subscribe(
+ (deleteResults) => {
+ const anySuccess = deleteResults.some(res => res.success);
+ const referenceErrors = deleteResults.filter(res => res.resourceIsReferencedError);
+ const otherError = deleteResults.find(res => !res.success);
+ if (anySuccess) {
+ this.config.updateData();
+ }
+ if (referenceErrors?.length) {
+ const resourcesWithReferences: ResourceInfoWithReferences[] =
+ referenceErrors.map(ref => ({...ref.resource, ...{references: ref.references}}));
+ const data = {
+ multiple: true,
+ resources: resourcesWithReferences,
+ configuration: {
+ title: 'resource.resources-are-in-use',
+ message: this.translate.instant('resource.resources-are-in-use-text'),
+ deleteText: 'resource.delete-resource-in-use-text',
+ selectedText: 'resource.selected-resources',
+ datasource: new ResourcesDatasource(this.resourceService, resourcesWithReferences, () => true),
+ columns: ['select', 'title', 'references']
+ }
+ };
+ this.dialog.open(ResourcesInUseDialogComponent, {
+ disableClose: true,
+ panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
+ data
+ }).afterClosed().subscribe((forceDeleteResources) => {
+ if (forceDeleteResources && forceDeleteResources.length) {
+ const forceDeleteTasks = forceDeleteResources.map((resource) =>
+ this.resourceService.deleteResource(resource.id.id, true)
+ );
+ forkJoin(forceDeleteTasks).subscribe(
+ () => {
+ this.config.updateData();
+ }
+ );
+ }
+ });
+ } else if (otherError) {
+ const errorMessageWithTimeout = parseHttpErrorMessage(otherError.error, this.translate);
+ setTimeout(() => {
+ this.store.dispatch(new ActionNotificationShow({message: errorMessageWithTimeout.message, type: 'error'}));
+ }, errorMessageWithTimeout.timeout);
+ }
+ }
+ );
+ }
+ });
+ }
+ }
}
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index d79bb81ae5..4639552658 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4497,7 +4497,12 @@
"scada-symbol": "Scada symbol",
"extension": "Extension",
"module": "Module"
- }
+ },
+ "resource-is-in-use": "Resource is used by other entities",
+ "resources-are-in-use": "Resources are used by other entities",
+ "resource-is-in-use-text": "The Resource '{{title}}' was not deleted because it is used by the following entities:",
+ "resources-are-in-use-text": "Not all Resources have been deleted because they are used by other entities.You can view referenced entities by clicking the References button in the corresponding resource row.If you still want to delete these resources, select them in the table below and click the Delete selected button.",
+ "delete-resource-in-use-text": "If you still want to delete the resource, click the Delete anyway button."
},
"javascript": {
"add": "Add JavaScript resource",
From af600ff450925466baa86461f33e98065d82af9b Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko
Date: Fri, 12 Sep 2025 16:46:38 +0300
Subject: [PATCH 14/31] UI: oprimize import
---
ui-ngx/src/app/core/http/resource.service.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/ui-ngx/src/app/core/http/resource.service.ts b/ui-ngx/src/app/core/http/resource.service.ts
index 90335758dd..168c63b3b1 100644
--- a/ui-ngx/src/app/core/http/resource.service.ts
+++ b/ui-ngx/src/app/core/http/resource.service.ts
@@ -24,7 +24,6 @@ import { Resource, ResourceInfo, ResourceSubType, ResourceType, TBResourceScope
import { catchError, mergeMap } from 'rxjs/operators';
import { isNotEmptyStr } from '@core/utils';
import { ResourcesService } from '@core/services/resources.service';
-import { NotificationTarget } from "@shared/models/notification.models";
@Injectable({
providedIn: 'root'
From e688a8af0f40c51400277320b2061d841c580b14 Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets
Date: Mon, 29 Sep 2025 13:35:22 +0300
Subject: [PATCH 15/31] AI models: add base URL to OpenAI
---
.../Langchain4jChatModelConfigurerImpl.java | 1 +
.../controller/AiModelControllerTest.java | 12 ++++++--
.../ai/DefaultTbAiModelServiceTest.java | 2 +-
.../sql/BaseTbResourceServiceTest.java | 6 +++-
.../ai/provider/OpenAiProviderConfig.java | 30 +++++++++++++++++--
.../rule/engine/ai/TbAiNodeTest.java | 5 +++-
6 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
index 2cb6c2097f..c631f1a3d0 100644
--- a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
@@ -70,6 +70,7 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
@Override
public ChatModel configureChatModel(OpenAiChatModelConfig chatModelConfig) {
return OpenAiChatModel.builder()
+ .baseUrl(chatModelConfig.providerConfig().baseUrl())
.apiKey(chatModelConfig.providerConfig().apiKey())
.modelName(chatModelConfig.modelId())
.temperature(chatModelConfig.temperature())
diff --git a/application/src/test/java/org/thingsboard/server/controller/AiModelControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AiModelControllerTest.java
index ae2972b0cc..53648af441 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AiModelControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AiModelControllerTest.java
@@ -104,7 +104,10 @@ public class AiModelControllerTest extends AbstractControllerTest {
var model = doPost("/api/ai/model", constructValidOpenAiModel("Test model"), AiModel.class);
var newModelConfig = OpenAiChatModelConfig.builder()
- .providerConfig(new OpenAiProviderConfig("test-api-key-updated"))
+ .providerConfig(OpenAiProviderConfig.builder()
+ .baseUrl(OpenAiProviderConfig.OPENAI_OFFICIAL_BASE_URL)
+ .apiKey("test-api-key-updated")
+ .build())
.modelId("o4-mini")
.temperature(0.2)
.topP(0.4)
@@ -270,7 +273,7 @@ public class AiModelControllerTest extends AbstractControllerTest {
.tenantId(tenantId)
.name("Test model 1")
.configuration(OpenAiChatModelConfig.builder()
- .providerConfig(new OpenAiProviderConfig("test-api-key"))
+ .providerConfig(OpenAiProviderConfig.builder().apiKey("test-api-key").build())
.modelId("o3-pro")
.build())
.build(), AiModel.class);
@@ -594,7 +597,10 @@ public class AiModelControllerTest extends AbstractControllerTest {
private AiModel constructValidOpenAiModel(String name) {
var modelConfig = OpenAiChatModelConfig.builder()
- .providerConfig(new OpenAiProviderConfig("test-api-key"))
+ .providerConfig(OpenAiProviderConfig.builder()
+ .baseUrl(OpenAiProviderConfig.OPENAI_OFFICIAL_BASE_URL)
+ .apiKey("test-api-key")
+ .build())
.modelId("gpt-4o")
.temperature(0.5)
.topP(0.3)
diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/ai/DefaultTbAiModelServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/ai/DefaultTbAiModelServiceTest.java
index 2321446b44..b6be136f82 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/ai/DefaultTbAiModelServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/ai/DefaultTbAiModelServiceTest.java
@@ -253,7 +253,7 @@ class DefaultTbAiModelServiceTest {
private static AiModelConfig constructValidOpenAiModelConfig() {
return OpenAiChatModelConfig.builder()
- .providerConfig(new OpenAiProviderConfig("test-api-key"))
+ .providerConfig(OpenAiProviderConfig.builder().apiKey("test-api-key").build())
.modelId("gpt-4o")
.temperature(0.5)
.topP(0.3)
diff --git a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
index da20b9489c..a146730465 100644
--- a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
@@ -682,7 +682,10 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
private AiModel constructValidOpenAiModel(String name) {
var modelConfig = OpenAiChatModelConfig.builder()
- .providerConfig(new OpenAiProviderConfig("test-api-key"))
+ .providerConfig(OpenAiProviderConfig.builder()
+ .baseUrl(OpenAiProviderConfig.OPENAI_OFFICIAL_BASE_URL)
+ .apiKey("test-api-key")
+ .build())
.modelId("gpt-4o")
.temperature(0.5)
.topP(0.3)
@@ -699,6 +702,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
.configuration(modelConfig)
.build();
}
+
@Test
public void testFindTenantResourcesByTenantId() throws Exception {
loginSysAdmin();
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 09ffda837b..f7864db6e3 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,32 @@
*/
package org.thingsboard.server.common.data.ai.provider;
-import jakarta.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.validation.constraints.AssertTrue;
+import lombok.Builder;
+import org.apache.commons.lang3.StringUtils;
+import java.util.Objects;
+
+@Builder
public record OpenAiProviderConfig(
- @NotNull String apiKey
-) implements AiProviderConfig {}
+ String baseUrl,
+ String apiKey
+) implements AiProviderConfig {
+
+ public static final String OPENAI_OFFICIAL_BASE_URL = "https://api.openai.com/v1";
+
+ public OpenAiProviderConfig {
+ baseUrl = Objects.requireNonNullElse(baseUrl, OPENAI_OFFICIAL_BASE_URL);
+ }
+
+ @JsonIgnore
+ @AssertTrue(message = "API key is required when using the official OpenAI API")
+ public boolean isValid() {
+ if (baseUrl.equals(OPENAI_OFFICIAL_BASE_URL)) {
+ return StringUtils.isNotBlank(apiKey);
+ }
+ return true;
+ }
+
+}
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/ai/TbAiNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/ai/TbAiNodeTest.java
index c5b7f2c44b..a786cdd536 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/ai/TbAiNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/ai/TbAiNodeTest.java
@@ -129,7 +129,10 @@ class TbAiNodeTest {
config = new TbAiNodeConfiguration();
modelConfig = OpenAiChatModelConfig.builder()
- .providerConfig(new OpenAiProviderConfig("test-api-key"))
+ .providerConfig(OpenAiProviderConfig.builder()
+ .baseUrl(OpenAiProviderConfig.OPENAI_OFFICIAL_BASE_URL)
+ .apiKey("test-api-key")
+ .build())
.modelId("gpt-4o")
.temperature(0.5)
.topP(0.3)
From 22dc482b9ee43672ad99138833929de1e5c9aa33 Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko
Date: Tue, 30 Sep 2025 09:47:30 +0300
Subject: [PATCH 16/31] UI: Add baseUrl for openAI provider
---
.../ai-model/ai-model-dialog.component.html | 24 +++++++++---------
.../ai-model/ai-model-dialog.component.ts | 25 ++++++++++++++++++-
.../src/app/shared/models/ai-model.models.ts | 2 +-
.../assets/locale/locale.constant-en_US.json | 1 +
4 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
index abfe8500b4..5aa323fe7d 100644
--- a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
@@ -116,14 +116,24 @@
}
+ @if (providerFieldsList.includes('baseUrl')) {
+
+ ai-models.baseurl
+
+
+ {{ 'ai-models.baseurl-required' | translate }}
+
+
+ }
@if (providerFieldsList.includes('apiKey')) {
ai-models.api-key
-
+
- {{ 'ai-models.api-key-required' | translate }}
+ {{ ( provider === aiProvider.OPENAI ? 'ai-models.api-key-open-ai-required' : 'ai-models.api-key-required') | translate }}
}
@@ -158,16 +168,6 @@
}
- @if (providerFieldsList.includes('baseUrl')) {
-
- ai-models.baseurl
-
-
- {{ 'ai-models.baseurl-required' | translate }}
-
-
- }
@if (provider === aiProvider.OLLAMA) {
diff --git a/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.ts b/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.ts
index a06c72827a..6216f087b1 100644
--- a/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/resources/resources-dialog.component.ts
@@ -106,6 +106,9 @@ export class ResourcesDialogComponent extends DialogComponent response[0])
).subscribe(result => this.dialogRef.close(result));
} else {
+ if (resource.resourceType !== ResourceType.GENERAL) {
+ delete resource.descriptor;
+ }
this.resourceService.saveResource(resource).subscribe(result => this.dialogRef.close(result));
}
}
diff --git a/ui-ngx/src/app/modules/home/components/resources/resources-library.component.html b/ui-ngx/src/app/modules/home/components/resources/resources-library.component.html
index c602906be1..4737b75ef2 100644
--- a/ui-ngx/src/app/modules/home/components/resources/resources-library.component.html
+++ b/ui-ngx/src/app/modules/home/components/resources/resources-library.component.html
@@ -48,14 +48,16 @@
diff --git a/ui-ngx/src/app/modules/home/components/resources/resources-library.component.ts b/ui-ngx/src/app/modules/home/components/resources/resources-library.component.ts
index 0b50e45a7a..e3ad0e15f3 100644
--- a/ui-ngx/src/app/modules/home/components/resources/resources-library.component.ts
+++ b/ui-ngx/src/app/modules/home/components/resources/resources-library.component.ts
@@ -44,7 +44,7 @@ export class ResourcesLibraryComponent extends EntityComponent impleme
standalone = false;
@Input()
- resourceTypes = [ResourceType.LWM2M_MODEL, ResourceType.PKCS_12, ResourceType.JKS, ResourceType.TEXT];
+ resourceTypes = [ResourceType.LWM2M_MODEL, ResourceType.PKCS_12, ResourceType.JKS, ResourceType.GENERAL];
@Input()
defaultResourceType = ResourceType.LWM2M_MODEL;
@@ -90,10 +90,19 @@ export class ResourcesLibraryComponent extends EntityComponent impleme
title: [entity ? entity.title : '', [Validators.required, Validators.maxLength(255)]],
resourceType: [entity?.resourceType ? entity.resourceType : ResourceType.LWM2M_MODEL, Validators.required],
fileName: [entity ? entity.fileName : null, Validators.required],
- data: [entity ? entity.data : null, this.isAdd ? [Validators.required] : []]
+ data: [entity ? entity.data : null, this.isAdd ? [Validators.required] : []],
+ descriptor: this.fb.group({
+ mediaType: ['']
+ })
});
}
+ mediaTypeChange(mediaType: string): void {
+ if (this.entityForm.get('resourceType').value === ResourceType.GENERAL) {
+ this.entityForm.get('descriptor').get('mediaType').patchValue(mediaType);
+ }
+ }
+
updateForm(entity: Resource): void {
this.entityForm.patchValue(entity);
}
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html
index d259d57ef3..5381fc770b 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.html
@@ -76,7 +76,7 @@
placeholderText="{{ 'rule-node-config.ai.ai-resources' | translate }}"
[inlineField]="true"
[entityType]="EntityType.TB_RESOURCE"
- [subType]="ResourceType.TEXT"
+ [subType]="ResourceType.GENERAL"
(createNew)="createAiResources($event, 'resourceIds')"
formControlName="resourceIds">
diff --git a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.ts b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.ts
index a4d973e998..07bcb86fdf 100644
--- a/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/rule-node/external/ai-config.component.ts
@@ -129,7 +129,7 @@ export class AiConfigComponent extends RuleNodeConfigurationComponent {
disableClose: true,
panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
data: {
- resources: {title: name, resourceType: ResourceType.TEXT},
+ resources: {title: name, resourceType: ResourceType.GENERAL},
isAdd: true
}
}).afterClosed()
diff --git a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-table-header.component.ts b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-table-header.component.ts
index d4b5d18493..136c143e3c 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-table-header.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-table-header.component.ts
@@ -28,7 +28,7 @@ import { PageLink } from '@shared/models/page/page-link';
})
export class ResourcesTableHeaderComponent extends EntityTableHeaderComponent {
- readonly resourceTypes = [ResourceType.LWM2M_MODEL, ResourceType.PKCS_12, ResourceType.JKS, ResourceType.TEXT];
+ readonly resourceTypes = [ResourceType.LWM2M_MODEL, ResourceType.PKCS_12, ResourceType.JKS, ResourceType.GENERAL];
readonly resourceTypesTranslationMap = ResourceTypeTranslationMap;
constructor(protected store: Store) {
diff --git a/ui-ngx/src/app/shared/components/file-input.component.ts b/ui-ngx/src/app/shared/components/file-input.component.ts
index bbe68bb9c6..6960db73dd 100644
--- a/ui-ngx/src/app/shared/components/file-input.component.ts
+++ b/ui-ngx/src/app/shared/components/file-input.component.ts
@@ -129,10 +129,15 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
@Output()
fileNameChanged = new EventEmitter();
+ @Output()
+ mediaTypeChanged = new EventEmitter();
+
fileName: string | string[];
fileContent: any;
files: File[];
+ mediaType: string;
+
@ViewChild('flow', {static: true})
flow: FlowDirective;
@@ -180,6 +185,7 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
this.fileContent = files[0].fileContent;
this.fileName = files[0].fileName;
this.files = files[0].files;
+ this.mediaType = files[0].mediaType;
this.updateModel();
} else if (files.length > 1) {
this.fileContent = files.map(content => content.fileContent);
@@ -203,6 +209,7 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
let fileName = null;
let fileContent = null;
let files = null;
+ let mediaType = null;
if (reader.readyState === reader.DONE) {
if (!this.workFromFileObj) {
fileContent = reader.result;
@@ -211,16 +218,18 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
fileContent = this.contentConvertFunction(fileContent);
}
fileName = fileContent ? file.name : null;
+ mediaType = file?.file?.type || null;
}
} else if (file.name || file.file){
files = file.file;
fileName = file.name;
+ mediaType = file.file.type || null;
}
}
- resolve({fileContent, fileName, files});
+ resolve({fileContent, fileName, files, mediaType});
};
reader.onerror = () => {
- resolve({fileContent: null, fileName: null, files: null});
+ resolve({fileContent: null, fileName: null, files: null, mediaType: null});
};
if (this.readAsBinary) {
reader.readAsBinaryString(file.file);
@@ -283,6 +292,7 @@ export class FileInputComponent extends PageComponent implements AfterViewInit,
this.propagateChange(this.files);
} else {
this.propagateChange(this.fileContent);
+ this.mediaTypeChanged.emit(this.mediaType);
this.fileNameChanged.emit(this.fileName);
}
}
diff --git a/ui-ngx/src/app/shared/models/resource.models.ts b/ui-ngx/src/app/shared/models/resource.models.ts
index 3495bf9eac..12590e7608 100644
--- a/ui-ngx/src/app/shared/models/resource.models.ts
+++ b/ui-ngx/src/app/shared/models/resource.models.ts
@@ -25,7 +25,7 @@ export enum ResourceType {
PKCS_12 = 'PKCS_12',
JKS = 'JKS',
JS_MODULE = 'JS_MODULE',
- TEXT = 'TEXT',
+ GENERAL = 'GENERAL',
}
export enum ResourceSubType {
@@ -59,7 +59,7 @@ export const ResourceTypeTranslationMap = new Map(
[ResourceType.PKCS_12, 'resource.type.pkcs-12'],
[ResourceType.JKS, 'resource.type.jks'],
[ResourceType.JS_MODULE, 'resource.type.js-module'],
- [ResourceType.TEXT, 'resource.type.text'],
+ [ResourceType.GENERAL, 'resource.type.general'],
]
);
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index d4bfd4ea06..d79bb81ae5 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4489,7 +4489,7 @@
"js-module": "JS module",
"lwm2m-model": "LWM2M model",
"pkcs-12": "PKCS #12",
- "text": "Text"
+ "general": "General"
},
"resource-sub-type": "Sub-type",
"sub-type": {
From 8a561456b40fba456e0cac5649f0492e0b3b908a Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko
Date: Fri, 12 Sep 2025 16:23:53 +0300
Subject: [PATCH 23/31] UI: Add resources in use dialog with force to delete
---
.../resources-library-table-config.resolve.ts | 180 +++++++++++++++++-
.../assets/locale/locale.constant-en_US.json | 7 +-
2 files changed, 177 insertions(+), 10 deletions(-)
diff --git a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
index dc85ca4914..d92355fbac 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/resource/resources-library-table-config.resolve.ts
@@ -22,7 +22,13 @@ import {
EntityTableConfig
} from '@home/models/entity/entities-table-config.models';
import { Router } from '@angular/router';
-import { Resource, ResourceInfo, ResourceType, ResourceTypeTranslationMap } from '@shared/models/resource.models';
+import {
+ Resource,
+ ResourceInfo, ResourceInfoWithReferences,
+ ResourceType,
+ ResourceTypeTranslationMap,
+ toResourceDeleteResult
+} from '@shared/models/resource.models';
import { EntityType, entityTypeResources, entityTypeTranslations } from '@shared/models/entity-type.models';
import { NULL_UUID } from '@shared/models/id/has-uuid';
import { DatePipe } from '@angular/common';
@@ -35,9 +41,19 @@ import { Authority } from '@shared/models/authority.enum';
import { ResourcesLibraryComponent } from '@home/components/resources/resources-library.component';
import { PageLink } from '@shared/models/page/page-link';
import { EntityAction } from '@home/models/entity/entity-component.models';
-import { map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs/operators';
import { ResourcesTableHeaderComponent } from '@home/pages/admin/resource/resources-table-header.component';
import { ResourceLibraryTabsComponent } from '@home/pages/admin/resource/resource-library-tabs.component';
+import { forkJoin, of } from "rxjs";
+import {
+ ResourcesInUseDialogComponent,
+ ResourcesInUseDialogData
+} from "@shared/components/resource/resources-in-use-dialog.component";
+import { parseHttpErrorMessage } from "@core/utils";
+import { ActionNotificationShow } from "@core/notification/notification.actions";
+import { ResourcesDatasource } from "@home/pages/admin/resource/resources-datasource";
+import { MatDialog } from "@angular/material/dialog";
+import { DialogService } from "@core/services/dialog.service";
@Injectable()
export class ResourcesLibraryTableConfigResolver {
@@ -49,6 +65,8 @@ export class ResourcesLibraryTableConfigResolver {
private resourceService: ResourceService,
private translate: TranslateService,
private router: Router,
+ private dialog: MatDialog,
+ private dialogService: DialogService,
private datePipe: DatePipe) {
this.config.entityType = EntityType.TB_RESOURCE;
@@ -76,19 +94,27 @@ export class ResourcesLibraryTableConfigResolver {
icon: 'file_download',
isEnabled: () => true,
onAction: ($event, entity) => this.downloadResource($event, entity)
- }
+ },
+ {
+ name: this.translate.instant('resource.delete'),
+ icon: 'delete',
+ isEnabled: (resource) => this.config.deleteEnabled(resource),
+ onAction: ($event, entity) => this.deleteResource($event, entity)
+ },
);
- this.config.deleteEntityTitle = resource => this.translate.instant('resource.delete-resource-title',
- { resourceTitle: resource.title });
- this.config.deleteEntityContent = () => this.translate.instant('resource.delete-resource-text');
- this.config.deleteEntitiesTitle = count => this.translate.instant('resource.delete-resources-title', {count});
- this.config.deleteEntitiesContent = () => this.translate.instant('resource.delete-resources-text');
+ this.config.groupActionDescriptors = [{
+ name: this.translate.instant('action.delete'),
+ icon: 'delete',
+ isEnabled: true,
+ onAction: ($event, entities) => this.deleteResources($event, entities)
+ }];
+
+ this.config.entitiesDeleteEnabled = false;
this.config.entitiesFetchFunction = pageLink => this.resourceService.getResources(pageLink, this.config.componentsData.resourceType);
this.config.loadEntity = id => this.resourceService.getResourceInfoById(id.id);
this.config.saveEntity = resource => this.saveResource(resource);
- this.config.deleteEntity = id => this.resourceService.deleteResource(id.id);
this.config.onEntityAction = action => this.onResourceAction(action);
}
@@ -147,6 +173,8 @@ export class ResourcesLibraryTableConfigResolver {
case 'downloadResource':
this.downloadResource(action.event, action.entity);
return true;
+ case 'deleteLibrary':
+ this.deleteResource(action.event, action.entity);
}
return false;
}
@@ -165,4 +193,138 @@ export class ResourcesLibraryTableConfigResolver {
return authority === Authority.SYS_ADMIN;
}
}
+
+ private deleteResource($event: Event, resource: ResourceInfo) {
+ if ($event) {
+ $event.stopPropagation();
+ }
+ this.dialogService.confirm(
+ this.translate.instant('resource.delete-resource-title', { resourceTitle: resource.title }),
+ this.translate.instant('resource.delete-resource-text'),
+ this.translate.instant('action.no'),
+ this.translate.instant('action.yes'),
+ true
+ ).subscribe((result) => {
+ if (result) {
+ this.resourceService.deleteResource(resource.id.id, false, {ignoreErrors: true}).pipe(
+ map(() => toResourceDeleteResult(resource)),
+ catchError((err) => of(toResourceDeleteResult(resource, err)))
+ ).subscribe(
+ (deleteResult) => {
+ if (deleteResult.success) {
+ if (this.config.getEntityDetailsPage()) {
+ this.config.getEntityDetailsPage().goBack();
+ } else {
+ this.config.updateData(true);
+ }
+ } else if (deleteResult.resourceIsReferencedError) {
+ const resources: ResourceInfoWithReferences[] = [{...resource, ...{references: deleteResult.references}}];
+ const data = {
+ multiple: false,
+ resources,
+ configuration: {
+ title: 'resource.resource-is-in-use',
+ message: this.translate.instant('resource.resource-is-in-use-text', {title: resources[0].title}),
+ deleteText: 'resource.delete-resource-in-use-text',
+ selectedText: 'resource.selected-resources',
+ columns: ['select', 'title', 'references']
+ }
+ };
+ this.dialog.open(ResourcesInUseDialogComponent, {
+ disableClose: true,
+ panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
+ data
+ }).afterClosed().subscribe((resources) => {
+ if (resources) {
+ this.resourceService.deleteResource(resource.id.id, true).subscribe(() => {
+ if (this.config.getEntityDetailsPage()) {
+ this.config.getEntityDetailsPage().goBack();
+ } else {
+ this.config.updateData(true);
+ }
+ });
+ }
+ });
+ } else {
+ const errorMessageWithTimeout = parseHttpErrorMessage(deleteResult.error, this.translate);
+ setTimeout(() => {
+ this.store.dispatch(new ActionNotificationShow({message: errorMessageWithTimeout.message, type: 'error'}));
+ }, errorMessageWithTimeout.timeout);
+ }
+ }
+ );
+ }
+ });
+ }
+
+ private deleteResources($event: Event, resources: ResourceInfo[]) {
+ if ($event) {
+ $event.stopPropagation();
+ }
+ if (resources && resources.length) {
+ const title = this.translate.instant('resource.delete-resources-title', {count: resources.length});
+ const content = this.translate.instant('resource.delete-resources-text');
+ this.dialogService.confirm(title, content,
+ this.translate.instant('action.no'),
+ this.translate.instant('action.yes')).subscribe((result) => {
+ if (result) {
+ const tasks = resources.map((resource) =>
+ this.resourceService.deleteResource(resource.id.id, false, {ignoreErrors: true}).pipe(
+ map(() => toResourceDeleteResult(resource)),
+ catchError((err) => of(toResourceDeleteResult(resource, err)))
+ )
+ );
+ forkJoin(tasks).subscribe(
+ (deleteResults) => {
+ const anySuccess = deleteResults.some(res => res.success);
+ const referenceErrors = deleteResults.filter(res => res.resourceIsReferencedError);
+ const otherError = deleteResults.find(res => !res.success);
+ if (anySuccess) {
+ this.config.updateData();
+ }
+ if (referenceErrors?.length) {
+ const resourcesWithReferences: ResourceInfoWithReferences[] =
+ referenceErrors.map(ref => ({...ref.resource, ...{references: ref.references}}));
+ const data = {
+ multiple: true,
+ resources: resourcesWithReferences,
+ configuration: {
+ title: 'resource.resources-are-in-use',
+ message: this.translate.instant('resource.resources-are-in-use-text'),
+ deleteText: 'resource.delete-resource-in-use-text',
+ selectedText: 'resource.selected-resources',
+ datasource: new ResourcesDatasource(this.resourceService, resourcesWithReferences, () => true),
+ columns: ['select', 'title', 'references']
+ }
+ };
+ this.dialog.open(ResourcesInUseDialogComponent, {
+ disableClose: true,
+ panelClass: ['tb-dialog', 'tb-fullscreen-dialog'],
+ data
+ }).afterClosed().subscribe((forceDeleteResources) => {
+ if (forceDeleteResources && forceDeleteResources.length) {
+ const forceDeleteTasks = forceDeleteResources.map((resource) =>
+ this.resourceService.deleteResource(resource.id.id, true)
+ );
+ forkJoin(forceDeleteTasks).subscribe(
+ () => {
+ this.config.updateData();
+ }
+ );
+ }
+ });
+ } else if (otherError) {
+ const errorMessageWithTimeout = parseHttpErrorMessage(otherError.error, this.translate);
+ setTimeout(() => {
+ this.store.dispatch(new ActionNotificationShow({message: errorMessageWithTimeout.message, type: 'error'}));
+ }, errorMessageWithTimeout.timeout);
+ }
+ }
+ );
+ }
+ });
+ }
+ }
}
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index d79bb81ae5..4639552658 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -4497,7 +4497,12 @@
"scada-symbol": "Scada symbol",
"extension": "Extension",
"module": "Module"
- }
+ },
+ "resource-is-in-use": "Resource is used by other entities",
+ "resources-are-in-use": "Resources are used by other entities",
+ "resource-is-in-use-text": "The Resource '{{title}}' was not deleted because it is used by the following entities:",
+ "resources-are-in-use-text": "Not all Resources have been deleted because they are used by other entities.You can view referenced entities by clicking the References button in the corresponding resource row.If you still want to delete these resources, select them in the table below and click the Delete selected button.",
+ "delete-resource-in-use-text": "If you still want to delete the resource, click the Delete anyway button."
},
"javascript": {
"add": "Add JavaScript resource",
From e88114de720bf8171500fa0031cea84b0e7f64a3 Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko
Date: Fri, 12 Sep 2025 16:46:38 +0300
Subject: [PATCH 24/31] UI: oprimize import
---
ui-ngx/src/app/core/http/resource.service.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/ui-ngx/src/app/core/http/resource.service.ts b/ui-ngx/src/app/core/http/resource.service.ts
index 90335758dd..168c63b3b1 100644
--- a/ui-ngx/src/app/core/http/resource.service.ts
+++ b/ui-ngx/src/app/core/http/resource.service.ts
@@ -24,7 +24,6 @@ import { Resource, ResourceInfo, ResourceSubType, ResourceType, TBResourceScope
import { catchError, mergeMap } from 'rxjs/operators';
import { isNotEmptyStr } from '@core/utils';
import { ResourcesService } from '@core/services/resources.service';
-import { NotificationTarget } from "@shared/models/notification.models";
@Injectable({
providedIn: 'root'
From 5c7f20a1514124cafbd9f26f6a94adc0fac516b5 Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets
Date: Mon, 15 Sep 2025 17:32:57 +0300
Subject: [PATCH 25/31] AI models: add support for Ollama
---
application/pom.xml | 4 ++
.../Langchain4jChatModelConfigurerImpl.java | 16 ++++++
.../common/data/ai/dto/TbChatResponse.java | 6 +-
.../common/data/ai/model/AiModelConfig.java | 8 ++-
.../data/ai/model/chat/AiChatModelConfig.java | 2 +-
.../chat/Langchain4jChatModelConfigurer.java | 2 +
.../ai/model/chat/OllamaChatModelConfig.java | 57 +++++++++++++++++++
.../common/data/ai/provider/AiProvider.java | 3 +-
.../data/ai/provider/AiProviderConfig.java | 2 +-
.../ai/provider/OllamaProviderConfig.java | 22 +++++++
.../rule/engine/ai/TbResponseFormat.java | 8 +--
.../ai-model/ai-model-dialog.component.html | 9 +++
.../ai-model/ai-model-dialog.component.ts | 1 +
.../src/app/shared/models/ai-model.models.ts | 21 +++++--
.../assets/locale/locale.constant-en_US.json | 5 +-
15 files changed, 146 insertions(+), 20 deletions(-)
create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OllamaChatModelConfig.java
create mode 100644 common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java
diff --git a/application/pom.xml b/application/pom.xml
index 33bc0972d4..0413f7732c 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -419,6 +419,10 @@
+
+ dev.langchain4j
+ langchain4j-ollama
+
diff --git a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
index 69dd98f47f..7008e866f4 100644
--- a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
@@ -32,6 +32,7 @@ import dev.langchain4j.model.chat.request.ChatRequestParameters;
import dev.langchain4j.model.github.GitHubModelsChatModel;
import dev.langchain4j.model.googleai.GoogleAiGeminiChatModel;
import dev.langchain4j.model.mistralai.MistralAiChatModel;
+import dev.langchain4j.model.ollama.OllamaChatModel;
import dev.langchain4j.model.openai.OpenAiChatModel;
import dev.langchain4j.model.vertexai.gemini.VertexAiGeminiChatModel;
import org.springframework.stereotype.Component;
@@ -43,6 +44,7 @@ import org.thingsboard.server.common.data.ai.model.chat.GoogleAiGeminiChatModelC
import org.thingsboard.server.common.data.ai.model.chat.GoogleVertexAiGeminiChatModelConfig;
import org.thingsboard.server.common.data.ai.model.chat.Langchain4jChatModelConfigurer;
import org.thingsboard.server.common.data.ai.model.chat.MistralAiChatModelConfig;
+import org.thingsboard.server.common.data.ai.model.chat.OllamaChatModelConfig;
import org.thingsboard.server.common.data.ai.model.chat.OpenAiChatModelConfig;
import org.thingsboard.server.common.data.ai.provider.AmazonBedrockProviderConfig;
import org.thingsboard.server.common.data.ai.provider.AzureOpenAiProviderConfig;
@@ -262,6 +264,20 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.build();
}
+ @Override
+ public ChatModel configureChatModel(OllamaChatModelConfig chatModelConfig) {
+ return OllamaChatModel.builder()
+ .baseUrl(chatModelConfig.providerConfig().baseUrl())
+ .modelName(chatModelConfig.modelId())
+ .temperature(chatModelConfig.temperature())
+ .topP(chatModelConfig.topP())
+ .topK(chatModelConfig.topK())
+ .numPredict(chatModelConfig.maxOutputTokens())
+ .timeout(toDuration(chatModelConfig.timeoutSeconds()))
+ .maxRetries(chatModelConfig.maxRetries())
+ .build();
+ }
+
private static Duration toDuration(Integer timeoutSeconds) {
return timeoutSeconds != null ? Duration.ofSeconds(timeoutSeconds) : null;
}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/dto/TbChatResponse.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/dto/TbChatResponse.java
index 2cc17e4553..73e6557fb5 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/dto/TbChatResponse.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/dto/TbChatResponse.java
@@ -22,7 +22,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
@JsonTypeInfo(
use = JsonTypeInfo.Id.NAME,
property = "status",
- include = JsonTypeInfo.As.PROPERTY,
+ include = JsonTypeInfo.As.EXISTING_PROPERTY,
visible = true
)
@JsonSubTypes({
@@ -51,9 +51,7 @@ public sealed interface TbChatResponse permits TbChatResponse.Success, TbChatRes
}
record Failure(
- @Schema(
- description = "A string containing details about the failure"
- )
+ @Schema(description = "A string containing details about the failure")
String errorDetails
) implements TbChatResponse {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/AiModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/AiModelConfig.java
index bfaa29a6e3..f18429e7cf 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/AiModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/AiModelConfig.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.ai.model.chat.GitHubModelsChatModelCon
import org.thingsboard.server.common.data.ai.model.chat.GoogleAiGeminiChatModelConfig;
import org.thingsboard.server.common.data.ai.model.chat.GoogleVertexAiGeminiChatModelConfig;
import org.thingsboard.server.common.data.ai.model.chat.MistralAiChatModelConfig;
+import org.thingsboard.server.common.data.ai.model.chat.OllamaChatModelConfig;
import org.thingsboard.server.common.data.ai.model.chat.OpenAiChatModelConfig;
import org.thingsboard.server.common.data.ai.provider.AiProvider;
import org.thingsboard.server.common.data.ai.provider.AiProviderConfig;
@@ -34,6 +35,7 @@ import org.thingsboard.server.common.data.ai.provider.GitHubModelsProviderConfig
import org.thingsboard.server.common.data.ai.provider.GoogleAiGeminiProviderConfig;
import org.thingsboard.server.common.data.ai.provider.GoogleVertexAiGeminiProviderConfig;
import org.thingsboard.server.common.data.ai.provider.MistralAiProviderConfig;
+import org.thingsboard.server.common.data.ai.provider.OllamaProviderConfig;
import org.thingsboard.server.common.data.ai.provider.OpenAiProviderConfig;
@JsonTypeInfo(
@@ -50,7 +52,8 @@ import org.thingsboard.server.common.data.ai.provider.OpenAiProviderConfig;
@JsonSubTypes.Type(value = MistralAiChatModelConfig.class, name = "MISTRAL_AI"),
@JsonSubTypes.Type(value = AnthropicChatModelConfig.class, name = "ANTHROPIC"),
@JsonSubTypes.Type(value = AmazonBedrockChatModelConfig.class, name = "AMAZON_BEDROCK"),
- @JsonSubTypes.Type(value = GitHubModelsChatModelConfig.class, name = "GITHUB_MODELS")
+ @JsonSubTypes.Type(value = GitHubModelsChatModelConfig.class, name = "GITHUB_MODELS"),
+ @JsonSubTypes.Type(value = OllamaChatModelConfig.class, name = "OLLAMA")
})
public interface AiModelConfig {
@@ -69,7 +72,8 @@ public interface AiModelConfig {
@JsonSubTypes.Type(value = MistralAiProviderConfig.class, name = "MISTRAL_AI"),
@JsonSubTypes.Type(value = AnthropicProviderConfig.class, name = "ANTHROPIC"),
@JsonSubTypes.Type(value = AmazonBedrockProviderConfig.class, name = "AMAZON_BEDROCK"),
- @JsonSubTypes.Type(value = GitHubModelsProviderConfig.class, name = "GITHUB_MODELS")
+ @JsonSubTypes.Type(value = GitHubModelsProviderConfig.class, name = "GITHUB_MODELS"),
+ @JsonSubTypes.Type(value = OllamaProviderConfig.class, name = "OLLAMA")
})
AiProviderConfig providerConfig();
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AiChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AiChatModelConfig.java
index 2bc28cfce0..49126c1861 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AiChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AiChatModelConfig.java
@@ -24,7 +24,7 @@ public sealed interface AiChatModelConfig> extend
permits
OpenAiChatModelConfig, AzureOpenAiChatModelConfig, GoogleAiGeminiChatModelConfig,
GoogleVertexAiGeminiChatModelConfig, MistralAiChatModelConfig, AnthropicChatModelConfig,
- AmazonBedrockChatModelConfig, GitHubModelsChatModelConfig {
+ AmazonBedrockChatModelConfig, GitHubModelsChatModelConfig, OllamaChatModelConfig {
ChatModel configure(Langchain4jChatModelConfigurer configurer);
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/Langchain4jChatModelConfigurer.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/Langchain4jChatModelConfigurer.java
index c9c1bc3173..828256dcdc 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/Langchain4jChatModelConfigurer.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/Langchain4jChatModelConfigurer.java
@@ -35,4 +35,6 @@ public interface Langchain4jChatModelConfigurer {
ChatModel configureChatModel(GitHubModelsChatModelConfig chatModelConfig);
+ ChatModel configureChatModel(OllamaChatModelConfig chatModelConfig);
+
}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OllamaChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OllamaChatModelConfig.java
new file mode 100644
index 0000000000..360b514d6d
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OllamaChatModelConfig.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright © 2016-2025 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.ai.model.chat;
+
+import dev.langchain4j.model.chat.ChatModel;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import jakarta.validation.constraints.PositiveOrZero;
+import lombok.Builder;
+import lombok.With;
+import org.thingsboard.server.common.data.ai.provider.AiProvider;
+import org.thingsboard.server.common.data.ai.provider.OllamaProviderConfig;
+
+@Builder
+public record OllamaChatModelConfig(
+ @NotNull @Valid OllamaProviderConfig providerConfig,
+ @NotBlank String modelId,
+ @PositiveOrZero Double temperature,
+ @Positive @Max(1) Double topP,
+ @PositiveOrZero Integer topK,
+ @Positive Integer maxOutputTokens,
+ @With @Positive Integer timeoutSeconds,
+ @With @PositiveOrZero Integer maxRetries
+) implements AiChatModelConfig {
+
+ @Override
+ public AiProvider provider() {
+ return AiProvider.OLLAMA;
+ }
+
+ @Override
+ public ChatModel configure(Langchain4jChatModelConfigurer configurer) {
+ return configurer.configureChatModel(this);
+ }
+
+ @Override
+ public boolean supportsJsonMode() {
+ return true;
+ }
+
+}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProvider.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProvider.java
index d0a5bd0510..a9a6af4de8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProvider.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProvider.java
@@ -24,6 +24,7 @@ public enum AiProvider {
MISTRAL_AI,
ANTHROPIC,
AMAZON_BEDROCK,
- GITHUB_MODELS
+ GITHUB_MODELS,
+ OLLAMA
}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProviderConfig.java
index bd32c88efb..5423b24410 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/AiProviderConfig.java
@@ -19,4 +19,4 @@ public sealed interface AiProviderConfig
permits
OpenAiProviderConfig, AzureOpenAiProviderConfig, GoogleAiGeminiProviderConfig,
GoogleVertexAiGeminiProviderConfig, MistralAiProviderConfig, AnthropicProviderConfig,
- AmazonBedrockProviderConfig, GitHubModelsProviderConfig {}
+ AmazonBedrockProviderConfig, GitHubModelsProviderConfig, OllamaProviderConfig {}
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java
new file mode 100644
index 0000000000..fc0a2d6fd8
--- /dev/null
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright © 2016-2025 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.common.data.ai.provider;
+
+import jakarta.validation.constraints.NotBlank;
+
+public record OllamaProviderConfig(
+ @NotBlank String baseUrl
+) implements AiProviderConfig {}
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/TbResponseFormat.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/TbResponseFormat.java
index 5c891a9c74..5107e613a4 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/TbResponseFormat.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/ai/TbResponseFormat.java
@@ -60,9 +60,7 @@ public sealed interface TbResponseFormat permits TbTextResponseFormat, TbJsonRes
@Override
public ResponseFormat toLangChainResponseFormat() {
- return ResponseFormat.builder()
- .type(ResponseFormatType.TEXT)
- .build();
+ return ResponseFormat.TEXT;
}
}
@@ -76,9 +74,7 @@ public sealed interface TbResponseFormat permits TbTextResponseFormat, TbJsonRes
@Override
public ResponseFormat toLangChainResponseFormat() {
- return ResponseFormat.builder()
- .type(ResponseFormatType.JSON)
- .build();
+ return ResponseFormat.JSON;
}
}
diff --git a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
index 5f9c189399..1a3c2bf181 100644
--- a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
@@ -150,6 +150,15 @@
}
+ @if (providerFieldsList.includes('baseUrl')) {
+
+ ai-models.baseurl
+
+
+ {{ 'ai-models.baseurl-required' | translate }}
+
+
+ }
diff --git a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts
index c459d66f12..e6490cd84d 100644
--- a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts
@@ -100,6 +100,7 @@ export class AIModelDialogComponent extends DialogComponent, 'label'>, HasTenantId
region?: string;
accessKeyId?: string;
secretAccessKey?: string;
+ baseUrl?: string;
};
modelId: string;
temperature?: number;
@@ -57,7 +58,8 @@ export enum AiProvider {
MISTRAL_AI = 'MISTRAL_AI',
ANTHROPIC = 'ANTHROPIC',
AMAZON_BEDROCK = 'AMAZON_BEDROCK',
- GITHUB_MODELS = 'GITHUB_MODELS'
+ GITHUB_MODELS = 'GITHUB_MODELS',
+ OLLAMA = 'OLLAMA'
}
export const AiProviderTranslations = new Map(
@@ -69,7 +71,8 @@ export const AiProviderTranslations = new Map(
[AiProvider.MISTRAL_AI , 'ai-models.ai-providers.mistral-ai'],
[AiProvider.ANTHROPIC , 'ai-models.ai-providers.anthropic'],
[AiProvider.AMAZON_BEDROCK , 'ai-models.ai-providers.amazon-bedrock'],
- [AiProvider.GITHUB_MODELS , 'ai-models.ai-providers.github-models']
+ [AiProvider.GITHUB_MODELS , 'ai-models.ai-providers.github-models'],
+ [AiProvider.OLLAMA , 'ai-models.ai-providers.ollama']
]
);
@@ -84,7 +87,8 @@ export const ProviderFieldsAllList = [
'serviceVersion',
'region',
'accessKeyId',
- 'secretAccessKey'
+ 'secretAccessKey',
+ 'baseUrl'
];
export const ModelFieldsAllList = ['temperature', 'topP', 'topK', 'frequencyPenalty', 'presencePenalty', 'maxOutputTokens'];
@@ -191,6 +195,14 @@ export const AiModelMap = new Map
Date: Tue, 16 Sep 2025 14:41:38 +0300
Subject: [PATCH 26/31] AI models: add context length support for Ollama
---
.../Langchain4jChatModelConfigurerImpl.java | 1 +
.../chat/AmazonBedrockChatModelConfig.java | 2 +-
.../model/chat/AnthropicChatModelConfig.java | 2 +-
.../chat/AzureOpenAiChatModelConfig.java | 2 +-
.../chat/GitHubModelsChatModelConfig.java | 2 +-
.../chat/GoogleAiGeminiChatModelConfig.java | 2 +-
.../GoogleVertexAiGeminiChatModelConfig.java | 2 +-
.../model/chat/MistralAiChatModelConfig.java | 2 +-
.../ai/model/chat/OllamaChatModelConfig.java | 3 ++-
.../ai/model/chat/OpenAiChatModelConfig.java | 2 +-
.../ai-model/ai-model-dialog.component.html | 23 +++++++++++--------
.../ai-model/ai-model-dialog.component.ts | 3 ++-
.../src/app/shared/models/ai-model.models.ts | 5 ++--
.../assets/locale/locale.constant-en_US.json | 3 ++-
14 files changed, 31 insertions(+), 23 deletions(-)
diff --git a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
index 7008e866f4..84b09b9188 100644
--- a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
@@ -272,6 +272,7 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.temperature(chatModelConfig.temperature())
.topP(chatModelConfig.topP())
.topK(chatModelConfig.topK())
+ .numCtx(chatModelConfig.contextLength())
.numPredict(chatModelConfig.maxOutputTokens())
.timeout(toDuration(chatModelConfig.timeoutSeconds()))
.maxRetries(chatModelConfig.maxRetries())
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AmazonBedrockChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AmazonBedrockChatModelConfig.java
index 2bb4de5aa8..d2ab72086a 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AmazonBedrockChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AmazonBedrockChatModelConfig.java
@@ -33,7 +33,7 @@ public record AmazonBedrockChatModelConfig(
@NotBlank String modelId,
@PositiveOrZero Double temperature,
@Positive @Max(1) Double topP,
- @Positive Integer maxOutputTokens,
+ Integer maxOutputTokens,
@With @Positive Integer timeoutSeconds,
@With @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AnthropicChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AnthropicChatModelConfig.java
index 69b5578fb3..6d505f75a6 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AnthropicChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AnthropicChatModelConfig.java
@@ -34,7 +34,7 @@ public record AnthropicChatModelConfig(
@PositiveOrZero Double temperature,
@Positive @Max(1) Double topP,
@PositiveOrZero Integer topK,
- @Positive Integer maxOutputTokens,
+ Integer maxOutputTokens,
@With @Positive Integer timeoutSeconds,
@With @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AzureOpenAiChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AzureOpenAiChatModelConfig.java
index 47e7e96c37..f70f2af539 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AzureOpenAiChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AzureOpenAiChatModelConfig.java
@@ -35,7 +35,7 @@ public record AzureOpenAiChatModelConfig(
@Positive @Max(1) Double topP,
Double frequencyPenalty,
Double presencePenalty,
- @Positive Integer maxOutputTokens,
+ Integer maxOutputTokens,
@With @Positive Integer timeoutSeconds,
@With @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GitHubModelsChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GitHubModelsChatModelConfig.java
index b509254f77..0aafd72197 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GitHubModelsChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GitHubModelsChatModelConfig.java
@@ -35,7 +35,7 @@ public record GitHubModelsChatModelConfig(
@Positive @Max(1) Double topP,
Double frequencyPenalty,
Double presencePenalty,
- @Positive Integer maxOutputTokens,
+ Integer maxOutputTokens,
@With @Positive Integer timeoutSeconds,
@With @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleAiGeminiChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleAiGeminiChatModelConfig.java
index fe11a11460..b5c3d4263d 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleAiGeminiChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleAiGeminiChatModelConfig.java
@@ -36,7 +36,7 @@ public record GoogleAiGeminiChatModelConfig(
@PositiveOrZero Integer topK,
Double frequencyPenalty,
Double presencePenalty,
- @Positive Integer maxOutputTokens,
+ Integer maxOutputTokens,
@With @Positive Integer timeoutSeconds,
@With @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleVertexAiGeminiChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleVertexAiGeminiChatModelConfig.java
index 609e14f86e..944963ee27 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleVertexAiGeminiChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/GoogleVertexAiGeminiChatModelConfig.java
@@ -36,7 +36,7 @@ public record GoogleVertexAiGeminiChatModelConfig(
@PositiveOrZero Integer topK,
Double frequencyPenalty,
Double presencePenalty,
- @Positive Integer maxOutputTokens,
+ Integer maxOutputTokens,
@With @Positive Integer timeoutSeconds,
@With @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/MistralAiChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/MistralAiChatModelConfig.java
index f603e99c53..8f67d93398 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/MistralAiChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/MistralAiChatModelConfig.java
@@ -35,7 +35,7 @@ public record MistralAiChatModelConfig(
@Positive @Max(1) Double topP,
Double frequencyPenalty,
Double presencePenalty,
- @Positive Integer maxOutputTokens,
+ Integer maxOutputTokens,
@With @Positive Integer timeoutSeconds,
@With @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OllamaChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OllamaChatModelConfig.java
index 360b514d6d..ea48670b63 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OllamaChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OllamaChatModelConfig.java
@@ -34,7 +34,8 @@ public record OllamaChatModelConfig(
@PositiveOrZero Double temperature,
@Positive @Max(1) Double topP,
@PositiveOrZero Integer topK,
- @Positive Integer maxOutputTokens,
+ Integer contextLength,
+ Integer maxOutputTokens,
@With @Positive Integer timeoutSeconds,
@With @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OpenAiChatModelConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OpenAiChatModelConfig.java
index 00b5115d7d..23db9accc2 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OpenAiChatModelConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OpenAiChatModelConfig.java
@@ -35,7 +35,7 @@ public record OpenAiChatModelConfig(
@Positive @Max(1) Double topP,
Double frequencyPenalty,
Double presencePenalty,
- @Positive Integer maxOutputTokens,
+ Integer maxOutputTokens,
@With @Positive Integer timeoutSeconds,
@With @PositiveOrZero Integer maxRetries
) implements AiChatModelConfig {
diff --git a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
index 1a3c2bf181..c730850474 100644
--- a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
@@ -151,7 +151,7 @@
}
@if (providerFieldsList.includes('baseUrl')) {
-
+
ai-models.baseurl
@@ -264,15 +264,18 @@
-
- warning
-
+ type="number" step="1" placeholder="{{ 'ai-models.set' | translate }}">
+
+
+ }
+ @if (modelFieldsList.includes('contextLength')) {
+
}
diff --git a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts
index e6490cd84d..3294c6ac76 100644
--- a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.ts
@@ -108,7 +108,8 @@ export class AIModelDialogComponent extends DialogComponent, 'label'>, HasTenantId
frequencyPenalty?: number;
presencePenalty?: number;
maxOutputTokens?: number;
+ contextLength?: number;
}
}
@@ -91,7 +92,7 @@ export const ProviderFieldsAllList = [
'baseUrl'
];
-export const ModelFieldsAllList = ['temperature', 'topP', 'topK', 'frequencyPenalty', 'presencePenalty', 'maxOutputTokens'];
+export const ModelFieldsAllList = ['temperature', 'topP', 'topK', 'frequencyPenalty', 'presencePenalty', 'maxOutputTokens', 'contextLength'];
export const AiModelMap = new Map([
[
@@ -200,7 +201,7 @@ export const AiModelMap = new Map
Date: Mon, 22 Sep 2025 12:18:06 +0300
Subject: [PATCH 27/31] AI models: add auth support for Ollama
---
.../Langchain4jChatModelConfigurerImpl.java | 28 +++++++++++++---
.../ai/provider/OllamaProviderConfig.java | 32 +++++++++++++++++--
2 files changed, 53 insertions(+), 7 deletions(-)
diff --git a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
index 84b09b9188..2cb6c2097f 100644
--- a/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/ai/Langchain4jChatModelConfigurerImpl.java
@@ -35,6 +35,7 @@ import dev.langchain4j.model.mistralai.MistralAiChatModel;
import dev.langchain4j.model.ollama.OllamaChatModel;
import dev.langchain4j.model.openai.OpenAiChatModel;
import dev.langchain4j.model.vertexai.gemini.VertexAiGeminiChatModel;
+import org.springframework.http.HttpHeaders;
import org.springframework.stereotype.Component;
import org.thingsboard.server.common.data.ai.model.chat.AmazonBedrockChatModelConfig;
import org.thingsboard.server.common.data.ai.model.chat.AnthropicChatModelConfig;
@@ -49,6 +50,7 @@ import org.thingsboard.server.common.data.ai.model.chat.OpenAiChatModelConfig;
import org.thingsboard.server.common.data.ai.provider.AmazonBedrockProviderConfig;
import org.thingsboard.server.common.data.ai.provider.AzureOpenAiProviderConfig;
import org.thingsboard.server.common.data.ai.provider.GoogleVertexAiGeminiProviderConfig;
+import org.thingsboard.server.common.data.ai.provider.OllamaProviderConfig;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.regions.Region;
@@ -56,7 +58,11 @@ import software.amazon.awssdk.services.bedrockruntime.BedrockRuntimeClient;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.time.Duration;
+import java.util.Base64;
+
+import static java.util.Collections.singletonMap;
@Component
class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigurer {
@@ -136,7 +142,7 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
// set request timeout from model config
if (chatModelConfig.timeoutSeconds() != null) {
- retrySettings.setTotalTimeout(org.threeten.bp.Duration.ofSeconds(chatModelConfig.timeoutSeconds()));
+ retrySettings.setTotalTimeoutDuration(Duration.ofSeconds(chatModelConfig.timeoutSeconds()));
}
// set updated retry settings
@@ -266,7 +272,7 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
@Override
public ChatModel configureChatModel(OllamaChatModelConfig chatModelConfig) {
- return OllamaChatModel.builder()
+ var builder = OllamaChatModel.builder()
.baseUrl(chatModelConfig.providerConfig().baseUrl())
.modelName(chatModelConfig.modelId())
.temperature(chatModelConfig.temperature())
@@ -275,8 +281,22 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
.numCtx(chatModelConfig.contextLength())
.numPredict(chatModelConfig.maxOutputTokens())
.timeout(toDuration(chatModelConfig.timeoutSeconds()))
- .maxRetries(chatModelConfig.maxRetries())
- .build();
+ .maxRetries(chatModelConfig.maxRetries());
+
+ var auth = chatModelConfig.providerConfig().auth();
+ if (auth instanceof OllamaProviderConfig.OllamaAuth.Basic basicAuth) {
+ String credentials = basicAuth.username() + ":" + basicAuth.password();
+ String encodedCredentials = Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.UTF_8));
+ builder.customHeaders(singletonMap(HttpHeaders.AUTHORIZATION, "Basic " + encodedCredentials));
+ } else if (auth instanceof OllamaProviderConfig.OllamaAuth.Token tokenAuth) {
+ builder.customHeaders(singletonMap(HttpHeaders.AUTHORIZATION, "Bearer " + tokenAuth.token()));
+ } else if (auth instanceof OllamaProviderConfig.OllamaAuth.None) {
+ // do nothing
+ } else {
+ throw new UnsupportedOperationException("Unknown authentication type: " + auth.getClass().getSimpleName());
+ }
+
+ return builder.build();
}
private static Duration toDuration(Integer timeoutSeconds) {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java
index fc0a2d6fd8..39bb57834c 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java
@@ -15,8 +15,34 @@
*/
package org.thingsboard.server.common.data.ai.provider;
-import jakarta.validation.constraints.NotBlank;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
public record OllamaProviderConfig(
- @NotBlank String baseUrl
-) implements AiProviderConfig {}
+ @NotNull String baseUrl,
+ @NotNull @Valid OllamaAuth auth
+) implements AiProviderConfig {
+
+ @JsonTypeInfo(
+ use = JsonTypeInfo.Id.NAME,
+ include = JsonTypeInfo.As.PROPERTY,
+ property = "type"
+ )
+ @JsonSubTypes({
+ @JsonSubTypes.Type(value = OllamaAuth.None.class, name = "NONE"),
+ @JsonSubTypes.Type(value = OllamaAuth.Basic.class, name = "BASIC"),
+ @JsonSubTypes.Type(value = OllamaAuth.Token.class, name = "TOKEN")
+ })
+ public sealed interface OllamaAuth {
+
+ record None() implements OllamaAuth {}
+
+ record Basic(@NotNull String username, @NotNull String password) implements OllamaAuth {}
+
+ record Token(@NotNull String token) implements OllamaAuth {}
+
+ }
+
+}
From 8a6015f04e7b2b4471f9d801517c9e40da6ef0d3 Mon Sep 17 00:00:00 2001
From: ArtemDzhereleiko
Date: Thu, 25 Sep 2025 15:44:50 +0300
Subject: [PATCH 28/31] UI: Add authentication for Ollama model
---
.../ai-model/ai-model-dialog.component.html | 87 +++++++++++++++----
.../ai-model/ai-model-dialog.component.ts | 67 +++++++++++---
.../src/app/shared/models/ai-model.models.ts | 11 +++
.../assets/locale/locale.constant-en_US.json | 16 +++-
4 files changed, 153 insertions(+), 28 deletions(-)
diff --git a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
index c730850474..abfe8500b4 100644
--- a/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
+++ b/ui-ngx/src/app/modules/home/components/ai-model/ai-model-dialog.component.html
@@ -55,31 +55,34 @@
-
-
- {{ 'legend.show-total' | translate }}
-
+
+
+ {{ 'legend.show-total' | translate }}
+
+
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts
index 036ba70c04..3f76eb18cf 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/bar-chart-widget.models.ts
@@ -68,6 +68,7 @@ export const barChartWidgetBarsChartSettings = (settings: BarChartWidgetSettings
showTotal: false,
animation: settings.animation,
showLegend: settings.showLegend,
+ legendShowTotal: settings.legendShowTotal,
showTooltip: settings.showTooltip,
tooltipValueType: settings.tooltipValueType,
tooltipValueDecimals: settings.tooltipValueDecimals,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts
index 0d8c1ba9fa..0ef277ea8b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/doughnut-widget.models.ts
@@ -88,6 +88,7 @@ export const doughnutPieChartSettings = (settings: DoughnutWidgetSettings): Deep
showTotal: settings.layout === DoughnutLayout.with_total,
animation: settings.animation,
showLegend: settings.showLegend,
+ legendShowTotal: settings.legendShowTotal,
totalValueFont: settings.totalValueFont,
totalValueColor: settings.totalValueColor,
showLabel: false,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.ts
index 80be75d98d..85905dfd3e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.component.ts
@@ -82,8 +82,7 @@ export class LatestChartComponent implements OnInit, OnDestroy, AfterViewInit {
padding: string;
get legendItems(): LatestChartLegendItem[] {
- let items = this.latestChart ? this.latestChart.getLegendItems() : [];
- return this.legendShowTotal ? items : items.filter(item => !item.total);
+ return this.latestChart ? this.latestChart.getLegendItems() : [];
}
legendLabelStyle: ComponentStyle;
@@ -93,7 +92,6 @@ export class LatestChartComponent implements OnInit, OnDestroy, AfterViewInit {
private shapeResize$: ResizeObserver;
private legendHorizontal: boolean;
- private legendShowTotal: boolean;
private latestChart: TbLatestChart;
@@ -121,7 +119,6 @@ export class LatestChartComponent implements OnInit, OnDestroy, AfterViewInit {
this.legendValueStyle = textStyle(this.settings.legendValueFont);
this.disabledLegendValueStyle = textStyle(this.settings.legendValueFont);
this.legendValueStyle.color = this.settings.legendValueColor;
- this.legendShowTotal = this.settings.legendShowTotal;
}
}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts
index 639938bad6..aa1ac43644 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.models.ts
@@ -87,6 +87,7 @@ export interface LatestChartSettings extends LatestChartTooltipSettings {
sortSeries: boolean;
showTotal?: boolean;
showLegend: boolean;
+ legendShowTotal: boolean;
animation: ChartAnimationSettings;
}
@@ -96,6 +97,7 @@ export const latestChartDefaultSettings: LatestChartSettings = {
sortSeries: false,
showTotal: false,
showLegend: true,
+ legendShowTotal: true,
animation: mergeDeep({} as ChartAnimationSettings, chartAnimationDefaultSettings)
};
@@ -105,14 +107,12 @@ export interface LatestChartWidgetSettings extends LatestChartSettings {
legendLabelColor: string;
legendValueFont: Font;
legendValueColor: string;
- legendShowTotal: boolean;
background: BackgroundSettings;
padding: string;
}
export const latestChartWidgetDefaultSettings: LatestChartWidgetSettings = {
...latestChartDefaultSettings,
- showLegend: true,
legendPosition: LegendPosition.bottom,
legendLabelFont: {
family: 'Roboto',
@@ -132,7 +132,6 @@ export const latestChartWidgetDefaultSettings: LatestChartWidgetSettings = {
lineHeight: '20px'
},
legendValueColor: 'rgba(0, 0, 0, 0.87)',
- legendShowTotal: true,
background: {
type: BackgroundType.color,
color: '#fff',
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.ts
index b9f0940b52..9e525cd794 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/latest-chart.ts
@@ -36,6 +36,7 @@ import { ValueFormatProcessor } from '@shared/models/widget-settings.models';
export abstract class TbLatestChart {
private readonly shapeResize$: ResizeObserver;
+ private showTotalValueInLegend: boolean;
protected readonly settings: S;
@@ -121,7 +122,8 @@ export abstract class TbLatestChart {
this.legendItems.sort((a, b) => a.label.localeCompare(b.label));
}
}
- if (this.settings.showLegend && !this.settings.showTotal) {
+ this.showTotalValueInLegend = this.settings.showLegend && !this.settings.showTotal && this.settings.legendShowTotal;
+ if (this.showTotalValueInLegend) {
this.legendItems.push(
{
value: '--',
@@ -252,11 +254,11 @@ export abstract class TbLatestChart {
if (this.settings.showTotal || this.settings.showLegend) {
if (hasValue) {
this.totalText = this.valueFormatter.format(this.total);
- if (this.settings.showLegend && !this.settings.showTotal) {
+ if (this.showTotalValueInLegend) {
this.legendItems[this.legendItems.length - 1].hasValue = true;
this.legendItems[this.legendItems.length - 1].value = this.totalText;
}
- } else if (this.settings.showLegend && !this.settings.showTotal) {
+ } else if (this.showTotalValueInLegend) {
this.legendItems[this.legendItems.length - 1].hasValue = false;
this.legendItems[this.legendItems.length - 1].value = '--';
}
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts
index a98cdfdd4a..cddf75b9f9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/pie-chart-widget.models.ts
@@ -64,6 +64,7 @@ export const pieChartWidgetPieChartSettings = (settings: PieChartWidgetSettings)
showTotal: false,
animation: settings.animation,
showLegend: settings.showLegend,
+ legendShowTotal: settings.legendShowTotal,
showLabel: settings.showLabel,
labelPosition: settings.labelPosition,
labelFont: settings.labelFont,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts
index 70b4520159..4b744ce9c3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/polar-area-widget.models.ts
@@ -72,6 +72,7 @@ export const polarAreaChartWidgetBarsChartSettings = (settings: PolarAreaChartWi
showTotal: false,
animation: settings.animation,
showLegend: settings.showLegend,
+ legendShowTotal: settings.legendShowTotal,
showTooltip: settings.showTooltip,
tooltipValueType: settings.tooltipValueType,
tooltipValueDecimals: settings.tooltipValueDecimals,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart-widget.models.ts
index ec42955b4d..b3be129489 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart-widget.models.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/chart/radar-chart-widget.models.ts
@@ -135,6 +135,7 @@ export const radarChartWidgetRadarChartSettings = (settings: RadarChartWidgetSet
showTotal: false,
animation: settings.animation,
showLegend: settings.showLegend,
+ legendShowTotal: settings.legendShowTotal,
showTooltip: settings.showTooltip,
tooltipValueType: settings.tooltipValueType,
tooltipValueDecimals: settings.tooltipValueDecimals,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/latest-chart-widget-settings.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/latest-chart-widget-settings.component.html
index fe071f16a0..66d0234914 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/latest-chart-widget-settings.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/chart/latest-chart-widget-settings.component.html
@@ -61,9 +61,11 @@
-
- {{ 'legend.show-total' | translate }}
-
+
+
+ {{ 'legend.show-total' | translate }}
+
+
From 94e098ab4d058fc7f157e3176f3cf43f408f24be Mon Sep 17 00:00:00 2001
From: Dmytro Skarzhynets
Date: Tue, 30 Sep 2025 14:50:00 +0300
Subject: [PATCH 30/31] AI models: update model ID autocomplete options
---
ui-ngx/src/app/shared/models/ai-model.models.ts | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/ui-ngx/src/app/shared/models/ai-model.models.ts b/ui-ngx/src/app/shared/models/ai-model.models.ts
index b0a88d076e..5ba0327dfe 100644
--- a/ui-ngx/src/app/shared/models/ai-model.models.ts
+++ b/ui-ngx/src/app/shared/models/ai-model.models.ts
@@ -110,6 +110,9 @@ export const AiModelMap = new Map
Date: Wed, 1 Oct 2025 14:41:54 +0300
Subject: [PATCH 31/31] UI: Refactoring show total in chart tooltip
---
...e-series-chart-basic-config.component.html | 4 +-
...ime-series-chart-basic-config.component.ts | 5 +-
.../chart/time-series-chart-tooltip.models.ts | 172 +++++++++---------
.../lib/chart/time-series-chart.models.ts | 2 +-
.../widget/lib/chart/time-series-chart.ts | 3 +-
...eries-chart-widget-settings.component.html | 4 +-
...-series-chart-widget-settings.component.ts | 5 +-
7 files changed, 101 insertions(+), 94 deletions(-)
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
index c237c056d9..0c5eb426b3 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/chart/time-series-chart-basic-config.component.html
@@ -318,8 +318,8 @@
{{ 'tooltip.hide-zero-tooltip-values' | translate }}
-
-