Merge pull request #2288 from voxel51/bugfix/v0.16.6-compat

Patch v0.16.6 compatibility
voxel51 · Nov 26, 2022 · f8ef906 · f8ef906
2 parents b3ab6b8 + 9638da5
commit f8ef906
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/app/packages/core/src/__generated__/DatasetQuery.graphql.ts b/app/packages/core/src/__generated__/DatasetQuery.graphql.ts
diff --git a/app/packages/relay/src/mutations/__generated__/setViewMutation.graphql.ts b/app/packages/relay/src/mutations/__generated__/setViewMutation.graphql.ts
diff --git a/app/schema.graphql b/app/schema.graphql
@@ -136,7 +136,7 @@ type Dataset {
 }
 
 type DatasetAppConfig {
-  mediaFields: [String!]!
+  mediaFields: [String!]
   plugins: JSON
   sidebarGroups: [SidebarGroup!]
   sidebarMode: SidebarMode

diff --git a/fiftyone/core/odm/dataset.py b/fiftyone/core/odm/dataset.py
@@ -546,7 +546,9 @@ class DatasetDocument(Document):
     default_group_slice = StringField()
     tags = ListField(StringField())
     info = DictField()
-    app_config = EmbeddedDocumentField(DatasetAppConfig)
+    app_config = EmbeddedDocumentField(
+        DatasetAppConfig, default=DatasetAppConfig
+    )
     classes = DictField(ClassesField())
     default_classes = ClassesField()
     mask_targets = DictField(TargetsField())

diff --git a/fiftyone/server/metadata.py b/fiftyone/server/metadata.py
@@ -358,11 +358,7 @@ class FFmpegNotFoundException(RuntimeError):
 def _create_media_urls(
     collection: SampleCollection, sample: t.Dict, cache: t.Dict
 ) -> t.Dict[str, str]:
-    media_fields = (
-        collection.app_config.media_fields
-        if collection.app_config
-        else ["filepath"]
-    )
+    media_fields = collection.app_config.media_fields
     media_urls = []
 
     for field in media_fields:

diff --git a/fiftyone/server/query.py b/fiftyone/server/query.py
@@ -134,7 +134,7 @@ class SidebarMode(Enum):
 
 @gql.type
 class DatasetAppConfig:
-    media_fields: t.List[str]
+    media_fields: t.Optional[t.List[str]]
     plugins: t.Optional[JSON]
     sidebar_groups: t.Optional[t.List[SidebarGroup]]
     sidebar_mode: t.Optional[SidebarMode]