fix precommit and typechecks

Author: yiyuan-he

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

@@ -50,9 +50,9 @@ def on_chat_model_start(
         messages: list[list[BaseMessage]],  # type: ignore
         *,
         run_id: UUID,
-        tags: list[str] | None,
-        parent_run_id: UUID | None,
-        metadata: dict[str, Any] | None,
+        tags: list[str] | None = None,
+        parent_run_id: UUID | None = None,
+        metadata: dict[str, Any] | None = None,
         **kwargs: Any,
     ) -> None:
         # Other providers/LLMs may be supported in the future and telemetry for them is skipped for now.
@@ -142,7 +142,7 @@ def on_llm_end(
         response: LLMResult,  # type: ignore [reportUnknownParameterType]
         *,
         run_id: UUID,
-        parent_run_id: UUID | None,
+        parent_run_id: UUID | None = None,
         **kwargs: Any,
     ) -> None:
         span = self.span_manager.get_span(run_id)
@@ -219,7 +219,7 @@ def on_llm_error(
         error: BaseException,
         *,
         run_id: UUID,
-        parent_run_id: UUID | None,
+        parent_run_id: UUID | None = None,
         **kwargs: Any,
     ) -> None:
         self.span_manager.handle_error(error, run_id)
@@ -238,7 +238,11 @@ def on_chain_start(
         """Run when chain starts running."""
         # Extract chain name from serialized or kwargs
         chain_name = "unknown"
-        if serialized and "kwargs" in serialized and serialized["kwargs"].get("name"):
+        if (
+            serialized
+            and "kwargs" in serialized
+            and serialized["kwargs"].get("name")
+        ):
             chain_name = serialized["kwargs"]["name"]
         elif kwargs.get("name"):
             chain_name = kwargs["name"]
@@ -284,7 +288,7 @@ def on_chain_error(
 
     def on_agent_action(
         self,
-        action: AgentAction,  # type: ignore
+        action: AgentAction,  # type: ignore[type-arg]
         *,
         run_id: UUID,
         parent_run_id: UUID | None = None,
@@ -296,16 +300,18 @@ def on_agent_action(
         # We can add attributes to the existing span if needed
         span = self.span_manager.get_span(run_id)
         if span:
-            tool = getattr(action, "tool", None)
+            tool = getattr(action, "tool", None)  # type: ignore[arg-type]
             if tool:
                 span.set_attribute("langchain.agent.action.tool", tool)
-            tool_input = getattr(action, "tool_input", None)
+            tool_input = getattr(action, "tool_input", None)  # type: ignore[arg-type]
             if tool_input:
-                span.set_attribute("langchain.agent.action.tool_input", str(tool_input))
+                span.set_attribute(
+                    "langchain.agent.action.tool_input", str(tool_input)
+                )
 
     def on_agent_finish(
         self,
-        finish: AgentFinish,  # type: ignore
+        finish: AgentFinish,  # type: ignore[type-arg]
         *,
         run_id: UUID,
         parent_run_id: UUID | None = None,
@@ -316,6 +322,9 @@ def on_agent_finish(
         # Agent finish is tracked as part of the chain span
         span = self.span_manager.get_span(run_id)
         if span:
-            return_values = getattr(finish, "return_values", None)
+            return_values = getattr(finish, "return_values", None)  # type: ignore[arg-type]
             if return_values and "output" in return_values:
-                span.set_attribute("langchain.agent.finish.output", str(return_values["output"]))
+                span.set_attribute(
+                    "langchain.agent.finish.output",
+                    str(return_values["output"]),
+                )

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

@@ -98,7 +98,9 @@ def create_agent_span(
         agent_name: Optional[str] = None,
     ) -> Span:
         """Create a span for agent invocation."""
-        span_name = f"invoke_agent {agent_name}" if agent_name else "invoke_agent"
+        span_name = (
+            f"invoke_agent {agent_name}" if agent_name else "invoke_agent"
+        )
         span = self._create_span(
             run_id=run_id,
             parent_run_id=parent_run_id,

instrumentation-genai/opentelemetry-instrumentation-langchain/tests/test_agent_spans.py

@@ -1,6 +1,6 @@
 """Tests for agent-related spans in LangChain instrumentation."""
 
-from unittest.mock import MagicMock, Mock
+from unittest.mock import MagicMock
 from uuid import uuid4
 
 import pytest
@@ -9,7 +9,9 @@
 from opentelemetry.instrumentation.langchain.callback_handler import (
     OpenTelemetryLangChainCallbackHandler,
 )
-from opentelemetry.semconv._incubating.attributes import gen_ai_attributes as GenAI
+from opentelemetry.semconv._incubating.attributes import (
+    gen_ai_attributes as GenAI,
+)
 from opentelemetry.trace import SpanKind
 
 
@@ -26,7 +28,10 @@ def test_agent_chain_span(callback_handler, span_exporter):
 
     # Start a chain that represents an agent
     callback_handler.on_chain_start(
-        serialized={"name": "TestAgent", "id": ["langchain", "agents", "TestAgent"]},
+        serialized={
+            "name": "TestAgent",
+            "id": ["langchain", "agents", "TestAgent"],
+        },
         inputs={"input": "What is the capital of France?"},
         run_id=run_id,
         parent_run_id=parent_run_id,
@@ -99,7 +104,10 @@ def test_agent_action_tracking(callback_handler, span_exporter):
     span = spans[0]
     assert span.attributes.get("langchain.agent.action.tool") == "calculator"
     assert span.attributes.get("langchain.agent.action.tool_input") == "2 + 2"
-    assert span.attributes.get("langchain.agent.finish.output") == "The answer is 4"
+    assert (
+        span.attributes.get("langchain.agent.finish.output")
+        == "The answer is 4"
+    )
 
 
 def test_regular_chain_without_agent(callback_handler, span_exporter):
@@ -131,7 +139,9 @@ def test_regular_chain_without_agent(callback_handler, span_exporter):
     assert span.name == "chain RegularChain"
     assert span.kind == SpanKind.INTERNAL
     assert GenAI.GEN_AI_AGENT_NAME not in span.attributes
-    assert GenAI.GEN_AI_OPERATION_NAME not in span.attributes  # Regular chains don't have operation name
+    assert (
+        GenAI.GEN_AI_OPERATION_NAME not in span.attributes
+    )  # Regular chains don't have operation name
 
 
 def test_chain_error_handling(callback_handler, span_exporter):
@@ -162,4 +172,4 @@ def test_chain_error_handling(callback_handler, span_exporter):
     span = spans[0]
     assert span.name == "chain ErrorChain"
     assert span.status.status_code.name == "ERROR"
-    assert span.attributes.get("error.type") == "ValueError"
+    assert span.attributes.get("error.type") == "ValueError"

instrumentation-genai/opentelemetry-instrumentation-langchain/tests/test_chain_spans.py

@@ -7,7 +7,6 @@
 from opentelemetry.instrumentation.langchain.callback_handler import (
     OpenTelemetryLangChainCallbackHandler,
 )
-from opentelemetry.semconv._incubating.attributes import gen_ai_attributes as GenAI
 from opentelemetry.trace import SpanKind
 
 
@@ -212,4 +211,4 @@ def test_chain_with_nested_structure(callback_handler, span_exporter):
     chain_names = {span.name for span in chain_spans}
     assert "chain MainChain" in chain_names
     assert "chain SubChain1" in chain_names
-    assert "chain SubChain2" in chain_names
+    assert "chain SubChain2" in chain_names