omnata-plugin-runtime 0.5.3__py3-none-any.whl → 0.5.4__py3-none-any.whl

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/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/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

{omnata_plugin_runtime-0.5.3.dist-info → omnata_plugin_runtime-0.5.4.dist-info}/METADATA

@@ -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.4.dist-info/RECORD

@@ -0,0 +1,12 @@
+omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTwRpBA,1576
+omnata_plugin_runtime/api.py,sha256=FxzTqri4no8ClkOm7vZADG8aD47jcGBCTTQDEORmOJM,6326
+omnata_plugin_runtime/configuration.py,sha256=g_p8z0b23FQInlAaPuLIxpH_qoAbaEZp2ZL3m7Xml-A,36631
+omnata_plugin_runtime/forms.py,sha256=GzSPEwcijsoPCXEO1mHiE8ylvX_KSE5TkhwqkymA2Ss,19755
+omnata_plugin_runtime/logging.py,sha256=bn7eKoNWvtuyTk7RTwBS9UARMtqkiICtgMtzq3KA2V0,3272
+omnata_plugin_runtime/omnata_plugin.py,sha256=XyiWPEFKoH0H8bYuTVgTacpL5OM2K3lVRjlayENuR9A,111528
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=JirYUbPBaN0UMh9t_uAHDdhaQZ7NUhdMJ11eHRKOoNY,29302
+omnata_plugin_runtime/rate_limiting.py,sha256=DVQ_bc-mVLBkrU1PTns1MWXhHiLpSB5HkWCcdePtJ2A,25611
+omnata_plugin_runtime-0.5.4.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+omnata_plugin_runtime-0.5.4.dist-info/METADATA,sha256=WplHHMcEM4pLjgbYACc2B4d8oYsADqDIcP7BSLn6qb8,1947
+omnata_plugin_runtime-0.5.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+omnata_plugin_runtime-0.5.4.dist-info/RECORD,,

omnata_plugin_runtime-0.5.3.dist-info/RECORD

@@ -1,12 +0,0 @@
-omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTwRpBA,1576
-omnata_plugin_runtime/api.py,sha256=FxzTqri4no8ClkOm7vZADG8aD47jcGBCTTQDEORmOJM,6326
-omnata_plugin_runtime/configuration.py,sha256=4eKYhw6_l-RUVUwNU5NlTpPwL7xZRs6VLaCKf8OIKuY,36420
-omnata_plugin_runtime/forms.py,sha256=42o3DJnnxJ-W92pNaF5MuawvDPUK5O0azvn80HDxTZM,19744
-omnata_plugin_runtime/logging.py,sha256=bn7eKoNWvtuyTk7RTwBS9UARMtqkiICtgMtzq3KA2V0,3272
-omnata_plugin_runtime/omnata_plugin.py,sha256=zIk8dS5m4pXsVy_2im-Cd-t1uQV9hf1seosb1T2jGGs,110880
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=JirYUbPBaN0UMh9t_uAHDdhaQZ7NUhdMJ11eHRKOoNY,29302
-omnata_plugin_runtime/rate_limiting.py,sha256=DVQ_bc-mVLBkrU1PTns1MWXhHiLpSB5HkWCcdePtJ2A,25611
-omnata_plugin_runtime-0.5.3.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-omnata_plugin_runtime-0.5.3.dist-info/METADATA,sha256=NjxZcT3Dc8AZ44OHNjr1LYIyIO9Mt3mCrh45kd9zlf4,1947
-omnata_plugin_runtime-0.5.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-omnata_plugin_runtime-0.5.3.dist-info/RECORD,,