fix bucket cache keying

rhelmot · Jul 14, 2024 · 021591a · 021591a
1 parent 0ccd16b
commit 021591a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pydatatask/query/builtins.py b/pydatatask/query/builtins.py
@@ -377,7 +377,7 @@ async def map_values(a: repomodule.Repository, b: Callable[[object], Awaitable[o
     async def inner(_key, obj):
         return await b(obj)
 
-    return a.map(inner)
+    return a.map(inner, [])
 
 
 @_builtin("map")
@@ -398,7 +398,7 @@ async def map_key_values(
     async def inner(key, obj):
         return await b(Key(key), obj)
 
-    return a.map(inner)
+    return a.map(inner, [])
 
 
 @_builtin("rekey")
@@ -407,9 +407,9 @@ async def inner(k: str) -> str:
         return str(await b(Key(k)))
 
     if isinstance(a, repomodule.MetadataRepository):
-        return repomodule.RelatedItemMetadataRepository(a, repomodule.FunctionCallMetadataRepository(inner, a))
+        return repomodule.RelatedItemMetadataRepository(a, repomodule.FunctionCallMetadataRepository(inner, a, []))
     else:
-        return repomodule.RelatedItemRepository(a, repomodule.FunctionCallMetadataRepository(inner, a))
+        return repomodule.RelatedItemRepository(a, repomodule.FunctionCallMetadataRepository(inner, a, []))
 
 
 @_builtin("filter")

diff --git a/pydatatask/repository/bucket.py b/pydatatask/repository/bucket.py
@@ -109,9 +109,6 @@ def __init__(
     def footprint(self):
         yield self
 
-    async def cache_key(self, job):
-        return f"bucket:{self.bucket}/{job}"
-
     def __getstate__(self) -> Any:
         return (self.endpoints, self.bucket)
 
@@ -167,6 +164,9 @@ def __init__(
         self.suffix = suffix
         self.mimetype = mimetype
 
+    async def cache_key(self, job):
+        return f"bucket:{self.bucket}/{self.prefix}{job}{self.suffix}"
+
     def __getstate__(self):
         return (super().__getstate__(), self.prefix, self.suffix, self.mimetype)