datacontract-cli 0.10.29__py3-none-any.whl → 0.10.31__py3-none-any.whl

datacontract/data_contract.py

@@ -4,7 +4,7 @@ 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.importer import ImportFormat, Spec
 from datacontract.imports.odcs_v3_importer import import_from_odcs
 
 if typing.TYPE_CHECKING:
@@ -300,7 +300,7 @@ class DataContract:
         id = kwargs.get("id")
         owner = kwargs.get("owner")
 
-        if spec == Spec.odcs:
+        if spec == Spec.odcs or format == ImportFormat.excel:
             data_contract_specification_initial = DataContract.init(template=template, schema=schema)
 
             odcs_imported = importer_factory.create(format).import_source(

datacontract/export/great_expectations_converter.py

@@ -14,9 +14,6 @@ from datacontract.export.exporter import (
     Exporter,
     _check_models_for_export,
 )
-from datacontract.export.pandas_type_converter import convert_to_pandas_type
-from datacontract.export.spark_converter import to_spark_data_type
-from datacontract.export.sql_type_converter import convert_to_sql_type
 from datacontract.model.data_contract_specification import (
     DataContractSpecification,
     DeprecatedQuality,
@@ -167,10 +164,16 @@ def add_field_expectations(
     """
     if field.type is not None:
         if engine == GreatExpectationsEngine.spark.value:
+            from datacontract.export.spark_converter import to_spark_data_type
+
             field_type = to_spark_data_type(field).__class__.__name__
         elif engine == GreatExpectationsEngine.pandas.value:
+            from datacontract.export.pandas_type_converter import convert_to_pandas_type
+
             field_type = convert_to_pandas_type(field)
         elif engine == GreatExpectationsEngine.sql.value:
+            from datacontract.export.sql_type_converter import convert_to_sql_type
+
             field_type = convert_to_sql_type(field, sql_server_type)
         else:
             field_type = field.type

datacontract/export/markdown_converter.py

@@ -153,7 +153,7 @@ def field_to_markdown(field_name: str, field: Field, level: int = 0) -> str:
     Returns:
         str: A Markdown table rows for the field.
     """
-    tabs = " " * level
+    tabs = " " * level
     arrow = "↳" if level > 0 else ""
     column_name = f"{tabs}{arrow} {field_name}"
 

datacontract/export/spark_converter.py

@@ -126,6 +126,8 @@ def to_spark_data_type(field: Field) -> types.DataType:
         return types.StructType(to_struct_type(field.fields))
     if field_type == "map":
         return types.MapType(to_spark_data_type(field.keys), to_spark_data_type(field.values))
+    if field_type == "variant":
+        return types.VariantType()
     if field_type in ["string", "varchar", "text"]:
         return types.StringType()
     if field_type in ["number", "decimal", "numeric"]:
@@ -150,7 +152,7 @@ def to_spark_data_type(field: Field) -> types.DataType:
         return types.DateType()
     if field_type == "bytes":
         return types.BinaryType()
-    return types.BinaryType()
+    return types.StringType() # default if no condition is met
 
 
 def print_schema(dtype: types.DataType) -> str:

datacontract/imports/excel_importer.py

@@ -680,7 +680,7 @@ def import_servers(workbook) -> Optional[List[Server]]:
                 elif server_type == "databricks":
                     server.catalog = get_server_cell_value(workbook, sheet, "servers.databricks.catalog", index)
                     server.host = get_server_cell_value(workbook, sheet, "servers.databricks.host", index)
-                    server.schema = get_server_cell_value(workbook, sheet, "servers.databricks.schema", index)
+                    server.schema_ = get_server_cell_value(workbook, sheet, "servers.databricks.schema", index)
                 elif server_type == "glue":
                     server.account = get_server_cell_value(workbook, sheet, "servers.glue.account", index)
                     server.database = get_server_cell_value(workbook, sheet, "servers.glue.database", index)
@@ -694,7 +694,7 @@ def import_servers(workbook) -> Optional[List[Server]]:
                     server.database = get_server_cell_value(workbook, sheet, "servers.postgres.database", index)
                     server.host = get_server_cell_value(workbook, sheet, "servers.postgres.host", index)
                     server.port = get_server_cell_value(workbook, sheet, "servers.postgres.port", index)
-                    server.schema = get_server_cell_value(workbook, sheet, "servers.postgres.schema", index)
+                    server.schema_ = get_server_cell_value(workbook, sheet, "servers.postgres.schema", index)
                 elif server_type == "s3":
                     server.delimiter = get_server_cell_value(workbook, sheet, "servers.s3.delimiter", index)
                     server.endpointUrl = get_server_cell_value(workbook, sheet, "servers.s3.endpointUrl", index)
@@ -705,13 +705,13 @@ def import_servers(workbook) -> Optional[List[Server]]:
                     server.database = get_server_cell_value(workbook, sheet, "servers.snowflake.database", index)
                     server.host = get_server_cell_value(workbook, sheet, "servers.snowflake.host", index)
                     server.port = get_server_cell_value(workbook, sheet, "servers.snowflake.port", index)
-                    server.schema = get_server_cell_value(workbook, sheet, "servers.snowflake.schema", index)
+                    server.schema_ = get_server_cell_value(workbook, sheet, "servers.snowflake.schema", index)
                     server.warehouse = get_server_cell_value(workbook, sheet, "servers.snowflake.warehouse", index)
                 elif server_type == "sqlserver":
                     server.database = get_server_cell_value(workbook, sheet, "servers.sqlserver.database", index)
                     server.host = get_server_cell_value(workbook, sheet, "servers.sqlserver.host", index)
                     server.port = get_server_cell_value(workbook, sheet, "servers.sqlserver.port", index)
-                    server.schema = get_server_cell_value(workbook, sheet, "servers.sqlserver.schema", index)
+                    server.schema_ = get_server_cell_value(workbook, sheet, "servers.sqlserver.schema", index)
                 else:
                     # Custom server type - grab all possible fields
                     server.account = get_server_cell_value(workbook, sheet, "servers.custom.account", index)
@@ -726,7 +726,7 @@ def import_servers(workbook) -> Optional[List[Server]]:
                     server.path = get_server_cell_value(workbook, sheet, "servers.custom.path", index)
                     server.port = get_server_cell_value(workbook, sheet, "servers.custom.port", index)
                     server.project = get_server_cell_value(workbook, sheet, "servers.custom.project", index)
-                    server.schema = get_server_cell_value(workbook, sheet, "servers.custom.schema", index)
+                    server.schema_ = get_server_cell_value(workbook, sheet, "servers.custom.schema", index)
                     server.stagingDir = get_server_cell_value(workbook, sheet, "servers.custom.stagingDir", index)
                     server.table = get_server_cell_value(workbook, sheet, "servers.custom.table", index)
                     server.view = get_server_cell_value(workbook, sheet, "servers.custom.view", index)

datacontract/imports/sql_importer.py

@@ -230,6 +230,8 @@ def map_type_from_sql(sql_type: str) -> str | None:
         return "int"
     elif sql_type_normed.startswith("float"):
         return "float"
+    elif sql_type_normed.startswith("double"):
+        return "double"
     elif sql_type_normed.startswith("decimal"):
         return "decimal"
     elif sql_type_normed.startswith("numeric"):

datacontract/imports/unity_importer.py

@@ -200,7 +200,8 @@ def import_table_fields(columns: List[ColumnInfo]) -> dict[str, Field]:
 
 def _to_field(column: ColumnInfo) -> Field:
     field = Field()
-    if column.type_name is not None:
+    # The second condition evaluates for complex types (e.g. variant)
+    if column.type_name is not None or (column.type_name is None and column.type_text is not None):
         sql_type = str(column.type_text)
         field.type = map_type_from_sql(sql_type)
     physical_type_key = to_physical_type_key("databricks")

{datacontract_cli-0.10.29.dist-info → datacontract_cli-0.10.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datacontract-cli
-Version: 0.10.29
+Version: 0.10.31
 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
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: typer<0.16,>=0.15.1
+Requires-Dist: typer<0.17,>=0.15.1
 Requires-Dist: pydantic<2.12.0,>=2.8.2
 Requires-Dist: pyyaml~=6.0.1
 Requires-Dist: requests<2.33,>=2.31
@@ -42,7 +42,7 @@ 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.58.0; extra == "databricks"
+Requires-Dist: databricks-sdk<0.59.0; extra == "databricks"
 Requires-Dist: pyspark<4.0.0,>=3.5.5; extra == "databricks"
 Provides-Extra: iceberg
 Requires-Dist: pyiceberg==0.9.1; extra == "iceberg"
@@ -54,7 +54,7 @@ Provides-Extra: postgres
 Requires-Dist: soda-core-postgres<3.6.0,>=3.3.20; extra == "postgres"
 Provides-Extra: s3
 Requires-Dist: s3fs<2026.0.0,>=2025.2.0; extra == "s3"
-Requires-Dist: aiobotocore<2.23.0,>=2.17.0; extra == "s3"
+Requires-Dist: aiobotocore<2.24.0,>=2.17.0; extra == "s3"
 Provides-Extra: snowflake
 Requires-Dist: snowflake-connector-python[pandas]<3.16,>=3.6; extra == "snowflake"
 Requires-Dist: soda-core-snowflake<3.6.0,>=3.3.20; extra == "snowflake"
@@ -71,7 +71,7 @@ Requires-Dist: pyarrow>=18.1.0; extra == "parquet"
 Provides-Extra: rdf
 Requires-Dist: rdflib==7.0.0; extra == "rdf"
 Provides-Extra: api
-Requires-Dist: fastapi==0.115.14; extra == "api"
+Requires-Dist: fastapi==0.116.1; extra == "api"
 Requires-Dist: uvicorn==0.35.0; extra == "api"
 Provides-Extra: protobuf
 Requires-Dist: grpcio-tools>=1.53; extra == "protobuf"
@@ -86,7 +86,7 @@ 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"
 Requires-Dist: pytest-xdist; extra == "dev"
-Requires-Dist: pymssql==2.3.6; extra == "dev"
+Requires-Dist: pymssql==2.3.7; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: testcontainers[kafka,minio,mssql,postgres]==4.10.0; extra == "dev"
 Requires-Dist: trino==0.335.0; extra == "dev"
@@ -1018,8 +1018,6 @@ If using Databricks, and an error is thrown when trying to deploy the SQL DDLs w
 
 ```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
@@ -2083,7 +2081,6 @@ We are happy to receive your contributions. Propose your change in an issue or d
 - [INNOQ](https://innoq.com)
 - [Data Catering](https://data.catering/)
 - [Oliver Wyman](https://www.oliverwyman.com/)
-- [dmTECH](https://www.dmtech.tech/de)
 - And many more. To add your company, please create a pull request.
 
 ## Related Tools

{datacontract_cli-0.10.29.dist-info → datacontract_cli-0.10.31.dist-info}/RECORD

@@ -1,7 +1,7 @@
 datacontract/__init__.py,sha256=ThDdxDJsd7qNErLoh628nK5M7RzhJNYCmN-C6BAJFoo,405
 datacontract/api.py,sha256=Ze6pVD3Ub0oyMJI3iYSNXH78K2nPKbXKKHA-0DerJ48,8175
 datacontract/cli.py,sha256=KSXii4MsrdmEwFTDN9F7A-OC250gdY0R914FBqA2RuY,18614
-datacontract/data_contract.py,sha256=-nIf68Uo2bclJpqGUz_AkLesGqwrlgpn59WVSFwoi3I,15028
+datacontract/data_contract.py,sha256=yU0Ys4-MK16tTm5RAnALGaNfqpvFmAjfabZg7ePqV5Y,15074
 datacontract/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 datacontract/breaking/breaking.py,sha256=DnqgxUjD-EAZcg5RBizOP9a2WxsFTaQBik0AB_m3K00,20431
 datacontract/breaking/breaking_change.py,sha256=BIDEUo1U2CQLVT2-I5PyFttxAj6zQPI1UUkEoOOQXMY,2249
@@ -37,11 +37,11 @@ datacontract/export/duckdb_type_converter.py,sha256=hUAAbImhJUMJOXEG-UoOKQqYGrJM
 datacontract/export/exporter.py,sha256=P_6J5d7k5GPm-DUyfrbgEXmU_o45FHu5nlOTT2CdkUk,3049
 datacontract/export/exporter_factory.py,sha256=PWA2j82Vjenj4hXlYXUISTzttrMIILdx8LxNv6hM0cg,6014
 datacontract/export/go_converter.py,sha256=Ttvbfu3YU-3GBwRD6nwCsFyZuc_hiIvJD-Jg2sT5WLw,3331
-datacontract/export/great_expectations_converter.py,sha256=WvEa4HNUMyzn2a5YNkcI9mjROzGkKRYOS2gFPjRRHNc,12218
+datacontract/export/great_expectations_converter.py,sha256=Wx0mESRy4xAf8y7HjESsGsQaaei8k9xOVu3RbC6BlQM,12257
 datacontract/export/html_exporter.py,sha256=EyTMj25_Df3irZiYw1hxVZeLYWp6YSG6z3IuFUviP14,3066
 datacontract/export/iceberg_converter.py,sha256=ArcQ_Y3z_W4_kGDU_8jPRx2-pHpP3Nhx1zYoETOL3c4,6804
 datacontract/export/jsonschema_converter.py,sha256=2MT82MurcQQbrVDRj1kFsxnmFd9scNSfYI1upQSecl4,5631
-datacontract/export/markdown_converter.py,sha256=chtaZX4vXTee7JCMYmWiDQ9m55gwJjHPw6SEM3UOwpQ,6467
+datacontract/export/markdown_converter.py,sha256=ioTFe3mHKLYwpo7wasOr-4TBlHIjowDHSonDgXV4uOQ,6468
 datacontract/export/mermaid_exporter.py,sha256=wBFqRKgy3Y5FZnzD0RCR1UAlT9ZqYW7dkXWSJa6eHiQ,3465
 datacontract/export/odcs_v3_exporter.py,sha256=b__AiPAnCUuFQE5DPHsvXBrMeEl1t_mJ1vzTx84TMlI,13931
 datacontract/export/pandas_type_converter.py,sha256=464pQ3JQKFQa1TO0HBNcEoZvQye_yUbY6jQtiBaphSc,1117
@@ -49,7 +49,7 @@ datacontract/export/protobuf_converter.py,sha256=DHLl8BW26xqltBsd7Qhz0RhTl9YZQKC
 datacontract/export/pydantic_converter.py,sha256=1Lt9F8i6zyQYb44MyQtsXwCWWXYxZ47SmzArr_uPqsU,5579
 datacontract/export/rdf_converter.py,sha256=1aTe_fwBRBnYUrJZzhEQ8eVnl0mQ1hcF45aKVdgvSIc,6435
 datacontract/export/sodacl_converter.py,sha256=75vQ2TnoLfjiDtWT2x8opumvotXVRs1YaIu1NLYz05M,1473
-datacontract/export/spark_converter.py,sha256=LCue-rLan3ki7HgzUFyBaO8YUlc6CrDNBZD-QVgUv-U,7190
+datacontract/export/spark_converter.py,sha256=c4C_QZFRQLMW6Cz35WYdHqYGKyHSF7bBVmJua2YF0Cs,7290
 datacontract/export/sql_converter.py,sha256=vyLbDqzt_J3LRXpPv2W2HqUIyAtQx_S-jviBiSxh14A,5087
 datacontract/export/sql_type_converter.py,sha256=4r8S7nb4z2ODgXTwHxdtU158HWE8uxXHydiZ_y4-N_E,13592
 datacontract/export/sqlalchemy_converter.py,sha256=0DMncvA811lTtd5q4ZORREQ9YH1vQm1lJeqMWsFvloE,6463
@@ -59,7 +59,7 @@ datacontract/imports/bigquery_importer.py,sha256=7TcP9FDsIas5LwJZ-HrOPXZ-NuR056s
 datacontract/imports/csv_importer.py,sha256=mBsmyTvfB8q64Z3NYqv4zTDUOvoXG896hZvp3oLt5YM,5330
 datacontract/imports/dbml_importer.py,sha256=o0IOgvXN34lU1FICDHm_QUTv0DKsgwbHPHUDxQhIapE,3872
 datacontract/imports/dbt_importer.py,sha256=hQwqD9vbvwLLc6Yj3tQbar5ldI0pV-ynSiz7CZZ0JCc,8290
-datacontract/imports/excel_importer.py,sha256=6HJcbRxyZ0PTFL0f0Ww-VAMdUnnph_e7JqZWwOeAK6Y,37111
+datacontract/imports/excel_importer.py,sha256=TsyGlF4LE3ABps9UJt7ozwEXwHLgmOhqyJhh6l--xk0,37116
 datacontract/imports/glue_importer.py,sha256=fiJPkvfwOCsaKKCGW19-JM5CCGXZ2mkNrVtUzp2iw6g,8370
 datacontract/imports/iceberg_importer.py,sha256=vadGJVqQKgG-j8swUytZALFB8QjbGRqZPCcPcCy0vco,5923
 datacontract/imports/importer.py,sha256=NRhR_9AWPWDNq2ac_DVUHGoJuvkVpwwaao8nDfJG_l0,1257
@@ -71,8 +71,8 @@ datacontract/imports/odcs_v3_importer.py,sha256=smtFSoywNojUCdB8sDu0e_3yHN4CmUw5
 datacontract/imports/parquet_importer.py,sha256=W_0_16mX4stwDUt4GM2L7dnGmTpAySab5k13-OlTCCc,3095
 datacontract/imports/protobuf_importer.py,sha256=rlUIskv9PNi5rFQ4Hobt9zlnKpahGsb4dy5G5UJoVAw,10840
 datacontract/imports/spark_importer.py,sha256=vqGM3kisQGSiHS1AvuC6gp0unj2-6TT3R-ejG96j-Tw,8618
-datacontract/imports/sql_importer.py,sha256=a5Ym4qkjjvT1g1P7lIn0KpvIxL45zGPn_qPKqg570ro,9472
-datacontract/imports/unity_importer.py,sha256=Aa-Rqjzfen5chUB4EUt9bOL0QOAbj4j7ZoU-chdhtvk,8554
+datacontract/imports/sql_importer.py,sha256=CfHap1zpyy-NVol_i21bDai3l4PD8OLuJQwaVlihbqg,9543
+datacontract/imports/unity_importer.py,sha256=iW4CJNbHNoQR5fqVlBJfdHnbbDasPgkwHHmyV9FKGkI,8687
 datacontract/init/init_template.py,sha256=nc-B2ZkwDQ3GNFqxNmSDcStQMDbBTxysgTZDLw15izo,721
 datacontract/integration/datamesh_manager.py,sha256=FT9eadzFz181lg54b49_c_x2caGJT7mR3drlZBSBJLo,3375
 datacontract/lint/files.py,sha256=tg0vq_w4LQsEr_8A5qr4hUJmHeGalUpsXJXC1t-OGC0,471
@@ -112,9 +112,9 @@ datacontract/templates/partials/model_field.html,sha256=2YBF95ypNCPFYuYKoeilRnDG
 datacontract/templates/partials/quality.html,sha256=ynEDWRn8I90Uje-xhGYgFcfwOgKI1R-CDki-EvTsauQ,1785
 datacontract/templates/partials/server.html,sha256=dHFJtonMjhiUHtT69RUgTpkoRwmNdTRzkCdH0LtGg_4,6279
 datacontract/templates/style/output.css,sha256=ioIo1f96VW7LHhDifj6QI8QbRChJl-LlQ59EwM8MEmA,28692
-datacontract_cli-0.10.29.dist-info/licenses/LICENSE,sha256=23h64qnSeIZ0DKeziWAKC-zBCt328iSbRbWBrXoYRb4,2210
-datacontract_cli-0.10.29.dist-info/METADATA,sha256=qYg7wS67rf8uW1mgGwlIGTaQxs5cIz2-3Lw5wLTW-kw,110312
-datacontract_cli-0.10.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-datacontract_cli-0.10.29.dist-info/entry_points.txt,sha256=D3Eqy4q_Z6bHauGd4ppIyQglwbrm1AJnLau4Ppbw9Is,54
-datacontract_cli-0.10.29.dist-info/top_level.txt,sha256=VIRjd8EIUrBYWjEXJJjtdUgc0UAJdPZjmLiOR8BRBYM,13
-datacontract_cli-0.10.29.dist-info/RECORD,,
+datacontract_cli-0.10.31.dist-info/licenses/LICENSE,sha256=23h64qnSeIZ0DKeziWAKC-zBCt328iSbRbWBrXoYRb4,2210
+datacontract_cli-0.10.31.dist-info/METADATA,sha256=T5pyKhT8TWagt86un_b7JSYYN2BLtpLKTvK5kRpOCeg,110144
+datacontract_cli-0.10.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+datacontract_cli-0.10.31.dist-info/entry_points.txt,sha256=D3Eqy4q_Z6bHauGd4ppIyQglwbrm1AJnLau4Ppbw9Is,54
+datacontract_cli-0.10.31.dist-info/top_level.txt,sha256=VIRjd8EIUrBYWjEXJJjtdUgc0UAJdPZjmLiOR8BRBYM,13
+datacontract_cli-0.10.31.dist-info/RECORD,,