From 2588088a230e9e995da509c021be9ca180a4a564 Mon Sep 17 00:00:00 2001 From: Daniel Chang Date: Thu, 31 Oct 2024 09:50:27 -0400 Subject: [PATCH 1/2] verbose funman logging --- .../components/workflow/ops/funman/tera-funman-drilldown.vue | 4 +++- packages/client/hmi-client/src/types/Types.ts | 3 ++- .../terarium/hmiserver/models/funman/parts/FunmanConfig.java | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue index 86fdd6535d..6e97a2c512 100644 --- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue +++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-drilldown.vue @@ -506,7 +506,9 @@ const runMakeQuery = async () => { normalization_constant: knobs.value.compartmentalConstraint.isActive && configuredModel.value.semantics ? parseFloat(mass.value) : 1, normalize: false, - tolerance: knobs.value.tolerance + tolerance: knobs.value.tolerance, + // FIXME: Set to max logging for debugging and checking liveliness , remove when stable. Oct 2024 + verbosity: 0 } } }; diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts index 5ffd934829..0195631606 100644 --- a/packages/client/hmi-client/src/types/Types.ts +++ b/packages/client/hmi-client/src/types/Types.ts @@ -441,6 +441,7 @@ export interface FunmanConfig { use_compartmental_constraints?: boolean; normalize?: boolean; normalization_constant?: number; + verbosity?: number; } export interface FunmanInterval { @@ -800,8 +801,8 @@ export interface ModelUnit { } export interface GroundedSemantic { - id: string; name?: string; + id: string; grounding?: ModelGrounding; } diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/funman/parts/FunmanConfig.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/funman/parts/FunmanConfig.java index 1bfc07e3c0..765432ca37 100644 --- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/funman/parts/FunmanConfig.java +++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/funman/parts/FunmanConfig.java @@ -66,4 +66,7 @@ public class FunmanConfig { @TSOptional private Integer normalization_constant; + + @TSOptional + private Integer verbosity; } From f359f532092a838f8a417d947e1e0e076c14187c Mon Sep 17 00:00:00 2001 From: mwdchang Date: Thu, 31 Oct 2024 13:52:46 +0000 Subject: [PATCH 2/2] chore: update generated types --- packages/client/hmi-client/src/types/Types.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts index 0195631606..4ebb234eef 100644 --- a/packages/client/hmi-client/src/types/Types.ts +++ b/packages/client/hmi-client/src/types/Types.ts @@ -801,9 +801,9 @@ export interface ModelUnit { } export interface GroundedSemantic { - name?: string; - id: string; grounding?: ModelGrounding; + id: string; + name?: string; } export interface Properties {