fix: Update fastapi signature (#1238)

* fix: Update fastapi signature

* Handle breaking change in minio 7.2.19

* Handle bucket_name becoming kwarg-only in minio 7.2.19

* fix: More Minio breaking changes

---------

Co-authored-by: Dan Allan <[email protected]>

Author: DiamondJoseph

pyproject.toml

@@ -73,7 +73,7 @@ all = [
     "dask[dataframe]",
     "duckdb <1.4.0",  # https://github.com/bluesky/tiled/issues/1144
     "entrypoints",
-    "fastapi >=0.115.8",
+    "fastapi >=0.122.0",
     "h5netcdf",
     "h5py",
     "hdf5plugin",

tiled/_tests/conftest.py

@@ -322,27 +322,29 @@ def minio_uri():
 
         # For convenience, we split the bucket from a string
         url = urlparse(uri)
-        bucket = url.path.lstrip("/")
+        bucket_name = url.path.lstrip("/")
         uri = url._replace(netloc="{}:{}".format(url.hostname, url.port), path="")
 
         client = Minio(
-            uri.geturl(),
+            endpoint=uri.geturl(),
             access_key=url.username,
             secret_key=url.password,
             secure=False,
         )
 
         # Reset the state of the bucket after each test.
-        if client.bucket_exists(bucket):
+        if client.bucket_exists(bucket_name=bucket_name):
             delete_object_list = map(
-                lambda x: DeleteObject(x.object_name),
-                client.list_objects(bucket, recursive=True),
+                lambda x: DeleteObject(object_name=x.object_name),
+                client.list_objects(bucket_name=bucket_name, recursive=True),
+            )
+            errors = client.remove_objects(
+                bucket_name=bucket_name, delete_object_list=delete_object_list
             )
-            errors = client.remove_objects(bucket, delete_object_list)
             for error in errors:
                 print("error occurred when deleting object", error)
         else:
-            client.make_bucket(bucket)
+            client.make_bucket(bucket_name=bucket_name)
 
     else:
         raise pytest.skip("No TILED_TEST_BUCKET configured")

tiled/_tests/test_writing.py

@@ -55,24 +55,28 @@ def tmp_minio_bucket():
     if uri := os.getenv("TILED_TEST_BUCKET"):
         clean_uri, username, password = sanitize_uri(uri)
         minio_client = Minio(
-            urlparse(clean_uri).netloc,  # e.g. only "localhost:9000"
+            endpoint=urlparse(clean_uri).netloc,  # e.g. only "localhost:9000"
             access_key=username or "minioadmin",
             secret_key=password or "minioadmin",
             secure=False,
         )
 
         bucket_name = f"test-{uuid.uuid4().hex}"
-        minio_client.make_bucket(bucket_name)
+        minio_client.make_bucket(bucket_name=bucket_name)
 
         try:
             yield urljoin(uri, "/" + bucket_name)  # full URI with credentials
         finally:
             # Cleanup: remove all objects and delete the bucket
             try:
-                objects = minio_client.list_objects(bucket_name, recursive=True)
+                objects = minio_client.list_objects(
+                    bucket_name=bucket_name, recursive=True
+                )
                 for obj in objects:
-                    minio_client.remove_object(bucket_name, obj.object_name)
-                minio_client.remove_bucket(bucket_name)
+                    minio_client.remove_object(
+                        bucket_name=bucket_name, object_name=obj.object_name
+                    )
+                minio_client.remove_bucket(bucket_name=bucket_name)
             except S3Error as e:
                 print(f"Warning: failed to delete test bucket {bucket_name}: {e}")
 

tiled/server/authentication.py

@@ -112,7 +112,7 @@ async def __call__(self, request: Request) -> Optional[str]:
         api_key: Optional[str] = request.headers.get(self.model.name)
         scheme, param = get_authorization_scheme_param(api_key)
         if not scheme or scheme.lower() == "bearer":
-            return self.check_api_key(None, self.auto_error)
+            return self.check_api_key(None)
         if scheme.lower() != self.scheme_name.lower():
             raise HTTPException(
                 status_code=HTTP_400_BAD_REQUEST,
@@ -122,7 +122,7 @@ async def __call__(self, request: Request) -> Optional[str]:
                     "'Bearer SECRET' or 'Apikey SECRET'. "
                 ),
             )
-        return self.check_api_key(param, self.auto_error)
+        return self.check_api_key(param)
 
 
 # The tokenUrl below is patched at app startup when we know it.