[Exchange Oracle] Move cvat timeout settings to cvat config, update .env template

Author: zhiltsov-max

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

@@ -69,6 +69,14 @@ CVAT_ADMIN_USER_ID=
 CVAT_INCOMING_WEBHOOKS_URL=
 CVAT_WEBHOOK_SECRET=
 CVAT_ORG_SLUG=
+CVAT_TASK_SEGMENT_SIZE=
+CVAT_MAX_JOBS_PER_TASK=
+CVAT_TASK_CREATION_CHECK_INTERVAL=
+CVAT_MAX_VALIDATION_CHECKS=
+CVAT_IOU_THRESHOLD=
+CVAT_OKS_SIGMA=
+CVAT_EXPORT_TIMEOUT=
+CVAT_IMPORT_TIMEOUT=
 
 # Storage Config (S3/GCS)
 
@@ -84,6 +92,7 @@ STORAGE_USE_SSL=
 # Features
 
 ENABLE_CUSTOM_CLOUD_HOST=
+REQUEST_LOGGING_ENABLED=
 
 # Core
 
@@ -105,6 +114,7 @@ DEFAULT_API_PAGE_SIZE=
 LOCALHOST_RECORDING_ORACLE_ADDRESS=
 LOCALHOST_RECORDING_ORACLE_URL=
 LOCALHOST_JOB_LAUNCHER_URL=
+LOCALHOST_REPUTATION_ORACLE_ADDRESS=
 LOCALHOST_REPUTATION_ORACLE_URL=
 
 # Encryption

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

@@ -170,7 +170,7 @@ class CronConfig:
 
 
 class CvatConfig:
-    # TODO: it looks odd to use cvat_ prefix in class attributes inside CvatConfig
+    # TODO: remove cvat_ prefix
     cvat_url = os.environ.get("CVAT_URL", "http://localhost:8080")
     cvat_admin = os.environ.get("CVAT_ADMIN", "admin")
     cvat_admin_pass = os.environ.get("CVAT_ADMIN_PASS", "admin")
@@ -182,6 +182,12 @@ class CvatConfig:
     cvat_max_jobs_per_task = int(os.environ.get("CVAT_MAX_JOBS_PER_TASK", 10 * 1000))
     cvat_task_creation_check_interval = int(os.environ.get("CVAT_TASK_CREATION_CHECK_INTERVAL", 5))
 
+    cvat_export_timeout = int(os.environ.get("CVAT_EXPORT_TIMEOUT", 5 * 60))
+    "Timeout, in seconds, for annotations or dataset export waiting"
+
+    cvat_import_timeout = int(os.environ.get("CVAT_IMPORT_TIMEOUT", 60 * 60))
+    "Timeout, in seconds, for waiting on GT annotations import"
+
     # quality control settings
     cvat_max_validation_checks = int(os.environ.get("CVAT_MAX_VALIDATION_CHECKS", 3))
     "Maximum number of attempts to run a validation check on a job after completing annotation"
@@ -233,12 +239,6 @@ class FeaturesConfig:
     enable_custom_cloud_host = to_bool(os.environ.get("ENABLE_CUSTOM_CLOUD_HOST", "no"))
     "Allows using a custom host in manifest bucket urls"
 
-    default_export_timeout = int(os.environ.get("DEFAULT_EXPORT_TIMEOUT", 60))
-    "Timeout, in seconds, for annotations or dataset export waiting"
-
-    default_import_timeout = int(os.environ.get("DEFAULT_IMPORT_TIMEOUT", 60 * 60))
-    "Timeout, in seconds, for waiting on GT annotations import"
-
     request_logging_enabled = to_bool(os.getenv("REQUEST_LOGGING_ENABLED", "0"))
     "Allow to log request details for each request"
 

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

@@ -77,7 +77,7 @@ def _get_annotations(
     time_begin = utcnow()
 
     if timeout is _NOTSET:
-        timeout = Config.features.default_export_timeout
+        timeout = Config.cvat_config.cvat_export_timeout
 
     while True:
         (_, response) = endpoint.call_with_http_info(
@@ -641,7 +641,7 @@ def upload_gt_annotations(
     *,
     format_name: str,
     sleep_interval: int = 5,
-    timeout: int | None = Config.features.default_import_timeout,
+    timeout: int | None = Config.cvat_config.cvat_import_timeout,
 ) -> None:
     # FUTURE-TODO: use job.import_annotations when CVAT supports a waiting timeout
     start_time = datetime.now(timezone.utc)