Skip to content

Commit 3746126

Browse files
committed
[Recording Oracle] Update .env template, add some variables
1 parent 7122809 commit 3746126

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

packages/examples/cvat/recording-oracle/src/.env.template

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,15 @@ EXCHANGE_ORACLE_STORAGE_RESULTS_BUCKET_NAME=
5555
EXCHANGE_ORACLE_STORAGE_USE_SSL=
5656
EXCHANGE_ORACLE_STORAGE_KEY_FILE_PATH=
5757

58+
# CVAT
59+
60+
CVAT_URL=
61+
CVAT_ADMIN=
62+
CVAT_ADMIN_PASS=
63+
CVAT_ORG_SLUG=
64+
CVAT_QUALITY_RETRIEVAL_TIMEOUT=
65+
CVAT_QUALITY_CHECK_INTERVAL=
66+
5867
# Localhost
5968

6069
LOCALHOST_EXCHANGE_ORACLE_URL=

packages/examples/cvat/recording-oracle/src/core/config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,9 @@ class CvatConfig:
229229
cvat_admin_pass = os.environ.get("CVAT_ADMIN_PASS", "admin")
230230
cvat_org_slug = os.environ.get("CVAT_ORG_SLUG", "org1")
231231

232+
cvat_quality_retrieval_timeout = int(os.environ.get("CVAT_QUALITY_RETRIEVAL_TIMEOUT", 60 * 60))
233+
cvat_quality_check_interval = int(os.environ.get("CVAT_QUALITY_CHECK_INTERVAL", 5))
234+
232235

233236
class Config:
234237
port = int(os.environ.get("PORT", 8000))

packages/examples/cvat/recording-oracle/src/cvat/api_calls.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ def get_last_task_quality_report(task_id: int) -> models.QualityReport | None:
4040
def compute_task_quality_report(
4141
task_id: int,
4242
*,
43-
max_waiting_time: int = 60 * 60,
44-
sleep_interval: float = 0.5,
43+
timeout: int = Config.cvat_config.cvat_quality_retrieval_timeout,
44+
check_interval: float = Config.cvat_config.cvat_quality_check_interval,
4545
) -> models.QualityReport:
4646
logger = logging.getLogger("app")
4747
start_time = utcnow()
@@ -56,7 +56,7 @@ def compute_task_quality_report(
5656
f"when creating a task({task_id}) quality report"
5757
)
5858

59-
while utcnow() - start_time < timedelta(seconds=max_waiting_time):
59+
while utcnow() - start_time < timedelta(seconds=timeout):
6060
_, response = api_client.quality_api.create_report(
6161
rq_id=rq_id, _check_status=False, _parse_response=False
6262
)
@@ -68,7 +68,7 @@ def compute_task_quality_report(
6868

6969
return report
7070
case HTTPStatus.ACCEPTED:
71-
sleep(sleep_interval)
71+
sleep(check_interval)
7272
continue
7373
case _:
7474
raise Exception(f"Unexpected response status: {response.status}")
@@ -91,8 +91,8 @@ def get_task(task_id: int) -> models.TaskRead:
9191
def get_task_quality_report(
9292
task_id: int,
9393
*,
94-
max_waiting_time: int = 10 * 60,
95-
sleep_interval: float = 0.5,
94+
timeout: int = Config.cvat_config.cvat_quality_retrieval_timeout,
95+
check_interval: float = Config.cvat_config.cvat_quality_check_interval,
9696
) -> models.QualityReport:
9797
logger = logging.getLogger("app")
9898

@@ -111,9 +111,7 @@ def get_task_quality_report(
111111
)
112112
return report
113113

114-
return compute_task_quality_report(
115-
task_id, max_waiting_time=max_waiting_time, sleep_interval=sleep_interval
116-
)
114+
return compute_task_quality_report(task_id, timeout=timeout, check_interval=check_interval)
117115

118116

119117
def get_quality_report_data(report_id: int) -> QualityReportData:

0 commit comments

Comments
 (0)