omnata-plugin-runtime 0.10.11a262__py3-none-any.whl → 0.10.12a263__py3-none-any.whl

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):
     """

{omnata_plugin_runtime-0.10.11a262.dist-info → omnata_plugin_runtime-0.10.12a263.dist-info}/METADATA

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

@@ -2,12 +2,12 @@ omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTw
 omnata_plugin_runtime/api.py,sha256=baGraSMiD4Yvi3ZWrEv_TKh8Ktd1U8riBdOpe9j0Puw,8202
 omnata_plugin_runtime/configuration.py,sha256=0rfIGv8rCu8OwL7m-VOXIBjd05iyaBWRdt2h9o6scwo,46754
 omnata_plugin_runtime/forms.py,sha256=9YHJ_T17lT-rwyDaUg_0yj_YMPda4DRCw_wrvf8hE0E,19964
-omnata_plugin_runtime/json_schema.py,sha256=1gObKC5ueCVethiYL_MsZGwWxIEiCABS97xwdnWotjo,36105
+omnata_plugin_runtime/json_schema.py,sha256=-CKMWBphgSdAuJvczGfkhXBbynFtLrNdx7E7O70LCXk,36267
 omnata_plugin_runtime/logging.py,sha256=WBuZt8lF9E5oFWM4KYQbE8dDJ_HctJ1pN3BHwU6rcd0,4461
 omnata_plugin_runtime/omnata_plugin.py,sha256=M0b6f9lKKEoEI0zf-ZwZcIPKPQTmHTIMhvcrBc94Mhg,133278
 omnata_plugin_runtime/plugin_entrypoints.py,sha256=iqGl8_nEEnPGKg3Aem4YLSQ6d5xS3ju5gq8MJbx6sCA,31968
 omnata_plugin_runtime/rate_limiting.py,sha256=qpr5esU4Ks8hMzuMpSR3gLFdor2ZUXYWCjmsQH_K6lQ,25882
-omnata_plugin_runtime-0.10.11a262.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.10.11a262.dist-info/METADATA,sha256=EsBAJqs1g7eCgu-UlIjV5yZYZrgVMimsFue_yZ5KU5g,2212
-omnata_plugin_runtime-0.10.11a262.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-omnata_plugin_runtime-0.10.11a262.dist-info/RECORD,,
+omnata_plugin_runtime-0.10.12a263.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.10.12a263.dist-info/METADATA,sha256=Avx7KnmxD7O9caT0AMHs0kd1WmawDNG9Wfpa7FSFz-A,2212
+omnata_plugin_runtime-0.10.12a263.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+omnata_plugin_runtime-0.10.12a263.dist-info/RECORD,,