diff --git a/reactome2py/content.py b/reactome2py/content.py index 06e0667..ae0cde2 100644 --- a/reactome2py/content.py +++ b/reactome2py/content.py @@ -105,7 +105,7 @@ def event_ancestors(id='R-HSA-5673001'): return util.get_json(f'{_SERVICE}/data/event/{id}/ancestors') -def event_species(species='9606', pathways_only=False, token=None, resource='Total', include_interactors=False) \ +def event_species(species='9606', pathways_only=False, token=None, resource='TOTAL', include_interactors=False) \ -> List[EventHierarchyNode]: """ Events (pathways and reactions) in Reactome are organised in a hierarchical structure for every species. @@ -134,7 +134,7 @@ def event_species(species='9606', pathways_only=False, token=None, resource='Tot def export_diagram(id='R-HSA-177929', ext='png', quality='5', flag_interactors=False, title=True, margin='15', - ehld=True, diagram_profile='Modern', resource='Total', analysis_profile='Standard', + ehld=True, diagram_profile='Modern', resource='TOTAL', analysis_profile='Standard', token: str = None, flag: str = None, sel: List[str] = None, exp_column: str = None, file='report', path=''): """ @@ -183,7 +183,7 @@ def export_diagram(id='R-HSA-177929', ext='png', quality='5', flag_interactors=F ) -def export_document(id='R-HSA-177929', level='1', diagram_profile='Modern', resource='Total', +def export_document(id='R-HSA-177929', level='1', diagram_profile='Modern', resource='TOTAL', analysis_profile='Standard', token: str = None, exp_column: str = None, file='report', path=''): """ This method accepts identifiers for Event class instances. @@ -247,7 +247,7 @@ def export_event(id='R-HSA-177929', format='sbgn', file='report', path=''): def export_fireworks(species='9606', ext='png', file='report', path='', quality='5', flag: str = None, flag_interactors=False, - sel: List[str] = None, title=True, margin='15', resource='Total', diagram_profile='', + sel: List[str] = None, title=True, margin='15', resource='TOTAL', diagram_profile='', coverage=False, token=None, exp_column=None): @@ -296,7 +296,7 @@ def export_fireworks(species='9606', ext='png', file='report', path='', quality= def export_reaction(id='R-HSA-6787403', ext='png', file='report', path='', quality='5', flag=None, flag_interactors=False, - sel: List[str] = None, title=True, margin='15', resource='Total', diagram_profile='', + sel: List[str] = None, title=True, margin='15', resource='TOTAL', diagram_profile='', coverage=False, token=None, exp_column=None): """ diff --git a/reactome2py/util.py b/reactome2py/util.py index 682078f..b64508d 100644 --- a/reactome2py/util.py +++ b/reactome2py/util.py @@ -44,17 +44,23 @@ def post(url: str, data: Any, headers: Dict[str, str] = None, params: Dict[str, """ :return: Json dictionary object of The schema.org for an Event in Reactome knowledgebase """ - if headers is None: - headers = {} - headers = { - 'accept': '*/*', - 'content-type': 'text/plain', - **headers - } + if isinstance(data, bytes): + headers = {} + files = {'file': data} + data = None + else: + if headers is None: + headers = {} + headers = { + 'accept': '*/*', + 'content-type': 'text/plain', + **headers + } + files = None try: - response = requests.post(url=url, headers=headers, params=params, data=data) + response = requests.post(url=url, headers=headers, params=params, data=data, files=files) if response.status_code == 200: return response else: