omnata-plugin-runtime 0.10.14a268__tar.gz → 0.10.15a269__tar.gz

{omnata_plugin_runtime-0.10.14a268 → omnata_plugin_runtime-0.10.15a269}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.14a268
+Version: 0.10.15a269
 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.14a268 → omnata_plugin_runtime-0.10.15a269}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.10.14-a268"
+version = "0.10.15-a269"
 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.14a268 → omnata_plugin_runtime-0.10.15a269}/src/omnata_plugin_runtime/json_schema.py

@@ -493,7 +493,7 @@ class SnowflakeViewParts(BaseModel):
                 self.main_part.cte_text(original_name=True)
             ] + [
                 part.cte_text(original_name=True,include_only_columns=all_referenced_columns.get(part.stream_name)) 
-            for part in self.joined_parts
+            for part in joined_parts_deduped
         ]
         # we need a final CTE which selects the main part's direct columns and joined columns, with their original names
         # then the final select statement will just be aliasing to the transformed names
@@ -535,6 +535,7 @@ class SnowflakeViewParts(BaseModel):
         Returns the building blocks required to create a normalized view from a stream.
         This includes any joins that are required, via CTEs.
         """
+        logger.debug(f"Generating view parts for stream: {stream_name}")
         # we start with the view parts for the view we are building
         main_stream_view_part = normalized_view_part(
             stream_name=stream_name,
@@ -551,6 +552,7 @@ class SnowflakeViewParts(BaseModel):
                                        and join.join_stream_name in stream_schemas]
 
         for join in main_stream_view_part.joins:
+            logger.debug(f"Generating view parts for join stream: {join.join_stream_name}")
             joined_parts.append(normalized_view_part(
                 stream_name=join.join_stream_name,
                 raw_table_location=raw_stream_locations[join.join_stream_name],
@@ -577,6 +579,7 @@ class SnowflakeViewParts(BaseModel):
         
         # Process all joins to build the mappings
         for part in [main_stream_view_part] + joined_parts:
+            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}
@@ -656,6 +659,11 @@ class SnowflakeViewParts(BaseModel):
             # These are not considered circular references
             if all(ref_type == "join" or ref_type == "join_reverse" for ref_type, _ in refs1):
                 continue
+            
+            # Skip self-references (same stream referencing itself)
+            # These are not considered circular references
+            if source_stream == target_stream:
+                continue
                 
             # Check for direct circular references
             reverse_key = (target, source)
@@ -666,27 +674,17 @@ class SnowflakeViewParts(BaseModel):
                 if all(ref_type == "join" or ref_type == "join_reverse" for ref_type, _ in refs2):
                     continue
                 
+                # Skip if the references are through different aliases
+                # This is not a circular reference
+                if source != target and target != source:
+                    continue
+                
                 raise ValueError(f"""Cyclic dependency detected: Circular reference between {source} and {target}.
 {source} -> {target}: {refs1}
 {target} -> {source}: {refs2}""")
             
-            # Check for circular references through aliases
-            for (other_source, other_target), refs2 in circular_refs.items():
-                if source == other_source or target == other_target:
-                    continue  # Skip self-comparisons
-                
-                # Skip references that are just join relationships
-                if all(ref_type == "join" or ref_type == "join_reverse" for ref_type, _ in refs2):
-                    continue
-                
-                other_source_stream = alias_to_stream.get(other_source, other_source)
-                other_target_stream = alias_to_stream.get(other_target, other_target)
-                
-                # Check if this is a circular reference through aliases
-                if target_stream == other_source_stream and source_stream == other_target_stream:
-                    raise ValueError(f"""Cyclic dependency detected: Circular reference through aliases.
-{source} ({source_stream}) -> {target} ({target_stream}): {refs1}
-{other_source} ({other_source_stream}) -> {other_target} ({other_target_stream}): {refs2}""")
+            # We don't need to check for circular references through aliases
+            # because we're already handling them in the direct circular reference check above
                     
         # If we get here, no circular references were found
         logger.debug("No circular references found")
@@ -702,7 +700,7 @@ class SnowflakeViewParts(BaseModel):
         prune_count = 0
         while prune(main_stream_view_part, joined_parts):
             prune_count += 1
-            if prune_count > 10000:
+            if prune_count > 10:
                 raise ValueError("Pruning of columns from the view has entered an infinite loop")
 
         return cls(main_part=main_stream_view_part, joined_parts=joined_parts)