arthur-common 2.1.47__py3-none-any.whl → 2.1.49__py3-none-any.whl

arthur_common/aggregations/functions/confusion_matrix.py

@@ -13,7 +13,7 @@ from arthur_common.models.schema_definitions import (
     ScalarType,
     ScopeSchemaTag,
 )
-from arthur_common.tools.duckdb_data_loader import escape_identifier
+from arthur_common.tools.duckdb_data_loader import escape_identifier, escape_str_literal
 from duckdb import DuckDBPyConnection
 
 
@@ -57,7 +57,8 @@ class ConfusionMatrixAggregationFunction(NumericAggregationFunction):
                     SUM(CASE WHEN prediction = actual_value AND actual_value = 1 THEN 1 ELSE 0 END) AS true_positive_count,
                     SUM(CASE WHEN prediction != actual_value AND actual_value = 0 THEN 1 ELSE 0 END) AS false_positive_count,
                     SUM(CASE WHEN prediction != actual_value AND actual_value = 1 THEN 1 ELSE 0 END) AS false_negative_count,
-                    SUM(CASE WHEN prediction = actual_value AND actual_value = 0 THEN 1 ELSE 0 END) AS true_negative_count
+                    SUM(CASE WHEN prediction = actual_value AND actual_value = 0 THEN 1 ELSE 0 END) AS true_negative_count,
+                    {escaped_prediction_col_name} as prediction_column_name
                 FROM normalized_data
                 GROUP BY ts
                 ORDER BY ts
@@ -65,6 +66,7 @@ class ConfusionMatrixAggregationFunction(NumericAggregationFunction):
         segmentation_cols = [] if not segmentation_cols else segmentation_cols
         escaped_timestamp_col = escape_identifier(timestamp_col)
         escaped_prediction_col = escape_identifier(prediction_col)
+        escaped_prediction_col_name = escape_str_literal(prediction_col)
         escaped_gt_values_col = escape_identifier(gt_values_col)
         # build query components with segmentation columns
         escaped_segmentation_cols = [
@@ -81,8 +83,10 @@ class ConfusionMatrixAggregationFunction(NumericAggregationFunction):
             "SUM(CASE WHEN prediction != actual_value AND actual_value = 0 THEN 1 ELSE 0 END) AS false_positive_count",
             "SUM(CASE WHEN prediction != actual_value AND actual_value = 1 THEN 1 ELSE 0 END) AS false_negative_count",
             "SUM(CASE WHEN prediction = actual_value AND actual_value = 0 THEN 1 ELSE 0 END) AS true_negative_count",
+            f"{escaped_prediction_col_name} as prediction_column_name",
         ] + escaped_segmentation_cols
         second_subquery_group_by_cols = ["ts"] + escaped_segmentation_cols
+        extra_dims = ["prediction_column_name"]
 
         # build query
         confusion_matrix_query = f"""
@@ -102,25 +106,25 @@ class ConfusionMatrixAggregationFunction(NumericAggregationFunction):
         tp = self.group_query_results_to_numeric_metrics(
             results,
             "true_positive_count",
-            dim_columns=segmentation_cols,
+            dim_columns=segmentation_cols + extra_dims,
             timestamp_col="ts",
         )
         fp = self.group_query_results_to_numeric_metrics(
             results,
             "false_positive_count",
-            dim_columns=segmentation_cols,
+            dim_columns=segmentation_cols + extra_dims,
             timestamp_col="ts",
         )
         fn = self.group_query_results_to_numeric_metrics(
             results,
             "false_negative_count",
-            dim_columns=segmentation_cols,
+            dim_columns=segmentation_cols + extra_dims,
             timestamp_col="ts",
         )
         tn = self.group_query_results_to_numeric_metrics(
             results,
             "true_negative_count",
-            dim_columns=segmentation_cols,
+            dim_columns=segmentation_cols + extra_dims,
             timestamp_col="ts",
         )
         tp_metric = self.series_to_metric("confusion_matrix_true_positive_count", tp)

arthur_common/models/connectors.py

@@ -35,6 +35,8 @@ MSSQL_CONNECTOR_DATABASE_FIELD = "database"
 MSSQL_CONNECTOR_USERNAME_FIELD = "username"
 MSSQL_CONNECTOR_PASSWORD_FIELD = "password"
 MSSQL_CONNECTOR_DRIVER_FIELD = "driver"
+MSSQL_CONNECTOR_TABLE_NAME_FIELD = "table_name"
+
 
 # dataset (connector type dependent) constants
 SHIELD_DATASET_TASK_ID_FIELD = "task_id"

{arthur_common-2.1.47.dist-info → arthur_common-2.1.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arthur-common
-Version: 2.1.47
+Version: 2.1.49
 Summary: Utility code common to Arthur platform components.
 License: MIT
 Author: Arthur

{arthur_common-2.1.47.dist-info → arthur_common-2.1.49.dist-info}/RECORD

@@ -4,7 +4,7 @@ arthur_common/aggregations/aggregator.py,sha256=8J0TRYjQdwf0qXBnoZ4ETJVCdo4UIyvQ
 arthur_common/aggregations/functions/README.md,sha256=MkZoTAJ94My96R5Z8GAxud7S6vyR0vgVi9gqdt9a4XY,5460
 arthur_common/aggregations/functions/__init__.py,sha256=HqC3UNRURX7ZQHgamTrQvfA8u_FiZGZ4I4eQW7Ooe5o,1299
 arthur_common/aggregations/functions/categorical_count.py,sha256=W0xIpqqSElRpGBPpvztoZBpDO5QtiGYpaMVOQ3piS-4,5077
-arthur_common/aggregations/functions/confusion_matrix.py,sha256=Uk7cOBPqEuG1X6WDMvp8Z8fNce4BYXXBHwSlCXzO9_g,20769
+arthur_common/aggregations/functions/confusion_matrix.py,sha256=fZ5SeFcENjGyoCqecRTF9Y0Ub-RzsA-SlZ8cEHzUvnM,21111
 arthur_common/aggregations/functions/inference_count.py,sha256=jIhuh_NjL82NA84qJD2VI3FVRgZCSFjfcME3Hr_slpg,3832
 arthur_common/aggregations/functions/inference_count_by_class.py,sha256=JKTOhXSP3hBz28u10AvA8OyDi7P68Fv7NP6j_M7kXCQ,11066
 arthur_common/aggregations/functions/inference_null_count.py,sha256=l-yuVX7OJQGk-vvnkuXJPD-mEI1ZzwGjbzeihwSDT_M,4566
@@ -18,7 +18,7 @@ arthur_common/aggregations/functions/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 arthur_common/aggregations/functions/shield_aggregations.py,sha256=nkMlj9V7NIKeRP46jpsrlfB741RHk2CgwimD7BYp9To,31540
 arthur_common/aggregations/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arthur_common/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arthur_common/models/connectors.py,sha256=hj8epo32MjtDgWGon1U4l__Ls6pf8nFp2v_jrUYUTCI,1799
+arthur_common/models/connectors.py,sha256=iQ9J--krb7p8zMQ_AvOaazSRupQKqpr_9ikCcuQkDtU,1848
 arthur_common/models/datasets.py,sha256=giG_8mv_3ilBf7cIvRV0_TDCDdb4qxRbYZvl7hRb6l8,491
 arthur_common/models/metrics.py,sha256=ZfsDL3aPdhZ1-E1-wlRyZT4lZNzz2A3qL-jDrqJbQdY,8217
 arthur_common/models/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -34,6 +34,6 @@ arthur_common/tools/functions.py,sha256=FWL4eWO5-vLp86WudT-MGUKvf2B8f02IdoXQFKd6
 arthur_common/tools/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arthur_common/tools/schema_inferer.py,sha256=PkAOHZRk_rZ1OZSigYrfzH-jERb9B_Gu7pOMl9WJQA8,4202
 arthur_common/tools/time_utils.py,sha256=4gfiu9NXfvPZltiVNLSIQGylX6h2W0viNi9Kv4bKyfw,1410
-arthur_common-2.1.47.dist-info/METADATA,sha256=LASSH5_vMsLP9gWxYep7Xa73sgd196uRZqkYGBIMbLg,1568
-arthur_common-2.1.47.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arthur_common-2.1.47.dist-info/RECORD,,
+arthur_common-2.1.49.dist-info/METADATA,sha256=KcHRIA8akOMXT7eLagd5CBe_RzdwDFeSXVQuOUp2fTU,1568
+arthur_common-2.1.49.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arthur_common-2.1.49.dist-info/RECORD,,