Skip to content

Commit

Permalink
Add document models, type hints
Browse files Browse the repository at this point in the history
  • Loading branch information
mkhorton committed Apr 6, 2021
1 parent 7fb91de commit af723fd
Show file tree
Hide file tree
Showing 14 changed files with 95 additions and 6 deletions.
2 changes: 2 additions & 0 deletions src/mp_api/piezo/client.py
Expand Up @@ -2,13 +2,15 @@
from collections import defaultdict

from mp_api.core.client import BaseRester, MPRestError
from mp_api.piezo.models import PiezoDoc

import warnings


class PiezoRester(BaseRester):

suffix = "piezoelectric"
document_model = PiezoDoc

def get_piezo_from_material_id(self, material_id: str):
"""
Expand Down
14 changes: 14 additions & 0 deletions src/mp_api/piezo/client.pyi
@@ -0,0 +1,14 @@
from typing import List, Optional
from mp_api.piezo.models import PiezoDoc


class PiezoRester:

def get_document_by_id(
self,
document_id: str,
fields: Optional[List[str]] = None,
monty_decode: bool = True,
version: Optional[str] = None,
) -> PiezoDoc:
...
1 change: 1 addition & 0 deletions src/mp_api/search/client.py
Expand Up @@ -3,5 +3,6 @@


class SearchRester(BaseRester):

suffix = "search"
document_model = SearchDoc
14 changes: 14 additions & 0 deletions src/mp_api/search/client.pyi
@@ -0,0 +1,14 @@
from typing import List, Optional
from mp_api.search.models import SearchDoc


class SearchRester:

def get_document_by_id(
self,
document_id: str,
fields: Optional[List[str]] = None,
monty_decode: bool = True,
version: Optional[str] = None,
) -> SearchDoc:
...
2 changes: 2 additions & 0 deletions src/mp_api/substrates/client.py
Expand Up @@ -3,11 +3,13 @@
import warnings

from mp_api.core.client import BaseRester
from mp_api.substrates.models import SubstratesDoc


class SubstratesRester(BaseRester):

suffix = "substrates"
document_model = SubstratesDoc

def search_substrates_docs(
self,
Expand Down
14 changes: 14 additions & 0 deletions src/mp_api/substrates/client.pyi
@@ -0,0 +1,14 @@
from typing import List, Optional
from mp_api.substrates.models import SubstratesDoc


class SubstratesRester:

def get_document_by_id(
self,
document_id: str,
fields: Optional[List[str]] = None,
monty_decode: bool = True,
version: Optional[str] = None,
) -> SubstratesDoc:
...
2 changes: 2 additions & 0 deletions src/mp_api/surface_properties/client.py
Expand Up @@ -3,11 +3,13 @@
import warnings

from mp_api.core.client import BaseRester, MPRestError
from mp_api.surface_properties.models import SurfacePropDoc


class SurfacePropertiesRester(BaseRester):

suffix = "surface_properties"
document_model = SurfacePropDoc

def get_surface_properties_from_material_id(self, material_id: str):
"""
Expand Down
14 changes: 14 additions & 0 deletions src/mp_api/surface_properties/client.pyi
@@ -0,0 +1,14 @@
from typing import List, Optional
from mp_api.surface_properties.models import SurfacePropDoc


class SurfacePropertiesRester:

def get_document_by_id(
self,
document_id: str,
fields: Optional[List[str]] = None,
monty_decode: bool = True,
version: Optional[str] = None,
) -> SurfacePropDoc:
...
1 change: 1 addition & 0 deletions src/mp_api/synthesis/client.pyi
Expand Up @@ -3,5 +3,6 @@ from mp_api.synthesis.models import SynthesisDoc


class SynthesisRester:

def query_text(self, keywords: List[str]) -> SynthesisDoc:
...
9 changes: 7 additions & 2 deletions src/mp_api/tasks/client.pyi
Expand Up @@ -3,7 +3,12 @@ from mp_api.tasks.models import TaskDoc


class TaskRester:
def query_by_task_id(
self, task_id, fields: Optional[List[str]] = None, monty_decode: bool = True

def get_document_by_id(
self,
document_id: str,
fields: Optional[List[str]] = None,
monty_decode: bool = True,
version: Optional[str] = None,
) -> TaskDoc:
...
1 change: 1 addition & 0 deletions src/mp_api/thermo/client.py
Expand Up @@ -11,6 +11,7 @@ class ThermoRester(BaseRester):

suffix = "thermo"
document_model = ThermoDoc
supports_versions = True

def search_thermo_docs(
self,
Expand Down
10 changes: 7 additions & 3 deletions src/mp_api/thermo/client.pyi
@@ -1,9 +1,13 @@
from typing import List, Optional
from mp_api.thermo.models import ThermoDoc


class ThermoRester:
def query_by_task_id(
self, task_id, fields: Optional[List[str]] = None, monty_decode: bool = True

def get_document_by_id(
self,
document_id: str,
fields: Optional[List[str]] = None,
monty_decode: bool = True,
version: Optional[str] = None,
) -> ThermoDoc:
...
3 changes: 2 additions & 1 deletion src/mp_api/xas/client.py
@@ -1,12 +1,13 @@
from typing import List, Optional
from pymatgen.core.periodic_table import Element
from mp_api.core.client import BaseRester, MPRestError
from mp_api.xas.models import Edge, XASType
from mp_api.xas.models import Edge, XASType, XASDoc


class XASRester(BaseRester):

suffix = "xas"
document_model = XASDoc

def get_available_elements(
self,
Expand Down
14 changes: 14 additions & 0 deletions src/mp_api/xas/client.pyi
@@ -0,0 +1,14 @@
from typing import List, Optional
from mp_api.xas.models import XASDoc


class XASRester:

def get_document_by_id(
self,
document_id: str,
fields: Optional[List[str]] = None,
monty_decode: bool = True,
version: Optional[str] = None,
) -> XASDoc:
...

0 comments on commit af723fd

Please sign in to comment.