omnata-plugin-runtime 0.10.7a248__py3-none-any.whl → 0.10.7a250__py3-none-any.whl

omnata_plugin_runtime/configuration.py

@@ -505,39 +505,44 @@ class InboundSyncStreamsConfiguration(SubscriptableBaseModel):
     @model_validator(mode='before')
     @classmethod
     def migrate_bulk_configuration(cls, data: Any) -> Any:
-        if 'sync_strategy_bulk_configuration' in data or 'storage_behaviour_bulk_configuration' in data:
+        if 'sync_strategy_bulk_configuration' in data \
+                and data['sync_strategy_bulk_configuration'] is not None \
+                and 'storage_behaviour_bulk_configuration' in data \
+                and data['storage_behaviour_bulk_configuration'] is not None:
             return data
-        if 'bulk_configuration' in data:
-            # Recently deprecated values
-            # AUTO_MERGE = "Auto / Merge changes" # Merge
-            # AUTO_APPEND = "Auto / Keep history"  # Append
-            # CUSTOMIZE = "Customize - choose sync behaviours for each object"
-            # Deprecated longer ago
-            # ALL_FULL_REPLACE = "All Objects - Full refresh / Replace"
-            # ALL_FULL_APPEND = "All Objects - Full refresh / Append"
-            # ALL_INCR_MERGE = "All Objects - Incremental / Merge"
-            # ALL_INCR_APPEND = "All Objects - Incremental / Append"
-            if data['bulk_configuration']== InboundSyncBulkConfiguration.AUTO_MERGE.value:
-                data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.AUTO.value
-                data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.MERGE.value
-            elif data['bulk_configuration']== InboundSyncBulkConfiguration.AUTO_APPEND.value:
-                data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.AUTO.value
-                data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.APPEND.value
-            elif data['bulk_configuration']== InboundSyncBulkConfiguration.CUSTOMIZE.value:
-                data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.MANUAL.value
-                data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.MANUAL.value
-            elif data['bulk_configuration']== InboundSyncBulkConfiguration.ALL_FULL_REPLACE.value:
-                data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.MANUAL.value
-                data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.MERGE.value
-            elif data['bulk_configuration']== InboundSyncBulkConfiguration.ALL_FULL_APPEND.value:
-                data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.MANUAL.value
-                data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.APPEND.value
-            elif data['bulk_configuration']== InboundSyncBulkConfiguration.ALL_INCR_MERGE.value:
-                data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.AUTO.value
-                data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.MERGE.value
-            elif data['bulk_configuration']== InboundSyncBulkConfiguration.ALL_INCR_APPEND.value:
-                data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.AUTO.value
-                data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.APPEND.value
+        if 'bulk_configuration' not in data:
+            # This was previously a default value
+            data['bulk_configuration'] = InboundSyncBulkConfiguration.CUSTOMIZE.value
+        # Recently deprecated values
+        # AUTO_MERGE = "Auto / Merge changes" # Merge
+        # AUTO_APPEND = "Auto / Keep history"  # Append
+        # CUSTOMIZE = "Customize - choose sync behaviours for each object"
+        # Deprecated longer ago
+        # ALL_FULL_REPLACE = "All Objects - Full refresh / Replace"
+        # ALL_FULL_APPEND = "All Objects - Full refresh / Append"
+        # ALL_INCR_MERGE = "All Objects - Incremental / Merge"
+        # ALL_INCR_APPEND = "All Objects - Incremental / Append"
+        if data['bulk_configuration']== InboundSyncBulkConfiguration.AUTO_MERGE.value:
+            data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.AUTO.value
+            data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.MERGE.value
+        elif data['bulk_configuration']== InboundSyncBulkConfiguration.AUTO_APPEND.value:
+            data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.AUTO.value
+            data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.APPEND.value
+        elif data['bulk_configuration']== InboundSyncBulkConfiguration.CUSTOMIZE.value:
+            data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.MANUAL.value
+            data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.MANUAL.value
+        elif data['bulk_configuration']== InboundSyncBulkConfiguration.ALL_FULL_REPLACE.value:
+            data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.MANUAL.value
+            data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.MERGE.value
+        elif data['bulk_configuration']== InboundSyncBulkConfiguration.ALL_FULL_APPEND.value:
+            data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.MANUAL.value
+            data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.APPEND.value
+        elif data['bulk_configuration']== InboundSyncBulkConfiguration.ALL_INCR_MERGE.value:
+            data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.AUTO.value
+            data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.MERGE.value
+        elif data['bulk_configuration']== InboundSyncBulkConfiguration.ALL_INCR_APPEND.value:
+            data['sync_strategy_bulk_configuration']= InboundSyncStrategyBulkConfiguration.AUTO.value
+            data['storage_behaviour_bulk_configuration']= InboundStorageBehaviourBulkConfiguration.APPEND.value
             # remove this once the old UI is deprecated
             #del data['bulk_configuration']
         return data

omnata_plugin_runtime/json_schema.py

@@ -252,11 +252,15 @@ 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 = []
+        omnata_system_columns_start = []
+        omnata_system_columns_end = []
         for column in join_columns[:]:
-            if column.original_name.startswith("OMNATA_"):
+            if column.original_name=="OMNATA_APP_IDENTIFIER":
                 join_columns.remove(column)
-                omnata_system_columns.append(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:
@@ -268,7 +272,7 @@ class SnowflakeViewColumn(BaseModel):
         for column in columns_to_move:
             join_columns.remove(column)
             join_columns.insert(0, column)
-        return omnata_system_columns + join_columns
+        return omnata_system_columns_start + join_columns + omnata_system_columns_end
 
 
 class SnowflakeViewJoin(BaseModel):

{omnata_plugin_runtime-0.10.7a248.dist-info → omnata_plugin_runtime-0.10.7a250.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
 omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTwRpBA,1576
 omnata_plugin_runtime/api.py,sha256=baGraSMiD4Yvi3ZWrEv_TKh8Ktd1U8riBdOpe9j0Puw,8202
-omnata_plugin_runtime/configuration.py,sha256=m2a4HrqJjezjmnrnuOjUxnUzzj1bq1wy3PM-uaAnagg,46561
+omnata_plugin_runtime/configuration.py,sha256=0rfIGv8rCu8OwL7m-VOXIBjd05iyaBWRdt2h9o6scwo,46754
 omnata_plugin_runtime/forms.py,sha256=9YHJ_T17lT-rwyDaUg_0yj_YMPda4DRCw_wrvf8hE0E,19964
-omnata_plugin_runtime/json_schema.py,sha256=HOLJgP4LdfhtWb9BnIZtvgRngbhttTtX5CX0h_6E3Ts,30668
+omnata_plugin_runtime/json_schema.py,sha256=Kng9tCG4vHkt-p8XUuvTrzYXudmc8r0dgvQVQn6KrAs,30918
 omnata_plugin_runtime/logging.py,sha256=WBuZt8lF9E5oFWM4KYQbE8dDJ_HctJ1pN3BHwU6rcd0,4461
 omnata_plugin_runtime/omnata_plugin.py,sha256=M0b6f9lKKEoEI0zf-ZwZcIPKPQTmHTIMhvcrBc94Mhg,133278
 omnata_plugin_runtime/plugin_entrypoints.py,sha256=iqGl8_nEEnPGKg3Aem4YLSQ6d5xS3ju5gq8MJbx6sCA,31968
 omnata_plugin_runtime/rate_limiting.py,sha256=qpr5esU4Ks8hMzuMpSR3gLFdor2ZUXYWCjmsQH_K6lQ,25882
-omnata_plugin_runtime-0.10.7a248.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.10.7a248.dist-info/METADATA,sha256=i8umwqdSx4J_H-cgXKMHHurCLvUpqt113kb04CyZ4CE,2211
-omnata_plugin_runtime-0.10.7a248.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-omnata_plugin_runtime-0.10.7a248.dist-info/RECORD,,
+omnata_plugin_runtime-0.10.7a250.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.10.7a250.dist-info/METADATA,sha256=cArWu-lk5ftYw5xTFkzgtm2PJVYMYOg6lB4kKEbCOYU,2211
+omnata_plugin_runtime-0.10.7a250.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+omnata_plugin_runtime-0.10.7a250.dist-info/RECORD,,