omnata-plugin-runtime 0.9.1a212__tar.gz → 0.9.2a213__tar.gz

{omnata_plugin_runtime-0.9.1a212 → omnata_plugin_runtime-0.9.2a213}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.9.1-a212"
+version = "0.9.2-a213"
 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.9.1a212 → omnata_plugin_runtime-0.9.2a213}/src/omnata_plugin_runtime/configuration.py

@@ -7,10 +7,11 @@ import json
 import sys
 import logging
 from typing import Any, List, Dict, Literal, Union, Optional
+from typing_extensions import Self
 from enum import Enum
 
 from abc import ABC
-from pydantic import BaseModel, Field, PrivateAttr, SerializationInfo, TypeAdapter, field_validator, model_serializer, validator  # pylint: disable=no-name-in-module
+from pydantic import BaseModel, Field, PrivateAttr, SerializationInfo, TypeAdapter, field_validator, model_serializer, model_validator  # pylint: disable=no-name-in-module
 from .logging import logger, tracer
 
 if tuple(sys.version_info[:2]) >= (3, 9):
@@ -599,22 +600,20 @@ class ConnectionConfigurationParameters(SubscriptableBaseModel):
         default=None
     )
 
-    @field_validator('ngrok_tunnel_settings',mode='before')
-    @classmethod
-    def validate_ngrok_tunnel_settings(cls, values: Optional[dict[str, Any]]) -> Optional[NgrokTunnelSettings]:
-        if "connection_secrets" in values:
-            connection_secrets:Dict[str, StoredConfigurationValue] = values["connection_secrets"]
-            if "ngrok_client_certificate" in connection_secrets and \
-                "ngrok_client_key" in connection_secrets and \
-                "ngrok_endpoint_host" in connection_secrets and \
-                "ngrok_endpoint_port" in connection_secrets:
-                return NgrokTunnelSettings(
-                    endpoint_host=connection_secrets["ngrok_endpoint_host"].value,
-                    endpoint_port=connection_secrets["ngrok_endpoint_port"].value,
-                    client_certificate=connection_secrets["ngrok_client_certificate"].value,
-                    client_key=connection_secrets["ngrok_client_key"].value
+    @model_validator(mode='after')
+    def validate_ngrok_tunnel_settings(self) -> Self:
+        if self.connection_secrets:
+            if "ngrok_client_certificate" in self.connection_secrets and \
+                "ngrok_client_key" in self.connection_secrets and \
+                "ngrok_endpoint_host" in self.connection_secrets and \
+                "ngrok_endpoint_port" in self.connection_secrets:
+                self.ngrok_tunnel_settings = NgrokTunnelSettings(
+                    endpoint_host=self.connection_secrets["ngrok_endpoint_host"].value,
+                    endpoint_port=int(self.connection_secrets["ngrok_endpoint_port"].value),
+                    client_certificate=self.connection_secrets["ngrok_client_certificate"].value,
+                    client_key=self.connection_secrets["ngrok_client_key"].value
                 )
-        return None
+        return self
 
     def get_connection_parameter(self, parameter_name: str) -> StoredConfigurationValue:
         """