Skip to content

Commit

Permalink
Update stac-fastapi-pgstac to v2.4.5 (#163)
Browse files Browse the repository at this point in the history
* deps: update stac-fastapi-pgstac to v2.4.5

Includes a requirements.txt file (generated with pip-tools) to freeze
requirements for pcstac.

* chore: update changelog
  • Loading branch information
gadomski authored Apr 5, 2023
1 parent a4f79b4 commit 90cd846
Show file tree
Hide file tree
Showing 7 changed files with 306 additions and 14 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- New endpoints under `/vector` that server collection level Mapbox Vector Tiles (MVT) [#147](https://github.com/microsoft/planetary-computer-apis/pull/147)

### Changed

- Updated **stac-fastapi-pgstac** to v2.4.5 [#163](https://github.com/microsoft/planetary-computer-apis/pull/163)

## [2022.4.0]

### Changed
Expand Down Expand Up @@ -63,7 +67,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed bug in legend/colormap endpoint [#53](https://github.com/microsoft/planetary-computer-apis/pull/53)
- Fixed tiler for Ground Control Point datasets, implemented for Sentinel 1 GRD [#90](https://github.com/microsoft/planetary-computer-apis/pull/90)


## [2022.1.3]

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions pccommon/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# Runtime requirements.
inst_reqs = [
"fastapi>=0.87",
"fastapi==0.90.1",
"starlette>=0.22.0,<0.23.0",
"opencensus-ext-azure==1.0.8",
"opencensus-ext-logging==0.1.0",
Expand All @@ -13,7 +13,7 @@
"azure-data-tables==12.4.0",
"azure-storage-blob==12.12.0",
"pydantic>=1.9, <2.0.0",
"cachetools==5.0.0",
"cachetools~=5.3",
"types-cachetools==4.2.9",
"pyhumps==3.5.3",
"redis==4.2.0-rc1",
Expand Down
2 changes: 1 addition & 1 deletion pcstac/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ WORKDIR /opt/src

COPY pcstac /opt/src/pcstac
COPY pccommon /opt/src/pccommon
RUN pip install -e ./pccommon -e ./pcstac[server]
RUN pip install -r ./pcstac/requirements.txt -e ./pccommon -e ./pcstac[server]

ENV APP_HOST=0.0.0.0
ENV APP_PORT=81
Expand Down
4 changes: 3 additions & 1 deletion pcstac/pcstac/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,9 @@ async def item_collection(
_super: CoreCrudClient = super()

async def _fetch() -> ItemCollection:
return await _super.item_collection(collection_id, limit, token, **kwargs)
return await _super.item_collection(
collection_id, limit=limit, token=token, **kwargs
)

cache_key = f"{CACHE_KEY_ITEMS}:{collection_id}:limit:{limit}:token:{token}"
return await cached_result(_fetch, cache_key, kwargs["request"])
Expand Down
6 changes: 3 additions & 3 deletions pcstac/pcstac/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
conformance_classes=[
FilterConformanceClasses.FILTER,
FilterConformanceClasses.ITEM_SEARCH_FILTER,
FilterConformanceClasses.BASIC_CQL,
FilterConformanceClasses.CQL_JSON,
FilterConformanceClasses.CQL_TEXT,
FilterConformanceClasses.BASIC_CQL2,
FilterConformanceClasses.CQL2_JSON,
FilterConformanceClasses.CQL2_TEXT,
],
),
# stac_fastapi extensions
Expand Down
288 changes: 288 additions & 0 deletions pcstac/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,288 @@
#
# This file is autogenerated by pip-compile with Python 3.9
# by the following command:
#
# pip-compile --extra=server --output-file=pcstac/requirements.txt --resolver=backtracking pccommon/setup.py pcstac/setup.py
#
anyio==3.6.2
# via
# starlette
# watchgod
asgiref==3.6.0
# via uvicorn
async-timeout==4.0.2
# via redis
asyncpg==0.27.0
# via stac-fastapi-pgstac
attrs==22.2.0
# via
# stac-fastapi-api
# stac-fastapi-extensions
# stac-fastapi-pgstac
# stac-fastapi-types
azure-core==1.26.3
# via
# azure-data-tables
# azure-identity
# azure-storage-blob
# msrest
azure-data-tables==12.4.0
# via pccommon (pccommon/setup.py)
azure-identity==1.7.1
# via pccommon (pccommon/setup.py)
azure-storage-blob==12.12.0
# via pccommon (pccommon/setup.py)
beautifulsoup4==4.12.1
# via html-sanitizer
brotli==1.0.9
# via brotli-asgi
brotli-asgi==1.3.0
# via
# stac-fastapi-api
# stac-fastapi-pgstac
buildpg==0.4
# via stac-fastapi-pgstac
cachetools==5.3.0
# via
# google-auth
# pccommon (pccommon/setup.py)
# pypgstac
certifi==2022.12.7
# via
# msrest
# requests
cffi==1.15.1
# via cryptography
charset-normalizer==3.1.0
# via requests
click==8.1.3
# via
# stac-pydantic
# uvicorn
cryptography==40.0.1
# via
# azure-identity
# azure-storage-blob
# msal
# pyjwt
dateparser==1.1.8
# via pygeofilter
deprecated==1.2.13
# via redis
fastapi==0.90.1
# via
# pccommon (pccommon/setup.py)
# stac-fastapi-types
fire==0.4.0
# via pypgstac
geojson-pydantic==0.5.0
# via stac-pydantic
google-api-core==2.11.0
# via opencensus
google-auth==2.17.2
# via google-api-core
googleapis-common-protos==1.59.0
# via google-api-core
h11==0.14.0
# via uvicorn
html-sanitizer==1.9.0
# via pccommon (pccommon/setup.py)
httptools==0.5.0
# via uvicorn
idna==3.4
# via
# anyio
# requests
iso8601==1.0.2
# via stac-fastapi-types
isodate==0.6.1
# via msrest
lark==0.12.0
# via pygeofilter
lxml==4.9.2
# via html-sanitizer
msal==1.21.0
# via
# azure-identity
# msal-extensions
msal-extensions==0.3.1
# via azure-identity
msrest==0.7.1
# via
# azure-data-tables
# azure-storage-blob
oauthlib==3.2.2
# via requests-oauthlib
opencensus==0.11.2
# via
# opencensus-ext-azure
# opencensus-ext-logging
opencensus-context==0.1.3
# via opencensus
opencensus-ext-azure==1.0.8
# via pccommon (pccommon/setup.py)
opencensus-ext-logging==0.1.0
# via pccommon (pccommon/setup.py)
orjson==3.5.2
# via
# pccommon (pccommon/setup.py)
# pypgstac
# stac-fastapi-pgstac
packaging==23.0
# via redis
plpygis==0.2.1
# via pypgstac
portalocker==2.7.0
# via msal-extensions
protobuf==4.22.1
# via
# google-api-core
# googleapis-common-protos
psutil==5.9.4
# via opencensus-ext-azure
psycopg[binary]==3.1.8
# via pypgstac
psycopg-binary==3.1.8
# via psycopg
psycopg-pool==3.1.7
# via pypgstac
pyasn1==0.4.8
# via
# pyasn1-modules
# rsa
pyasn1-modules==0.2.8
# via google-auth
pycparser==2.21
# via cffi
pydantic[dotenv]==1.10.7
# via
# fastapi
# geojson-pydantic
# pccommon (pccommon/setup.py)
# pypgstac
# stac-fastapi-api
# stac-fastapi-extensions
# stac-fastapi-pgstac
# stac-fastapi-types
# stac-pydantic
pygeofilter==0.2.0
# via stac-fastapi-pgstac
pygeoif==0.7
# via pygeofilter
pyhumps==3.5.3
# via pccommon (pccommon/setup.py)
pyjwt[crypto]==2.6.0
# via msal
pypgstac[psycopg]==0.7.3
# via
# pcstac (pcstac/setup.py)
# stac-fastapi-pgstac
pystac==1.7.1
# via
# pcstac (pcstac/setup.py)
# stac-fastapi-types
python-dateutil==2.8.2
# via
# dateparser
# pypgstac
# pystac
python-dotenv==1.0.0
# via
# pydantic
# uvicorn
pytz==2023.3
# via dateparser
pytz-deprecation-shim==0.1.0.post0
# via tzlocal
pyyaml==6.0
# via uvicorn
redis==4.2.0rc1
# via pccommon (pccommon/setup.py)
regex==2023.3.23
# via dateparser
requests==2.28.2
# via
# azure-core
# google-api-core
# msal
# msrest
# opencensus-ext-azure
# requests-oauthlib
requests-oauthlib==1.3.1
# via msrest
rsa==4.9
# via google-auth
six==1.16.0
# via
# azure-core
# azure-identity
# fire
# google-auth
# isodate
# python-dateutil
smart-open==6.3.0
# via pypgstac
sniffio==1.3.0
# via anyio
soupsieve==2.4
# via beautifulsoup4
stac-fastapi-api==2.4.5
# via
# pcstac (pcstac/setup.py)
# stac-fastapi-extensions
# stac-fastapi-pgstac
stac-fastapi-extensions==2.4.5
# via
# pcstac (pcstac/setup.py)
# stac-fastapi-pgstac
stac-fastapi-pgstac==2.4.5
# via pcstac (pcstac/setup.py)
stac-fastapi-types==2.4.5
# via
# pcstac (pcstac/setup.py)
# stac-fastapi-api
# stac-fastapi-extensions
# stac-fastapi-pgstac
stac-pydantic==2.0.3
# via
# stac-fastapi-api
# stac-fastapi-extensions
# stac-fastapi-pgstac
# stac-fastapi-types
starlette==0.22.0
# via
# brotli-asgi
# fastapi
# pccommon (pccommon/setup.py)
tenacity==8.1.0
# via pypgstac
termcolor==2.2.0
# via fire
types-cachetools==4.2.9
# via pccommon (pccommon/setup.py)
typing-extensions==4.5.0
# via
# azure-core
# psycopg
# psycopg-pool
# pydantic
# redis
# starlette
tzdata==2023.3
# via pytz-deprecation-shim
tzlocal==4.3
# via dateparser
urllib3==1.26.15
# via requests
uvicorn[standard]==0.17.6
# via pcstac (pcstac/setup.py)
uvloop==0.17.0
# via uvicorn
version-parser==1.0.1
# via pypgstac
watchgod==0.8.2
# via uvicorn
websockets==11.0
# via uvicorn
wrapt==1.15.0
# via deprecated
11 changes: 5 additions & 6 deletions pcstac/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@

# Runtime requirements.
inst_reqs = [
"stac-fastapi.api @ git+https://github.com/stac-utils/stac-fastapi/@25879afe94296eb82b94b523bfa2871b686e035a#egg=stac-fastapi.api&subdirectory=stac_fastapi/api",
"stac-fastapi.extensions @ git+https://github.com/stac-utils/stac-fastapi/@25879afe94296eb82b94b523bfa2871b686e035a#egg=stac-fastapi.extensions&subdirectory=stac_fastapi/extensions",
"stac-fastapi.pgstac @ git+https://github.com/stac-utils/stac-fastapi/@25879afe94296eb82b94b523bfa2871b686e035a#egg=stac-fastapi.pgstac&subdirectory=stac_fastapi/pgstac",
"stac-fastapi.types @ git+https://github.com/stac-utils/stac-fastapi/@25879afe94296eb82b94b523bfa2871b686e035a#egg=stac-fastapi.types&subdirectory=stac_fastapi/types",
"pccommon",
"stac-fastapi.api==2.4.5",
"stac-fastapi.extensions==2.4.5",
"stac-fastapi.pgstac==2.4.5",
"stac-fastapi.types==2.4.5",
# Required due to some imports related to pypgstac CLI usage in startup script
"pypgstac[psycopg]==0.6.13",
"pypgstac[psycopg]~=0.7",
"pystac==1.*",
]

Expand Down

0 comments on commit 90cd846

Please sign in to comment.