datacontract-cli 0.10.27__tar.gz → 0.10.28__tar.gz

{datacontract_cli-0.10.27/datacontract_cli.egg-info → datacontract_cli-0.10.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacontract-cli
-Version: 0.10.27
+Version: 0.10.28
 Summary: The datacontract CLI is an open source command-line tool for working with Data Contracts. It uses data contract YAML files to lint the data contract, connect to data sources and execute schema and quality tests, detect breaking changes, and export to different formats. The tool is written in Python. It can be used as a standalone CLI tool, in a CI/CD pipeline, or directly as a Python library.
 Author-email: Jochen Christ <jochen.christ@innoq.com>, Stefan Negele <stefan.negele@innoq.com>, Simon Harrer <simon.harrer@innoq.com>
 License-Expression: MIT
@@ -42,12 +42,14 @@ Provides-Extra: databricks
 Requires-Dist: soda-core-spark-df<3.6.0,>=3.3.20; extra == "databricks"
 Requires-Dist: soda-core-spark[databricks]<3.6.0,>=3.3.20; extra == "databricks"
 Requires-Dist: databricks-sql-connector<4.1.0,>=3.7.0; extra == "databricks"
-Requires-Dist: databricks-sdk<0.51.0; extra == "databricks"
+Requires-Dist: databricks-sdk<0.55.0; extra == "databricks"
+Requires-Dist: pyspark==3.5.5; extra == "databricks"
 Provides-Extra: iceberg
 Requires-Dist: pyiceberg==0.8.1; extra == "iceberg"
 Provides-Extra: kafka
 Requires-Dist: datacontract-cli[avro]; extra == "kafka"
 Requires-Dist: soda-core-spark-df<3.6.0,>=3.3.20; extra == "kafka"
+Requires-Dist: pyspark==3.5.5; extra == "kafka"
 Provides-Extra: postgres
 Requires-Dist: soda-core-postgres<3.6.0,>=3.3.20; extra == "postgres"
 Provides-Extra: s3
@@ -79,7 +81,7 @@ Provides-Extra: dev
 Requires-Dist: datacontract-cli[all]; extra == "dev"
 Requires-Dist: httpx==0.28.1; extra == "dev"
 Requires-Dist: kafka-python; extra == "dev"
-Requires-Dist: moto==5.1.4; extra == "dev"
+Requires-Dist: moto==5.1.5; extra == "dev"
 Requires-Dist: pandas>=2.1.0; extra == "dev"
 Requires-Dist: pre-commit<4.3.0,>=3.7.1; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -399,30 +401,38 @@ Commands
 │                             [default: datacontract.yaml]                                         │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
 ╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮
-│ --schema                                       TEXT     The location (url or path) of the Data   │
-│                                                         Contract Specification JSON Schema       │
-│                                                         [default: None]                          │
-│ --server                                       TEXT     The server configuration to run the      │
-│                                                         schema and quality tests. Use the key of │
-│                                                         the server object in the data contract   │
-│                                                         yaml file to refer to a server, e.g.,    │
-│                                                         `production`, or `all` for all servers   │
-│                                                         (default).                               │
-│                                                         [default: all]                           │
-│ --publish                                      TEXT     The url to publish the results after the │
-│                                                         test                                     │
-│                                                         [default: None]                          │
-│ --output                                       PATH     Specify the file path where the test     │
-│                                                         results should be written to (e.g.,      │
-│                                                         './test-results/TEST-datacontract.xml'). │
-│                                                         [default: None]                          │
-│ --output-format                                [junit]  The target format for the test results.  │
-│                                                         [default: None]                          │
-│ --logs                --no-logs                         Print logs [default: no-logs]            │
-│ --ssl-verification    --no-ssl-verification             SSL verification when publishing the     │
-│                                                         data contract.                           │
-│                                                         [default: ssl-verification]              │
-│ --help                                                  Show this message and exit.              │
+│ --schema                                               TEXT     The location (url or path) of    │
+│                                                                 the Data Contract Specification  │
+│                                                                 JSON Schema                      │
+│                                                                 [default: None]                  │
+│ --server                                               TEXT     The server configuration to run  │
+│                                                                 the schema and quality tests.    │
+│                                                                 Use the key of the server object │
+│                                                                 in the data contract yaml file   │
+│                                                                 to refer to a server, e.g.,      │
+│                                                                 `production`, or `all` for all   │
+│                                                                 servers (default).               │
+│                                                                 [default: all]                   │
+│ --publish-test-results    --no-publish-test-results             Publish the results after the    │
+│                                                                 test                             │
+│                                                                 [default:                        │
+│                                                                 no-publish-test-results]         │
+│ --publish                                              TEXT     DEPRECATED. The url to publish   │
+│                                                                 the results after the test.      │
+│                                                                 [default: None]                  │
+│ --output                                               PATH     Specify the file path where the  │
+│                                                                 test results should be written   │
+│                                                                 to (e.g.,                        │
+│                                                                 './test-results/TEST-datacontra… │
+│                                                                 [default: None]                  │
+│ --output-format                                        [junit]  The target format for the test   │
+│                                                                 results.                         │
+│                                                                 [default: None]                  │
+│ --logs                    --no-logs                             Print logs [default: no-logs]    │
+│ --ssl-verification        --no-ssl-verification                 SSL verification when publishing │
+│                                                                 the data contract.               │
+│                                                                 [default: ssl-verification]      │
+│ --help                                                          Show this message and exit.      │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
 
 ```
@@ -996,6 +1006,21 @@ Available export options:
 | `custom`             | Export to Custom format with Jinja                      | ✅      |
 | Missing something?   | Please create an issue on GitHub                        | TBD    |
 
+#### SQL
+
+The `export` function converts a given data contract into a SQL data definition language (DDL).
+
+```shell
+datacontract export datacontract.yaml --format sql --output output.sql
+```
+
+If using Databricks, and an error is thrown when trying to deploy the SQL DDLs with `variant` columns set the following properties.
+
+```shell
+spark.conf.set(“spark.databricks.delta.schema.typeCheck.enabled”, “false”)
+from datacontract.model import data_contract_specification
+data_contract_specification.DATACONTRACT_TYPES.append(“variant”)
+```
 
 #### Great Expectations
 
@@ -1003,7 +1028,7 @@ The `export` function transforms a specified data contract into a comprehensive
 If the contract includes multiple models, you need to specify the names of the model you wish to export.
 
 ```shell
-datacontract  export datacontract.yaml --format great-expectations --model orders
+datacontract export datacontract.yaml --format great-expectations --model orders
 ```
 
 The export creates a list of expectations by utilizing:
@@ -1028,7 +1053,7 @@ To further customize the export, the following optional arguments are available:
 
 #### RDF
 
-The export function converts a given data contract into a RDF representation. You have the option to
+The `export` function converts a given data contract into a RDF representation. You have the option to
 add a base_url which will be used as the default prefix to resolve relative IRIs inside the document.
 
 ```shell
@@ -1273,6 +1298,10 @@ FROM
 │    --source                       TEXT                            The path to the file that      │
 │                                                                   should be imported.            │
 │                                                                   [default: None]                │
+│    --spec                         [datacontract_specification|od  The format of the data         │
+│                                   cs]                             contract to import.            │
+│                                                                   [default:                      │
+│                                                                   datacontract_specification]    │
 │    --dialect                      TEXT                            The SQL dialect to use when    │
 │                                                                   importing SQL files, e.g.,     │
 │                                                                   postgres, tsql, bigquery.      │
@@ -1361,11 +1390,11 @@ Available import options:
 | `jsonschema`       | Import from JSON Schemas                       | ✅      |
 | `odcs`             | Import from Open Data Contract Standard (ODCS) | ✅      |
 | `parquet`          | Import from Parquet File Metadata              | ✅      |
-| `protobuf`         | Import from Protobuf schemas                   | ✅    |
-| `spark`            | Import from Spark StructTypes                  | ✅      |
+| `protobuf`         | Import from Protobuf schemas                   | ✅      |
+| `spark`            | Import from Spark StructTypes, Variant         | ✅      |
 | `sql`              | Import from SQL DDL                            | ✅      |
 | `unity`            | Import from Databricks Unity Catalog           | partial |
-| Missing something? | Please create an issue on GitHub               | TBD    |
+| Missing something? | Please create an issue on GitHub               | TBD     |
 
 
 #### ODCS
@@ -1467,14 +1496,31 @@ datacontract import --format glue --source <database_name>
 
 #### Spark
 
-Importing from Spark table or view these must be created or accessible in the Spark context. Specify tables list in `source` parameter.
-
-Example:
+Importing from Spark table or view these must be created or accessible in the Spark context. Specify tables list in `source` parameter.  If the `source` tables are registered as tables in Databricks, and they have a table-level descriptions they will also be added to the Data Contract Specification.
 
 ```bash
+# Example: Import Spark table(s) from Spark context
 datacontract import --format spark --source "users,orders"
 ```
 
+```bash
+# Example: Import Spark table
+DataContract().import_from_source("spark", "users")
+DataContract().import_from_source(format = "spark", source = "users")
+
+# Example: Import Spark dataframe
+DataContract().import_from_source("spark", "users", dataframe = df_user)
+DataContract().import_from_source(format = "spark", source = "users", dataframe = df_user)
+
+# Example: Import Spark table + table description
+DataContract().import_from_source("spark", "users", description = "description") 
+DataContract().import_from_source(format = "spark", source = "users", description = "description")
+
+# Example: Import Spark dataframe + table description
+DataContract().import_from_source("spark", "users", dataframe = df_user, description = "description")
+DataContract().import_from_source(format = "spark", source = "users", dataframe = df_user, description = "description")
+```
+
 #### DBML
 
 Importing from DBML Documents.

{datacontract_cli-0.10.27 → datacontract_cli-0.10.28}/README.md

@@ -307,30 +307,38 @@ Commands
 │                             [default: datacontract.yaml]                                         │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
 ╭─ Options ────────────────────────────────────────────────────────────────────────────────────────╮
-│ --schema                                       TEXT     The location (url or path) of the Data   │
-│                                                         Contract Specification JSON Schema       │
-│                                                         [default: None]                          │
-│ --server                                       TEXT     The server configuration to run the      │
-│                                                         schema and quality tests. Use the key of │
-│                                                         the server object in the data contract   │
-│                                                         yaml file to refer to a server, e.g.,    │
-│                                                         `production`, or `all` for all servers   │
-│                                                         (default).                               │
-│                                                         [default: all]                           │
-│ --publish                                      TEXT     The url to publish the results after the │
-│                                                         test                                     │
-│                                                         [default: None]                          │
-│ --output                                       PATH     Specify the file path where the test     │
-│                                                         results should be written to (e.g.,      │
-│                                                         './test-results/TEST-datacontract.xml'). │
-│                                                         [default: None]                          │
-│ --output-format                                [junit]  The target format for the test results.  │
-│                                                         [default: None]                          │
-│ --logs                --no-logs                         Print logs [default: no-logs]            │
-│ --ssl-verification    --no-ssl-verification             SSL verification when publishing the     │
-│                                                         data contract.                           │
-│                                                         [default: ssl-verification]              │
-│ --help                                                  Show this message and exit.              │
+│ --schema                                               TEXT     The location (url or path) of    │
+│                                                                 the Data Contract Specification  │
+│                                                                 JSON Schema                      │
+│                                                                 [default: None]                  │
+│ --server                                               TEXT     The server configuration to run  │
+│                                                                 the schema and quality tests.    │
+│                                                                 Use the key of the server object │
+│                                                                 in the data contract yaml file   │
+│                                                                 to refer to a server, e.g.,      │
+│                                                                 `production`, or `all` for all   │
+│                                                                 servers (default).               │
+│                                                                 [default: all]                   │
+│ --publish-test-results    --no-publish-test-results             Publish the results after the    │
+│                                                                 test                             │
+│                                                                 [default:                        │
+│                                                                 no-publish-test-results]         │
+│ --publish                                              TEXT     DEPRECATED. The url to publish   │
+│                                                                 the results after the test.      │
+│                                                                 [default: None]                  │
+│ --output                                               PATH     Specify the file path where the  │
+│                                                                 test results should be written   │
+│                                                                 to (e.g.,                        │
+│                                                                 './test-results/TEST-datacontra… │
+│                                                                 [default: None]                  │
+│ --output-format                                        [junit]  The target format for the test   │
+│                                                                 results.                         │
+│                                                                 [default: None]                  │
+│ --logs                    --no-logs                             Print logs [default: no-logs]    │
+│ --ssl-verification        --no-ssl-verification                 SSL verification when publishing │
+│                                                                 the data contract.               │
+│                                                                 [default: ssl-verification]      │
+│ --help                                                          Show this message and exit.      │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
 
 ```
@@ -904,6 +912,21 @@ Available export options:
 | `custom`             | Export to Custom format with Jinja                      | ✅      |
 | Missing something?   | Please create an issue on GitHub                        | TBD    |
 
+#### SQL
+
+The `export` function converts a given data contract into a SQL data definition language (DDL).
+
+```shell
+datacontract export datacontract.yaml --format sql --output output.sql
+```
+
+If using Databricks, and an error is thrown when trying to deploy the SQL DDLs with `variant` columns set the following properties.
+
+```shell
+spark.conf.set(“spark.databricks.delta.schema.typeCheck.enabled”, “false”)
+from datacontract.model import data_contract_specification
+data_contract_specification.DATACONTRACT_TYPES.append(“variant”)
+```
 
 #### Great Expectations
 
@@ -911,7 +934,7 @@ The `export` function transforms a specified data contract into a comprehensive
 If the contract includes multiple models, you need to specify the names of the model you wish to export.
 
 ```shell
-datacontract  export datacontract.yaml --format great-expectations --model orders
+datacontract export datacontract.yaml --format great-expectations --model orders
 ```
 
 The export creates a list of expectations by utilizing:
@@ -936,7 +959,7 @@ To further customize the export, the following optional arguments are available:
 
 #### RDF
 
-The export function converts a given data contract into a RDF representation. You have the option to
+The `export` function converts a given data contract into a RDF representation. You have the option to
 add a base_url which will be used as the default prefix to resolve relative IRIs inside the document.
 
 ```shell
@@ -1181,6 +1204,10 @@ FROM
 │    --source                       TEXT                            The path to the file that      │
 │                                                                   should be imported.            │
 │                                                                   [default: None]                │
+│    --spec                         [datacontract_specification|od  The format of the data         │
+│                                   cs]                             contract to import.            │
+│                                                                   [default:                      │
+│                                                                   datacontract_specification]    │
 │    --dialect                      TEXT                            The SQL dialect to use when    │
 │                                                                   importing SQL files, e.g.,     │
 │                                                                   postgres, tsql, bigquery.      │
@@ -1269,11 +1296,11 @@ Available import options:
 | `jsonschema`       | Import from JSON Schemas                       | ✅      |
 | `odcs`             | Import from Open Data Contract Standard (ODCS) | ✅      |
 | `parquet`          | Import from Parquet File Metadata              | ✅      |
-| `protobuf`         | Import from Protobuf schemas                   | ✅    |
-| `spark`            | Import from Spark StructTypes                  | ✅      |
+| `protobuf`         | Import from Protobuf schemas                   | ✅      |
+| `spark`            | Import from Spark StructTypes, Variant         | ✅      |
 | `sql`              | Import from SQL DDL                            | ✅      |
 | `unity`            | Import from Databricks Unity Catalog           | partial |
-| Missing something? | Please create an issue on GitHub               | TBD    |
+| Missing something? | Please create an issue on GitHub               | TBD     |
 
 
 #### ODCS
@@ -1375,14 +1402,31 @@ datacontract import --format glue --source <database_name>
 
 #### Spark
 
-Importing from Spark table or view these must be created or accessible in the Spark context. Specify tables list in `source` parameter.
-
-Example:
+Importing from Spark table or view these must be created or accessible in the Spark context. Specify tables list in `source` parameter.  If the `source` tables are registered as tables in Databricks, and they have a table-level descriptions they will also be added to the Data Contract Specification.
 
 ```bash
+# Example: Import Spark table(s) from Spark context
 datacontract import --format spark --source "users,orders"
 ```
 
+```bash
+# Example: Import Spark table
+DataContract().import_from_source("spark", "users")
+DataContract().import_from_source(format = "spark", source = "users")
+
+# Example: Import Spark dataframe
+DataContract().import_from_source("spark", "users", dataframe = df_user)
+DataContract().import_from_source(format = "spark", source = "users", dataframe = df_user)
+
+# Example: Import Spark table + table description
+DataContract().import_from_source("spark", "users", description = "description") 
+DataContract().import_from_source(format = "spark", source = "users", description = "description")
+
+# Example: Import Spark dataframe + table description
+DataContract().import_from_source("spark", "users", dataframe = df_user, description = "description")
+DataContract().import_from_source(format = "spark", source = "users", dataframe = df_user, description = "description")
+```
+
 #### DBML
 
 Importing from DBML Documents.

{datacontract_cli-0.10.27 → datacontract_cli-0.10.28}/datacontract/cli.py

@@ -11,7 +11,7 @@ from typing_extensions import Annotated
 
 from datacontract.catalog.catalog import create_data_contract_html, create_index_html
 from datacontract.data_contract import DataContract, ExportFormat
-from datacontract.imports.importer import ImportFormat
+from datacontract.imports.importer import ImportFormat, Spec
 from datacontract.init.init_template import get_init_template
 from datacontract.integration.datamesh_manager import (
     publish_data_contract_to_datamesh_manager,
@@ -126,7 +126,8 @@ def test(
             "servers (default)."
         ),
     ] = "all",
-    publish: Annotated[str, typer.Option(help="The url to publish the results after the test")] = None,
+    publish_test_results: Annotated[bool, typer.Option(help="Publish the results after the test")] = False,
+    publish: Annotated[str, typer.Option(help="DEPRECATED. The url to publish the results after the test.")] = None,
     output: Annotated[
         Path,
         typer.Option(
@@ -149,6 +150,7 @@ def test(
     run = DataContract(
         data_contract_file=location,
         schema_location=schema,
+        publish_test_results=publish_test_results,
         publish_url=publish,
         server=server,
         ssl_verification=ssl_verification,
@@ -246,6 +248,10 @@ def import_(
         Optional[str],
         typer.Option(help="The path to the file that should be imported."),
     ] = None,
+    spec: Annotated[
+        Spec,
+        typer.Option(help="The format of the data contract to import. "),
+    ] = Spec.datacontract_specification,
     dialect: Annotated[
         Optional[str],
         typer.Option(help="The SQL dialect to use when importing SQL files, e.g., postgres, tsql, bigquery."),
@@ -265,7 +271,7 @@ def import_(
         ),
     ] = None,
     unity_table_full_name: Annotated[
-        Optional[str], typer.Option(help="Full name of a table in the unity catalog")
+        Optional[List[str]], typer.Option(help="Full name of a table in the unity catalog")
     ] = None,
     dbt_model: Annotated[
         Optional[List[str]],
@@ -312,6 +318,7 @@ def import_(
     result = DataContract().import_from_source(
         format=format,
         source=source,
+        spec=spec,
         template=template,
         schema=schema,
         dialect=dialect,

{datacontract_cli-0.10.27 → datacontract_cli-0.10.28}/datacontract/data_contract.py

@@ -1,6 +1,12 @@
 import logging
 import typing
 
+from open_data_contract_standard.model import CustomProperty, OpenDataContractStandard
+
+from datacontract.export.odcs_v3_exporter import to_odcs_v3
+from datacontract.imports.importer import Spec
+from datacontract.imports.odcs_v3_importer import import_from_odcs
+
 if typing.TYPE_CHECKING:
     from pyspark.sql import SparkSession
 
@@ -44,6 +50,7 @@ class DataContract:
         inline_definitions: bool = True,
         inline_quality: bool = True,
         ssl_verification: bool = True,
+        publish_test_results: bool = False,
     ):
         self._data_contract_file = data_contract_file
         self._data_contract_str = data_contract_str
@@ -51,6 +58,7 @@ class DataContract:
         self._schema_location = schema_location
         self._server = server
         self._publish_url = publish_url
+        self._publish_test_results = publish_test_results
         self._spark = spark
         self._duckdb_connection = duckdb_connection
         self._inline_definitions = inline_definitions
@@ -178,7 +186,7 @@ class DataContract:
 
         run.finish()
 
-        if self._publish_url is not None:
+        if self._publish_url is not None or self._publish_test_results:
             publish_test_results_to_datamesh_manager(run, self._publish_url, self._ssl_verification)
 
         return run
@@ -243,43 +251,128 @@ class DataContract:
         )
 
     def export(self, export_format: ExportFormat, model: str = "all", sql_server_type: str = "auto", **kwargs) -> str:
-        data_contract = resolve.resolve_data_contract(
-            self._data_contract_file,
-            self._data_contract_str,
-            self._data_contract,
-            schema_location=self._schema_location,
-            inline_definitions=self._inline_definitions,
-            inline_quality=self._inline_quality,
-        )
+        if export_format == ExportFormat.html or export_format == ExportFormat.mermaid:
+            data_contract = resolve.resolve_data_contract_v2(
+                self._data_contract_file,
+                self._data_contract_str,
+                self._data_contract,
+                schema_location=self._schema_location,
+                inline_definitions=self._inline_definitions,
+                inline_quality=self._inline_quality,
+            )
 
-        return exporter_factory.create(export_format).export(
-            data_contract=data_contract,
-            model=model,
-            server=self._server,
-            sql_server_type=sql_server_type,
-            export_args=kwargs,
-        )
+            return exporter_factory.create(export_format).export(
+                data_contract=data_contract,
+                model=model,
+                server=self._server,
+                sql_server_type=sql_server_type,
+                export_args=kwargs,
+            )
+        else:
+            data_contract = resolve.resolve_data_contract(
+                self._data_contract_file,
+                self._data_contract_str,
+                self._data_contract,
+                schema_location=self._schema_location,
+                inline_definitions=self._inline_definitions,
+                inline_quality=self._inline_quality,
+            )
+
+            return exporter_factory.create(export_format).export(
+                data_contract=data_contract,
+                model=model,
+                server=self._server,
+                sql_server_type=sql_server_type,
+                export_args=kwargs,
+            )
 
+    # REFACTOR THIS
+    # could be a class method, not using anything from the instance
     def import_from_source(
         self,
         format: str,
         source: typing.Optional[str] = None,
         template: typing.Optional[str] = None,
         schema: typing.Optional[str] = None,
+        spec: Spec = Spec.datacontract_specification,
         **kwargs,
-    ) -> DataContractSpecification:
-        data_contract_specification_initial = DataContract.init(template=template, schema=schema)
+    ) -> DataContractSpecification | OpenDataContractStandard:
+        id = kwargs.get("id")
+        owner = kwargs.get("owner")
 
-        imported_data_contract_specification = importer_factory.create(format).import_source(
-            data_contract_specification=data_contract_specification_initial, source=source, import_args=kwargs
-        )
+        if spec == Spec.odcs:
+            data_contract_specification_initial = DataContract.init(template=template, schema=schema)
+
+            odcs_imported = importer_factory.create(format).import_source(
+                data_contract_specification=data_contract_specification_initial, source=source, import_args=kwargs
+            )
+
+            if isinstance(odcs_imported, DataContractSpecification):
+                # convert automatically
+                odcs_imported = to_odcs_v3(odcs_imported)
+
+            self._overwrite_id_in_odcs(odcs_imported, id)
+            self._overwrite_owner_in_odcs(odcs_imported, owner)
+
+            return odcs_imported
+        elif spec == Spec.datacontract_specification:
+            data_contract_specification_initial = DataContract.init(template=template, schema=schema)
+
+            data_contract_specification_imported = importer_factory.create(format).import_source(
+                data_contract_specification=data_contract_specification_initial, source=source, import_args=kwargs
+            )
+
+            if isinstance(data_contract_specification_imported, OpenDataContractStandard):
+                # convert automatically
+                data_contract_specification_imported = import_from_odcs(
+                    data_contract_specification_initial, data_contract_specification_imported
+                )
+
+            self._overwrite_id_in_data_contract_specification(data_contract_specification_imported, id)
+            self._overwrite_owner_in_data_contract_specification(data_contract_specification_imported, owner)
+
+            return data_contract_specification_imported
+        else:
+            raise DataContractException(
+                type="general",
+                result=ResultEnum.error,
+                name="Import Data Contract",
+                reason=f"Unsupported data contract format: {spec}",
+                engine="datacontract",
+            )
+
+    def _overwrite_id_in_data_contract_specification(
+        self, data_contract_specification: DataContractSpecification, id: str | None
+    ):
+        if not id:
+            return
+
+        data_contract_specification.id = id
+
+    def _overwrite_owner_in_data_contract_specification(
+        self, data_contract_specification: DataContractSpecification, owner: str | None
+    ):
+        if not owner:
+            return
+
+        if data_contract_specification.info is None:
+            data_contract_specification.info = Info()
+        data_contract_specification.info.owner = owner
+
+    def _overwrite_owner_in_odcs(self, odcs: OpenDataContractStandard, owner: str | None):
+        if not owner:
+            return
+
+        if odcs.customProperties is None:
+            odcs.customProperties = []
+        for customProperty in odcs.customProperties:
+            if customProperty.name == "owner":
+                customProperty.value = owner
+                return
+        odcs.customProperties.append(CustomProperty(property="owner", value=owner))
 
-        # Set id and owner if provided
-        if kwargs.get("id"):
-            data_contract_specification_initial.id = kwargs["id"]
-        if kwargs.get("owner"):
-            if data_contract_specification_initial.info is None:
-                data_contract_specification_initial.info = Info()
-            data_contract_specification_initial.info.owner = kwargs["owner"]
+    def _overwrite_id_in_odcs(self, odcs: OpenDataContractStandard, id: str | None):
+        if not id:
+            return
 
-        return imported_data_contract_specification
+        odcs.id = id

{datacontract_cli-0.10.27 → datacontract_cli-0.10.28}/datacontract/engines/data_contract_checks.py

@@ -502,11 +502,13 @@ def prepare_query(quality: Quality, model_name: str, field_name: str = None) ->
     query = quality.query
 
     query = query.replace("{model}", model_name)
+    query = query.replace("{schema}", model_name)
     query = query.replace("{table}", model_name)
 
     if field_name is not None:
         query = query.replace("{field}", field_name)
         query = query.replace("{column}", field_name)
+        query = query.replace("{property}", field_name)
 
     return query