omnata-plugin-runtime 0.3.19a61__py3-none-any.whl → 0.3.20__py3-none-any.whl

omnata_plugin_runtime/configuration.py

@@ -31,12 +31,13 @@ class SyncDirection(str, Enum):
 class InboundStorageBehaviour(str, Enum):
     APPEND = "append"
     MERGE = "merge"
-    REPLACE = "replace"
+    REPLACE = "replace" # now deprecated, full refreshes now use merge
 
 
 class InboundSyncStrategy(str, Enum):
     FULL_REFRESH = "Full Refresh"
     INCREMENTAL = "Incremental"
+    AUTO = "Auto" # not valid as an individual stream choice, only when referring to a forward preference (new_stream_sync_strategy)
 
 
 class InboundSyncBulkConfiguration(str, Enum):

omnata_plugin_runtime/omnata_plugin.py

@@ -924,13 +924,8 @@ class InboundSyncRequest(SyncRequest):
                     self._apply_results[stream_name] = None
                 self._apply_results = {}
                 # update the inbound stream record counts, so we can see progress
-                self._plugin_message(
-                    message=PluginMessageStreamProgressUpdate(
-                        stream_total_counts=self._stream_record_counts,
-                        completed_streams=self._completed_streams,
-                        stream_errors=self._omnata_log_handler.stream_global_errors
-                    )
-                )
+                self.apply_progress_updates()
+                
         # also take care of uploading delete requests
         if hasattr(self,'_apply_results_criteria_deletes') and self._apply_results_criteria_deletes is not None:
             with self._apply_results_lock:
@@ -947,6 +942,21 @@ class InboundSyncRequest(SyncRequest):
                     all_dfs = pandas.concat(results)
                     #logger.info(f"applying: {all_dfs}")
                     self._apply_criteria_deletes_dataframe(all_dfs)
+                    # clear the delete requests
+                    self._apply_results_criteria_deletes = {}
+    
+    def apply_progress_updates(self):
+        """
+        Sends a message to the plugin with the current progress of the sync run.
+        """
+        # TODO: Only send them if they have changed since last time
+        self._plugin_message(
+            message=PluginMessageStreamProgressUpdate(
+                stream_total_counts=self._stream_record_counts,
+                completed_streams=self._completed_streams,
+                stream_errors=self._omnata_log_handler.stream_global_errors
+            )
+        )
 
     def apply_cancellation(self):
         """

omnata_plugin_runtime/plugin_entrypoints.py

@@ -210,6 +210,7 @@ class PluginEntrypoint:
                     logger.info("Calling apply_results_queue")
                     inbound_sync_request.apply_results_queue()
                     inbound_sync_request.apply_rate_limit_state()
+                    inbound_sync_request.apply_progress_updates()
                 if inbound_sync_request.deadline_reached:
                     # if we actually hit the deadline, this is flagged by the cancellation checking worker and the cancellation
                     # token is set. We throw it here as an error since that's currently how it flows back to the engine with a DELAYED state

{omnata_plugin_runtime-0.3.19a61.dist-info → omnata_plugin_runtime-0.3.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.3.19a61
+Version: 0.3.20
 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.3.20.dist-info/RECORD

@@ -0,0 +1,12 @@
+omnata_plugin_runtime/__init__.py,sha256=w63LVME5nY-hQ4BBzfacy9kvTunwqHGs8iiSPGAX2ns,1214
+omnata_plugin_runtime/api.py,sha256=_N5ok5LN7GDO4J9n3yduXp3tpjmhpySY__U2baiygrs,6217
+omnata_plugin_runtime/configuration.py,sha256=AY_hHBd283VHx_rU9TzUol5VTzA6PHxxTltYWV7clCg,35113
+omnata_plugin_runtime/forms.py,sha256=pw_aKVsXSz47EP8PFBI3VDwdSN5IjvZxp8JTjO1V130,18421
+omnata_plugin_runtime/logging.py,sha256=bn7eKoNWvtuyTk7RTwBS9UARMtqkiICtgMtzq3KA2V0,3272
+omnata_plugin_runtime/omnata_plugin.py,sha256=9t17Ug94v0IdXzUNx27v_U0itUVQV3k0Tqqx5b-djwE,99609
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=s-SrUnXaS6FaBq1igiJhcCB3Md_a6op-dp_g1H_55QU,27736
+omnata_plugin_runtime/rate_limiting.py,sha256=se6MftQI5NrVHaLb1hByPCgAESPQhkAgIG7KIU1clDU,16562
+omnata_plugin_runtime-0.3.20.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+omnata_plugin_runtime-0.3.20.dist-info/METADATA,sha256=KYTr76x2AGYfw0Rrn0GyhPM_-o0i0u5Yx_Ymp0TmS44,1601
+omnata_plugin_runtime-0.3.20.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+omnata_plugin_runtime-0.3.20.dist-info/RECORD,,

omnata_plugin_runtime-0.3.19a61.dist-info/RECORD

@@ -1,12 +0,0 @@
-omnata_plugin_runtime/__init__.py,sha256=w63LVME5nY-hQ4BBzfacy9kvTunwqHGs8iiSPGAX2ns,1214
-omnata_plugin_runtime/api.py,sha256=_N5ok5LN7GDO4J9n3yduXp3tpjmhpySY__U2baiygrs,6217
-omnata_plugin_runtime/configuration.py,sha256=mXYD4X9VJWqYFTvFDFqJOntULSLD5OMpTpgA8QiIzPc,34933
-omnata_plugin_runtime/forms.py,sha256=pw_aKVsXSz47EP8PFBI3VDwdSN5IjvZxp8JTjO1V130,18421
-omnata_plugin_runtime/logging.py,sha256=bn7eKoNWvtuyTk7RTwBS9UARMtqkiICtgMtzq3KA2V0,3272
-omnata_plugin_runtime/omnata_plugin.py,sha256=hygZU0EwuFmob-LAL57C_tj8Ft_OTQ81NoEZkEqHppc,99276
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=_XgmWsrHoSshkl5Z2T27BAGVnBh4yH-8lni5sdGlSz8,27670
-omnata_plugin_runtime/rate_limiting.py,sha256=se6MftQI5NrVHaLb1hByPCgAESPQhkAgIG7KIU1clDU,16562
-omnata_plugin_runtime-0.3.19a61.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-omnata_plugin_runtime-0.3.19a61.dist-info/METADATA,sha256=GPQijTx4qqhvgJNnBWZjN4gAXtv6xaQdOvnjKtms8UI,1604
-omnata_plugin_runtime-0.3.19a61.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-omnata_plugin_runtime-0.3.19a61.dist-info/RECORD,,