omnata-plugin-runtime 0.11.2a317__py3-none-any.whl → 0.11.4a320__py3-none-any.whl

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):

omnata_plugin_runtime/omnata_plugin.py

@@ -1858,6 +1858,40 @@ class OmnataPlugin(ABC):
         raise NotImplementedError(
             "Your plugin class must implement the inbound_configuration_form method"
         )
+
+    def outbound_tuning_parameters(
+        self, parameters: OutboundSyncConfigurationParameters
+    ) -> OutboundSyncConfigurationForm:
+        """
+        Returns the form definition for declaring outbound tuning parameters.
+
+        The returned form should consist of static fields with default values that represent the
+        plugin's recommended runtime behaviour. This form is optional and is only rendered when a
+        user opts to override those defaults at sync runtime, so it must be safe to fall back to the
+        provided defaults when no tuning parameters are configured.
+
+        :param OutboundSyncConfigurationParameters parameters the current outbound configuration
+        :return: An OutboundSyncConfigurationForm describing the available tuning parameters
+        :rtype: OutboundSyncConfigurationForm
+        """
+        return OutboundSyncConfigurationForm(fields=[])
+
+    def inbound_tuning_parameters(
+        self, parameters: InboundSyncConfigurationParameters
+    ) -> InboundSyncConfigurationForm:
+        """
+        Returns the form definition for declaring inbound tuning parameters.
+
+        The returned form should consist of static fields with default values that represent the
+        plugin's recommended runtime behaviour. This form is optional and is only rendered when a
+        user opts to override those defaults at sync runtime, so it must be safe to fall back to the
+        provided defaults when no tuning parameters are configured.
+
+        :param InboundSyncConfigurationParameters parameters the current inbound configuration
+        :return: An InboundSyncConfigurationForm describing the available tuning parameters
+        :rtype: InboundSyncConfigurationForm
+        """
+        return InboundSyncConfigurationForm(fields=[])
     
     def inbound_stream_list(
         self, parameters: InboundSyncConfigurationParameters

{omnata_plugin_runtime-0.11.2a317.dist-info → omnata_plugin_runtime-0.11.4a320.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omnata-plugin-runtime
-Version: 0.11.2a317
+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.2a317.dist-info → omnata_plugin_runtime-0.11.4a320.dist-info}/RECORD

@@ -2,12 +2,12 @@ omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTw
 omnata_plugin_runtime/api.py,sha256=5gbjbnFy72Xjf0E3kbG23G0V2J3CorvD5kpBn_BkdlI,8084
 omnata_plugin_runtime/configuration.py,sha256=SffokJfgvy6V3kUsoEjXcK3GdNgHo6U3mgBEs0qBv4I,46972
 omnata_plugin_runtime/forms.py,sha256=Lrbr3otsFDrvHWJw7v-slsW4PvEHJ6BG1Yl8oaJfiDo,20529
-omnata_plugin_runtime/json_schema.py,sha256=6Hj5SBAW3_moHtCZhVynOUUxCiIIETroCjKFFpPMGJM,54879
+omnata_plugin_runtime/json_schema.py,sha256=HGqqsJGzKT7PSW2re4teyGTiTv-ytEhOSzuvubiz-uY,54826
 omnata_plugin_runtime/logging.py,sha256=WBuZt8lF9E5oFWM4KYQbE8dDJ_HctJ1pN3BHwU6rcd0,4461
-omnata_plugin_runtime/omnata_plugin.py,sha256=PV1BzsqI2yi3pd6DBSRc1s1QJ_My-b6pewrB7ad4sms,140256
+omnata_plugin_runtime/omnata_plugin.py,sha256=xqAIxFdb2X4ryK4VetQxI4u4UdMyN2xs4toLHKasIdU,142045
 omnata_plugin_runtime/plugin_entrypoints.py,sha256=_1pDLov3iQorGmfcae8Sw2bVjxw1vYeowBaKKNzRclQ,32629
 omnata_plugin_runtime/rate_limiting.py,sha256=qpr5esU4Ks8hMzuMpSR3gLFdor2ZUXYWCjmsQH_K6lQ,25882
-omnata_plugin_runtime-0.11.2a317.dist-info/METADATA,sha256=vQ1Z_h_geCijwFZGpPaN9IshKj5rta5U4HB-jdffjJ8,2233
-omnata_plugin_runtime-0.11.2a317.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-omnata_plugin_runtime-0.11.2a317.dist-info/licenses/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.11.2a317.dist-info/RECORD,,
+omnata_plugin_runtime-0.11.4a320.dist-info/METADATA,sha256=aUfwo3Fm2tXpcbXwnSA2eIMj91E266MknaHA3zAAVMg,2233
+omnata_plugin_runtime-0.11.4a320.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+omnata_plugin_runtime-0.11.4a320.dist-info/licenses/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.11.4a320.dist-info/RECORD,,