omnata-plugin-runtime 0.3.25a78__tar.gz → 0.3.26a79__tar.gz

{omnata_plugin_runtime-0.3.25a78 → omnata_plugin_runtime-0.3.26a79}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omnata-plugin-runtime
-Version: 0.3.25a78
+Version: 0.3.26a79
 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.25a78 → omnata_plugin_runtime-0.3.26a79}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "omnata-plugin-runtime"
-version = "0.3.25-a78"
+version = "0.3.26-a79"
 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.3.25a78 → omnata_plugin_runtime-0.3.26a79}/src/omnata_plugin_runtime/omnata_plugin.py

@@ -1415,6 +1415,10 @@ class MonthlyBillingEventRequest(BaseModel):
     # below is deprecated
     has_active_inbound: bool = False
     has_active_outbound: bool = False
+    # had to add these because the old version of the standard billing events assumed a daily billing event
+    # TODO: deprecate all of these once the plugins are all on 0.3.26 or higher
+    billable_connections_inbound: int = 0
+    billable_connections_outbound: int = 0
 
 
 BillingEventRequest = Annotated[Union[DailyBillingEventRequest,MonthlyBillingEventRequest],Field(discriminator='billing_schedule')]
@@ -1622,27 +1626,29 @@ class OmnataPlugin(ABC):
         """
         sent_initial = False
         events: List[SnowflakeBillingEvent] = []
-        for i in range(request.billable_connections_inbound + request.billable_connections_outbound):
-            if sent_initial is False:
-                events.append(
-                    SnowflakeBillingEvent(
-                        billing_class="DAILY_ACTIVE_INITIAL",
-                        billing_subclass="",
-                        timestamp=datetime.datetime.now(tz=datetime.timezone.utc),
-                        base_charge=initial_charge,
-                    )
-                )
-                sent_initial = True
-            else:
-                if additional_charge is not None and additional_charge > 0:
+        if request.billing_schedule == "DAILY":
+            for i in range(request.billable_connections_inbound + request.billable_connections_outbound):
+                if sent_initial is False:
                     events.append(
                         SnowflakeBillingEvent(
-                            billing_class="DAILY_ACTIVE_ADDITIONAL",
+                            billing_class="DAILY_ACTIVE_INITIAL",
                             billing_subclass="",
                             timestamp=datetime.datetime.now(tz=datetime.timezone.utc),
-                            base_charge=additional_charge,
+                            base_charge=initial_charge,
                         )
                     )
+                    sent_initial = True
+                else:
+                    if additional_charge is not None and additional_charge > 0:
+                        events.append(
+                            SnowflakeBillingEvent(
+                                billing_class="DAILY_ACTIVE_ADDITIONAL",
+                                billing_subclass="",
+                                timestamp=datetime.datetime.now(tz=datetime.timezone.utc),
+                                base_charge=additional_charge,
+                            )
+                        )
+        # handle monthly billing events inside the plugins for now
         return events
 
     def additional_loggers(self) -> List[str]: