Skip to content

Commit

Permalink
Fixes an import issue.
Browse files Browse the repository at this point in the history
  • Loading branch information
mrDzurb committed Jun 10, 2024
1 parent 06ce342 commit fac365f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
11 changes: 3 additions & 8 deletions ads/aqua/common/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,12 @@
from ads.aqua.constants import *
from ads.aqua.data import AquaResourceIdentifier
from ads.common.auth import default_signer
from ads.common.decorator import threaded
from ads.common.decorator.threaded import threaded
from ads.common.extended_enum import ExtendedEnumMeta
from ads.common.object_storage_details import ObjectStorageDetails
from ads.common.oci_resource import SEARCH_TYPE, OCIResource
from ads.common.utils import copy_file, get_console_link, upload_to_os
from ads.config import (
AQUA_SERVICE_MODELS_BUCKET,
CONDA_BUCKET_NS,
TENANCY_OCID,
THREADED_DEFAULT_TIMEOUT,
)
from ads.config import AQUA_SERVICE_MODELS_BUCKET, CONDA_BUCKET_NS, TENANCY_OCID
from ads.model import DataScienceModel, ModelVersionSet

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


@threaded(timeout=THREADED_DEFAULT_TIMEOUT)
@threaded()
def load_config(file_path: str, config_file_name: str, **kwargs) -> dict:
artifact_path = f"{file_path.rstrip('/')}/{config_file_name}"
if artifact_path.startswith("oci://"):
Expand Down
4 changes: 2 additions & 2 deletions ads/common/decorator/threaded.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __init__(
)


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

0 comments on commit fac365f

Please sign in to comment.