omnata-plugin-runtime 0.10.11a262__tar.gz → 0.10.12__tar.gz

{omnata_plugin_runtime-0.10.11a262 → omnata_plugin_runtime-0.10.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.11a262
+Version: 0.10.12
 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.11a262 → omnata_plugin_runtime-0.10.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.10.11-a262"
+version = "0.10.12"
 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.11a262 → omnata_plugin_runtime-0.10.12}/src/omnata_plugin_runtime/json_schema.py

@@ -572,35 +572,40 @@ class SnowflakeViewParts(BaseModel):
 
         return cls(main_part=main_stream_view_part, joined_parts=joined_parts)
 
-def prune(view_part:SnowflakeViewPart,joined_parts:List[SnowflakeViewPart]) -> bool:
+def prune(view_part: SnowflakeViewPart, joined_parts: List[SnowflakeViewPart]) -> bool:
     """
-    Prunes columns from the main view part that reference fields that are not available in the joined parts.
-    Returns True if columns were removed, False otherwise.
+    Iteratively prunes columns from the main view part that reference fields
+    that are not available in the joined parts.
     """
-    for column in view_part.columns:
-        if column.referenced_columns:
-            for referenced_stream_name, referenced_fields in column.referenced_columns.items():
-                
-                if referenced_stream_name == view_part.stream_name:
-                    part = view_part
-                else:
-                    part = next((part for part in joined_parts if part.stream_name==referenced_stream_name),None)
-                    if part is None:
-                        logger.warning(f"Column {column.name} in stream {view_part.stream_name} references stream {referenced_stream_name}, but it was not provided")
-                        view_part.columns.remove(column)
-                        return True
-                
-                columns_missing_from_join = part.columns_missing(referenced_fields)
-                if len(columns_missing_from_join) > 0:
-                    logger.warning(f"Column {column.name} in stream {view_part.stream_name} references fields {columns_missing_from_join} in stream {referenced_stream_name}, but they were not provided")
-                    view_part.columns.remove(column)
-                    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
-                    if part != view_part:
-                        return prune(part,joined_parts)
-
-    return False
+    stack = [(view_part, joined_parts)]
+    columns_removed = False
+
+    while stack:
+        current_part, current_joined_parts = stack.pop()
+        for column in current_part.columns[:]:  # Iterate over a copy to allow safe removal
+            if column.referenced_columns:
+                for referenced_stream_name, referenced_fields in column.referenced_columns.items():
+                    if referenced_stream_name == current_part.stream_name:
+                        part = current_part
+                    else:
+                        part = next((p for p in current_joined_parts if p.stream_name == referenced_stream_name), None)
+                        if part is None:
+                            logger.warning(f"Column {column.name} in stream {current_part.stream_name} references stream {referenced_stream_name}, but it was not provided")
+                            current_part.columns.remove(column)
+                            columns_removed = True
+                            break
+
+                    columns_missing_from_join = part.columns_missing(referenced_fields)
+                    if columns_missing_from_join:
+                        logger.warning(f"Column {column.name} in stream {current_part.stream_name} references fields {columns_missing_from_join} in stream {referenced_stream_name}, but they were not provided")
+                        current_part.columns.remove(column)
+                        columns_removed = True
+                        break
+                    else:
+                        if part != current_part:
+                            stack.append((part, current_joined_parts))
+
+    return columns_removed
 
 class JsonSchemaTopLevel(BaseModel):
     """