omnata-plugin-runtime 0.9.0a209__py3-none-any.whl → 0.9.1a210__py3-none-any.whl

omnata_plugin_runtime/forms.py

@@ -13,7 +13,7 @@ else:
     from typing_extensions import Annotated
 from abc import ABC
 from types import MethodType
-from pydantic import BaseModel, Field, validator  # pylint: disable=no-name-in-module
+from pydantic import BaseModel, Field, field_validator  # pylint: disable=no-name-in-module
 from .configuration import (
     SubscriptableBaseModel,
     NgrokTunnelSettings,
@@ -264,7 +264,8 @@ class DynamicFormOptionsDataSource(SubscriptableBaseModel):
     new_option_creator: Optional[NewOptionCreator] = Field(default=None)
     type: Literal["dynamic"] = "dynamic"
 
-    @validator("source_function", always=True)
+    @field_validator("source_function", mode='after')
+    @classmethod
     def function_name_convertor(cls, v) -> str:
         return v.__name__ if isinstance(v, MethodType) else v
 
@@ -376,15 +377,18 @@ class NewOptionCreator(SubscriptableBaseModel):
     ]
     allow_create: bool = Field(default=True)
 
-    @validator("creation_form_function", always=True)
+    @field_validator("creation_form_function", mode='after')
+    @classmethod
     def function_name_convertor(cls, v) -> str:
         return v.__name__ if isinstance(v, MethodType) else v
 
-    @validator("creation_complete_function", always=True)
+    @field_validator("creation_complete_function", mode='after')
+    @classmethod
     def function_name_convertor_2(cls, v) -> str:
         return v.__name__ if isinstance(v, MethodType) else v
     
-    @validator("construct_form_option", always=True)
+    @field_validator("construct_form_option", mode='after')
+    @classmethod
     def function_name_convertor_3(cls, v) -> str:
         return v.__name__ if isinstance(v, MethodType) else v
 
@@ -469,7 +473,8 @@ class NGrokMTLSTunnel(SubscriptableBaseModel):
     post_tunnel_fields_function: Union[
         Callable[[ConnectionConfigurationParameters], List[FormFieldBase]], str
     ]
-    @validator("post_tunnel_fields_function", always=True)
+    @field_validator("post_tunnel_fields_function", mode='after')
+    @classmethod
     def function_name_convertor(cls, v) -> str:
         return v.__name__ if isinstance(v, MethodType) else v
 

omnata_plugin_runtime/json_schema.py

@@ -0,0 +1,538 @@
+"""
+Models used to represent JSON schemas and Snowflake view definitions.
+This was originally internal to the Sync Engine, but was moved to the
+plugin runtime so that it could be used for testing column expressions (formulas, etc).
+"""
+from typing import Any, Dict, Optional, Literal, List, Union
+from typing_extensions import Self
+from pydantic import BaseModel, Field, model_validator, computed_field
+from jinja2 import Environment
+
+class JsonSchemaProperty(BaseModel):
+    """
+    The most basic common properties for a JSON schema property, plus the extra ones we use for providing Snowflake-specific information.
+    Used mainly to do partial parsing as we extract fields from within the schema
+    """
+
+    type: Optional[Union[str,List[str]]] = Field(..., description="The type of the property")
+    ref: Optional[str] = Field(
+        None, description="The reference to another schema", alias="$ref"
+    )
+    nullable: bool = Field(
+        True, description="Whether the property is nullable"
+    )
+    description: Optional[str] = Field(
+        None, description="The description of the property"
+    )
+    format: Optional[str] = Field(
+        None, description="The format of the property, e.g. date-time"
+    )
+    properties: Optional[Dict[str, Self]] = Field(
+        None, description="The sub-properties of the property, if the property is an object type"
+    )
+    snowflakeTimestampType: Optional[Literal['TIMESTAMP_TZ','TIMESTAMP_NTZ','TIMESTAMP_LTZ']] = Field(
+        None, description="The Snowflake timestamp type to use when interpreting a date-time string."
+    )
+    snowflakeTimestampFormat: Optional[str] = Field(
+        None, description="The Snowflake timestamp format to use when interpreting a date-time string."
+    )
+    snowflakePrecision: Optional[int] = Field(
+        None, description="The Snowflake precision to assign to the column."
+    )
+    snowflakeScale: Optional[int] = Field(
+        None, description="The Snowflake scale to assign to the column."
+    )
+    snowflakeColumnExpression: Optional[str] = Field(
+        None,description="""When advanced processing is needed, you can provide a value here. Use {{variant_path}} to interpolate the path to the JSON field.""",
+    )
+    isJoinColumn: Optional[bool] = Field(
+        False, description="Whether this column is sourced from a joined stream"
+    )
+
+    @model_validator(mode='after')
+    def validate(self) -> Self:
+        # If the type is a list, we need to condense it down to a single string
+        if self.type is None:
+            if self.ref is None:
+                raise ValueError("You must provide either a type or a reference")
+        else:
+            if isinstance(self.type, list):
+                data_types = [t for t in self.type if t != "null"]
+                if len(data_types) == 0:
+                    raise ValueError(
+                        f"For a list of types, you must provide at least one non-null type ({self.type})"
+                    )
+                self.nullable = "null" in self.type
+                self.type = data_types[0]
+        return self
+    
+    @computed_field
+    @property
+    def precision(self) -> Optional[int]:
+        """
+        Returns the precision for this property.
+        """
+        precision = None
+        if self.type == "number" or self.type == "integer":
+            precision = 38
+        if self.snowflakePrecision is not None:
+            precision = self.snowflakePrecision
+        return precision
+    
+    @computed_field
+    @property
+    def scale(self) -> Optional[int]:
+        """
+        Returns the scale for this property.
+        """
+        scale = None
+        if self.type == "number":
+            scale = 19
+        if self.type == "integer":
+            scale = 0
+        if self.snowflakeScale is not None:
+            scale = self.snowflakeScale
+        return scale
+    
+    @computed_field
+    @property
+    def snowflake_data_type(self) -> str:
+        """
+        Returns the Snowflake data type for this property.
+        """
+        if self.type is not None:
+            if self.type == "string":
+                if self.format is not None:
+                    if self.format == "date-time":
+                        if self.snowflakeTimestampType is not None:
+                            return self.snowflakeTimestampType
+                        return "TIMESTAMP" # not sure if we should default to something that may vary according to account parameters
+                    elif self.format == "time":
+                        return "TIME"
+                    elif self.format == "date":
+                        return "DATE"
+                return "VARCHAR"
+            elif self.type == "number":
+                return "NUMERIC"
+            elif self.type == "integer":
+                return "NUMERIC"
+            elif self.type == "boolean":
+                return "BOOLEAN"
+            if self.type == "object":
+                return "OBJECT"
+            if self.type == "array":
+                return "ARRAY"
+            return "VARCHAR"
+        elif self.ref is not None:
+            if self.ref == "WellKnownTypes.json#definitions/Boolean":
+                return "BOOLEAN"
+            elif self.ref == "WellKnownTypes.json#definitions/Date":
+                return "DATE"
+            elif self.ref == "WellKnownTypes.json#definitions/TimestampWithTimezone":
+                return "TIMESTAMP_TZ"
+            elif self.ref == "WellKnownTypes.json#definitions/TimestampWithoutTimezone":
+                return "TIMESTAMP_NTZ"
+            elif self.ref == "WellKnownTypes.json#definitions/TimeWithTimezone":
+                return "TIME"
+            elif self.ref == "WellKnownTypes.json#definitions/TimeWithoutTimezone":
+                return "TIME"
+            elif self.ref == "WellKnownTypes.json#definitions/Integer":
+                return "NUMERIC"
+            elif self.ref == "WellKnownTypes.json#definitions/Number":
+                return "NUMERIC"
+            return "VARCHAR"
+
+
+class SnowflakeViewColumn(BaseModel):
+    """
+    Represents everything needed to express a column in a Snowflake normalized view.
+    The name is the column name, the expression is the SQL expression to use in the view.
+    In other words, the column definition is "expression as name".
+    """
+    name: str
+    expression: str
+    comment: Optional[str] = Field(default=None)
+    is_join_column: Optional[bool] = Field(
+        default=False, description="Whether this column is sourced from a joined stream"
+    )
+
+    def __repr__(self) -> str:
+        return "SnowflakeViewColumn(name=%r, definition=%r, comment=%r)" % (
+            self.name,
+            self.definition(),
+            self.comment,
+        )
+
+    def definition(self) -> str:
+        return f'{self.expression} as "{self.name}"'
+
+    def name_with_comment(self) -> str:
+        """
+        Returns the column name (quoted), along with any comment.
+        The resulting text can be used in a CREATE VIEW statement.
+        """
+        return (
+            f'"{self.name}"'
+            if self.comment is None
+            else f'"{self.name}" COMMENT $${self.comment}$$'
+        )
+    
+    @classmethod
+    def from_json_schema_property(cls,
+                                  column_name:str,
+                                  comment:str,
+                                  variant_path:str,
+                                  json_schema_property:JsonSchemaProperty,
+                                  column_name_environment:Environment,
+                                  column_name_expression:str) -> Self:
+        """
+        Takes a JSON schema property (which may be nested via variant_path), along with its final name and comment,
+        and returns a SnowflakeViewColumn object which is ready to use in a select statement.
+        It does this by applying overarching type conversion rules, and evaluating the final column name using Jinja.
+        """
+        jinja_vars = {"column_name": column_name}
+        final_column_name = column_name_environment.from_string(column_name_expression).render(**jinja_vars)
+        expression = f"""RECORD_DATA:{variant_path}"""
+        if json_schema_property.snowflakeColumnExpression:
+            jinja_vars = {"variant_path": expression}
+            expression = column_name_environment.from_string(json_schema_property.snowflakeColumnExpression).render(
+                **jinja_vars
+            )
+        
+        if json_schema_property.precision is not None and json_schema_property.scale is not None:
+            expression=f"{expression}::NUMERIC({json_schema_property.precision},{json_schema_property.scale})"
+        elif json_schema_property.snowflakeTimestampType and json_schema_property.snowflakeTimestampFormat:
+            timestamp_type = json_schema_property.snowflakeTimestampType
+            timestamp_format = json_schema_property.snowflakeTimestampFormat
+            expression=f"""TO_{timestamp_type}({expression}::varchar,'{timestamp_format}')"""
+        else:
+            if not json_schema_property.snowflakeColumnExpression:
+                expression=f"""{expression}::{json_schema_property.type}"""
+        return cls(
+            name=final_column_name,
+            expression=expression,
+            comment=comment,
+            is_join_column=json_schema_property.isJoinColumn,
+        )
+
+
+class SnowflakeViewJoin(BaseModel):
+    """
+    Represents a join in a Snowflake normalized view.
+    """
+
+    left_alias: str = Field(
+        ..., description="The alias to use on the left side of the join"
+    )
+    left_column: str = Field(
+        ..., description="The column to join on from the left side"
+    )
+    join_stream_name: str = Field(
+        ..., description="The name of the stream to join (right side)"
+    )
+    join_stream_alias: str = Field(
+        ...,
+        description="The alias to use for the joined stream, this is used in the column definitions instead of the stream name, and accomodates the possibility of multiple joins to the same stream",
+    )
+    join_stream_column: str = Field(
+        ..., description="The column to join on from the right side"
+    )
+
+    def __repr__(self) -> str:
+        return (
+            "SnowflakeViewJoin(left_alias=%r, left_column=%r, join_stream_name=%r, join_stream_alias=%r, join_stream_column=%r)"
+            % (
+                self.left_alias,
+                self.left_column,
+                self.join_stream_name,
+                self.join_stream_alias,
+                self.join_stream_column,
+            )
+        )
+
+    def definition(self) -> str:
+        """
+        Returns the SQL for a single join in a normalized view
+        """
+        # we don't need to fully qualify the table name, because they'll be aliased in CTEs
+        return f"""JOIN "{self.join_stream_name}" as "{self.join_stream_alias}" 
+ON "{self.left_alias}"."{self.left_column}" = "{self.join_stream_alias}"."{self.join_stream_column}" """
+
+
+class SnowflakeViewParts(BaseModel):
+    """
+    Represents the definition of a Snowflake normalized view.
+    """
+
+    comment: Optional[str] = Field(
+        None, description="The comment to assign to the view"
+    )
+    columns: List[SnowflakeViewColumn] = Field(
+        ..., description="The columns to include in the view"
+    )
+    joins: List[SnowflakeViewJoin] = Field(
+        ..., description="The joins to include in the view"
+    )
+
+    def direct_columns(self) -> List[SnowflakeViewColumn]:
+        """
+        Returns the columns that are not sourced from joins.
+        """
+        return [c for c in self.columns if not c.is_join_column]
+
+    def join_columns(self) -> List[SnowflakeViewColumn]:
+        """
+        Returns the columns that are sourced from joins.
+        """
+        return [c for c in self.columns if c.is_join_column]
+
+    def comment_clause(self) -> str:
+        """
+        Returns the comment clause for the view definition.
+        """
+        return f"COMMENT = $${self.comment}$$ " if self.comment is not None else ""
+
+    def column_names_with_comments(self) -> List[str]:
+        # the outer view definition has all of the column names and comments, but with the direct columns
+        # first and the join columns last, same as they are ordered in the inner query
+        return [
+            c.name_with_comment() for c in (self.direct_columns() + self.join_columns())
+        ]
+
+class FullyQualifiedTable(BaseModel):
+    """
+    Represents a fully qualified table name in Snowflake, including database, schema, and table name.
+    This is not a template, it's a fully specified object.
+    """
+
+    database_name: Optional[str] = Field(default=None, description="The database name")
+    schema_name: str = Field(..., description="The schema name")
+    table_name: str = Field(..., description="The table name")
+
+    def get_fully_qualified_name(self, table_override: Optional[str] = None) -> str:
+        """
+        If table_override is provided, it will be used instead of the table name
+        """
+        actual_table_name = (
+            self.table_name if table_override is None else table_override
+        )
+        # We try to make this resilient to quoting
+        schema_name = self.schema_name.replace('"', "")
+        table_name = actual_table_name.replace('"', "")
+        if self.database_name is None or self.database_name == "":
+            return f'"{schema_name}"."{table_name}"'
+        database_name = self.database_name.replace('"', "")
+        return f'"{database_name}"."{schema_name}"."{table_name}"'
+
+class JsonSchemaTopLevel(BaseModel):
+    """
+    This model is used as a starting point for parsing a JSON schema.
+    It does not validate the whole thing up-front, as there is some complex recursion as well as external configuration.
+    Instead, it takes the basic properties and then allows for further parsing on demand.
+    """
+    description: Optional[str] = Field(
+        None, description="The description of the schema"
+    )
+    joins: Optional[List[SnowflakeViewJoin]] = Field(
+        None, description="The joins to include in the view"
+    )
+    properties: Optional[Dict[str, Any]] = Field(
+        None, description="The properties of the schema. This is left as a dictionary, and parsed on demand."
+    )
+
+    def build_view_columns(self,
+                            column_name_environment: Environment = Environment(),                
+                            column_name_expression: str = "{{column_name}}"
+                           ) -> List[SnowflakeViewColumn]:
+        """
+        Returns a list of column definitions from a json schema
+        """
+        if self.properties is None:
+            return []
+        columns = [
+            self._extract_view_columns(
+                property_name=property_name,
+                property_value=property_value,
+                column_name_environment=column_name_environment,
+                column_name_expression=column_name_expression,
+            )
+            for property_name, property_value in self.properties.items()
+        ]
+        return [item for sublist in columns for item in sublist]
+
+
+    def _extract_view_columns(
+        self,
+        property_name: str,
+        property_value: Dict,
+        column_name_environment: Environment,                
+        column_name_expression: str,
+        current_field_name_path: List[str] = [],
+        current_comment_path: List[str] = []
+    ) -> List[SnowflakeViewColumn]:
+        """
+        Recursive function which returns a list of column definitions.
+        - property_name is the name of the current property.
+        - property_value is the value of the current property, (the JSON-schema node).
+        - current_field_name_path is [] on initial entry, then contains parent path field names as it recurses.
+        - current_comment_path is the same length as above, and contains any "description" values found on the way down
+        """
+        json_property = JsonSchemaProperty.model_validate(property_value)
+        # bit of basic home-grown validation, could probably use a library for this
+        if json_property.type:
+            if json_property.type == "object":
+                # TODO: make this depth configurable on the sync
+                if len(current_field_name_path) < 5 and json_property.properties is not None:
+                    children = [
+                        self._extract_view_columns(
+                            property_name=child_property_name,
+                            property_value=child_property_value,
+                            column_name_environment=column_name_environment,
+                            column_name_expression=column_name_expression,
+                            current_field_name_path=current_field_name_path + [property_name],
+                            current_comment_path=current_comment_path + [json_property.description or ""],
+                        )
+                        for child_property_name, child_property_value in json_property.properties.items()
+                    ]
+                    return [item for sublist in children for item in sublist]
+
+        current_field_name_path = current_field_name_path + [property_name]
+        current_comment_path = current_comment_path + [
+            json_property.description or ""
+        ]
+        # remove empty strings from current_comment_path
+        current_comment_path = [c for c in current_comment_path if c]
+
+        return [SnowflakeViewColumn.from_json_schema_property(
+            column_name="_".join(current_field_name_path),
+            comment=" -> ".join(current_comment_path),
+            variant_path=":".join([f'"{p}"' for p in current_field_name_path if p]),
+            json_schema_property=json_property,
+            column_name_environment=column_name_environment,
+            column_name_expression=column_name_expression
+        )]
+    
+
+def normalized_view_parts(
+    include_default_columns: bool,
+    stream_schema: Optional[Dict] = None,
+) -> SnowflakeViewParts:
+    """
+    Returns an object containing:
+    - A top level comment for the view
+    - A list of SnowflakeViewColumn objects, representing the columns to create in the view
+    - A list of SnowflakeViewJoin objects, representing the joins to create in the view
+    """
+    snowflake_columns: List[SnowflakeViewColumn] = []
+    if include_default_columns:
+        snowflake_columns.append(
+            SnowflakeViewColumn(
+                name="OMNATA_APP_IDENTIFIER",
+                expression="APP_IDENTIFIER",
+                comment="The value of the unique identifier for the record in the source system",
+            )
+        )
+        snowflake_columns.append(
+            SnowflakeViewColumn(
+                name="OMNATA_RETRIEVE_DATE",
+                expression="RETRIEVE_DATE",
+                comment="The date and time the record was retrieved from the source system",
+            )
+        )
+        snowflake_columns.append(
+            SnowflakeViewColumn(
+                name="OMNATA_RAW_RECORD",
+                expression="RECORD_DATA",
+                comment="The raw semi-structured record as retrieved from the source system",
+            )
+        )
+        snowflake_columns.append(
+            SnowflakeViewColumn(
+                name="OMNATA_IS_DELETED",
+                expression="IS_DELETED",
+                comment="A flag to indicate that the record was deleted from the source system",
+            )
+        )
+        snowflake_columns.append(
+            SnowflakeViewColumn(
+                name="OMNATA_RUN_ID",
+                expression="RUN_ID",
+                comment="A flag to indicate which run the record was last processed in",
+            )
+        )
+    json_schema = JsonSchemaTopLevel.model_validate(stream_schema)
+    return SnowflakeViewParts(
+        columns=snowflake_columns + json_schema.build_view_columns(), 
+        joins=json_schema.joins or [],
+        comment=json_schema.description
+    )
+
+def normalized_view_body(
+    stream_locations: Dict[str,FullyQualifiedTable],
+    stream_schemas: Dict[str,Dict],
+    stream_name: str,
+    include_default_columns: bool = True,
+) -> str:
+    """
+    Returns the SQL for the body of a normalized view.
+    Because views are created over raw data (potentially several joined raw tables), we have
+    to pass in the locations of those raw tables, keyed by stream name.
+    The stream schema is also passed in, keyed by stream name, and used to build the columns and joins.
+    """
+    main_stream_raw_table_name_quoted = stream_locations[stream_name].get_fully_qualified_name()
+    # we start with the view parts for the view we are building
+    main_stream_view_part = normalized_view_parts(
+        include_default_columns=include_default_columns,
+        stream_schema=stream_schemas.get(stream_name)
+    )
+    # we use a CTE because we may need to use aliases in the joins
+    main_stream_cte = f""" "{stream_name}" as (
+    select {', '.join([c.definition() for c in main_stream_view_part.direct_columns()])} 
+    from {main_stream_raw_table_name_quoted}
+) """
+    ctes = [main_stream_cte]
+    # we also use CTEs that recreate the views that the joins reference.
+    # the reason for this is that we can't rely on the view being there,
+    # and it's also possible that they reference each other
+    for join in main_stream_view_part.joins:
+        join_view_part = normalized_view_parts(
+            include_default_columns=include_default_columns,
+            stream_schema=stream_schemas.get(join.join_stream_name)
+        )
+        join_stream_raw_table_name_quoted = stream_locations[stream_name].get_fully_qualified_name()
+        join_view_cte = f""" "{join.join_stream_name}" as (
+        select {', '.join([c.definition() for c in join_view_part.direct_columns()])}
+        from {join_stream_raw_table_name_quoted}
+        ) """
+        ctes.append(join_view_cte)
+
+    join_columns = main_stream_view_part.join_columns()
+    # in some situations, column expressions may reference the alias of another column
+    # this is allowed in Snowflake, as long as the aliased column is defined before it's used in a later column
+    # so we need to sort the columns so that if the name of the column appears (in quotes) in the expression of another column, it is ordered first
+
+    # Collect columns to be moved
+    columns_to_move = []
+
+    for column in join_columns:
+        for other_column in join_columns:
+            if f'"{column.name}"' in other_column.expression:
+                if column not in columns_to_move:
+                    columns_to_move.append(column)
+
+    # Move collected columns to the front
+    for column in columns_to_move:
+        join_columns.remove(column)
+        join_columns.insert(0, column)
+
+    join_column_clauses = [c.definition() for c in join_columns]
+    # we select * from the original view (in the CTE) and then add any expressions that come from the join columns
+    final_column_clauses = [f'"{stream_name}".*'] + join_column_clauses
+    all_ctes = "\n,".join(ctes)
+    view_body = f"""with {all_ctes}
+select {', '.join(final_column_clauses)} from "{stream_name}" """
+
+    if len(main_stream_view_part.joins) > 0:
+        join_clauses = [join.definition() for join in main_stream_view_part.joins]
+        view_body += "\n" + ("\n".join(join_clauses))
+    return view_body

omnata_plugin_runtime/omnata_plugin.py

@@ -8,6 +8,7 @@ from inspect import signature
 import sys
 from types import FunctionType
 from typing import Union
+from typing_extensions import Self
 if tuple(sys.version_info[:2]) >= (3, 9):
     # Python 3.9 and above
     from typing import Annotated  # pylint: disable=ungrouped-imports
@@ -38,7 +39,7 @@ from typing import Any, Callable, Dict, Iterable, List, Literal, Optional, Type,
 import jinja2
 import pandas
 from pydantic_core import to_jsonable_python
-from pydantic import Field, TypeAdapter, ValidationError, create_model, root_validator, BaseModel
+from pydantic import Field, TypeAdapter, ValidationError, create_model, model_validator, BaseModel
 from dateutil.parser import parse
 from jinja2 import Environment
 from snowflake.connector.pandas_tools import write_pandas
@@ -1577,19 +1578,19 @@ class SnowflakeBillingEvent(BaseModel):
     objects: List[str] = []
     additional_info: Dict[str, Any] = {}
 
-    @root_validator(pre=True)
-    def validate_datetime_fields(cls, values):
+    @model_validator(mode='after')
+    def validate_datetime_fields(self) -> Self:
         # Handling timestamps, we want to be strict on supplying a timezone
-        timestamp = values.get('timestamp')
+        timestamp = self.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')
+        start_timestamp = self.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
+        return self
 
 class DailyBillingEventRequest(BaseModel):
     """

omnata_plugin_runtime/rate_limiting.py

@@ -12,8 +12,9 @@ from typing import Any, List, Literal, Optional, Dict, Tuple
 import requests
 import time
 import logging
-from pydantic import Field, root_validator, PrivateAttr, field_serializer
+from pydantic import Field, model_validator, PrivateAttr, field_serializer
 from pydantic_core import to_jsonable_python
+from typing_extensions import Self
 from .configuration import SubscriptableBaseModel
 from .logging import logger, tracer
 import pytz
@@ -194,12 +195,12 @@ class RateLimitState(SubscriptableBaseModel):
 
 
     # Combined root validator
-    @root_validator(pre=True)
-    def validate_datetime_fields(cls, values):
+    @model_validator(mode='after')
+    def validate_datetime_fields(self) -> Self:
         # Handling wait_until
-        wait_until = values.get('wait_until')
+        wait_until = self.wait_until
         if isinstance(wait_until, int):
-            values['wait_until'] = epoch_milliseconds_to_datetime(wait_until)
+            self.wait_until = epoch_milliseconds_to_datetime(wait_until)
         elif wait_until and isinstance(wait_until, datetime.datetime):
             if wait_until.tzinfo is None:
                 raise ValueError("wait_until must be timezone aware")
@@ -207,16 +208,16 @@ class RateLimitState(SubscriptableBaseModel):
                 raise ValueError("wait_until must be timezone aware and UTC")
 
         # Handling previous_request_timestamps
-        timestamps = values.get('previous_request_timestamps', [])
+        timestamps = self.previous_request_timestamps or []
         if timestamps and isinstance(timestamps[0], int):
-            values['previous_request_timestamps'] = [epoch_milliseconds_to_datetime(epoch) for epoch in timestamps]
+            self.previous_request_timestamps = [epoch_milliseconds_to_datetime(epoch) for epoch in timestamps]
         elif timestamps and isinstance(timestamps[0], datetime.datetime):
             if timestamps[0].tzinfo is None:
                 raise ValueError("previous_request_timestamps must be timezone aware")
             elif timestamps[0].tzinfo != datetime.timezone.utc:
                 raise ValueError("previous_request_timestamps must be timezone aware and UTC")
         
-        return values
+        return self
 
     def merge(self,other:RateLimitState):
         """

{omnata_plugin_runtime-0.9.0a209.dist-info → omnata_plugin_runtime-0.9.1a210.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.9.0a209
+Version: 0.9.1a210
 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.9.1a210.dist-info/RECORD

@@ -0,0 +1,13 @@
+omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTwRpBA,1576
+omnata_plugin_runtime/api.py,sha256=baGraSMiD4Yvi3ZWrEv_TKh8Ktd1U8riBdOpe9j0Puw,8202
+omnata_plugin_runtime/configuration.py,sha256=hHWaK72q45cCQ2R7x9vX2tGifvUDabMrVXBZF4XX0TY,41286
+omnata_plugin_runtime/forms.py,sha256=9YHJ_T17lT-rwyDaUg_0yj_YMPda4DRCw_wrvf8hE0E,19964
+omnata_plugin_runtime/json_schema.py,sha256=KI3Y_-3IFsnIwxkT52rCjVdyWqaoZTBAWLPgTByFSnY,23340
+omnata_plugin_runtime/logging.py,sha256=WBuZt8lF9E5oFWM4KYQbE8dDJ_HctJ1pN3BHwU6rcd0,4461
+omnata_plugin_runtime/omnata_plugin.py,sha256=IDj8EaWZuEKaTPrWm3wzHvdmW4l2WibCZEj9AnyTHLU,131622
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=iqGl8_nEEnPGKg3Aem4YLSQ6d5xS3ju5gq8MJbx6sCA,31968
+omnata_plugin_runtime/rate_limiting.py,sha256=qpr5esU4Ks8hMzuMpSR3gLFdor2ZUXYWCjmsQH_K6lQ,25882
+omnata_plugin_runtime-0.9.1a210.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.9.1a210.dist-info/METADATA,sha256=ECFBPltpv4Exrz0h2ZHegOsDC-WibdyY8teB1yyeMRA,2158
+omnata_plugin_runtime-0.9.1a210.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+omnata_plugin_runtime-0.9.1a210.dist-info/RECORD,,

omnata_plugin_runtime-0.9.0a209.dist-info/RECORD

@@ -1,12 +0,0 @@
-omnata_plugin_runtime/__init__.py,sha256=MS9d1whnfT_B3-ThqZ7l63QeC_8OEKTuaYV5wTwRpBA,1576
-omnata_plugin_runtime/api.py,sha256=baGraSMiD4Yvi3ZWrEv_TKh8Ktd1U8riBdOpe9j0Puw,8202
-omnata_plugin_runtime/configuration.py,sha256=hHWaK72q45cCQ2R7x9vX2tGifvUDabMrVXBZF4XX0TY,41286
-omnata_plugin_runtime/forms.py,sha256=ueodN2GIMS5N9fqebpY4uNGJnjEb9HcuaVQVfWH-cGg,19838
-omnata_plugin_runtime/logging.py,sha256=WBuZt8lF9E5oFWM4KYQbE8dDJ_HctJ1pN3BHwU6rcd0,4461
-omnata_plugin_runtime/omnata_plugin.py,sha256=3OPFFYhbxmffAcb5pJA09gV62SLX-1nu2j3mJMy3pis,131600
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=iqGl8_nEEnPGKg3Aem4YLSQ6d5xS3ju5gq8MJbx6sCA,31968
-omnata_plugin_runtime/rate_limiting.py,sha256=eOWVRYWiqPlVeYzmB1exVXfXbrcpmYb7vtTi9B-4zkQ,25868
-omnata_plugin_runtime-0.9.0a209.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.9.0a209.dist-info/METADATA,sha256=3j72wTua0fHhugze-4pSSFl58MR7ODerhgoz7ZWaB10,2158
-omnata_plugin_runtime-0.9.0a209.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-omnata_plugin_runtime-0.9.0a209.dist-info/RECORD,,