fix: difference column for non-numeric

zeno-ml · Sep 27, 2023 · 90a9718 · 90a9718
1 parent 71bf6bb
commit 90a9718
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/backend/zeno_backend/database/select.py b/backend/zeno_backend/database/select.py
@@ -3,7 +3,7 @@
 
 from psycopg import sql
 
-from zeno_backend.classes.base import ZenoColumn
+from zeno_backend.classes.base import MetadataType, ZenoColumn
 from zeno_backend.classes.chart import Chart
 from zeno_backend.classes.filter import FilterPredicateGroup, Join, Operation
 from zeno_backend.classes.folder import Folder
@@ -1127,10 +1127,16 @@ def table_data_paginated(
 
         diff_sql = sql.SQL("")
         if req.diff_column_1 is not None and req.diff_column_2 is not None:
-            diff_sql = sql.SQL(", {} - {} AS diff").format(
-                sql.Identifier(req.diff_column_1.id),
-                sql.Identifier(req.diff_column_2.id),
-            )
+            if req.diff_column_1.data_type == MetadataType.CONTINUOUS:
+                diff_sql = sql.SQL(", {} - {} AS diff").format(
+                    sql.Identifier(req.diff_column_1.id),
+                    sql.Identifier(req.diff_column_2.id),
+                )
+            else:
+                diff_sql = sql.SQL(", {} = {} AS diff").format(
+                    sql.Identifier(req.diff_column_1.id),
+                    sql.Identifier(req.diff_column_2.id),
+                )
 
         filter = sql.SQL("")
         if filter_sql is not None:

diff --git a/frontend/src/lib/components/instance-views/ComparisonView.svelte b/frontend/src/lib/components/instance-views/ComparisonView.svelte
@@ -241,10 +241,10 @@
 							<td class="p-3 align-text-top">{modelValueAndDiff($comparisonModel, tableContent)}</td
 							>
 							<td class="p-3 align-text-top"
-								>{Number(tableContent['diff'])
+								>{$comparisonColumn?.dataType === MetadataType.CONTINUOUS
 									? Number(tableContent['diff']).toFixed(2)
-									: tableContent['diff']}</td
-							>
+									: tableContent['diff']}
+							</td>
 						{/if}
 					</tr>
 				{/each}