omnata-plugin-runtime 0.10.13a266__py3-none-any.whl → 0.10.14__py3-none-any.whl

omnata_plugin_runtime/json_schema.py

@@ -563,26 +563,137 @@ class SnowflakeViewParts(BaseModel):
         # on the SnowflakeViewColumn object.
         # Until this generate function is called with the raw stream names, we don't know which streams the user has actually selected, nor which
         # fields are actually available (some may be dropped due to something like an unsupported formula).
-        # So now there's a pruning process where we remove columns that reference fields that are not available.
         # First, explicitly check for circular references between tables, erroring if they are found.
-        circular_refs = {}
+        # This must be done before any pruning happens.
+        # 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
+        
+        # Initialize with the main stream
+        stream_to_aliases[main_stream_view_part.stream_name] = {main_stream_view_part.stream_name}
+        alias_to_stream[main_stream_view_part.stream_name] = main_stream_view_part.stream_name
+        
+        # Process all joins to build the mappings
+        for part in [main_stream_view_part] + joined_parts:
+            # 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}
+            alias_to_stream[part.stream_name] = part.stream_name
+            
+            for join in part.joins:
+                # Add the join stream alias to the set of aliases for that stream
+                if join.join_stream_name not in stream_to_aliases:
+                    stream_to_aliases[join.join_stream_name] = set()
+                stream_to_aliases[join.join_stream_name].add(join.join_stream_alias)
+                
+                # Map the alias back to its stream
+                alias_to_stream[join.join_stream_alias] = join.join_stream_name
+                
+                # Also add the left alias mapping
+                if join.left_alias not in alias_to_stream:
+                    # Try to find which stream this alias belongs to
+                    for other_part in [main_stream_view_part] + joined_parts:
+                        if other_part.stream_name == join.left_alias:
+                            if other_part.stream_name not in stream_to_aliases:
+                                stream_to_aliases[other_part.stream_name] = set()
+                            stream_to_aliases[other_part.stream_name].add(join.left_alias)
+                            alias_to_stream[join.left_alias] = other_part.stream_name
+                            break
+        
+        # Build a graph of references between streams and their aliases
+        circular_refs = {}  # (source, target) -> [(column_name, ref_fields)]
+        
+        # First, add references based on column dependencies
         for part in [main_stream_view_part] + joined_parts:
             for column in part.columns:
                 if column.referenced_columns:
                     for ref_stream_name, ref_fields in column.referenced_columns.items():
-                        # Record this reference
-                        if (part.stream_name, ref_stream_name) not in circular_refs:
-                            circular_refs[(part.stream_name, ref_stream_name)] = []
-                        circular_refs[(part.stream_name, ref_stream_name)].append((column.original_name, ref_fields))
+                        # Record this reference by stream name
+                        key = (part.stream_name, ref_stream_name)
+                        if key not in circular_refs:
+                            circular_refs[key] = []
+                        circular_refs[key].append((column.original_name, ref_fields))
+                        
+                        # Also record references by aliases
+                        # For each alias of the source stream
+                        for source_alias in stream_to_aliases.get(part.stream_name, {part.stream_name}):
+                            # For each alias of the target stream
+                            for target_alias in stream_to_aliases.get(ref_stream_name, {ref_stream_name}):
+                                # Create a reference from source alias to target alias
+                                alias_key = (source_alias, target_alias)
+                                if alias_key not in circular_refs:
+                                    circular_refs[alias_key] = []
+                                circular_refs[alias_key].append((column.original_name, ref_fields))
+        # Also add references from the joins
+        for part in [main_stream_view_part] + joined_parts:
+            for join in part.joins:
+                # Add a reference from the join stream to the left stream
+                key = (join.join_stream_name, part.stream_name)
+                if key not in circular_refs:
+                    circular_refs[key] = []
+                circular_refs[key].append(("join", [join.join_stream_column]))
+                
+                # Also add references by aliases
+                alias_key = (join.join_stream_alias, join.left_alias)
+                if alias_key not in circular_refs:
+                    circular_refs[alias_key] = []
+                circular_refs[alias_key].append(("join", [join.join_stream_column]))
+                
+                # Add references from the left alias to the join stream alias
+                reverse_key = (join.left_alias, join.join_stream_alias)
+                if reverse_key not in circular_refs:
+                    circular_refs[reverse_key] = []
+                circular_refs[reverse_key].append(("join_reverse", [join.left_column]))
         
-        # Check for circular references
-        for (stream1, stream2), refs1 in circular_refs.items():
-            if (stream2, stream1) in circular_refs:
-                # Found a potential circular reference between stream1 and stream2
-                refs2 = circular_refs[(stream2, stream1)]
-                raise ValueError(f"""Cyclic dependency detected: Circular reference between {stream1} and {stream2}.
-{stream1} -> {stream2}: {refs1}
-{stream2} -> {stream1}: {refs2}""")
+        # Check for circular references by stream name and by aliases
+        for (source, target), refs1 in circular_refs.items():
+            source_stream = alias_to_stream.get(source, source)
+            target_stream = alias_to_stream.get(target, target)
+            
+            # Skip references that are just join relationships
+            # These are not considered circular references
+            if all(ref_type == "join" or ref_type == "join_reverse" for ref_type, _ in refs1):
+                continue
+                
+            # Check for direct circular references
+            reverse_key = (target, source)
+            if reverse_key in circular_refs:
+                refs2 = circular_refs[reverse_key]
+                
+                # Skip if both references are just join relationships
+                if all(ref_type == "join" or ref_type == "join_reverse" for ref_type, _ in refs2):
+                    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}""")
+                    
+        # If we get here, no circular references were found
+        logger.debug("No circular references found")
+        
+        # Now proceed with the actual pruning process
+        # First, removing unavailable columns from other streams
+        # then, we can do a final pass and remove columns that reference fields that are not available in the current stream
         
         # Now proceed with the actual pruning process
         # First, removing unavailable columns from other streams

{omnata_plugin_runtime-0.10.13a266.dist-info → omnata_plugin_runtime-0.10.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.13a266
+Version: 0.10.14
 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.13a266.dist-info → omnata_plugin_runtime-0.10.14.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=us4T3OgpjAyfsmew4pD777PyY0PR9Qhu3v89YqcYVsw,39125
+omnata_plugin_runtime/json_schema.py,sha256=GuXmUydF44xQTxKL6PF0G_gsqevl_VI_p-raG8S2ETo,45463
 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.13a266.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.10.13a266.dist-info/METADATA,sha256=snbSNIEHMlkO9M-uKmUeIfzcW-MSXYk3saWTlYocQfs,2212
-omnata_plugin_runtime-0.10.13a266.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-omnata_plugin_runtime-0.10.13a266.dist-info/RECORD,,
+omnata_plugin_runtime-0.10.14.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.10.14.dist-info/METADATA,sha256=CDUnPb2-4jvcHOugd9ZOjVJYmUtDby5INIvwhf39YCA,2208
+omnata_plugin_runtime-0.10.14.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+omnata_plugin_runtime-0.10.14.dist-info/RECORD,,