some fixes

Author: lmolkova

pyproject.toml

@@ -178,10 +178,6 @@ ignore = [
 
 [tool.ruff.lint.per-file-ignores]
 "docs/**/*.*" = ["A001"]
-# Deferred imports to break circular dependency: utils -> types -> inference_invocation -> utils
-"util/opentelemetry-util-genai/src/opentelemetry/util/genai/utils.py" = ["PLC0415"]
-# Bottom-of-file import of LLMInvocation for backward-compatibility re-export; cannot move to top
-"util/opentelemetry-util-genai/src/opentelemetry/util/genai/types.py" = ["E402"]
 
 [tool.ruff.lint.isort]
 detect-same-package = false # to not consider instrumentation packages as first-party

util/opentelemetry-util-genai/pyproject.toml

@@ -50,3 +50,9 @@ include = ["/src", "/tests"]
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/opentelemetry"]
+
+[tool.pytest.ini_options]
+# TODO: remove once all usages of LLMInvocation are migrated to InferenceInvocation
+filterwarnings = [
+  "ignore:LLMInvocation is deprecated:DeprecationWarning",
+]

util/opentelemetry-util-genai/src/opentelemetry/util/genai/handler.py

@@ -147,7 +147,9 @@ def _start(self, invocation: _T) -> _T:
 
         return invocation
 
-    def _finish(self, invocation: _T, error: Error | None = None) -> _T:
+    def _finish(  # pylint: disable=no-self-use
+        self, invocation: _T, error: Error | None = None
+    ) -> _T:
         """Finalize a GenAI invocation and end its span."""
         if invocation._context_token is None:
             # TODO: Provide feedback that this invocation was not started

util/opentelemetry-util-genai/src/opentelemetry/util/genai/inference_invocation.py

@@ -28,14 +28,14 @@
 from opentelemetry.trace import INVALID_SPAN, SpanKind
 from opentelemetry.trace.propagation import set_span_in_context
 from opentelemetry.util.genai.types import (
-    ContentCapturingMode,
     Error,
     GenAIInvocation,
     InputMessage,
     MessagePart,
     OutputMessage,
 )
 from opentelemetry.util.genai.utils import (
+    ContentCapturingMode,
     gen_ai_json_dumps,
     get_content_capturing_mode,
     is_experimental_mode,
@@ -57,7 +57,7 @@ class InferenceInvocation(GenAIInvocation):
     def operation_name(self) -> str:
         return GenAI.GenAiOperationNameValues.CHAT.value
 
-    def __init__(
+    def __init__(  # pylint: disable=too-many-locals
         self,
         handler: TelemetryHandler,
         provider: str,
@@ -236,7 +236,7 @@ def _emit_event(self) -> None:
 
 @deprecated("LLMInvocation is deprecated. Use InferenceInvocation instead.")
 class LLMInvocation(InferenceInvocation):
-    def __init__(
+    def __init__(  # pylint: disable=too-many-locals
         self,
         handler: "TelemetryHandler | None" = None,
         provider: str = "",

util/opentelemetry-util-genai/src/opentelemetry/util/genai/metrics.py

@@ -11,13 +11,14 @@
 )
 from opentelemetry.semconv.attributes import server_attributes
 from opentelemetry.trace import set_span_in_context
-from opentelemetry.util.genai.inference_invocation import InferenceInvocation
 from opentelemetry.util.genai.instruments import (
     create_duration_histogram,
     create_token_histogram,
 )
 from opentelemetry.util.types import AttributeValue
 
+from .inference_invocation import InferenceInvocation
+
 
 class InvocationMetricsRecorder:
     """Records duration and token usage histograms for GenAI invocations."""

util/opentelemetry-util-genai/src/opentelemetry/util/genai/types.py

@@ -22,28 +22,17 @@
 from typing_extensions import TypeAlias
 
 from opentelemetry.context import Context
+from opentelemetry.semconv.attributes import error_attributes
 from opentelemetry.trace import INVALID_SPAN as _INVALID_SPAN
 from opentelemetry.trace import Span, SpanKind
+from opentelemetry.trace.status import Status, StatusCode
 
 if TYPE_CHECKING:
     from opentelemetry.util.genai.handler import TelemetryHandler
-from opentelemetry.semconv.attributes import error_attributes
-from opentelemetry.trace.status import Status, StatusCode
 
 ContextToken: TypeAlias = Token[Context]
 
 
-@dataclass()
-class GenericPart:
-    """Used for provider-specific message part types that don't match
-    the standard MessagePart types defined in semantic conventions. Wrap custom
-    types with GenericPart(value=...) to explicitly opt-in to non-standard types.
-    This will be removed in a future version when all instrumentations use core types."""
-
-    value: Any
-    type: Literal["generic"] = "generic"
-
-
 class ContentCapturingMode(Enum):
     # Do not capture content (default).
     NO_CONTENT = 0
@@ -55,6 +44,17 @@ class ContentCapturingMode(Enum):
     SPAN_AND_EVENT = 3
 
 
+@dataclass()
+class GenericPart:
+    """Used for provider-specific message part types that don't match
+    the standard MessagePart types defined in semantic conventions. Wrap custom
+    types with GenericPart(value=...) to explicitly opt-in to non-standard types.
+    This will be removed in a future version when all instrumentations use core types."""
+
+    value: Any
+    type: Literal["generic"] = "generic"
+
+
 @dataclass()
 class ToolCallRequest:
     """Represents a tool call requested by the model (message part only).
@@ -293,7 +293,6 @@ def _apply_error_attributes(self, error: Error) -> None:
     def _apply_finish(self, _error: Error | None = None) -> None:
         """Apply finish telemetry (attributes, metrics, events)."""
         # nothing to do at the base class level
-        pass
 
     def stop(self) -> None:
         """Finalize the invocation successfully and end its span."""
@@ -306,6 +305,11 @@ def fail(self, error: Error | BaseException) -> None:
         self._handler._finish(self, error)
 
 
-from opentelemetry.util.genai.inference_invocation import (
-    LLMInvocation,  # noqa: F401
-)
+def __getattr__(name: str) -> object:
+    if name == "LLMInvocation":
+        from opentelemetry.util.genai.inference_invocation import (  # noqa: PLC0415  # pylint: disable=import-outside-toplevel
+            LLMInvocation,
+        )
+
+        return LLMInvocation
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

util/opentelemetry-util-genai/src/opentelemetry/util/genai/utils.py

@@ -19,7 +19,7 @@
 import os
 from base64 import b64encode
 from functools import partial
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from opentelemetry.instrumentation._semconv import (
     _OpenTelemetrySemanticConventionStability,
@@ -30,9 +30,7 @@
     OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT,
     OTEL_INSTRUMENTATION_GENAI_EMIT_EVENT,
 )
-
-if TYPE_CHECKING:
-    from opentelemetry.util.genai.types import ContentCapturingMode
+from opentelemetry.util.genai.types import ContentCapturingMode
 
 logger = logging.getLogger(__name__)
 
@@ -50,8 +48,6 @@ def get_content_capturing_mode() -> ContentCapturingMode:
     """This function should not be called when GEN_AI stability mode is set to DEFAULT.
 
     When the GEN_AI stability mode is DEFAULT this function will raise a ValueError -- see the code below."""
-    from opentelemetry.util.genai.types import ContentCapturingMode
-
     envvar = os.environ.get(OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT)
     if not is_experimental_mode():
         raise ValueError(
@@ -99,8 +95,6 @@ def should_emit_event() -> bool:
 
     # If not explicitly set (or invalid), determine default based on content capturing mode
     try:
-        from opentelemetry.util.genai.types import ContentCapturingMode
-
         if not is_experimental_mode():
             # Not in experimental mode, default to False
             return False
@@ -121,8 +115,6 @@ def should_emit_event() -> bool:
 
 def should_capture_content_on_spans_in_experimental_mode() -> bool:
     """Return True when content conversion should be performed."""
-    from opentelemetry.util.genai.types import ContentCapturingMode
-
     if not is_experimental_mode():
         return False
     mode = get_content_capturing_mode()

util/opentelemetry-util-genai/src/opentelemetry/util/genai/workflow_invocation.py

@@ -22,13 +22,13 @@
 )
 from opentelemetry.trace import SpanKind
 from opentelemetry.util.genai.types import (
-    ContentCapturingMode,
     Error,
     GenAIInvocation,
     InputMessage,
     OutputMessage,
 )
 from opentelemetry.util.genai.utils import (
+    ContentCapturingMode,
     gen_ai_json_dumps,
     get_content_capturing_mode,
     is_experimental_mode,