omnata-plugin-runtime 0.10.25__py3-none-any.whl → 0.10.26__py3-none-any.whl

omnata_plugin_runtime/json_schema.py

@@ -3,7 +3,7 @@ Models used to represent JSON schemas and Snowflake view definitions.
 This was originally internal to the Sync Engine, but was moved to the
 plugin runtime so that it could be used for testing column expressions (formulas, etc).
 """
-from typing import Any, Dict, Optional, Literal, List, Union
+from typing import Any, Dict, Optional, Literal, List, Union, Tuple
 from typing_extensions import Self
 from pydantic import BaseModel, Field, model_validator, computed_field
 from jinja2 import Environment
@@ -475,6 +475,15 @@ class SnowflakeViewParts(BaseModel):
         # first, we need to collapse all referenced columns into a single map
         all_referenced_columns:Dict[str,List[str]] = {}
         for part in [self.main_part] + self.joined_parts:
+            # if the main part references any columns in this part in its joins, we need to include those columns
+            aliases_for_stream = [j.join_stream_alias for j in self.main_part.joins 
+                if j.join_stream_name == part.stream_name]
+            columns_used_in_joins = [
+                j.left_column for j in self.main_part.joins if j.left_alias in aliases_for_stream
+            ]
+            if part.stream_name not in all_referenced_columns:
+                all_referenced_columns[part.stream_name] = []
+            all_referenced_columns[part.stream_name] += columns_used_in_joins
             for column in part.columns:
                 if column.referenced_columns:
                     for stream_name, referenced_columns in column.referenced_columns.items():
@@ -485,8 +494,6 @@ class SnowflakeViewParts(BaseModel):
                 if join.join_stream_name not in all_referenced_columns:
                     all_referenced_columns[join.join_stream_name] = []
                 all_referenced_columns[join.join_stream_name].append(join.join_stream_column)
-                if part.stream_name not in all_referenced_columns:
-                    all_referenced_columns[part.stream_name] = []
                 all_referenced_columns[part.stream_name].append(join.left_column)
 
 
@@ -574,8 +581,8 @@ class SnowflakeViewParts(BaseModel):
         # We need to check both by stream name and by join stream alias
         
         # Build mappings for stream names and aliases
-        stream_to_aliases = {}  # stream_name -> set of aliases
-        alias_to_stream = {}    # alias -> stream_name
+        stream_to_aliases:Dict[str,set] = {}  # stream_name -> set of aliases
+        alias_to_stream:Dict[str,str] = {}    # alias -> stream_name
         
         # Initialize with the main stream
         stream_to_aliases[main_stream_view_part.stream_name] = {main_stream_view_part.stream_name}
@@ -586,7 +593,7 @@ class SnowflakeViewParts(BaseModel):
             logger.debug(f"Processing joins for stream: {part.stream_name}")
             # Make sure the part's stream name is in the mappings
             if part.stream_name not in stream_to_aliases:
-                stream_to_aliases[part.stream_name] = {part.stream_name}
+                stream_to_aliases[part.stream_name] = [part.stream_name]
             alias_to_stream[part.stream_name] = part.stream_name
             
             for join in part.joins:
@@ -610,7 +617,7 @@ class SnowflakeViewParts(BaseModel):
                             break
         
         # Build a graph of references between streams and their aliases
-        circular_refs = {}  # (source, target) -> [(column_name, ref_fields)]
+        circular_refs:Dict[Tuple[str,str],List[Tuple[str,List[str]]]] = {}  # (source, target) -> [(column_name, ref_fields)]
         
         # First, add references based on column dependencies
         for part in [main_stream_view_part] + joined_parts:
@@ -775,7 +782,19 @@ def prune(view_part: SnowflakeViewPart, joined_parts: List[SnowflakeViewPart]) -
     
     # Process joined parts
     for joined_part in joined_parts:
+        # We have to avoid pruning columns that are referenced by joins to this stream.
+        # first, we determine all aliases for this stream (multiple join paths back to the same stream are allowed)
+        aliases_for_stream = [j.join_stream_alias for j in view_part.joins if j.join_stream_name == joined_part.stream_name]
+        # now find all joins using this stream as the join stream
+        columns_used_in_joins = [
+            j.left_column for j in view_part.joins if j.left_alias in aliases_for_stream
+        ]
         for column in joined_part.columns[:]:  # Use a copy to allow safe removal
+            # First check if the column is a join column
+            if column.original_name in columns_used_in_joins:
+                # If it's a join column, we need to keep it
+                continue
+
             if not should_keep_column(column, joined_part):
                 joined_part.columns.remove(column)
                 columns_removed = True

{omnata_plugin_runtime-0.10.25.dist-info → omnata_plugin_runtime-0.10.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.25
+Version: 0.10.26
 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.25.dist-info → omnata_plugin_runtime-0.10.26.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=ud3O9R03BbUjGUJDVpGbnADqKw5oLVy65EQN1g6gmKg,46811
 omnata_plugin_runtime/forms.py,sha256=Lrbr3otsFDrvHWJw7v-slsW4PvEHJ6BG1Yl8oaJfiDo,20529
-omnata_plugin_runtime/json_schema.py,sha256=rqpJ5wjZiaE6shFB6Rv5CRHIl8xGxntibNjlh4A6Zr0,45902
+omnata_plugin_runtime/json_schema.py,sha256=Mq1R_TAYklG92iDUmeZFdjuUr-PEoejIXNs6hICyOgc,47196
 omnata_plugin_runtime/logging.py,sha256=WBuZt8lF9E5oFWM4KYQbE8dDJ_HctJ1pN3BHwU6rcd0,4461
 omnata_plugin_runtime/omnata_plugin.py,sha256=vD6FKJIFzTRYbj1Q51LSE-Kar4GPTq9SJcBU5jCYtiQ,134074
 omnata_plugin_runtime/plugin_entrypoints.py,sha256=SlpI3VF3EdTGFCr9wDD0kV4v6B6bHfNDFdC3slU2y8Y,32241
 omnata_plugin_runtime/rate_limiting.py,sha256=qpr5esU4Ks8hMzuMpSR3gLFdor2ZUXYWCjmsQH_K6lQ,25882
-omnata_plugin_runtime-0.10.25.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.10.25.dist-info/METADATA,sha256=n2fp4xzWD8fLZumTMPNwmtylqwtFRNBKIaLQDsC8t-c,2208
-omnata_plugin_runtime-0.10.25.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-omnata_plugin_runtime-0.10.25.dist-info/RECORD,,
+omnata_plugin_runtime-0.10.26.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.10.26.dist-info/METADATA,sha256=g6r33zwplvtOzmX701x1c6VFKZOkHrdm9_oEJxTH5xg,2208
+omnata_plugin_runtime-0.10.26.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+omnata_plugin_runtime-0.10.26.dist-info/RECORD,,