omnata-plugin-runtime 0.11.0a306__tar.gz → 0.11.0a308__tar.gz

{omnata_plugin_runtime-0.11.0a306 → omnata_plugin_runtime-0.11.0a308}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.11.0-a306"
+version = "0.11.0-a308"
 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.11.0a306 → omnata_plugin_runtime-0.11.0a308}/src/omnata_plugin_runtime/omnata_plugin.py

@@ -1205,31 +1205,29 @@ class InboundSyncRequest(SyncRequest):
         """
         Sends a message to the plugin with the current progress of the sync run, if it has changed since last time.
         """
-        if self._apply_results is not None:
-            with self._apply_results_lock:
-                new_progress_update = PluginMessageStreamProgressUpdate(
-                        stream_total_counts=self._stream_record_counts,
-                        # records could have been marked as completed, but still have results to apply
-                        completed_streams=[s for s in self._completed_streams if s not in self._apply_results or self._apply_results[s] is None],
-                        stream_errors=self._omnata_log_handler.stream_global_errors,
-                        total_records_estimate=self._total_records_estimate
-                    )
-            if self._last_stream_progress_update is None or new_progress_update != self._last_stream_progress_update:
-                result = self._plugin_message(
-                    message=new_progress_update,
-                    ignore_errors=ignore_errors
+        with self._apply_results_lock:
+            new_progress_update = PluginMessageStreamProgressUpdate(
+                    stream_total_counts=self._stream_record_counts,
+                    # records could have been marked as completed, but still have results to apply
+                    completed_streams=[s for s in self._completed_streams if s not in self._apply_results or self._apply_results[s] is None],
+                    stream_errors=self._omnata_log_handler.stream_global_errors,
+                    total_records_estimate=self._total_records_estimate
                 )
-                if result is None:
-                    return False
-                self._last_stream_progress_update = new_progress_update
-            else:
-                completed_streams_awaiting_results_upload = [
-                    s for s in self._completed_streams if s in self._apply_results and self._apply_results[s] is not None
-                ]
-                for completed_stream_awaiting_results_upload in completed_streams_awaiting_results_upload:
-                    logger.debug(
-                        f"Stream {completed_stream_awaiting_results_upload} is marked as completed but awaiting upload of {len(self._apply_results[completed_stream_awaiting_results_upload])} results"
-                    )
+        if self._last_stream_progress_update is None or new_progress_update != self._last_stream_progress_update:
+            result = self._plugin_message(
+                message=new_progress_update,
+                ignore_errors=ignore_errors
+            )
+            if result is None:
+                return False
+            self._last_stream_progress_update = new_progress_update
+        else:
+            completed_streams_awaiting_results_upload = [
+                s for s in self._completed_streams if s in self._apply_results and self._apply_results[s] is not None
+            ]
+            logger.debug(
+                f"Streams marked as completed but awaiting upload: {', '.join(completed_streams_awaiting_results_upload)}"
+            )
         return True
 
     def apply_cancellation(self):
@@ -1355,6 +1353,7 @@ class InboundSyncRequest(SyncRequest):
         Marks a stream as completed, this is called automatically per stream when using @managed_inbound_processing.
         If @managed_inbound_processing is not used, call this whenever a stream has finished recieving records.
         """
+        logger.debug(f"Marking stream {stream_name} as completed locally")
         self._completed_streams.append(stream_name)
         # dedup just in case it's called twice
         self._completed_streams = list(set(self._completed_streams))