Skip to content

Commit

Permalink
Change molecules legacy endpoint (#802)
Browse files Browse the repository at this point in the history
* Nest legacy molecules

* Linting
  • Loading branch information
Jason Munro authored Aug 8, 2023
1 parent 41d03b3 commit 4789aa4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 32 deletions.
3 changes: 1 addition & 2 deletions emmet-api/app.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
from material_resources import resources as materials_resources
from molecule_resources import resources as molecule_resources
from legacy_resources import resources as legacy_resources

from emmet.api.core.api import MAPI
from emmet.api.core.documentation import description, tags_meta
from emmet.api.core.settings import MAPISettings

default_settings = MAPISettings()

resources = {**materials_resources, **molecule_resources, **legacy_resources}
resources = {**materials_resources, **molecule_resources}

api = MAPI(
resources=resources,
Expand Down
30 changes: 0 additions & 30 deletions emmet-api/legacy_resources.py

This file was deleted.

8 changes: 8 additions & 0 deletions emmet-api/molecule_resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from emmet.api.routes.molecules.thermo.resources import thermo_resource
from emmet.api.routes.molecules.vibrations.resources import vibration_resource
from emmet.api.routes.molecules.summary.resources import summary_resource
from emmet.api.routes.legacy.jcesr.resources import jcesr_resource


resources = {}
Expand Down Expand Up @@ -124,6 +125,10 @@
collection_name="molecules_summary",
)

jcesr_store = MongoURIStore(
uri=db_uri, database="mp_core", key="task_id", collection_name="molecules"
)

else:
raise RuntimeError("Must specify MongoDB URI containing inputs.")

Expand Down Expand Up @@ -179,4 +184,7 @@
# Summary
mp_molecules_resources.extend([summary_resource(summary_store)])

# Legacy JCESR
mp_molecules_resources.extend([jcesr_resource(jcesr_store)])

resources.update({"molecules": mp_molecules_resources})

0 comments on commit 4789aa4

Please sign in to comment.