turns apikey into global variable
This commit is contained in:
@@ -20,7 +20,7 @@ def valid_elabfiles(path):
|
||||
pass
|
||||
return elabfiles
|
||||
|
||||
def call_sample(apikey, elabid, SERVER_URL="https://elabftw.fisica.unina.it/"): # TO-DO: rm default server
|
||||
def call_sample(elabid, SERVER_URL="https://elabftw.fisica.unina.it/"): # TO-DO: rm default server
|
||||
'''Queries the Resources (/items) API endpoint
|
||||
of eLabFTW instance to request data (JSON)
|
||||
on a certain sample given its eLab-ID.
|
||||
@@ -40,14 +40,13 @@ def call_sample(apikey, elabid, SERVER_URL="https://elabftw.fisica.unina.it/"):
|
||||
)
|
||||
return sample.json()
|
||||
|
||||
def id2sample(apikey, elabid):
|
||||
def id2sample(elabid):
|
||||
'''Fetches sample data (JSON) from eLabFTW
|
||||
instance (using function "call_sample()")
|
||||
and extracts significant information.
|
||||
|
||||
Currently, it only returns the sample's title.'''
|
||||
#apikey = getpass("Paste API key here: ") # move outside loops
|
||||
sample_data = call_sample(apikey, elabid)
|
||||
sample_data = call_sample(elabid)
|
||||
sample_title = sample_data["title"]
|
||||
return sample_title
|
||||
|
||||
@@ -56,13 +55,12 @@ def fetch_and_group(path):
|
||||
files in a given folder, then
|
||||
'''
|
||||
sample_dict = {}
|
||||
apikey = getpass("Paste API key here: ")
|
||||
for filename in valid_elabfiles(path):
|
||||
with open(os.path.join(path, filename), "r") as f:
|
||||
layer = json.load(f)
|
||||
extra = layer["metadata_decoded"]["extra_fields"]
|
||||
sample_id = extra["Sample"]["value"]
|
||||
sample_title = id2sample(apikey, sample_id)
|
||||
sample_title = id2sample(sample_id)
|
||||
lpn = int(extra["Layer Progressive Number"]["value"]) # Layer Progressive Number
|
||||
if not sample_dict.get(sample_title): # if not existent yet, initialize
|
||||
sample_dict[sample_title] = {
|
||||
@@ -82,5 +80,6 @@ def fetch_and_group(path):
|
||||
}
|
||||
return sample_dict
|
||||
|
||||
apikey = getpass("Paste API key here: ")
|
||||
sample_dict = fetch_and_group("./tests/objects")
|
||||
print(json.dumps(sample_dict, indent=3))
|
||||
Reference in New Issue
Block a user