additional cleanup / type fixes, consolidate Union types

	build-public-backend.sh

Author: ikreymer

backend/btrixcloud/models.py

@@ -1974,6 +1974,24 @@ class SubscriptionAddMinutesOut(SubscriptionAddMinutes, SubscriptionEventOut):
     type: Literal["add-minutes"] = "add-minutes"
 
 
+# ============================================================================
+SubscriptionEventAny = Union[
+    SubscriptionCreate,
+    SubscriptionUpdate,
+    SubscriptionCancel,
+    SubscriptionImport,
+    SubscriptionAddMinutes,
+]
+
+SubscriptionEventAnyOut = Union[
+    SubscriptionCreateOut,
+    SubscriptionUpdateOut,
+    SubscriptionCancelOut,
+    SubscriptionImportOut,
+    SubscriptionAddMinutesOut,
+]
+
+
 # ============================================================================
 class SubscriptionTrialEndReminder(BaseModel):
     """Email reminder that subscription will end soon"""
@@ -3146,14 +3164,7 @@ class PaginatedProfileResponse(PaginatedResponse):
 class PaginatedSubscriptionEventResponse(PaginatedResponse):
     """Response model for paginated subscription events"""
 
-    items: List[
-        Union[
-            SubscriptionCreateOut,
-            SubscriptionUpdateOut,
-            SubscriptionCancelOut,
-            SubscriptionImportOut,
-        ]
-    ]
+    items: List[SubscriptionEventAnyOut]
 
 
 # ============================================================================

backend/btrixcloud/subs.py

@@ -2,7 +2,7 @@
 Subscription API handling
 """
 
-from typing import Awaitable, Callable, Union, Any, Optional, Tuple, List, Annotated
+from typing import Awaitable, Callable, Any, Optional, Tuple, List, Annotated
 import os
 import asyncio
 from uuid import UUID
@@ -24,11 +24,13 @@
     SubscriptionUpdate,
     SubscriptionCancel,
     SubscriptionAddMinutes,
+    SubscriptionEventAny,
     SubscriptionCreateOut,
     SubscriptionImportOut,
     SubscriptionUpdateOut,
     SubscriptionCancelOut,
     SubscriptionAddMinutesOut,
+    SubscriptionEventAnyOut,
     SubscriptionEventType,
     Subscription,
     SubscriptionPortalUrlRequest,
@@ -247,13 +249,7 @@ async def add_sub_minutes(self, add_min: SubscriptionAddMinutes):
     async def add_sub_event(
         self,
         type_: SubscriptionEventType,
-        event: Union[
-            SubscriptionCreate,
-            SubscriptionImport,
-            SubscriptionUpdate,
-            SubscriptionCancel,
-            SubscriptionAddMinutes,
-        ],
+        event: SubscriptionEventAny,
         oid: UUID,
     ) -> None:
         """add a subscription event to the db"""
@@ -263,24 +259,20 @@ async def add_sub_event(
         data["oid"] = oid
         await self.subs.insert_one(data)
 
-    def _get_sub_by_type_from_data(self, data: dict[str, object]) -> Union[
-        SubscriptionCreateOut,
-        SubscriptionImportOut,
-        SubscriptionUpdateOut,
-        SubscriptionCancelOut,
-        SubscriptionAddMinutesOut,
-    ]:
+    def _get_sub_by_type_from_data(
+        self, data: dict[str, object]
+    ) -> SubscriptionEventAnyOut:
         """convert dict to propert background job type"""
         if data["type"] == "create":
             return SubscriptionCreateOut(**data)
         if data["type"] == "import":
             return SubscriptionImportOut(**data)
         if data["type"] == "update":
             return SubscriptionUpdateOut(**data)
-        if data["type"] == "add-minutes":
-            return SubscriptionAddMinutesOut(**data)
         if data["type"] == "cancel":
             return SubscriptionCancelOut(**data)
+        if data["type"] == "add-minutes":
+            return SubscriptionAddMinutesOut(**data)
 
         raise HTTPException(status_code=500, detail="unknown sub event")
 
@@ -297,15 +289,7 @@ async def list_sub_events(
         sort_by: Optional[str] = None,
         sort_direction: Optional[int] = -1,
     ) -> Tuple[
-        List[
-            Union[
-                SubscriptionCreateOut,
-                SubscriptionImportOut,
-                SubscriptionUpdateOut,
-                SubscriptionCancelOut,
-                SubscriptionAddMinutesOut,
-            ]
-        ],
+        List[SubscriptionEventAnyOut],
         int,
     ]:
         """list subscription events"""

backend/test/test_org_subs.py

@@ -762,7 +762,7 @@ def test_subscription_events_log_filter_sort(admin_auth_headers):
 
     last_id = None
     for event in events:
-        sub_id = event["subId"]
+        sub_id = event.get("subId")
         if last_id:
             assert last_id <= sub_id
         last_id = sub_id
@@ -778,7 +778,7 @@ def test_subscription_events_log_filter_sort(admin_auth_headers):
 
     last_id = None
     for event in events:
-        sub_id = event["subId"]
+        sub_id = event.get("subId")
         if last_id:
             assert last_id >= sub_id
         last_id = sub_id
@@ -961,7 +961,7 @@ def test_subscription_add_minutes(admin_auth_headers):
     assert len(quota_updates)
     last_update = quota_updates[len(quota_updates) - 1]
 
-    assert last_update["type"] == "add-minutes"
+    print(last_update)
     assert last_update["context"] == "addon"
     assert last_update["update"] == {
         "maxPagesPerCrawl": 100,