Skip to content

Commit fb5c414

Browse files
committed
test: default OCI model coverage to callable regions
1 parent b168ab6 commit fb5c414

1 file changed

Lines changed: 18 additions & 11 deletions

File tree

tests/test_oci_client.py

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ def get_test_oci_model(env_var: str, default: str) -> str:
2525
return default
2626

2727

28+
def get_test_oci_setting(env_var: str, default: str) -> str:
29+
value = os.getenv(env_var)
30+
if value:
31+
return value
32+
return default
33+
34+
2835
@unittest.skipIf(os.getenv("TEST_OCI") is None, "TEST_OCI not set")
2936
class TestOciClient(unittest.TestCase):
3037
"""Test OciClient (v1 API) with OCI Generative AI."""
@@ -412,12 +419,15 @@ class TestOciClientModels(unittest.TestCase):
412419

413420
def setUp(self):
414421
"""Set up OCI client for each test."""
415-
compartment_id = os.getenv("OCI_COMPARTMENT_ID")
422+
compartment_id = get_test_oci_setting(
423+
"OCI_MODEL_TEST_COMPARTMENT_ID",
424+
os.getenv("OCI_COMPARTMENT_ID", ""),
425+
)
416426
if not compartment_id:
417427
self.skipTest("OCI_COMPARTMENT_ID not set")
418428

419-
region = os.getenv("OCI_REGION", "us-chicago-1")
420-
profile = os.getenv("OCI_PROFILE", "DEFAULT")
429+
region = get_test_oci_setting("OCI_MODEL_TEST_REGION", os.getenv("OCI_REGION", "us-chicago-1"))
430+
profile = get_test_oci_setting("OCI_MODEL_TEST_PROFILE", os.getenv("OCI_PROFILE", "API_KEY_AUTH"))
421431

422432
self.client = cohere.OciClient(
423433
oci_region=region,
@@ -437,14 +447,11 @@ def test_embed_english_v3(self):
437447

438448
def test_embed_light_v3(self):
439449
"""Test embed-english-light-v3.0 model."""
440-
try:
441-
response = self.client.embed(
442-
model="embed-english-light-v3.0",
443-
texts=["Test"],
444-
input_type="search_document",
445-
)
446-
except NotFoundError:
447-
self.skipTest("embed-english-light-v3.0 is not available in this OCI region/profile")
450+
response = self.client.embed(
451+
model="embed-english-light-v3.0",
452+
texts=["Test"],
453+
input_type="search_document",
454+
)
448455
self.assertIsNotNone(response.embeddings)
449456
self.assertEqual(len(response.embeddings[0]), 384)
450457

0 commit comments

Comments
 (0)