Skip to content

Commit

Permalink
Automated commit -> added proxy and tease settings in env
Browse files Browse the repository at this point in the history
  • Loading branch information
miloswrath committed Sep 23, 2024
1 parent bc4de0a commit 34be331
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 10 deletions.
31 changes: 21 additions & 10 deletions jatosAPI.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,21 @@

# jap_5ThOJ14yf7z1EPEUpAoZYMWoETZcmJk305719

def get_met():
def parse_cmd():
#parse command line for TEASE var
import argparse
parser = argparse.ArgumentParser(description='API File to Pull Subject Data from Jatos')
parser.add_argument('-t', type=str, help='TEASE')

tease = os.getenv['TEASE']


def get_met(tease):



proxies = {
'http': f'http:zjgilliam:{tease}//proxy.divms.uiowa.edu:8888',
'https': f'https://zjgilliam:{tease}proxy.divms.uiowa.edu:8888',
'http': f'http:zjgilliam:{tease}@proxy.divms.uiowa.edu:8888',
'https': f'https://zjgilliam:{tease}@proxy.divms.uiowa.edu:8888',
}


Expand Down Expand Up @@ -62,12 +70,13 @@ def get_met():

return study_result_ids

def get_data(study_result_ids):
tease = os.getenv['TEASE']
def get_data(study_result_ids, tease):



proxies = {
'http': f'http:zjgilliam:{tease}//proxy.divms.uiowa.edu:8888',
'https': f'https://zjgilliam:{tease}proxy.divms.uiowa.edu:8888',
'http': f'http:zjgilliam:{tease}@proxy.divms.uiowa.edu:8888',
'https': f'https://zjgilliam:{tease}@proxy.divms.uiowa.edu:8888',
}

headers = {
Expand Down Expand Up @@ -224,8 +233,10 @@ def push():


def main():
study_result_ids = get_met()
get_data(study_result_ids)
args = parse_cmd()
tease = args.t
study_result_ids = get_met(tease)
get_data(study_result_ids, tease)
convert_beh()
txt_files = []
for root, dirs, files in os.walk('./data/raw'):
Expand Down
16 changes: 16 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
contourpy==1.2.1
cycler==0.12.1
fonttools==4.53.1
fuzzywuzzy==0.18.0
kiwisolver==1.4.5
matplotlib==3.9.2
numpy==2.0.1
packaging==24.1
pandas==2.2.2
pillow==10.4.0
pyparsing==3.1.2
python-dateutil==2.9.0.post0
pytz==2024.1
seaborn==0.13.2
six==1.16.0
tzdata==2024.1

0 comments on commit 34be331

Please sign in to comment.