Use black 21

stac_fastapi/api/setup.py

@@ -21,7 +21,13 @@
 ]
 
 extra_reqs = {
-    "dev": ["pytest", "pytest-cov", "pytest-asyncio", "pre-commit", "requests",],
+    "dev": [
+        "pytest",
+        "pytest-cov",
+        "pytest-asyncio",
+        "pre-commit",
+        "requests",
+    ],
     "docs": ["mkdocs", "mkdocs-material", "pdocs"],
 }
 

stac_fastapi/api/stac_fastapi/api/errors.py

@@ -67,7 +67,8 @@ def request_validation_exception_handler(
         request: Request, exc: RequestValidationError
     ) -> JSONResponse:
         return JSONResponse(
-            status_code=status.HTTP_400_BAD_REQUEST, content={"detail": exc.errors()},
+            status_code=status.HTTP_400_BAD_REQUEST,
+            content={"detail": exc.errors()},
         )
 
     app.add_exception_handler(

stac_fastapi/api/stac_fastapi/api/routes.py

@@ -49,7 +49,8 @@ def _endpoint(
         else:
 
             def _endpoint(
-                request: Request, request_data: request_model,  # type:ignore
+                request: Request,
+                request_data: request_model,  # type:ignore
             ):
                 """Endpoint."""
                 resp = func(request_data, request=request)
@@ -72,7 +73,8 @@ async def _endpoint(
         else:
 
             async def _endpoint(
-                request: Request, request_data: request_model,  # type:ignore
+                request: Request,
+                request_data: request_model,  # type:ignore
             ):
                 """Endpoint."""
                 resp = await func(request_data, request=request)

stac_fastapi/extensions/setup.py

@@ -23,7 +23,13 @@
 ]
 
 extra_reqs = {
-    "dev": ["pytest", "pytest-cov", "pytest-asyncio", "pre-commit", "requests",],
+    "dev": [
+        "pytest",
+        "pytest-cov",
+        "pytest-asyncio",
+        "pre-commit",
+        "requests",
+    ],
     "docs": ["mkdocs", "mkdocs-material", "pdocs"],
     "tiles": ["titiler==0.2.*"],
 }

stac_fastapi/extensions/stac_fastapi/extensions/third_party/tiles.py

@@ -45,7 +45,8 @@ class TileLinks:
     def __attrs_post_init__(self):
         """Post init handler."""
         self.item_uri = urljoin(
-            self.base_url, f"collections/{self.collection_id}/items/{self.item_id}",
+            self.base_url,
+            f"collections/{self.collection_id}/items/{self.item_id}",
         )
 
     def tiles(self) -> OGCTileLink:
@@ -65,7 +66,8 @@ def viewer(self) -> OGCTileLink:
         """Create viewer link."""
         return OGCTileLink(
             href=urljoin(
-                self.base_url, f"{self.route_prefix}/viewer?url={self.item_uri}",
+                self.base_url,
+                f"{self.route_prefix}/viewer?url={self.item_uri}",
             ),
             rel=Relations.alternate,
             type=MimeTypes.html,
@@ -76,7 +78,8 @@ def tilejson(self) -> OGCTileLink:
         """Create tilejson link."""
         return OGCTileLink(
             href=urljoin(
-                self.base_url, f"{self.route_prefix}/tilejson.json?url={self.item_uri}",
+                self.base_url,
+                f"{self.route_prefix}/tilejson.json?url={self.item_uri}",
             ),
             rel=Relations.alternate,
             type=MimeTypes.json,

stac_fastapi/pgstac/stac_fastapi/pgstac/core.py

@@ -40,7 +40,11 @@ async def landing_page(self, **kwargs) -> ORJSONResponse:
             title="Arturo STAC API",
             description="Arturo raster datastore",
             links=[
-                Link(rel=Relations.self, type=MimeTypes.json, href=str(base_url),),
+                Link(
+                    rel=Relations.self,
+                    type=MimeTypes.json,
+                    href=str(base_url),
+                ),
                 Link(
                     rel=Relations.docs,
                     type=MimeTypes.html,
@@ -205,11 +209,15 @@ async def _search_base(
                 include = search_request.fields.include
                 if len(include) == 0:
                     include = None
-                feature = feature.dict(exclude_none=True,)
+                feature = feature.dict(
+                    exclude_none=True,
+                )
             cleaned_features.append(feature)
             collection.features = cleaned_features
         collection.links = await PagingLinks(
-            request=request, next=next, prev=prev,
+            request=request,
+            next=next,
+            prev=prev,
         ).get_links()
         return collection
 

stac_fastapi/pgstac/stac_fastapi/pgstac/db.py

@@ -19,10 +19,16 @@
 async def con_init(conn):
     """Use orjson for json returns."""
     await conn.set_type_codec(
-        "json", encoder=orjson.dumps, decoder=orjson.loads, schema="pg_catalog",
+        "json",
+        encoder=orjson.dumps,
+        decoder=orjson.loads,
+        schema="pg_catalog",
     )
     await conn.set_type_codec(
-        "jsonb", encoder=orjson.dumps, decoder=orjson.loads, schema="pg_catalog",
+        "jsonb",
+        encoder=orjson.dumps,
+        decoder=orjson.loads,
+        schema="pg_catalog",
     )
 
 

stac_fastapi/pgstac/stac_fastapi/pgstac/models/links.py

@@ -113,7 +113,10 @@ def link_next(self) -> PaginationLink:
             if method == "GET":
                 href = merge_params(self.url, {"token": f"next:{self.next}"})
                 link = PaginationLink(
-                    rel=Relations.next, type=MimeTypes.json, method=method, href=href,
+                    rel=Relations.next,
+                    type=MimeTypes.json,
+                    method=method,
+                    href=href,
                 )
                 return link
             if method == "POST":
@@ -176,7 +179,11 @@ def link_self(self) -> Link:
 
     def link_parent(self) -> Link:
         """Create the `parent` link."""
-        return Link(rel=Relations.parent, type=MimeTypes.json, href=self.base_url,)
+        return Link(
+            rel=Relations.parent,
+            type=MimeTypes.json,
+            href=self.base_url,
+        )
 
     def link_items(self) -> Link:
         """Create the `item` link."""
@@ -234,7 +241,8 @@ class TileLinks:
     def __post_init__(self):
         """Post init handler."""
         self.item_uri = urljoin(
-            self.base_url, f"/collections/{self.collection_id}/items/{self.item_id}",
+            self.base_url,
+            f"/collections/{self.collection_id}/items/{self.item_id}",
         )
 
     def link_tiles(self) -> OGCTileLink:
@@ -272,7 +280,8 @@ def link_wmts(self) -> OGCTileLink:
         """Create wmts capabilities link."""
         return OGCTileLink(
             href=urljoin(
-                self.base_url, f"/titiler/WMTSCapabilities.xml?url={self.item_uri}",
+                self.base_url,
+                f"/titiler/WMTSCapabilities.xml?url={self.item_uri}",
             ),
             rel=Relations.alternate,
             type=MimeTypes.xml,

stac_fastapi/pgstac/tests/clients/test_postgres.py

@@ -11,7 +11,10 @@
 async def test_create_collection(app_client, load_test_data: Callable):
     in_json = load_test_data("test_collection.json")
     in_coll = Collection.parse_obj(in_json)
-    resp = await app_client.post("/collections", json=in_json,)
+    resp = await app_client.post(
+        "/collections",
+        json=in_json,
+    )
     assert resp.status_code == 200
     post_coll = Collection.parse_obj(resp.json())
     assert in_coll.dict(exclude={"links"}) == post_coll.dict(exclude={"links"})
@@ -54,7 +57,10 @@ async def test_create_item(app_client, load_test_data: Callable, load_test_colle
 
     in_json = load_test_data("test_item.json")
     in_item = Item.parse_obj(in_json)
-    resp = await app_client.post("/collections/{coll.id}/items", json=in_json,)
+    resp = await app_client.post(
+        "/collections/{coll.id}/items",
+        json=in_json,
+    )
     assert resp.status_code == 200
 
     post_item = Item.parse_obj(resp.json())
@@ -105,10 +111,15 @@ async def test_get_collection_items(app_client, load_test_collection, load_test_
 
     for _ in range(4):
         item.id = str(uuid.uuid4())
-        resp = await app_client.post(f"/collections/{coll.id}/items", json=item.dict(),)
+        resp = await app_client.post(
+            f"/collections/{coll.id}/items",
+            json=item.dict(),
+        )
         assert resp.status_code == 200
 
-    resp = await app_client.get(f"/collections/{coll.id}/items",)
+    resp = await app_client.get(
+        f"/collections/{coll.id}/items",
+    )
     assert resp.status_code == 200
     fc = resp.json()
     assert "features" in fc

stac_fastapi/pgstac/tests/conftest.py

@@ -127,14 +127,20 @@ def load_file(filename: str) -> Dict:
 @pytest.fixture
 async def load_test_collection(app_client, load_test_data):
     data = load_test_data("test_collection.json")
-    resp = await app_client.post("/collections", json=data,)
+    resp = await app_client.post(
+        "/collections",
+        json=data,
+    )
     assert resp.status_code == 200
     return Collection.parse_obj(resp.json())
 
 
 @pytest.fixture
 async def load_test_item(app_client, load_test_data, load_test_collection):
     data = load_test_data("test_item.json")
-    resp = await app_client.post("/collections/{coll.id}/items", json=data,)
+    resp = await app_client.post(
+        "/collections/{coll.id}/items",
+        json=data,
+    )
     assert resp.status_code == 200
     return Item.parse_obj(resp.json())

stac_fastapi/pgstac/tests/resources/test_collection.py

@@ -8,7 +8,10 @@
 async def test_create_collection(app_client, load_test_data: Callable):
     in_json = load_test_data("test_collection.json")
     in_coll = Collection.parse_obj(in_json)
-    resp = await app_client.post("/collections", json=in_json,)
+    resp = await app_client.post(
+        "/collections",
+        json=in_json,
+    )
     assert resp.status_code == 200
     post_coll = Collection.parse_obj(resp.json())
     assert in_coll.dict(exclude={"links"}) == post_coll.dict(exclude={"links"})
@@ -51,15 +54,23 @@ async def test_delete_collection(
 async def test_create_collection_conflict(app_client, load_test_data: Callable):
     in_json = load_test_data("test_collection.json")
     Collection.parse_obj(in_json)
-    resp = await app_client.post("/collections", json=in_json,)
+    resp = await app_client.post(
+        "/collections",
+        json=in_json,
+    )
     assert resp.status_code == 200
     Collection.parse_obj(resp.json())
-    resp = await app_client.post("/collections", json=in_json,)
+    resp = await app_client.post(
+        "/collections",
+        json=in_json,
+    )
     assert resp.status_code == 409
 
 
 @pytest.mark.asyncio
-async def test_delete_missing_collection(app_client,):
+async def test_delete_missing_collection(
+    app_client,
+):
     resp = await app_client.delete("/collections")
     assert resp.status_code == 405
 
@@ -74,6 +85,8 @@ async def test_update_new_collection(app_client, load_test_collection):
 
 
 @pytest.mark.asyncio
-async def test_nocollections(app_client,):
+async def test_nocollections(
+    app_client,
+):
     resp = await app_client.get("/collections")
     assert resp.status_code == 200

stac_fastapi/pgstac/tests/resources/test_item.py

@@ -14,7 +14,10 @@
 async def test_create_collection(app_client, load_test_data: Callable):
     in_json = load_test_data("test_collection.json")
     in_coll = Collection.parse_obj(in_json)
-    resp = await app_client.post("/collections", json=in_json,)
+    resp = await app_client.post(
+        "/collections",
+        json=in_json,
+    )
     assert resp.status_code == 200
     post_coll = Collection.parse_obj(resp.json())
     assert in_coll.dict(exclude={"links"}) == post_coll.dict(exclude={"links"})
@@ -59,7 +62,10 @@ async def test_create_item(app_client, load_test_data: Callable, load_test_colle
 
     in_json = load_test_data("test_item.json")
     in_item = Item.parse_obj(in_json)
-    resp = await app_client.post("/collections/{coll.id}/items", json=in_json,)
+    resp = await app_client.post(
+        "/collections/{coll.id}/items",
+        json=in_json,
+    )
     assert resp.status_code == 200
 
     post_item = Item.parse_obj(resp.json())
@@ -114,10 +120,15 @@ async def test_get_collection_items(app_client, load_test_collection, load_test_
 
     for _ in range(4):
         item.id = str(uuid.uuid4())
-        resp = await app_client.post(f"/collections/{coll.id}/items", json=item.dict(),)
+        resp = await app_client.post(
+            f"/collections/{coll.id}/items",
+            json=item.dict(),
+        )
         assert resp.status_code == 200
 
-    resp = await app_client.get(f"/collections/{coll.id}/items",)
+    resp = await app_client.get(
+        f"/collections/{coll.id}/items",
+    )
     assert resp.status_code == 200
     fc = resp.json()
     assert "features" in fc
@@ -132,10 +143,16 @@ async def test_create_item_conflict(
 
     in_json = load_test_data("test_item.json")
     Item.parse_obj(in_json)
-    resp = await app_client.post("/collections/{coll.id}/items", json=in_json,)
+    resp = await app_client.post(
+        "/collections/{coll.id}/items",
+        json=in_json,
+    )
     assert resp.status_code == 200
 
-    resp = await app_client.post("/collections/{coll.id}/items", json=in_json,)
+    resp = await app_client.post(
+        "/collections/{coll.id}/items",
+        json=in_json,
+    )
     assert resp.status_code == 409
 
 

stac_fastapi/sqlalchemy/alembic/env.py

@@ -72,7 +72,9 @@ def run_migrations_online():
     configuration = config.get_section(config.config_ini_section)
     configuration["sqlalchemy.url"] = get_connection_url()
     connectable = engine_from_config(
-        configuration, prefix="sqlalchemy.", poolclass=pool.NullPool,
+        configuration,
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
     )
 
     with connectable.connect() as connection:

stac_fastapi/sqlalchemy/setup.py

@@ -31,7 +31,13 @@
 ]
 
 extra_reqs = {
-    "dev": ["pytest", "pytest-cov", "pytest-asyncio", "pre-commit", "requests",],
+    "dev": [
+        "pytest",
+        "pytest-cov",
+        "pytest-asyncio",
+        "pre-commit",
+        "requests",
+    ],
     "docs": ["mkdocs", "mkdocs-material", "pdocs"],
     "server": ["uvicorn[standard]>=0.12.0,<0.14.0"],
 }

stac_fastapi/sqlalchemy/stac_fastapi/sqlalchemy/core.py

@@ -250,7 +250,8 @@ def post_search(
             if search_request.sortby:
                 sort_fields = [
                     getattr(
-                        self.item_table.get_field(sort.field), sort.direction.value,
+                        self.item_table.get_field(sort.field),
+                        sort.direction.value,
                     )()
                     for sort in search_request.sortby
                 ]