omnata-plugin-runtime 0.2.37__tar.gz → 0.2.40__tar.gz

{omnata_plugin_runtime-0.2.37 → omnata_plugin_runtime-0.2.40}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.2.37"
+version = "0.2.40"
 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.37 → omnata_plugin_runtime-0.2.40}/src/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
@@ -1144,12 +1144,26 @@ 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")
+        return values
+
 class BillingEventRequest(BaseModel):
     """
     Represents a request to provide billing events for that day.