omnata-plugin-runtime 0.10.7a253__tar.gz → 0.10.8a255__tar.gz

{omnata_plugin_runtime-0.10.7a253 → omnata_plugin_runtime-0.10.8a255}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omnata-plugin-runtime
-Version: 0.10.7a253
+Version: 0.10.8a255
 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.7a253 → omnata_plugin_runtime-0.10.8a255}/pyproject.toml

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

@@ -52,6 +52,9 @@ class JsonSchemaProperty(BaseModel):
     requiredStreamNames: Optional[List[str]] = Field(
         None, description="The names of the streams that are depended upon by this column, via joins. If these streams are not selected, the column will be omitted."
     )
+    referencedFields: Optional[Dict[str,List[str]]] = Field(
+        None, description="The names of fields that are referenced by this field, keyed on the stream name (or None if it's the current stream). This is used to order the fields, and also to cascade the removal of unsupported fields (e.g. in formulas)."
+    )
 
     @model_validator(mode='after')
     def validate(self) -> Self:
@@ -165,6 +168,9 @@ class SnowflakeViewColumn(BaseModel):
     required_stream_names: Optional[List[str]] = Field(
         default=None, description="The names of the streams that are depended upon by this column, via joins. If these streams are not selected, the column will be omitted"
     )
+    referenced_columns: Optional[Dict[str,List[str]]] = Field(
+        default=None, description="The names of columns that are referenced by this column, keyed on the stream name (or None if it's the current stream). This is used to order the columns, and also to cascade the removal of unsupported columns (e.g. in formulas)."
+    )
 
     def __repr__(self) -> str:
         return "SnowflakeViewColumn(name=%r, definition=%r, comment=%r)" % (
@@ -230,19 +236,23 @@ class SnowflakeViewColumn(BaseModel):
             if not json_schema_property.snowflakeColumnExpression:
                 expression=f"""{expression}::{json_schema_property.snowflake_data_type}"""
         required_stream_names = None
+        referenced_columns = None
         if json_schema_property.requiredStreamNames:
             required_stream_names = json_schema_property.requiredStreamNames
+        if json_schema_property.referencedFields:
+            referenced_columns = json_schema_property.referencedFields
         return cls(
             name=final_column_name,
             original_name=column_name,
             expression=expression,
             comment=comment,
             is_join_column=json_schema_property.isJoinColumn,
-            required_stream_names=required_stream_names
+            required_stream_names=required_stream_names,
+            referenced_columns=referenced_columns
         )
     
     @classmethod
-    def order_by_reference(cls,join_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
@@ -253,28 +263,24 @@ class SnowflakeViewColumn(BaseModel):
         columns_to_move:List[Self] = []
         # Collect Omnata System columns and keep them at the front
         omnata_system_columns_start = []
-        omnata_system_columns_end = []
-        for column in join_columns[:]:
-            if column.original_name=="OMNATA_APP_IDENTIFIER":
-                join_columns.remove(column)
+        for column in columns[:]:
+            if column.original_name.startswith("OMNATA_"):
+                columns.remove(column)
                 omnata_system_columns_start.append(column)
-            elif column.original_name.startswith("OMNATA_"):
-                join_columns.remove(column)
-                omnata_system_columns_end.append(column)
 
-        for column in join_columns:
-            for other_column in join_columns:
+        for column in columns:
+            for other_column in columns:
                 if column==other_column:
                     continue
-                if f'"{column.original_name}"' in other_column.expression:
+                if column.original_name in (other_column.referenced_columns or {}).get(current_stream_name,[]):
                     if column not in columns_to_move:
                         columns_to_move.append(column)
         
         # Move collected columns to the front
         for column in columns_to_move:
-            join_columns.remove(column)
-            join_columns.insert(0, column)
-        return omnata_system_columns_start + join_columns + omnata_system_columns_end
+            columns.remove(column)
+            columns.insert(0, column)
+        return omnata_system_columns_start + columns
 
 
 class SnowflakeViewJoin(BaseModel):
@@ -683,7 +689,7 @@ def normalized_view_part(
     #- APP_IDENTIFIER
     #- Direct and joined columns, ordered so that columns that reference other columns are defined after the columns they reference
     #- OMNATA_RETRIEVE_DATE, OMNATA_RAW_RECORD, OMNATA_IS_DELETED, OMNATA_RUN_ID
-    view_columns = SnowflakeViewColumn.order_by_reference(direct_view_columns +
+    view_columns = SnowflakeViewColumn.order_by_reference(stream_name,direct_view_columns +
                                                               join_view_columns)
     return SnowflakeViewPart(
         stream_name=stream_name,