omnata-plugin-runtime 0.2.34__py3-none-any.whl → 0.2.39__py3-none-any.whl

omnata_plugin_runtime/omnata_plugin.py

@@ -20,7 +20,7 @@ import jinja2
 import pandas
 import pydantic
 import pydantic.json
-from pydantic import parse_obj_as
+from pydantic import parse_obj_as, root_validator
 from dateutil.parser import parse
 from jinja2 import Environment
 from pydantic import BaseModel  # pylint: disable=no-name-in-module
@@ -297,7 +297,9 @@ class SyncRequest(ABC):
         # rate limiting windows than this one, but it's fairly unlikely users would override defaults to that extent
         if self.rate_limit_state_this_sync_and_branch is not None:
             for endpoint_category in self.rate_limit_state_this_sync_and_branch:
-                self.rate_limit_state_this_sync_and_branch[endpoint_category].prune_history(self.api_limits)
+                api_limits_for_category = [x for x in self.api_limits if x.endpoint_category == endpoint_category]
+                if len(api_limits_for_category) > 0:
+                    self.rate_limit_state_this_sync_and_branch[endpoint_category].prune_history(api_limits_for_category[0].request_rates)
             logger.info(f"Updating rate limit state for sync {self._run_id}")
             update_rate_limit_result = self._plugin_message(
                 PluginMessageRateLimitState(rate_limit_state=self.rate_limit_state_this_sync_and_branch)
@@ -1142,12 +1144,25 @@ class SnowflakeBillingEvent(BaseModel):
 
     billing_class: str
     base_charge: Decimal
-    timestamp: datetime.datetime = datetime.datetime.now()
+    timestamp: datetime.datetime = datetime.datetime.now(tz=datetime.timezone.utc)
     sub_class: Optional[str] = None
     start_timestamp: Optional[datetime.datetime] = None
     objects: List[str] = []
     additional_info: Dict[str, Any] = {}
 
+    @root_validator(pre=True)
+    def validate_datetime_fields(cls, values):
+        # Handling timestamps, we want to be strict on supplying a timezone
+        timestamp = values.get('timestamp')
+        if timestamp is not None and isinstance(timestamp, datetime.datetime):
+            if timestamp.tzinfo is None or timestamp.tzinfo.utcoffset(timestamp) is None:
+                raise ValueError("timestamp must be timezone aware")
+        
+        start_timestamp = values.get('start_timestamp')
+        if start_timestamp is not None and isinstance(start_timestamp, datetime.datetime):
+            if start_timestamp.tzinfo is None or start_timestamp.tzinfo.utcoffset(start_timestamp) is None:
+                raise ValueError("start_timestamp must be timezone aware")
+
 class BillingEventRequest(BaseModel):
     """
     Represents a request to provide billing events for that day.
@@ -1174,6 +1189,8 @@ class OmnataPlugin(ABC):
         # the current parameters are available here for the benefit of jinja filters,
         # so that they don't get in the way of the other function arguments
         self._configuration_parameters: Optional[SyncConfigurationParameters] = None
+        # the Snowpark session shouldn't need to be used, ordinarily
+        self._session: Optional[Session] = None
     
 
     @abstractmethod

omnata_plugin_runtime/plugin_entrypoints.py

@@ -58,6 +58,7 @@ class PluginEntrypoint:
         module = importlib.import_module(module_name)
         class_obj = getattr(module, class_name)
         self._plugin_instance: OmnataPlugin = class_obj()
+        self._plugin_instance._session = session  # pylint: disable=protected-access
 
     def sync(self, sync_request: Dict):
         logger.info("Entered sync method")

omnata_plugin_runtime/rate_limiting.py

@@ -134,13 +134,9 @@ class ApiLimits(SubscriptableBaseModel):
         for request_rate in self.request_rates:
             if rate_limit_state.previous_request_timestamps is not None and len(rate_limit_state.previous_request_timestamps) > 0:
                 request_index = request_rate.request_count - 1
-                if len(rate_limit_state.previous_request_timestamps) < request_index:
-                    request_index = (
-                        len(rate_limit_state.previous_request_timestamps) - 1
-                    )
-                timestamp_at_horizon = rate_limit_state.previous_request_timestamps[
-                    request_index
-                ]
+                if request_index > len(rate_limit_state.previous_request_timestamps) - 1:
+                    request_index = len(rate_limit_state.previous_request_timestamps) - 1
+                timestamp_at_horizon = rate_limit_state.previous_request_timestamps[request_index]
                 next_allowed_request = timestamp_at_horizon + datetime.timedelta(
                     seconds=request_rate.number_of_seconds()
                 )

{omnata_plugin_runtime-0.2.34.dist-info → omnata_plugin_runtime-0.2.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.2.34
+Version: 0.2.39
 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.39.dist-info/RECORD

@@ -0,0 +1,12 @@
+omnata_plugin_runtime/__init__.py,sha256=w63LVME5nY-hQ4BBzfacy9kvTunwqHGs8iiSPGAX2ns,1214
+omnata_plugin_runtime/api.py,sha256=vKq7goVPX5cPQ9CVN9l8RmpJDcqDwS5y9v1IWhWjBbk,6024
+omnata_plugin_runtime/configuration.py,sha256=D5y3IxGpI3a5B7cGHWRgCy-V7PD-nvnk-r3tWr8lVB8,31506
+omnata_plugin_runtime/forms.py,sha256=a76q0mZep-Q1XYw0c0uXA0_qbYLwQGAwHZMpZ8125Is,15235
+omnata_plugin_runtime/logging.py,sha256=Q6eSqrr3SzwfVAg4r4sV1dlxeNS_PzOtZfieoWUEOZQ,3232
+omnata_plugin_runtime/omnata_plugin.py,sha256=It1j9NmEHslcpmSzqJ49lPu2SW7Gl43G3bfYw1FrBhk,84156
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=_mU2iDEoRtLElO7c5c6WW9qvaOg6Lu7EV-wxkLFmPZA,22798
+omnata_plugin_runtime/rate_limiting.py,sha256=QO8VB1H8al6a8-ydohUmL0c5JynXG2bulmuPRs2-2-Y,14910
+omnata_plugin_runtime-0.2.39.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+omnata_plugin_runtime-0.2.39.dist-info/METADATA,sha256=2EaZZOfZr_ewnSsXH0cODK8Abp97EY1qITVSmcj8lng,1086
+omnata_plugin_runtime-0.2.39.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+omnata_plugin_runtime-0.2.39.dist-info/RECORD,,

omnata_plugin_runtime-0.2.34.dist-info/RECORD

@@ -1,12 +0,0 @@
-omnata_plugin_runtime/__init__.py,sha256=w63LVME5nY-hQ4BBzfacy9kvTunwqHGs8iiSPGAX2ns,1214
-omnata_plugin_runtime/api.py,sha256=vKq7goVPX5cPQ9CVN9l8RmpJDcqDwS5y9v1IWhWjBbk,6024
-omnata_plugin_runtime/configuration.py,sha256=D5y3IxGpI3a5B7cGHWRgCy-V7PD-nvnk-r3tWr8lVB8,31506
-omnata_plugin_runtime/forms.py,sha256=a76q0mZep-Q1XYw0c0uXA0_qbYLwQGAwHZMpZ8125Is,15235
-omnata_plugin_runtime/logging.py,sha256=Q6eSqrr3SzwfVAg4r4sV1dlxeNS_PzOtZfieoWUEOZQ,3232
-omnata_plugin_runtime/omnata_plugin.py,sha256=ZRVDOwxwEcFsEuYfLYSbOFeN51PbTbsn0p01R1YD33w,83027
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=wmXOwJl9ACN2gjDV-hDN9WSHDSy6UK1gGXgsLMqqoKs,22713
-omnata_plugin_runtime/rate_limiting.py,sha256=P5tjl50-mjUPZC8jaIfvkzq-0gezRKtmFffo1iQK_T4,14992
-omnata_plugin_runtime-0.2.34.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-omnata_plugin_runtime-0.2.34.dist-info/METADATA,sha256=JKeaa3SFSXA8ZoaRx-TNxH0g3S8fXrdsZYDAWrHDnyE,1086
-omnata_plugin_runtime-0.2.34.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-omnata_plugin_runtime-0.2.34.dist-info/RECORD,,