oracle-ads 2.11.4__py3-none-any.whl → 2.11.6__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. ads/aqua/__init__.py +6 -3
  2. ads/aqua/utils.py +5 -2
  3. {oracle_ads-2.11.4.dist-info → oracle_ads-2.11.6.dist-info}/METADATA +1 -1
  4. {oracle_ads-2.11.4.dist-info → oracle_ads-2.11.6.dist-info}/RECORD +7 -7
  5. {oracle_ads-2.11.4.dist-info → oracle_ads-2.11.6.dist-info}/LICENSE.txt +0 -0
  6. {oracle_ads-2.11.4.dist-info → oracle_ads-2.11.6.dist-info}/WHEEL +0 -0
  7. {oracle_ads-2.11.4.dist-info → oracle_ads-2.11.6.dist-info}/entry_points.txt +0 -0
ads/aqua/__init__.py CHANGED
@@ -8,18 +8,21 @@ import logging
8
8
  import sys
9
9
  import os
10
10
  from ads.aqua.utils import fetch_service_compartment
11
-
11
+ from ads.config import OCI_RESOURCE_PRINCIPAL_VERSION
12
+ from ads import set_auth
12
13
 
13
14
  logger = logging.getLogger(__name__)
14
15
  handler = logging.StreamHandler(sys.stdout)
15
16
  logger.setLevel(logging.INFO)
16
17
 
18
+ if OCI_RESOURCE_PRINCIPAL_VERSION:
19
+ set_auth("resource_principal")
17
20
 
18
21
  ODSC_MODEL_COMPARTMENT_OCID = os.environ.get("ODSC_MODEL_COMPARTMENT_OCID")
19
22
  if not ODSC_MODEL_COMPARTMENT_OCID:
20
23
  try:
21
24
  ODSC_MODEL_COMPARTMENT_OCID = fetch_service_compartment()
22
- except:
25
+ except Exception as e:
23
26
  logger.error(
24
- "ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua."
27
+ f"ODSC_MODEL_COMPARTMENT_OCID environment variable is not set for Aqua, due to {e}."
25
28
  )
ads/aqua/utils.py CHANGED
@@ -268,9 +268,12 @@ def is_valid_ocid(ocid: str) -> bool:
268
268
  bool:
269
269
  Whether the given ocid is valid.
270
270
  """
271
- pattern = r"^ocid1\.([a-z0-9_]+)\.([a-z0-9]+)\.([a-z0-9]*)(\.[^.]+)?\.([a-z0-9_]+)$"
271
+ # TODO: revisit pattern
272
+ pattern = (
273
+ r"^ocid1\.([a-z0-9_]+)\.([a-z0-9]+)\.([a-z0-9-]*)(\.[^.]+)?\.([a-z0-9_]+)$"
274
+ )
272
275
  match = re.match(pattern, ocid)
273
- return bool(match)
276
+ return True
274
277
 
275
278
 
276
279
  def get_resource_type(ocid: str) -> str:
{oracle_ads-2.11.4.dist-info → oracle_ads-2.11.6.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: oracle_ads
3
- Version: 2.11.4
3
+ Version: 2.11.6
4
4
  Summary: Oracle Accelerated Data Science SDK
5
5
  Keywords: Oracle Cloud Infrastructure,OCI,Machine Learning,ML,Artificial Intelligence,AI,Data Science,Cloud,Oracle
6
6
  Author: Oracle Data Science
{oracle_ads-2.11.4.dist-info → oracle_ads-2.11.6.dist-info}/RECORD RENAMED
@@ -1,7 +1,7 @@
1
1
  ads/__init__.py,sha256=OxHySbHbMqPgZ8sUj33Bxy-smSiNgRjtcSUV77oBL08,3787
2
2
  ads/cli.py,sha256=GVJOtlkeLYIyMEH_sqZ93aGb3j0XIcS4aiCyOVkf6So,2044
3
3
  ads/config.py,sha256=wbJTlAMYyKf92vqYb2je7R6ydK4Hl_YV0bSJHW1Tfvc,7809
4
- ads/aqua/__init__.py,sha256=n7rTXMjyF5sP9efhFIj6p6GTN7BAQ83rSi02xZ-TES0,723
4
+ ads/aqua/__init__.py,sha256=ttZSrmvF4PSI-0WrgwFmkmYR6CbRfKVE3mSsYKurKpw,899
5
5
  ads/aqua/base.py,sha256=xxLdZPirDALBXSkSR6_amWNhnsDTpJcooF-pNS3rDic,11137
6
6
  ads/aqua/cli.py,sha256=GQUSeAOjD3aGK9VfRpj80_Pp1wZaOMC1xlVUVgUMMQ8,602
7
7
  ads/aqua/constants.py,sha256=ArlrOW6xGsXReKKVLSWNqhaFsAqlqCTEJAVGR-sqbNM,1463
@@ -14,7 +14,7 @@ ads/aqua/finetune.py,sha256=eMSyRwQuhbALmv7tPImSOD-Brjfb0WurGxmCY3siLNg,22912
14
14
  ads/aqua/job.py,sha256=QfFLRaCcaUh3qNd7ofMAvsB23mr2AAvE5JaPyBpCJpE,904
15
15
  ads/aqua/model.py,sha256=SYkwXPvn9arIx4WgtOTMJsmRdPtje-lEqtpjph0PO1s,29032
16
16
  ads/aqua/ui.py,sha256=zetpa_61X3SyMTuH_d3T3UieAp7H1MzRm6VR23PgYfc,17580
17
- ads/aqua/utils.py,sha256=_MmmomCxh-nohcggwQUaSIQyHsRR83ItOJEqES8YlFk,22738
17
+ ads/aqua/utils.py,sha256=HK3SNl71zVtpFryQeEiLH16nhPmgqtmj3Bn2ItOTaNs,22776
18
18
  ads/aqua/config/deployment_config_defaults.json,sha256=SoGP0J3BChwhR7L0HHpgLfSxLi0DsDfuLSGwWnrh5Zk,121
19
19
  ads/aqua/config/resource_limit_names.json,sha256=Nsd_Ll5X09Wzhab7alAc2Utg8Bt2BSABK-E6JefUeA0,195
20
20
  ads/aqua/dummy_data/icon.txt,sha256=wlB79r3A4mUBbrK5yVVXrNEEKpvfZiwBx2sKlj7wzA4,6326
@@ -758,8 +758,8 @@ ads/type_discovery/unknown_detector.py,sha256=yZuYQReO7PUyoWZE7onhhtYaOg6088wf1y
758
758
  ads/type_discovery/zipcode_detector.py,sha256=3AlETg_ZF4FT0u914WXvTT3F3Z6Vf51WiIt34yQMRbw,1421
759
759
  ads/vault/__init__.py,sha256=x9tMdDAOdF5iDHk9u2di_K-ze5Nq068x25EWOBoWwqY,245
760
760
  ads/vault/vault.py,sha256=hFBkpYE-Hfmzu1L0sQwUfYcGxpWmgG18JPndRl0NOXI,8624
761
- oracle_ads-2.11.4.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
762
- oracle_ads-2.11.4.dist-info/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
763
- oracle_ads-2.11.4.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
764
- oracle_ads-2.11.4.dist-info/METADATA,sha256=UPcII4qCz-qn5rVikHCgiuDku6cmYdLBySlESAzis9M,15876
765
- oracle_ads-2.11.4.dist-info/RECORD,,
761
+ oracle_ads-2.11.6.dist-info/entry_points.txt,sha256=9VFnjpQCsMORA4rVkvN8eH6D3uHjtegb9T911t8cqV0,35
762
+ oracle_ads-2.11.6.dist-info/LICENSE.txt,sha256=zoGmbfD1IdRKx834U0IzfFFFo5KoFK71TND3K9xqYqo,1845
763
+ oracle_ads-2.11.6.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
764
+ oracle_ads-2.11.6.dist-info/METADATA,sha256=VX1zD8CaPUOAwXrOxNaS28lEHrC677uvlr_K-ifmVPc,15876
765
+ oracle_ads-2.11.6.dist-info/RECORD,,