Skip to content

Commit

Permalink
Remove filter from opportunity response
Browse files Browse the repository at this point in the history
  • Loading branch information
jsignell committed Apr 18, 2024
1 parent 4300355 commit 95e7882
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 15 deletions.
5 changes: 3 additions & 2 deletions stat_fastapi/models/opportunity.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from geojson_pydantic import Feature, FeatureCollection
from geojson_pydantic.geometries import Geometry
from pydantic import BaseModel
from pydantic import BaseModel, ConfigDict

from stat_fastapi.types.datetime_interval import DatetimeInterval
from stat_fastapi.types.filter import CQL2Filter
Expand All @@ -12,11 +12,12 @@
class OpportunityProperties(BaseModel):
datetime: DatetimeInterval
product_id: str
filter: Optional[CQL2Filter] = None
model_config = ConfigDict(extra="allow")


class OpportunitySearch(OpportunityProperties):
geometry: Geometry
filter: Optional[CQL2Filter] = None


class Opportunity(Feature[Geometry, OpportunityProperties]):
Expand Down
17 changes: 17 additions & 0 deletions stat_fastapi_landsat/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
## Landsat backend

Start the server locally

```sh
poetry run landsat
```

GET all products
```sh
curl http://127.0.0.1:8000/products
```

POST to opportunities
```sh
curl -d '{"geometry": {"type": "Point", "coordinates": [13.4, 52.5]}, "product_id": "landsat:9", "datetime": "2024-05-01T00:00:00Z/2024-05-12T00:00:00Z"}' -H "Content-Type: application/json" -X POST http://127.0.0.1:8000/opportunities
```
11 changes: 1 addition & 10 deletions stat_fastapi_landsat/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@

import pytz
from fastapi import Request
from pydantic import (
BaseModel,
ConfigDict,
)
from shapely.geometry import shape

from stat_fastapi.exceptions import NotFoundException
Expand All @@ -18,11 +14,7 @@
)
from stat_fastapi.models.order import Order
from stat_fastapi.models.product import Product, Provider, ProviderRole


class Constraints(BaseModel):
model_config = ConfigDict(extra="forbid")

from stat_fastapi_landsat.models import Constraints

PRODUCTS = [
Product(
Expand Down Expand Up @@ -139,7 +131,6 @@ async def search_opportunities(
properties=OpportunityProperties(
product_id=search.product_id,
datetime=[current_date, current_date],
filter=search.filter,
),
)
)
Expand Down
4 changes: 1 addition & 3 deletions stat_fastapi_landsat/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
from pydantic import (
ConfigDict,
)
from pydantic import ConfigDict

from stat_fastapi.models.constraints import Constraints as BaseConstraints
from stat_fastapi.models.opportunity import OpportunitySearch
Expand Down

0 comments on commit 95e7882

Please sign in to comment.