-
Notifications
You must be signed in to change notification settings - Fork 48
Trajectory Endpoint #1845
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.
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
Draft
JPBergsma
wants to merge
123
commits into
Materials-Consortia:0.25.x
Choose a base branch
from
JPBergsma:JPBergsma/trajectory_endpoint
base: 0.25.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Trajectory Endpoint #1845
Changes from all commits
Commits
Show all changes
123 commits
Select commit
Hold shift + click to select a range
eecc878
Addded meta field to entry model
JPBergsma 6ed4a5d
Added validator for meta field.
JPBergsma 5e0ace4
Merge branch 'master' into JPBergsma/add_metadata
JPBergsma ef1ca3c
Update pyyaml version in requirements.txt
JPBergsma 89ac0fe
Update requirements.txt
JPBergsma f229be1
Update requirements.txt
JPBergsma fcc501c
Merge branch 'master' into JPBergsma/add_metadata
JPBergsma a195fb5
Remove test structures to get an idea of what triggers yaml import er…
JPBergsma 07d77fe
Readding meta field to test_good_structures.
JPBergsma 2848dd3
Readding meta field to test_structures.json.
JPBergsma 80c4dc4
Added handling None for property_metadata to validator + small correc…
JPBergsma d55abec
Added test for validator per entry meta field.
JPBergsma ff545bb
Added test for presence metadata field in test_structures.py.
JPBergsma e0d6ff3
Remove metadata fields when the fields that they belong to are not re…
JPBergsma 191fbba
add extra test for bad prefix.
JPBergsma 8764e34
Merge branch 'master' into JPBergsma/add_metadata
JPBergsma 6251e48
Test if dependancy conflict causes error.
JPBergsma c6be5ca
Merge branch 'master' into JPBergsma/add_metadata
JPBergsma bf9692a
Revert "Test if dependancy conflict causes error."
JPBergsma 0864911
Revert "Revert "Test if dependancy conflict causes error.""
JPBergsma 03f91f1
Merge branch 'JPBergsma/add_metadata' of https://github.com/JPBergsma…
JPBergsma eb953ad
correct version httpx.
JPBergsma 2879fac
commenting out validator to see if this resolves issue github.
JPBergsma 18e2ef1
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 7fc1906
Slowly reassembling validator to see if this resolves issue github.
JPBergsma b622414
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 95bf11b
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 7c02f38
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 2b52248
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 20e228d
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 7be2a0f
Slowly reassembling validator to see if this resolves issue github.
JPBergsma bffb5d1
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 1f0bbb9
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 7c0a8be
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 456f34f
Slowly reassembling validator to see if this resolves issue github.
JPBergsma 9603277
Slowly reassembling validator to see if this resolves issue Github.
JPBergsma c621412
Slowly reassembling validator to see if this resolves issue Github.
JPBergsma ed44736
Slowly reassembling validator to see if this resolves issue Github..
JPBergsma 4f28acc
Slowly reassembling validator to see if this resolves issue Github..
JPBergsma 63af8dc
Placed yaml import in try except block.
JPBergsma 5b41b71
Added more cases to test data and added bugfix for removing associate…
JPBergsma f694d15
Removed seemingly unneccesary mypy ignore exception statement.
JPBergsma 5bac762
Merge branch 'master' into JPBergsma/add_metadata
JPBergsma 40ff136
remove change in version pyyaml in requirements.txt.
JPBergsma 8f7ca29
correct spelling mistake
JPBergsma 6a20ef9
moved starts_with_supported_prefix and check_starts_with_supported_pr…
JPBergsma e95c9b4
Expanded docstring check_starts_with_supported_prefix
JPBergsma bcd7971
Expanded docstring check_starts_with_supported_prefix
JPBergsma 748bacc
Added return type for starts_with_supported_prefix and check_starts_…
JPBergsma 8430ddd
Added return type for starts_with_supported_prefix and check_starts_…
JPBergsma ac26f09
Adjusted validators baseed on suggestion Matthew.
JPBergsma e1c4901
small corrections validators.
JPBergsma 7dab3a7
small correction in removing unrequested metadata.
JPBergsma da8a026
Added spaces before values 'exmpl_originates_from _project'.
JPBergsma 92da84e
First draft version of model of jsonlines response.
JPBergsma f39c734
renamed files to partialdata.
JPBergsma 8c889c6
First draft version of model of jsonlines response.
JPBergsma 75669c8
added metadata fields for partial data protocal to entry models.
JPBergsma 9657ff3
Added descriptions for fields partial data links.
JPBergsma 281551e
Storing intermediate code on the way to implement partial data to get…
JPBergsma 115ca61
Merge with master.
JPBergsma e8bbfe1
First somewhat working version of partial_data endpoint.
JPBergsma 9c0985a
Merge branch 'master' into JPBergsma/Partial_data
JPBergsma f67555e
Move _check_aliases to it's own subclass so it can be used for both g…
JPBergsma b7907c9
Merge branch 'master' into optimade_python_tools_trajectory_0.1
JPBergsma 07defa5
Extra todo's and comments after trying to add validator for format fi…
JPBergsma 64b97bd
Fixed validator for format field.
JPBergsma c908d3f
first minimal version partial data.
JPBergsma 88e4eb9
merge with master
JPBergsma 944d374
merge with master
JPBergsma 04e9ff6
update openapijson
JPBergsma 5368934
update openapijson
JPBergsma bccbe73
update openapijson
JPBergsma 7a75366
changed 'regex' to 'pattern'.
JPBergsma c87d436
Moved generate_links_partial_data function to routers/utils.py and ma…
JPBergsma 60b102e
Added relevant code from original trajectory proposal.
JPBergsma 6822fef
Made some adjustment to be more compatible with export to traj mongo …
JPBergsma 9799842
Expanded model partial_data.
JPBergsma 6746969
Expanded model partial_data.
JPBergsma 8a98896
Added some validators for the trajectory specific fields.
JPBergsma 7f7c383
Clarified why field is named describedby and not described_by.
JPBergsma d65ac4c
Added instructions for setting up a trajectory database.
JPBergsma 2b552c5
Various bug fixes
JPBergsma d700b92
Fix whitespace for code snippets to allow copying through GH UI
ml-evs 4a3f426
Add note about MongoDB install
ml-evs fdc7490
Suggest Python 3.10 instead of 11
ml-evs 95bda33
Merge pull request #6 from ml-evs/patch-1
JPBergsma 221e163
Merge branch 'JPBergsma/trajectory_endpoint' into JPBergsma/trajector…
JPBergsma e4606cc
Merge pull request #8 from ml-evs/JPBergsma/trajectory_endpoint
JPBergsma d080fbf
Merge pull request #7 from ml-evs/patch-2
JPBergsma 3996049
updated optimade_config.json for trajectories.
JPBergsma 63651f1
use lstrip instead of manually removing / one at a time.
JPBergsma 389e679
Update optimade/models/entries.py
JPBergsma 4ec23c9
Update description per entry meta datafield.
JPBergsma 05b2906
Merge branch 'master' into JPBergsma/add_metadata
JPBergsma 1cd73e3
Merge branch 'master' into JPBergsma/add_metadata
JPBergsma d3b8b22
update openapijson.
JPBergsma 8ae4081
trying to merge with remote.
JPBergsma 68f14d3
try to see if moving yaml is still necessary.
JPBergsma 1d46e1b
Revert "try to see if moving yaml is still necessary."
JPBergsma 774be72
Added supported_prefixes field to config.py
JPBergsma fac9b9b
Merge branch 'master' of https://github.com/JPBergsma/optimade-python…
JPBergsma 7d790b2
Merge branch 'master' into JPBergsma/add_metadata
JPBergsma 6c85877
Merged latest version metadata branch with partial data branch.
JPBergsma 11bdbe7
Merged JPBergsma/Partial_data in trajectory branch.
JPBergsma a0e6f8b
changing Priocfile to see if this fixes problem with uvicorn complain…
JPBergsma a4f1242
Add numpy to requirements.
JPBergsma 3ccad18
Made a correction in the testdata for trajectories.
JPBergsma 13fcdc0
Add numpy to requirements.
JPBergsma 3be7d54
Added jsonlines dependancy.
JPBergsma 075ef06
Made changes to make mypy happy.
JPBergsma ca2a0f2
Trying to determine why jsonlines is not impoeted properly on github.
JPBergsma cf45488
Update requirements-client.txt (#1813)
JPBergsma 2466fb1
Merge branch 'master' of https://github.com/JPBergsma/optimade-python…
JPBergsma ff25f14
Merge branch 'master' into JPBergsma/add_metadata
JPBergsma 1dbd07a
Merge branch 'JPBergsma/add_metadata' into JPBergsma/Partial_data
JPBergsma 8510ffa
Modernize all Python 3.8 annotations (#1815)
ml-evs 44d8789
Merging with master.
JPBergsma 563948e
merging with metadata branch
JPBergsma 7b89608
merging with partial data branch
JPBergsma ca87650
Corrected wrong name validator in trajectory model.
JPBergsma e1ad997
removed importing List from typing.
JPBergsma 8f03cca
Merge branch '0.25.x' into JPBergsma/trajectory_endpoint
ml-evs File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
web: uvicorn optimade.server.main:app --host 0.0.0.0 --port $PORT | ||
web: --host 0.0.0.0 --port $PORT | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# jsonl | ||
|
||
::: optimade.adapters.jsonl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# partial_data | ||
|
||
::: optimade.models.partial_data | ||
options: | ||
show_if_no_docstring: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# trajectories | ||
|
||
::: optimade.models.trajectories | ||
options: | ||
show_if_no_docstring: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# partial_data | ||
|
||
::: optimade.server.mappers.partial_data |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# trajectories | ||
|
||
::: optimade.server.mappers.trajectories |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# partial_data | ||
|
||
::: optimade.server.routers.partial_data |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# trajectories | ||
|
||
::: optimade.server.routers.trajectories |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why was this necessary? I think fly might get confused