diff --git a/CameraIntrinsics/iPad15,3/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,3/Deployed/cameraIntrinsics.pickle new file mode 100644 index 00000000..cad847ca Binary files /dev/null and b/CameraIntrinsics/iPad15,3/Deployed/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,3/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,3/Deployed_720_60fps/cameraIntrinsics.pickle new file mode 100644 index 00000000..cad847ca Binary files /dev/null and b/CameraIntrinsics/iPad15,3/Deployed_720_60fps/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,4/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,4/Deployed/cameraIntrinsics.pickle new file mode 100644 index 00000000..cad847ca Binary files /dev/null and b/CameraIntrinsics/iPad15,4/Deployed/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,4/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,4/Deployed_720_60fps/cameraIntrinsics.pickle new file mode 100644 index 00000000..cad847ca Binary files /dev/null and b/CameraIntrinsics/iPad15,4/Deployed_720_60fps/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,5/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,5/Deployed/cameraIntrinsics.pickle new file mode 100644 index 00000000..cad847ca Binary files /dev/null and b/CameraIntrinsics/iPad15,5/Deployed/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,5/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,5/Deployed_720_60fps/cameraIntrinsics.pickle new file mode 100644 index 00000000..cad847ca Binary files /dev/null and b/CameraIntrinsics/iPad15,5/Deployed_720_60fps/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,6/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,6/Deployed/cameraIntrinsics.pickle new file mode 100644 index 00000000..cad847ca Binary files /dev/null and b/CameraIntrinsics/iPad15,6/Deployed/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,6/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,6/Deployed_720_60fps/cameraIntrinsics.pickle new file mode 100644 index 00000000..cad847ca Binary files /dev/null and b/CameraIntrinsics/iPad15,6/Deployed_720_60fps/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,7/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,7/Deployed/cameraIntrinsics.pickle new file mode 100644 index 00000000..44737741 Binary files /dev/null and b/CameraIntrinsics/iPad15,7/Deployed/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,7/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,7/Deployed_720_60fps/cameraIntrinsics.pickle new file mode 100644 index 00000000..44737741 Binary files /dev/null and b/CameraIntrinsics/iPad15,7/Deployed_720_60fps/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,8/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,8/Deployed/cameraIntrinsics.pickle new file mode 100644 index 00000000..44737741 Binary files /dev/null and b/CameraIntrinsics/iPad15,8/Deployed/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad15,8/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPad15,8/Deployed_720_60fps/cameraIntrinsics.pickle new file mode 100644 index 00000000..44737741 Binary files /dev/null and b/CameraIntrinsics/iPad15,8/Deployed_720_60fps/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad16,1/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPad16,1/Deployed/cameraIntrinsics.pickle new file mode 100644 index 00000000..44737741 Binary files /dev/null and b/CameraIntrinsics/iPad16,1/Deployed/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad16,1/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPad16,1/Deployed_720_60fps/cameraIntrinsics.pickle new file mode 100644 index 00000000..44737741 Binary files /dev/null and b/CameraIntrinsics/iPad16,1/Deployed_720_60fps/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad16,2/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPad16,2/Deployed/cameraIntrinsics.pickle new file mode 100644 index 00000000..44737741 Binary files /dev/null and b/CameraIntrinsics/iPad16,2/Deployed/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPad16,2/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPad16,2/Deployed_720_60fps/cameraIntrinsics.pickle new file mode 100644 index 00000000..44737741 Binary files /dev/null and b/CameraIntrinsics/iPad16,2/Deployed_720_60fps/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPhone17,5/Deployed/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,5/Deployed/cameraIntrinsics.pickle new file mode 100644 index 00000000..61964ccb Binary files /dev/null and b/CameraIntrinsics/iPhone17,5/Deployed/cameraIntrinsics.pickle differ diff --git a/CameraIntrinsics/iPhone17,5/Deployed_720_60fps/cameraIntrinsics.pickle b/CameraIntrinsics/iPhone17,5/Deployed_720_60fps/cameraIntrinsics.pickle new file mode 100644 index 00000000..61964ccb Binary files /dev/null and b/CameraIntrinsics/iPhone17,5/Deployed_720_60fps/cameraIntrinsics.pickle differ diff --git a/app.py b/app.py index ea4963a1..fa1164b8 100644 --- a/app.py +++ b/app.py @@ -7,9 +7,12 @@ import traceback import logging import glob +import random from datetime import datetime, timedelta import numpy as np -from utilsAPI import getAPIURL, getWorkerType, getErrorLogBool, getASInstance, unprotect_current_instance, get_number_of_pending_trials +from utilsAPI import (getAPIURL, getWorkerType, getErrorLogBool, getASInstance, + unprotect_current_instance, get_number_of_pending_trials, + getAppPullWaitTimeAndJitter, getLogLevel) from utilsAuth import getToken from utils import (getDataDirectory, checkTime, checkResourceUsage, sendStatusEmail, checkForTrialsWithStatus, @@ -17,8 +20,10 @@ postProcessedDuration, makeRequestWithRetry, writeToErrorLog) +log_level = getLogLevel() + logging.basicConfig(format="[%(asctime)s] [%(levelname)s] %(message)s", - level=logging.INFO, + level=log_level, datefmt='%Y-%m-%d %H:%M:%S', force=True) @@ -30,6 +35,7 @@ ERROR_LOG = getErrorLogBool() error_log_path = "/data/error_log.json" +wait_base_time, wait_jitter = getAppPullWaitTimeAndJitter() # if true, will delete entire data directory when finished with a trial isDocker = True @@ -84,7 +90,9 @@ if r.status_code == 404: logging.info(f"...pulling {workerType} trials from {API_URL} " f"using commit {getCommitHash()}") - time.sleep(1) + wait_time = wait_base_time + random.uniform(-wait_jitter, wait_jitter) + time.sleep(wait_time) + logging.debug(f'waiting {wait_time} seconds') # When using autoscaling, we will remove the instance scale-in protection if it hasn't # pulled a trial recently and there are no actively recording trials diff --git a/utilsAPI.py b/utilsAPI.py index 1535406c..f2242096 100644 --- a/utilsAPI.py +++ b/utilsAPI.py @@ -7,6 +7,7 @@ import os import boto3 import requests +import logging from decouple import config from datetime import datetime, timedelta @@ -51,6 +52,18 @@ def getStatusEmails(): def getErrorLogBool(): return config('ERROR_LOG', default=False, cast=bool) +def getAppPullWaitTimeAndJitter(): + time = config('APP_PULL_WAIT_TIME', default=5.0, cast=float) + jitter = config('APP_PULL_WAIT_TIME_JITTER', default=1.0, cast=float) + + return time, jitter + +def getLogLevel(): + log_level_str = config('LOG_LEVEL', default='INFO') + log_level = getattr(logging, log_level_str.upper(), logging.INFO) + + return log_level + def getASInstance(): try: # Check if the ECS_CONTAINER_METADATA_FILE environment variable exists