Merge branch 'thingsboard:master' into fix/widget-card-appearance

application/pom.xml

@@ -419,6 +419,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>dev.langchain4j</groupId>
+            <artifactId>langchain4j-ollama</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

application/src/main/data/upgrade/basic/schema_update.sql

@@ -14,3 +14,35 @@
 -- limitations under the License.
 --
 
+-- UPDATE TENANT PROFILE CONFIGURATION START
+
+UPDATE tenant_profile
+SET profile_data = jsonb_set(
+        profile_data,
+        '{configuration}',
+        (profile_data -> 'configuration')
+            || jsonb_strip_nulls(
+                jsonb_build_object(
+                        'minAllowedScheduledUpdateIntervalInSecForCF',
+                        CASE
+                            WHEN (profile_data -> 'configuration') ? 'minAllowedScheduledUpdateIntervalInSecForCF'
+                                THEN NULL
+                            ELSE to_jsonb(60)
+                            END,
+                        'maxRelationLevelPerCfArgument',
+                        CASE
+                            WHEN (profile_data -> 'configuration') ? 'maxRelationLevelPerCfArgument'
+                                THEN NULL
+                            ELSE to_jsonb(10)
+                            END
+                )
+               ),
+        false
+                   )
+WHERE NOT (
+    (profile_data -> 'configuration') ? 'minAllowedScheduledUpdateIntervalInSecForCF'
+        AND
+    (profile_data -> 'configuration') ? 'maxRelationLevelPerCfArgument'
+    );
+
+-- UPDATE TENANT PROFILE CONFIGURATION END

application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java

@@ -97,6 +97,7 @@ import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.resource.TbResourceDataCache;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.rule.RuleNodeStateService;
@@ -511,6 +512,10 @@ public class ActorSystemContext {
     @Getter
     private ResourceService resourceService;
 
+    @Autowired
+    @Getter
+    private TbResourceDataCache resourceDataCache;
+
     @Lazy
     @Autowired(required = false)
     @Getter

application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityActor.java

@@ -51,7 +51,7 @@ public class CalculatedFieldEntityActor extends AbstractCalculatedFieldActor {
     @Override
     public void destroy(TbActorStopReason stopReason, Throwable cause) throws TbActorException {
         log.debug("[{}] Stopping CF entity actor.", processor.tenantId);
-        processor.stop();
+        processor.stop(false);
     }
 
     @Override

application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java

@@ -48,6 +48,8 @@ import org.thingsboard.server.service.cf.ctx.state.ArgumentEntry;
 import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx;
 import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldState;
 import org.thingsboard.server.service.cf.ctx.state.SingleValueArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculatedFieldState;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -91,16 +93,18 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
         this.ctx = ctx;
     }
 
-    public void stop() {
+    public void stop(boolean partitionChanged) {
-        log.info("[{}][{}] Stopping entity actor.", tenantId, entityId);
+        log.info(partitionChanged ?
+                        "[{}][{}] Stopping entity actor due to change partition event." :
+                        "[{}][{}] Stopping entity actor.",
+                tenantId, entityId);
         states.clear();
         ctx.stop(ctx.getSelf());
     }
 
     public void process(CalculatedFieldPartitionChangeMsg msg) {
         if (!systemContext.getPartitionService().resolve(ServiceType.TB_RULE_ENGINE, DataConstants.CF_QUEUE_NAME, tenantId, entityId).isMyPartition()) {
-            log.info("[{}] Stopping entity actor due to change partition event.", entityId);
+            stop(true);
-            ctx.stop(ctx.getSelf());
         }
     }
 
@@ -251,6 +255,16 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
         if (state == null) {
             state = getOrInitState(ctx);
             justRestored = true;
+        } else if (ctx.shouldFetchDynamicArgumentsFromDb(state)) {
+            log.debug("[{}][{}] Going to update dynamic arguments for CF.", entityId, ctx.getCfId());
+            try {
+                Map<String, ArgumentEntry> dynamicArgsFromDb = cfService.fetchDynamicArgsFromDb(ctx, entityId);
+                dynamicArgsFromDb.forEach(newArgValues::putIfAbsent);
+                var geofencingState = (GeofencingCalculatedFieldState) state;
+                geofencingState.setLastDynamicArgumentsRefreshTs(System.currentTimeMillis());
+            } catch (Exception e) {
+                throw CalculatedFieldException.builder().ctx(ctx).eventEntity(entityId).cause(e).build();
+            }
         }
         if (state.isSizeOk()) {
             if (state.updateState(ctx, newArgValues) || justRestored) {
@@ -271,7 +285,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
         if (state != null) {
             return state;
         } else {
-            ListenableFuture<CalculatedFieldState> stateFuture = systemContext.getCalculatedFieldProcessingService().fetchStateFromDb(ctx, entityId);
+            ListenableFuture<CalculatedFieldState> stateFuture = cfService.fetchStateFromDb(ctx, entityId);
             // Ugly but necessary. We do not expect to often fetch data from DB. Only once per <Entity, CalculatedField> pair lifetime.
             // This call happens while processing the CF pack from the queue consumer. So the timeout should be relatively low.
             // Alternatively, we can fetch the state outside the actor system and push separate command to create this actor,
@@ -288,7 +302,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
         boolean stateSizeChecked = false;
         try {
             if (ctx.isInitialized() && state.isReady()) {
-                CalculatedFieldResult calculationResult = state.performCalculation(ctx).get(systemContext.getCfCalculationResultTimeout(), TimeUnit.SECONDS);
+                CalculatedFieldResult calculationResult = state.performCalculation(entityId, ctx).get(systemContext.getCfCalculationResultTimeout(), TimeUnit.SECONDS);
                 state.checkStateSize(ctxId, ctx.getMaxStateSize());
                 stateSizeChecked = true;
                 if (state.isSizeOk()) {
@@ -298,7 +312,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
                         callback.onSuccess();
                     }
                     if (DebugModeUtil.isDebugAllAvailable(ctx.getCalculatedField())) {
-                        systemContext.persistCalculatedFieldDebugEvent(tenantId, ctx.getCfId(), entityId, state.getArguments(), tbMsgId, tbMsgType, calculationResult.getResult().toString(), null);
+                        systemContext.persistCalculatedFieldDebugEvent(tenantId, ctx.getCfId(), entityId, state.getArguments(), tbMsgId, tbMsgType, calculationResult.toStringOrElseNull(), null);
                     }
                 }
             } else {
@@ -367,7 +381,7 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
     }
 
     private Map<String, ArgumentEntry> mapToArguments(CalculatedFieldCtx ctx, AttributeScopeProto scope, List<AttributeValueProto> attrDataList) {
-        return mapToArguments(ctx.getMainEntityArguments(), scope, attrDataList);
+        return mapToArguments(entityId, ctx.getMainEntityArguments(), ctx.getMainEntityGeofencingArgumentNames(), scope, attrDataList);
     }
 
     private Map<String, ArgumentEntry> mapToArguments(CalculatedFieldCtx ctx, EntityId entityId, AttributeScopeProto scope, List<AttributeValueProto> attrDataList) {
@@ -375,17 +389,23 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
         if (argNames.isEmpty()) {
             return Collections.emptyMap();
         }
-        return mapToArguments(argNames, scope, attrDataList);
+        List<String> geofencingArgumentNames = ctx.getLinkedEntityGeofencingArgumentNames();
+        return mapToArguments(entityId, argNames, geofencingArgumentNames, scope, attrDataList);
     }
 
-    private Map<String, ArgumentEntry> mapToArguments(Map<ReferencedEntityKey, String> argNames, AttributeScopeProto scope, List<AttributeValueProto> attrDataList) {
+    private Map<String, ArgumentEntry> mapToArguments(EntityId entityId, Map<ReferencedEntityKey, String> argNames, List<String> geofencingArgNames, AttributeScopeProto scope, List<AttributeValueProto> attrDataList) {
         Map<String, ArgumentEntry> arguments = new HashMap<>();
         for (AttributeValueProto item : attrDataList) {
             ReferencedEntityKey key = new ReferencedEntityKey(item.getKey(), ArgumentType.ATTRIBUTE, AttributeScope.valueOf(scope.name()));
             String argName = argNames.get(key);
-            if (argName != null) {
+            if (argName == null) {
-                arguments.put(argName, new SingleValueArgumentEntry(item));
+                continue;
+            }
+            if (geofencingArgNames.contains(argName)) {
+                arguments.put(argName, new GeofencingArgumentEntry(entityId, item));
+                continue;
             }
+            arguments.put(argName, new SingleValueArgumentEntry(item));
         }
         return arguments;
     }
@@ -395,26 +415,32 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
         if (argNames.isEmpty()) {
             return Collections.emptyMap();
         }
-        return mapToArgumentsWithDefaultValue(argNames, ctx.getArguments(), scope, removedAttrKeys);
+        List<String> geofencingArgumentNames = ctx.getLinkedEntityGeofencingArgumentNames();
+        return mapToArgumentsWithDefaultValue(argNames, ctx.getArguments(), geofencingArgumentNames, scope, removedAttrKeys);
     }
 
     private Map<String, ArgumentEntry> mapToArgumentsWithDefaultValue(CalculatedFieldCtx ctx, AttributeScopeProto scope, List<String> removedAttrKeys) {
-        return mapToArgumentsWithDefaultValue(ctx.getMainEntityArguments(), ctx.getArguments(), scope, removedAttrKeys);
+        return mapToArgumentsWithDefaultValue(ctx.getMainEntityArguments(), ctx.getArguments(), ctx.getMainEntityGeofencingArgumentNames(), scope, removedAttrKeys);
     }
 
-    private Map<String, ArgumentEntry> mapToArgumentsWithDefaultValue(Map<ReferencedEntityKey, String> argNames, Map<String, Argument> configArguments, AttributeScopeProto scope, List<String> removedAttrKeys) {
+    private Map<String, ArgumentEntry> mapToArgumentsWithDefaultValue(Map<ReferencedEntityKey, String> argNames, Map<String, Argument> configArguments, List<String> geofencingArgNames, AttributeScopeProto scope, List<String> removedAttrKeys) {
         Map<String, ArgumentEntry> arguments = new HashMap<>();
         for (String removedKey : removedAttrKeys) {
             ReferencedEntityKey key = new ReferencedEntityKey(removedKey, ArgumentType.ATTRIBUTE, AttributeScope.valueOf(scope.name()));
             String argName = argNames.get(key);
-            if (argName != null) {
+            if (argName == null) {
-                Argument argument = configArguments.get(argName);
+                continue;
-                String defaultValue = (argument != null) ? argument.getDefaultValue() : null;
-                arguments.put(argName, StringUtils.isNotEmpty(defaultValue)
-                        ? new SingleValueArgumentEntry(System.currentTimeMillis(), new StringDataEntry(removedKey, defaultValue), null)
-                        : new SingleValueArgumentEntry());
-
             }
+            if (geofencingArgNames.contains(argName)) {
+                arguments.put(argName, new GeofencingArgumentEntry());
+                continue;
+            }
+            Argument argument = configArguments.get(argName);
+            String defaultValue = (argument != null) ? argument.getDefaultValue() : null;
+            arguments.put(argName, StringUtils.isNotEmpty(defaultValue)
+                    ? new SingleValueArgumentEntry(System.currentTimeMillis(), new StringDataEntry(removedKey, defaultValue), null)
+                    : new SingleValueArgumentEntry());
+
         }
         return arguments;
     }

application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldManagerMessageProcessor.java

@@ -57,6 +57,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.BiConsumer;
 
 import static org.thingsboard.server.utils.CalculatedFieldUtils.fromProto;
 
@@ -255,7 +256,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
                 log.debug("[{}] Failed to lookup CF by id [{}]", tenantId, cfId);
                 callback.onSuccess();
             } else {
-                var cfCtx = new CalculatedFieldCtx(cf, systemContext.getTbelInvokeService(), systemContext.getApiLimitService());
+                var cfCtx = getCfCtx(cf);
                 try {
                     cfCtx.init();
                 } catch (Exception e) {
@@ -266,11 +267,15 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
                 // Alternative approach would be to use any list but avoid modifications to the list (change the complete map value instead)
                 entityIdCalculatedFields.computeIfAbsent(cf.getEntityId(), id -> new CopyOnWriteArrayList<>()).add(cfCtx);
                 addLinks(cf);
-                initCf(cfCtx, callback, false);
+                applyToTargetCfEntityActors(cfCtx, callback, (id, cb) -> initCfForEntity(id, cfCtx, false, cb));
             }
         }
     }
 
+    private CalculatedFieldCtx getCfCtx(CalculatedField cf) {
+        return new CalculatedFieldCtx(cf, systemContext.getTbelInvokeService(), systemContext.getApiLimitService(), systemContext.getRelationService());
+    }
+
     private void onCfUpdated(ComponentLifecycleMsg msg, TbCallback callback) throws CalculatedFieldException {
         var cfId = new CalculatedFieldId(msg.getEntityId().getId());
         var oldCfCtx = calculatedFields.get(cfId);
@@ -282,7 +287,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
                 log.debug("[{}] Failed to lookup CF by id [{}]", tenantId, cfId);
                 callback.onSuccess();
             } else {
-                var newCfCtx = new CalculatedFieldCtx(newCf, systemContext.getTbelInvokeService(), systemContext.getApiLimitService());
+                var newCfCtx = getCfCtx(newCf);
                 try {
                     newCfCtx.init();
                 } catch (Exception e) {
@@ -290,6 +295,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
                 }
                 calculatedFields.put(newCf.getId(), newCfCtx);
                 List<CalculatedFieldCtx> oldCfList = entityIdCalculatedFields.get(newCf.getEntityId());
+
                 List<CalculatedFieldCtx> newCfList = new CopyOnWriteArrayList<>();
                 boolean found = false;
                 for (CalculatedFieldCtx oldCtx : oldCfList) {
@@ -312,7 +318,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
                 // Alternative approach would be to use any list but avoid modifications to the list (change the complete map value instead)
                 var stateChanges = newCfCtx.hasStateChanges(oldCfCtx);
                 if (stateChanges || newCfCtx.hasOtherSignificantChanges(oldCfCtx)) {
-                    initCf(newCfCtx, callback, stateChanges);
+                    applyToTargetCfEntityActors(newCfCtx, callback, (id, cb) -> initCfForEntity(id, newCfCtx, stateChanges, cb));
                 } else {
                     callback.onSuccess();
                 }
@@ -326,31 +332,11 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
         if (cfCtx == null) {
             log.debug("[{}] CF was already deleted [{}]", tenantId, cfId);
             callback.onSuccess();
-        } else {
+            return;
-            entityIdCalculatedFields.get(cfCtx.getEntityId()).remove(cfCtx);
-            deleteLinks(cfCtx);
-
-            EntityId entityId = cfCtx.getEntityId();
-            EntityType entityType = cfCtx.getEntityId().getEntityType();
-            if (isProfileEntity(entityType)) {
-                var entityIds = entityProfileCache.getEntityIdsByProfileId(entityId);
-                if (!entityIds.isEmpty()) {
-                    //TODO: no need to do this if we cache all created actors and know which one belong to us;
-                    var multiCallback = new MultipleTbCallback(entityIds.size(), callback);
-                    entityIds.forEach(id -> {
-                        if (isMyPartition(id, multiCallback)) {
-                            deleteCfForEntity(id, cfId, multiCallback);
-                        }
-                    });
-                } else {
-                    callback.onSuccess();
-                }
-            } else {
-                if (isMyPartition(entityId, callback)) {
-                    deleteCfForEntity(entityId, cfId, callback);
-                }
-            }
         }
+        entityIdCalculatedFields.get(cfCtx.getEntityId()).remove(cfCtx);
+        deleteLinks(cfCtx);
+        applyToTargetCfEntityActors(cfCtx, callback, (id, cb) -> deleteCfForEntity(id, cfId, cb));
     }
 
     public void onTelemetryMsg(CalculatedFieldTelemetryMsg msg) {
@@ -389,31 +375,11 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
         }
         for (var linkProto : linksList) {
             var link = fromProto(linkProto);
-            var targetEntityId = link.entityId();
-            var targetEntityType = targetEntityId.getEntityType();
             var cf = calculatedFields.get(link.cfId());
-            if (EntityType.DEVICE_PROFILE.equals(targetEntityType) || EntityType.ASSET_PROFILE.equals(targetEntityType)) {
+            withTargetEntities(link.entityId(), callback, (ids, cb) -> {
-                // iterate over all entities that belong to profile and push the message for corresponding CF
+                var linkedTelemetryMsg = new EntityCalculatedFieldLinkedTelemetryMsg(tenantId, sourceEntityId, proto.getMsg(), cf, cb);
-                var entityIds = entityProfileCache.getEntityIdsByProfileId(targetEntityId);
+                ids.forEach(id -> linkedTelemetryMsgForEntity(id, linkedTelemetryMsg));
-                if (!entityIds.isEmpty()) {
+            });
-                    MultipleTbCallback multipleCallback = new MultipleTbCallback(entityIds.size(), callback);
-                    var newMsg = new EntityCalculatedFieldLinkedTelemetryMsg(tenantId, sourceEntityId, proto.getMsg(), cf, multipleCallback);
-                    entityIds.forEach(entityId -> {
-                        if (isMyPartition(entityId, multipleCallback)) {
-                            log.debug("Pushing linked telemetry msg to specific actor [{}]", entityId);
-                            getOrCreateActor(entityId).tell(newMsg);
-                        }
-                    });
-                } else {
-                    callback.onSuccess();
-                }
-            } else {
-                if (isMyPartition(targetEntityId, callback)) {
-                    log.debug("Pushing linked telemetry msg to specific actor [{}]", targetEntityId);
-                    var newMsg = new EntityCalculatedFieldLinkedTelemetryMsg(tenantId, sourceEntityId, proto.getMsg(), cf, callback);
-                    getOrCreateActor(targetEntityId).tell(newMsg);
-                }
-            }
         }
     }
 
@@ -452,26 +418,9 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
         return result;
     }
 
-    private void initCf(CalculatedFieldCtx cfCtx, TbCallback callback, boolean forceStateReinit) {
+    private void linkedTelemetryMsgForEntity(EntityId entityId, EntityCalculatedFieldLinkedTelemetryMsg msg) {
-        EntityId entityId = cfCtx.getEntityId();
+        log.debug("Pushing linked telemetry msg to specific actor [{}]", entityId);
-        EntityType entityType = cfCtx.getEntityId().getEntityType();
+        getOrCreateActor(entityId).tell(msg);
-        if (isProfileEntity(entityType)) {
-            var entityIds = entityProfileCache.getEntityIdsByProfileId(entityId);
-            if (!entityIds.isEmpty()) {
-                var multiCallback = new MultipleTbCallback(entityIds.size(), callback);
-                entityIds.forEach(id -> {
-                    if (isMyPartition(id, multiCallback)) {
-                        initCfForEntity(id, cfCtx, forceStateReinit, multiCallback);
-                    }
-                });
-            } else {
-                callback.onSuccess();
-            }
-        } else {
-            if (isMyPartition(entityId, callback)) {
-                initCfForEntity(entityId, cfCtx, forceStateReinit, callback);
-            }
-        }
     }
 
     private void deleteCfForEntity(EntityId entityId, CalculatedFieldId cfId, TbCallback callback) {
@@ -545,7 +494,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
     }
 
     private void initCalculatedField(CalculatedField cf) throws CalculatedFieldException {
-        var cfCtx = new CalculatedFieldCtx(cf, systemContext.getTbelInvokeService(), systemContext.getApiLimitService());
+        var cfCtx = new CalculatedFieldCtx(cf, systemContext.getTbelInvokeService(), systemContext.getApiLimitService(), systemContext.getRelationService());
         try {
             cfCtx.init();
         } catch (Exception e) {
@@ -584,4 +533,30 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
         }
     }
 
+    private void applyToTargetCfEntityActors(CalculatedFieldCtx ctx,
+                                             TbCallback callback,
+                                             BiConsumer<EntityId, TbCallback> action) {
+        withTargetEntities(ctx.getEntityId(), callback, (ids, cb) -> ids.forEach(id -> action.accept(id, cb)));
+    }
+
+    private void withTargetEntities(EntityId entityId, TbCallback parentCallback, BiConsumer<List<EntityId>, TbCallback> consumer) {
+        if (isProfileEntity(entityId.getEntityType())) {
+            var ids = entityProfileCache.getEntityIdsByProfileId(entityId);
+            if (ids.isEmpty()) {
+                parentCallback.onSuccess();
+                return;
+            }
+            var multiCallback = new MultipleTbCallback(ids.size(), parentCallback);
+            var profileEntityIds = ids.stream().filter(id -> isMyPartition(id, multiCallback)).toList();
+            if (profileEntityIds.isEmpty()) {
+                return;
+            }
+            consumer.accept(profileEntityIds, multiCallback);
+            return;
+        }
+        if (isMyPartition(entityId, parentCallback)) {
+            consumer.accept(List.of(entityId), parentCallback);
+        }
+    }
+
 }

application/src/main/java/org/thingsboard/server/actors/calculatedField/MultipleTbCallback.java

@@ -50,7 +50,7 @@ public class MultipleTbCallback implements TbCallback {
 
     @Override
     public void onFailure(Throwable t) {
-        log.warn("[{}][{}] onFailure.", id, callback.getId());
+        log.warn("[{}][{}] onFailure.", id, callback.getId(), t);
         callback.onFailure(t);
     }
 }

application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java

@@ -51,6 +51,7 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasRuleEngineProfile;
+import org.thingsboard.server.common.data.HasTenantId;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.alarm.Alarm;
@@ -60,6 +61,7 @@ import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.RuleNodeId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -110,6 +112,7 @@ import org.thingsboard.server.dao.ota.OtaPackageService;
 import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.resource.TbResourceDataCache;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.tenant.TenantService;
@@ -770,6 +773,11 @@ public class DefaultTbContext implements TbContext {
         return mainCtx.getResourceService();
     }
 
+    @Override
+    public TbResourceDataCache getTbResourceDataCache() {
+        return mainCtx.getResourceDataCache();
+    }
+
     @Override
     public OtaPackageService getOtaPackageService() {
         return mainCtx.getOtaPackageService();
@@ -1054,7 +1062,18 @@ public class DefaultTbContext implements TbContext {
 
     @Override
     public void checkTenantEntity(EntityId entityId) throws TbNodeException {
-        if (!this.getTenantId().equals(TenantIdLoader.findTenantId(this, entityId))) {
+        TenantId actualTenantId = TenantIdLoader.findTenantId(this, entityId);
+        assertSameTenantId(actualTenantId, entityId);
+    }
+
+    @Override
+    public <E extends HasId<I> & HasTenantId, I extends EntityId> void checkTenantEntity(E entity) throws TbNodeException {
+        TenantId actualTenantId = entity.getTenantId();
+        assertSameTenantId(actualTenantId, entity.getId());
+    }
+
+    private void assertSameTenantId(TenantId tenantId, EntityId entityId) throws TbNodeException {
+        if (!getTenantId().equals(tenantId)) {
             throw new TbNodeException("Entity with id: '" + entityId + "' specified in the configuration doesn't belong to the current tenant.", true);
         }
     }

application/src/main/java/org/thingsboard/server/controller/CalculatedFieldController.java

@@ -289,7 +289,6 @@ public class CalculatedFieldController extends BaseController {
                 default -> throw new IllegalArgumentException("Calculated fields do not support '" + entityType + "' for referenced entities.");
             }
         }
-
     }
 
 }

application/src/main/java/org/thingsboard/server/controller/ImageController.java

@@ -300,6 +300,7 @@ public class ImageController extends BaseController {
         tbImageService.putETag(cacheKey, descriptor.getEtag());
         var result = ResponseEntity.ok()
                 .header("Content-Type", descriptor.getMediaType())
+                .header("Content-Security-Policy", "default-src 'none'")
                 .eTag(descriptor.getEtag());
         if (!cacheKey.isPublic()) {
             result

application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java

@@ -162,6 +162,8 @@ public class SystemInfoController extends BaseController {
             }
             systemParams.setMaxArgumentsPerCF(tenantProfileConfiguration.getMaxArgumentsPerCF());
             systemParams.setMaxDataPointsPerRollingArg(tenantProfileConfiguration.getMaxDataPointsPerRollingArg());
+            systemParams.setMinAllowedScheduledUpdateIntervalInSecForCF(tenantProfileConfiguration.getMinAllowedScheduledUpdateIntervalInSecForCF());
+            systemParams.setMaxRelationLevelPerCfArgument(tenantProfileConfiguration.getMaxRelationLevelPerCfArgument());
             systemParams.setTrendzSettings(trendzSettingsService.findTrendzSettings(currentUser.getTenantId()));
         }
         systemParams.setMobileQrEnabled(Optional.ofNullable(qrCodeSettingService.findQrCodeSettings(TenantId.SYS_TENANT_ID))

application/src/main/java/org/thingsboard/server/controller/TbResourceController.java

@@ -55,14 +55,17 @@ import org.thingsboard.server.common.data.util.ThrowingSupplier;
 import org.thingsboard.server.config.annotations.ApiOperation;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.resource.TbResourceService;
+import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.permission.Operation;
 import org.thingsboard.server.service.security.permission.Resource;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 
 import static org.thingsboard.server.controller.ControllerConstants.AVAILABLE_FOR_ANY_AUTHORIZED_USER;
 import static org.thingsboard.server.controller.ControllerConstants.LWM2M_OBJECT_DESCRIPTION;
@@ -263,6 +266,20 @@ public class TbResourceController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Get Resource Infos by ids (getSystemOrTenantResourcesByIds)")
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @GetMapping(value = "/resource", params = {"resourceIds"})
+    public List<TbResourceInfo> getSystemOrTenantResourcesByIds(
+            @Parameter(description = "A list of resource ids, separated by comma ','", array = @ArraySchema(schema = @Schema(type = "string")))
+            @RequestParam("resourceIds") Set<UUID> resourceUuids) throws ThingsboardException {
+        SecurityUser user = getCurrentUser();
+        List<TbResourceId> resourceIds = new ArrayList<>();
+        for (UUID resourceId : resourceUuids) {
+            resourceIds.add(new TbResourceId(resourceId));
+        }
+        return resourceService.findSystemOrTenantResourcesByIds(user.getTenantId(), resourceIds);
+    }
+
     @ApiOperation(value = "Get All Resource Infos (getAllResources)",
             notes = "Returns a page of Resource Info objects owned by tenant. " +
                     PAGE_DATA_PARAMETERS + RESOURCE_INFO_DESCRIPTION + TENANT_AUTHORITY_PARAGRAPH)

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

@@ -32,8 +32,10 @@ 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.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;
@@ -43,10 +45,12 @@ 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;
 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;
@@ -54,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 {
@@ -62,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())
@@ -134,7 +143,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
@@ -262,6 +271,35 @@ class Langchain4jChatModelConfigurerImpl implements Langchain4jChatModelConfigur
                 .build();
     }
 
+    @Override
+    public ChatModel configureChatModel(OllamaChatModelConfig chatModelConfig) {
+        var builder = OllamaChatModel.builder()
+                .baseUrl(chatModelConfig.providerConfig().baseUrl())
+                .modelName(chatModelConfig.modelId())
+                .temperature(chatModelConfig.temperature())
+                .topP(chatModelConfig.topP())
+                .topK(chatModelConfig.topK())
+                .numCtx(chatModelConfig.contextLength())
+                .numPredict(chatModelConfig.maxOutputTokens())
+                .timeout(toDuration(chatModelConfig.timeoutSeconds()))
+                .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) {
         return timeoutSeconds != null ? Duration.ofSeconds(timeoutSeconds) : null;
     }

application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java

@@ -442,13 +442,13 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
         boolean check(long threshold, long warnThreshold, long value);
     }
 
-    private void checkStartOfNextCycle() {
+    public void checkStartOfNextCycle() {
         updateLock.lock();
         try {
             long now = System.currentTimeMillis();
             myUsageStates.values().forEach(state -> {
                 if ((state.getNextCycleTs() < now) && (now - state.getNextCycleTs() < TimeUnit.HOURS.toMillis(1))) {
-                    state.setCycles(state.getNextCycleTs(), SchedulerUtils.getStartOfNextNextMonth());
+                    state.setCycles(state.getNextCycleTs(), SchedulerUtils.getStartOfNextMonth());
                     if (log.isTraceEnabled()) {
                         log.trace("[{}][{}] Updating state cycles (currentCycleTs={},nextCycleTs={})", state.getTenantId(), state.getEntityId(), state.getCurrentCycleTs(), state.getNextCycleTs());
                     }

application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java

@@ -0,0 +1,252 @@
+/**
+ * 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.service.cf;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.ThingsBoardExecutors;
+import org.thingsboard.server.common.data.cf.configuration.Argument;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentType;
+import org.thingsboard.server.common.data.cf.configuration.RelationPathQueryDynamicSourceConfiguration;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.kv.Aggregation;
+import org.thingsboard.server.common.data.kv.AttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BaseReadTsKvQuery;
+import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
+import org.thingsboard.server.common.data.kv.ReadTsKvQuery;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.common.data.relation.RelationTypeGroup;
+import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
+import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.dao.usagerecord.ApiLimitService;
+import org.thingsboard.server.service.cf.ctx.state.ArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx;
+import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculatedFieldState;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.stream.Collectors;
+
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LATITUDE_ARGUMENT_KEY;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LONGITUDE_ARGUMENT_KEY;
+import static org.thingsboard.server.utils.CalculatedFieldArgumentUtils.createDefaultKvEntry;
+import static org.thingsboard.server.utils.CalculatedFieldArgumentUtils.createStateByType;
+import static org.thingsboard.server.utils.CalculatedFieldArgumentUtils.transformSingleValueArgument;
+
+@Data
+@Slf4j
+public abstract class AbstractCalculatedFieldProcessingService {
+
+    protected final AttributesService attributesService;
+    protected final TimeseriesService timeseriesService;
+    protected final ApiLimitService apiLimitService;
+    protected final RelationService relationService;
+
+    protected ListeningExecutorService calculatedFieldCallbackExecutor;
+
+    @PostConstruct
+    public void init() {
+        calculatedFieldCallbackExecutor = MoreExecutors.listeningDecorator(ThingsBoardExecutors.newWorkStealingPool(
+                Math.max(4, Runtime.getRuntime().availableProcessors()), getExecutorNamePrefix()));
+    }
+
+    @PreDestroy
+    public void stop() {
+        if (calculatedFieldCallbackExecutor != null) {
+            calculatedFieldCallbackExecutor.shutdownNow();
+        }
+    }
+
+    protected abstract String getExecutorNamePrefix();
+
+    public ListenableFuture<CalculatedFieldState> fetchStateFromDb(CalculatedFieldCtx ctx, EntityId entityId) {
+        Map<String, ListenableFuture<ArgumentEntry>> argFutures = switch (ctx.getCalculatedField().getType()) {
+            case GEOFENCING -> fetchGeofencingCalculatedFieldArguments(ctx, entityId, false);
+            case SIMPLE, SCRIPT -> {
+                Map<String, ListenableFuture<ArgumentEntry>> futures = new HashMap<>();
+                for (var entry : ctx.getArguments().entrySet()) {
+                    var argEntityId = resolveEntityId(entityId, entry.getValue());
+                    var argValueFuture = fetchArgumentValue(ctx.getTenantId(), argEntityId, entry.getValue(), System.currentTimeMillis());
+                    futures.put(entry.getKey(), argValueFuture);
+                }
+                yield futures;
+            }
+        };
+        return Futures.whenAllComplete(argFutures.values()).call(() -> {
+            var result = createStateByType(ctx);
+            result.updateState(ctx, resolveArgumentFutures(argFutures));
+            // TODO: move to state.init() method after merge with alarm rules 2.0
+            if (ctx.hasRelationQueryDynamicArguments() && result instanceof GeofencingCalculatedFieldState geofencingCalculatedFieldState) {
+                geofencingCalculatedFieldState.setLastDynamicArgumentsRefreshTs(System.currentTimeMillis());
+            }
+            return result;
+        }, MoreExecutors.directExecutor());
+    }
+
+    protected EntityId resolveEntityId(EntityId entityId, Argument argument) {
+        return argument.getRefEntityId() != null ? argument.getRefEntityId() : entityId;
+    }
+
+    protected Map<String, ArgumentEntry> resolveArgumentFutures(Map<String, ListenableFuture<ArgumentEntry>> argFutures) {
+        return argFutures.entrySet().stream()
+                .collect(Collectors.toMap(
+                        Map.Entry::getKey, // Keep the key as is
+                        entry -> {
+                            try {
+                                return entry.getValue().get();
+                            } catch (ExecutionException e) {
+                                Throwable cause = e.getCause();
+                                throw new RuntimeException("Failed to fetch " + entry.getKey() + ": " + cause.getMessage(), cause);
+                            } catch (InterruptedException e) {
+                                throw new RuntimeException("Failed to fetch" + entry.getKey(), e);
+                            }
+                        }
+                ));
+    }
+
+    protected Map<String, ListenableFuture<ArgumentEntry>> fetchGeofencingCalculatedFieldArguments(CalculatedFieldCtx ctx, EntityId entityId, boolean dynamicArgumentsOnly) {
+        Map<String, ListenableFuture<ArgumentEntry>> argFutures = new HashMap<>();
+        Set<Map.Entry<String, Argument>> entries = ctx.getArguments().entrySet();
+        if (dynamicArgumentsOnly) {
+            entries = entries.stream()
+                    .filter(entry -> entry.getValue().hasDynamicSource())
+                    .collect(Collectors.toSet());
+        }
+        for (var entry : entries) {
+            switch (entry.getKey()) {
+                case ENTITY_ID_LATITUDE_ARGUMENT_KEY, ENTITY_ID_LONGITUDE_ARGUMENT_KEY ->
+                        argFutures.put(entry.getKey(), fetchArgumentValue(ctx.getTenantId(), entityId, entry.getValue(), System.currentTimeMillis()));
+                default -> {
+                    var resolvedEntityIdsFuture = resolveGeofencingEntityIds(ctx.getTenantId(), entityId, entry);
+                    argFutures.put(entry.getKey(), Futures.transformAsync(resolvedEntityIdsFuture, resolvedEntityIds ->
+                            fetchGeofencingKvEntry(ctx.getTenantId(), resolvedEntityIds, entry.getValue()), MoreExecutors.directExecutor()));
+                }
+            }
+        }
+        return argFutures;
+    }
+
+    private ListenableFuture<List<EntityId>> resolveGeofencingEntityIds(TenantId tenantId, EntityId entityId, Map.Entry<String, Argument> entry) {
+        Argument value = entry.getValue();
+        if (value.getRefEntityId() != null) {
+            return Futures.immediateFuture(List.of(value.getRefEntityId()));
+        }
+        if (!value.hasDynamicSource()) {
+            return Futures.immediateFuture(List.of(entityId));
+        }
+        var refDynamicSourceConfiguration = value.getRefDynamicSourceConfiguration();
+        return switch (refDynamicSourceConfiguration.getType()) {
+            case RELATION_PATH_QUERY -> {
+                var configuration = (RelationPathQueryDynamicSourceConfiguration) refDynamicSourceConfiguration;
+                yield Futures.transform(relationService.findByRelationPathQueryAsync(tenantId, configuration.toRelationPathQuery(entityId)),
+                        configuration::resolveEntityIds, calculatedFieldCallbackExecutor);
+            }
+        };
+    }
+
+    private ListenableFuture<ArgumentEntry> fetchGeofencingKvEntry(TenantId tenantId, List<EntityId> geofencingEntities, Argument argument) {
+        if (argument.getRefEntityKey().getType() != ArgumentType.ATTRIBUTE) {
+            throw new IllegalStateException("Unsupported argument key type: " + argument.getRefEntityKey().getType());
+        }
+        List<ListenableFuture<Map.Entry<EntityId, AttributeKvEntry>>> kvFutures = geofencingEntities.stream()
+                .map(entityId -> {
+                    var attributesFuture = attributesService.find(
+                            tenantId,
+                            entityId,
+                            argument.getRefEntityKey().getScope(),
+                            argument.getRefEntityKey().getKey()
+                    );
+                    return Futures.transform(attributesFuture, resultOpt ->
+                                    Map.entry(entityId, resultOpt.orElseGet(() ->
+                                            new BaseAttributeKvEntry(createDefaultKvEntry(argument), System.currentTimeMillis(), 0L))),
+                            calculatedFieldCallbackExecutor
+                    );
+                }).collect(Collectors.toList());
+
+        ListenableFuture<List<Map.Entry<EntityId, AttributeKvEntry>>> allFutures = Futures.allAsList(kvFutures);
+
+        return Futures.transform(allFutures, entries -> ArgumentEntry.createGeofencingValueArgument(entries.stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))), MoreExecutors.directExecutor());
+    }
+
+    protected ListenableFuture<ArgumentEntry> fetchArgumentValue(TenantId tenantId, EntityId entityId, Argument argument, long startTs) {
+        return switch (argument.getRefEntityKey().getType()) {
+            case TS_ROLLING -> fetchTsRolling(tenantId, entityId, argument, startTs);
+            case ATTRIBUTE -> fetchAttribute(tenantId, entityId, argument, startTs);
+            case TS_LATEST -> fetchTsLatest(tenantId, entityId, argument, startTs);
+        };
+    }
+
+    private ListenableFuture<ArgumentEntry> fetchTsRolling(TenantId tenantId, EntityId entityId, Argument argument, long queryEndTs) {
+        long argTimeWindow = argument.getTimeWindow() == 0 ? queryEndTs : argument.getTimeWindow();
+        long startInterval = queryEndTs - argTimeWindow;
+        ReadTsKvQuery query = buildTsRollingQuery(tenantId, argument, startInterval, queryEndTs);
+
+        log.trace("[{}][{}] Fetching timeseries for query {}", tenantId, entityId, query);
+        ListenableFuture<List<TsKvEntry>> tsRollingFuture = timeseriesService.findAll(tenantId, entityId, List.of(query));
+        return Futures.transform(tsRollingFuture, tsRolling -> {
+            log.debug("[{}][{}] Fetched {} timeseries for query {}", tenantId, entityId, tsRolling == null ? 0 : tsRolling.size(), query);
+            return ArgumentEntry.createTsRollingArgument(tsRolling, query.getLimit(), argTimeWindow);
+        }, calculatedFieldCallbackExecutor);
+    }
+
+    private ListenableFuture<ArgumentEntry> fetchAttribute(TenantId tenantId, EntityId entityId, Argument argument, long defaultLastUpdateTs) {
+        log.trace("[{}][{}] Fetching attribute for key {}", tenantId, entityId, argument.getRefEntityKey());
+        var attributeOptFuture = attributesService.find(tenantId, entityId, argument.getRefEntityKey().getScope(), argument.getRefEntityKey().getKey());
+
+        return Futures.transform(attributeOptFuture, attrOpt -> {
+            log.debug("[{}][{}] Fetched attribute for key {}: {}", tenantId, entityId, argument.getRefEntityKey(), attrOpt);
+            AttributeKvEntry attributeKvEntry = attrOpt.orElseGet(() -> new BaseAttributeKvEntry(createDefaultKvEntry(argument), defaultLastUpdateTs, 0L));
+            return transformSingleValueArgument(Optional.of(attributeKvEntry));
+        }, calculatedFieldCallbackExecutor);
+    }
+
+    protected ListenableFuture<ArgumentEntry> fetchTsLatest(TenantId tenantId, EntityId entityId, Argument argument, long startTs) {
+        String timeseriesKey = argument.getRefEntityKey().getKey();
+        log.trace("[{}][{}] Fetching latest timeseries {}", tenantId, entityId, timeseriesKey);
+        return transformSingleValueArgument(
+                Futures.transform(
+                        timeseriesService.findLatest(tenantId, entityId, timeseriesKey),
+                        result -> {
+                            log.debug("[{}][{}] Fetched latest timeseries {}: {}", tenantId, entityId, timeseriesKey, result);
+                            return result.or(() -> Optional.of(new BasicTsKvEntry(System.currentTimeMillis(), createDefaultKvEntry(argument), 0L)));
+                        }, calculatedFieldCallbackExecutor));
+    }
+
+    private ReadTsKvQuery buildTsRollingQuery(TenantId tenantId, Argument argument, long startTs, long endTs) {
+        long maxDataPoints = apiLimitService.getLimit(
+                tenantId, DefaultTenantProfileConfiguration::getMaxDataPointsPerRollingArg);
+        int argumentLimit = argument.getLimit();
+        int limit = argumentLimit == 0 || argumentLimit > maxDataPoints ? (int) maxDataPoints : argumentLimit;
+        return new BaseReadTsKvQuery(argument.getRefEntityKey().getKey(), startTs, endTs, 0, limit, Aggregation.NONE);
+    }
+
+}

application/src/main/java/org/thingsboard/server/service/cf/CalculatedFieldProcessingService.java

@@ -34,6 +34,8 @@ public interface CalculatedFieldProcessingService {
 
     ListenableFuture<CalculatedFieldState> fetchStateFromDb(CalculatedFieldCtx ctx, EntityId entityId);
 
+    Map<String, ArgumentEntry> fetchDynamicArgsFromDb(CalculatedFieldCtx ctx, EntityId entityId);
+
     Map<String, ArgumentEntry> fetchArgsFromDb(TenantId tenantId, EntityId entityId, Map<String, Argument> arguments);
 
     void pushMsgToRuleEngine(TenantId tenantId, EntityId entityId, CalculatedFieldResult calculationResult, List<CalculatedFieldId> cfIds, TbCallback callback);

application/src/main/java/org/thingsboard/server/service/cf/CalculatedFieldResult.java

@@ -34,4 +34,8 @@ public final class CalculatedFieldResult {
                 (result.isTextual() && result.asText().isEmpty());
     }
 
+    public String toStringOrElseNull() {
+        return result == null ? null : result.toString();
+    }
+
 }

application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java

@@ -30,6 +30,7 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageDataIterable;
 import org.thingsboard.server.dao.cf.CalculatedFieldService;
+import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.usagerecord.ApiLimitService;
 import org.thingsboard.server.queue.util.AfterStartUp;
 import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx;
@@ -52,6 +53,7 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
     private final CalculatedFieldService calculatedFieldService;
     private final TbelInvokeService tbelInvokeService;
     private final ApiLimitService apiLimitService;
+    private final RelationService relationService;
 
     private final ConcurrentMap<CalculatedFieldId, CalculatedField> calculatedFields = new ConcurrentHashMap<>();
     private final ConcurrentMap<EntityId, List<CalculatedField>> entityIdCalculatedFields = new ConcurrentHashMap<>();
@@ -111,7 +113,7 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
                 if (ctx == null) {
                     CalculatedField calculatedField = getCalculatedField(calculatedFieldId);
                     if (calculatedField != null) {
-                        ctx = new CalculatedFieldCtx(calculatedField, tbelInvokeService, apiLimitService);
+                        ctx = new CalculatedFieldCtx(calculatedField, tbelInvokeService, apiLimitService, relationService);
                         calculatedFieldsCtx.put(calculatedFieldId, ctx);
                         log.debug("[{}] Put calculated field ctx into cache: {}", calculatedFieldId, ctx);
                     }

application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java

@@ -15,46 +15,28 @@
  */
 package org.thingsboard.server.service.cf;
 
-import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import jakarta.annotation.PostConstruct;
-import jakarta.annotation.PreDestroy;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.stereotype.Service;
-import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.server.actors.calculatedField.CalculatedFieldTelemetryMsg;
 import org.thingsboard.server.actors.calculatedField.MultipleTbCallback;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
 import org.thingsboard.server.common.data.cf.configuration.OutputType;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.kv.Aggregation;
-import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
-import org.thingsboard.server.common.data.kv.BaseReadTsKvQuery;
-import org.thingsboard.server.common.data.kv.BasicTsKvEntry;
-import org.thingsboard.server.common.data.kv.BooleanDataEntry;
-import org.thingsboard.server.common.data.kv.DoubleDataEntry;
-import org.thingsboard.server.common.data.kv.KvEntry;
-import org.thingsboard.server.common.data.kv.ReadTsKvQuery;
-import org.thingsboard.server.common.data.kv.StringDataEntry;
-import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.msg.TbMsgType;
-import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
 import org.thingsboard.server.common.msg.TbMsg;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.dao.attributes.AttributesService;
+import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.dao.usagerecord.ApiLimitService;
 import org.thingsboard.server.gen.transport.TransportProtos.CalculatedFieldLinkedTelemetryMsgProto;
@@ -70,20 +52,12 @@ import org.thingsboard.server.service.cf.ctx.CalculatedFieldEntityCtxId;
 import org.thingsboard.server.service.cf.ctx.state.ArgumentEntry;
 import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx;
 import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldState;
-import org.thingsboard.server.service.cf.ctx.state.ScriptCalculatedFieldState;
-import org.thingsboard.server.service.cf.ctx.state.SimpleCalculatedFieldState;
-import org.thingsboard.server.service.cf.ctx.state.SingleValueArgumentEntry;
-import org.thingsboard.server.service.cf.ctx.state.TsRollingArgumentEntry;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
 
 import static org.thingsboard.server.common.data.DataConstants.SCOPE;
 import static org.thingsboard.server.utils.CalculatedFieldUtils.toProto;
@@ -91,76 +65,53 @@ import static org.thingsboard.server.utils.CalculatedFieldUtils.toProto;
 @TbRuleEngineComponent
 @Service
 @Slf4j
-@RequiredArgsConstructor
+public class DefaultCalculatedFieldProcessingService extends AbstractCalculatedFieldProcessingService implements CalculatedFieldProcessingService {
-public class DefaultCalculatedFieldProcessingService implements CalculatedFieldProcessingService {
 
-    private final AttributesService attributesService;
-    private final TimeseriesService timeseriesService;
     private final TbClusterService clusterService;
-    private final ApiLimitService apiLimitService;
     private final PartitionService partitionService;
 
-    private ListeningExecutorService calculatedFieldCallbackExecutor;
+    public DefaultCalculatedFieldProcessingService(AttributesService attributesService,
-
+                                                   TimeseriesService timeseriesService,
-    @PostConstruct
+                                                   ApiLimitService apiLimitService,
-    public void init() {
+                                                   RelationService relationService,
-        calculatedFieldCallbackExecutor = MoreExecutors.listeningDecorator(ThingsBoardExecutors.newWorkStealingPool(
+                                                   TbClusterService clusterService,
-                Math.max(4, Runtime.getRuntime().availableProcessors()), "calculated-field-callback"));
+                                                   PartitionService partitionService) {
+        super(attributesService, timeseriesService, apiLimitService, relationService);
+        this.clusterService = clusterService;
+        this.partitionService = partitionService;
     }
 
-    @PreDestroy
+    @Override
-    public void stop() {
+    protected String getExecutorNamePrefix() {
-        if (calculatedFieldCallbackExecutor != null) {
+        return "calculated-field-callback";
-            calculatedFieldCallbackExecutor.shutdownNow();
-        }
     }
 
     @Override
     public ListenableFuture<CalculatedFieldState> fetchStateFromDb(CalculatedFieldCtx ctx, EntityId entityId) {
-        Map<String, ListenableFuture<ArgumentEntry>> argFutures = new HashMap<>();
+        return super.fetchStateFromDb(ctx, entityId);
-        for (var entry : ctx.getArguments().entrySet()) {
+    }
-            var argEntityId = entry.getValue().getRefEntityId() != null ? entry.getValue().getRefEntityId() : entityId;
+
-            var argValueFuture = fetchKvEntry(ctx.getTenantId(), argEntityId, entry.getValue());
+    @Override
-            argFutures.put(entry.getKey(), argValueFuture);
+    public Map<String, ArgumentEntry> fetchDynamicArgsFromDb(CalculatedFieldCtx ctx, EntityId entityId) {
+        // only geofencing calculated fields supports dynamic arguments scheduled updates
+        if (!ctx.getCalculatedField().getType().equals(CalculatedFieldType.GEOFENCING)) {
+            return Map.of();
         }
-        return Futures.whenAllComplete(argFutures.values()).call(() -> {
+        return resolveArgumentFutures(fetchGeofencingCalculatedFieldArguments(ctx, entityId, true));
-            var result = createStateByType(ctx);
-            result.updateState(ctx, argFutures.entrySet().stream()
-                    .collect(Collectors.toMap(
-                            Entry::getKey, // Keep the key as is
-                            entry -> {
-                                try {
-                                    // Resolve the future to get the value
-                                    return entry.getValue().get();
-                                } catch (ExecutionException | InterruptedException e) {
-                                    throw new RuntimeException("Error getting future result for key: " + entry.getKey(), e);
-                                }
-                            }
-                    )));
-            return result;
-        }, calculatedFieldCallbackExecutor);
     }
 
     @Override
     public Map<String, ArgumentEntry> fetchArgsFromDb(TenantId tenantId, EntityId entityId, Map<String, Argument> arguments) {
         Map<String, ListenableFuture<ArgumentEntry>> argFutures = new HashMap<>();
         for (var entry : arguments.entrySet()) {
-            var argEntityId = entry.getValue().getRefEntityId() != null ? entry.getValue().getRefEntityId() : entityId;
+            if (entry.getValue().hasDynamicSource()) {
-            var argValueFuture = fetchKvEntry(tenantId, argEntityId, entry.getValue());
+                continue;
+            }
+            var argEntityId = resolveEntityId(entityId, entry.getValue());
+            var argValueFuture = fetchArgumentValue(tenantId, argEntityId, entry.getValue(), System.currentTimeMillis());
             argFutures.put(entry.getKey(), argValueFuture);
         }
-        return argFutures.entrySet().stream()
+        return resolveArgumentFutures(argFutures);
-                .collect(Collectors.toMap(
-                        Entry::getKey, // Keep the key as is
-                        entry -> {
-                            try {
-                                // Resolve the future to get the value
-                                return entry.getValue().get();
-                            } catch (ExecutionException | InterruptedException e) {
-                                throw new RuntimeException("Error getting future result for key: " + entry.getKey(), e);
-                            }
-                        }
-                ));
     }
 
     @Override
@@ -169,7 +120,7 @@ public class DefaultCalculatedFieldProcessingService implements CalculatedFieldP
             OutputType type = calculatedFieldResult.getType();
             TbMsgType msgType = OutputType.ATTRIBUTES.equals(type) ? TbMsgType.POST_ATTRIBUTES_REQUEST : TbMsgType.POST_TELEMETRY_REQUEST;
             TbMsgMetaData md = OutputType.ATTRIBUTES.equals(type) ? new TbMsgMetaData(Map.of(SCOPE, calculatedFieldResult.getScope().name())) : TbMsgMetaData.EMPTY;
-            TbMsg msg = TbMsg.newMsg().type(msgType).originator(entityId).previousCalculatedFieldIds(cfIds).metaData(md).data(calculatedFieldResult.getResult().toString()).build();
+            TbMsg msg = TbMsg.newMsg().type(msgType).originator(entityId).previousCalculatedFieldIds(cfIds).metaData(md).data(calculatedFieldResult.toStringOrElseNull()).build();
             clusterService.pushMsgToRuleEngine(tenantId, entityId, msg, new TbQueueCallback() {
                 @Override
                 public void onSuccess(TbQueueMsgMetadata metadata) {
@@ -241,69 +192,6 @@ public class DefaultCalculatedFieldProcessingService implements CalculatedFieldP
         return builder.build();
     }
 
-    private ListenableFuture<ArgumentEntry> fetchKvEntry(TenantId tenantId, EntityId entityId, Argument argument) {
-        return switch (argument.getRefEntityKey().getType()) {
-            case TS_ROLLING -> fetchTsRolling(tenantId, entityId, argument);
-            case ATTRIBUTE -> transformSingleValueArgument(
-                    Futures.transform(
-                            attributesService.find(tenantId, entityId, argument.getRefEntityKey().getScope(), argument.getRefEntityKey().getKey()),
-                            result -> result.or(() -> Optional.of(new BaseAttributeKvEntry(createDefaultKvEntry(argument), System.currentTimeMillis(), 0L))),
-                            calculatedFieldCallbackExecutor)
-            );
-            case TS_LATEST -> transformSingleValueArgument(
-                    Futures.transform(
-                            timeseriesService.findLatest(tenantId, entityId, argument.getRefEntityKey().getKey()),
-                            result -> result.or(() -> Optional.of(new BasicTsKvEntry(System.currentTimeMillis(), createDefaultKvEntry(argument), 0L))),
-                            calculatedFieldCallbackExecutor));
-        };
-    }
-
-    private ListenableFuture<ArgumentEntry> transformSingleValueArgument(ListenableFuture<Optional<? extends KvEntry>> kvEntryFuture) {
-        return Futures.transform(kvEntryFuture, kvEntry -> {
-            if (kvEntry.isPresent() && kvEntry.get().getValue() != null) {
-                return ArgumentEntry.createSingleValueArgument(kvEntry.get());
-            } else {
-                return new SingleValueArgumentEntry();
-            }
-        }, calculatedFieldCallbackExecutor);
-    }
-
-    private ListenableFuture<ArgumentEntry> fetchTsRolling(TenantId tenantId, EntityId entityId, Argument argument) {
-        long currentTime = System.currentTimeMillis();
-        long timeWindow = argument.getTimeWindow() == 0 ? System.currentTimeMillis() : argument.getTimeWindow();
-        long startTs = currentTime - timeWindow;
-        long maxDataPoints = apiLimitService.getLimit(tenantId, DefaultTenantProfileConfiguration::getMaxDataPointsPerRollingArg);
-        int argumentLimit = argument.getLimit();
-        int limit = argumentLimit == 0 || argumentLimit > maxDataPoints ? (int) maxDataPoints : argument.getLimit();
-
-        ReadTsKvQuery query = new BaseReadTsKvQuery(argument.getRefEntityKey().getKey(), startTs, currentTime, 0, limit, Aggregation.NONE);
-        ListenableFuture<List<TsKvEntry>> tsRollingFuture = timeseriesService.findAll(tenantId, entityId, List.of(query));
-
-        return Futures.transform(tsRollingFuture, tsRolling -> tsRolling == null ? new TsRollingArgumentEntry(limit, timeWindow) : ArgumentEntry.createTsRollingArgument(tsRolling, limit, timeWindow), calculatedFieldCallbackExecutor);
-    }
-
-    private KvEntry createDefaultKvEntry(Argument argument) {
-        String key = argument.getRefEntityKey().getKey();
-        String defaultValue = argument.getDefaultValue();
-        if (StringUtils.isBlank(defaultValue)) {
-            return new StringDataEntry(key, null);
-        }
-        if (NumberUtils.isParsable(defaultValue)) {
-            return new DoubleDataEntry(key, Double.parseDouble(defaultValue));
-        }
-        if ("true".equalsIgnoreCase(defaultValue) || "false".equalsIgnoreCase(defaultValue)) {
-            return new BooleanDataEntry(key, Boolean.parseBoolean(defaultValue));
-        }
-        return new StringDataEntry(key, defaultValue);
-    }
-
-    private CalculatedFieldState createStateByType(CalculatedFieldCtx ctx) {
-        return switch (ctx.getCfType()) {
-            case SIMPLE -> new SimpleCalculatedFieldState(ctx.getArgNames());
-            case SCRIPT -> new ScriptCalculatedFieldState(ctx.getArgNames());
-        };
-    }
-
     private static class TbCallbackWrapper implements TbQueueCallback {
         private final TbCallback callback;
 

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ArgumentEntry.java

@@ -19,10 +19,13 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.thingsboard.script.api.tbel.TbelCfArg;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.KvEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingArgumentEntry;
 
 import java.util.List;
+import java.util.Map;
 
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
@@ -31,7 +34,8 @@ import java.util.List;
 )
 @JsonSubTypes({
         @JsonSubTypes.Type(value = SingleValueArgumentEntry.class, name = "SINGLE_VALUE"),
-        @JsonSubTypes.Type(value = TsRollingArgumentEntry.class, name = "TS_ROLLING")
+        @JsonSubTypes.Type(value = TsRollingArgumentEntry.class, name = "TS_ROLLING"),
+        @JsonSubTypes.Type(value = GeofencingArgumentEntry.class, name = "GEOFENCING")
 })
 public interface ArgumentEntry {
 
@@ -58,4 +62,8 @@ public interface ArgumentEntry {
         return new TsRollingArgumentEntry(kvEntries, limit, timeWindow);
     }
 
+    static ArgumentEntry createGeofencingValueArgument(Map<EntityId, KvEntry> entityIdkvEntryMap) {
+        return new GeofencingArgumentEntry(entityIdkvEntryMap);
+    }
+
 }

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ArgumentEntryType.java

@@ -16,5 +16,5 @@
 package org.thingsboard.server.service.cf.ctx.state;
 
 public enum ArgumentEntryType {
-    SINGLE_VALUE, TS_ROLLING
+    SINGLE_VALUE, TS_ROLLING, GEOFENCING
 }

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java

@@ -25,8 +25,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.thingsboard.server.utils.CalculatedFieldUtils.toSingleValueArgumentProto;
-
 @Data
 @AllArgsConstructor
 public abstract class BaseCalculatedFieldState implements CalculatedFieldState {
@@ -64,7 +62,7 @@ public abstract class BaseCalculatedFieldState implements CalculatedFieldState {
             boolean entryUpdated;
 
             if (existingEntry == null || newEntry.isForceResetPrevious()) {
-                validateNewEntry(newEntry);
+                validateNewEntry(key, newEntry);
                 arguments.put(key, newEntry);
                 entryUpdated = true;
             } else {
@@ -95,19 +93,7 @@ public abstract class BaseCalculatedFieldState implements CalculatedFieldState {
         }
     }
 
-    @Override
+    protected void validateNewEntry(String key, ArgumentEntry newEntry) {}
-    public void checkArgumentSize(String name, ArgumentEntry entry, CalculatedFieldCtx ctx) {
-        if (entry instanceof TsRollingArgumentEntry) {
-            return;
-        }
-        if (entry instanceof SingleValueArgumentEntry singleValueArgumentEntry) {
-            if (ctx.getMaxSingleValueArgumentSize() > 0 && toSingleValueArgumentProto(name, singleValueArgumentEntry).getSerializedSize() > ctx.getMaxSingleValueArgumentSize()) {
-                throw new IllegalArgumentException("Single value size exceeds the maximum allowed limit. The argument will not be used for calculation.");
-            }
-        }
-    }
-
-    protected abstract void validateNewEntry(ArgumentEntry newEntry);
 
     private void updateLastUpdateTimestamp(ArgumentEntry entry) {
         long newTs = this.latestTimestamp;

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldCtx.java

@@ -25,10 +25,13 @@ import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
 import org.thingsboard.server.common.data.cf.configuration.ArgumentType;
-import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.ExpressionBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.Output;
 import org.thingsboard.server.common.data.cf.configuration.ReferencedEntityKey;
+import org.thingsboard.server.common.data.cf.configuration.ScheduledUpdateSupportedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.SimpleCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -36,14 +39,17 @@ import org.thingsboard.server.common.data.kv.AttributeKvEntry;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
 import org.thingsboard.server.common.util.ProtoUtils;
+import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.usagerecord.ApiLimitService;
 import org.thingsboard.server.gen.transport.TransportProtos.CalculatedFieldTelemetryMsgProto;
 import org.thingsboard.server.service.cf.ctx.CalculatedFieldEntityCtxId;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculatedFieldState;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import static org.thingsboard.common.util.ExpressionFunctionsUtil.userDefinedFunctions;
 
@@ -64,6 +70,7 @@ public class CalculatedFieldCtx {
     private String expression;
     private boolean useLatestTs;
     private TbelInvokeService tbelInvokeService;
+    private RelationService relationService;
     private CalculatedFieldScriptEngine calculatedFieldScriptEngine;
     private ThreadLocal<Expression> customExpression;
 
@@ -73,31 +80,63 @@ public class CalculatedFieldCtx {
     private long maxStateSize;
     private long maxSingleValueArgumentSize;
 
-    public CalculatedFieldCtx(CalculatedField calculatedField, TbelInvokeService tbelInvokeService, ApiLimitService apiLimitService) {
+    private boolean relationQueryDynamicArguments;
+    private List<String> mainEntityGeofencingArgumentNames;
+    private List<String> linkedEntityGeofencingArgumentNames;
+
+    private long scheduledUpdateIntervalMillis;
+
+    public CalculatedFieldCtx(CalculatedField calculatedField, TbelInvokeService tbelInvokeService, ApiLimitService apiLimitService, RelationService relationService) {
         this.calculatedField = calculatedField;
 
         this.cfId = calculatedField.getId();
         this.tenantId = calculatedField.getTenantId();
         this.entityId = calculatedField.getEntityId();
         this.cfType = calculatedField.getType();
-        CalculatedFieldConfiguration configuration = calculatedField.getConfiguration();
+        this.arguments = new HashMap<>();
-        this.arguments = configuration.getArguments();
         this.mainEntityArguments = new HashMap<>();
         this.linkedEntityArguments = new HashMap<>();
-        for (Map.Entry<String, Argument> entry : arguments.entrySet()) {
+        this.argNames = new ArrayList<>();
-            var refId = entry.getValue().getRefEntityId();
+        this.mainEntityGeofencingArgumentNames = new ArrayList<>();
-            var refKey = entry.getValue().getRefEntityKey();
+        this.linkedEntityGeofencingArgumentNames = new ArrayList<>();
-            if (refId == null || refId.equals(calculatedField.getEntityId())) {
+        this.output = calculatedField.getConfiguration().getOutput();
-                mainEntityArguments.put(refKey, entry.getKey());
+        if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration argBasedConfig) {
-            } else {
+            this.arguments.putAll(argBasedConfig.getArguments());
-                linkedEntityArguments.computeIfAbsent(refId, key -> new HashMap<>()).put(refKey, entry.getKey());
+            for (Map.Entry<String, Argument> entry : arguments.entrySet()) {
+                var refId = entry.getValue().getRefEntityId();
+                var refKey = entry.getValue().getRefEntityKey();
+                if (refId == null && entry.getValue().hasDynamicSource()) {
+                    relationQueryDynamicArguments = true;
+                    continue;
+                }
+                if (refId == null || refId.equals(calculatedField.getEntityId())) {
+                    mainEntityArguments.put(refKey, entry.getKey());
+                } else {
+                    linkedEntityArguments.computeIfAbsent(refId, key -> new HashMap<>()).put(refKey, entry.getKey());
+                }
+            }
+            this.argNames.addAll(arguments.keySet());
+            if (argBasedConfig instanceof ExpressionBasedCalculatedFieldConfiguration expressionBasedConfig) {
+                this.expression = expressionBasedConfig.getExpression();
+                this.useLatestTs = CalculatedFieldType.SIMPLE.equals(calculatedField.getType()) && ((SimpleCalculatedFieldConfiguration) argBasedConfig).isUseLatestTs();
             }
+            if (calculatedField.getConfiguration() instanceof GeofencingCalculatedFieldConfiguration geofencingConfig) {
+                geofencingConfig.getZoneGroups().forEach((zoneGroupName, config) -> {
+                    if (config.isCfEntitySource(entityId)) {
+                        mainEntityGeofencingArgumentNames.add(zoneGroupName);
+                        return;
+                    }
+                    if (config.isLinkedCfEntitySource(entityId)) {
+                        linkedEntityGeofencingArgumentNames.add(zoneGroupName);
+                    }
+                });
+            }
+        }
+        if (calculatedField.getConfiguration() instanceof ScheduledUpdateSupportedCalculatedFieldConfiguration scheduledConfig) {
+            this.scheduledUpdateIntervalMillis = scheduledConfig.isScheduledUpdateEnabled() ? TimeUnit.SECONDS.toMillis(scheduledConfig.getScheduledUpdateInterval()) : -1L;
         }
-        this.argNames = new ArrayList<>(arguments.keySet());
-        this.output = configuration.getOutput();
-        this.expression = configuration.getExpression();
-        this.useLatestTs = CalculatedFieldType.SIMPLE.equals(calculatedField.getType()) && ((SimpleCalculatedFieldConfiguration) configuration).isUseLatestTs();
         this.tbelInvokeService = tbelInvokeService;
+        this.relationService = relationService;
 
         this.maxDataPointsPerRollingArg = apiLimitService.getLimit(tenantId, DefaultTenantProfileConfiguration::getMaxDataPointsPerRollingArg);
         this.maxStateSize = apiLimitService.getLimit(tenantId, DefaultTenantProfileConfiguration::getMaxStateSizeInKBytes) * 1024;
@@ -105,25 +144,29 @@ public class CalculatedFieldCtx {
     }
 
     public void init() {
-        if (CalculatedFieldType.SCRIPT.equals(cfType)) {
+        switch (cfType) {
-            try {
+            case SCRIPT -> {
-                this.calculatedFieldScriptEngine = initEngine(tenantId, expression, tbelInvokeService);
+                try {
-                initialized = true;
+                    this.calculatedFieldScriptEngine = initEngine(tenantId, expression, tbelInvokeService);
-            } catch (Exception e) {
+                    initialized = true;
-                throw new RuntimeException("Failed to init calculated field ctx. Invalid expression syntax.", e);
+                } catch (Exception e) {
+                    throw new RuntimeException("Failed to init calculated field ctx. Invalid expression syntax.", e);
+                }
             }
-        } else {
+            case GEOFENCING -> initialized = true;
-            if (isValidExpression(expression)) {
+            case SIMPLE -> {
-                this.customExpression = ThreadLocal.withInitial(() ->
+                if (isValidExpression(expression)) {
-                        new ExpressionBuilder(expression)
+                    this.customExpression = ThreadLocal.withInitial(() ->
-                                .functions(userDefinedFunctions)
+                            new ExpressionBuilder(expression)
-                                .implicitMultiplication(true)
+                                    .functions(userDefinedFunctions)
-                                .variables(this.arguments.keySet())
+                                    .implicitMultiplication(true)
-                                .build()
+                                    .variables(this.arguments.keySet())
-                );
+                                    .build()
-                initialized = true;
+                    );
-            } else {
+                    initialized = true;
-                throw new RuntimeException("Failed to init calculated field ctx. Invalid expression syntax.");
+                } else {
+                    throw new RuntimeException("Failed to init calculated field ctx. Invalid expression syntax.");
+                }
             }
         }
     }
@@ -293,15 +336,42 @@ public class CalculatedFieldCtx {
     }
 
     public boolean hasOtherSignificantChanges(CalculatedFieldCtx other) {
-        boolean expressionChanged = !expression.equals(other.expression);
+        boolean expressionChanged = calculatedField.getConfiguration() instanceof ExpressionBasedCalculatedFieldConfiguration && !expression.equals(other.expression);
         boolean outputChanged = !output.equals(other.output);
-        return expressionChanged || outputChanged;
+        boolean scheduledUpdatesConfigChanged = scheduledUpdateIntervalMillis != other.scheduledUpdateIntervalMillis;
+        return expressionChanged || outputChanged || scheduledUpdatesConfigChanged;
     }
 
     public boolean hasStateChanges(CalculatedFieldCtx other) {
         boolean typeChanged = !cfType.equals(other.cfType);
         boolean argumentsChanged = !arguments.equals(other.arguments);
-        return typeChanged || argumentsChanged;
+        boolean geoZoneGroupsConfigChanged = hasGeofencingZoneGroupConfigurationChanges(other);
+        return typeChanged || argumentsChanged || geoZoneGroupsConfigChanged;
+    }
+
+    private boolean hasGeofencingZoneGroupConfigurationChanges(CalculatedFieldCtx other) {
+        if (calculatedField.getConfiguration() instanceof GeofencingCalculatedFieldConfiguration thisConfig
+            && other.calculatedField.getConfiguration() instanceof GeofencingCalculatedFieldConfiguration otherConfig) {
+            return !thisConfig.getZoneGroups().equals(otherConfig.getZoneGroups());
+        }
+        return false;
+    }
+
+    public boolean hasRelationQueryDynamicArguments() {
+        return relationQueryDynamicArguments && scheduledUpdateIntervalMillis != -1;
+    }
+
+    public boolean shouldFetchDynamicArgumentsFromDb(CalculatedFieldState state) {
+        if (!hasRelationQueryDynamicArguments()) {
+            return false;
+        }
+        if (!(state instanceof GeofencingCalculatedFieldState geofencingState)) {
+            return false;
+        }
+        if (geofencingState.getLastDynamicArgumentsRefreshTs() == -1L) {
+            return true;
+        }
+        return geofencingState.getLastDynamicArgumentsRefreshTs() < System.currentTimeMillis() - scheduledUpdateIntervalMillis;
     }
 
     public String getSizeExceedsLimitMessage() {

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/CalculatedFieldState.java

@@ -20,12 +20,17 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.google.common.util.concurrent.ListenableFuture;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.service.cf.CalculatedFieldResult;
 import org.thingsboard.server.service.cf.ctx.CalculatedFieldEntityCtxId;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculatedFieldState;
 
 import java.util.List;
 import java.util.Map;
 
+import static org.thingsboard.server.utils.CalculatedFieldUtils.toSingleValueArgumentProto;
+
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
         include = JsonTypeInfo.As.PROPERTY,
@@ -34,6 +39,7 @@ import java.util.Map;
 @JsonSubTypes({
         @JsonSubTypes.Type(value = SimpleCalculatedFieldState.class, name = "SIMPLE"),
         @JsonSubTypes.Type(value = ScriptCalculatedFieldState.class, name = "SCRIPT"),
+        @JsonSubTypes.Type(value = GeofencingCalculatedFieldState.class, name = "GEOFENCING"),
 })
 public interface CalculatedFieldState {
 
@@ -48,7 +54,7 @@ public interface CalculatedFieldState {
 
     boolean updateState(CalculatedFieldCtx ctx, Map<String, ArgumentEntry> argumentValues);
 
-    ListenableFuture<CalculatedFieldResult> performCalculation(CalculatedFieldCtx ctx);
+    ListenableFuture<CalculatedFieldResult> performCalculation(EntityId entityId, CalculatedFieldCtx ctx);
 
     @JsonIgnore
     boolean isReady();
@@ -62,6 +68,15 @@ public interface CalculatedFieldState {
 
     void checkStateSize(CalculatedFieldEntityCtxId ctxId, long maxStateSize);
 
-    void checkArgumentSize(String name, ArgumentEntry entry, CalculatedFieldCtx ctx);
+    default void checkArgumentSize(String name, ArgumentEntry entry, CalculatedFieldCtx ctx) {
+        if (entry instanceof TsRollingArgumentEntry || entry instanceof GeofencingArgumentEntry) {
+            return;
+        }
+        if (entry instanceof SingleValueArgumentEntry singleValueArgumentEntry) {
+            if (ctx.getMaxSingleValueArgumentSize() > 0 && toSingleValueArgumentProto(name, singleValueArgumentEntry).getSerializedSize() > ctx.getMaxSingleValueArgumentSize()) {
+                throw new IllegalArgumentException("Single value size exceeds the maximum allowed limit. The argument will not be used for calculation.");
+            }
+        }
+    }
 
 }

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldState.java

@@ -20,6 +20,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.script.api.tbel.TbelCfArg;
@@ -27,6 +28,7 @@ import org.thingsboard.script.api.tbel.TbelCfCtx;
 import org.thingsboard.script.api.tbel.TbelCfSingleValueArg;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Output;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.service.cf.CalculatedFieldResult;
 
 import java.util.ArrayList;
@@ -37,6 +39,7 @@ import java.util.Map;
 @Data
 @Slf4j
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public class ScriptCalculatedFieldState extends BaseCalculatedFieldState {
 
     public ScriptCalculatedFieldState(List<String> requiredArguments) {
@@ -49,11 +52,7 @@ public class ScriptCalculatedFieldState extends BaseCalculatedFieldState {
     }
 
     @Override
-    protected void validateNewEntry(ArgumentEntry newEntry) {
+    public ListenableFuture<CalculatedFieldResult> performCalculation(EntityId entityId, CalculatedFieldCtx ctx) {
-    }
-
-    @Override
-    public ListenableFuture<CalculatedFieldResult> performCalculation(CalculatedFieldCtx ctx) {
         Map<String, TbelCfArg> arguments = new LinkedHashMap<>();
         List<Object> args = new ArrayList<>(ctx.getArgNames().size() + 1);
         args.add(new Object()); // first element is a ctx, but we will set it later;

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldState.java

@@ -20,11 +20,13 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.script.api.tbel.TbUtils;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Output;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.kv.BasicKvEntry;
 import org.thingsboard.server.service.cf.CalculatedFieldResult;
 
@@ -33,6 +35,7 @@ import java.util.Map;
 
 @Data
 @NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public class SimpleCalculatedFieldState extends BaseCalculatedFieldState {
 
     public SimpleCalculatedFieldState(List<String> requiredArguments) {
@@ -45,14 +48,15 @@ public class SimpleCalculatedFieldState extends BaseCalculatedFieldState {
     }
 
     @Override
-    protected void validateNewEntry(ArgumentEntry newEntry) {
+    protected void validateNewEntry(String key, ArgumentEntry newEntry) {
         if (newEntry instanceof TsRollingArgumentEntry) {
-            throw new IllegalArgumentException("Rolling argument entry is not supported for simple calculated fields.");
+            throw new IllegalArgumentException("Unsupported argument type detected for argument: " + key + ". " +
+                                               "Rolling argument entry is not supported for simple calculated fields.");
         }
     }
 
     @Override
-    public ListenableFuture<CalculatedFieldResult> performCalculation(CalculatedFieldCtx ctx) {
+    public ListenableFuture<CalculatedFieldResult> performCalculation(EntityId entityId, CalculatedFieldCtx ctx) {
         var expr = ctx.getCustomExpression().get();
 
         for (Map.Entry<String, ArgumentEntry> entry : this.arguments.entrySet()) {

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/geofencing/GeofencingArgumentEntry.java

@@ -0,0 +1,111 @@
+/**
+ * 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.service.cf.ctx.state.geofencing;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.script.api.tbel.TbelCfArg;
+import org.thingsboard.script.api.tbel.TbelCfTsGeofencingArg;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.util.ProtoUtils;
+import org.thingsboard.server.gen.transport.TransportProtos;
+import org.thingsboard.server.service.cf.ctx.state.ArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.ArgumentEntryType;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Data
+@Slf4j
+public class GeofencingArgumentEntry implements ArgumentEntry {
+
+    private Map<EntityId, GeofencingZoneState> zoneStates;
+
+    private boolean forceResetPrevious;
+
+    public GeofencingArgumentEntry() {
+    }
+
+    public GeofencingArgumentEntry(EntityId entityId, TransportProtos.AttributeValueProto entry) {
+        this(Map.of(entityId, ProtoUtils.fromProto(entry)));
+    }
+
+    public GeofencingArgumentEntry(Map<EntityId, KvEntry> entityIdkvEntryMap) {
+        this.zoneStates = toZones(entityIdkvEntryMap);
+    }
+
+    @Override
+    public ArgumentEntryType getType() {
+        return ArgumentEntryType.GEOFENCING;
+    }
+
+    @Override
+    public Object getValue() {
+        return zoneStates;
+    }
+
+    @Override
+    public boolean updateEntry(ArgumentEntry entry) {
+        if (!(entry instanceof GeofencingArgumentEntry geofencingArgumentEntry)) {
+            throw new IllegalArgumentException("Unsupported argument entry type for geofencing argument entry: " + entry.getType());
+        }
+        if (geofencingArgumentEntry.isEmpty()) {
+            zoneStates.clear();
+            return true;
+        }
+        boolean updated = false;
+        for (var zoneEntry : geofencingArgumentEntry.getZoneStates().entrySet()) {
+            if (updateZone(zoneEntry)) {
+                updated = true;
+            }
+        }
+        return updated;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return zoneStates == null || zoneStates.isEmpty();
+    }
+
+    @Override
+    public TbelCfArg toTbelCfArg() {
+        return new TbelCfTsGeofencingArg(zoneStates);
+    }
+
+    private Map<EntityId, GeofencingZoneState> toZones(Map<EntityId, KvEntry> entityIdKvEntryMap) {
+        return entityIdKvEntryMap.entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey,
+                        entry -> new GeofencingZoneState(entry.getKey(), entry.getValue())));
+    }
+
+    private boolean updateZone(Map.Entry<EntityId, GeofencingZoneState> zoneEntry) {
+        EntityId zoneId = zoneEntry.getKey();
+        GeofencingZoneState newZoneState = zoneEntry.getValue();
+
+        GeofencingZoneState existingZoneState = zoneStates.get(zoneId);
+        if (existingZoneState == null) {
+            zoneStates.put(zoneId, newZoneState);
+            return true;
+        }
+        if (newZoneState.getPerimeterDefinition() == null) {
+            zoneStates.remove(zoneId);
+            return true;
+        }
+        return existingZoneState.update(newZoneState);
+    }
+
+}

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/geofencing/GeofencingCalculatedFieldState.java

@@ -0,0 +1,188 @@
+/**
+ * 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.service.cf.ctx.state.geofencing;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.geo.Coordinates;
+import org.thingsboard.server.common.data.cf.CalculatedFieldType;
+import org.thingsboard.server.common.data.cf.configuration.OutputType;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingReportStrategy;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingTransitionEvent;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.ZoneGroupConfiguration;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.service.cf.CalculatedFieldResult;
+import org.thingsboard.server.service.cf.ctx.state.ArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.ArgumentEntryType;
+import org.thingsboard.server.service.cf.ctx.state.BaseCalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx;
+import org.thingsboard.server.service.cf.ctx.state.SingleValueArgumentEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LATITUDE_ARGUMENT_KEY;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LONGITUDE_ARGUMENT_KEY;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus.INSIDE;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus.OUTSIDE;
+
+@Data
+@Slf4j
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class GeofencingCalculatedFieldState extends BaseCalculatedFieldState {
+
+    private long lastDynamicArgumentsRefreshTs = -1;
+
+    public GeofencingCalculatedFieldState(List<String> requiredArguments) {
+        super(requiredArguments);
+    }
+
+    @Override
+    public CalculatedFieldType getType() {
+        return CalculatedFieldType.GEOFENCING;
+    }
+
+    @Override
+    protected void validateNewEntry(String key, ArgumentEntry newEntry) {
+        switch (key) {
+            case ENTITY_ID_LATITUDE_ARGUMENT_KEY, ENTITY_ID_LONGITUDE_ARGUMENT_KEY -> {
+                if (!(newEntry instanceof SingleValueArgumentEntry)) {
+                    throw new IllegalArgumentException("Unsupported argument entry type for " + key + " argument: " + newEntry.getType() + ". " +
+                                                       "Only SINGLE_VALUE type is allowed.");
+                }
+            }
+            default -> {
+                if (!(newEntry instanceof GeofencingArgumentEntry)) {
+                    throw new IllegalArgumentException("Unsupported argument entry type for " + key + " argument: " + newEntry.getType() + ". " +
+                                                       "Only GEOFENCING type is allowed.");
+                }
+            }
+        }
+    }
+
+    @Override
+    public ListenableFuture<CalculatedFieldResult> performCalculation(EntityId entityId, CalculatedFieldCtx ctx) {
+        double latitude = (double) arguments.get(ENTITY_ID_LATITUDE_ARGUMENT_KEY).getValue();
+        double longitude = (double) arguments.get(ENTITY_ID_LONGITUDE_ARGUMENT_KEY).getValue();
+        Coordinates entityCoordinates = new Coordinates(latitude, longitude);
+
+        var geofencingCfg = (GeofencingCalculatedFieldConfiguration) ctx.getCalculatedField().getConfiguration();
+        Map<String, ZoneGroupConfiguration> zoneGroups = geofencingCfg.getZoneGroups();
+
+        ObjectNode valuesNode = JacksonUtil.newObjectNode();
+        List<ListenableFuture<Boolean>> relationFutures = new ArrayList<>();
+
+        getGeofencingArguments().forEach((argumentKey, argumentEntry) -> {
+            ZoneGroupConfiguration zoneGroupCfg = zoneGroups.get(argumentKey);
+            if (zoneGroupCfg == null) {
+                throw new RuntimeException("Zone group configuration is missing for the: " + entityId);
+            }
+            boolean createRelationsWithMatchedZones = zoneGroupCfg.isCreateRelationsWithMatchedZones();
+            List<GeofencingEvalResult> zoneResults = new ArrayList<>(argumentEntry.getZoneStates().size());
+            argumentEntry.getZoneStates().forEach((zoneId, zoneState) -> {
+                GeofencingEvalResult eval = zoneState.evaluate(entityCoordinates);
+                zoneResults.add(eval);
+                if (createRelationsWithMatchedZones) {
+                    GeofencingTransitionEvent transitionEvent = eval.transition();
+                    if (transitionEvent == null) {
+                        return;
+                    }
+                    EntityRelation relation = switch (zoneGroupCfg.getDirection()) {
+                        case TO -> new EntityRelation(zoneId, entityId, zoneGroupCfg.getRelationType());
+                        case FROM -> new EntityRelation(entityId, zoneId, zoneGroupCfg.getRelationType());
+                    };
+                    ListenableFuture<Boolean> f = switch (transitionEvent) {
+                        case ENTERED -> ctx.getRelationService().saveRelationAsync(ctx.getTenantId(), relation);
+                        case LEFT -> ctx.getRelationService().deleteRelationAsync(ctx.getTenantId(), relation);
+                    };
+                    relationFutures.add(f);
+                }
+            });
+            updateValuesNode(argumentKey, zoneResults, zoneGroupCfg.getReportStrategy(), valuesNode);
+        });
+
+        OutputType outputType = ctx.getOutput().getType();
+        var result = new CalculatedFieldResult(ctx.getOutput().getType(), ctx.getOutput().getScope(), toResultNode(outputType, valuesNode));
+        if (relationFutures.isEmpty()) {
+            return Futures.immediateFuture(result);
+        }
+        return Futures.whenAllComplete(relationFutures).call(() -> result, MoreExecutors.directExecutor());
+    }
+
+    private Map<String, GeofencingArgumentEntry> getGeofencingArguments() {
+        return arguments.entrySet()
+                .stream()
+                .filter(entry -> entry.getValue().getType().equals(ArgumentEntryType.GEOFENCING))
+                .collect(Collectors.toMap(Map.Entry::getKey, entry -> (GeofencingArgumentEntry) entry.getValue()));
+    }
+
+    private void updateValuesNode(String argumentKey, List<GeofencingEvalResult> zoneResults, GeofencingReportStrategy geofencingReportStrategy, ObjectNode resultNode) {
+        GeofencingEvalResult aggregationResult = aggregateZoneGroup(zoneResults);
+        final String eventKey = argumentKey + "Event";
+        final String statusKey = argumentKey + "Status";
+        switch (geofencingReportStrategy) {
+            case REPORT_TRANSITION_EVENTS_ONLY -> addTransitionEventIfExists(resultNode, aggregationResult, eventKey);
+            case REPORT_PRESENCE_STATUS_ONLY -> resultNode.put(statusKey, aggregationResult.status().name());
+            case REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS -> {
+                addTransitionEventIfExists(resultNode, aggregationResult, eventKey);
+                resultNode.put(statusKey, aggregationResult.status().name());
+            }
+        }
+    }
+
+    private JsonNode toResultNode(OutputType outputType, ObjectNode valuesNode) {
+        if (OutputType.ATTRIBUTES.equals(outputType) || latestTimestamp == -1) {
+            return valuesNode;
+        }
+        ObjectNode resultNode = JacksonUtil.newObjectNode();
+        resultNode.put("ts", latestTimestamp);
+        resultNode.set("values", valuesNode);
+        return resultNode;
+    }
+
+    private GeofencingEvalResult aggregateZoneGroup(List<GeofencingEvalResult> zoneResults) {
+        boolean nowInside = zoneResults.stream().anyMatch(r -> INSIDE.equals(r.status()));
+        boolean prevInside = zoneResults.stream()
+                .anyMatch(r -> GeofencingTransitionEvent.LEFT.equals(r.transition()) || r.transition() == null && r.status() == INSIDE);
+        GeofencingTransitionEvent transition = null;
+        if (!prevInside && nowInside) {
+            transition = GeofencingTransitionEvent.ENTERED;
+        } else if (prevInside && !nowInside) {
+            transition = GeofencingTransitionEvent.LEFT;
+        }
+        return new GeofencingEvalResult(transition, nowInside ? INSIDE : OUTSIDE);
+    }
+
+    private void addTransitionEventIfExists(ObjectNode resultNode, GeofencingEvalResult aggregationResult, String eventKey) {
+        if (aggregationResult.transition() != null) {
+            resultNode.put(eventKey, aggregationResult.transition().name());
+        }
+    }
+
+}

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/geofencing/GeofencingEvalResult.java

@@ -0,0 +1,24 @@
+/**
+ * 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.service.cf.ctx.state.geofencing;
+
+import jakarta.annotation.Nullable;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingTransitionEvent;
+
+public record GeofencingEvalResult(@Nullable GeofencingTransitionEvent transition,
+                                   GeofencingPresenceStatus status) {
+}

application/src/main/java/org/thingsboard/server/service/cf/ctx/state/geofencing/GeofencingZoneState.java

@@ -0,0 +1,106 @@
+/**
+ * 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.service.cf.ctx.state.geofencing;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.common.util.geo.Coordinates;
+import org.thingsboard.common.util.geo.PerimeterDefinition;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingTransitionEvent;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.kv.AttributeKvEntry;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.util.ProtoUtils;
+import org.thingsboard.server.gen.transport.TransportProtos.GeofencingZoneProto;
+
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus.INSIDE;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus.OUTSIDE;
+
+@Data
+public class GeofencingZoneState {
+
+    private final EntityId zoneId;
+
+    private long ts;
+    private Long version;
+    private PerimeterDefinition perimeterDefinition;
+
+    @EqualsAndHashCode.Exclude
+    private GeofencingPresenceStatus lastPresence;
+
+    public GeofencingZoneState(EntityId zoneId, KvEntry entry) {
+        this.zoneId = zoneId;
+        if (!(entry instanceof AttributeKvEntry attributeKvEntry)) {
+            throw new IllegalArgumentException("Unsupported KvEntry type for geofencing zone state: " + entry.getClass().getSimpleName());
+        }
+        this.ts = attributeKvEntry.getLastUpdateTs();
+        this.version = attributeKvEntry.getVersion();
+        this.perimeterDefinition = JacksonUtil.fromString(entry.getValueAsString(), PerimeterDefinition.class);
+    }
+
+    public GeofencingZoneState(GeofencingZoneProto proto) {
+        this.zoneId = ProtoUtils.fromProto(proto.getZoneId());
+        this.ts = proto.getTs();
+        this.version = proto.getVersion();
+        this.perimeterDefinition = JacksonUtil.fromString(proto.getPerimeterDefinition(), PerimeterDefinition.class);
+        if (proto.hasInside()) {
+            this.lastPresence = proto.getInside() ? INSIDE : OUTSIDE;
+        }
+    }
+
+    public boolean update(GeofencingZoneState newZoneState) {
+        if (newZoneState.getTs() <= this.ts) {
+            return false;
+        }
+        Long newVersion = newZoneState.getVersion();
+        if (newVersion == null || this.version == null || newVersion > this.version) {
+            this.ts = newZoneState.getTs();
+            this.version = newVersion;
+            this.perimeterDefinition = newZoneState.getPerimeterDefinition();
+            this.lastPresence = null;
+            return true;
+        }
+        return false;
+    }
+
+    public GeofencingEvalResult evaluate(Coordinates entityCoordinates) {
+        boolean nowInside = perimeterDefinition.checkMatches(entityCoordinates);
+
+        GeofencingPresenceStatus status = nowInside ? INSIDE : OUTSIDE;
+
+        // first evaluation
+        if (this.lastPresence == null) {
+            this.lastPresence = status;
+            GeofencingTransitionEvent transition = null;
+            if (status == GeofencingPresenceStatus.INSIDE) {
+                transition = GeofencingTransitionEvent.ENTERED;
+            }
+            return new GeofencingEvalResult(transition, status);
+        }
+        // State changed
+        if (this.lastPresence != status) {
+            this.lastPresence = status;
+            GeofencingTransitionEvent transition = (status == GeofencingPresenceStatus.INSIDE) ?
+                    GeofencingTransitionEvent.ENTERED : GeofencingTransitionEvent.LEFT;
+            return new GeofencingEvalResult(transition, status);
+        }
+        // State unchanged
+        return new GeofencingEvalResult(null, status);
+    }
+
+}

application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java

@@ -93,14 +93,13 @@ import static org.thingsboard.server.service.state.DefaultDeviceStateService.LAS
 @TbCoreComponent
 public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase implements EdgeRpcService {
 
-    private static final int DESTROY_SESSION_MAX_ATTEMPTS = 10;
-
     private final ConcurrentMap<EdgeId, EdgeGrpcSession> sessions = new ConcurrentHashMap<>();
     private final ConcurrentMap<EdgeId, Lock> sessionNewEventsLocks = new ConcurrentHashMap<>();
     private final Map<EdgeId, Boolean> sessionNewEvents = new HashMap<>();
     private final ConcurrentMap<EdgeId, ScheduledFuture<?>> sessionEdgeEventChecks = new ConcurrentHashMap<>();
     private final ConcurrentMap<UUID, Consumer<FromEdgeSyncResponse>> localSyncEdgeRequests = new ConcurrentHashMap<>();
     private final ConcurrentMap<EdgeId, Boolean> edgeEventsMigrationProcessed = new ConcurrentHashMap<>();
+    private final List<EdgeGrpcSession> zombieSessions = new ArrayList<>();
 
     @Value("${edges.rpc.port}")
     private int rpcPort;
@@ -193,7 +192,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
         this.edgeEventProcessingExecutorService = ThingsBoardExecutors.newScheduledThreadPool(schedulerPoolSize, "edge-event-check-scheduler");
         this.sendDownlinkExecutorService = ThingsBoardExecutors.newScheduledThreadPool(sendSchedulerPoolSize, "edge-send-scheduler");
         this.executorService = ThingsBoardExecutors.newSingleThreadScheduledExecutor("edge-service");
-        this.executorService.scheduleAtFixedRate(this::destroyKafkaSessionIfDisconnectedAndConsumerActive, 60, 60, TimeUnit.SECONDS);
+        this.executorService.scheduleAtFixedRate(this::cleanupZombieSessions, 60, 60, TimeUnit.SECONDS);
         log.info("Edge RPC service initialized!");
     }
 
@@ -518,14 +517,10 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
 
     private void destroySession(EdgeGrpcSession session) {
         try (session) {
-            for (int i = 0; i < DESTROY_SESSION_MAX_ATTEMPTS; i++) {
+            if (!session.destroy()) {
-                if (session.destroy()) {
+                log.warn("[{}][{}] Session destroy failed for edge [{}] with session id [{}]. Adding to zombie queue for later cleanup.",
-                    break;
+                        session.getTenantId(), session.getEdge().getId(), session.getEdge().getName(), session.getSessionId());
-                } else {
+                zombieSessions.add(session);
-                    try {
-                        Thread.sleep(100);
-                    } catch (InterruptedException ignored) {}
-                }
             }
         }
     }
@@ -634,7 +629,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
         }
     }
 
-    private void destroyKafkaSessionIfDisconnectedAndConsumerActive() {
+    private void cleanupZombieSessions() {
         try {
             List<EdgeId> toRemove = new ArrayList<>();
             for (EdgeGrpcSession session : sessions.values()) {
@@ -655,9 +650,19 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
                     }
                 }
             }
+            zombieSessions.removeIf(zombie -> {
+                if (zombie.destroy()) {
+                    log.info("[{}][{}] Successfully cleaned up zombie session [{}] for edge [{}].",
+                            zombie.getTenantId(), zombie.getEdge().getId(), zombie.getSessionId(), zombie.getEdge().getName());
+                    return true;
+                } else {
+                    log.warn("[{}][{}] Failed to remove zombie session [{}] for edge [{}].",
+                            zombie.getTenantId(), zombie.getEdge().getId(), zombie.getSessionId(), zombie.getEdge().getName());
+                    return false;
+                }
+            });
         } catch (Exception e) {
             log.warn("Failed to cleanup kafka sessions", e);
         }
     }
-
 }

application/src/main/java/org/thingsboard/server/service/query/DefaultEntityQueryService.java

@@ -238,7 +238,7 @@ public class DefaultEntityQueryService implements EntityQueryService {
             entitiesSortOrder = sortOrder;
         }
         EntityDataPageLink edpl = new EntityDataPageLink(maxEntitiesPerAlarmSubscription, 0, null, entitiesSortOrder);
-        return new EntityDataQuery(query.getEntityFilter(), edpl, null, null, query.getKeyFilters());
+        return new EntityDataQuery(query.getEntityFilter(), edpl, query.getEntityFields(), query.getLatestValues(), query.getKeyFilters());
     }
 
     @Override

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCalculatedFieldConsumerService.java

@@ -35,6 +35,7 @@ import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
+import org.thingsboard.server.dao.resource.TbResourceDataCache;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.gen.transport.TransportProtos.CalculatedFieldLinkedTelemetryMsgProto;
 import org.thingsboard.server.gen.transport.TransportProtos.CalculatedFieldTelemetryMsgProto;
@@ -83,6 +84,7 @@ public class DefaultTbCalculatedFieldConsumerService extends AbstractPartitionBa
                                                    ActorSystemContext actorContext,
                                                    TbDeviceProfileCache deviceProfileCache,
                                                    TbAssetProfileCache assetProfileCache,
+                                                   TbResourceDataCache tbResourceDataCache,
                                                    TbTenantProfileCache tenantProfileCache,
                                                    TbApiUsageStateService apiUsageStateService,
                                                    PartitionService partitionService,
@@ -90,7 +92,7 @@ public class DefaultTbCalculatedFieldConsumerService extends AbstractPartitionBa
                                                    JwtSettingsService jwtSettingsService,
                                                    CalculatedFieldCache calculatedFieldCache,
                                                    CalculatedFieldStateService stateService) {
-        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, calculatedFieldCache, apiUsageStateService, partitionService,
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, calculatedFieldCache, apiUsageStateService, partitionService,
                 eventPublisher, jwtSettingsService);
         this.queueFactory = tbQueueFactory;
         this.stateService = stateService;

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbClusterService.java

@@ -48,6 +48,7 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.msg.TbMsgType;
 import org.thingsboard.server.common.data.page.PageData;
@@ -435,8 +436,9 @@ public class DefaultTbClusterService implements TbClusterService {
 
     @Override
     public void onResourceChange(TbResourceInfo resource, TbQueueCallback callback) {
+        TenantId tenantId = resource.getTenantId();
+        TbResourceId resourceId = resource.getId();
         if (resource.getResourceType() == ResourceType.LWM2M_MODEL) {
-            TenantId tenantId = resource.getTenantId();
             log.trace("[{}][{}][{}] Processing change resource", tenantId, resource.getResourceType(), resource.getResourceKey());
             ResourceUpdateMsg resourceUpdateMsg = ResourceUpdateMsg.newBuilder()
                     .setTenantIdMSB(tenantId.getId().getMostSignificantBits())
@@ -447,6 +449,7 @@ public class DefaultTbClusterService implements TbClusterService {
             ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setResourceUpdateMsg(resourceUpdateMsg).build();
             broadcast(transportMsg, DataConstants.LWM2M_TRANSPORT_NAME, callback);
         }
+        broadcastEntityStateChangeEvent(tenantId, resourceId, ComponentLifecycleEvent.UPDATED);
     }
 
     @Override
@@ -462,6 +465,7 @@ public class DefaultTbClusterService implements TbClusterService {
             ToTransportMsg transportMsg = ToTransportMsg.newBuilder().setResourceDeleteMsg(resourceDeleteMsg).build();
             broadcast(transportMsg, DataConstants.LWM2M_TRANSPORT_NAME, callback);
         }
+        broadcastEntityStateChangeEvent(resource.getTenantId(), resource.getId(), ComponentLifecycleEvent.DELETED);
     }
 
     private <T> void broadcastEntityChangeToTransport(TenantId tenantId, EntityId entityid, T entity, TbQueueCallback callback) {
@@ -592,7 +596,8 @@ public class DefaultTbClusterService implements TbClusterService {
                 EntityType.TENANT_PROFILE,
                 EntityType.DEVICE_PROFILE,
                 EntityType.ASSET_PROFILE,
-                EntityType.JOB)
+                EntityType.JOB,
+                EntityType.TB_RESOURCE)
                 || (entityType == EntityType.ASSET && msg.getEvent() == ComponentLifecycleEvent.UPDATED)
                 || (entityType == EntityType.DEVICE && msg.getEvent() == ComponentLifecycleEvent.UPDATED)
         ) {

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java

@@ -55,6 +55,7 @@ import org.thingsboard.server.common.stats.StatsFactory;
 import org.thingsboard.server.common.util.KvProtoUtil;
 import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.dao.resource.ImageCacheKey;
+import org.thingsboard.server.dao.resource.TbResourceDataCache;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceStateServiceMsgProto;
@@ -176,10 +177,11 @@ public class DefaultTbCoreConsumerService extends AbstractConsumerService<ToCore
                                         NotificationSchedulerService notificationSchedulerService,
                                         NotificationRuleProcessor notificationRuleProcessor,
                                         TbImageService imageService,
+                                        TbResourceDataCache tbResourceDataCache,
                                         RuleEngineCallService ruleEngineCallService,
                                         CalculatedFieldCache calculatedFieldCache,
                                         EdqsService edqsService) {
-        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, calculatedFieldCache, apiUsageStateService, partitionService,
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, calculatedFieldCache, apiUsageStateService, partitionService,
                 eventPublisher, jwtSettingsService);
         this.stateService = stateService;
         this.localSubscriptionService = localSubscriptionService;

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbEdgeConsumerService.java

@@ -87,7 +87,7 @@ public class DefaultTbEdgeConsumerService extends AbstractConsumerService<ToEdge
 
     public DefaultTbEdgeConsumerService(TbCoreQueueFactory tbCoreQueueFactory, ActorSystemContext actorContext,
                                         StatsFactory statsFactory, EdgeContextComponent edgeCtx) {
-        super(actorContext, null, null, null, null, null, null,
+        super(actorContext, null, null, null, null, null, null, null,
                 null, null);
         this.edgeCtx = edgeCtx;
         this.stats = new EdgeConsumerStats(statsFactory);

application/src/main/java/org/thingsboard/server/service/queue/DefaultTbRuleEngineConsumerService.java

@@ -33,6 +33,7 @@ import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
 import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.dao.queue.QueueService;
+import org.thingsboard.server.dao.resource.TbResourceDataCache;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.QueueDeleteMsg;
@@ -78,13 +79,14 @@ public class DefaultTbRuleEngineConsumerService extends AbstractPartitionBasedCo
                                               QueueService queueService,
                                               TbDeviceProfileCache deviceProfileCache,
                                               TbAssetProfileCache assetProfileCache,
+                                              TbResourceDataCache tbResourceDataCache,
                                               TbTenantProfileCache tenantProfileCache,
                                               TbApiUsageStateService apiUsageStateService,
                                               PartitionService partitionService,
                                               ApplicationEventPublisher eventPublisher,
                                               JwtSettingsService jwtSettingsService,
                                               CalculatedFieldCache calculatedFieldCache) {
-        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, calculatedFieldCache, apiUsageStateService, partitionService, eventPublisher, jwtSettingsService);
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, calculatedFieldCache, apiUsageStateService, partitionService, eventPublisher, jwtSettingsService);
         this.ctx = ctx;
         this.tbDeviceRpcService = tbDeviceRpcService;
         this.queueService = queueService;

application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractConsumerService.java

@@ -30,12 +30,14 @@ import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.queue.ServiceType;
 import org.thingsboard.server.common.msg.queue.TbCallback;
+import org.thingsboard.server.dao.resource.TbResourceDataCache;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.queue.TbQueueConsumer;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
@@ -72,6 +74,7 @@ public abstract class AbstractConsumerService<N extends com.google.protobuf.Gene
     protected final TbTenantProfileCache tenantProfileCache;
     protected final TbDeviceProfileCache deviceProfileCache;
     protected final TbAssetProfileCache assetProfileCache;
+    protected final TbResourceDataCache tbResourceDataCache;
     protected final CalculatedFieldCache calculatedFieldCache;
     protected final TbApiUsageStateService apiUsageStateService;
     protected final PartitionService partitionService;
@@ -202,6 +205,8 @@ public abstract class AbstractConsumerService<N extends com.google.protobuf.Gene
             } else {
                 calculatedFieldCache.evict((CalculatedFieldId) componentLifecycleMsg.getEntityId());
             }
+        }  else if (EntityType.TB_RESOURCE.equals(componentLifecycleMsg.getEntityId().getEntityType())) {
+            tbResourceDataCache.evictResourceData(tenantId, new TbResourceId(componentLifecycleMsg.getEntityId().getId()));
         }
 
         eventPublisher.publishEvent(componentLifecycleMsg);

application/src/main/java/org/thingsboard/server/service/queue/processing/AbstractPartitionBasedConsumerService.java

@@ -18,6 +18,7 @@ package org.thingsboard.server.service.queue.processing;
 import jakarta.annotation.PostConstruct;
 import org.springframework.context.ApplicationEventPublisher;
 import org.thingsboard.server.actors.ActorSystemContext;
+import org.thingsboard.server.dao.resource.TbResourceDataCache;
 import org.thingsboard.server.dao.tenant.TbTenantProfileCache;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.event.PartitionChangeEvent;
@@ -43,12 +44,13 @@ public abstract class AbstractPartitionBasedConsumerService<N extends com.google
                                                  TbTenantProfileCache tenantProfileCache,
                                                  TbDeviceProfileCache deviceProfileCache,
                                                  TbAssetProfileCache assetProfileCache,
+                                                 TbResourceDataCache tbResourceDataCache,
                                                  CalculatedFieldCache calculatedFieldCache,
                                                  TbApiUsageStateService apiUsageStateService,
                                                  PartitionService partitionService,
                                                  ApplicationEventPublisher eventPublisher,
                                                  JwtSettingsService jwtSettingsService) {
-        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, calculatedFieldCache, apiUsageStateService, partitionService, eventPublisher, jwtSettingsService);
+        super(actorContext, tenantProfileCache, deviceProfileCache, assetProfileCache, tbResourceDataCache, calculatedFieldCache, apiUsageStateService, partitionService, eventPublisher, jwtSettingsService);
     }
 
     @PostConstruct

application/src/main/java/org/thingsboard/server/service/resource/DefaultTbResourceService.java

@@ -102,7 +102,6 @@ public class DefaultTbResourceService extends AbstractTbEntityService implements
             if (result.isSuccess()) {
                 logEntityActionService.logEntityAction(tenantId, resourceId, tbResource, actionType, user, resourceId.toString());
             }
-
             return result;
         } catch (Exception e) {
             logEntityActionService.logEntityAction(tenantId, emptyId(EntityType.TB_RESOURCE),

application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java

@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasVersion;
 import org.thingsboard.server.common.data.cf.CalculatedField;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -153,11 +154,13 @@ public class DefaultEntityExportService<I extends EntityId, E extends Exportable
         List<CalculatedField> calculatedFields = calculatedFieldService.findCalculatedFieldsByEntityId(ctx.getTenantId(), entityId);
         calculatedFields.forEach(calculatedField -> {
             calculatedField.setEntityId(getExternalIdOrElseInternal(ctx, entityId));
-            calculatedField.getConfiguration().getArguments().values().forEach(argument -> {
+            if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration configuration) {
-                if (argument.getRefEntityId() != null) {
+                configuration.getArguments().values().forEach(argument -> {
-                    argument.setRefEntityId(getExternalIdOrElseInternal(ctx, argument.getRefEntityId()));
+                    if (argument.getRefEntityId() != null) {
-                }
+                        argument.setRefEntityId(getExternalIdOrElseInternal(ctx, argument.getRefEntityId()));
-            });
+                    }
+                });
+            }
         });
         return calculatedFields;
     }

application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java

@@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.HasVersion;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.cf.CalculatedField;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -321,11 +322,13 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
                 .peek(calculatedField -> {
                     calculatedField.setTenantId(ctx.getTenantId());
                     calculatedField.setEntityId(savedEntity.getId());
-                    calculatedField.getConfiguration().getArguments().values().forEach(argument -> {
+                    if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration configuration) {
-                        if (argument.getRefEntityId() != null) {
+                        configuration.getArguments().values().forEach(argument -> {
-                            argument.setRefEntityId(idProvider.getInternalId(argument.getRefEntityId(), ctx.isFinalImportAttempt()));
+                            if (argument.getRefEntityId() != null) {
-                        }
+                                argument.setRefEntityId(idProvider.getInternalId(argument.getRefEntityId(), ctx.isFinalImportAttempt()));
-                    });
+                            }
+                        });
+                    }
                 }).toList();
 
         for (CalculatedField existingField : existing) {

application/src/main/java/org/thingsboard/server/utils/CalculatedFieldArgumentUtils.java

@@ -0,0 +1,75 @@
+/**
+ * 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.utils;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.thingsboard.server.common.data.StringUtils;
+import org.thingsboard.server.common.data.cf.configuration.Argument;
+import org.thingsboard.server.common.data.kv.BooleanDataEntry;
+import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
+import org.thingsboard.server.service.cf.ctx.state.ArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx;
+import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.ScriptCalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.SimpleCalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.SingleValueArgumentEntry;
+
+import java.util.Optional;
+
+public class CalculatedFieldArgumentUtils {
+
+    public static ListenableFuture<ArgumentEntry> transformSingleValueArgument(ListenableFuture<Optional<? extends KvEntry>> kvEntryFuture) {
+        return Futures.transform(kvEntryFuture, CalculatedFieldArgumentUtils::transformSingleValueArgument, MoreExecutors.directExecutor());
+    }
+
+    public static ArgumentEntry transformSingleValueArgument(Optional<? extends KvEntry> kvEntry) {
+        if (kvEntry.isPresent() && kvEntry.get().getValue() != null) {
+            return ArgumentEntry.createSingleValueArgument(kvEntry.get());
+        } else {
+            return new SingleValueArgumentEntry();
+        }
+    }
+
+    public static KvEntry createDefaultKvEntry(Argument argument) {
+        String key = argument.getRefEntityKey().getKey();
+        String defaultValue = argument.getDefaultValue();
+        if (StringUtils.isBlank(defaultValue)) {
+            return new StringDataEntry(key, null);
+        }
+        if (NumberUtils.isParsable(defaultValue)) {
+            return new DoubleDataEntry(key, Double.parseDouble(defaultValue));
+        }
+        if ("true".equalsIgnoreCase(defaultValue) || "false".equalsIgnoreCase(defaultValue)) {
+            return new BooleanDataEntry(key, Boolean.parseBoolean(defaultValue));
+        }
+        return new StringDataEntry(key, defaultValue);
+    }
+
+    public static CalculatedFieldState createStateByType(CalculatedFieldCtx ctx) {
+        return switch (ctx.getCfType()) {
+            case SIMPLE -> new SimpleCalculatedFieldState(ctx.getArgNames());
+            case SCRIPT -> new ScriptCalculatedFieldState(ctx.getArgNames());
+            case GEOFENCING -> new GeofencingCalculatedFieldState(ctx.getArgNames());
+        };
+    }
+
+}

application/src/main/java/org/thingsboard/server/utils/CalculatedFieldUtils.java

@@ -15,31 +15,43 @@
  */
 package org.thingsboard.server.utils;
 
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.kv.BasicKvEntry;
 import org.thingsboard.server.common.util.KvProtoUtil;
+import org.thingsboard.server.common.util.ProtoUtils;
 import org.thingsboard.server.gen.transport.TransportProtos.CalculatedFieldEntityCtxIdProto;
 import org.thingsboard.server.gen.transport.TransportProtos.CalculatedFieldIdProto;
 import org.thingsboard.server.gen.transport.TransportProtos.CalculatedFieldStateProto;
+import org.thingsboard.server.gen.transport.TransportProtos.GeofencingArgumentProto;
+import org.thingsboard.server.gen.transport.TransportProtos.GeofencingZoneProto;
 import org.thingsboard.server.gen.transport.TransportProtos.SingleValueArgumentProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TsDoubleValProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TsRollingArgumentProto;
 import org.thingsboard.server.gen.transport.TransportProtos.TsValueProto;
 import org.thingsboard.server.service.cf.ctx.CalculatedFieldEntityCtxId;
+import org.thingsboard.server.service.cf.ctx.state.ArgumentEntry;
 import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingZoneState;
 import org.thingsboard.server.service.cf.ctx.state.ScriptCalculatedFieldState;
 import org.thingsboard.server.service.cf.ctx.state.SimpleCalculatedFieldState;
 import org.thingsboard.server.service.cf.ctx.state.SingleValueArgumentEntry;
 import org.thingsboard.server.service.cf.ctx.state.TsRollingArgumentEntry;
 
+import java.util.Map;
 import java.util.Optional;
 import java.util.TreeMap;
 import java.util.UUID;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 public class CalculatedFieldUtils {
 
@@ -79,6 +91,8 @@ public class CalculatedFieldUtils {
                 builder.addSingleValueArguments(toSingleValueArgumentProto(argName, singleValueArgumentEntry));
             } else if (argEntry instanceof TsRollingArgumentEntry rollingArgumentEntry) {
                 builder.addRollingValueArguments(toRollingArgumentProto(argName, rollingArgumentEntry));
+            } else if (argEntry instanceof GeofencingArgumentEntry geofencingArgumentEntry) {
+                builder.addGeofencingArguments(toGeofencingArgumentProto(argName, geofencingArgumentEntry));
             }
         });
         return builder.build();
@@ -108,6 +122,27 @@ public class CalculatedFieldUtils {
         return builder.build();
     }
 
+    private static GeofencingArgumentProto toGeofencingArgumentProto(String argName, GeofencingArgumentEntry geofencingArgumentEntry) {
+        Map<EntityId, GeofencingZoneState> zoneStates = geofencingArgumentEntry.getZoneStates();
+        GeofencingArgumentProto.Builder builder = GeofencingArgumentProto.newBuilder()
+                .setArgName(argName);
+        zoneStates.forEach((entityId, zoneState) ->
+                builder.addZones(toGeofencingZoneProto(entityId, zoneState)));
+        return builder.build();
+    }
+
+    private static GeofencingZoneProto toGeofencingZoneProto(EntityId entityId, GeofencingZoneState zoneState) {
+        GeofencingZoneProto.Builder builder = GeofencingZoneProto.newBuilder()
+                .setZoneId(ProtoUtils.toProto(entityId))
+                .setTs(zoneState.getTs())
+                .setVersion(zoneState.getVersion())
+                .setPerimeterDefinition(JacksonUtil.toString(zoneState.getPerimeterDefinition()));
+        if (zoneState.getLastPresence() != null) {
+            builder.setInside(zoneState.getLastPresence().equals(GeofencingPresenceStatus.INSIDE));
+        }
+        return builder.build();
+    }
+
     public static CalculatedFieldState fromProto(CalculatedFieldStateProto proto) {
         if (StringUtils.isEmpty(proto.getType())) {
             return null;
@@ -118,6 +153,7 @@ public class CalculatedFieldUtils {
         CalculatedFieldState state = switch (type) {
             case SIMPLE -> new SimpleCalculatedFieldState();
             case SCRIPT -> new ScriptCalculatedFieldState();
+            case GEOFENCING -> new GeofencingCalculatedFieldState();
         };
 
         proto.getSingleValueArgumentsList().forEach(argProto ->
@@ -128,6 +164,11 @@ public class CalculatedFieldUtils {
                     state.getArguments().put(argProto.getKey(), fromRollingArgumentProto(argProto)));
         }
 
+        if (CalculatedFieldType.GEOFENCING.equals(type)) {
+            proto.getGeofencingArgumentsList().forEach(argProto ->
+                    state.getArguments().put(argProto.getArgName(), fromGeofencingArgumentProto(argProto)));
+        }
+
         return state;
     }
 
@@ -149,4 +190,15 @@ public class CalculatedFieldUtils {
         return new TsRollingArgumentEntry(tsRecords, proto.getLimit(), proto.getTimeWindow());
     }
 
+
+    private static ArgumentEntry fromGeofencingArgumentProto(GeofencingArgumentProto proto) {
+        Map<EntityId, GeofencingZoneState> zoneStates = proto.getZonesList()
+                .stream()
+                .map(GeofencingZoneState::new)
+                .collect(Collectors.toMap(GeofencingZoneState::getZoneId, Function.identity()));
+        GeofencingArgumentEntry geofencingArgumentEntry = new GeofencingArgumentEntry();
+        geofencingArgumentEntry.setZoneStates(zoneStates);
+        return geofencingArgumentEntry;
+    }
+
 }

application/src/main/resources/logback.xml

@@ -56,6 +56,9 @@
     <!-- Device actor message processor debug -->
     <!--    <logger name="org.thingsboard.server.actors.device.DeviceActorMessageProcessor" level="DEBUG" />-->
 
+    <!-- CF actors message processors trace -->
+    <!--    <logger name="org.thingsboard.server.actors.calculatedField" level="TRACE" />-->
+
     <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
 
     <root level="INFO">

application/src/main/resources/thingsboard.yml

@@ -679,6 +679,9 @@ cache:
       maxSize: "${CACHE_SPECS_IMAGE_ETAGS_MAX_SIZE:10000}" # 0 means the cache is disabled
     systemImagesBrowserTtlInMinutes: "${CACHE_SPECS_IMAGE_SYSTEM_BROWSER_TTL:0}" # Browser cache TTL for system images in minutes. 0 means the cache is disabled
     tenantImagesBrowserTtlInMinutes: "${CACHE_SPECS_IMAGE_TENANT_BROWSER_TTL:0}" # Browser cache TTL for tenant images in minutes. 0 means the cache is disabled
+  tbResourceData:
+    timeToLiveInMinutes: "${CACHE_SPECS_RESOURCE_DATA_TTL:10080}" # TB resource data cache TTL
+    maxSize: "${CACHE_SPECS_RESOURCE_DATA_MAX_SIZE:100000}" # 0 means the cache is disabled
 
 # Spring data parameters
 spring.data.redis.repositories.enabled: false # Disable this because it is not required.
@@ -1542,7 +1545,7 @@ swagger:
   version: "${SWAGGER_VERSION:}"
   # The group name (definition) on the API doc UI page.
   group_name: "${SWAGGER_GROUP_NAME:thingsboard}"
-  # Control the initial display state of API operations and tags (none, list or full)
+  # Control the initial display state of API operations and tags (none or list)
   doc_expansion: "${SWAGGER_DOC_EXPANSION:list}"
 
 # Queue configuration parameters

application/src/test/java/org/thingsboard/server/cf/CalculatedFieldIntegrationTest.java

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.cf;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.junit.Test;
@@ -23,28 +24,44 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.AttributeScope;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.EntityInfo;
+import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
 import org.thingsboard.server.common.data.cf.configuration.ArgumentType;
+import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.Output;
 import org.thingsboard.server.common.data.cf.configuration.OutputType;
 import org.thingsboard.server.common.data.cf.configuration.ReferencedEntityKey;
+import org.thingsboard.server.common.data.cf.configuration.RelationPathQueryDynamicSourceConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.ScriptCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.SimpleCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.ZoneGroupConfiguration;
 import org.thingsboard.server.common.data.debug.DebugSettings;
 import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.relation.EntitySearchDirection;
+import org.thingsboard.server.common.data.relation.RelationPathLevel;
 import org.thingsboard.server.controller.CalculatedFieldControllerTest;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LATITUDE_ARGUMENT_KEY;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LONGITUDE_ARGUMENT_KEY;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingReportStrategy.REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS;
 
 @DaoSqlTest
 public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTest {
@@ -121,7 +138,7 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
                     assertThat(temperatureF.get(0).get("value").asText()).isEqualTo("86.0");
                 });
 
-        Argument savedArgument = savedCalculatedField.getConfiguration().getArguments().get("T");
+        Argument savedArgument = ((SimpleCalculatedFieldConfiguration) savedCalculatedField.getConfiguration()).getArguments().get("T");
         savedArgument.setRefEntityKey(new ReferencedEntityKey("deviceTemperature", ArgumentType.ATTRIBUTE, AttributeScope.SERVER_SCOPE));
         savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class);
 
@@ -133,7 +150,7 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
                     assertThat(temperatureF.get(0).get("value").asText()).isEqualTo("104.0");
                 });
 
-        savedCalculatedField.getConfiguration().setExpression("1.8 * T + 32");
+        ((SimpleCalculatedFieldConfiguration) savedCalculatedField.getConfiguration()).setExpression("1.8 * T + 32");
         savedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class);
 
         await().alias("update CF expression -> perform calculation with new expression").atMost(TIMEOUT, TimeUnit.SECONDS)
@@ -606,6 +623,332 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
                 });
     }
 
+    @Test
+    public void testGeofencingCalculatedField_withZonesCreatedOnDevice() throws Exception {
+        // --- Arrange entities ---
+        Device device = createDevice("GF Test Device", "sn-geo-2");
+
+        // Allowed zone polygon (square)
+        String allowedPolygon = "[[50.472000, 30.504000], [50.472000, 30.506000], [50.474000, 30.506000], [50.474000, 30.504000]]";
+        // Restricted zone polygon (square)
+        String restrictedPolygon = "[[50.475000, 30.510000], [50.475000, 30.512000], [50.477000, 30.512000], [50.477000, 30.510000]]";
+
+        doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE,
+                JacksonUtil.toJsonNode("{\"allowedZone\":" + allowedPolygon + "}")).andExpect(status().isOk());
+
+        doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE,
+                JacksonUtil.toJsonNode("{\"restrictedZone\":" + restrictedPolygon + "}")).andExpect(status().isOk());
+
+        // Initial device coordinates (inside Allowed, outside Restricted)
+        doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/timeseries/unusedScope",
+                JacksonUtil.toJsonNode("{\"latitude\":50.4730,\"longitude\":30.5050}"));
+
+        // --- Build CF: GEOFENCING ---
+        CalculatedField cf = new CalculatedField();
+        cf.setEntityId(device.getDeviceProfileId());
+        cf.setType(CalculatedFieldType.GEOFENCING);
+        cf.setName("Geofencing CF");
+        cf.setDebugSettings(DebugSettings.off());
+
+        GeofencingCalculatedFieldConfiguration cfg = new GeofencingCalculatedFieldConfiguration();
+
+        // Coordinates: TS_LATEST on the device
+        EntityCoordinates entityCoordinates = new EntityCoordinates("latitude", "longitude");
+        cfg.setEntityCoordinates(entityCoordinates);
+
+        // Zone groups: ATTRIBUTE on the device
+        ZoneGroupConfiguration allowedZonesGroup = new ZoneGroupConfiguration("allowedZone", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
+        ZoneGroupConfiguration restrictedZonesGroup = new ZoneGroupConfiguration("restrictedZone", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
+
+        cfg.setZoneGroups(Map.of("allowedZones", allowedZonesGroup, "restrictedZones", restrictedZonesGroup));
+
+        // Output to server attributes
+        Output out = new Output();
+        out.setType(OutputType.ATTRIBUTES);
+        out.setScope(AttributeScope.SERVER_SCOPE);
+        cfg.setOutput(out);
+
+        cf.setConfiguration(cfg);
+
+        doPost("/api/calculatedField", cf, CalculatedField.class);
+
+        // --- Assert initial evaluation (ENTERED / OUTSIDE) ---
+        await().alias("initial geofencing evaluation")
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+                .untilAsserted(() -> {
+                    ArrayNode attrs = getServerAttributes(device.getId(),
+                            "allowedZonesEvent", "allowedZonesStatus", "restrictedZonesStatus", "restrictedZonesEvent");
+                    // --- no restrictedZonesEvent as no transition happened yet
+                    assertThat(attrs).isNotNull().isNotEmpty().hasSize(3);
+                    Map<String, String> m = kv(attrs);
+                    assertThat(m).containsEntry("allowedZonesEvent", "ENTERED")
+                            .containsEntry("allowedZonesStatus", "INSIDE")
+                            .containsEntry("restrictedZonesStatus", "OUTSIDE");
+                });
+
+        // --- delete attributes reported in previous evaluation
+        doDelete("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/SERVER_SCOPE?keys=allowedZonesEvent,allowedZonesStatus,restrictedZonesStatus", String.class);
+
+        // --- Update restrictedZone by 'restrictedZone' attribute update
+        doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE,
+                JacksonUtil.toJsonNode("{\"restrictedZone\":" + restrictedPolygon + "}")).andExpect(status().isOk());
+
+        // --- Assert no transition ---
+        // --- Assert attributes updated with the same values for restrictedZones ---
+        // --- Assert attributes updated with the new values for allowedZones ---
+        await().alias("evaluation after version bump of geo argument")
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+                .untilAsserted(() -> {
+                    ArrayNode attrs = getServerAttributes(device.getId(),
+                            "allowedZonesEvent", "allowedZonesStatus",
+                            "restrictedZonesEvent", "restrictedZonesStatus");
+                    assertThat(attrs).isNotNull().isNotEmpty().hasSize(2);
+                    Map<String, String> m = kv(attrs);
+                    assertThat(m).containsEntry("allowedZonesStatus", "INSIDE")
+                            .containsEntry("restrictedZonesStatus", "OUTSIDE");
+                });
+    }
+
+    @Test
+    public void testGeofencingCalculatedField_withoutRelationsCreationAndDynamicRefresh() throws Exception {
+        // --- Arrange entities ---
+        Device device = createDevice("GF Device", "sn-geo-1");
+
+        // Allowed zone polygon (square)
+        String allowedPolygon = "[[50.472000, 30.504000], [50.472000, 30.506000], [50.474000, 30.506000], [50.474000, 30.504000]]";
+        // Restricted zone polygon (square)
+        String restrictedPolygon = "[[50.475000, 30.510000], [50.475000, 30.512000], [50.477000, 30.512000], [50.477000, 30.510000]]";
+
+        Asset allowedZoneAsset = createAsset("Allowed Zone", null);
+        doPost("/api/plugins/telemetry/ASSET/" + allowedZoneAsset.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE,
+                JacksonUtil.toJsonNode("{\"zone\":" + allowedPolygon + "}")).andExpect(status().isOk());
+
+        Asset restrictedZoneAsset = createAsset("Restricted Zone", null);
+        doPost("/api/plugins/telemetry/ASSET/" + restrictedZoneAsset.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE,
+                JacksonUtil.toJsonNode("{\"zone\":" + restrictedPolygon + "}")).andExpect(status().isOk());
+
+        // Relations from device to zones
+        EntityRelation deviceToAllowedZoneRelation = new EntityRelation();
+        deviceToAllowedZoneRelation.setFrom(device.getId());
+        deviceToAllowedZoneRelation.setTo(allowedZoneAsset.getId());
+        deviceToAllowedZoneRelation.setType("AllowedZone");
+
+        EntityRelation deviceToRestrictedZoneRelation = new EntityRelation();
+        deviceToRestrictedZoneRelation.setFrom(device.getId());
+        deviceToRestrictedZoneRelation.setTo(restrictedZoneAsset.getId());
+        deviceToRestrictedZoneRelation.setType("RestrictedZone");
+
+        doPost("/api/relation", deviceToAllowedZoneRelation).andExpect(status().isOk());
+        doPost("/api/relation", deviceToRestrictedZoneRelation).andExpect(status().isOk());
+
+        // Initial device coordinates (inside Allowed, outside Restricted)
+        doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/timeseries/unusedScope",
+                JacksonUtil.toJsonNode("{\"latitude\":50.4730,\"longitude\":30.5050}"));
+
+        // --- Build CF: GEOFENCING ---
+        CalculatedField cf = new CalculatedField();
+        cf.setEntityId(device.getId());
+        cf.setType(CalculatedFieldType.GEOFENCING);
+        cf.setName("Geofencing CF");
+        cf.setDebugSettings(DebugSettings.off());
+
+        GeofencingCalculatedFieldConfiguration cfg = new GeofencingCalculatedFieldConfiguration();
+
+        // Coordinates: TS_LATEST on the device
+        EntityCoordinates entityCoordinates = new EntityCoordinates("latitude", "longitude");
+        cfg.setEntityCoordinates(entityCoordinates);
+
+        // Zone groups: ATTRIBUTE on specific assets (one zone per group)
+        ZoneGroupConfiguration allowedZonesGroup = new ZoneGroupConfiguration("zone", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
+        var allowedZoneDynamicSourceConfiguration = new RelationPathQueryDynamicSourceConfiguration();
+        allowedZoneDynamicSourceConfiguration.setLevels(List.of(new RelationPathLevel(EntitySearchDirection.FROM, "AllowedZone")));
+        allowedZonesGroup.setRefDynamicSourceConfiguration(allowedZoneDynamicSourceConfiguration);
+
+        ZoneGroupConfiguration restrictedZonesGroup = new ZoneGroupConfiguration("zone", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
+        var restrictedZoneDynamicSourceConfiguration = new RelationPathQueryDynamicSourceConfiguration();
+        restrictedZoneDynamicSourceConfiguration.setLevels(List.of(new RelationPathLevel(EntitySearchDirection.FROM, "RestrictedZone")));
+        restrictedZonesGroup.setRefDynamicSourceConfiguration(restrictedZoneDynamicSourceConfiguration);
+
+        cfg.setZoneGroups(Map.of("allowedZones", allowedZonesGroup, "restrictedZones", restrictedZonesGroup));
+
+        // Output to server attributes
+        Output out = new Output();
+        out.setType(OutputType.ATTRIBUTES);
+        out.setScope(AttributeScope.SERVER_SCOPE);
+        cfg.setOutput(out);
+
+        cf.setConfiguration(cfg);
+
+        doPost("/api/calculatedField", cf, CalculatedField.class);
+
+        // --- Assert initial evaluation (ENTERED / OUTSIDE) ---
+        await().alias("initial geofencing evaluation")
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+                .untilAsserted(() -> {
+                    ArrayNode attrs = getServerAttributes(device.getId(),
+                            "allowedZonesEvent", "allowedZonesStatus", "restrictedZonesStatus");
+                    assertThat(attrs).isNotNull().isNotEmpty().hasSize(3);
+                    Map<String, String> m = kv(attrs);
+                    assertThat(m).containsEntry("allowedZonesEvent", "ENTERED")
+                            .containsEntry("allowedZonesStatus", "INSIDE")
+                            .containsEntry("restrictedZonesStatus", "OUTSIDE");
+                });
+
+        // --- Move the device into Restricted zone (and outside Allowed) ---
+        doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/timeseries/unusedScope",
+                JacksonUtil.toJsonNode("{\"latitude\":50.4760,\"longitude\":30.5110}"));
+
+        // --- Assert transition (LEFT / ENTERED) ---
+        await().alias("transition evaluation after movement")
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+                .untilAsserted(() -> {
+                    ArrayNode attrs = getServerAttributes(device.getId(),
+                            "allowedZonesEvent", "allowedZonesStatus",
+                            "restrictedZonesEvent", "restrictedZonesStatus");
+                    assertThat(attrs).isNotNull().isNotEmpty().hasSize(4);
+                    Map<String, String> m = kv(attrs);
+                    assertThat(m).containsEntry("allowedZonesEvent", "LEFT")
+                            .containsEntry("restrictedZonesEvent", "ENTERED")
+                            .containsEntry("allowedZonesStatus", "OUTSIDE")
+                            .containsEntry("restrictedZonesStatus", "INSIDE");
+                });
+    }
+
+    @Test
+    public void testGeofencingCalculatedField_DynamicRefresh_RebindsZoneArguments() throws Exception {
+        // --- Update min allowed scheduled update intervals for CFs ---
+        loginSysAdmin();
+        EntityInfo tenantProfileEntityInfo = doGet("/api/tenantProfileInfo/default", EntityInfo.class);
+        assertThat(tenantProfileEntityInfo).isNotNull();
+        TenantProfile foundTenantProfile = doGet("/api/tenantProfile/" + tenantProfileEntityInfo.getId().getId().toString(), TenantProfile.class);
+        assertThat(foundTenantProfile).isNotNull();
+        assertThat(foundTenantProfile.getDefaultProfileConfiguration()).isNotNull();
+        int minAllowedScheduledUpdateIntervalInSecForCF = TIMEOUT / 10;
+        foundTenantProfile.getDefaultProfileConfiguration().setMinAllowedScheduledUpdateIntervalInSecForCF(minAllowedScheduledUpdateIntervalInSecForCF);
+        TenantProfile savedTenantProfile = doPost("/api/tenantProfile", foundTenantProfile, TenantProfile.class);
+        assertThat(savedTenantProfile).isNotNull();
+        assertThat(savedTenantProfile.getDefaultProfileConfiguration().getMinAllowedScheduledUpdateIntervalInSecForCF()).isEqualTo(minAllowedScheduledUpdateIntervalInSecForCF);
+        loginTenantAdmin();
+
+        // --- Arrange entities ---
+        Device device = createDevice("GF Device dyn", "sn-geo-dyn-1");
+
+        // Allowed Zone A: covers initial point (ENTERED)
+        String allowedPolygonA = "[[50.472000, 30.504000], [50.472000, 30.506000], [50.474000, 30.506000], [50.474000, 30.504000]]";
+
+        Asset allowedZoneA = createAsset("Allowed Zone A", null);
+        doPost("/api/plugins/telemetry/ASSET/" + allowedZoneA.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE,
+                JacksonUtil.toJsonNode("{\"zone\":" + allowedPolygonA + "}")).andExpect(status().isOk());
+
+        // Relation from device to Allowed Zone A
+        EntityRelation relAllowedA = new EntityRelation();
+        relAllowedA.setFrom(device.getId());
+        relAllowedA.setTo(allowedZoneA.getId());
+        relAllowedA.setType("AllowedZone");
+        doPost("/api/relation", relAllowedA).andExpect(status().isOk());
+
+        // Initial device coordinates: INSIDE Zone A
+        doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/timeseries/unusedScope",
+                JacksonUtil.toJsonNode("{\"latitude\":50.4730,\"longitude\":30.5050}")).andExpect(status().isOk());
+
+        // --- Build CF: GEOFENCING with dynamic 'allowedZones' and short scheduled refresh ---
+        CalculatedField cf = new CalculatedField();
+        cf.setEntityId(device.getId());
+        cf.setType(CalculatedFieldType.GEOFENCING);
+        cf.setName("Geofencing CF (dynamic refresh)");
+        cf.setDebugSettings(DebugSettings.off());
+
+        GeofencingCalculatedFieldConfiguration cfg = new GeofencingCalculatedFieldConfiguration();
+        cfg.setEntityCoordinates(new EntityCoordinates(ENTITY_ID_LATITUDE_ARGUMENT_KEY, ENTITY_ID_LONGITUDE_ARGUMENT_KEY));
+
+        var allowedZonesGroup = new ZoneGroupConfiguration("zone", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
+        var allowedZoneDynamicSourceConfiguration = new RelationPathQueryDynamicSourceConfiguration();
+        allowedZoneDynamicSourceConfiguration.setLevels(List.of(new RelationPathLevel(EntitySearchDirection.FROM, "AllowedZone")));
+        allowedZonesGroup.setRefDynamicSourceConfiguration(allowedZoneDynamicSourceConfiguration);
+        cfg.setZoneGroups(Map.of("allowedZones", allowedZonesGroup));
+
+        // Server attributes output
+        Output out = new Output();
+        out.setType(OutputType.ATTRIBUTES);
+        out.setScope(AttributeScope.SERVER_SCOPE);
+        cfg.setOutput(out);
+
+        // Enable scheduled refresh with a 6-second interval
+        cfg.setScheduledUpdateInterval(minAllowedScheduledUpdateIntervalInSecForCF);
+        cfg.setScheduledUpdateEnabled(true);
+
+        cf.setConfiguration(cfg);
+        CalculatedField savedCalculatedField = doPost("/api/calculatedField", cf, CalculatedField.class);
+        assertThat(savedCalculatedField).isNotNull();
+        CalculatedFieldConfiguration configuration = savedCalculatedField.getConfiguration();
+        assertThat(configuration).isInstanceOf(GeofencingCalculatedFieldConfiguration.class);
+        var geofencingConfiguration = (GeofencingCalculatedFieldConfiguration) configuration;
+        assertThat(geofencingConfiguration.isScheduledUpdateEnabled()).isTrue();
+
+        // --- Assert initial evaluation (ENTERED) ---
+        await().alias("initial geofencing evaluation")
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+                .untilAsserted(() -> {
+                    ArrayNode attrs = getServerAttributes(device.getId(), "allowedZonesEvent", "allowedZonesStatus");
+                    assertThat(attrs).isNotNull().isNotEmpty().hasSize(2);
+                    Map<String, String> m = kv(attrs);
+                    assertThat(m).containsEntry("allowedZonesEvent", "ENTERED")
+                            .containsEntry("allowedZonesStatus", "INSIDE");
+                });
+
+        // --- Move device OUTSIDE Zone A (expect LEFT) ---
+        doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/timeseries/unusedScope",
+                JacksonUtil.toJsonNode("{\"latitude\":50.4760,\"longitude\":30.5110}")).andExpect(status().isOk());
+
+        await().alias("outside zone A (LEFT)")
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+                .untilAsserted(() -> {
+                    ArrayNode attrs = getServerAttributes(device.getId(), "allowedZonesEvent", "allowedZonesStatus");
+                    assertThat(attrs).isNotNull().isNotEmpty().hasSize(2);
+                    Map<String, String> m = kv(attrs);
+                    assertThat(m).containsEntry("allowedZonesEvent", "LEFT")
+                            .containsEntry("allowedZonesStatus", "OUTSIDE");
+                });
+
+        // --- Create Allowed Zone B covering the CURRENT location ---
+        String allowedPolygonB = "[[50.475500, 30.510500], [50.475500, 30.511500], [50.476500, 30.511500], [50.476500, 30.510500]]";
+
+        Asset allowedZoneB = createAsset("Allowed Zone B", null);
+        doPost("/api/plugins/telemetry/ASSET/" + allowedZoneB.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE,
+                JacksonUtil.toJsonNode("{\"zone\":" + allowedPolygonB + "}")).andExpect(status().isOk());
+
+        // Add a new relation
+        EntityRelation relAllowedB = new EntityRelation();
+        relAllowedB.setFrom(device.getId());
+        relAllowedB.setTo(allowedZoneB.getId());
+        relAllowedB.setType("AllowedZone");
+        doPost("/api/relation", relAllowedB).andExpect(status().isOk());
+
+        awaitForCalculatedFieldEntityMessageProcessorToRegisterCfStateAsReadyToRefreshDynamicArguments(device.getId(), savedCalculatedField.getId(), minAllowedScheduledUpdateIntervalInSecForCF);
+
+        // --- Same coordinates as before, but now we expect ENTERED since a new zone is registered ---
+        doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/timeseries/unusedScope",
+                JacksonUtil.toJsonNode("{\"latitude\":50.4760,\"longitude\":30.5110}")).andExpect(status().isOk());
+
+        // --- Assert dynamic refresh picks up new relation and flips event back to ENTERED on the next telemetry update ---
+        await().alias("dynamic refresh rebinds allowedZones")
+                .atMost(TIMEOUT, TimeUnit.SECONDS)
+                .pollInterval(1, TimeUnit.SECONDS)
+                .untilAsserted(() -> {
+                    ArrayNode attrs = getServerAttributes(device.getId(), "allowedZonesEvent", "allowedZonesStatus");
+                    assertThat(attrs).isNotNull().isNotEmpty().hasSize(2);
+                    Map<String, String> m = kv(attrs);
+                    assertThat(m).containsEntry("allowedZonesEvent", "ENTERED")
+                            .containsEntry("allowedZonesStatus", "INSIDE");
+                });
+    }
+
     private ObjectNode getLatestTelemetry(EntityId entityId, String... keys) throws Exception {
         return doGetAsync("/api/plugins/telemetry/" + entityId.getEntityType() + "/" + entityId.getId() + "/values/timeseries?keys=" + String.join(",", keys), ObjectNode.class);
     }
@@ -621,4 +964,12 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
         return doPost("/api/asset", asset, Asset.class);
     }
 
+    private static Map<String, String> kv(ArrayNode attrs) {
+        Map<String, String> m = new HashMap<>();
+        for (JsonNode n : attrs) {
+            m.put(n.get("key").asText(), n.get("value").asText());
+        }
+        return m;
+    }
+
 }

application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java

@@ -68,7 +68,10 @@ import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.server.actors.DefaultTbActorSystem;
 import org.thingsboard.server.actors.TbActorId;
 import org.thingsboard.server.actors.TbActorMailbox;
+import org.thingsboard.server.actors.TbCalculatedFieldEntityActorId;
 import org.thingsboard.server.actors.TbEntityActorId;
+import org.thingsboard.server.actors.calculatedField.CalculatedFieldEntityActor;
+import org.thingsboard.server.actors.calculatedField.CalculatedFieldEntityMessageProcessor;
 import org.thingsboard.server.actors.device.DeviceActor;
 import org.thingsboard.server.actors.device.DeviceActorMessageProcessor;
 import org.thingsboard.server.actors.device.SessionInfo;
@@ -99,6 +102,7 @@ import org.thingsboard.server.common.data.device.profile.ProtoTransportPayloadCo
 import org.thingsboard.server.common.data.device.profile.TransportPayloadTypeConfiguration;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
@@ -150,6 +154,8 @@ import org.thingsboard.server.dao.tenant.TenantProfileService;
 import org.thingsboard.server.dao.timeseries.TimeseriesService;
 import org.thingsboard.server.queue.memory.InMemoryStorage;
 import org.thingsboard.server.service.cf.CfRocksDb;
+import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculatedFieldState;
 import org.thingsboard.server.service.entitiy.tenant.profile.TbTenantProfileService;
 import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRequest;
 import org.thingsboard.server.service.security.auth.rest.LoginRequest;
@@ -1099,6 +1105,18 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         });
     }
 
+    protected void awaitForCalculatedFieldEntityMessageProcessorToRegisterCfStateAsReadyToRefreshDynamicArguments(EntityId entityId, CalculatedFieldId cfId, int scheduledUpdateInterval) {
+        CalculatedFieldEntityMessageProcessor processor = getCalculatedFieldEntityMessageProcessor(entityId);
+        Map<CalculatedFieldId, CalculatedFieldState> statesMap = (Map<CalculatedFieldId, CalculatedFieldState>) ReflectionTestUtils.getField(processor, "states");
+        Awaitility.await("CF state for entity actor ready to refresh dynamic arguments").atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> {
+            CalculatedFieldState calculatedFieldState = statesMap.get(cfId);
+            boolean isReady = calculatedFieldState != null && ((GeofencingCalculatedFieldState) calculatedFieldState).getLastDynamicArgumentsRefreshTs()
+                              < System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(scheduledUpdateInterval);
+            log.warn("entityId {}, cfId {}, state ready to refresh == {}", entityId, cfId, isReady);
+            return isReady;
+        });
+    }
+
     protected static String getMapName(FeatureType featureType) {
         switch (featureType) {
             case ATTRIBUTES:
@@ -1120,6 +1138,16 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
         return (DeviceActorMessageProcessor) ReflectionTestUtils.getField(actor, "processor");
     }
 
+    protected CalculatedFieldEntityMessageProcessor getCalculatedFieldEntityMessageProcessor(EntityId entityId) {
+        DefaultTbActorSystem actorSystem = (DefaultTbActorSystem) ReflectionTestUtils.getField(actorService, "system");
+        ConcurrentMap<TbActorId, TbActorMailbox> actors = (ConcurrentMap<TbActorId, TbActorMailbox>) ReflectionTestUtils.getField(actorSystem, "actors");
+        Awaitility.await("CF entity actor was created").atMost(TIMEOUT, TimeUnit.SECONDS)
+                .until(() -> actors.containsKey(new TbCalculatedFieldEntityActorId(entityId)));
+        TbActorMailbox actorMailbox = actors.get(new TbCalculatedFieldEntityActorId(entityId));
+        CalculatedFieldEntityActor actor = (CalculatedFieldEntityActor) ReflectionTestUtils.getField(actorMailbox, "actor");
+        return (CalculatedFieldEntityMessageProcessor) ReflectionTestUtils.getField(actor, "processor");
+    }
+
     protected void updateDefaultTenantProfileConfig(Consumer<DefaultTenantProfileConfiguration> updater) throws ThingsboardException {
         updateDefaultTenantProfile(tenantProfile -> {
             TenantProfileData profileData = tenantProfile.getProfileData();

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)

application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java

@@ -29,15 +29,23 @@ import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfig
 import org.thingsboard.server.common.data.cf.configuration.Output;
 import org.thingsboard.server.common.data.cf.configuration.OutputType;
 import org.thingsboard.server.common.data.cf.configuration.ReferencedEntityKey;
+import org.thingsboard.server.common.data.cf.configuration.RelationPathQueryDynamicSourceConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.SimpleCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.ZoneGroupConfiguration;
 import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.relation.EntitySearchDirection;
+import org.thingsboard.server.common.data.relation.RelationPathLevel;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 
+import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingReportStrategy.REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS;
 
 @DaoSqlTest
 public class CalculatedFieldControllerTest extends AbstractControllerTest {
@@ -84,7 +92,35 @@ public class CalculatedFieldControllerTest extends AbstractControllerTest {
         assertThat(savedCalculatedField.getEntityId()).isEqualTo(calculatedField.getEntityId());
         assertThat(savedCalculatedField.getType()).isEqualTo(calculatedField.getType());
         assertThat(savedCalculatedField.getName()).isEqualTo(calculatedField.getName());
-        assertThat(savedCalculatedField.getConfiguration()).isEqualTo(getCalculatedFieldConfig());
+        assertThat(savedCalculatedField.getConfiguration()).isEqualTo(getSimpleCalculatedFieldConfig());
+        assertThat(savedCalculatedField.getVersion()).isEqualTo(1L);
+
+        savedCalculatedField.setName("Test CF");
+
+        CalculatedField updatedCalculatedField = doPost("/api/calculatedField", savedCalculatedField, CalculatedField.class);
+
+        assertThat(updatedCalculatedField.getName()).isEqualTo(savedCalculatedField.getName());
+        assertThat(updatedCalculatedField.getVersion()).isEqualTo(savedCalculatedField.getVersion() + 1);
+
+        doDelete("/api/calculatedField/" + savedCalculatedField.getId().getId().toString())
+                .andExpect(status().isOk());
+    }
+
+    @Test
+    public void testSaveGeofencingCalculatedField() throws Exception {
+        Device testDevice = createDevice("Test device", "1234567890");
+        CalculatedField calculatedField = getCalculatedField(testDevice.getId(), getGeofencingCalculatedFieldConfig());
+
+        CalculatedField savedCalculatedField = doPost("/api/calculatedField", calculatedField, CalculatedField.class);
+
+        assertThat(savedCalculatedField).isNotNull();
+        assertThat(savedCalculatedField.getId()).isNotNull();
+        assertThat(savedCalculatedField.getCreatedTime()).isGreaterThan(0);
+        assertThat(savedCalculatedField.getTenantId()).isEqualTo(savedTenant.getId());
+        assertThat(savedCalculatedField.getEntityId()).isEqualTo(calculatedField.getEntityId());
+        assertThat(savedCalculatedField.getType()).isEqualTo(calculatedField.getType());
+        assertThat(savedCalculatedField.getName()).isEqualTo(calculatedField.getName());
+        assertThat(savedCalculatedField.getConfiguration()).isEqualTo(getGeofencingCalculatedFieldConfig());
         assertThat(savedCalculatedField.getVersion()).isEqualTo(1L);
 
         savedCalculatedField.setName("Test CF");
@@ -128,17 +164,41 @@ public class CalculatedFieldControllerTest extends AbstractControllerTest {
     }
 
     private CalculatedField getCalculatedField(DeviceId deviceId) {
+        return getCalculatedField(deviceId, getSimpleCalculatedFieldConfig());
+    }
+
+    private CalculatedField getCalculatedField(DeviceId deviceId, CalculatedFieldConfiguration configuration) {
         CalculatedField calculatedField = new CalculatedField();
         calculatedField.setEntityId(deviceId);
         calculatedField.setType(CalculatedFieldType.SIMPLE);
         calculatedField.setName("Test Calculated Field");
         calculatedField.setConfigurationVersion(1);
-        calculatedField.setConfiguration(getCalculatedFieldConfig());
+        calculatedField.setConfiguration(configuration);
         calculatedField.setVersion(1L);
         return calculatedField;
     }
 
-    private CalculatedFieldConfiguration getCalculatedFieldConfig() {
+    private CalculatedFieldConfiguration getGeofencingCalculatedFieldConfig() {
+        var config = new GeofencingCalculatedFieldConfiguration();
+
+        var refDynamicSourceConfiguration = new RelationPathQueryDynamicSourceConfiguration();
+        refDynamicSourceConfiguration.setLevels(List.of(new RelationPathLevel(EntitySearchDirection.TO, "FromSafeArea")));
+
+        var zoneGroupConfiguration = new ZoneGroupConfiguration("perimeter", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
+        zoneGroupConfiguration.setRefDynamicSourceConfiguration(refDynamicSourceConfiguration);
+
+        Output output = new Output();
+        output.setType(OutputType.TIME_SERIES);
+
+        config.setEntityCoordinates(new EntityCoordinates("latitide", "longitude"));
+        config.setZoneGroups(Map.of("safeArea", zoneGroupConfiguration));
+        config.setScheduledUpdateEnabled(false);
+        config.setOutput(output);
+
+        return config;
+    }
+
+    private CalculatedFieldConfiguration getSimpleCalculatedFieldConfig() {
         SimpleCalculatedFieldConfiguration config = new SimpleCalculatedFieldConfiguration();
 
         Argument argument = new Argument();

application/src/test/java/org/thingsboard/server/controller/EntityQueryControllerTest.java

@@ -519,6 +519,67 @@ public class EntityQueryControllerTest extends AbstractControllerTest {
         Assert.assertEquals(1, filteredAssetAlamData.getTotalElements());
     }
 
+    @Test
+    public void testFindAlarmsWithEntityFilterAndLatestValues() throws Exception {
+        loginTenantAdmin();
+        List<Device> devices = new ArrayList<>();
+        List<String> temps = new ArrayList<>();
+        List<String> deviceNames = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            Device device = new Device();
+            device.setCustomerId(customerId);
+            device.setName("Device" + i);
+            device.setType("default");
+            device.setLabel("testLabel" + (int) (Math.random() * 1000));
+            device = doPost("/api/device", device, Device.class);
+            devices.add(device);
+            deviceNames.add(device.getName());
+
+            int temp = i * 10;
+            temps.add(String.valueOf(temp));
+            JsonNode content = JacksonUtil.toJsonNode("{\"temperature\": " + temp + "}");
+            doPost("/api/plugins/telemetry/" + EntityType.DEVICE.name() + "/" + device.getUuidId() + "/timeseries/SERVER_SCOPE", content)
+                    .andExpect(status().isOk());
+            Thread.sleep(1);
+        }
+
+        for (int i = 0; i < devices.size(); i++) {
+            Alarm alarm = new Alarm();
+            alarm.setCustomerId(customerId);
+            alarm.setOriginator(devices.get(i).getId());
+            String type = "device alarm" + i;
+            alarm.setType(type);
+            alarm.setSeverity(AlarmSeverity.WARNING);
+            doPost("/api/alarm", alarm, Alarm.class);
+            Thread.sleep(1);
+        }
+
+        AlarmDataPageLink pageLink = new AlarmDataPageLink();
+        pageLink.setPage(0);
+        pageLink.setPageSize(100);
+        pageLink.setSortOrder(new EntityDataSortOrder(new EntityKey(EntityKeyType.ALARM_FIELD, "created_time")));
+
+        List<EntityKey> alarmFields = new ArrayList<>();
+        alarmFields.add(new EntityKey(EntityKeyType.ALARM_FIELD, "type"));
+
+        List<EntityKey> entityFields = new ArrayList<>();
+        entityFields.add(new EntityKey(EntityKeyType.ENTITY_FIELD, "name"));
+
+        List<EntityKey> latestValues = new ArrayList<>();
+        latestValues.add(new EntityKey(EntityKeyType.TIME_SERIES, "temperature"));
+
+        EntityTypeFilter deviceTypeFilter = new EntityTypeFilter();
+        deviceTypeFilter.setEntityType(EntityType.DEVICE);
+        AlarmDataQuery deviceAlarmQuery =  new AlarmDataQuery(deviceTypeFilter, pageLink, entityFields, latestValues, null, alarmFields);
+
+        PageData<AlarmData> alarmPageData = findAlarmsByQueryAndCheck(deviceAlarmQuery, 10);
+        List<String> retrievedAlarmTemps = alarmPageData.getData().stream().map(alarmData -> alarmData.getLatest().get(EntityKeyType.TIME_SERIES).get("temperature").getValue()).toList();
+        assertThat(retrievedAlarmTemps).containsExactlyInAnyOrderElementsOf(temps);
+
+        List<String> retrievedDeviceNames = alarmPageData.getData().stream().map(alarmData -> alarmData.getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue()).toList();
+        assertThat(retrievedDeviceNames).containsExactlyInAnyOrderElementsOf(deviceNames);
+    }
+
     private void testCountAlarmsByQuery(List<Alarm> alarms) throws Exception {
         AlarmCountQuery countQuery = new AlarmCountQuery();
 

application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java

@@ -31,6 +31,7 @@ import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.DashboardInfo;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.EntityInfo;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.StringUtils;
@@ -321,18 +322,15 @@ public class TbResourceControllerTest extends AbstractControllerTest {
         var referenceValues = JacksonUtil.toJsonNode(deleteResponse).get("references");
         Assert.assertNotNull(referenceValues);
 
-        var widgetTypeInfos = JacksonUtil.readValue(referenceValues.toString(), new TypeReference<HashMap<String, List<WidgetTypeInfo>>>() {
+        var widgetTypeInfos = JacksonUtil.readValue(referenceValues.toString(), new TypeReference<HashMap<String, List<EntityInfo>>>() {
         });
         Assert.assertNotNull(widgetTypeInfos);
         Assert.assertFalse(widgetTypeInfos.isEmpty());
         Assert.assertEquals(1, widgetTypeInfos.size());
 
-        var dashboardInfo = widgetTypeInfos.get(EntityType.WIDGET_TYPE.name()).get(0);
+        var widgetTypeInfo = widgetTypeInfos.get(EntityType.WIDGET_TYPE.name()).get(0);
-        Assert.assertNotNull(dashboardInfo);
+        Assert.assertNotNull(widgetTypeInfo);
-
+        Assert.assertEquals(new EntityInfo(savedWidgetType.getId(), savedWidgetType.getName()), widgetTypeInfo);
-        WidgetTypeInfo foundedWidgetType = doGet("/api/widgetTypeInfo/" + savedWidgetType.getId().getId().toString(), WidgetTypeInfo.class);
-        Assert.assertNotNull(foundedWidgetType);
-        Assert.assertEquals(foundedWidgetType, dashboardInfo);
     }
 
     @Test
@@ -372,7 +370,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
         Assert.assertTrue(isSuccess);
 
         var referenceValues = JacksonUtil.toJsonNode(deleteResponse).get("references");
-        var widgetTypeInfos = JacksonUtil.readValue(referenceValues.toString(), new TypeReference<HashMap<String, List<WidgetTypeInfo>>>() {
+        var widgetTypeInfos = JacksonUtil.readValue(referenceValues.toString(), new TypeReference<HashMap<String, List<EntityInfo>>>() {
         });
         Assert.assertNull(widgetTypeInfos);
     }
@@ -417,7 +415,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
         var referenceValues = JacksonUtil.toJsonNode(deleteResponse).get("references");
         Assert.assertNotNull(referenceValues);
 
-        var dashboardInfos = JacksonUtil.readValue(referenceValues.toString(), new TypeReference<HashMap<String, List<DashboardInfo>>>() {
+        var dashboardInfos = JacksonUtil.readValue(referenceValues.toString(), new TypeReference<HashMap<String, List<EntityInfo>>>() {
         });
         Assert.assertNotNull(dashboardInfos);
         Assert.assertFalse(dashboardInfos.isEmpty());
@@ -425,10 +423,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
 
         var dashboardInfo = dashboardInfos.get(EntityType.DASHBOARD.name()).get(0);
         Assert.assertNotNull(dashboardInfo);
-
+        Assert.assertEquals(new EntityInfo(savedDashboard.getId(), savedDashboard.getName()), dashboardInfo);
-        DashboardInfo foundDashboard = doGet("/api/dashboard/info/" + savedDashboard.getId().getId().toString(), DashboardInfo.class);
-        Assert.assertNotNull(foundDashboard);
-        Assert.assertEquals(foundDashboard, dashboardInfo);
     }
 
     @Test
@@ -469,7 +464,7 @@ public class TbResourceControllerTest extends AbstractControllerTest {
         Assert.assertTrue(isSuccess);
 
         var referenceValues = JacksonUtil.toJsonNode(deleteResponse).get("references");
-        var dashboardInfos = JacksonUtil.readValue(referenceValues.toString(), new TypeReference<HashMap<String, List<DashboardInfo>>>() {
+        var dashboardInfos = JacksonUtil.readValue(referenceValues.toString(), new TypeReference<HashMap<String, List<EntityInfo>>>() {
         });
         Assert.assertNull(dashboardInfos);
     }

application/src/test/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateServiceTest.java

@@ -20,9 +20,12 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.ApiUsageRecordKey;
+import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.ApiUsageStateValue;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
+import org.thingsboard.server.common.data.id.ApiUsageStateId;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
@@ -33,8 +36,17 @@ import org.thingsboard.server.dao.usagerecord.ApiUsageStateService;
 import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 
+import java.lang.reflect.Field;
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
+import static java.time.ZoneOffset.UTC;
+import static java.time.temporal.ChronoField.DAY_OF_MONTH;
+import static java.time.temporal.ChronoUnit.MONTHS;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 
 @DaoSqlTest
@@ -48,6 +60,7 @@ public class DefaultTbApiUsageStateServiceTest extends AbstractControllerTest {
 
     private TenantId tenantId;
     private Tenant savedTenant;
+    private TenantProfile savedTenantProfile;
 
     private static final int MAX_ENABLE_VALUE = 5000;
     private static final long VALUE_WARNING = 4500L;
@@ -59,7 +72,7 @@ public class DefaultTbApiUsageStateServiceTest extends AbstractControllerTest {
         loginSysAdmin();
 
         TenantProfile tenantProfile = createTenantProfile();
-        TenantProfile savedTenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
+        savedTenantProfile = doPost("/api/tenantProfile", tenantProfile, TenantProfile.class);
         Assert.assertNotNull(savedTenantProfile);
 
         Tenant tenant = new Tenant();
@@ -109,6 +122,41 @@ public class DefaultTbApiUsageStateServiceTest extends AbstractControllerTest {
         assertEquals(ApiUsageStateValue.DISABLED, apiUsageStateService.findTenantApiUsageState(tenantId).getDbStorageState());
     }
 
+    @Test
+    public void checkStartOfNextCycle_setsNextCycleToNextMonth() throws Exception {
+        ApiUsageState apiUsageState = new ApiUsageState(new ApiUsageStateId(UUID.randomUUID()));
+        apiUsageState.setDbStorageState(ApiUsageStateValue.ENABLED);
+        apiUsageState.setAlarmExecState(ApiUsageStateValue.ENABLED);
+        apiUsageState.setSmsExecState(ApiUsageStateValue.ENABLED);
+        apiUsageState.setTbelExecState(ApiUsageStateValue.ENABLED);
+        apiUsageState.setReExecState(ApiUsageStateValue.ENABLED);
+        apiUsageState.setTransportState(ApiUsageStateValue.ENABLED);
+        apiUsageState.setEmailExecState(ApiUsageStateValue.ENABLED);
+        apiUsageState.setJsExecState(ApiUsageStateValue.ENABLED);
+        apiUsageState.setTenantId(tenantId);
+        apiUsageState.setEntityId(tenantId);
+
+        long now = System.currentTimeMillis();
+        long currentCycleTs = now - TimeUnit.DAYS.toMillis(30);
+        long nextCycleTs = now - TimeUnit.MINUTES.toMillis(5); // < 1h ago
+        TenantApiUsageState tenantApiUsageState = new TenantApiUsageState(savedTenantProfile, apiUsageState);
+        tenantApiUsageState.setCycles(currentCycleTs, nextCycleTs);
+        Map<EntityId, BaseApiUsageState> map = new HashMap<>();
+        map.put(tenantId, tenantApiUsageState);
+
+        Field fieldToSet = DefaultTbApiUsageStateService.class.getDeclaredField("myUsageStates");
+        fieldToSet.setAccessible(true);
+        fieldToSet.set(service, map);
+
+        service.checkStartOfNextCycle();
+
+        long firstOfNextMonth = LocalDate.now()
+                .with((temporal) -> temporal.with(DAY_OF_MONTH, 1)
+                        .plus(1, MONTHS))
+                .atStartOfDay(UTC).toInstant().toEpochMilli();
+        assertThat(tenantApiUsageState.getNextCycleTs()).isEqualTo(firstOfNextMonth);
+    }
+
     private TenantProfile createTenantProfile() {
         TenantProfile tenantProfile = new TenantProfile();
         tenantProfile.setName("Tenant Profile");

application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingCalculatedFieldStateTest.java

@@ -0,0 +1,478 @@
+/**
+ * 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.service.cf.ctx.state;
+
+import com.google.common.util.concurrent.Futures;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.cf.CalculatedField;
+import org.thingsboard.server.common.data.cf.CalculatedFieldType;
+import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.Output;
+import org.thingsboard.server.common.data.cf.configuration.OutputType;
+import org.thingsboard.server.common.data.cf.configuration.RelationPathQueryDynamicSourceConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingCalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingReportStrategy;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.ZoneGroupConfiguration;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.DoubleDataEntry;
+import org.thingsboard.server.common.data.kv.JsonDataEntry;
+import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.relation.EntitySearchDirection;
+import org.thingsboard.server.common.data.relation.RelationPathLevel;
+import org.thingsboard.server.dao.relation.RelationService;
+import org.thingsboard.server.dao.usagerecord.ApiLimitService;
+import org.thingsboard.server.service.cf.CalculatedFieldResult;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculatedFieldState;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LATITUDE_ARGUMENT_KEY;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LONGITUDE_ARGUMENT_KEY;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingReportStrategy.REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS;
+
+@ExtendWith(MockitoExtension.class)
+public class GeofencingCalculatedFieldStateTest {
+
+    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("8f83eeca-b5cd-4955-9241-09d1393768c6"));
+    private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("688b529d-cfbe-4430-91c5-60b4f4e5d3cf"));
+    private final AssetId ZONE_1_ID = new AssetId(UUID.fromString("c0e3031c-7df1-45e4-9590-cfd621a4d714"));
+    private final AssetId ZONE_2_ID = new AssetId(UUID.fromString("e7da6200-2096-4038-a343-ade9ea4fa3e4"));
+
+    private final SingleValueArgumentEntry latitudeArgEntry = new SingleValueArgumentEntry(System.currentTimeMillis() - 10, new DoubleDataEntry("latitude", 50.4730), 145L);
+    private final SingleValueArgumentEntry longitudeArgEntry = new SingleValueArgumentEntry(System.currentTimeMillis() - 6, new DoubleDataEntry("longitude", 30.5050), 165L);
+
+    private final JsonDataEntry allowedZoneDataEntry = new JsonDataEntry("zone", "[[50.472000, 30.504000], [50.472000, 30.506000], [50.474000, 30.506000], [50.474000, 30.504000]]");
+    private final BaseAttributeKvEntry allowedZoneAttributeKvEntry = new BaseAttributeKvEntry(allowedZoneDataEntry, System.currentTimeMillis(), 0L);
+    private final GeofencingArgumentEntry geofencingAllowedZoneArgEntry = new GeofencingArgumentEntry(Map.of(ZONE_1_ID, allowedZoneAttributeKvEntry));
+
+    private final JsonDataEntry restrictedZoneDataEntry = new JsonDataEntry("zone", "[[50.475000, 30.510000], [50.475000, 30.512000], [50.477000, 30.512000], [50.477000, 30.510000]]");
+    private final BaseAttributeKvEntry restrictedZoneAttributeKvEntry = new BaseAttributeKvEntry(restrictedZoneDataEntry, System.currentTimeMillis(), 0L);
+    private final GeofencingArgumentEntry geofencingRestrictedZoneArgEntry = new GeofencingArgumentEntry(Map.of(ZONE_2_ID, restrictedZoneAttributeKvEntry));
+
+
+    private GeofencingCalculatedFieldState state;
+    private CalculatedFieldCtx ctx;
+
+    @Mock
+    private ApiLimitService apiLimitService;
+    @Mock
+    private RelationService relationService;
+
+    @BeforeEach
+    void setUp() {
+        when(apiLimitService.getLimit(any(), any())).thenReturn(1000L);
+        ctx = new CalculatedFieldCtx(getCalculatedField(), null, apiLimitService, relationService);
+        ctx.init();
+        state = new GeofencingCalculatedFieldState(ctx.getArgNames());
+    }
+
+    @Test
+    void testType() {
+        assertThat(state.getType()).isEqualTo(CalculatedFieldType.GEOFENCING);
+    }
+
+    @Test
+    void testUpdateState() {
+        state.arguments = new HashMap<>(Map.of(
+                ENTITY_ID_LATITUDE_ARGUMENT_KEY, latitudeArgEntry,
+                ENTITY_ID_LONGITUDE_ARGUMENT_KEY, longitudeArgEntry
+        ));
+
+        Map<String, ArgumentEntry> newArgs = Map.of("allowedZones", geofencingAllowedZoneArgEntry);
+        boolean stateUpdated = state.updateState(ctx, newArgs);
+
+        assertThat(stateUpdated).isTrue();
+        assertThat(state.getArguments()).containsExactlyInAnyOrderEntriesOf(
+                Map.of(
+                        ENTITY_ID_LATITUDE_ARGUMENT_KEY, latitudeArgEntry,
+                        ENTITY_ID_LONGITUDE_ARGUMENT_KEY, longitudeArgEntry,
+                        "allowedZones", geofencingAllowedZoneArgEntry
+                )
+        );
+    }
+
+    @Test
+    void testUpdateStateWithInvalidArgumentTypeForLatitudeArgument() {
+        assertThatThrownBy(() -> state.updateState(ctx, Map.of(ENTITY_ID_LATITUDE_ARGUMENT_KEY, geofencingAllowedZoneArgEntry)))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Unsupported argument entry type for latitude argument: GEOFENCING. Only SINGLE_VALUE type is allowed.");
+    }
+
+    @Test
+    void testUpdateStateWithInvalidArgumentTypeForLongitudeArgument() {
+        assertThatThrownBy(() -> state.updateState(ctx, Map.of(ENTITY_ID_LONGITUDE_ARGUMENT_KEY, geofencingAllowedZoneArgEntry)))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Unsupported argument entry type for longitude argument: GEOFENCING. Only SINGLE_VALUE type is allowed.");
+    }
+
+    @Test
+    void testUpdateStateWithInvalidArgumentTypeForGeofencingArgument() {
+        assertThatThrownBy(() -> state.updateState(ctx, Map.of("someArgumentName", latitudeArgEntry)))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Unsupported argument entry type for someArgumentName argument: SINGLE_VALUE. Only GEOFENCING type is allowed.");
+    }
+
+    @Test
+    void testUpdateStateWhenUpdateExistingSingleValueArgumentEntry() {
+        state.arguments = new HashMap<>(Map.of(ENTITY_ID_LATITUDE_ARGUMENT_KEY, latitudeArgEntry));
+
+        SingleValueArgumentEntry newArgEntry = new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 50.4760), 190L);
+        Map<String, ArgumentEntry> newArgs = Map.of("latitude", newArgEntry);
+        boolean stateUpdated = state.updateState(ctx, newArgs);
+
+        assertThat(stateUpdated).isTrue();
+        assertThat(state.getArguments()).isEqualTo(newArgs);
+    }
+
+    @Test
+    void testUpdateStateWhenUpdateExistingGeofencingValueArgumentEntryWithTheSameValue() {
+        state.arguments = new HashMap<>(Map.of("allowedZones", geofencingAllowedZoneArgEntry));
+
+        Map<String, ArgumentEntry> newArgs = Map.of("allowedZones", geofencingAllowedZoneArgEntry);
+
+        boolean stateUpdated = state.updateState(ctx, newArgs);
+
+        assertThat(stateUpdated).isFalse();
+        assertThat(state.getArguments()).isEqualTo(newArgs);
+    }
+
+    @Test
+    void testUpdateStateWhenUpdateExistingSingleValueArgumentEntryWithValueOfAnotherType() {
+        state.arguments = new HashMap<>(Map.of(ENTITY_ID_LATITUDE_ARGUMENT_KEY, latitudeArgEntry));
+
+        assertThatThrownBy(() -> state.updateState(ctx, Map.of(ENTITY_ID_LATITUDE_ARGUMENT_KEY, geofencingAllowedZoneArgEntry)))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Unsupported argument entry type for single value argument entry: GEOFENCING");
+    }
+
+
+    @Test
+    void testUpdateStateWhenUpdateExistingGeofencingValueArgumentEntryWithValueOfAnotherType() {
+        state.arguments = new HashMap<>(Map.of("allowedZones", geofencingAllowedZoneArgEntry));
+
+        assertThatThrownBy(() -> state.updateState(ctx, Map.of("allowedZones", latitudeArgEntry)))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Unsupported argument entry type for geofencing argument entry: SINGLE_VALUE");
+    }
+
+    @Test
+    void testIsReadyWhenNotAllArgPresent() {
+        assertThat(state.isReady()).isFalse();
+    }
+
+    @Test
+    void testIsReadyWhenAllArgPresent() {
+        state.arguments = new HashMap<>(Map.of(
+                ENTITY_ID_LATITUDE_ARGUMENT_KEY, latitudeArgEntry,
+                ENTITY_ID_LONGITUDE_ARGUMENT_KEY, longitudeArgEntry,
+                "allowedZones", geofencingAllowedZoneArgEntry,
+                "restrictedZones", geofencingRestrictedZoneArgEntry
+        ));
+        assertThat(state.isReady()).isTrue();
+    }
+
+    @Test
+    void testIsReadyWhenEmptyEntryPresents() {
+        state.arguments = new HashMap<>(Map.of(
+                ENTITY_ID_LATITUDE_ARGUMENT_KEY, latitudeArgEntry,
+                ENTITY_ID_LONGITUDE_ARGUMENT_KEY, longitudeArgEntry,
+                "allowedZones", geofencingAllowedZoneArgEntry,
+                "restrictedZones", geofencingRestrictedZoneArgEntry
+        ));
+
+        state.getArguments().put("noParkingZones", new GeofencingArgumentEntry());
+
+        assertThat(state.isReady()).isFalse();
+    }
+
+    @Test
+    void testPerformCalculation() throws ExecutionException, InterruptedException {
+        state.arguments = new HashMap<>(Map.of(
+                ENTITY_ID_LATITUDE_ARGUMENT_KEY, latitudeArgEntry,
+                ENTITY_ID_LONGITUDE_ARGUMENT_KEY, longitudeArgEntry,
+                "allowedZones", geofencingAllowedZoneArgEntry,
+                "restrictedZones", geofencingRestrictedZoneArgEntry
+        ));
+
+        Output output = ctx.getOutput();
+        var configuration = (GeofencingCalculatedFieldConfiguration) ctx.getCalculatedField().getConfiguration();
+
+        when(relationService.saveRelationAsync(any(), any())).thenReturn(Futures.immediateFuture(true));
+        when(relationService.deleteRelationAsync(any(), any())).thenReturn(Futures.immediateFuture(true));
+
+        CalculatedFieldResult result = state.performCalculation(ctx.getEntityId(), ctx).get();
+
+        assertThat(result).isNotNull();
+        assertThat(result.getType()).isEqualTo(output.getType());
+        assertThat(result.getScope()).isEqualTo(output.getScope());
+        assertThat(result.getResult()).isEqualTo(
+                JacksonUtil.newObjectNode()
+                        .put("allowedZonesEvent", "ENTERED")
+                        .put("allowedZonesStatus", "INSIDE")
+                        .put("restrictedZonesStatus", "OUTSIDE")
+        );
+
+        SingleValueArgumentEntry newLatitude = new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 50.4760), 146L);
+        SingleValueArgumentEntry newLongitude = new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("longitude", 30.5110), 166L);
+
+        // move the device to new coordinates → leaves allowed, enters restricted
+        state.updateState(ctx, Map.of(ENTITY_ID_LATITUDE_ARGUMENT_KEY, newLatitude, ENTITY_ID_LONGITUDE_ARGUMENT_KEY, newLongitude));
+
+        CalculatedFieldResult result2 = state.performCalculation(ctx.getEntityId(), ctx).get();
+
+        assertThat(result2).isNotNull();
+        assertThat(result2.getType()).isEqualTo(output.getType());
+        assertThat(result2.getScope()).isEqualTo(output.getScope());
+        assertThat(result2.getResult().get("values")).isEqualTo(
+                JacksonUtil.newObjectNode()
+                        .put("allowedZonesEvent", "LEFT")
+                        .put("allowedZonesStatus", "OUTSIDE")
+                        .put("restrictedZonesEvent", "ENTERED")
+                        .put("restrictedZonesStatus", "INSIDE")
+        );
+
+        // Check relations are created and deleted correctly for both iterations.
+        ArgumentCaptor<EntityRelation> saveCaptor = ArgumentCaptor.forClass(EntityRelation.class);
+        verify(relationService, times(2)).saveRelationAsync(eq(ctx.getTenantId()), saveCaptor.capture());
+        List<EntityRelation> saveValues = saveCaptor.getAllValues();
+        assertThat(saveValues).hasSize(2);
+
+        EntityRelation relationFromFirstIteration = saveValues.get(0);
+        assertThat(relationFromFirstIteration.getTo()).isEqualTo(ctx.getEntityId());
+        assertThat(relationFromFirstIteration.getFrom()).isEqualTo(ZONE_1_ID);
+        assertThat(relationFromFirstIteration.getType()).isEqualTo("CurrentZone");
+
+        EntityRelation relationFromSecondIteration = saveValues.get(1);
+        assertThat(relationFromSecondIteration.getTo()).isEqualTo(ctx.getEntityId());
+        assertThat(relationFromSecondIteration.getFrom()).isEqualTo(ZONE_2_ID);
+        assertThat(relationFromSecondIteration.getType()).isEqualTo("CurrentZone");
+
+        ArgumentCaptor<EntityRelation> deleteCaptor = ArgumentCaptor.forClass(EntityRelation.class);
+        verify(relationService).deleteRelationAsync(eq(ctx.getTenantId()), deleteCaptor.capture());
+        EntityRelation leftRelation = deleteCaptor.getValue();
+        assertThat(leftRelation.getFrom()).isEqualTo(ZONE_1_ID);
+        assertThat(leftRelation.getTo()).isEqualTo(ctx.getEntityId());
+    }
+
+    @Test
+    void testPerformCalculationWithOnlyTransitionEventsReportingStrategy() throws ExecutionException, InterruptedException {
+        state.arguments = new HashMap<>(Map.of(
+                ENTITY_ID_LATITUDE_ARGUMENT_KEY, latitudeArgEntry,
+                ENTITY_ID_LONGITUDE_ARGUMENT_KEY, longitudeArgEntry,
+                "allowedZones", geofencingAllowedZoneArgEntry,
+                "restrictedZones", geofencingRestrictedZoneArgEntry
+        ));
+
+        Output output = ctx.getOutput();
+
+        var calculatedFieldConfig = getCalculatedFieldConfig(GeofencingReportStrategy.REPORT_TRANSITION_EVENTS_ONLY);
+
+        ctx.setCalculatedField(getCalculatedField(calculatedFieldConfig));
+        ctx.init();
+
+        var configuration = (GeofencingCalculatedFieldConfiguration) ctx.getCalculatedField().getConfiguration();
+
+        when(relationService.saveRelationAsync(any(), any())).thenReturn(Futures.immediateFuture(true));
+        when(relationService.deleteRelationAsync(any(), any())).thenReturn(Futures.immediateFuture(true));
+
+        CalculatedFieldResult result = state.performCalculation(ctx.getEntityId(), ctx).get();
+
+        assertThat(result).isNotNull();
+        assertThat(result.getType()).isEqualTo(output.getType());
+        assertThat(result.getScope()).isEqualTo(output.getScope());
+        assertThat(result.getResult()).isEqualTo(
+                JacksonUtil.newObjectNode().put("allowedZonesEvent", "ENTERED")
+        );
+
+        SingleValueArgumentEntry newLatitude = new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 50.4760), 146L);
+        SingleValueArgumentEntry newLongitude = new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("longitude", 30.5110), 166L);
+
+        // move the device to new coordinates → leaves allowed, enters restricted
+        state.updateState(ctx, Map.of(ENTITY_ID_LATITUDE_ARGUMENT_KEY, newLatitude, ENTITY_ID_LONGITUDE_ARGUMENT_KEY, newLongitude));
+
+        CalculatedFieldResult result2 = state.performCalculation(ctx.getEntityId(), ctx).get();
+
+        assertThat(result2).isNotNull();
+        assertThat(result2.getType()).isEqualTo(output.getType());
+        assertThat(result2.getScope()).isEqualTo(output.getScope());
+        assertThat(result2.getResult().get("values")).isEqualTo(
+                JacksonUtil.newObjectNode()
+                        .put("allowedZonesEvent", "LEFT")
+                        .put("restrictedZonesEvent", "ENTERED")
+        );
+
+        // Check relations are created and deleted correctly for both iterations.
+        ArgumentCaptor<EntityRelation> saveCaptor = ArgumentCaptor.forClass(EntityRelation.class);
+        verify(relationService, times(2)).saveRelationAsync(eq(ctx.getTenantId()), saveCaptor.capture());
+        List<EntityRelation> saveValues = saveCaptor.getAllValues();
+        assertThat(saveValues).hasSize(2);
+
+        EntityRelation relationFromFirstIteration = saveValues.get(0);
+        assertThat(relationFromFirstIteration.getTo()).isEqualTo(ctx.getEntityId());
+        assertThat(relationFromFirstIteration.getFrom()).isEqualTo(ZONE_1_ID);
+        assertThat(relationFromFirstIteration.getType()).isEqualTo("CurrentZone");
+
+        EntityRelation relationFromSecondIteration = saveValues.get(1);
+        assertThat(relationFromSecondIteration.getTo()).isEqualTo(ctx.getEntityId());
+        assertThat(relationFromSecondIteration.getFrom()).isEqualTo(ZONE_2_ID);
+        assertThat(relationFromSecondIteration.getType()).isEqualTo("CurrentZone");
+
+        ArgumentCaptor<EntityRelation> deleteCaptor = ArgumentCaptor.forClass(EntityRelation.class);
+        verify(relationService).deleteRelationAsync(eq(ctx.getTenantId()), deleteCaptor.capture());
+        EntityRelation leftRelation = deleteCaptor.getValue();
+        assertThat(leftRelation.getFrom()).isEqualTo(ZONE_1_ID);
+        assertThat(leftRelation.getTo()).isEqualTo(ctx.getEntityId());
+    }
+
+    @Test
+    void testPerformCalculationWithOnlyPresenceStatusReportingStrategy() throws ExecutionException, InterruptedException {
+        state.arguments = new HashMap<>(Map.of(
+                ENTITY_ID_LATITUDE_ARGUMENT_KEY, latitudeArgEntry,
+                ENTITY_ID_LONGITUDE_ARGUMENT_KEY, longitudeArgEntry,
+                "allowedZones", geofencingAllowedZoneArgEntry,
+                "restrictedZones", geofencingRestrictedZoneArgEntry
+        ));
+
+        Output output = ctx.getOutput();
+
+        var calculatedFieldConfig = getCalculatedFieldConfig(GeofencingReportStrategy.REPORT_PRESENCE_STATUS_ONLY);
+
+        ctx.setCalculatedField(getCalculatedField(calculatedFieldConfig));
+        ctx.init();
+
+        var configuration = (GeofencingCalculatedFieldConfiguration) ctx.getCalculatedField().getConfiguration();
+
+        when(relationService.saveRelationAsync(any(), any())).thenReturn(Futures.immediateFuture(true));
+        when(relationService.deleteRelationAsync(any(), any())).thenReturn(Futures.immediateFuture(true));
+
+        CalculatedFieldResult result = state.performCalculation(ctx.getEntityId(), ctx).get();
+
+        assertThat(result).isNotNull();
+        assertThat(result.getType()).isEqualTo(output.getType());
+        assertThat(result.getScope()).isEqualTo(output.getScope());
+        assertThat(result.getResult()).isEqualTo(
+                JacksonUtil.newObjectNode()
+                        .put("allowedZonesStatus", "INSIDE")
+                        .put("restrictedZonesStatus", "OUTSIDE")
+        );
+
+        SingleValueArgumentEntry newLatitude = new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 50.4760), 146L);
+        SingleValueArgumentEntry newLongitude = new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("longitude", 30.5110), 166L);
+
+        // move the device to new coordinates → leaves allowed, enters restricted
+        state.updateState(ctx, Map.of(ENTITY_ID_LATITUDE_ARGUMENT_KEY, newLatitude, ENTITY_ID_LONGITUDE_ARGUMENT_KEY, newLongitude));
+
+        CalculatedFieldResult result2 = state.performCalculation(ctx.getEntityId(), ctx).get();
+
+        assertThat(result2).isNotNull();
+        assertThat(result2.getType()).isEqualTo(output.getType());
+        assertThat(result2.getScope()).isEqualTo(output.getScope());
+        assertThat(result2.getResult().get("values")).isEqualTo(
+                JacksonUtil.newObjectNode()
+                        .put("allowedZonesStatus", "OUTSIDE")
+                        .put("restrictedZonesStatus", "INSIDE")
+        );
+
+        // Check relations are created and deleted correctly for both iterations.
+        ArgumentCaptor<EntityRelation> saveCaptor = ArgumentCaptor.forClass(EntityRelation.class);
+        verify(relationService, times(2)).saveRelationAsync(eq(ctx.getTenantId()), saveCaptor.capture());
+        List<EntityRelation> saveValues = saveCaptor.getAllValues();
+        assertThat(saveValues).hasSize(2);
+
+        EntityRelation relationFromFirstIteration = saveValues.get(0);
+        assertThat(relationFromFirstIteration.getTo()).isEqualTo(ctx.getEntityId());
+        assertThat(relationFromFirstIteration.getFrom()).isEqualTo(ZONE_1_ID);
+        assertThat(relationFromFirstIteration.getType()).isEqualTo("CurrentZone");
+
+        EntityRelation relationFromSecondIteration = saveValues.get(1);
+        assertThat(relationFromSecondIteration.getTo()).isEqualTo(ctx.getEntityId());
+        assertThat(relationFromSecondIteration.getFrom()).isEqualTo(ZONE_2_ID);
+        assertThat(relationFromSecondIteration.getType()).isEqualTo("CurrentZone");
+
+        ArgumentCaptor<EntityRelation> deleteCaptor = ArgumentCaptor.forClass(EntityRelation.class);
+        verify(relationService).deleteRelationAsync(eq(ctx.getTenantId()), deleteCaptor.capture());
+        EntityRelation leftRelation = deleteCaptor.getValue();
+        assertThat(leftRelation.getFrom()).isEqualTo(ZONE_1_ID);
+        assertThat(leftRelation.getTo()).isEqualTo(ctx.getEntityId());
+    }
+
+    private CalculatedField getCalculatedField() {
+        return getCalculatedField(getCalculatedFieldConfig(REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS));
+    }
+
+    private CalculatedField getCalculatedField(CalculatedFieldConfiguration configuration) {
+        CalculatedField calculatedField = new CalculatedField();
+        calculatedField.setTenantId(TENANT_ID);
+        calculatedField.setEntityId(DEVICE_ID);
+        calculatedField.setType(CalculatedFieldType.GEOFENCING);
+        calculatedField.setName("Test Geofencing Calculated Field");
+        calculatedField.setConfigurationVersion(1);
+        calculatedField.setConfiguration(configuration);
+        calculatedField.setVersion(1L);
+        return calculatedField;
+    }
+
+    private CalculatedFieldConfiguration getCalculatedFieldConfig(GeofencingReportStrategy reportStrategy) {
+        var config = new GeofencingCalculatedFieldConfiguration();
+
+        EntityCoordinates entityCoordinates = new EntityCoordinates("latitude", "longitude");
+        config.setEntityCoordinates(entityCoordinates);
+
+        ZoneGroupConfiguration allowedZonesGroup = new ZoneGroupConfiguration("zone", reportStrategy, true);
+        var allowedZoneDynamicSourceConfiguration = new RelationPathQueryDynamicSourceConfiguration();
+        allowedZoneDynamicSourceConfiguration.setLevels(List.of(new RelationPathLevel(EntitySearchDirection.TO, "AllowedZone")));
+        allowedZonesGroup.setRefDynamicSourceConfiguration(allowedZoneDynamicSourceConfiguration);
+        allowedZonesGroup.setRelationType("CurrentZone");
+        allowedZonesGroup.setDirection(EntitySearchDirection.TO);
+
+        ZoneGroupConfiguration restrictedZonesGroup = new ZoneGroupConfiguration("zone", reportStrategy, true);
+        var restrictedZoneDynamicSourceConfiguration = new RelationPathQueryDynamicSourceConfiguration();
+        restrictedZoneDynamicSourceConfiguration.setLevels(List.of(new RelationPathLevel(EntitySearchDirection.TO, "RestrictedZone")));
+        restrictedZonesGroup.setRefDynamicSourceConfiguration(restrictedZoneDynamicSourceConfiguration);
+        restrictedZonesGroup.setRelationType("CurrentZone");
+        restrictedZonesGroup.setDirection(EntitySearchDirection.TO);
+
+        config.setZoneGroups(Map.of("allowedZones", allowedZonesGroup, "restrictedZones", restrictedZonesGroup));
+
+        Output output = new Output();
+        output.setType(OutputType.TIME_SERIES);
+        config.setOutput(output);
+        return config;
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingValueArgumentEntryTest.java

@@ -0,0 +1,184 @@
+/**
+ * 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.service.cf.ctx.state;
+
+import io.hypersistence.utils.hibernate.type.json.internal.JacksonUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.thingsboard.common.util.geo.PerimeterDefinition;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.JsonDataEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingZoneState;
+
+import java.util.Map;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+public class GeofencingValueArgumentEntryTest {
+
+    private final AssetId ZONE_1_ID = new AssetId(UUID.fromString("c0e3031c-7df1-45e4-9590-cfd621a4d714"));
+    private final AssetId ZONE_2_ID = new AssetId(UUID.fromString("e7da6200-2096-4038-a343-ade9ea4fa3e4"));
+
+    private final JsonDataEntry allowedZoneDataEntry = new JsonDataEntry("zone", "[[50.472000, 30.504000], [50.472000, 30.506000], [50.474000, 30.506000], [50.474000, 30.504000]]");
+    private final BaseAttributeKvEntry allowedZoneAttributeKvEntry = new BaseAttributeKvEntry(allowedZoneDataEntry, 363L, 155L);
+
+    private final JsonDataEntry restrictedZoneDataEntry = new JsonDataEntry("zone", "[[50.475000, 30.510000], [50.475000, 30.512000], [50.477000, 30.512000], [50.477000, 30.510000]]");
+    private final BaseAttributeKvEntry restrictedZoneAttributeKvEntry = new BaseAttributeKvEntry(restrictedZoneDataEntry, 363L, 155L);
+
+    private GeofencingArgumentEntry entry;
+
+    @BeforeEach
+    void setUp() {
+        entry = new GeofencingArgumentEntry(Map.of(ZONE_1_ID, allowedZoneAttributeKvEntry, ZONE_2_ID, restrictedZoneAttributeKvEntry));
+    }
+
+    @Test
+    void testArgumentEntryType() {
+        assertThat(entry.getType()).isEqualTo(ArgumentEntryType.GEOFENCING);
+    }
+
+    @Test
+    void testUpdateEntryWhenSingleEntryPassed() {
+        assertThatThrownBy(() -> entry.updateEntry(new SingleValueArgumentEntry()))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Unsupported argument entry type for geofencing argument entry: SINGLE_VALUE");
+    }
+
+    @Test
+    void testUpdateEntryWhenRollingEntryPassed() {
+        assertThatThrownBy(() -> entry.updateEntry(new TsRollingArgumentEntry(5, 30000L)))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Unsupported argument entry type for geofencing argument entry: TS_ROLLING");
+    }
+
+    @Test
+    void testUpdateEntryWithTheSameTs() {
+        BaseAttributeKvEntry differentValueSameTs = new BaseAttributeKvEntry(new JsonDataEntry("zone", "[[50.472001, 30.504001], [50.472001, 30.506001], [50.474001, 30.506001], [50.474001, 30.504001]]"), 363L, 156L);
+        var updated = new GeofencingArgumentEntry(Map.of(ZONE_1_ID, differentValueSameTs, ZONE_2_ID, restrictedZoneAttributeKvEntry));
+        assertThat(entry.updateEntry(updated)).isFalse();
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void testUpdateEntryWhenNewVersionIsNull() {
+        BaseAttributeKvEntry differentValueNewVersionIsNull = new BaseAttributeKvEntry(new JsonDataEntry("zone", "[[50.472001, 30.504001], [50.472001, 30.506001], [50.474001, 30.506001], [50.474001, 30.504001]]"), 364L, null);
+        var updated = new GeofencingArgumentEntry(Map.of(ZONE_1_ID, differentValueNewVersionIsNull, ZONE_2_ID, restrictedZoneAttributeKvEntry));
+
+        assertThat(entry.updateEntry(updated)).isTrue();
+        assertThat(entry.getValue()).isInstanceOf(Map.class);
+
+        Map<EntityId, GeofencingZoneState> value = (Map<EntityId, GeofencingZoneState>) entry.getValue();
+        assertThat(value).hasSize(2);
+        assertThat(value.get(ZONE_1_ID).getVersion()).isNull();
+        assertThat(value.get(ZONE_1_ID).getTs()).isEqualTo(364L);
+        assertThat(value.get(ZONE_1_ID).getPerimeterDefinition())
+                .isEqualTo(JacksonUtil.fromString(differentValueNewVersionIsNull.getJsonValue().get(), PerimeterDefinition.class));
+
+        assertThat(value.get(ZONE_2_ID).getVersion()).isEqualTo(155L);
+        assertThat(value.get(ZONE_2_ID).getTs()).isEqualTo(363L);
+        assertThat(value.get(ZONE_2_ID).getPerimeterDefinition())
+                .isEqualTo(JacksonUtil.fromString(restrictedZoneAttributeKvEntry.getJsonValue().get(), PerimeterDefinition.class));
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    void testUpdateEntryWhenNewVersionIsGreaterThanCurrent() {
+        BaseAttributeKvEntry differentValueNewVersionIsSet = new BaseAttributeKvEntry(new JsonDataEntry("zone", "[[50.472001, 30.504001], [50.472001, 30.506001], [50.474001, 30.506001], [50.474001, 30.504001]]"), 364L, 156L);
+        var updated = new GeofencingArgumentEntry(Map.of(ZONE_1_ID, differentValueNewVersionIsSet, ZONE_2_ID, restrictedZoneAttributeKvEntry));
+
+        assertThat(entry.updateEntry(updated)).isTrue();
+        assertThat(entry.getValue()).isInstanceOf(Map.class);
+
+        Map<EntityId, GeofencingZoneState> value = (Map<EntityId, GeofencingZoneState>) entry.getValue();
+        assertThat(value).hasSize(2);
+        assertThat(value.get(ZONE_1_ID).getVersion()).isEqualTo(156L);
+        assertThat(value.get(ZONE_1_ID).getTs()).isEqualTo(364L);
+        assertThat(value.get(ZONE_1_ID).getPerimeterDefinition())
+                .isEqualTo(JacksonUtil.fromString(differentValueNewVersionIsSet.getJsonValue().get(), PerimeterDefinition.class));
+
+        assertThat(value.get(ZONE_2_ID).getVersion()).isEqualTo(155L);
+        assertThat(value.get(ZONE_2_ID).getTs()).isEqualTo(363L);
+        assertThat(value.get(ZONE_2_ID).getPerimeterDefinition())
+                .isEqualTo(JacksonUtil.fromString(restrictedZoneAttributeKvEntry.getJsonValue().get(), PerimeterDefinition.class));
+    }
+
+    @Test
+    void testUpdateEntryWhenNewVersionIsLessThanCurrent() {
+        BaseAttributeKvEntry differentValueNewVersionIsSet = new BaseAttributeKvEntry(new JsonDataEntry("zone", "[[50.472001, 30.504001], [50.472001, 30.506001], [50.474001, 30.506001], [50.474001, 30.504001]]"), 364L, 154L);
+        var updated = new GeofencingArgumentEntry(Map.of(ZONE_1_ID, differentValueNewVersionIsSet, ZONE_2_ID, restrictedZoneAttributeKvEntry));
+
+        assertThat(entry.updateEntry(updated)).isFalse();
+    }
+
+    @Test
+    void testUpdateEntryWhenNewTsAndVersionIsGreaterThenCurrentAndValueWasNotChanged() {
+        BaseAttributeKvEntry newTsAndTheSameValue = new BaseAttributeKvEntry(allowedZoneDataEntry, 364L, 156L);
+        var updated = new GeofencingArgumentEntry(Map.of(ZONE_1_ID, newTsAndTheSameValue, ZONE_2_ID, restrictedZoneAttributeKvEntry));
+
+        assertThat(entry.updateEntry(updated)).isTrue();
+    }
+
+    @Test
+    void testUpdateEntryWithOldTs() {
+        BaseAttributeKvEntry oldTsAndTheSameValue = new BaseAttributeKvEntry(allowedZoneDataEntry, 362L, 156L);
+        var updated = new GeofencingArgumentEntry(Map.of(ZONE_1_ID, oldTsAndTheSameValue, ZONE_2_ID, restrictedZoneAttributeKvEntry));
+
+        assertThat(entry.updateEntry(updated)).isFalse();
+    }
+
+    @Test
+    void testUpdateEntryWithNewZone() {
+        final AssetId NEW_ZONE_ID = new AssetId(UUID.fromString("a3eacf1a-6af3-4e9f-87c4-502bb25c7dc3"));
+        BaseAttributeKvEntry newZone = new BaseAttributeKvEntry(new JsonDataEntry("zone", "[[50.472001, 30.504001], [50.472001, 30.506001], [50.474001, 30.506001], [50.474001, 30.504001]]"), 364L, 156L);
+        var updated = new GeofencingArgumentEntry(Map.of(ZONE_1_ID, allowedZoneAttributeKvEntry, ZONE_2_ID, restrictedZoneAttributeKvEntry, NEW_ZONE_ID, newZone));
+        assertThat(entry.updateEntry(updated)).isTrue();
+    }
+
+    @Test
+    void testIsEmpty() {
+        GeofencingArgumentEntry geofencingArgumentEntry = new GeofencingArgumentEntry();
+        assertThat(geofencingArgumentEntry.isEmpty()).isTrue();
+    }
+
+    @Test
+    void testIsEmptyWithEmptyMap() {
+        GeofencingArgumentEntry geofencingArgumentEntry = new GeofencingArgumentEntry(Map.of());
+        assertThat(geofencingArgumentEntry.isEmpty()).isTrue();
+    }
+
+    @Test
+    void testInvalidKvEntryDataTypeForZoneResultInEmptyArgument() {
+        BaseAttributeKvEntry invalidZoneEntry = new BaseAttributeKvEntry(new StringDataEntry("zone", "someString"), 363L, 155L);
+        assertThatThrownBy(() -> new GeofencingArgumentEntry(Map.of(ZONE_1_ID, invalidZoneEntry)))
+                .isExactlyInstanceOf(IllegalArgumentException.class)
+                .hasMessage("The given string value cannot be transformed to Json object: someString");
+    }
+
+    @Test
+    void testNotParsableToPerimeterJsonKvEntryResultInExceptionTrowed() {
+        BaseAttributeKvEntry invalidZoneEntry = new BaseAttributeKvEntry(new JsonDataEntry("zone", "\"{}\""), 363L, 155L);
+        assertThatThrownBy(() -> new GeofencingArgumentEntry(Map.of(ZONE_1_ID, invalidZoneEntry)))
+                .isExactlyInstanceOf(IllegalArgumentException.class)
+                .hasMessage("The given string value cannot be transformed to Json object: \"{}\"");
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingZoneStateTest.java

@@ -0,0 +1,169 @@
+/**
+ * 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.service.cf.ctx.state;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.thingsboard.common.util.geo.Coordinates;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.JsonDataEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingEvalResult;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingZoneState;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus.INSIDE;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus.OUTSIDE;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingTransitionEvent.ENTERED;
+import static org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingTransitionEvent.LEFT;
+
+public class GeofencingZoneStateTest {
+
+    private final AssetId ZONE_ID = new AssetId(UUID.fromString("628730fd-d625-417f-9c6d-ae9fe4addbdb"));
+
+    private GeofencingZoneState state;
+
+    @BeforeEach
+    void setUp() {
+        String POLYGON = "[[50.472000, 30.504000], [50.472000, 30.506000], [50.474000, 30.506000], [50.474000, 30.504000]]";
+        state = new GeofencingZoneState(ZONE_ID, new BaseAttributeKvEntry(new JsonDataEntry("zone", POLYGON), 100L, 1L));
+    }
+
+    @Test
+    void evaluate_initialInside_thenInsideAgain() {
+        var inside = new Coordinates(50.4730, 30.5050);
+        // first evaluation: no prior state -> ENTERED
+        assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(ENTERED, INSIDE));
+        // same position again -> INSIDE (steady state)
+        assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(null, INSIDE));
+    }
+
+    @Test
+    void evaluate_initialOutside_thenOutsideAgain() {
+        var outside = new Coordinates(50.4760, 30.5110);
+        // first evaluation: no prior state -> OUTSIDE
+        assertThat(state.evaluate(outside)).isEqualTo(new GeofencingEvalResult(null, OUTSIDE));
+        // same position again -> OUTSIDE (steady state)
+        assertThat(state.evaluate(outside)).isEqualTo(new GeofencingEvalResult(null, OUTSIDE));
+    }
+
+    @Test
+    void evaluate_inside_thenLeave() {
+        var inside = new Coordinates(50.4730, 30.5050);
+        var outside = new Coordinates(50.4760, 30.5110);
+        // enter
+        assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(ENTERED, INSIDE));
+        // leave -> LEFT
+        assertThat(state.evaluate(outside)).isEqualTo(new GeofencingEvalResult(LEFT, OUTSIDE));
+        // still outside -> OUTSIDE
+        assertThat(state.evaluate(outside)).isEqualTo(new GeofencingEvalResult(null, OUTSIDE));
+    }
+
+    @Test
+    void evaluate_outside_thenEnter() {
+        var outside = new Coordinates(50.4760, 30.5110);
+        var inside = new Coordinates(50.4730, 30.5050);
+        // start outside
+        assertThat(state.evaluate(outside)).isEqualTo(new GeofencingEvalResult(null, OUTSIDE));
+        // cross boundary -> ENTERED
+        assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(ENTERED, INSIDE));
+        // remain inside -> INSIDE
+        assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(null, INSIDE));
+    }
+
+    @Test
+    void update_withNewerVersion_updatesState_andResetsPresence() {
+        // arrange: establish a prior presence to ensure it’s reset on update
+        var inside = new Coordinates(50.4730, 30.5050);
+        assertThat(state.evaluate(inside)).isNotNull(); // sets lastPresence internally
+
+        String NEW_POLYGON = "[[50.470000, 30.502000], [50.470000, 30.503000], [50.471000, 30.503000], [50.471000, 30.502000]]";
+        GeofencingZoneState newer = new GeofencingZoneState(
+                ZONE_ID,
+                new BaseAttributeKvEntry(new JsonDataEntry("zone", NEW_POLYGON), 200L, 2L)
+        );
+
+        // act
+        boolean changed = state.update(newer);
+
+        // assert
+        assertThat(changed).isTrue();
+        assertThat(state.getTs()).isEqualTo(200L);
+        assertThat(state.getVersion()).isEqualTo(2L);
+        assertThat(state.getPerimeterDefinition()).isNotNull();
+        assertThat(state.getLastPresence()).isNull(); // must be reset on successful update
+    }
+
+    @Test
+    void update_withEqualVersion_doesNothing() {
+        // arrange: same version (1L) but different ts/polygon should still be ignored
+        String SOME_POLYGON = "[[50.472500, 30.504500], [50.472500, 30.505500], [50.473500, 30.505500], [50.473500, 30.504500]]";
+        GeofencingZoneState sameVersion = new GeofencingZoneState(
+                ZONE_ID,
+                new BaseAttributeKvEntry(new JsonDataEntry("zone", SOME_POLYGON), 300L, 1L)
+        );
+
+        // act
+        boolean changed = state.update(sameVersion);
+
+        // assert: nothing changes
+        assertThat(changed).isFalse();
+        assertThat(state.getTs()).isEqualTo(100L);
+        assertThat(state.getVersion()).isEqualTo(1L);
+    }
+
+    @Test
+    void update_withNullNewVersion_alwaysApplies_andCopiesNull() {
+        // arrange: the implementation updates if newVersion == null
+        String OTHER_POLYGON = "[[50.471000, 30.506000], [50.471000, 30.507000], [50.472000, 30.507000], [50.472000, 30.506000]]";
+        GeofencingZoneState nullVersion = new GeofencingZoneState(
+                ZONE_ID,
+                new BaseAttributeKvEntry(new JsonDataEntry("zone", OTHER_POLYGON), 400L, null)
+        );
+
+        // act
+        boolean changed = state.update(nullVersion);
+
+        // assert: applied and version copied as null
+        assertThat(changed).isTrue();
+        assertThat(state.getTs()).isEqualTo(400L);
+        assertThat(state.getVersion()).isNull();
+        assertThat(state.getLastPresence()).isNull();
+    }
+
+    @Test
+    void update_withNewVersionWhenExistingIsNull_alwaysApplies_andCopiesNew() {
+        // arrange: the implementation updates if newVersion == null
+        String OTHER_POLYGON = "[[50.471000, 30.506000], [50.471000, 30.507000], [50.472000, 30.507000], [50.472000, 30.506000]]";
+        GeofencingZoneState newVersion = new GeofencingZoneState(
+                ZONE_ID,
+                new BaseAttributeKvEntry(new JsonDataEntry("zone", OTHER_POLYGON), 400L, 2L)
+        );
+        state.setVersion(null);
+
+        // act
+        boolean changed = state.update(newVersion);
+
+        // assert: applied and version copied as null
+        assertThat(changed).isTrue();
+        assertThat(state.getTs()).isEqualTo(400L);
+        assertThat(state.getVersion()).isEqualTo(2);
+        assertThat(state.getLastPresence()).isNull();
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/cf/ctx/state/ScriptCalculatedFieldStateTest.java

@@ -44,6 +44,7 @@ import org.thingsboard.server.dao.usagerecord.ApiLimitService;
 import org.thingsboard.server.service.cf.CalculatedFieldResult;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.UUID;
@@ -77,7 +78,7 @@ public class ScriptCalculatedFieldStateTest {
     @BeforeEach
     void setUp() {
         when(apiLimitService.getLimit(any(), any())).thenReturn(1000L);
-        ctx = new CalculatedFieldCtx(getCalculatedField(), tbelInvokeService, apiLimitService);
+        ctx = new CalculatedFieldCtx(getCalculatedField(), tbelInvokeService, apiLimitService, null);
         ctx.init();
         state = new ScriptCalculatedFieldState(ctx.getArgNames());
     }
@@ -124,7 +125,7 @@ public class ScriptCalculatedFieldStateTest {
     void testPerformCalculation() throws ExecutionException, InterruptedException {
         state.arguments = new HashMap<>(Map.of("deviceTemperature", deviceTemperatureArgEntry, "assetHumidity", assetHumidityArgEntry));
 
-        CalculatedFieldResult result = state.performCalculation(ctx).get();
+        CalculatedFieldResult result = state.performCalculation(ctx.getEntityId(), ctx).get();
 
         assertThat(result).isNotNull();
         Output output = getCalculatedFieldConfig().getOutput();
@@ -140,7 +141,7 @@ public class ScriptCalculatedFieldStateTest {
                 "assetHumidity", new SingleValueArgumentEntry(System.currentTimeMillis() - 10, new LongDataEntry("a", 45L), 10L)
         ));
 
-        CalculatedFieldResult result = state.performCalculation(ctx).get();
+        CalculatedFieldResult result = state.performCalculation(ctx.getEntityId(), ctx).get();
 
         assertThat(result).isNotNull();
         Output output = getCalculatedFieldConfig().getOutput();

application/src/test/java/org/thingsboard/server/service/cf/ctx/state/SimpleCalculatedFieldStateTest.java

@@ -71,7 +71,7 @@ public class SimpleCalculatedFieldStateTest {
     @BeforeEach
     void setUp() {
         when(apiLimitService.getLimit(any(), any())).thenReturn(1000L);
-        ctx = new CalculatedFieldCtx(getCalculatedField(), null, apiLimitService);
+        ctx = new CalculatedFieldCtx(getCalculatedField(), null, apiLimitService, null);
         ctx.init();
         state = new SimpleCalculatedFieldState(ctx.getArgNames());
     }
@@ -123,7 +123,8 @@ public class SimpleCalculatedFieldStateTest {
         Map<String, ArgumentEntry> newArgs = Map.of("key3", new TsRollingArgumentEntry(10, 30000L));
         assertThatThrownBy(() -> state.updateState(ctx, newArgs))
                 .isInstanceOf(IllegalArgumentException.class)
-                .hasMessage("Rolling argument entry is not supported for simple calculated fields.");
+                .hasMessage("Unsupported argument type detected for argument: key3. " +
+                            "Rolling argument entry is not supported for simple calculated fields.");
     }
 
     @Test
@@ -134,7 +135,7 @@ public class SimpleCalculatedFieldStateTest {
                 "key3", key3ArgEntry
         ));
 
-        CalculatedFieldResult result = state.performCalculation(ctx).get();
+        CalculatedFieldResult result = state.performCalculation(ctx.getEntityId(), ctx).get();
 
         assertThat(result).isNotNull();
         Output output = getCalculatedFieldConfig().getOutput();
@@ -151,7 +152,7 @@ public class SimpleCalculatedFieldStateTest {
                 "key3", key3ArgEntry
         ));
 
-        assertThatThrownBy(() -> state.performCalculation(ctx))
+        assertThatThrownBy(() -> state.performCalculation(ctx.getEntityId(), ctx))
                 .isInstanceOf(IllegalArgumentException.class)
                 .hasMessage("Argument 'key2' is not a number.");
     }
@@ -164,7 +165,7 @@ public class SimpleCalculatedFieldStateTest {
                 "key3", key3ArgEntry
         ));
 
-        CalculatedFieldResult result = state.performCalculation(ctx).get();
+        CalculatedFieldResult result = state.performCalculation(ctx.getEntityId(), ctx).get();
 
         assertThat(result).isNotNull();
         Output output = getCalculatedFieldConfig().getOutput();
@@ -185,7 +186,7 @@ public class SimpleCalculatedFieldStateTest {
         output.setDecimalsByDefault(3);
         ctx.setOutput(output);
 
-        CalculatedFieldResult result = state.performCalculation(ctx).get();
+        CalculatedFieldResult result = state.performCalculation(ctx.getEntityId(), ctx).get();
 
         assertThat(result).isNotNull();
         assertThat(result.getType()).isEqualTo(output.getType());

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)

application/src/test/java/org/thingsboard/server/service/resource/DefaultResourceDataCacheTest.java

@@ -0,0 +1,83 @@
+/**
+ * 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.service.resource;
+
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.GeneralFileDescriptor;
+import org.thingsboard.server.common.data.ResourceType;
+import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.TbResourceDataInfo;
+import org.thingsboard.server.common.data.TbResourceInfo;
+import org.thingsboard.server.controller.AbstractControllerTest;
+import org.thingsboard.server.dao.resource.ResourceService;
+import org.thingsboard.server.dao.resource.TbResourceDataCache;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+@DaoSqlTest
+public class DefaultResourceDataCacheTest extends AbstractControllerTest {
+
+    @MockitoSpyBean
+    private ResourceService resourceService;
+    @Autowired
+    private TbResourceService tbResourceService;
+    @MockitoSpyBean
+    private TbResourceDataCache resourceDataCache;
+
+    @Test
+    public void testGetCachedResourceData() throws Exception {
+        loginTenantAdmin();
+
+        TbResource resource = new TbResource();
+        resource.setTenantId(tenantId);
+        resource.setTitle("File for AI request");
+        resource.setResourceType(ResourceType.GENERAL);
+        resource.setFileName("myTestJson.json");
+        GeneralFileDescriptor descriptor = new GeneralFileDescriptor("application/json");
+        resource.setDescriptorValue(descriptor);
+        byte[] data = "This is a test prompt for AI request.".getBytes();
+        resource.setData(data);
+        TbResourceInfo savedResource = tbResourceService.save(resource);
+        verify(resourceDataCache, timeout(2000).times(1)).evictResourceData(tenantId, savedResource.getId());
+
+        TbResourceDataInfo cachedData = resourceDataCache.getResourceDataInfoAsync(tenantId, savedResource.getId()).get();
+        assertThat(cachedData.getData()).isEqualTo(data);
+        assertThat(JacksonUtil.treeToValue(cachedData.getDescriptor(), GeneralFileDescriptor.class)).isEqualTo(descriptor);
+        verify(resourceService).getResourceDataInfo(tenantId, savedResource.getId());
+
+        // retrieve resource data second time
+        clearInvocations(resourceService);
+        TbResourceDataInfo cachedData2 = resourceDataCache.getResourceDataInfoAsync(tenantId, savedResource.getId()).get();
+        assertThat(cachedData2.getData()).isEqualTo(data);
+        verifyNoMoreInteractions(resourceService);
+
+        // delete resource, check cache
+        TbResource resourceById = resourceService.findResourceById(tenantId, savedResource.getId());
+        tbResourceService.delete(resourceById, true, null);
+        verify(resourceDataCache, timeout(2000).times(2)).evictResourceData(tenantId, savedResource.getId());
+        TbResourceDataInfo cachedDataAfterDeletion = resourceDataCache.getResourceDataInfoAsync(tenantId, savedResource.getId()).get();
+        assertThat(cachedDataAfterDeletion).isEqualTo(null);
+    }
+
+}

application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.service.resource.sql;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -24,8 +25,10 @@ import org.junit.Test;
 import org.junit.jupiter.api.Assertions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.rule.engine.ai.TbAiNode;
+import org.thingsboard.rule.engine.ai.TbAiNodeConfiguration;
+import org.thingsboard.rule.engine.ai.TbResponseFormat;
 import org.thingsboard.server.common.data.Dashboard;
-import org.thingsboard.server.common.data.DashboardInfo;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.EntityInfo;
 import org.thingsboard.server.common.data.EntityType;
@@ -37,26 +40,40 @@ import org.thingsboard.server.common.data.TbResourceInfoFilter;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.ai.AiModel;
+import org.thingsboard.server.common.data.ai.model.chat.OpenAiChatModelConfig;
+import org.thingsboard.server.common.data.ai.provider.OpenAiProviderConfig;
+import org.thingsboard.server.common.data.debug.DebugSettings;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.RuleChainId;
+import org.thingsboard.server.common.data.id.TbResourceId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
+import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.data.rule.RuleChainMetaData;
+import org.thingsboard.server.common.data.rule.RuleChainType;
+import org.thingsboard.server.common.data.rule.RuleNode;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
-import org.thingsboard.server.common.data.widget.WidgetTypeInfo;
 import org.thingsboard.server.controller.AbstractControllerTest;
+import org.thingsboard.server.dao.ai.AiModelService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.dao.resource.ResourceService;
+import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.service.DaoSqlTest;
 import org.thingsboard.server.dao.widget.WidgetTypeService;
 import org.thingsboard.server.service.resource.TbResourceService;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -135,6 +152,10 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
     private WidgetTypeService widgetTypeService;
     @Autowired
     private DashboardService dashboardService;
+    @Autowired
+    private RuleChainService ruleChainService;
+    @Autowired
+    private AiModelService aiModelService;
 
     private Tenant savedTenant;
     private User tenantAdmin;
@@ -453,11 +474,9 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         Assert.assertFalse(result.getReferences().isEmpty());
         Assert.assertEquals(1, result.getReferences().size());
 
-        WidgetTypeInfo widgetTypeInfo = (WidgetTypeInfo) result.getReferences().get(EntityType.WIDGET_TYPE.name()).get(0);
+        EntityInfo widgetTypeInfo = (EntityInfo) result.getReferences().get(EntityType.WIDGET_TYPE.name()).get(0);
-        WidgetTypeInfo foundWidgetTypeInfo = new WidgetTypeInfo(foundWidgetType);
         Assert.assertNotNull(widgetTypeInfo);
-        Assert.assertNotNull(foundWidgetTypeInfo);
+        Assert.assertEquals(widgetTypeInfo, new EntityInfo(foundWidgetType.getId(), foundWidgetType.getName()));
-        Assert.assertEquals(widgetTypeInfo, foundWidgetTypeInfo);
 
         TbResourceInfo foundResourceInfo = resourceService.findResourceInfoById(savedTenant.getId(), savedResource.getId());
         Assert.assertNotNull(foundResource);
@@ -546,11 +565,9 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         Assert.assertNotNull(result.getReferences());
         Assert.assertEquals(1, result.getReferences().size());
 
-        DashboardInfo dashboardInfo = (DashboardInfo) result.getReferences().get(EntityType.DASHBOARD.name()).get(0);
+        EntityInfo dashboardInfo = (EntityInfo) result.getReferences().get(EntityType.DASHBOARD.name()).get(0);
-        DashboardInfo foundDashboardInfo = dashboardService.findDashboardInfoById(savedTenant.getId(), savedDashboard.getId());
         Assert.assertNotNull(dashboardInfo);
-        Assert.assertNotNull(foundDashboardInfo);
+        Assert.assertEquals(new EntityInfo(savedDashboard.getId(), savedDashboard.getName()), dashboardInfo);
-        Assert.assertEquals(foundDashboardInfo, dashboardInfo);
 
         foundResource = resourceService.findResourceById(savedTenant.getId(), savedResource.getId());
         Assert.assertNotNull(foundResource);
@@ -598,6 +615,94 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         Assert.assertNull(foundResource);
     }
 
+    @Test
+    public void testShouldNotDeleteResourceIfUsedInAiNode() throws Exception {
+        TbResource resource = new TbResource();
+        resource.setResourceType(ResourceType.GENERAL);
+        resource.setTitle("My resource");
+        resource.setFileName("test.json");
+        resource.setTenantId(savedTenant.getId());
+        resource.setData("<test></test>".getBytes());
+        TbResourceInfo savedResource = tbResourceService.save(resource);
+        RuleChainMetaData ruleChain = createRuleChainReferringResource(savedResource.getId());
+
+        TbResourceDeleteResult result = tbResourceService.delete(savedResource, false, null);
+        assertThat(result).isNotNull();
+        assertThat(result.isSuccess()).isFalse();
+        assertThat(result.getReferences()).isNotEmpty().hasSize(1);
+        EntityInfo entityInfo = (EntityInfo) result.getReferences().get(EntityType.RULE_CHAIN.name()).get(0);
+        assertThat(entityInfo).isEqualTo(new EntityInfo(ruleChain.getRuleChainId(), "Test"));
+
+        TbResource foundResource = resourceService.findResourceById(savedTenant.getId(), savedResource.getId());
+        assertThat(foundResource).isNotNull();
+
+        // force delete
+        TbResourceDeleteResult deleteResult = tbResourceService.delete(savedResource, true, null);
+        assertThat(deleteResult).isNotNull();
+        assertThat(deleteResult.isSuccess()).isTrue();
+
+        TbResource resourceAfterDeletion = resourceService.findResourceById(savedTenant.getId(), savedResource.getId());
+        assertThat(resourceAfterDeletion).isNull();
+    }
+
+    private RuleChainMetaData createRuleChainReferringResource(TbResourceId resourceId) {
+        AiModel model = constructValidOpenAiModel("Test model");
+        AiModel saved = aiModelService.save(model);
+
+        RuleChain ruleChain = new RuleChain();
+        ruleChain.setTenantId(tenantId);
+        ruleChain.setName("Test");
+        ruleChain.setType(RuleChainType.CORE);
+        ruleChain.setDebugMode(true);
+        ruleChain.setConfiguration(JacksonUtil.newObjectNode().set("a", new TextNode("b")));
+        ruleChain = ruleChainService.saveRuleChain(ruleChain);
+        RuleChainId ruleChainId = ruleChain.getId();
+
+        RuleChainMetaData metaData = new RuleChainMetaData();
+        metaData.setRuleChainId(ruleChainId);
+
+        RuleNode aiNode = new RuleNode();
+        aiNode.setName("Ai request");
+        aiNode.setType(org.thingsboard.rule.engine.ai.TbAiNode.class.getName());
+        aiNode.setConfigurationVersion(TbAiNode.class.getAnnotation(org.thingsboard.rule.engine.api.RuleNode.class).version());
+        aiNode.setDebugSettings(DebugSettings.all());
+        TbAiNodeConfiguration configuration = new TbAiNodeConfiguration();
+        configuration.setResourceIds(Set.of(resourceId.getId()));
+        configuration.setModelId(saved.getId());
+        configuration.setResponseFormat(new TbResponseFormat.TbJsonResponseFormat());
+        configuration.setTimeoutSeconds(1);
+        configuration.setUserPrompt("What is temp");
+        aiNode.setConfiguration(JacksonUtil.valueToTree(configuration));
+
+        metaData.setNodes(Arrays.asList(aiNode));
+        metaData.setFirstNodeIndex(0);
+        ruleChainService.saveRuleChainMetaData(tenantId, metaData, Function.identity());
+        return ruleChainService.loadRuleChainMetaData(tenantId, ruleChainId);
+    }
+
+    private AiModel constructValidOpenAiModel(String name) {
+        var modelConfig = OpenAiChatModelConfig.builder()
+                .providerConfig(OpenAiProviderConfig.builder()
+                        .baseUrl(OpenAiProviderConfig.OPENAI_OFFICIAL_BASE_URL)
+                        .apiKey("test-api-key")
+                        .build())
+                .modelId("gpt-4o")
+                .temperature(0.5)
+                .topP(0.3)
+                .frequencyPenalty(0.1)
+                .presencePenalty(0.2)
+                .maxOutputTokens(1000)
+                .timeoutSeconds(60)
+                .maxRetries(2)
+                .build();
+
+        return AiModel.builder()
+                .tenantId(tenantId)
+                .name(name)
+                .configuration(modelConfig)
+                .build();
+    }
+
     @Test
     public void testFindTenantResourcesByTenantId() throws Exception {
         loginSysAdmin();

application/src/test/java/org/thingsboard/server/service/sync/vc/VersionControlTest.java

@@ -638,7 +638,9 @@ public class VersionControlTest extends AbstractControllerTest {
             assertThat(importedField.getName()).isEqualTo(deviceCalculatedField.getName());
             assertThat(importedField.getType()).isEqualTo(deviceCalculatedField.getType());
             assertThat(importedField.getId()).isNotEqualTo(deviceCalculatedField.getId());
-            assertThat(importedField.getConfiguration().getArguments().get("T").getRefEntityId()).isEqualTo(importedAsset.getId());
+            assertThat(importedField.getConfiguration()).isInstanceOf(SimpleCalculatedFieldConfiguration.class);
+            SimpleCalculatedFieldConfiguration simpleCfg = (SimpleCalculatedFieldConfiguration) importedField.getConfiguration();
+            assertThat(simpleCfg.getArguments().get("T").getRefEntityId()).isEqualTo(importedAsset.getId());
         });
 
         List<CalculatedField> importedAssetCalculatedFields = findCalculatedFieldsByEntityId(importedAsset.getId());
@@ -647,7 +649,9 @@ public class VersionControlTest extends AbstractControllerTest {
             assertThat(importedField.getName()).isEqualTo(assetCalculatedField.getName());
             assertThat(importedField.getType()).isEqualTo(assetCalculatedField.getType());
             assertThat(importedField.getId()).isNotEqualTo(assetCalculatedField.getId());
-            assertThat(importedField.getConfiguration().getArguments().get("T").getRefEntityId()).isEqualTo(importedDevice.getId());
+            assertThat(importedField.getConfiguration()).isInstanceOf(SimpleCalculatedFieldConfiguration.class);
+            SimpleCalculatedFieldConfiguration simpleCfg = (SimpleCalculatedFieldConfiguration) importedField.getConfiguration();
+            assertThat(simpleCfg.getArguments().get("T").getRefEntityId()).isEqualTo(importedDevice.getId());
         });
     }
 

application/src/test/java/org/thingsboard/server/utils/CalculatedFieldUtilsTest.java

@@ -0,0 +1,109 @@
+/**
+ * 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.utils;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingPresenceStatus;
+import org.thingsboard.server.common.data.id.AssetId;
+import org.thingsboard.server.common.data.id.CalculatedFieldId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.JsonDataEntry;
+import org.thingsboard.server.gen.transport.TransportProtos.CalculatedFieldStateProto;
+import org.thingsboard.server.service.cf.ctx.CalculatedFieldEntityCtxId;
+import org.thingsboard.server.service.cf.ctx.state.ArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldCtx;
+import org.thingsboard.server.service.cf.ctx.state.CalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingArgumentEntry;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingCalculatedFieldState;
+import org.thingsboard.server.service.cf.ctx.state.geofencing.GeofencingZoneState;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Mockito.mock;
+import static org.thingsboard.server.utils.CalculatedFieldUtils.toProto;
+
+@ExtendWith(MockitoExtension.class)
+class CalculatedFieldUtilsTest {
+
+    private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("0a69e1e2-fcbc-4234-a4cd-3844bf54035c"));
+    private static final CalculatedFieldId CF_ID = CalculatedFieldId.fromString("ec0e91b9-6f27-4e93-946a-5fbc2707d8bc");
+    private static final DeviceId DEVICE_ID = DeviceId.fromString("1e03bd38-2010-4739-9362-160c288e36c4");
+
+    @Test
+    void toProtoAndFromProto_shouldMapGeofencingArgumentsAndZones() {
+        // given
+        CalculatedFieldEntityCtxId stateId = mock(CalculatedFieldEntityCtxId.class);
+        given(stateId.tenantId()).willReturn(TENANT_ID);
+        given(stateId.cfId()).willReturn(CF_ID);
+        given(stateId.entityId()).willReturn(DEVICE_ID);
+
+        // Build a geofencing argument with two zones (one with inside=true, one with inside=null)
+        GeofencingArgumentEntry geofencingArgumentEntry = new GeofencingArgumentEntry();
+        Map<EntityId, GeofencingZoneState> zoneStates = new LinkedHashMap<>();
+
+        UUID zoneId1 = UUID.fromString("624a8fff-71a2-4847-a100-ff1cf52dbe71");
+        UUID zoneId2 = UUID.fromString("e2adf6ce-9478-40b1-b0e9-4a6860cc46bb");
+
+        AssetId z1 = new AssetId(zoneId1);
+        AssetId z2 = new AssetId(zoneId2);
+
+        JsonDataEntry zone1 = new JsonDataEntry("zone", "[[50.472000, 30.504000], [50.472000, 30.506000], [50.474000, 30.506000], [50.474000, 30.504000]]");
+        JsonDataEntry zone2 = new JsonDataEntry("zone", "[[50.475000, 30.510000], [50.475000, 30.512000], [50.477000, 30.512000], [50.477000, 30.510000]]");
+
+        BaseAttributeKvEntry zone1PerimeterAttribute = new BaseAttributeKvEntry(zone1, System.currentTimeMillis(), 0L);
+        BaseAttributeKvEntry zone2PerimeterAttribute = new BaseAttributeKvEntry(zone2, System.currentTimeMillis(), 0L);
+
+        GeofencingZoneState s1 = new GeofencingZoneState(z1, zone1PerimeterAttribute);
+        s1.setLastPresence(GeofencingPresenceStatus.INSIDE);
+        GeofencingZoneState s2 = new GeofencingZoneState(z2, zone2PerimeterAttribute);
+
+        zoneStates.put(z1, s1);
+        zoneStates.put(z2, s2);
+        geofencingArgumentEntry.setZoneStates(zoneStates);
+
+        // Create cf state with the geofencing argument and add it to the state map
+        CalculatedFieldState state = new GeofencingCalculatedFieldState(List.of("geofencingArgumentTest"));
+        state.updateState(mock(CalculatedFieldCtx.class), Map.of("geofencingArgumentTest", geofencingArgumentEntry));
+
+        // when
+        CalculatedFieldStateProto proto = toProto(stateId, state);
+
+        // then
+        CalculatedFieldState fromProto = CalculatedFieldUtils.fromProto(proto);
+        assertThat(fromProto)
+                .usingRecursiveComparison()
+                .ignoringFields("requiredArguments")
+                .isEqualTo(state);
+
+        ArgumentEntry fromProtoArgument = fromProto.getArguments().get("geofencingArgumentTest");
+        assertThat(fromProtoArgument).isInstanceOf(GeofencingArgumentEntry.class);
+        GeofencingArgumentEntry fromProtoGeoArgument = (GeofencingArgumentEntry) fromProtoArgument;
+        assertThat(fromProtoGeoArgument.getZoneStates()).hasSize(2);
+        assertThat(fromProtoGeoArgument.getZoneStates().get(z1).getLastPresence()).isEqualTo(GeofencingPresenceStatus.INSIDE);
+        assertThat(fromProtoGeoArgument.getZoneStates().get(z2).getLastPresence()).isNull();
+    }
+
+}

common/cluster-api/src/main/java/org/thingsboard/server/cluster/TbClusterService.java

@@ -38,7 +38,6 @@ import org.thingsboard.server.common.msg.edge.ToEdgeSyncRequest;
 import org.thingsboard.server.common.msg.plugin.ComponentLifecycleMsg;
 import org.thingsboard.server.common.msg.queue.TopicPartitionInfo;
 import org.thingsboard.server.common.msg.rpc.FromDeviceRpcResponse;
-import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.RestApiCallResponseMsgProto;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCalculatedFieldMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ToCalculatedFieldNotificationMsg;
@@ -81,7 +80,7 @@ public interface TbClusterService extends TbQueueClusterService {
 
     void pushNotificationToTransport(String targetServiceId, ToTransportMsg response, TbQueueCallback callback);
 
-    void pushMsgToCalculatedFields(TenantId tenantId, EntityId entityId, TransportProtos.ToCalculatedFieldMsg msg, TbQueueCallback callback);
+    void pushMsgToCalculatedFields(TenantId tenantId, EntityId entityId, ToCalculatedFieldMsg msg, TbQueueCallback callback);
 
     void pushMsgToCalculatedFields(TopicPartitionInfo tpi, UUID msgId, ToCalculatedFieldMsg msg, TbQueueCallback callback);
 

common/dao-api/src/main/java/org/thingsboard/server/dao/relation/RelationService.java

@@ -20,6 +20,7 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.relation.EntityRelationInfo;
+import org.thingsboard.server.common.data.relation.EntityRelationPathQuery;
 import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
 import org.thingsboard.server.common.data.relation.RelationTypeGroup;
 import org.thingsboard.server.common.data.rule.RuleChainType;
@@ -83,6 +84,8 @@ public interface RelationService {
 
     List<EntityRelation> findRuleNodeToRuleChainRelations(TenantId tenantId, RuleChainType ruleChainType, int limit);
 
+    ListenableFuture<List<EntityRelation>> findByRelationPathQueryAsync(TenantId tenantId, EntityRelationPathQuery relationPathQuery);
+
 //    TODO: This method may be useful for some validations in the future
 //    ListenableFuture<Boolean> checkRecursiveRelation(EntityId from, EntityId to);
 

common/dao-api/src/main/java/org/thingsboard/server/dao/resource/ResourceService.java

@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.ResourceExportData;
 import org.thingsboard.server.common.data.ResourceSubType;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
+import org.thingsboard.server.common.data.TbResourceDataInfo;
 import org.thingsboard.server.common.data.TbResourceDeleteResult;
 import org.thingsboard.server.common.data.TbResourceInfo;
 import org.thingsboard.server.common.data.TbResourceInfoFilter;
@@ -46,6 +47,8 @@ public interface ResourceService extends EntityDaoService {
 
     byte[] getResourceData(TenantId tenantId, TbResourceId resourceId);
 
+    TbResourceDataInfo getResourceDataInfo(TenantId tenantId, TbResourceId resourceId);
+
     ResourceExportData exportResource(TbResourceInfo resourceInfo);
 
     List<ResourceExportData> exportResources(TenantId tenantId, Collection<TbResourceInfo> resources);
@@ -90,4 +93,6 @@ public interface ResourceService extends EntityDaoService {
 
     TbResource createOrUpdateSystemResource(ResourceType resourceType, ResourceSubType resourceSubType, String resourceKey, byte[] data);
 
+    List<TbResourceInfo> findSystemOrTenantResourcesByIds(TenantId tenantId, List<TbResourceId> resourceIds);
+
 }

common/dao-api/src/main/java/org/thingsboard/server/dao/resource/TbResourceDataCache.java

@@ -0,0 +1,28 @@
+/**
+ * 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.dao.resource;
+
+import com.google.common.util.concurrent.FluentFuture;
+import org.thingsboard.server.common.data.TbResourceDataInfo;
+import org.thingsboard.server.common.data.id.TbResourceId;
+import org.thingsboard.server.common.data.id.TenantId;
+
+public interface TbResourceDataCache {
+
+    FluentFuture<TbResourceDataInfo> getResourceDataInfoAsync(TenantId tenantId, TbResourceId resourceId);
+
+    void evictResourceData(TenantId tenantId, TbResourceId resourceId);
+}

common/data/src/main/java/org/thingsboard/server/common/data/GeneralFileDescriptor.java

@@ -0,0 +1,29 @@
+/**
+ * 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;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@Data
+@EqualsAndHashCode
+@AllArgsConstructor
+@NoArgsConstructor
+public class GeneralFileDescriptor {
+    private String mediaType;
+}

common/data/src/main/java/org/thingsboard/server/common/data/ResourceType.java

@@ -25,7 +25,8 @@ public enum ResourceType {
     PKCS_12("application/x-pkcs12", false, false),
     JS_MODULE("application/javascript", true, true),
     IMAGE(null, true, true),
-    DASHBOARD("application/json", true, true);
+    DASHBOARD("application/json", true, true),
+    GENERAL(null, false, true);
 
     @Getter
     private final String mediaType;

common/data/src/main/java/org/thingsboard/server/common/data/SystemParams.java

@@ -38,5 +38,7 @@ public class SystemParams {
     String calculatedFieldDebugPerTenantLimitsConfiguration;
     long maxArgumentsPerCF;
     long maxDataPointsPerRollingArg;
+    int minAllowedScheduledUpdateIntervalInSecForCF;
+    int maxRelationLevelPerCfArgument;
     TrendzSettings trendzSettings;
 }

common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.common.data;
 
 import com.fasterxml.jackson.annotation.JsonGetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonSetter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -86,6 +87,11 @@ public class TbResource extends TbResourceInfo {
                 .orElse(null);
     }
 
+    @JsonIgnore
+    public TbResourceDataInfo toResourceDataInfo() {
+        return new TbResourceDataInfo(data, getDescriptor());
+    }
+
     @Override
     public String toString() {
         return super.toString();

common/data/src/main/java/org/thingsboard/server/common/data/TbResourceDataInfo.java

@@ -0,0 +1,31 @@
+/**
+ * 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;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TbResourceDataInfo {
+
+    private byte[] data;
+    private JsonNode descriptor;
+
+}

common/data/src/main/java/org/thingsboard/server/common/data/TbResourceDeleteResult.java

@@ -17,7 +17,6 @@ package org.thingsboard.server.common.data;
 
 import lombok.Builder;
 import lombok.Data;
-import org.thingsboard.server.common.data.id.HasId;
 
 import java.util.List;
 import java.util.Map;
@@ -27,6 +26,6 @@ import java.util.Map;
 public class TbResourceDeleteResult {
 
     private boolean success;
-    private Map<String, List<? extends HasId<?>>> references;
+    private Map<String, List<EntityInfo>> references;
 
 }

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(
+            @Schema(description = "A string containing details about the failure")
-                    description = "A string containing details about the failure"
-            )
             String errorDetails
     ) implements TbChatResponse {
 

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();
 

common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/AiChatModelConfig.java

@@ -24,7 +24,7 @@ public sealed interface AiChatModelConfig<C extends AiChatModelConfig<C>> extend
         permits
         OpenAiChatModelConfig, AzureOpenAiChatModelConfig, GoogleAiGeminiChatModelConfig,
         GoogleVertexAiGeminiChatModelConfig, MistralAiChatModelConfig, AnthropicChatModelConfig,
-        AmazonBedrockChatModelConfig, GitHubModelsChatModelConfig {
+        AmazonBedrockChatModelConfig, GitHubModelsChatModelConfig, OllamaChatModelConfig {
 
     ChatModel configure(Langchain4jChatModelConfigurer configurer);
 

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<AmazonBedrockChatModelConfig> {

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<AnthropicChatModelConfig> {

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<AzureOpenAiChatModelConfig> {

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<GitHubModelsChatModelConfig> {

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<GoogleAiGeminiChatModelConfig> {

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<GoogleVertexAiGeminiChatModelConfig> {

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);
+
 }

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<MistralAiChatModelConfig> {

common/data/src/main/java/org/thingsboard/server/common/data/ai/model/chat/OllamaChatModelConfig.java

@@ -0,0 +1,58 @@
+/**
+ * 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,
+        Integer contextLength,
+        Integer maxOutputTokens,
+        @With @Positive Integer timeoutSeconds,
+        @With @PositiveOrZero Integer maxRetries
+) implements AiChatModelConfig<OllamaChatModelConfig> {
+
+    @Override
+    public AiProvider provider() {
+        return AiProvider.OLLAMA;
+    }
+
+    @Override
+    public ChatModel configure(Langchain4jChatModelConfigurer configurer) {
+        return configurer.configureChatModel(this);
+    }
+
+    @Override
+    public boolean supportsJsonMode() {
+        return true;
+    }
+
+}

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<OpenAiChatModelConfig> {

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
 
 }

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 {}

common/data/src/main/java/org/thingsboard/server/common/data/ai/provider/OllamaProviderConfig.java

@@ -0,0 +1,48 @@
+/**
+ * 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 com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+
+public record OllamaProviderConfig(
+        @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 {}
+
+    }
+
+}

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
+        String baseUrl,
-) implements AiProviderConfig {}
+        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;
+    }
+
+}

common/data/src/main/java/org/thingsboard/server/common/data/cf/CalculatedFieldType.java

@@ -17,6 +17,6 @@ package org.thingsboard.server.common.data.cf;
 
 public enum CalculatedFieldType {
 
-    SIMPLE, SCRIPT
+    SIMPLE, SCRIPT, GEOFENCING
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/Argument.java

@@ -26,10 +26,15 @@ public class Argument {
 
     @Nullable
     private EntityId refEntityId;
+    private CfArgumentDynamicSourceConfiguration refDynamicSourceConfiguration;
     private ReferencedEntityKey refEntityKey;
     private String defaultValue;
 
     private Integer limit;
     private Long timeWindow;
 
+    public boolean hasDynamicSource() {
+        return refDynamicSourceConfiguration != null;
+    }
+
 }

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ArgumentsBasedCalculatedFieldConfiguration.java

@@ -0,0 +1,24 @@
+/**
+ * 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.cf.configuration;
+
+import java.util.Map;
+
+public interface ArgumentsBasedCalculatedFieldConfiguration extends CalculatedFieldConfiguration {
+
+    Map<String, Argument> getArguments();
+
+}

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/BaseCalculatedFieldConfiguration.java

@@ -27,7 +27,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Data
-public abstract class BaseCalculatedFieldConfiguration implements CalculatedFieldConfiguration {
+public abstract class BaseCalculatedFieldConfiguration implements ExpressionBasedCalculatedFieldConfiguration {
 
     protected Map<String, Argument> arguments;
     protected String expression;
@@ -42,20 +42,13 @@ public abstract class BaseCalculatedFieldConfiguration implements CalculatedFiel
     }
 
     @Override
-    public List<CalculatedFieldLink> buildCalculatedFieldLinks(TenantId tenantId, EntityId cfEntityId, CalculatedFieldId calculatedFieldId) {
+    public void validate() {
-        return getReferencedEntities().stream()
+        if (arguments.containsKey("ctx")) {
-                .filter(referencedEntity -> !referencedEntity.equals(cfEntityId))
+            throw new IllegalArgumentException("Argument name 'ctx' is reserved and cannot be used.");
-                .map(referencedEntityId -> buildCalculatedFieldLink(tenantId, referencedEntityId, calculatedFieldId))
+        }
-                .collect(Collectors.toList());
+        if (arguments.values().stream().anyMatch(Argument::hasDynamicSource)) {
-    }
+            throw new IllegalArgumentException("Calculated field with type: '" + getType() + "' doesn't support dynamic source configuration!");
-
+        }
-    @Override
-    public CalculatedFieldLink buildCalculatedFieldLink(TenantId tenantId, EntityId referencedEntityId, CalculatedFieldId calculatedFieldId) {
-        CalculatedFieldLink link = new CalculatedFieldLink();
-        link.setTenantId(tenantId);
-        link.setEntityId(referencedEntityId);
-        link.setCalculatedFieldId(calculatedFieldId);
-        return link;
     }
 
 }

application/src/main/java/org/thingsboard/server/service/cf/CalculatedFieldInitService.java → common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CFArgumentDynamicSourceType.java

@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.thingsboard.server.service.cf;
+package org.thingsboard.server.common.data.cf.configuration;
+
+public enum CFArgumentDynamicSourceType {
+
+    RELATION_PATH_QUERY
 
-public interface CalculatedFieldInitService {
 }

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java

@@ -21,12 +21,14 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
+import org.thingsboard.server.common.data.cf.configuration.geofencing.GeofencingCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 
+import java.util.Collections;
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
@@ -35,7 +37,8 @@ import java.util.Map;
 )
 @JsonSubTypes({
         @JsonSubTypes.Type(value = SimpleCalculatedFieldConfiguration.class, name = "SIMPLE"),
-        @JsonSubTypes.Type(value = ScriptCalculatedFieldConfiguration.class, name = "SCRIPT")
+        @JsonSubTypes.Type(value = ScriptCalculatedFieldConfiguration.class, name = "SCRIPT"),
+        @JsonSubTypes.Type(value = GeofencingCalculatedFieldConfiguration.class, name = "GEOFENCING")
 })
 @JsonIgnoreProperties(ignoreUnknown = true)
 public interface CalculatedFieldConfiguration {
@@ -43,19 +46,28 @@ public interface CalculatedFieldConfiguration {
     @JsonIgnore
     CalculatedFieldType getType();
 
-    Map<String, Argument> getArguments();
-
-    String getExpression();
-
-    void setExpression(String expression);
-
     Output getOutput();
 
+    void validate();
+
     @JsonIgnore
-    List<EntityId> getReferencedEntities();
+    default List<EntityId> getReferencedEntities() {
+        return Collections.emptyList();
+    }
 
-    List<CalculatedFieldLink> buildCalculatedFieldLinks(TenantId tenantId, EntityId cfEntityId, CalculatedFieldId calculatedFieldId);
+    default CalculatedFieldLink buildCalculatedFieldLink(TenantId tenantId, EntityId referencedEntityId, CalculatedFieldId calculatedFieldId) {
+        CalculatedFieldLink link = new CalculatedFieldLink();
+        link.setTenantId(tenantId);
+        link.setEntityId(referencedEntityId);
+        link.setCalculatedFieldId(calculatedFieldId);
+        return link;
+    }
 
-    CalculatedFieldLink buildCalculatedFieldLink(TenantId tenantId, EntityId referencedEntityId, CalculatedFieldId calculatedFieldId);
+    default List<CalculatedFieldLink> buildCalculatedFieldLinks(TenantId tenantId, EntityId cfEntityId, CalculatedFieldId calculatedFieldId) {
+        return getReferencedEntities().stream()
+                .filter(referencedEntity -> !referencedEntity.equals(cfEntityId))
+                .map(referencedEntityId -> buildCalculatedFieldLink(tenantId, referencedEntityId, calculatedFieldId))
+                .collect(Collectors.toList());
+    }
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CfArgumentDynamicSourceConfiguration.java

@@ -0,0 +1,39 @@
+/**
+ * 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.cf.configuration;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+@JsonTypeInfo(
+        use = JsonTypeInfo.Id.NAME,
+        include = JsonTypeInfo.As.PROPERTY,
+        property = "type"
+)
+@JsonSubTypes({
+        @JsonSubTypes.Type(value = RelationPathQueryDynamicSourceConfiguration.class, name = "RELATION_PATH_QUERY")
+})
+@JsonIgnoreProperties(ignoreUnknown = true)
+public interface CfArgumentDynamicSourceConfiguration {
+
+    @JsonIgnore
+    CFArgumentDynamicSourceType getType();
+
+    default void validate() {}
+
+}

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ExpressionBasedCalculatedFieldConfiguration.java

@@ -0,0 +1,24 @@
+/**
+ * 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.cf.configuration;
+
+public interface ExpressionBasedCalculatedFieldConfiguration extends ArgumentsBasedCalculatedFieldConfiguration {
+
+    String getExpression();
+
+    void setExpression(String expression);
+
+}

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationPathQueryDynamicSourceConfiguration.java

@@ -0,0 +1,71 @@
+/**
+ * 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.cf.configuration;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.relation.EntityRelationPathQuery;
+import org.thingsboard.server.common.data.relation.EntitySearchDirection;
+import org.thingsboard.server.common.data.relation.RelationPathLevel;
+import org.thingsboard.server.common.data.util.CollectionsUtil;
+
+import java.util.List;
+import java.util.NoSuchElementException;
+
+@Data
+public class RelationPathQueryDynamicSourceConfiguration implements CfArgumentDynamicSourceConfiguration {
+
+    private List<RelationPathLevel> levels;
+
+    @Override
+    public CFArgumentDynamicSourceType getType() {
+        return CFArgumentDynamicSourceType.RELATION_PATH_QUERY;
+    }
+
+    @Override
+    public void validate() {
+        if (CollectionsUtil.isEmpty(levels)) {
+            throw new IllegalArgumentException("At least one relation level must be specified!");
+        }
+        levels.forEach(RelationPathLevel::validate);
+    }
+
+    public List<EntityId> resolveEntityIds(List<EntityRelation> relations) {
+        EntitySearchDirection lastLevelDirection = getLastLevel().direction();
+        return switch (lastLevelDirection) {
+            case FROM -> relations.stream().map(EntityRelation::getTo).toList();
+            case TO -> relations.stream().map(EntityRelation::getFrom).toList();
+        };
+    }
+
+    public void validateMaxRelationLevel(String argumentName, int maxAllowedRelationLevel) {
+        if (levels.size() > maxAllowedRelationLevel) {
+            throw new IllegalArgumentException("Max relation level is greater than configured " +
+                                               "maximum allowed relation level in tenant profile: " + maxAllowedRelationLevel + " for argument: " + argumentName);
+        }
+    }
+
+    public EntityRelationPathQuery toRelationPathQuery(EntityId entityId) {
+        return new EntityRelationPathQuery(entityId, levels);
+    }
+
+    private RelationPathLevel getLastLevel() {
+        return levels.get(levels.size() - 1);
+    }
+
+}