some fixes

Author: lmolkova

instrumentation-genai/opentelemetry-instrumentation-anthropic/src/opentelemetry/instrumentation/anthropic/patch.py

@@ -24,10 +24,8 @@
     gen_ai_attributes as GenAIAttributes,
 )
 from opentelemetry.util.genai.handler import TelemetryHandler
-from opentelemetry.util.genai.types import (  # pylint: disable=no-name-in-module  # TODO: migrate to InferenceInvocation
-    Error,
-    LLMInvocation,
-)
+from opentelemetry.util.genai.types import Error
+from opentelemetry.util.genai.inference_invocation import LLMInvocation  # pyright: ignore[reportDeprecated]  # TODO: migrate to InferenceInvocation
 from opentelemetry.util.genai.utils import (
     should_capture_content_on_spans_in_experimental_mode,
 )
@@ -92,7 +90,7 @@ def traced_method(
             else params.model
         )
 
-        invocation = LLMInvocation(
+        invocation = LLMInvocation(  # pyright: ignore[reportDeprecated]
             request_model=request_model,
             provider=ANTHROPIC,
             input_messages=get_input_messages(params.messages)
@@ -105,7 +103,7 @@ def traced_method(
         )
 
         # Use manual lifecycle management for both streaming and non-streaming
-        handler.start_llm(invocation)
+        handler.start_llm(invocation)  # pyright: ignore[reportDeprecated]
         try:
             result = wrapped(*args, **kwargs)
             if isinstance(result, AnthropicStream):
@@ -115,10 +113,10 @@ def traced_method(
 
             wrapper = MessageWrapper(result, capture_content)
             wrapper.extract_into(invocation)
-            handler.stop_llm(invocation)
+            handler.stop_llm(invocation)  # pyright: ignore[reportDeprecated]
             return wrapper.message
         except Exception as exc:
-            handler.fail_llm(
+            handler.fail_llm(  # pyright: ignore[reportDeprecated]
                 invocation, Error(message=str(exc), type=type(exc))
             )
             raise

instrumentation-genai/opentelemetry-instrumentation-anthropic/src/opentelemetry/instrumentation/anthropic/wrappers.py

@@ -21,10 +21,10 @@
 from opentelemetry.util.genai.handler import TelemetryHandler
 from opentelemetry.util.genai.types import (
     Error,
-    LLMInvocation,  # pylint: disable=no-name-in-module  # TODO: migrate to InferenceInvocation
     MessagePart,
     OutputMessage,
 )
+from opentelemetry.util.genai.inference_invocation import LLMInvocation  # pyright: ignore[reportDeprecated]  # TODO: migrate to InferenceInvocation
 
 from .messages_extractors import (
     GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS,
@@ -60,7 +60,7 @@ def __init__(self, message: Message, capture_content: bool):
         self._message = message
         self._capture_content = capture_content
 
-    def extract_into(self, invocation: LLMInvocation) -> None:
+    def extract_into(self, invocation: LLMInvocation) -> None:  # pyright: ignore[reportDeprecated]
         """Extract response data into the invocation."""
         if self._message.model:
             invocation.response_model_name = self._message.model
@@ -103,7 +103,7 @@ def __init__(
         self,
         stream: Stream[RawMessageStreamEvent],
         handler: TelemetryHandler,
-        invocation: LLMInvocation,
+        invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
         capture_content: bool,
     ):
         self._stream = stream
@@ -213,7 +213,7 @@ def _stop(self) -> None:
             "response attribute extraction",
         )
         self._safe_instrumentation(
-            lambda: self._handler.stop_llm(self._invocation),
+            lambda: self._handler.stop_llm(self._invocation),  # pyright: ignore[reportDeprecated]
             "stop_llm",
         )
         self._finalized = True
@@ -222,7 +222,7 @@ def _fail(self, message: str, error_type: type[BaseException]) -> None:
         if self._finalized:
             return
         self._safe_instrumentation(
-            lambda: self._handler.fail_llm(
+            lambda: self._handler.fail_llm(  # pyright: ignore[reportDeprecated]
                 self._invocation, Error(message=message, type=error_type)
             ),
             "fail_llm",

instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/callback_handler.py

@@ -25,10 +25,10 @@
     _InvocationManager,
 )
 from opentelemetry.util.genai.handler import TelemetryHandler
+from opentelemetry.util.genai.inference_invocation import LLMInvocation  # pyright: ignore[reportDeprecated]  # TODO: migrate to InferenceInvocation
 from opentelemetry.util.genai.types import (
     Error,
     InputMessage,
-    LLMInvocation,
     MessagePart,
     OutputMessage,
     Text,
@@ -140,7 +140,7 @@ def on_chat_model_start(
                     )
                 )
 
-        llm_invocation = LLMInvocation(
+        llm_invocation = LLMInvocation(  # pyright: ignore[reportDeprecated]
             request_model=request_model,
             input_messages=input_messages,
             provider=provider,
@@ -152,7 +152,7 @@ def on_chat_model_start(
             temperature=temperature,
             max_tokens=max_tokens,
         )
-        llm_invocation = self._telemetry_handler.start_llm(
+        llm_invocation = self._telemetry_handler.start_llm(  # pyright: ignore[reportDeprecated]
             invocation=llm_invocation
         )
         self._invocation_manager.add_invocation_state(
@@ -171,7 +171,7 @@ def on_llm_end(
     ) -> None:
         llm_invocation = self._invocation_manager.get_invocation(run_id=run_id)
         if llm_invocation is None or not isinstance(
-            llm_invocation, LLMInvocation
+            llm_invocation, LLMInvocation  # pyright: ignore[reportDeprecated]
         ):
             # If the invocation does not exist, we cannot set attributes or end it
             return
@@ -246,7 +246,7 @@ def on_llm_end(
             if response_id is not None:
                 llm_invocation.response_id = str(response_id)
 
-        llm_invocation = self._telemetry_handler.stop_llm(
+        llm_invocation = self._telemetry_handler.stop_llm(  # pyright: ignore[reportDeprecated]
             invocation=llm_invocation
         )
         if llm_invocation.span and not llm_invocation.span.is_recording():
@@ -262,13 +262,13 @@ def on_llm_error(
     ) -> None:
         llm_invocation = self._invocation_manager.get_invocation(run_id=run_id)
         if llm_invocation is None or not isinstance(
-            llm_invocation, LLMInvocation
+            llm_invocation, LLMInvocation  # pyright: ignore[reportDeprecated]
         ):
             # If the invocation does not exist, we cannot set attributes or end it
             return
 
         error_otel = Error(message=str(error), type=type(error))
-        llm_invocation = self._telemetry_handler.fail_llm(
+        llm_invocation = self._telemetry_handler.fail_llm(  # pyright: ignore[reportDeprecated]
             invocation=llm_invocation, error=error_otel
         )
         if llm_invocation.span and not llm_invocation.span.is_recording():

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

@@ -269,8 +269,8 @@ def stop_llm(self, invocation: LLMInvocation) -> LLMInvocation:  # pyright: igno
     )
     def fail_llm(
         self,
-        invocation: LLMInvocation,
-        error: Error,  # pyright: ignore[reportDeprecated]
+        invocation: LLMInvocation,  # pyright: ignore[reportDeprecated]
+        error: Error,
     ) -> LLMInvocation:  # pyright: ignore[reportDeprecated]
         """Fail an LLM invocation and end its span with error status.