Merge release/v1.9.0 to develop

.github/workflows/pr.yml

@@ -3,11 +3,6 @@ name: Pull Request
 on:
   pull_request:
     types: [opened, synchronize]
-    branches:
-      - develop
-      - feat/*
-      - main
-      - release/v[0-9]+.[0-9]+.[0-9]+
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

app/packages/looker-3d/src/hooks/use-fo-loaders.ts

@@ -1,5 +1,13 @@
 import { useLoader } from "@react-three/fiber";
 
+function ensureArray(value) {
+  if (Array.isArray(value)) {
+    return value;
+  } else {
+    return [value];
+  }
+}
+
 /**
  * Decorates useLoader() to support credentials forwarding
  */
@@ -12,8 +20,17 @@ export function useFoLoader<
   loaderFunction?: Parameters<typeof useLoader>[2]
 ) {
   return useLoader(loader, urls, (loaderInstance) => {
-    if (sessionStorage.getItem("customCredentialsAudience")?.length) {
-      loaderInstance.setWithCredentials(true);
+    const customCredentialsAudience = sessionStorage.getItem(
+      "customCredentialsAudience"
+    );
+    if (customCredentialsAudience) {
+      // The types say that `urls` is string | string[]
+      // But! Our code also sometimes passes in string[][]
+      // So, we're both calling ensureArray() and flat()
+      const urlArray = ensureArray(urls).flat();
+      if (urlArray.some((url) => url.includes(customCredentialsAudience))) {
+        loaderInstance.setWithCredentials(true);
+      }
     }
     if (loaderFunction) {
       loaderFunction(loaderInstance);

fiftyone/factory/repos/delegated_operation.py

@@ -186,18 +186,23 @@ def _create_indexes(self):
                 )
             )
 
-        if "dataset_id_1" not in index_names:
+        if "parent_id_1" not in index_names:
             indices_to_create.append(
                 IndexModel(
-                    [("dataset_id", pymongo.ASCENDING)], name="dataset_id_1"
+                    [("parent_id", pymongo.ASCENDING)],
+                    name="parent_id_1",
                 )
             )
 
-        if "parent_id_1" not in index_names:
+        if "dataset_id_1_parent_id_1_scheduled_at_1" not in index_names:
             indices_to_create.append(
                 IndexModel(
-                    [("parent_id", pymongo.ASCENDING)],
-                    name="parent_id_1",
+                    [
+                        ("dataset_id", pymongo.ASCENDING),
+                        ("parent_id", pymongo.ASCENDING),
+                        ("scheduled_at", pymongo.DESCENDING),
+                    ],
+                    name="dataset_id_1_parent_id_1_scheduled_at_1",
                 )
             )
 

fiftyone/factory/repos/delegated_operation_doc.py

@@ -6,7 +6,6 @@
 |
 """
 import copy
-import dataclasses
 import logging
 from datetime import datetime
 
@@ -137,14 +136,23 @@ def from_pymongo(self, doc: dict):
         return self
 
     def to_pymongo(self) -> dict:
-        d = copy.deepcopy(self.__dict__)
+        # We make a copy of self.__dict__ so that changes we make below do not
+        # affect the actual object. We exclude certain keys that we don't want
+        # to serialize directly. "context" is particularly important we do not
+        # try to copy because it may contain big, complicated, non-serializable
+        # objects that may cause issues with copying.
+
+        ignore_keys = {"_doc", "id", "context", "pipeline"}
+        d = {
+            k: copy.deepcopy(v)
+            for k, v in self.__dict__.items()
+            if k not in ignore_keys
+        }
         if self.context:
             d["context"] = {
                 "request_params": self.context._get_serialized_request_params()
             }
         if self.pipeline:
             d["pipeline"] = self.pipeline.to_json()
 
-        d.pop("_doc", None)
-        d.pop("id", None)
         return d

tests/unittests/operators/delegated_tests.py

@@ -1671,3 +1671,34 @@ def test_set_queue_remote_service(self, mock_get_operator):
         #####
         self.assertRaises(PermissionError, dos.set_queued, op_id)
         #####
+
+    def test_queue_panel_delegated_op(self, mock_get_operator):
+        """Queue DO that comes from a panel"""
+        self.mock_is_remote_service.return_value = True
+        db = delegated_operation.MongoDelegatedOperationRepo()
+        dos = DelegatedOperationService(repo=db)
+        ctx = ExecutionContext(
+            request_params={
+                "params": {
+                    "panel_id": bson.ObjectId(),
+                    "panel_state": {"foo2": "bar2"},
+                }
+            }
+        )
+        ctx.request_params = {"foo": "bar"}
+        ctx.params = {
+            "panel_id": bson.ObjectId(),
+            "panel_state": {"foo2": "bar2"},
+        }
+
+        #####
+        doc = dos.queue_operation(
+            operator=f"{TEST_DO_PREFIX}/operator/foo",
+            label=mock_get_operator.return_value.name,
+            delegation_target="test_target",
+            context=ctx,
+        )
+        #####
+
+        self.docs_to_delete.append(doc)
+        self.assertEqual(doc.run_state, ExecutionRunState.SCHEDULED)