validio-sdk 7.4.1__tar.gz → 7.4.2__tar.gz

{validio_sdk-7.4.1 → validio_sdk-7.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: validio-sdk
-Version: 7.4.1
+Version: 7.4.2
 Summary: SDK to interact with the Validio platform
 Home-page: https://validio.io/
 License: Apache-2.0

{validio_sdk-7.4.1 → validio_sdk-7.4.2}/pyproject.toml

@@ -3,7 +3,7 @@ name = "validio-sdk"
 # This version does not represent the released version or any tag. For each
 # release we automatically bump this before building and publishing so this
 # should be kept at 0.0.1dev1
-version = "7.4.1"
+version = "7.4.2"
 description = "SDK to interact with the Validio platform"
 authors = ["Validio <support@validio.io>"]
 license = "Apache-2.0"

{validio_sdk-7.4.1 → validio_sdk-7.4.2}/validio_sdk/code/_import.py

@@ -101,6 +101,7 @@ class ImportContext:
 async def _import(
     ctx: DiffContext,
     tags_ctx: DiffContext,
+    include_schema: bool = False,
 ) -> str:
     import_ctx = ImportContext()
 
@@ -189,16 +190,21 @@ async def _import(
     def import_sources(cls: type, name: str, r: Resource) -> None:
         credential = import_ctx.get_variable(Credential, cast(Any, r).credential_name)
 
+        inits: list[tuple[str, Any, str | None]] = [
+            ("credential", credential, None),
+            ("tags", resource_tags(r), None),
+        ]
+
+        if include_schema and isinstance(r, Source):
+            inits.append(("jtd_schema", r.jtd_schema, None))
+
         import_ctx.add_resource_decl(
             cls,
             name,
             r._import_str(
                 indent_level=0,
                 import_ctx=import_ctx,
-                inits=[
-                    ("credential", credential, None),
-                    ("tags", resource_tags(r), None),
-                ],
+                inits=inits,
                 skip={"tag_names"},
             ),
         )

{validio_sdk-7.4.1 → validio_sdk-7.4.2}/validio_sdk/resource/_diffable.py

@@ -23,6 +23,12 @@ could enter a cycle.
 """
 MAX_RESOURCE_DEPTH = 15
 
+"""
+When we format dictionaries this is the limit of how deep we can go to build a
+formatted output.
+"""
+MAX_FORMAT_DICT_DEPTH = 20
+
 
 class Diffable(ABC):
     """
@@ -162,8 +168,13 @@ class Diffable(ABC):
         import_args = []
 
         for field, arg, comment in sorted_params:
+            if isinstance(arg, dict):
+                value = _format_dict_value(arg, indent_level + 1, 0)
+            else:
+                value = arg
+
             comment_str = "" if not comment else f" # {comment}"
-            import_args.append(f"{field}={arg},{comment_str}")
+            import_args.append(f"{field}={value},{comment_str}")
 
         params_str = line_indent.join(import_args)
         closing_indent = " " * self._num_ident_spaces(indent_level)
@@ -175,6 +186,39 @@ class Diffable(ABC):
         return 4 * indent_level
 
 
+def _format_dict_value(value: Any, indent_level: int, recursion_depth: int) -> str:
+    """
+    Format dictionary for import.
+
+    This is only a best effort to try to wrap dict values instead of having a
+    long line for e.g. jtd schemas on import.
+    """
+    if recursion_depth >= MAX_FORMAT_DICT_DEPTH:
+        return value
+
+    indent = " " * (indent_level * 4)
+    if isinstance(value, dict):
+        if not value:
+            return "{}"
+
+        inner = indent + " " * 4
+
+        items = []
+        for k, v in value.items():
+            formatted = _format_dict_value(v, indent_level + 1, recursion_depth + 1)
+            items.append(f"{inner}'{k}': {formatted}")
+
+        return "{\n" + ",\n".join(items) + ",\n" + indent + "}"
+
+    if isinstance(value, bool):
+        return "True" if value else "False"
+
+    if value is None:
+        return "None"
+
+    return repr(value)
+
+
 class ApiSecretChangeNestedResource(Diffable):
     """An interface for nested structure inside a list of secret fields."""
 

{validio_sdk-7.4.1 → validio_sdk-7.4.2}/validio_sdk/resource/tests/test_import.py

@@ -165,7 +165,7 @@ notificationrule_0 = NotificationRule(
     assert doc.strip() == expected.strip()
 
 
-def test_import_sql_source() -> None:
+def test_import_sql_source_with_include_schema() -> None:
     credential = PostgreSqlCredential(
         name="postgres",
         host="127.0.0.1",
@@ -188,7 +188,14 @@ def test_import_sql_source() -> None:
             "nullable": False,
             "optionalProperties": {},
             "properties": {
-                "value": {"type": "int32"},
+                "value": {
+                    "type": "int32",
+                    "metadata": {
+                        "json_path": "value",
+                        "catalog_type": "NUMBER",
+                        "sampled_field": False,
+                    },
+                },
             },
         },
     )
@@ -224,6 +231,20 @@ source_0 = SqlSource(
     credential=credential_0,
     description=None,
     display_name='sql-source-postgres',
+    jtd_schema={
+        'nullable': False,
+        'optionalProperties': {},
+        'properties': {
+            'value': {
+                'type': 'int32',
+                'metadata': {
+                    'json_path': 'value',
+                    'catalog_type': 'NUMBER',
+                    'sampled_field': False,
+                },
+            },
+        },
+    },
     owner=None,
     priority=None,
     schedule='* * * * *',
@@ -240,7 +261,7 @@ source_0 = SqlSource(
         sources={source.name: source},
     )
 
-    doc = asyncio.run(_import(ctx, DiffContext()))
+    doc = asyncio.run(_import(ctx, DiffContext(), include_schema=True))
 
     assert doc.strip() == expected.strip()