Rename TestIdentifiers to ResourceIdentifiers to silence warning

Author: AlePouroullis

tests/custom/integration/conftest.py

@@ -8,12 +8,11 @@
 import uuid
 import pytest
 import dotenv
-from humanloop.client import Humanloop
 from tests.custom.types import GetHumanloopClientFn
 
 
 @dataclass
-class TestIdentifiers:
+class ResourceIdentifiers:
     file_id: str
     file_path: str
 
@@ -40,6 +39,7 @@ def openai_key() -> str:
 @pytest.fixture(scope="function")
 def sdk_test_dir(get_humanloop_client: GetHumanloopClientFn) -> Generator[str, None, None]:
     humanloop_client = get_humanloop_client()
+
     def cleanup_directory(directory_id: str):
         directory_response = humanloop_client.directories.get(id=directory_id)
         for subdirectory in directory_response.subdirectories:
@@ -95,7 +95,9 @@ def test_prompt_config() -> dict[str, Any]:
 
 
 @pytest.fixture(scope="function")
-def eval_dataset(get_humanloop_client: GetHumanloopClientFn, sdk_test_dir: str) -> Generator[TestIdentifiers, None, None]:
+def eval_dataset(
+    get_humanloop_client: GetHumanloopClientFn, sdk_test_dir: str
+) -> Generator[ResourceIdentifiers, None, None]:
     humanloop_client = get_humanloop_client()
     dataset_path = f"{sdk_test_dir}/eval_dataset"
     try:
@@ -119,7 +121,7 @@ def eval_dataset(get_humanloop_client: GetHumanloopClientFn, sdk_test_dir: str)
                 },
             ],
         )
-        yield TestIdentifiers(file_id=response.id, file_path=response.path)
+        yield ResourceIdentifiers(file_id=response.id, file_path=response.path)
         humanloop_client.datasets.delete(id=response.id)
     except Exception as e:
         pytest.fail(f"Failed to create dataset {dataset_path}: {e}")
@@ -128,15 +130,15 @@ def eval_dataset(get_humanloop_client: GetHumanloopClientFn, sdk_test_dir: str)
 @pytest.fixture(scope="function")
 def eval_prompt(
     get_humanloop_client: GetHumanloopClientFn, sdk_test_dir: str, openai_key: str, test_prompt_config: dict[str, Any]
-) -> Generator[TestIdentifiers, None, None]:
+) -> Generator[ResourceIdentifiers, None, None]:
     humanloop_client = get_humanloop_client()
     prompt_path = f"{sdk_test_dir}/eval_prompt"
     try:
         response = humanloop_client.prompts.upsert(
             path=prompt_path,
             **test_prompt_config,
         )
-        yield TestIdentifiers(file_id=response.id, file_path=response.path)
+        yield ResourceIdentifiers(file_id=response.id, file_path=response.path)
         humanloop_client.prompts.delete(id=response.id)
     except Exception as e:
         pytest.fail(f"Failed to create prompt {prompt_path}: {e}")
@@ -145,7 +147,7 @@ def eval_prompt(
 @pytest.fixture(scope="function")
 def output_not_null_evaluator(
     get_humanloop_client: GetHumanloopClientFn, sdk_test_dir: str
-) -> Generator[TestIdentifiers, None, None]:
+) -> Generator[ResourceIdentifiers, None, None]:
     humanloop_client = get_humanloop_client()
     evaluator_path = f"{sdk_test_dir}/output_not_null_evaluator"
     try:
@@ -161,14 +163,14 @@ def output_not_null(log: dict) -> bool:
                 "evaluator_type": "python",
             },
         )
-        yield TestIdentifiers(file_id=response.id, file_path=response.path)
+        yield ResourceIdentifiers(file_id=response.id, file_path=response.path)
         humanloop_client.evaluators.delete(id=response.id)
     except Exception as e:
         pytest.fail(f"Failed to create evaluator {evaluator_path}: {e}")
 
 
 @pytest.fixture(scope="function")
-def id_for_staging_environment(get_humanloop_client: GetHumanloopClientFn, eval_prompt: TestIdentifiers) -> str:
+def id_for_staging_environment(get_humanloop_client: GetHumanloopClientFn, eval_prompt: ResourceIdentifiers) -> str:
     humanloop_client = get_humanloop_client()
     response = humanloop_client.prompts.list_environments(id=eval_prompt.file_id)
     for environment in response:

tests/custom/integration/test_evals.py

@@ -3,15 +3,15 @@
 
 import pytest
 from humanloop.error import HumanloopRuntimeError
-from tests.custom.integration.conftest import TestIdentifiers
+from tests.custom.integration.conftest import ResourceIdentifiers
 from tests.custom.types import GetHumanloopClientFn
 
 
 def test_eval_run_works_on_online_files(
     get_humanloop_client: GetHumanloopClientFn,
-    output_not_null_evaluator: TestIdentifiers,
-    eval_dataset: TestIdentifiers,
-    eval_prompt: TestIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
+    eval_dataset: ResourceIdentifiers,
+    eval_prompt: ResourceIdentifiers,
 ) -> None:
     humanloop_client = get_humanloop_client()
     humanloop_client.evaluations.run(  # type: ignore [attr-defined]
@@ -39,9 +39,9 @@ def test_eval_run_works_on_online_files(
 
 def test_eval_run_version_id(
     get_humanloop_client: GetHumanloopClientFn,
-    output_not_null_evaluator: TestIdentifiers,
-    eval_dataset: TestIdentifiers,
-    eval_prompt: TestIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
+    eval_dataset: ResourceIdentifiers,
+    eval_prompt: ResourceIdentifiers,
     test_prompt_config: dict[str, Any],
 ) -> None:
     humanloop_client = get_humanloop_client()
@@ -88,9 +88,9 @@ def test_eval_run_version_id(
 
 def test_eval_run_environment(
     get_humanloop_client: GetHumanloopClientFn,
-    output_not_null_evaluator: TestIdentifiers,
-    eval_dataset: TestIdentifiers,
-    eval_prompt: TestIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
+    eval_dataset: ResourceIdentifiers,
+    eval_prompt: ResourceIdentifiers,
     test_prompt_config: dict[str, Any],
     id_for_staging_environment: str,
 ) -> None:
@@ -141,9 +141,9 @@ def test_eval_run_environment(
 @pytest.mark.parametrize("version_lookup", ["version_id", "environment"])
 def test_eval_run_version_lookup_fails_with_path(
     get_humanloop_client: GetHumanloopClientFn,
-    eval_prompt: TestIdentifiers,
-    eval_dataset: TestIdentifiers,
-    output_not_null_evaluator: TestIdentifiers,
+    eval_prompt: ResourceIdentifiers,
+    eval_dataset: ResourceIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
     version_lookup: str,
 ):
     # GIVEN an eval run where we try to evaluate a non-default version
@@ -172,9 +172,9 @@ def test_eval_run_version_lookup_fails_with_path(
 
 def test_eval_run_with_version_upsert(
     get_humanloop_client: GetHumanloopClientFn,
-    eval_prompt: TestIdentifiers,
-    eval_dataset: TestIdentifiers,
-    output_not_null_evaluator: TestIdentifiers,
+    eval_prompt: ResourceIdentifiers,
+    eval_dataset: ResourceIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
     test_prompt_config: dict[str, Any],
 ):
     humanloop_client = get_humanloop_client()
@@ -210,8 +210,8 @@ def test_eval_run_with_version_upsert(
 
 def test_flow_eval_does_not_work_without_callable(
     get_humanloop_client: GetHumanloopClientFn,
-    eval_dataset: TestIdentifiers,
-    output_not_null_evaluator: TestIdentifiers,
+    eval_dataset: ResourceIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
 ):
     with pytest.raises(HumanloopRuntimeError) as e:
         humanloop_client = get_humanloop_client()
@@ -241,8 +241,8 @@ def test_flow_eval_does_not_work_without_callable(
 
 def test_flow_eval_works_with_callable(
     get_humanloop_client: GetHumanloopClientFn,
-    eval_dataset: TestIdentifiers,
-    output_not_null_evaluator: TestIdentifiers,
+    eval_dataset: ResourceIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
     sdk_test_dir: str,
 ):
     humanloop_client = get_humanloop_client()
@@ -290,8 +290,8 @@ def test_flow_eval_works_with_callable(
 
 def test_cannot_evaluate_agent_with_callable(
     get_humanloop_client: GetHumanloopClientFn,
-    eval_dataset: TestIdentifiers,
-    output_not_null_evaluator: TestIdentifiers,
+    eval_dataset: ResourceIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
 ):
     with pytest.raises(ValueError) as e:
         humanloop_client = get_humanloop_client()
@@ -316,8 +316,8 @@ def test_cannot_evaluate_agent_with_callable(
 
 def test_flow_eval_resolves_to_default_with_callable(
     get_humanloop_client: GetHumanloopClientFn,
-    output_not_null_evaluator: TestIdentifiers,
-    eval_dataset: TestIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
+    eval_dataset: ResourceIdentifiers,
     sdk_test_dir: str,
 ) -> None:
     humanloop_client = get_humanloop_client()
@@ -361,8 +361,8 @@ def test_flow_eval_resolves_to_default_with_callable(
 @pytest.mark.skip(reason="Skip until agents are in prod")
 def test_agent_eval_works_upserting(
     get_humanloop_client: GetHumanloopClientFn,
-    eval_dataset: TestIdentifiers,
-    output_not_null_evaluator: TestIdentifiers,
+    eval_dataset: ResourceIdentifiers,
+    output_not_null_evaluator: ResourceIdentifiers,
     sdk_test_dir: str,
 ):
     humanloop_client = get_humanloop_client()