omnata-plugin-runtime 0.2.24__tar.gz → 0.2.26__tar.gz

{omnata_plugin_runtime-0.2.24 → omnata_plugin_runtime-0.2.26}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.2.24"
+version = "0.2.26"
 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.2.24 → omnata_plugin_runtime-0.2.26}/src/omnata_plugin_runtime/plugin_entrypoints.py

@@ -98,6 +98,9 @@ class PluginEntrypoint:
         )
         api_limits = list(all_api_limits_by_category.values())
         return_dict = {}
+        logger.info(
+            f"Rate limits state: {json.dumps(request.rate_limits_state, default=pydantic.json.pydantic_encoder)}"
+        )
         (rate_limit_state_all, rate_limit_state_this_branch) = RateLimitState.collapse(request.rate_limits_state,request.sync_id, request.sync_branch_name)
         # if any endpoint categories have no state, give them an empty state
         for api_limit in api_limits:
@@ -109,9 +112,6 @@ class PluginEntrypoint:
                 rate_limit_state_this_branch[api_limit.endpoint_category] = RateLimitState(
                     wait_until=None, previous_request_timestamps=None
                 )
-        logger.info(
-            f"Rate limits state: {json.dumps(request.rate_limits_state, default=pydantic.json.pydantic_encoder)}"
-        )
 
         if request.sync_direction == "outbound":
             parameters = OutboundSyncConfigurationParameters(
@@ -133,7 +133,7 @@ class PluginEntrypoint:
                 results_schema_name=request.results_schema_name,
                 results_table_name=request.results_table_name,
                 plugin_instance=self._plugin_instance,
-                api_limits=request.api_limit_overrides,
+                api_limits=api_limits,
                 rate_limit_state_all=rate_limit_state_all,
                 rate_limit_state_this_sync_and_branch=rate_limit_state_this_branch,
                 run_deadline=datetime.datetime.now() + datetime.timedelta(hours=4),
@@ -168,7 +168,7 @@ class PluginEntrypoint:
                 results_schema_name=request.results_schema_name,
                 results_table_name=request.results_table_name,
                 plugin_instance=self._plugin_instance,
-                api_limits=request.api_limit_overrides,
+                api_limits=api_limits,
                 rate_limit_state_all=rate_limit_state_all,
                 rate_limit_state_this_sync_and_branch=rate_limit_state_this_branch,
                 run_deadline=datetime.datetime.now() + datetime.timedelta(hours=4),

{omnata_plugin_runtime-0.2.24 → omnata_plugin_runtime-0.2.26}/src/omnata_plugin_runtime/rate_limiting.py

@@ -173,7 +173,7 @@ class RateLimitState(SubscriptableBaseModel):
         """
         if other.wait_until is not None and (self.wait_until is None or other.wait_until > self.wait_until):
             self.wait_until = other.wait_until
-        if len(other.previous_request_timestamps) > 0:
+        if other.previous_request_timestamps is not None and len(other.previous_request_timestamps) > 0:
             self.previous_request_timestamps.extend(other.previous_request_timestamps)
             self.previous_request_timestamps.sort(reverse=True) # they should be sorted newest to oldest