Skip to content

Commit 67e8613

Browse files
Fixing formatting and adding gitignore values
1 parent 2cd136d commit 67e8613

File tree

8 files changed

+150
-83
lines changed

8 files changed

+150
-83
lines changed

.flake8

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
exclude = .git,.tox,__pycache__,.eggs,dist,.venv*,build
33
max-line-length = 88
44
extend-ignore = W503,W504,E203
5+
per-file-ignores =
6+
src/stac_fastapi/globus_search/extensions/aggregration/client.py: E501
7+
tests/*: D

.gitignore

Lines changed: 69 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,69 @@
1-
*.pyc
2-
poetry.toml
1+
# macOS
2+
.DS_Store
3+
4+
# Windows
5+
Thumbs.db
6+
ehthumbs.db
7+
8+
# Python bytecode / caches
9+
*.py[cod]
10+
*$py.class
11+
__pycache__/
12+
.pytest_cache/
13+
.mypy_cache/
14+
.pytype/
15+
.pyre/
16+
.ruff_cache/
17+
18+
# Virtual environments
19+
.venv/
20+
venv/
21+
ENV/
22+
env/
23+
.env/
24+
.env.*
25+
26+
# Packaging / build artifacts
27+
build/
28+
dist/
29+
*.egg-info/
30+
pip-wheel-metadata/
31+
*.whl
32+
33+
# Test / coverage
34+
.coverage
35+
coverage.*
36+
coverage.xml
37+
htmlcov/
38+
39+
# Logs and databases
40+
*.log
41+
logs/
42+
*.sqlite3
43+
*.db
44+
*.db-journal
45+
46+
# Docker / local overrides
47+
docker-compose.override.yml
48+
docker-compose.override.*.yml
49+
50+
# IDEs / editors
51+
.vscode/
52+
.idea/
53+
*.sublime-project
54+
*.sublime-workspace
55+
56+
# Jupyter
57+
.ipynb_checkpoints
58+
*.ipynb
59+
60+
# OS / misc
61+
*.lock
62+
*.tmp
63+
*.bak
64+
65+
# Node (if any JS tooling gets added)
66+
node_modules/
67+
npm-debug.log*
68+
yarn-debug.log*
69+
yarn-error.log*

src/stac_fastapi/globus_search/app.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
stac-fastapi.
44
"""
55

6-
from hishel.fastapi import cache
7-
from hishel.asgi import ASGICacheMiddleware
86
from hishel import AsyncSqliteStorage
9-
7+
from hishel.asgi import ASGICacheMiddleware
8+
from hishel.fastapi import cache
109
from stac_fastapi.api.app import StacApi
11-
from stac_fastapi.api.models import (create_get_request_model,
12-
create_post_request_model)
10+
from stac_fastapi.api.models import create_get_request_model, create_post_request_model
1311
from stac_fastapi.core.session import Session
1412
from stac_fastapi.extensions.core import (
1513
AggregationExtension,
1614
FilterExtension,
17-
TokenPaginationExtension
15+
TokenPaginationExtension,
1816
)
17+
from stac_fastapi.sfeos_helpers.filter import EsAsyncBaseFiltersClient
18+
1919
from stac_fastapi.globus_search.config import GlobusSearchSettings
2020
from stac_fastapi.globus_search.core import GlobusSearchClient
2121
from stac_fastapi.globus_search.database_logic import DatabaseLogic
2222
from stac_fastapi.globus_search.extensions.aggregration import (
2323
GlobusAggregationExtensionGetRequest,
24-
GlobusAggregationExtensionPostRequest
24+
GlobusAggregationExtensionPostRequest,
25+
)
26+
from stac_fastapi.globus_search.extensions.aggregration.client import (
27+
GlobusSearchAggregationClient,
2528
)
26-
from stac_fastapi.globus_search.extensions.aggregration.client import GlobusSearchAggregationClient
27-
from stac_fastapi.sfeos_helpers.filter import EsAsyncBaseFiltersClient
28-
2929

3030
database_logic = DatabaseLogic()
3131
settings = GlobusSearchSettings()
@@ -59,7 +59,7 @@
5959
route_dependencies = [
6060
(
6161
[{"path": "/collections/{collection_id}/items", "method": "GET"}],
62-
[cache(max_age=300, public=True)]
62+
[cache(max_age=300, public=True)],
6363
)
6464
]
6565

src/stac_fastapi/globus_search/core.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from fastapi import HTTPException
55
from stac_fastapi.core.core import CoreClient
66
from stac_fastapi.core.models.links import PagingLinks
7-
87
from stac_fastapi.types import stac as stac_types
98

109

src/stac_fastapi/globus_search/database_logic.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,8 @@ async def find_collection(self, collection_id: str) -> dict:
239239
except FileNotFoundError:
240240
raise HTTPException(
241241
status_code=404,
242-
detail="Collection not found. Collections are case sensitive.")
242+
detail="Collection not found. Collections are case sensitive.",
243+
)
243244
data = json.load(f)
244245
return data
245246

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
from .aggregration import (
22
GlobusAggregationExtensionGetRequest,
3-
GlobusAggregationExtensionPostRequest
3+
GlobusAggregationExtensionPostRequest,
44
)
55

6-
76
__all__ = [
87
"GlobusAggregationExtensionGetRequest",
9-
"GlobusAggregationExtensionPostRequest"
8+
"GlobusAggregationExtensionPostRequest",
109
]

src/stac_fastapi/globus_search/extensions/aggregration/aggregration.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,30 @@
44

55
import attr
66
from fastapi import Path
7-
from typing_extensions import Annotated
8-
97
from stac_fastapi.extensions.core.aggregation.request import (
108
AggregationExtensionGetRequest,
119
AggregationExtensionPostRequest,
1210
)
13-
1411
from stac_fastapi.extensions.core.filter.request import (
1512
FilterExtensionGetRequest,
1613
FilterExtensionPostRequest,
1714
)
15+
from typing_extensions import Annotated
1816

1917

2018
@attr.s
2119
class GlobusAggregationExtensionGetRequest(
2220
AggregationExtensionGetRequest, FilterExtensionGetRequest
2321
):
24-
collection_id: Optional[
25-
Annotated[str, Path(description="Collection ID")]
26-
] = attr.ib(default=None)
22+
collection_id: Optional[Annotated[str, Path(description="Collection ID")]] = (
23+
attr.ib(default=None)
24+
)
2725

28-
size : Optional[int] = attr.ib(default=10)
26+
size: Optional[int] = attr.ib(default=10)
2927

3028

3129
@attr.s
3230
class GlobusAggregationExtensionPostRequest(
3331
AggregationExtensionPostRequest, FilterExtensionPostRequest
3432
):
35-
size : Optional[int] = 10
33+
size: Optional[int] = 10

0 commit comments

Comments
 (0)