omnata-plugin-runtime 0.5.3__tar.gz → 0.5.4__tar.gz

{omnata_plugin_runtime-0.5.3 → omnata_plugin_runtime-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.5.3
+Version: 0.5.4
 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.5.3 → omnata_plugin_runtime-0.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.5.3"
+version = "0.5.4"
 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.5.3 → omnata_plugin_runtime-0.5.4}/src/omnata_plugin_runtime/configuration.py

@@ -8,7 +8,7 @@ from typing import Any, List, Dict, Literal, Union, Optional
 from enum import Enum
 
 from abc import ABC
-from pydantic import BaseModel, Field, PrivateAttr, SerializationInfo, model_serializer, validator  # pylint: disable=no-name-in-module
+from pydantic import BaseModel, Field, PrivateAttr, SerializationInfo, field_validator, model_serializer, validator  # pylint: disable=no-name-in-module
 
 if tuple(sys.version_info[:2]) >= (3, 9):
     # Python 3.9 and above
@@ -449,6 +449,13 @@ class StoredStreamConfiguration(SubscriptableBaseModel):
     stream: StreamConfiguration
     latest_state: dict = Field(default_factory=dict,description="The latest state of the stream, used for incremental syncs")
 
+    @field_validator('latest_state',mode='before')
+    @classmethod
+    def state_must_not_be_none(cls, v: Optional[dict]) -> dict:
+        if v is None:
+            return {}
+        return v
+
 
 class StreamConfiguration(SubscriptableBaseModel):
     """

{omnata_plugin_runtime-0.5.3 → omnata_plugin_runtime-0.5.4}/src/omnata_plugin_runtime/forms.py

@@ -209,7 +209,7 @@ class FormSliderField(SubscriptableBaseModel):
 
     name: str
     label: str
-    default_value: Optional[str] = Field(default=None)
+    default_value: Optional[Union[str,int]] = Field(default=None)
     secret: bool = Field(default=False)
     required: bool = Field(default=False)
     depends_on: Optional[str] = Field(default=None)

{omnata_plugin_runtime-0.5.3 → omnata_plugin_runtime-0.5.4}/src/omnata_plugin_runtime/omnata_plugin.py

@@ -1007,20 +1007,23 @@ class InboundSyncRequest(SyncRequest):
         """
         Sends a message to the plugin with the current progress of the sync run, if it has changed since last time.
         """
-        new_progress_update = PluginMessageStreamProgressUpdate(
-                stream_total_counts=self._stream_record_counts,
-                completed_streams=self._completed_streams,
-                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
-            )
-            if result is None:
-                return False
-            self._last_stream_progress_update = new_progress_update
+        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
+                )
+                if result is None:
+                    return False
+                self._last_stream_progress_update = new_progress_update
         return True
 
     def apply_cancellation(self):
@@ -2042,9 +2045,13 @@ def __managed_inbound_processing_worker(
             # restore the first argument, was originally the dataframe/generator but now it's the appropriately sized dataframe
             try:
                 logger.info(f"worker {worker_index} processing stream {stream.stream_name}, invoking plugin class method {method.__name__}")
-                method(plugin_class_obj, *(stream, *method_args), **method_kwargs)
-                logger.info(f"worker {worker_index} completed processing stream {stream.stream_name}, marking as complete")
-                plugin_class_obj._sync_request.mark_stream_complete(stream.stream_name)
+                result = method(plugin_class_obj, *(stream, *method_args), **method_kwargs)
+                logger.info(f"worker {worker_index} completed processing stream {stream.stream_name}")
+                if result is not None and result is False:
+                    logger.info(f"worker {worker_index} requested that {stream.stream_name} be not marked as complete")
+                else:
+                    logger.info(f"worker {worker_index} marking stream {stream.stream_name} as complete")
+                    plugin_class_obj._sync_request.mark_stream_complete(stream.stream_name)
             except InterruptedWhileWaitingException:
                 # If an inbound run is cancelled while waiting for rate limiting, this should mean that
                 # the cancellation is handled elsewhere, so we don't need to do anything special here other than stop waiting