Fix: ManifestPartition.from_json does not convert search_after to tup…

…le (#3291, PR #3418)
DataBiosphere · Sep 20, 2021 · 0a40364 · 0a40364
2 parents ddfc0f4 + edae751
commit 0a40364
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/azul/service/manifest_service.py b/src/azul/service/manifest_service.py
@@ -256,9 +256,10 @@ class ManifestPartition:
 
     @classmethod
     def from_json(cls, partition: JSON) -> 'ManifestPartition':
-        # FIXME: Should convert search_after from list back to tuple
-        #        https://github.com/databiosphere/azul/issues/3291
-        return cls(**partition)
+        return cls(**{
+            k: tuple(v) if isinstance(v, list) else v
+            for k, v in partition.items()
+        })
 
     def to_json(self) -> MutableJSON:
         return attr.asdict(self)

diff --git a/test/service/test_manifest_async.py b/test/service/test_manifest_async.py
@@ -218,9 +218,7 @@ def test(self, mock_uuid, mock_helper):
                                           part_etags=('some_etag',),
                                           page_index=512,
                                           is_last_page=False,
-                                          # FIXME: Should really be a tuple
-                                          #        https://github.com/databiosphere/azul/issues/3291
-                                          search_after=['foo', 'doc#bar'])  # type: ignore
+                                          search_after=('foo', 'doc#bar'))
                     )
 
                     with mock.patch.object(ManifestService, 'get_manifest') as mock_get_manifest: