omnata-plugin-runtime 0.10.27a284__tar.gz → 0.10.28__tar.gz

{omnata_plugin_runtime-0.10.27a284 → omnata_plugin_runtime-0.10.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.27a284
+Version: 0.10.28
 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.27a284 → omnata_plugin_runtime-0.10.28}/pyproject.toml

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

@@ -289,10 +289,29 @@ class SnowflakeViewColumn(BaseModel):
                     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)
         
         # Move collected columns to the front
-        for column in columns_to_move:
+        for column in columns_to_move_final:
             columns.remove(column)
             columns.insert(0, column)
         return omnata_system_columns_start + columns

{omnata_plugin_runtime-0.10.27a284 → omnata_plugin_runtime-0.10.28}/src/omnata_plugin_runtime/omnata_plugin.py

@@ -1889,7 +1889,15 @@ class OmnataPlugin(ABC):
                                 base_charge=additional_charge,
                             )
                         )
-        # handle monthly billing events inside the plugins for now
+            if request.ngrok_connections_inbound + request.ngrok_connections_outbound > 0:
+                events.append(
+                    SnowflakeBillingEvent(
+                        billing_class="DAILY_ACTIVE_NGROK",
+                        billing_subclass="",
+                        timestamp=datetime.datetime.now(tz=datetime.timezone.utc),
+                        base_charge=Decimal("3.00"),
+                    )
+                )
         return events
 
     def additional_loggers(self) -> List[str]: