RF: changed bart timing, added 2 questions

Author: beegica

config.py

@@ -2,7 +2,7 @@
 
 import os
 
-EXP_NAME = "SUPREME-03252020"
+EXP_NAME = "SUPREMEMOOD"
 
 BACKGROUND_COLOR = (.35, .35, .35, 1.0)
 
@@ -165,144 +165,153 @@
 CESD = [{'type':'TITLE',
          'question':"General Questionnaire",
          },
-        {'type':'LI',
-         'question':"1. I was bothered by things that usually don't bother me.",
-         'ans':['Rarely or none\nof the time\n(less than 1 day)',
-                'Some or a little of\nthe time (1-2 days)',
-                'Occasionally or a\nmoderate amount of time\n(3-4 days)',
-                'Most or all of the time\n(5-7 days)'],
+        {'type':'MC',
+         'question':"1. Sex assigned at birth:",
+         'ans':['Male',
+                'Female',
+                'Perfer not to answer'],
          'group_id':"1"},
+         {'type':'TI',
+          'question':"2. Your Age: ",
+          'multiline':1},
         {'type':'LI',
-         'question':"2. I did not feel like eating; my appetite was poor.",
-         'ans':['Rarely or none\nof the time\n(less than 1 day)',
-                'Some or a little of\nthe time (1-2 days)',
-                'Occasionally or a\nmoderate amount of time\n(3-4 days)',
-                'Most or all of the time\n(5-7 days)'],
-         'group_id':"2"},
-        {'type':'LI',
-         'question':"3. I felt that I could not shake off the blues even with help from my family or friends.",
+         'question':"3. I was bothered by things that usually don't bother me.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"3"},
         {'type':'LI',
-         'question':"4. I felt I was just as good as other people.",
+         'question':"4. I did not feel like eating; my appetite was poor.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"4"},
         {'type':'LI',
-         'question':"5. I had trouble keeping my mind on what I was doing.",
+         'question':"5. I felt that I could not shake off the blues even with help from my family or friends.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"5"},
         {'type':'LI',
-         'question':"6. I felt depressed.",
+         'question':"6. I felt I was just as good as other people.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"6"},
         {'type':'LI',
-         'question':"7. I felt that everything I did was an effort.",
+         'question':"7. I had trouble keeping my mind on what I was doing.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"7"},
         {'type':'LI',
-         'question':"8. I felt hopeful about the future.",
+         'question':"8. I felt depressed.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"8"},
         {'type':'LI',
-         'question':"9. I thought my life had been a failure.",
+         'question':"9. I felt that everything I did was an effort.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"9"},
         {'type':'LI',
-         'question':"10. I felt fearful.",
+         'question':"10. I felt hopeful about the future.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"10"},
         {'type':'LI',
-         'question':"11. My sleep was restless",
+         'question':"11. I thought my life had been a failure.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"11"},
         {'type':'LI',
-         'question':"12. I was happy.",
+         'question':"12. I felt fearful.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"12"},
         {'type':'LI',
-         'question':"13. I talked less than usual.",
+         'question':"13. My sleep was restless",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"13"},
         {'type':'LI',
-         'question':"14. I felt lonely.",
+         'question':"14. I was happy.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"14"},
         {'type':'LI',
-         'question':"15. People were unfriendly.",
+         'question':"15. I talked less than usual.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"15"},
         {'type':'LI',
-         'question':"16. I enjoyed life.",
+         'question':"16. I felt lonely.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"16"},
         {'type':'LI',
-         'question':"17. I had crying spells.",
+         'question':"17. People were unfriendly.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"17"},
         {'type':'LI',
-         'question':"18. I felt sad.",
+         'question':"18. I enjoyed life.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"18"},
         {'type':'LI',
-         'question':"19. I felt that people dislike me.",
+         'question':"19. I had crying spells.",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
          'group_id':"19"},
         {'type':'LI',
-         'question':"20. I could not get \"going.\"",
+         'question':"20. I felt sad.",
+         'ans':['Rarely or none\nof the time\n(less than 1 day)',
+                'Some or a little of\nthe time (1-2 days)',
+                'Occasionally or a\nmoderate amount of time\n(3-4 days)',
+                'Most or all of the time\n(5-7 days)'],
+         'group_id':"20"},
+        {'type':'LI',
+         'question':"21. I felt that people dislike me.",
+         'ans':['Rarely or none\nof the time\n(less than 1 day)',
+                'Some or a little of\nthe time (1-2 days)',
+                'Occasionally or a\nmoderate amount of time\n(3-4 days)',
+                'Most or all of the time\n(5-7 days)'],
+         'group_id':"21"},
+        {'type':'LI',
+         'question':"22. I could not get \"going.\"",
          'ans':['Rarely or none\nof the time\n(less than 1 day)',
                 'Some or a little of\nthe time (1-2 days)',
                 'Occasionally or a\nmoderate amount of time\n(3-4 days)',
                 'Most or all of the time\n(5-7 days)'],
-         'group_id':"20"}
+         'group_id':"22"}
          ]

main.py

@@ -5,6 +5,7 @@
 import json
 import subprocess
 import zipfile
+import hashlib
 # Smile imports
 from smile.common import Experiment, Log, Wait, Func, UntilDone, ButtonPress, \
                          Button, Label, Loop, If, Elif, Else, KeyPress, Ref,\
@@ -50,27 +51,45 @@ def ToOut(message, exp, post_urlFULL):
         print(f"Unexpected {err=}, Could not zip directory.{type(err)=}")
         raise err
 
-    if not (message is None):
+    status_code = None
+    try:
+        with open(to_zip, 'rb') as f:
+            data = f.read()
+            print(post_urlFULL)
+            r = requests.post(post_urlFULL,
+                              data={'results':data},
+                              verify=os.path.join(WRK_DIR, "cert.pem"),
+                              allow_redirects=False,
+                              timeout=120)
+            print(r.status_code)
+            status_code = r.status_code
+    except BaseException as err:
+        print(f"Unexpected {err=}, {type(err)=}")
+        failed_post = True
+    if status_code != 200:
+        failed_post = True
+    m = 'e0000000000'
+    if (not (message is None)) & (not failed_post):
         with open('confirmation_code.txt', 'w') as f:
             f.write(message['extra'][10:-5])
+
         try:
             copy2clip(message['extra'][10:-5])
+            m = message['extra'][10:-5]
         except BaseException as err:
             print(f"Unexpected {err=}, Could not copy to clipboard: {type(err)=}")
             failed_copy = True
-    try:
+    else:
         with open(to_zip, 'rb') as f:
             data = f.read()
-            r = requests.post(post_urlFULL,
-                          data={'results':data},
-                          verify=os.path.join(WRK_DIR, "cert.pem"),
-                          timeout=120)
-            print(r)
-    except BaseException as err:
-        print(f"Unexpected {err=}, {type(err)=}")
-        raise err
-        failed_post = True
-    return failed_post, failed_copy
+            m = "e" + hashlib.md5(data).hexdigest()[:10]
+        try:
+            copy2clip(m)
+        except BaseException as err:
+            print(f"Unexpected {err=}, Could not copy to clipboard: {type(err)=}")
+            failed_copy = True
+
+    return failed_post, failed_copy, m
 #----------------WRK_DIR EDITS HERE----------------
 # edited so the data_dir is the WRK_DIR if running from the packaged exe
 # otherwise the data_dir is '.'
@@ -125,14 +144,15 @@ def ToOut(message, exp, post_urlFULL):
 # Do the get
 print('About to get')
 with open(os.path.join(WRK_DIR, 'serverinfo.txt'), 'r') as f:
-    serverinfo = f.read()
+    serverinfo = f.readline().strip()
+    post_urlFULL = f.readline().strip()
+    print(serverinfo, post_urlFULL)
 
 try:
     r = requests.get(serverinfo, verify=os.path.join(WRK_DIR, "cert.pem"),
                      timeout=2)
     print(r.text)
     message = json.loads(r.text.replace("\'", "\""))
-    post_urlFULL = serverinfo[:serverinfo.rfind('/')+1] + "end.php?at={}&sqlid={}"
     post_urlFULL = post_urlFULL.format(message['platformid'],
                                        message['sqlid'])
     connected = True
@@ -143,6 +163,7 @@ def ToOut(message, exp, post_urlFULL):
     post_urlFULL = None
     connected = False
     to_message = "Yo"
+print("connected: ", connected)
 # Initialize the SMILE experiment.
 exp = Experiment(name=CogBatt_config.EXP_NAME,
                  background_color=CogBatt_config.BACKGROUND_COLOR,
@@ -292,26 +313,27 @@ def ToOut(message, exp, post_urlFULL):
     KeyPress(['ESCAPE'], blocking=False)
 Wait(.25)
 with If(connected):
-    Label(text="Thank you! Your data will be sent after the experiment window closes.\nOn the next screen you will see your confirmation code!\nPress any key to continue",
+    Label(text="Thank you! Your data is about to be sent to our servers.\nOn one of the next screens, you will see your confirmation code!\nPress any key to continue",
           text_size=(s(900), None), font_size=s(CogBatt_config.SSI_FONT_SIZE))
     with UntilDone():
         KeyPress()
     # Start the experiment, everything above runs before the experiment even starts
     # since SMILE is a state machine. You must build it and then *.run()* it.
 
     Wait(.25)
-    Label(text="Code: {}\n\nThe code is saved to confirmation_code.txt\nPlease write down the code just in case it gets lost.\n\nOn the following screen we will attempt to send your data to our server and copy the code so you can paste into MTurk\n\nPress any key to continue. ".format(to_message),
-          text_size=(s(900), None), font_size=s(CogBatt_config.SSI_FONT_SIZE))
-    with UntilDone():
-        KeyPress()
-
     Label(text="Please wait, this could take several minutes...",
           text_size=(s(900), None), font_size=s(CogBatt_config.SSI_FONT_SIZE))
     with UntilDone():
         Wait(.033)
         to_server_resp = Func(ToOut, message, exp, post_urlFULL)
     with If(to_server_resp.result[1]):
-        Label(text="Due to an error, we were unable to copy the code to your clipboard.\n\nPlease see confirmation_code.txt for your code and paste it into MTurk. In case you cannot find this file, the code again is:\n\n{}\n\nPress any key to continue.".format(to_message),
+
+        Label(text="Due to an error, we were unable to copy the code to your clipboard.\n\nPlease see confirmation_code.txt for your code and paste it into MTurk. In case you cannot find this file, the code again is:\n\n"+to_server_resp.result[2]+"\n\nPress any key to continue.",
+              text_size=(s(900), None), font_size=s(CogBatt_config.SSI_FONT_SIZE))
+        with UntilDone():
+            KeyPress()
+    with Else():
+        Label(text="Your confirmation code was sent to your clipboard and saved in confirmation_code.txt.\n\nPlease paste it into MTurk. The code is:\n\n"+ to_server_resp.result[2] + "\n\nPlease write it down, then press any key to continue.",
               text_size=(s(900), None), font_size=s(CogBatt_config.SSI_FONT_SIZE))
         with UntilDone():
             KeyPress()
@@ -321,9 +343,11 @@ def ToOut(message, exp, post_urlFULL):
         with UntilDone():
             KeyPress()
 with Else():
-    Label(text="Thank you!\n\nDue to an error with the server, we ask that you send your data to: [email protected]\n\nYour data is in a file called data.zip located the same place as this experiment, cogmood.exe.\n\nPress any key to continue.",
+    ret2 = Func(ToOut, message, exp, post_urlFULL)
+
+    Label(text="Thank you!\n\nDue to an error with the server, we ask that you send your data to: [email protected]\n\nYour data is in a file called data.zip located the same place as this experiment, cogmood.exe.\n\nYour confirmation code for the experiment is\n\n" +ret2.result[2]+".\n\nPress any key to continue.",
           text_size=(s(900), None), font_size=s(CogBatt_config.SSI_FONT_SIZE))
     with UntilDone():
         KeyPress()
-    Func(ToOut, message, exp, post_urlFULL)
+
 exp.run()

tasks/BARTUVA/config.py

@@ -34,11 +34,11 @@
 
 FEEDBACK_TIME = 0.75
 ISI = 0.25
-INTER_PUMP_DURATION = 0.75
+INTER_PUMP_DURATION = 0.0
 REWARD_SLIDE_DURATION = 0.25
 PUMP_DURATION = 0.25
 COLLECT_DURATION = 0.5
-BALLOON_GROWTH_DURATION = 0.3
+BALLOON_GROWTH_DURATION = 0.2
 POP_ANIMATION_DURATION = 1.0
 
 BALLOON_START_SIZE = 100

tasks/BARTUVA/trial.py

@@ -220,7 +220,6 @@ def BARTSub(self,
                                         Reward_label.slide(duration=config.REWARD_SLIDE_DURATION,
                                                            center=Balloon.center,
                                                            color=(0,0,0,0))
-                                        Wait(0.5, jitter=0.3)
                                         with Parallel():
                                             Balloon.slide(duration=config.BALLOON_GROWTH_DURATION,
                                                           size=(s(self.curr_balloon_size),s(self.curr_balloon_size)),