omnata-plugin-runtime 0.10.8a256__tar.gz → 0.10.9a258__tar.gz

{omnata_plugin_runtime-0.10.8a256 → omnata_plugin_runtime-0.10.9a258}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.8a256
+Version: 0.10.9a258
 Summary: Classes and common runtime components for building and running Omnata Plugins
 Author: James Weakley
 Author-email: james.weakley@omnata.com

{omnata_plugin_runtime-0.10.8a256 → omnata_plugin_runtime-0.10.9a258}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.10.8-a256"
+version = "0.10.9-a258"
 description = "Classes and common runtime components for building and running Omnata Plugins"
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"

{omnata_plugin_runtime-0.10.8a256 → omnata_plugin_runtime-0.10.9a258}/src/omnata_plugin_runtime/json_schema.py

@@ -173,10 +173,22 @@ class SnowflakeViewColumn(BaseModel):
     )
 
     def __repr__(self) -> str:
-        return "SnowflakeViewColumn(name=%r, definition=%r, comment=%r)" % (
+        return """SnowflakeViewColumn(
+    name=%r,
+    original_name=%r,
+    expression=%r,
+    comment=%r,
+    is_join_column=%r,
+    required_stream_names=%r,
+    referenced_columns=%r)
+""" % (
             self.name,
-            self.definition(),
+            self.original_name,
+            self.expression,
             self.comment,
+            self.is_join_column,
+            self.required_stream_names,
+            self.referenced_columns
         )
 
     def definition(self,original_name:bool = False) -> str:
@@ -555,7 +567,8 @@ def prune(view_part:SnowflakeViewPart,joined_parts:List[SnowflakeViewPart]) -> b
                     return True
                 else:
                     # no columns were removed, but we need to check if the columns that are referenced are not themselves referencing other missing columns
-                    return prune(part,joined_parts)
+                    if part != view_part:
+                        return prune(part,joined_parts)
 
     return False
 
@@ -613,7 +626,7 @@ class JsonSchemaTopLevel(BaseModel):
         - current_comment_path is the same length as above, and contains any "description" values found on the way down
         """
         json_property = JsonSchemaProperty.model_validate(property_value)
-        # bit of basic home-grown validation, could probably use a library for this
+        children = []
         if json_property.type:
             if json_property.type == "object":
                 # TODO: make this depth configurable on the sync
@@ -629,8 +642,7 @@ class JsonSchemaTopLevel(BaseModel):
                         )
                         for child_property_name, child_property_value in json_property.properties.items()
                     ]
-                    return [item for sublist in children for item in sublist]
-
+                    children = [item for sublist in children for item in sublist]
         current_field_name_path = current_field_name_path + [property_name]
         current_comment_path = current_comment_path + [
             json_property.description or ""
@@ -638,7 +650,7 @@ class JsonSchemaTopLevel(BaseModel):
         # remove empty strings from current_comment_path
         current_comment_path = [c for c in current_comment_path if c]
 
-        return [SnowflakeViewColumn.from_json_schema_property(
+        columns = [SnowflakeViewColumn.from_json_schema_property(
             column_name="_".join(current_field_name_path),
             comment=" -> ".join(current_comment_path),
             variant_path=":".join([f'"{p}"' for p in current_field_name_path if p]),
@@ -646,6 +658,8 @@ class JsonSchemaTopLevel(BaseModel):
             column_name_environment=column_name_environment,
             column_name_expression=column_name_expression
         )]
+        columns.extend(children)
+        return columns
     
 
 def normalized_view_part(