omnata-plugin-runtime 0.11.3a319__tar.gz → 0.11.4a320__tar.gz

{omnata_plugin_runtime-0.11.3a319 → omnata_plugin_runtime-0.11.4a320}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omnata-plugin-runtime
-Version: 0.11.3a319
+Version: 0.11.4a320
 Summary: Classes and common runtime components for building and running Omnata Plugins
 License-File: LICENSE
 Author: James Weakley

{omnata_plugin_runtime-0.11.3a319 → omnata_plugin_runtime-0.11.4a320}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.11.3-a319"
+version = "0.11.4-a320"
 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.3a319 → omnata_plugin_runtime-0.11.4a320}/src/omnata_plugin_runtime/json_schema.py

@@ -7,6 +7,7 @@ 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
+from graphlib import TopologicalSorter
 from .logging import logger
 
 class JsonSchemaProperty(BaseModel):
@@ -271,57 +272,60 @@ class SnowflakeViewColumn(BaseModel):
         )
     
     @classmethod
-    def order_by_reference(cls,current_stream_name:str,columns:List[Self]) -> List[Self]:
+    def order_by_reference(cls, current_stream_name: str, columns: List[Self]) -> List[Self]:
         """
-        In some situations, column expressions may reference the alias of another column
-        This is allowed in Snowflake, as long as the aliased column is defined before it's used in a later column
-        So we need to sort the columns so that if the name of the column appears (in quotes) in the expression of another column, it is ordered first
+        Uses topological sorting to order columns so that if a column references another column,
+        the referenced column appears first in the list. This is required by Snowflake when
+        column expressions reference the alias of another column.
+        
+        OMNATA_ system columns are always placed at the front of the result.
         """
         logger.debug(
             f"Ordering columns by reference for stream: {current_stream_name} ({len(columns)} columns)"
         )
-        # Collect columns to be moved
-        columns_to_move:List[Self] = []
-        # Collect Omnata System columns and keep them at the front
-        omnata_system_columns_start = []
-        for column in columns[:]:
-            if column.original_name.startswith("OMNATA_"):
-                columns.remove(column)
-                omnata_system_columns_start.append(column)
-
+        
+        # Separate OMNATA system columns - they always go first
+        omnata_system_columns = []
+        regular_columns = []
         for column in columns:
-            for other_column in columns:
-                if column==other_column:
-                    continue
-                if column.original_name in (other_column.referenced_columns or {}).get(current_stream_name,[]):
-                    if column not in columns_to_move:
-                        logger.debug(
-                            f"Column {column.original_name} references {other_column.original_name}, moving it to the front"
-                        )
-                        columns_to_move.append(column)
-        # we need to do another pass just on columns_to_move, because they may reference each other
-        # if any do, they go to the front, otherwise they are appended
-        columns_to_move_final:List[Self] = []
-        for column in columns_to_move:
-            for other_column in columns_to_move:
-                if column==other_column:
-                    continue
-                if column.original_name in (other_column.referenced_columns or {}).get(current_stream_name,[]):
-                    if column not in columns_to_move_final:
-                        logger.debug(
-                            f"Second pass: Column {column.original_name} is referenced by {other_column.original_name}, moving it to the front"
-                        )
-                        columns_to_move_final.insert(0, column)
-                        continue
-            if column not in columns_to_move_final:
-                columns_to_move_final.append(column)
+            if column.original_name.startswith("OMNATA_"):
+                omnata_system_columns.append(column)
+            else:
+                regular_columns.append(column)
+        
+        # Build dependency graph: column_name -> list of columns it depends on
+        # (i.e., columns that must appear BEFORE it in the final order)
+        graph: Dict[str, List[str]] = {}
+        column_by_name: Dict[str, Self] = {}
+        
+        for column in regular_columns:
+            column_by_name[column.original_name] = column
+            # Initialize with empty dependencies
+            graph[column.original_name] = []
+            
+            # Add dependencies from referenced_columns
+            if column.referenced_columns:
+                referenced_in_current_stream = column.referenced_columns.get(current_stream_name, [])
+                for ref_col_name in referenced_in_current_stream:
+                    # This column depends on ref_col_name, so ref_col_name must come first
+                    graph[column.original_name].append(ref_col_name)
+                    logger.debug(
+                        f"Column {column.original_name} depends on {ref_col_name}"
+                    )
+        
+        # Use TopologicalSorter to sort the columns
+        try:
+            ts = TopologicalSorter(graph)
+            sorted_column_names = list(ts.static_order())
+        except ValueError as e:
+            # This would indicate a circular dependency
+            raise ValueError(f"Circular dependency detected in column references for stream {current_stream_name}: {e}")
+        
+        # Reconstruct the column list in topological order
+        sorted_columns = [column_by_name[name] for name in sorted_column_names if name in column_by_name]
         
-        # Move collected columns to the front
-        columns_to_move_final.reverse()
-        for column in columns_to_move_final:
-            columns.remove(column)
-            columns.insert(0, column)
-        return omnata_system_columns_start + columns
+        # Return OMNATA system columns first, followed by sorted regular columns
+        return omnata_system_columns + sorted_columns
 
 
 class SnowflakeViewJoin(BaseModel):