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

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

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

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