Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 12:54:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't use custom retries if are already handled by ayon api

Browse source
This commit is contained in:
Jakub Trllo 2025-12-09 12:03:19 +01:00
parent 647d91e288
commit faff50ce33
2 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/ayon_core/plugins/publish/integrate_review.py
View file

@ -2,8 +2,10 @@ import os
import time
import ayon_api
import pyblish.api
from ayon_api import TransferProgress
from ayon_api.server_api import RequestTypes
import pyblish.api
from ayon_core.lib import get_media_mime_type
from ayon_core.pipeline.publish import (
PublishXmlValidationError,
@ -108,13 +110,18 @@ class IntegrateAYONReview(pyblish.api.InstancePlugin):
content_type: str,
):
"""Upload file with simple retries."""
# How long to sleep before next attempt
wait_time = 1
filename = os.path.basename(repre_path)
headers = ayon_con.get_headers(content_type)
headers["x-file-name"] = filename
max_retries = ayon_con.get_default_max_retries()
# Retries are already implemented in 'ayon_api.upload_file'
# - added in ayon api 1.2.7
if hasattr(TransferProgress, "get_attempt"):
max_retries = 1
# How long to sleep before next attempt
wait_time = 1
last_error = None
for attempt in range(max_retries):
attempt += 1
@ -129,10 +136,11 @@ class IntegrateAYONReview(pyblish.api.InstancePlugin):
except (
requests.exceptions.Timeout,
requests.exceptions.ConnectionError
):
) as exc:
# Log and retry with backoff if attempts remain
if attempt >= max_retries:
raise
last_error = exc
break
self.log.warning(
f"Review upload failed ({attempt}/{max_retries})."

17
client/ayon_core/plugins/publish/integrate_thumbnail.py
View file

@ -27,7 +27,7 @@ import collections
import time
import ayon_api
from ayon_api import RequestTypes
from ayon_api import RequestTypes, TransferProgress
from ayon_api.operations import OperationsSession
import pyblish.api
import requests
@ -258,12 +258,16 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
content_type: str,
):
"""Upload file with simple retries."""
# How long to sleep before next attempt
wait_time = 1
ayon_con = ayon_api.get_server_api_connection()
headers = ayon_con.get_headers(content_type)
max_retries = ayon_con.get_default_max_retries()
# Retries are already implemented in 'ayon_api.upload_file'
# - added in ayon api 1.2.7
if hasattr(TransferProgress, "get_attempt"):
max_retries = 1
# How long to sleep before next attempt
wait_time = 1
last_error = None
for attempt in range(max_retries):
attempt += 1
@ -278,10 +282,11 @@ class IntegrateThumbnailsAYON(pyblish.api.ContextPlugin):
except (
requests.exceptions.Timeout,
requests.exceptions.ConnectionError
):
) as exc:
# Log and retry with backoff if attempts remain
if attempt >= max_retries:
raise
last_error = exc
break
self.log.warning(
f"Review upload failed ({attempt}/{max_retries})."