omnata-plugin-runtime 0.9.1a212__py3-none-any.whl → 0.9.2__py3-none-any.whl

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:
         """

{omnata_plugin_runtime-0.9.1a212.dist-info → omnata_plugin_runtime-0.9.2.dist-info}/METADATA

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

@@ -1,13 +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/configuration.py,sha256=H1snDDtS4DF2AILynob878ZKcronnZl5Qig6dE9KDoc,41189
 omnata_plugin_runtime/forms.py,sha256=9YHJ_T17lT-rwyDaUg_0yj_YMPda4DRCw_wrvf8hE0E,19964
 omnata_plugin_runtime/json_schema.py,sha256=Q5lGoRRoM_RKd4LzuH2khLTweqFoskgAr1oLGHczR0Y,25807
 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.1a212.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
-omnata_plugin_runtime-0.9.1a212.dist-info/METADATA,sha256=VP6QW_sICEcvGfUVtYIbZMu6JjexYIpcbAR5E3_XOXI,2158
-omnata_plugin_runtime-0.9.1a212.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-omnata_plugin_runtime-0.9.1a212.dist-info/RECORD,,
+omnata_plugin_runtime-0.9.2.dist-info/LICENSE,sha256=rGaMQG3R3F5-JGDp_-rlMKpDIkg5n0SI4kctTk8eZSI,56
+omnata_plugin_runtime-0.9.2.dist-info/METADATA,sha256=bZ76-kz-0kGPBq5pLPU6vENgTAwEsfomnQT5vzJezbY,2154
+omnata_plugin_runtime-0.9.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+omnata_plugin_runtime-0.9.2.dist-info/RECORD,,