Skip to content
Snippets Groups Projects
Commit fd0e53d0 authored by Albert Feghaly's avatar Albert Feghaly
Browse files

Merge remote-tracking branch 'origin/master' into 15-allow-to-keep-file-content-in-memory

Conflicts:
	pyiricdata/Client.py
parents 5ee76356 3b65feea
No related branches found
No related tags found
1 merge request!11Resolve "Allow to keep file content in memory"
......@@ -79,8 +79,8 @@ class Client:
df.index.name = 'ID'
return df
""" Fetch Dataset Name and Slug ID available for the user as JSON. A filter can be made on metadata and dataset """
def get_list_datafiles(self, key_anno=None, value_anno=None, dataset_id=None):
""" Return a DataFrame of user's files. A filter can be made on annotation and dataset """
def get_datafiles_list(self, key_anno=None, value_anno=None, dataset_id=None):
if key_anno is None and value_anno is None and dataset_id is None:
sys.stderr.write("WARNING: return all files isnt implemented\n")
return(None)
......@@ -173,8 +173,8 @@ class Client:
""" Return DataFrame (file_name, file_id, file_slug, file_hash) for files in a given dataset """
def get_dataset_filelist(self, dataset_id):
sys.stderr.write("DEPRECATED: Please use " +
"get_list_datafiles(dataset_id=dataset_id)\n")
return(self.get_list_datafiles(dataset_id=dataset_id))
"get_datafiles_list(dataset_id=dataset_id)\n")
return(self.get_datafiles_list(dataset_id=dataset_id))
""" Get DatasetId by name"""
def get_dataset_id_by_name(self, name):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment