[Core-547] Client: Catalog support for new event rules and new event …

…types (#12708)

GitOrigin-RevId: a601c1bee027f55073963429237b36d4312b3d11

descarteslabs/core/catalog/__init__.py

@@ -55,12 +55,17 @@
 from .event_rule import EventRule, EventRuleCollection, EventRuleSearch, EventRuleTarget
 from .event_schedule import EventSchedule, EventScheduleCollection, EventScheduleSearch
 from .event_subscription import (
+    ComputeFunctionCompletedEventSubscription,
     EventSubscription,
     EventSubscriptionCollection,
     EventSubscriptionComputeTarget,
     EventSubscriptionSearch,
+    EventSubscriptionSqsTarget,
     EventSubscriptionTarget,
     EventType,
+    NewImageEventSubscription,
+    NewStorageEventSubscription,
+    NewVectorEventSubscription,
     Placeholder,
     ScheduledEventSubscription,
 )
@@ -119,6 +124,7 @@
     "CatalogObject",
     "ClassBand",
     "Colormap",
+    "ComputeFunctionCompletedEventSubscription",
     "DataType",
     "DeletedObjectError",
     "DeletionTaskStatus",
@@ -140,6 +146,7 @@
     "EventSubscriptionCollection",
     "EventSubscriptionComputeTarget",
     "EventSubscriptionSearch",
+    "EventSubscriptionSqsTarget",
     "EventSubscriptionTarget",
     "EventType",
     "File",
@@ -160,6 +167,9 @@
     "MaskBand",
     "MicrowaveBand",
     "NamedCatalogObject",
+    "NewImageEventSubscription",
+    "NewStorageEventSubscription",
+    "NewVectorEventSubscription",
     "OverviewResampler",
     "Placeholder",
     "ProcessingLevelsAttribute",

descarteslabs/core/catalog/blob.py

@@ -462,7 +462,11 @@ def get_or_create(
         if (not id and not name) or (id and name):
             raise TypeError("Must specify exactly one of id or name parameters")
         if not id:
-            id = f"{storage_type}/{Blob.namespace_id(namespace)}/{name}"
+            namespace = cls.namespace_id(namespace)
+            id = f"{storage_type}/{namespace}/{name}"
+            kwargs["storage_type"] = storage_type
+            kwargs["namespace"] = namespace
+            kwargs["name"] = name
 
         return super(cls, Blob).get_or_create(id, client=client, **kwargs)
 

descarteslabs/core/catalog/event_api_destination.py

@@ -455,7 +455,10 @@ def get_or_create(
         if (not id and not name) or (id and name):
             raise TypeError("Must specify exactly one of id or name parameters")
         if not id:
-            id = f"{cls.namespace_id(namespace)}:{name}"
+            namespace = cls.namespace_id(namespace)
+            id = f"{namespace}:{name}"
+            kwargs["namespace"] = namespace
+            kwargs["name"] = name
 
         return super(cls, EventApiDestination).get_or_create(
             id, client=client, **kwargs

descarteslabs/core/catalog/event_rule.py

@@ -256,6 +256,13 @@ class EventRule(CatalogObject):
         str,
         doc="""str: The ARN of the event bus to which this rule belongs.""",
     )
+    role_arn = TypedAttribute(
+        str,
+        doc="""str, optional: The ARN of the role to assume when targeting another Event Bus.
+
+        *Filterable, sortable*.
+        """,
+    )
     rule_arn = TypedAttribute(
         str,
         doc="""str: The ARN of the rule.""",
@@ -444,7 +451,10 @@ def get_or_create(
         if (not id and not name) or (id and name):
             raise TypeError("Must specify exactly one of id or name parameters")
         if not id:
-            id = f"{cls.namespace_id(namespace)}:{name}"
+            namespace = cls.namespace_id(namespace)
+            id = f"{namespace}:{name}"
+            kwargs["namespace"] = namespace
+            kwargs["name"] = name
 
         return super(cls, EventRule).get_or_create(id, client=client, **kwargs)
 

descarteslabs/core/catalog/event_schedule.py

@@ -372,7 +372,10 @@ def get_or_create(
         if (not id and not name) or (id and name):
             raise TypeError("Must specify exactly one of id or name parameters")
         if not id:
-            id = f"{cls.namespace_id(namespace)}:{name}"
+            namespace = cls.namespace_id(namespace)
+            id = f"{namespace}:{name}"
+            kwargs["namespace"] = namespace
+            kwargs["name"] = name
 
         return super(cls, EventSchedule).get_or_create(id, client=client, **kwargs)