omnata-plugin-runtime 0.4.11a111__tar.gz → 0.5.0a113__tar.gz

{omnata_plugin_runtime-0.4.11a111 → omnata_plugin_runtime-0.5.0a113}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.4.11a111
+Version: 0.5.0a113
 Summary: Classes and common runtime components for building and running Omnata Plugins
 Author: James Weakley
 Author-email: james.weakley@omnata.com
@@ -9,26 +9,32 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Dist: certifi (<=2023.11.17)
+Requires-Dist: annotated-types (<=0.6.0)
+Requires-Dist: certifi (<=2024.7.4)
 Requires-Dist: charset-normalizer (<=2.0.4)
-Requires-Dist: idna (<=3.4)
+Requires-Dist: cryptography (<=42.0.5)
+Requires-Dist: filelock (<=3.13.1)
+Requires-Dist: idna (<=3.7)
 Requires-Dist: jinja2 (>=3.1.2,<=3.1.4)
 Requires-Dist: markupsafe (<=2.1.3)
-Requires-Dist: numpy (<=1.26.3)
-Requires-Dist: packaging (<=23.1)
-Requires-Dist: pandas (<=2.1.4)
+Requires-Dist: numpy (<=1.26.4)
+Requires-Dist: packaging (<=24.1)
+Requires-Dist: pandas (<=2.2.2)
 Requires-Dist: platformdirs (<=3.10.0)
-Requires-Dist: pydantic (>=1,<=1.10.12)
-Requires-Dist: pyjwt (<=2.4.0)
-Requires-Dist: pyopenssl (<=23.2.0)
-Requires-Dist: pytz (<=2023.3.post1)
-Requires-Dist: requests (>=2,<=2.31.0)
+Requires-Dist: pycparser (<=2.21)
+Requires-Dist: pydantic (>=2,<=2.5.3)
+Requires-Dist: pydantic-core (<=2.14.6)
+Requires-Dist: pyjwt (<=2.8.0)
+Requires-Dist: pyopenssl (<=24.0.0)
+Requires-Dist: pytz (<=2024.1)
+Requires-Dist: requests (>=2,<=2.32.2)
 Requires-Dist: setuptools (<=69.5.1)
-Requires-Dist: snowflake-snowpark-python (>=1,<2)
-Requires-Dist: tenacity (>=8,<=8.2.2)
+Requires-Dist: snowflake-connector-python (>=3,<=3.12.0)
+Requires-Dist: snowflake-snowpark-python (==1.19.0)
+Requires-Dist: tenacity (>=8,<=8.2.3)
 Requires-Dist: tomlkit (<=0.11.1)
-Requires-Dist: urllib3 (<=2.1.0)
-Requires-Dist: wheel (<=0.41.2)
+Requires-Dist: urllib3 (<=2.2.2)
+Requires-Dist: wheel (<=0.43.0)
 Description-Content-Type: text/markdown
 
 # omnata-plugin-runtime

{omnata_plugin_runtime-0.4.11a111 → omnata_plugin_runtime-0.5.0a113}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.4.11-a111"
+version = "0.5.0-a113"
 description = "Classes and common runtime components for building and running Omnata Plugins"
 authors = ["James Weakley <james.weakley@omnata.com>"]
 readme = "README.md"
@@ -8,27 +8,33 @@ packages = [{include = "omnata_plugin_runtime", from = "src"}]
 
 [tool.poetry.dependencies]
 python = ">=3.8, <3.11"
-snowflake-snowpark-python = "^1"
+snowflake-snowpark-python = "1.19.0" # fixes an issue
+snowflake-connector-python = "^3, <=3.12.0" # latest version available on Snowflake Anaconda
+cryptography = "<=42.0.5"
+annotated-types	= "<=0.6.0"
+pycparser = "<=2.21"
+filelock = "<=3.13.1"
+pydantic-core = "<=2.14.6"
 # had to relax some of these thanks to snowcli pinning newer versions
-certifi	= "<=2023.11.17" # latest version available on Snowflake Anaconda
+certifi	= "<=2024.7.4" # latest version available on Snowflake Anaconda
 charset-normalizer = "<=2.0.4" # latest version available on Snowflake Anaconda
-idna = "<=3.4" # latest version available on Snowflake Anaconda
+idna = "<=3.7" # latest version available on Snowflake Anaconda
 jinja2 = ">=3.1.2,<=3.1.4" # 3.1.4 was latest version available on Snowflake Anaconda
 markupsafe = "<=2.1.3" # latest version available on Snowflake Anaconda
-numpy = "<=1.26.3" # latest version available on Snowflake Anaconda
-packaging = "<=23.1" # latest version available on Snowflake Anaconda
-pandas = "<=2.1.4" # latest version available on Snowflake Anaconda
+numpy = "<=1.26.4" # latest version available on Snowflake Anaconda
+packaging = "<=24.1" # latest version available on Snowflake Anaconda
+pandas = "<=2.2.2" # latest version available on Snowflake Anaconda
 platformdirs = "<=3.10.0" # latest version available on Snowflake Anaconda
-pydantic = "^1, <=1.10.12" # latest version available on Snowflake Anaconda
-pyjwt = "<=2.4.0" # latest version available on Snowflake Anaconda
-pyopenssl = "<=23.2.0" # latest version available on Snowflake Anaconda
-pytz = "<=2023.3.post1" # latest version available on Snowflake Anaconda
-requests = "^2, <=2.31.0" # latest version available on Snowflake Anaconda
+pydantic = "^2, <=2.5.3" # latest version available on Snowflake Anaconda
+pyjwt = "<=2.8.0" # latest version available on Snowflake Anaconda
+pyopenssl = "<=24.0.0" # latest version available on Snowflake Anaconda
+pytz = "<=2024.1" # latest version available on Snowflake Anaconda
+requests = "^2, <=2.32.2" # latest version available on Snowflake Anaconda
 setuptools = "<=69.5.1" # 69.5.1 was latest version available on Snowflake Anaconda
 tomlkit = "<=0.11.1" # 0.11.1 was latest version available on Snowflake Anaconda
-tenacity = "^8, <=8.2.2" # latest version available on Snowflake Anaconda
-urllib3 = "<=2.1.0" # latest version available on Snowflake Anaconda
-wheel = "<=0.41.2" # latest version available on Snowflake Anaconda
+tenacity = "^8, <=8.2.3" # latest version available on Snowflake Anaconda
+urllib3 = "<=2.2.2" # latest version available on Snowflake Anaconda
+wheel = "<=0.43.0" # latest version available on Snowflake Anaconda
 
 [tool.poetry.dev-dependencies]
 pytest = "^6.2.4"

{omnata_plugin_runtime-0.4.11a111 → omnata_plugin_runtime-0.5.0a113}/src/omnata_plugin_runtime/api.py

@@ -67,8 +67,8 @@ class PluginMessageStreamProgressUpdate(BaseModel):
     stream_total_counts: Dict[str, int]
     completed_streams: List[str]
     # older runtime versions didn't have these, so the sync engine can't expect it
-    stream_errors: Optional[Dict[str,str]]
-    total_records_estimate: Optional[Dict[str,int]]
+    stream_errors: Optional[Dict[str,str]] = None
+    total_records_estimate: Optional[Dict[str,int]] = None
 
 
 class PluginMessageCancelledStreams(BaseModel):
@@ -120,14 +120,14 @@ class OutboundSyncRequestPayload(BaseModel):
     logging_level: str
     connection_method: str
     connection_parameters: Dict[str, StoredConfigurationValue]
-    oauth_secret_name: Optional[str]
-    other_secrets_name: Optional[str]
+    oauth_secret_name: Optional[str] = None
+    other_secrets_name: Optional[str] = None
     sync_direction: Literal["outbound"] = "outbound"
     sync_strategy: OutboundSyncStrategy
     sync_parameters: Dict[str, StoredConfigurationValue]
     api_limit_overrides: List[ApiLimits]
     rate_limits_state: Dict[int,Dict[str,Dict[str,RateLimitState]]]
-    field_mappings: Optional[StoredMappingValue]
+    field_mappings: Optional[StoredMappingValue] = None
     time_limit_mins: int = 60 * 4
 
 
@@ -138,7 +138,7 @@ class InboundSyncRequestPayload(BaseModel):
 
     sync_id: int  # only used by log handler
     sync_branch_name: str = 'main' # only used by rate limit updater
-    sync_branch_id: Optional[int]  # only used by log handler
+    sync_branch_id: Optional[int] = None  # only used by log handler
     connection_id: int  # only used by log handler
     run_id: int  # used by log handler and for reporting back run status updates
     source_app_name: str  # the name of the app which is invoking this plugin
@@ -147,8 +147,8 @@ class InboundSyncRequestPayload(BaseModel):
     logging_level: str
     connection_method: str
     connection_parameters: Dict[str, StoredConfigurationValue]
-    oauth_secret_name: Optional[str]
-    other_secrets_name: Optional[str]
+    oauth_secret_name: Optional[str] = None
+    other_secrets_name: Optional[str] = None
     sync_direction: Literal["inbound"] = "inbound"
     sync_parameters: Dict[str, StoredConfigurationValue]
     api_limit_overrides: List[ApiLimits]

{omnata_plugin_runtime-0.4.11a111 → omnata_plugin_runtime-0.5.0a113}/src/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, validator  # pylint: disable=no-name-in-module
+from pydantic import BaseModel, Field, PrivateAttr, validator  # pylint: disable=no-name-in-module
 
 if tuple(sys.version_info[:2]) >= (3, 9):
     # Python 3.9 and above
@@ -424,8 +424,8 @@ class InboundSyncStreamsConfiguration(SubscriptableBaseModel):
     """
 
     include_new_streams: bool
-    new_stream_sync_strategy: Optional[InboundSyncStrategy]
-    new_stream_storage_behaviour: Optional[InboundStorageBehaviour]
+    new_stream_sync_strategy: Optional[InboundSyncStrategy] = None
+    new_stream_storage_behaviour: Optional[InboundStorageBehaviour] = None
     included_streams: Dict[str, StoredStreamConfiguration]
     excluded_streams: List[str]
     bulk_configuration: InboundSyncBulkConfiguration = InboundSyncBulkConfiguration.CUSTOMIZE
@@ -536,10 +536,10 @@ class ConnectionConfigurationParameters(SubscriptableBaseModel):
     connection_secrets: Dict[str, StoredConfigurationValue] = None
     ngrok_tunnel_settings: Optional[NgrokTunnelSettings] = None
     access_token_secret_name: Optional[str] = None
-    _snowflake: Optional[Any] = None
 
-    class Config:
-        underscore_attrs_are_private = True
+    _snowflake: Optional[Any] = PrivateAttr(  # or use Any to annotate the type and use Field to initialize
+        default=None
+    )
 
     @validator("ngrok_tunnel_settings", always=True)
     def validate_ngrok_tunnel_settings(cls, v: str, values: dict[str, Any]) -> Optional[NgrokTunnelSettings]:
@@ -849,7 +849,7 @@ class StoredFieldMapping(SubscriptableBaseModel):
     app_metadata: dict = Field(default_factory=dict)
 
 
-StoredStreamConfiguration.update_forward_refs()
-InboundSyncStreamsConfiguration.update_forward_refs()
-StoredFieldMappings.update_forward_refs()
-OutboundSyncConfigurationParameters.update_forward_refs()
+StoredStreamConfiguration.model_rebuild()
+InboundSyncStreamsConfiguration.model_rebuild()
+StoredFieldMappings.model_rebuild()
+OutboundSyncConfigurationParameters.model_rebuild()

{omnata_plugin_runtime-0.4.11a111 → omnata_plugin_runtime-0.5.0a113}/src/omnata_plugin_runtime/forms.py

@@ -389,8 +389,8 @@ class NewOptionCreator(SubscriptableBaseModel):
         return v.__name__ if isinstance(v, MethodType) else v
 
 
-StaticFormOptionsDataSource.update_forward_refs()
-DynamicFormOptionsDataSource.update_forward_refs()
+StaticFormOptionsDataSource.model_rebuild()
+DynamicFormOptionsDataSource.model_rebuild()
 
 
 class FormFieldMappingSelector(FormFieldWithDataSource, BaseModel):

{omnata_plugin_runtime-0.4.11a111 → omnata_plugin_runtime-0.5.0a113}/src/omnata_plugin_runtime/omnata_plugin.py

@@ -30,13 +30,10 @@ from typing import Any, Callable, Dict, Iterable, List, Literal, Optional, Type,
 
 import jinja2
 import pandas
-import pydantic
-import pydantic.json
-from pydantic import Field, parse_obj_as, root_validator
+from pydantic_core import to_jsonable_python
+from pydantic import Field, TypeAdapter, root_validator, BaseModel
 from dateutil.parser import parse
 from jinja2 import Environment
-from pydantic import BaseModel  # pylint: disable=no-name-in-module
-from pandas import set_option
 from snowflake.connector.pandas_tools import write_pandas
 from snowflake.connector.version import VERSION
 from snowflake.snowpark import Session
@@ -127,7 +124,7 @@ class PluginInfo(BaseModel):
     manifest: PluginManifest
     anaconda_packages: List[str]
     bundled_packages: List[str]
-    icon_source: Optional[str]
+    icon_source: Optional[str] = None
     plugin_class_name: str
     has_custom_validator: bool
     plugin_runtime_version: str
@@ -368,7 +365,7 @@ class SyncRequest(ABC):
             if update_rate_limit_result is not None:
                 sync_id:int = update_rate_limit_result["sync_id"]
                 sync_branch_name:str = update_rate_limit_result["sync_branch_name"]
-                latest_state:Dict[int,Dict[str,Dict[str,RateLimitState]]] = parse_obj_as(Dict[int,Dict[str,Dict[str,RateLimitState]]],update_rate_limit_result["latest_state"])
+                latest_state = TypeAdapter(Dict[int,Dict[str,Dict[str,RateLimitState]]]).validate_python(update_rate_limit_result["latest_state"])
                 (rate_limit_state_all, rate_limit_state_this_branch) = RateLimitState.collapse(latest_state,sync_id, sync_branch_name)
                 self.rate_limit_state_all = rate_limit_state_all
                 self.rate_limit_state_this_sync_and_branch = rate_limit_state_this_branch
@@ -466,7 +463,7 @@ class SyncRequest(ABC):
                     self._session.sql(
                         f"""call {self._source_app_name}.API.PLUGIN_MESSAGE(
                                   {self._run_id},
-                                  PARSE_JSON($${json.dumps(message,default=pydantic.json.pydantic_encoder)}$$))"""
+                                  PARSE_JSON($${json.dumps(to_jsonable_python(message))}$$))"""
                     ).collect()
                 )
             except Exception as e:
@@ -1955,7 +1952,7 @@ def managed_outbound_processing(concurrency: int, batch_size: int):
                 dataframe_arg = method_args[0]
                 if dataframe_arg.__class__.__name__ != "DataFrame" and not hasattr(dataframe_arg, "__next__"):
                     raise ValueError(
-                        f"The first argument to a @managed_outbound_processing method must be a DataFrame or DataFrame generator (from outbound_sync_request.get_records). Instead, a {first_arg.__class__.__name__} was provided. Alternatively, you can provide these via the 'dataframe' or 'dataframe_generator' named arguments."
+                        f"The first argument to a @managed_outbound_processing method must be a DataFrame or DataFrame generator (from outbound_sync_request.get_records). Instead, a {dataframe_arg.__class__.__name__} was provided. Alternatively, you can provide these via the 'dataframe' or 'dataframe_generator' named arguments."
                     )
                 method_args = method_args[1:]
 

{omnata_plugin_runtime-0.4.11a111 → omnata_plugin_runtime-0.5.0a113}/src/omnata_plugin_runtime/plugin_entrypoints.py

@@ -8,8 +8,8 @@ import time
 import threading
 from typing import Dict, List, Optional
 
-from pydantic import BaseModel, parse_obj_as  # pylint: disable=no-name-in-module
-import pydantic.json
+from pydantic import BaseModel,TypeAdapter  # pylint: disable=no-name-in-module
+from pydantic_core import to_jsonable_python
 from snowflake.snowpark import Session
 
 from .api import PluginMessageStreamProgressUpdate, SyncRequestPayload, handle_proc_result
@@ -69,7 +69,7 @@ class PluginEntrypoint:
 
     def sync(self, sync_request: Dict):
         logger.info("Entered sync method")
-        request = parse_obj_as(SyncRequestPayload, sync_request)
+        request = TypeAdapter(SyncRequestPayload).validate_python(sync_request)
         connection_secrets = self.get_secrets(
             request.oauth_secret_name, request.other_secrets_name
         )
@@ -93,7 +93,7 @@ class PluginEntrypoint:
             connection_parameters.access_token_secret_name = request.oauth_secret_name
         all_api_limits = self._plugin_instance.api_limits(connection_parameters)
         logger.info(
-            f"Default API limits: {json.dumps(all_api_limits, default=pydantic.json.pydantic_encoder)}"
+            f"Default API limits: {json.dumps(to_jsonable_python(all_api_limits))}"
         )
         all_api_limits_by_category = {
             api_limit.endpoint_category: api_limit for api_limit in all_api_limits
@@ -109,7 +109,7 @@ 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)}"
+            f"Rate limits state: {json.dumps(to_jsonable_python(request.rate_limits_state))}"
         )
         (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
@@ -270,19 +270,15 @@ class PluginEntrypoint:
         oauth_secret_name = normalise_nulls(oauth_secret_name)
         other_secrets_name = normalise_nulls(other_secrets_name)
         connection_secrets = self.get_secrets(oauth_secret_name, other_secrets_name)
-        connection_parameters = parse_obj_as(
-            Dict[str, StoredConfigurationValue], connection_parameters
-        )
-        sync_parameters = parse_obj_as(
-            Dict[str, StoredConfigurationValue], sync_parameters
-        )
+        connection_parameters = TypeAdapter(
+            Dict[str, StoredConfigurationValue]).validate_python(connection_parameters)
+        sync_parameters = TypeAdapter(
+            Dict[str, StoredConfigurationValue]).validate_python(sync_parameters)
         form_parameters = None
         if current_form_parameters is not None:
-            form_parameters = parse_obj_as(
-                Dict[str, StoredConfigurationValue], current_form_parameters
-            )
+            form_parameters = TypeAdapter(Dict[str, StoredConfigurationValue]).validate_python(current_form_parameters)
         if sync_direction == "outbound":
-            sync_strat = OutboundSyncStrategy.parse_obj(sync_strategy) if sync_strategy is not None else None
+            sync_strat = OutboundSyncStrategy.model_validate(sync_strategy) if sync_strategy is not None else None
             parameters = OutboundSyncConfigurationParameters(
                 connection_parameters=connection_parameters,
                 connection_secrets=connection_secrets,
@@ -328,12 +324,10 @@ class PluginEntrypoint:
         oauth_secret_name = normalise_nulls(oauth_secret_name)
         other_secrets_name = normalise_nulls(other_secrets_name)
         connection_secrets = self.get_secrets(oauth_secret_name, other_secrets_name)
-        connection_parameters = parse_obj_as(
-            Dict[str, StoredConfigurationValue], connection_parameters
-        )
-        sync_parameters = parse_obj_as(
-            Dict[str, StoredConfigurationValue], sync_parameters
-        )
+        connection_parameters = TypeAdapter(
+            Dict[str, StoredConfigurationValue]).validate_python(connection_parameters)
+        sync_parameters = TypeAdapter(
+            Dict[str, StoredConfigurationValue]).validate_python(sync_parameters)
         parameters = InboundSyncConfigurationParameters(
             connection_parameters=connection_parameters,
             connection_secrets=connection_secrets,
@@ -360,9 +354,8 @@ class PluginEntrypoint:
         stored_values: List[Dict],
     ):
         logger.info("Entered construct_form_option method")
-        stored_values_parsed = parse_obj_as(
-            List[StoredConfigurationValue], stored_values
-        )
+        stored_values_parsed = TypeAdapter(
+            List[StoredConfigurationValue]).validate_python(stored_values)
         the_function = getattr(
             self._plugin_instance,
             function_name,
@@ -382,7 +375,7 @@ class PluginEntrypoint:
 
     def create_billing_events(self, session, event_request: Dict):
         logger.info("Entered create_billing_events method")
-        request = parse_obj_as(BillingEventRequest, event_request)
+        request = BillingEventRequest.model_validate(event_request)
         events: List[SnowflakeBillingEvent] = self._plugin_instance.create_billing_events(
             request
         )
@@ -435,7 +428,7 @@ class PluginEntrypoint:
                     other_secrets = json.loads(secret_string_content)
                     connection_secrets = {
                         **connection_secrets,
-                        **parse_obj_as(Dict[str, StoredConfigurationValue], other_secrets),
+                        **TypeAdapter(Dict[str, StoredConfigurationValue]).validate_python(other_secrets),
                     }
             except Exception as exception:
                 logger.error(f"Error parsing secrets content for secret {other_secrets_name}: {str(exception)}")
@@ -454,9 +447,8 @@ class PluginEntrypoint:
         oauth_secret_name = normalise_nulls(oauth_secret_name)
         other_secrets_name = normalise_nulls(other_secrets_name)
         connection_secrets = self.get_secrets(oauth_secret_name, other_secrets_name)
-        connection_parameters = parse_obj_as(
-            Dict[str, StoredConfigurationValue], connection_parameters
-        )
+        connection_parameters = TypeAdapter(
+            Dict[str, StoredConfigurationValue]).validate_python(connection_parameters)
         parameters = ConnectionConfigurationParameters(
             connection_method=connection_method,
             connection_parameters=connection_parameters,
@@ -484,9 +476,8 @@ class PluginEntrypoint:
         return self._plugin_instance.network_addresses(
             ConnectionConfigurationParameters(
                 connection_method=method,
-                connection_parameters=parse_obj_as(
-                    Dict[str, StoredConfigurationValue], connection_parameters
-                ),
+                connection_parameters=TypeAdapter(
+                    Dict[str, StoredConfigurationValue]).validate_python(connection_parameters),
                 connection_secrets={},
             )
         )
@@ -508,9 +499,8 @@ class PluginEntrypoint:
         )
         parameters = ConnectionConfigurationParameters(
             connection_method=method,
-            connection_parameters=parse_obj_as(
-                Dict[str, StoredConfigurationValue], connection_parameters
-            ),
+            connection_parameters=TypeAdapter(
+                Dict[str, StoredConfigurationValue]).validate_python(connection_parameters),
             connection_secrets=connection_secrets
         )
         if oauth_secret_name is not None:
@@ -555,15 +545,14 @@ class PluginEntrypoint:
         )
         connection_parameters = ConnectionConfigurationParameters(
             connection_method=method,
-            connection_parameters=parse_obj_as(
-                Dict[str, StoredConfigurationValue], connection_parameters
-            ),
+            connection_parameters=TypeAdapter(
+                Dict[str, StoredConfigurationValue]).validate_python(connection_parameters),
             connection_secrets=connection_secrets
         )
         if oauth_secret_name is not None:
             connection_parameters.access_token_secret_name = oauth_secret_name
         response: List[ApiLimits] = self._plugin_instance.api_limits(connection_parameters)
-        return [api_limit.dict() for api_limit in response]
+        return [api_limit.model_dump() for api_limit in response]
 
     def outbound_record_validator(
         self,
@@ -573,12 +562,9 @@ class PluginEntrypoint:
         source_types: Dict[str, str],
     ):
         # There's a bit of parsing here that could possibly be done outside of the handler function, but this shouldn't be too expensive
-        sync_parameters: Dict[str, StoredConfigurationValue] = parse_obj_as(
-            Dict[str, StoredConfigurationValue], sync_parameters
-        )
-        field_mappings: StoredMappingValue = parse_obj_as(
-            StoredMappingValue, field_mappings
-        )
+        sync_parameters: Dict[str, StoredConfigurationValue] = TypeAdapter(
+            Dict[str, StoredConfigurationValue]).validate_python(sync_parameters)
+        field_mappings: StoredMappingValue = StoredMappingValue.model_validate(field_mappings)
         return self._plugin_instance.outbound_record_validator(
             sync_parameters, field_mappings, transformed_record, source_types
         )

{omnata_plugin_runtime-0.4.11a111 → omnata_plugin_runtime-0.5.0a113}/src/omnata_plugin_runtime/rate_limiting.py

@@ -12,8 +12,8 @@ from typing import Any, List, Literal, Optional, Dict, Tuple
 import requests
 import time
 import logging
-from pydantic import Field, root_validator
-from pydantic.json import pydantic_encoder
+from pydantic import Field, root_validator, PrivateAttr, field_serializer
+from pydantic_core import to_jsonable_python
 from .configuration import SubscriptableBaseModel
 import pytz
 from requests.adapters import HTTPAdapter
@@ -160,7 +160,7 @@ def epoch_milliseconds_to_datetime(epoch: int) -> datetime.datetime:
 def datetimes_as_ints_encoder(obj):
     if isinstance(obj, datetime.datetime):
         return datetime_to_epoch_milliseconds(obj)
-    return pydantic_encoder(obj)
+    return to_jsonable_python(obj)
 
 
 class RateLimitState(SubscriptableBaseModel):
@@ -178,7 +178,22 @@ class RateLimitState(SubscriptableBaseModel):
         [],
         description="A list of timestamps where previous requests have been made, used to calculate the next request time",
     )
-    _request_timestamps_lock = threading.Lock()
+    
+    _request_timestamps_lock: threading.Lock = PrivateAttr(  # or use Any to annotate the type and use Field to initialize
+        default_factory=lambda: threading.Lock()
+    )
+
+    @field_serializer('wait_until',when_used='always')
+    def serialize_wait_until(self, value:Optional[datetime.datetime]) -> Optional[int]:
+        # if a datetime is provided, convert it to epoch milliseconds
+        if value is not None:
+            return datetime_to_epoch_milliseconds(value)
+
+    @field_serializer('previous_request_timestamps',when_used='always')
+    def serialize_previous_request_timestamps(self, value:List[datetime.datetime]) -> List[int]:
+        # if a list of datetimes is provided, convert them to epoch milliseconds
+        return [datetime_to_epoch_milliseconds(ts) if ts else None for ts in value]
+
 
     # Combined root validator
     @root_validator(pre=True)
@@ -545,4 +560,4 @@ def too_many_requests_hook(
     return hook
 
 
-ApiLimits.update_forward_refs()
+ApiLimits.model_rebuild()