Skip to content

Commit fac365f

Browse files
committed
Fixes an import issue.
1 parent 06ce342 commit fac365f

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

ads/aqua/common/utils.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,12 @@
2828
from ads.aqua.constants import *
2929
from ads.aqua.data import AquaResourceIdentifier
3030
from ads.common.auth import default_signer
31-
from ads.common.decorator import threaded
31+
from ads.common.decorator.threaded import threaded
3232
from ads.common.extended_enum import ExtendedEnumMeta
3333
from ads.common.object_storage_details import ObjectStorageDetails
3434
from ads.common.oci_resource import SEARCH_TYPE, OCIResource
3535
from ads.common.utils import copy_file, get_console_link, upload_to_os
36-
from ads.config import (
37-
AQUA_SERVICE_MODELS_BUCKET,
38-
CONDA_BUCKET_NS,
39-
TENANCY_OCID,
40-
THREADED_DEFAULT_TIMEOUT,
41-
)
36+
from ads.config import AQUA_SERVICE_MODELS_BUCKET, CONDA_BUCKET_NS, TENANCY_OCID
4237
from ads.model import DataScienceModel, ModelVersionSet
4338

4439
logger = logging.getLogger("ads.aqua")
@@ -201,7 +196,7 @@ def read_file(file_path: str, **kwargs) -> str:
201196
return UNKNOWN
202197

203198

204-
@threaded(timeout=THREADED_DEFAULT_TIMEOUT)
199+
@threaded()
205200
def load_config(file_path: str, config_file_name: str, **kwargs) -> dict:
206201
artifact_path = f"{file_path.rstrip('/')}/{config_file_name}"
207202
if artifact_path.startswith("oci://"):

ads/common/decorator/threaded.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(
4646
)
4747

4848

49-
def threaded(timeout=None):
49+
def threaded(timeout: Optional[int] = THREADED_DEFAULT_TIMEOUT):
5050
"""
5151
Decorator to run a function in a separate thread using a global thread pool.
5252
@@ -83,7 +83,7 @@ def wrapper(*args, **kwargs):
8383
"""
8484
future = thread_pool.submit(func, *args, **kwargs)
8585
try:
86-
return future.result(timeout=timeout or THREADED_DEFAULT_TIMEOUT)
86+
return future.result(timeout=timeout)
8787
except concurrent.futures.TimeoutError as ex:
8888
logger.debug(
8989
f"The function '{func.__name__}' "

0 commit comments

Comments
 (0)