Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

response should be either many (list) or one (object), not an union #15

Merged
merged 1 commit into from
Jun 12, 2019
Merged

response should be either many (list) or one (object), not an union #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions optimade/server/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from .collections import MongoCollection
from .models.jsonapi import Link, Links
from .models.structures import StructureResource
from. models.toplevel import OptimadeResponseMeta, OptimadeResponseMetaQuery, OptimadeStructureResponse
from. models.toplevel import OptimadeResponseMeta, OptimadeResponseMetaQuery, OptimadeStructureResponseMany

config = ConfigParser()
config.read(Path(__file__).resolve().parent.joinpath('config.ini'))
Expand Down Expand Up @@ -45,7 +45,7 @@
print('done inserting test structures...')


@app.get("/structures", response_model=OptimadeStructureResponse, response_model_skip_defaults=True, tags=['Structure'])
@app.get("/structures", response_model=OptimadeStructureResponseMany, response_model_skip_defaults=True, tags=['Structure'])
def get_structures(request: Request, params: EntryListingQueryParams = Depends()):
results, more_data_available, data_available = structures.find(params)
parse_result = urllib.parse.urlparse(str(request.url))
Expand All @@ -65,7 +65,7 @@ def get_structures(request: Request, params: EntryListingQueryParams = Depends()
data_returned=len(results),
more_data_available=more_data_available,
)
return OptimadeStructureResponse(
return OptimadeStructureResponseMany(
links=links,
data=results,
meta=meta,
Expand Down
18 changes: 14 additions & 4 deletions optimade/server/models/toplevel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,21 @@ class OptimadeResponseMeta(BaseModel):
more_data_available: bool


class OptimadeResponse(BaseModel):
class OptimadeResponse1(BaseModel):
links: Links
meta: OptimadeResponseMeta
data: Union[Resource, List[Resource]]
data: Resource


class OptimadeStructureResponse(OptimadeResponse):
data: Union[StructureResource, List[StructureResource]]
class OptimadeResponseMany(BaseModel):
links: Links
meta: OptimadeResponseMeta
data: List[Resource]


class OptimadeStructureResponse1(OptimadeResponse1):
data: StructureResource


class OptimadeStructureResponseMany(OptimadeResponseMany):
data: List[StructureResource]