omnata-plugin-runtime 0.10.7a247__tar.gz → 0.10.7a248__tar.gz

{omnata_plugin_runtime-0.10.7a247 → omnata_plugin_runtime-0.10.7a248}/PKG-INFO

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

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

@@ -251,6 +251,13 @@ class SnowflakeViewColumn(BaseModel):
         
         # Collect columns to be moved
         columns_to_move:List[Self] = []
+        # Collect Omnata System columns and keep them at the front
+        omnata_system_columns = []
+        for column in join_columns[:]:
+            if column.original_name.startswith("OMNATA_"):
+                join_columns.remove(column)
+                omnata_system_columns.append(column)
+
         for column in join_columns:
             for other_column in join_columns:
                 if f'"{column.original_name}"' in other_column.expression:
@@ -261,7 +268,7 @@ class SnowflakeViewColumn(BaseModel):
         for column in columns_to_move:
             join_columns.remove(column)
             join_columns.insert(0, column)
-        return join_columns
+        return omnata_system_columns + join_columns
 
 
 class SnowflakeViewJoin(BaseModel):
@@ -369,13 +376,13 @@ class SnowflakeViewPart(BaseModel):
         """
         Returns the columns that are not sourced from joins.
         """
-        return SnowflakeViewColumn.order_by_reference([c for c in self.columns if not c.is_join_column])
+        return [c for c in self.columns if not c.is_join_column]
 
     def join_columns(self) -> List[SnowflakeViewColumn]:
         """
         Returns the columns that are sourced from joins.
         """
-        return SnowflakeViewColumn.order_by_reference([c for c in self.columns if c.is_join_column])
+        return [c for c in self.columns if c.is_join_column]
 
     def comment_clause(self) -> str:
         """
@@ -431,12 +438,16 @@ class SnowflakeViewParts(BaseModel):
         final_cte = f""" OMNATA_FINAL_CTE as (
             select {', '.join(
             [
-                f'"{c.original_name}"' for c in self.main_part.direct_columns()
+                f'"{self.main_part.stream_name}"."{c.original_name}"' for c in self.main_part.direct_columns()
             ]+[
                 c.definition(original_name=True) for c in self.main_part.join_columns()
             ])}
-            from "{self.main_part.stream_name}"
-        ) """
+            from "{self.main_part.stream_name}" """
+        if len(self.main_part.joins) > 0:
+            join_clauses = [join.definition() for join in self.main_part.joins]
+            final_cte += "\n" + ("\n".join(join_clauses))
+        final_cte += ")"
+
         ctes.append(final_cte)
         all_ctes = "\n,".join(ctes)
         main_columns:List[SnowflakeViewColumn] = SnowflakeViewColumn.order_by_reference(self.main_part.direct_columns() +
@@ -447,9 +458,7 @@ class SnowflakeViewParts(BaseModel):
         view_body = f"""with {all_ctes}
     select {', '.join(column_clauses)}
     from OMNATA_FINAL_CTE """
-        if len(self.main_part.joins) > 0:
-            join_clauses = [join.definition() for join in self.main_part.joins]
-            view_body += "\n" + ("\n".join(join_clauses))
+        
         return view_body
 
     @classmethod