evals_run modification works with simple callable and instrumented callables

Author: Andrei Bratu

src/humanloop/decorators/prompt.py

@@ -1,15 +1,11 @@
 import logging
-import os
-import sys
 import typing
-import uuid
 from functools import wraps
 from typing import Any, Callable, Mapping, Optional, Sequence
 
 from opentelemetry.sdk.trace import Span
 from opentelemetry.trace import Tracer
 
-from humanloop.types.prompt_kernel_request import PromptKernelRequest
 
 if typing.TYPE_CHECKING:
     from humanloop import ToolFunctionParams

src/humanloop/eval_utils/run.py

@@ -103,7 +103,6 @@ def log_with_evaluation_context(
     def _is_evaluated_file(
         evaluation_context: EvaluationContext,
         log_args: dict,
-        file_id_attribute: str,
     ) -> bool:
         """Check if the File that will Log against is part of the current Evaluation.
 
@@ -112,7 +111,7 @@ def _is_evaluated_file(
         """
         if evaluation_context is None:
             return False
-        return evaluation_context.get("file_id") == log_args.get(file_id_attribute) or evaluation_context.get(
+        return evaluation_context.get("file_id") == log_args.get("id") or evaluation_context.get(
             "path"
         ) == log_args.get("path")
 
@@ -130,19 +129,9 @@ def _overloaded_log(
     ]:
         evaluation_context = evaluation_context_variable.get()
 
-        if isinstance(client, PromptsClient):
-            file_id_attribute = "prompt_id"
-        elif isinstance(client, ToolsClient):
-            file_id_attribute = "tool_id"
-        elif isinstance(client, FlowsClient):
-            file_id_attribute = "flow_id"
-        elif isinstance(client, EvaluatorsClient):
-            file_id_attribute = "evaluator_id"
-
         if _is_evaluated_file(
             evaluation_context=evaluation_context,  # type: ignore
             log_args=kwargs,
-            file_id_attribute=file_id_attribute,
         ):
             # If the .log API user does not provide the source_datapoint_id or run_id,
             # override them with the values from the EvaluationContext
@@ -161,7 +150,6 @@ def _overloaded_log(
         if _is_evaluated_file(
             evaluation_context=evaluation_context,  # type: ignore
             log_args=kwargs,
-            file_id_attribute=file_id_attribute,
         ):
             # Notify that the Log has been added to the Evaluation
             # evaluation_context cannot be None
@@ -171,8 +159,10 @@ def _overloaded_log(
             )
             evaluation_context["upload_callback"](  # type: ignore
                 {
-                    "id": response.id,
                     **kwargs,
+                    # ID in kwargs refers to the File ID
+                    # Replace it with the Log ID
+                    "id": response.id,
                 }
             )
 

src/humanloop/flows/client.py

@@ -200,6 +200,7 @@ def log(
             ),
         )
         """
+
         _response = self._client_wrapper.httpx_client.request(
             "flows/log",
             method="POST",

src/humanloop/otel/exporter.py

@@ -195,7 +195,6 @@ def _export_prompt(self, span: ReadableSpan) -> None:
             log_object["inputs"] = {}
         if "messages" not in log_object:
             log_object["messages"] = []
-        # Same as with messages above
         if "tools" not in file_object["prompt"]:
             file_object["prompt"]["tools"] = []
         trace_metadata = TRACE_FLOW_CONTEXT.get(span.get_span_context().span_id)