Fix s3 interface

odds/common/store/s3/s3_store.py

@@ -44,7 +44,8 @@ async def storeDB(self, resource: Resource, dataset: Dataset, dbFile, ctx: str)
             id = '{}/{}'.format(dataset.storeId(), resource.url)
             key = self.get_key('db', id, 'sqlite')
             rts.set(ctx, f'STORING RES-DB {resource.title} -> {key}')
-            await s3.upload_file(dbFile, bucket, key)
+            obj = await bucket.Object(key)
+            await obj.upload_file(dbFile)
 
     async def storeEmbedding(self, dataset: Dataset, embedding: Embedding, ctx: str) -> None:
         async with self.bucket() as (s3, bucket):
@@ -54,7 +55,8 @@ async def storeEmbedding(self, dataset: Dataset, embedding: Embedding, ctx: str)
             filename = BytesIO()
             np.save(filename, embedding)
             filename.seek(0)
-            await s3.upload_fileobj(filename, bucket, key)
+            obj = await bucket.Object(key)
+            await obj.upload_fileobj(filename)
 
     async def getDataset(self, datasetId: str) -> Dataset:
         async with self.bucket() as (s3, bucket):

utils/scrape_all.sh

@@ -1,4 +1,4 @@
 docker run -it \
-    -v ./odds.config.server.yaml:/srv/odds.config.yaml \
-    -v ./dummy-cache/:/srv/.caches/ \
-    odds-server -- "python utils/scrape_all.py"
+    -v ./odds.config.yaml:/srv/odds.config.yaml \
+    -v ./cache/:/srv/.caches/ \
+    ghcr.io/whiletrue-industries/odds/odds-server:latest -- "python utils/scrape_all.py"