Can now specify the root path that the app will run on with an environment variable

app.py

@@ -396,7 +396,7 @@ with app:
     then(fn = upload_file_to_s3, inputs=[usage_logs_state, usage_s3_logs_loc_state], outputs=[s3_logs_output_textbox])
 
 # Get some environment variables and Launch the Gradio app
-COGNITO_AUTH = get_or_create_env_var('COGNITO_AUTH', '1')
+COGNITO_AUTH = get_or_create_env_var('COGNITO_AUTH', '0')
 print(f'The value of COGNITO_AUTH is {COGNITO_AUTH}')
 
 RUN_DIRECT_MODE = get_or_create_env_var('RUN_DIRECT_MODE', '0')
@@ -411,14 +411,17 @@ print(f'The value of MAX_FILE_SIZE is {MAX_FILE_SIZE}')
 GRADIO_SERVER_PORT = int(get_or_create_env_var('GRADIO_SERVER_PORT', '7860'))
 print(f'The value of GRADIO_SERVER_PORT is {GRADIO_SERVER_PORT}')
 
+ROOT_PATH = get_or_create_env_var('ROOT_PATH', '')
+print(f'The value of ROOT_PATH is {ROOT_PATH}')
+
 if __name__ == "__main__":
 
     if RUN_DIRECT_MODE == "0":
         
         if os.environ['COGNITO_AUTH'] == "1":
-            app.queue(max_size=MAX_QUEUE_SIZE).launch(show_error=True, auth=authenticate_user, max_file_size=MAX_FILE_SIZE, server_port=GRADIO_SERVER_PORT)
+            app.queue(max_size=MAX_QUEUE_SIZE).launch(show_error=True, auth=authenticate_user, max_file_size=MAX_FILE_SIZE, server_port=GRADIO_SERVER_PORT, root_path=ROOT_PATH)
         else:
-            app.queue(max_size=MAX_QUEUE_SIZE).launch(show_error=True, inbrowser=True, max_file_size=MAX_FILE_SIZE, server_port=GRADIO_SERVER_PORT)
+            app.queue(max_size=MAX_QUEUE_SIZE).launch(show_error=True, inbrowser=True, max_file_size=MAX_FILE_SIZE, server_port=GRADIO_SERVER_PORT, root_path=ROOT_PATH)
     
     else:
         from tools.cli_redact import main

tools/aws_functions.py

@@ -19,25 +19,27 @@ print(f'The value of AWS_REGION is {AWS_REGION}')
 
 
 def get_assumed_role_info():
-        sts_endpoint = 'https://sts.' + AWS_REGION + '.amazonaws.com'
-        sts = boto3.client('sts', region_name=AWS_REGION, endpoint_url=sts_endpoint)
-        response = sts.get_caller_identity()
-
-        # Extract ARN of the assumed role
-        assumed_role_arn = response['Arn']
-        
-        # Extract the name of the assumed role from the ARN
-        assumed_role_name = assumed_role_arn.split('/')[-1]
-        
-        return assumed_role_arn, assumed_role_name
+    sts_endpoint = 'https://sts.' + AWS_REGION + '.amazonaws.com'
+    sts = boto3.client('sts', region_name=AWS_REGION, endpoint_url=sts_endpoint)
+    response = sts.get_caller_identity()
+
+    # Extract ARN of the assumed role
+    assumed_role_arn = response['Arn']
+    
+    # Extract the name of the assumed role from the ARN
+    assumed_role_name = assumed_role_arn.split('/')[-1]
+    
+    return assumed_role_arn, assumed_role_name
 
 if RUN_AWS_FUNCTIONS == "1":
     try:
         bucket_name = os.environ['DOCUMENT_REDACTION_BUCKET']
-        session = boto3.Session()       
+        session = boto3.Session()   
+
+        print("session:", session)    
             
     except Exception as e:
-        print(e)    
+        print("Could not start boto3 session:", e)    
 
     try:
         assumed_role_arn, assumed_role_name = get_assumed_role_info()
@@ -46,7 +48,7 @@ if RUN_AWS_FUNCTIONS == "1":
         print("Assumed Role Name:", assumed_role_name)
 
     except Exception as e:
-        print(e)
+        print("Could not get assumed role from STS:", e)
 
 # Download direct from S3 - requires login credentials
 def download_file_from_s3(bucket_name, key, local_file_path_and_name):

tools/redaction_review.py

@@ -70,7 +70,7 @@ def update_annotator(image_annotator_object:AnnotatedImageData, page_num:int, zo
 
         number_reported = gr.Number(label = "Page (press enter to change)", value=1, precision=0)
 
-        return out_image_annotator, number_reported, number_reported
+        return out_image_annotator, number_reported, number_reported, page_num_reported
     
     #print("page_num at start of update_annotator function:", page_num)