omnata-plugin-runtime 0.3.8__py3-none-any.whl → 0.3.9__py3-none-any.whl

omnata_plugin_runtime/omnata_plugin.py

@@ -4,6 +4,15 @@ Omnata Plugin Runtime.
 Includes data container classes and defines the contract for a plugin.
 """
 from __future__ import annotations
+import sys
+from typing import Union
+if tuple(sys.version_info[:2]) >= (3, 9):
+    # Python 3.9 and above
+    from typing import Annotated  # pylint: disable=ungrouped-imports
+else:
+    # Python 3.8 and below
+    from typing_extensions import Annotated
+
 
 import datetime
 import http
@@ -20,7 +29,7 @@ import jinja2
 import pandas
 import pydantic
 import pydantic.json
-from pydantic import parse_obj_as, root_validator
+from pydantic import Field, parse_obj_as, root_validator
 from dateutil.parser import parse
 from jinja2 import Environment
 from pydantic import BaseModel  # pylint: disable=no-name-in-module
@@ -1208,17 +1217,37 @@ class SnowflakeBillingEvent(BaseModel):
                 raise ValueError("start_timestamp must be timezone aware")
         return values
 
-class BillingEventRequest(BaseModel):
+class DailyBillingEventRequest(BaseModel):
     """
     Represents a request to provide billing events for that day.
+    These will occur at midnight, and cover the previous 24 hours.
+    Provides enough information for the plugin to create billing events for the day.
+    """
+
+    billing_schedule: Literal["DAILY"] = "DAILY"
+    billable_connections_inbound: int = 0
+    billable_connections_outbound: int = 0
+    # below is deprecated
+    has_active_inbound: bool = False
+    has_active_outbound: bool = False
+
+class MonthlyBillingEventRequest(BaseModel):
+    """
+    Represents a request to provide billing events for that month.
+    These will occur at midnight on the first of each month, and cover the whole previous month.
+    Currently, these exist to provide a way to bill for the number of active ngrok connections
+    and associated data overages.
     """
 
-    billing_schedule: Literal["DAILY"]
-    has_active_inbound: bool
-    has_active_outbound: bool
+    billing_schedule: Literal["MONTHLY"] = "MONTHLY"
+    distinct_active_ngrok_connections: int = 0
+    ngrok_data_usage_bytes: int = 0
+    # below is deprecated
+    has_active_inbound: bool = False
+    has_active_outbound: bool = False
 
 
-# BillingEventRequest = Annotated[Union[DailyBillingEventRequest,...],Field(discriminator='billing_schedule')]
+BillingEventRequest = Annotated[Union[DailyBillingEventRequest,MonthlyBillingEventRequest],Field(discriminator='billing_schedule')]
 
 
 class OmnataPlugin(ABC):

omnata_plugin_runtime/plugin_entrypoints.py

@@ -392,7 +392,7 @@ class PluginEntrypoint:
                 result = session.sql(event_query).collect()
                 logger.info(f"Billing event result: {result}")
             except Exception as e:
-                if '370001:3159209004' in str(e):
+                if '370001:3159209004' in str(e) or 'Application instance is not installed from listing' in str(e):
                     logger.warn('Billing event creation failed due to running internally to Omnata')
                 else:
                     raise e
@@ -420,7 +420,7 @@ class PluginEntrypoint:
                     }
             except Exception as exception:
                 logger.error(f"Error parsing secrets content for secret {other_secrets_name}: {str(exception)}")
-                raise ValueError("Error parsing secrets content:") from exception
+                raise ValueError(f"Error parsing secrets content: {str(exception)}") from exception
         return connection_secrets
     
     def ngrok_post_tunnel_fields(

{omnata_plugin_runtime-0.3.8.dist-info → omnata_plugin_runtime-0.3.9.dist-info}/METADATA

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

@@ -3,10 +3,10 @@ omnata_plugin_runtime/api.py,sha256=_N5ok5LN7GDO4J9n3yduXp3tpjmhpySY__U2baiygrs,
 omnata_plugin_runtime/configuration.py,sha256=at29ExowF_T4_2U9gY0BF4IVdwC-vDytmNRHL7UCWh8,34742
 omnata_plugin_runtime/forms.py,sha256=30CJB24TqfLYNnkplZdUbeqA-P9rUIBujVKXw_S-wKY,18371
 omnata_plugin_runtime/logging.py,sha256=bn7eKoNWvtuyTk7RTwBS9UARMtqkiICtgMtzq3KA2V0,3272
-omnata_plugin_runtime/omnata_plugin.py,sha256=KHyYquBqOXsPDtl_fH1tMMpugwRKCHUQME7ok6rV1jY,88493
-omnata_plugin_runtime/plugin_entrypoints.py,sha256=7Iqo_OmfKhnJ6jSjSABlGSRz4-E9WRkbgs-gMPTVfk0,27586
+omnata_plugin_runtime/omnata_plugin.py,sha256=y9I8ADK74vd1yjj6ma6oaRna9rIRRCWy3HQo_6p8ECA,89661
+omnata_plugin_runtime/plugin_entrypoints.py,sha256=_XgmWsrHoSshkl5Z2T27BAGVnBh4yH-8lni5sdGlSz8,27670
 omnata_plugin_runtime/rate_limiting.py,sha256=se6MftQI5NrVHaLb1hByPCgAESPQhkAgIG7KIU1clDU,16562
-omnata_plugin_runtime-0.3.8.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
-omnata_plugin_runtime-0.3.8.dist-info/METADATA,sha256=OedzIg-N0-OBrLyMuA6KNTpjpB5-7z4yrSoCW4y-L_I,1600
-omnata_plugin_runtime-0.3.8.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-omnata_plugin_runtime-0.3.8.dist-info/RECORD,,
+omnata_plugin_runtime-0.3.9.dist-info/LICENSE,sha256=IMF9i4xIpgCADf0U-V1cuf9HBmqWQd3qtI3FSuyW4zE,26526
+omnata_plugin_runtime-0.3.9.dist-info/METADATA,sha256=X4sY5HFP2FKMETC256GYN2hHNt17ctytu1Ht6LyiiSg,1600
+omnata_plugin_runtime-0.3.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+omnata_plugin_runtime-0.3.9.dist-info/RECORD,,

{omnata_plugin_runtime-0.3.8.dist-info → omnata_plugin_runtime-0.3.9.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.8.1
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any