omnata-plugin-runtime 0.11.0a314__tar.gz → 0.11.1__tar.gz

{omnata_plugin_runtime-0.11.0a314 → omnata_plugin_runtime-0.11.1}/PKG-INFO

@@ -1,7 +1,8 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: omnata-plugin-runtime
-Version: 0.11.0a314
+Version: 0.11.1
 Summary: Classes and common runtime components for building and running Omnata Plugins
+License-File: LICENSE
 Author: James Weakley
 Author-email: james.weakley@omnata.com
 Requires-Python: >=3.8,<=3.11

{omnata_plugin_runtime-0.11.0a314 → omnata_plugin_runtime-0.11.1}/pyproject.toml

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

@@ -557,7 +557,6 @@ class SnowflakeViewParts(BaseModel):
         # because they can be calculated directly without needing joins
         columns_only_referencing_own_stream: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 because they are used in the join condition
             aliases_for_stream = [j.join_stream_alias for j in self.main_part.joins 
@@ -570,7 +569,12 @@ class SnowflakeViewParts(BaseModel):
             for column in part.columns:
                 if column.referenced_columns:
                     for stream_name, referenced_columns in column.referenced_columns.items():
+                        aliases_for_referenced_stream = [j.join_stream_name for j in self.main_part.joins 
+                            if j.join_stream_alias == stream_name]
                         all_referenced_columns.setdefault(stream_name, []).extend(referenced_columns)
+                        # the stream name could be an alias, so we need to check if it's one of the aliases for this part
+                        for stream_name_for_alias in aliases_for_referenced_stream:
+                            all_referenced_columns.setdefault(stream_name_for_alias, []).extend(referenced_columns)
                         # populate columns_only_referencing_own_stream by following the chain of references until we reach a column that references another stream or has no references
                         if self.column_indirectly_references_other_streams(
                             [self.main_part] + self.joined_parts, part.stream_name, column.original_name
@@ -582,8 +586,8 @@ class SnowflakeViewParts(BaseModel):
             # if this part has joins to other streams, we need to include the join columns
             for join in part.joins:
                 all_referenced_columns.setdefault(join.join_stream_name, []).append(join.join_stream_column)
+                all_referenced_columns.setdefault(join.join_stream_alias, []).append(join.join_stream_column)
                 all_referenced_columns.setdefault(part.stream_name, []).append(join.left_column)
-
         ctes = [
                 self.main_part.cte_text(original_name=True,include_extra_columns=columns_only_referencing_own_stream.get(self.main_part.stream_name))
             ] + [
@@ -813,7 +817,13 @@ def find_part(view_part: SnowflakeViewPart, joined_parts: List[SnowflakeViewPart
             return part
     for join in view_part.joins:
         if join.join_stream_alias == stream_name:
-            return view_part
+            # this is the join, we need to find the actual stream
+            for part in joined_parts:
+                if part.stream_name == join.join_stream_name:
+                    return part
+            logger.warning(
+                f"Join alias {stream_name} maps to stream {join.join_stream_name}, but that stream is not in the joined parts"
+            )
     return None
 
 def prune(view_part: SnowflakeViewPart, joined_parts: List[SnowflakeViewPart]) -> bool: