Skip to content

Fix for JIRA ODSC-77609. #1272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 19, 2025
Merged

Fix for JIRA ODSC-77609. #1272

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
782e0b6
init code for fix
elizjo Sep 17, 2025
aa23f25
addressed comments
elizjo Sep 17, 2025
07dc35b
fixed some unit test issues
elizjo Sep 18, 2025
653b82d
fixed unit tests
elizjo Sep 18, 2025
669c21c
Merge branch 'main' into fix/ODSC-77609
elizjo Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions ads/model/runtime/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,15 @@
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/

import json
import logging
import os
from functools import lru_cache
from typing import Dict, Tuple
import logging

import fsspec
import requests
import yaml
from cerberus import DocumentError, Validator

from ads.common.object_storage_details import ObjectStorageDetails
from ads.common.utils import PAR_LINK

MODEL_PROVENANCE_SCHEMA_PATH = os.path.join(
os.path.dirname(os.path.abspath(__file__)),
Expand Down Expand Up @@ -127,8 +124,8 @@ def _get_index_json_through_bucket(
service_packs = json.loads(f.read())
service_pack_list = service_packs.get(SERVICE_PACKS)
except Exception as e:
logging.warn(e)
logging.warn(
logging.warning(e)
Copy link
Member

@mrDzurb mrDzurb Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can do:

except Exception as e:
        logger.error(
            f"Error occurred in attempt to extract the list of the service conda environments "
            f"from the object storage for bucket '{bucketname}' and namespace '{namespace}'. "
            f"Please make sure that you've provided correct bucket and namespace."
        )

logging.warning(
"Failed to retrieve the full conda pack path from slug. Pass conda pack path 'oci://<bucketname>@<namespace>/<path_to_conda>' instead of slug."
)
return service_pack_list
Expand Down Expand Up @@ -160,21 +157,15 @@ def get_service_packs(
service_pack_path_mapping = {}
service_pack_slug_mapping = {}
try:
response = requests.request("GET", PAR_LINK)

# if there is internet
if response.ok:
service_pack_list = response.json().get(SERVICE_PACKS)
# response not good.
else:
service_pack_list = _get_index_json_through_bucket(
namespace=namespace, bucketname=bucketname, auth=auth
)
except Exception as e:
# not internet
logging.info("Obtaining service packs through bucket.")
Copy link
Member

@mrDzurb mrDzurb Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can do sometihng like this:

    service_pack_path_mapping = {}
    service_pack_slug_mapping = {}

    try:
        service_pack_list = _get_index_json_through_bucket(
            namespace=namespace,
            bucketname=bucketname,
            auth=auth
        )
    except Exception as e:
        logger.error(
            "Failed to fetch service packs index from namespace '%s' and bucket '%s': %s",
            namespace,
            bucketname,
            str(e),
        )
        return service_pack_path_mapping, service_pack_slug_mapping

service_pack_list = _get_index_json_through_bucket(
namespace=namespace, bucketname=bucketname, auth=auth
)
except Exception as e:
# not internet
logging.warning(e)
logging.warning("Failed to obtain service packs through bucket. Please ensure internet connection.")


for service_pack in service_pack_list:
# Here we need to replace the namespace and bucketname
Expand Down
Loading