Adding the defaultDataSourceProperties

sodadata · Feb 13, 2025 · 7c2c95e · 7c2c95e
1 parent 23a6af4
commit 7c2c95e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/soda-core/src/soda_core/common/data_source.py b/soda-core/src/soda_core/common/data_source.py
@@ -11,6 +11,7 @@
 from soda_core.common.statements.metadata_columns_query import MetadataColumnsQuery, ColumnMetadata
 from soda_core.common.statements.metadata_tables_query import MetadataTablesQuery
 from soda_core.common.yaml import YamlSource, YamlFileContent
+from soda_core.contracts.contract_verification import DataSourceInfo
 
 
 class DataSource(ABC):
@@ -165,3 +166,9 @@ def test_connection_error_message(self) -> Optional[str]:
                 return None
         except Exception as e:
             return str(e)
+
+    def build_data_source_info(self) -> DataSourceInfo:
+        return DataSourceInfo(
+            name=self.name,
+            type=self.type_name
+        )
diff --git a/soda-core/src/soda_core/common/soda_cloud.py b/soda-core/src/soda_core/common/soda_cloud.py
@@ -153,6 +153,9 @@ def build_contract_result_json(self, contract_result: ContractResult) -> dict:
             {
                 "definitionName": contract_result.soda_qualified_dataset_name,
                 "defaultDataSource": contract_result.data_source_name,
+                "defaultDataSourceProperties": {
+                    "type": contract_result.data_source_info.type
+                },
                 # dataTimestamp can be changed by user, this is shown in Cloud as time of a scan.
                 # It's the timestamp used to identify the time partition, which is the slice of data that is verified.
                 "dataTimestamp": contract_result.data_timestamp,
@@ -175,7 +178,6 @@ def build_contract_result_json(self, contract_result: ContractResult) -> dict:
                 # ],
                 "logs": log_cloud_json_dicts,
                 "sourceOwner": "soda-core",
-
                 "contract": {
                     "fileId": contract_result.contract_info.source.soda_cloud_file_id,
                     "dataset": {

diff --git a/soda-core/src/soda_core/contracts/contract_verification.py b/soda-core/src/soda_core/contracts/contract_verification.py
@@ -205,6 +205,12 @@ class ContractInfo:
     source: YamlFileContentInfo
 
 
+@dataclass
+class DataSourceInfo:
+    name: str
+    type: str
+
+
 @dataclass
 class ThresholdInfo:
     must_be_greater_than: Number | None = None
@@ -274,6 +280,7 @@ class ContractResult:
     def __init__(
             self,
             contract_info: ContractInfo,
+            data_source_info: DataSourceInfo,
             data_timestamp: datetime | None,
             started_timestamp: datetime,
             ended_timestamp: datetime,
@@ -285,13 +292,15 @@ def __init__(
             logs: Logs
     ):
         self.contract_info: ContractInfo = contract_info
-        # TODO move to contract info
+        # TODO move to contract info or use the data_source_info
         self.data_source_name: str = data_source_name
         # TODO move to contract info
         self.soda_qualified_dataset_name: str = soda_qualified_dataset_name
         # TODO move to contract info
         self.sql_qualified_dataset_name: str = sql_qualified_dataset_name
 
+        self.data_source_info: DataSourceInfo = data_source_info
+
         self.data_timestamp: datetime | None = data_timestamp
         self.started_timestamp: datetime = started_timestamp
         self.ended_timestamp: datetime = ended_timestamp

diff --git a/soda-core/src/soda_core/contracts/impl/contract_verification_impl.py b/soda-core/src/soda_core/contracts/impl/contract_verification_impl.py
@@ -17,7 +17,7 @@
 from soda_core.common.sql_dialect import *
 from soda_core.common.yaml import YamlSource, VariableResolver, YamlFileContent
 from soda_core.contracts.contract_verification import ContractVerificationResult, ContractResult, \
-    CheckResult, Measurement, ThresholdInfo, ContractInfo, CheckInfo, YamlFileContentInfo
+    CheckResult, Measurement, ThresholdInfo, ContractInfo, CheckInfo, YamlFileContentInfo, DataSourceInfo
 from soda_core.contracts.impl.contract_yaml import ContractYaml, CheckYaml, ColumnYaml, RangeYaml, \
     MissingAndValidityYaml, ValidReferenceDataYaml, MissingAncValidityCheckYaml, ThresholdCheckYaml
 
@@ -327,6 +327,7 @@ def verify(self) -> ContractResult:
             measurements.append(derived_measurement)
 
         contract_info: ContractInfo = self.build_contract_info()
+        data_source_info: DataSourceInfo = self.data_source.build_data_source_info()
 
         # Evaluate the checks
         measurement_values = MeasurementValues(measurements)
@@ -340,6 +341,7 @@ def verify(self) -> ContractResult:
 
         return ContractResult(
             contract_info=contract_info,
+            data_source_info=data_source_info,
             data_timestamp=self.data_timestamp,
             started_timestamp=self.started_timestamp,
             ended_timestamp=datetime.now(tz=timezone.utc),