From f51eda8354070bcace18fe071e70febce31aca53 Mon Sep 17 00:00:00 2001 From: adityamehra Date: Tue, 4 Nov 2025 12:37:11 -0800 Subject: [PATCH] fix linting --- .gitignore | 3 +++ dev-genai-requirements.txt | 8 ++++++++ .../src/opentelemetry/instrumentation/langchain/config.py | 2 -- .../src/opentelemetry/instrumentation/langchain/utils.py | 1 - pyproject.toml | 2 +- .../util/genai/processor/traceloop_span_processor.py | 5 ++--- .../src/opentelemetry/util/genai/handler.py | 7 ++----- .../src/opentelemetry/util/genai/utils.py | 5 ++--- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 1c32b44..b471cb1 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,6 @@ target # Benchmark result files *-benchmark.json + +# pyenv +.python-version diff --git a/dev-genai-requirements.txt b/dev-genai-requirements.txt index 61e2ef6..3655c3c 100644 --- a/dev-genai-requirements.txt +++ b/dev-genai-requirements.txt @@ -17,6 +17,14 @@ pre-commit==3.7.0; python_version >= '3.9' pre-commit==3.5.0; python_version < '3.9' ruff==0.6.9 +# Optional test dependencies for langchain and deepeval +openai +pydantic +langchain-core +langchain +langchain-openai +deepeval + # opentelemetry dependencies: opentelemetry-exporter-otlp-proto-grpc opentelemetry-exporter-otlp-proto-http diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/config.py b/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/config.py index 0e1c3c0..02b773d 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/config.py +++ b/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/config.py @@ -1,6 +1,4 @@ -from typing import Optional -from opentelemetry._events import EventLogger class Config: diff --git a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/utils.py b/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/utils.py index a643179..83f0949 100644 --- a/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/utils.py +++ b/instrumentation-genai/opentelemetry-instrumentation-langchain/src/opentelemetry/instrumentation/langchain/utils.py @@ -6,7 +6,6 @@ import traceback from opentelemetry import context as context_api -from opentelemetry._events import EventLogger from opentelemetry.instrumentation.langchain.config import Config from opentelemetry.semconv._incubating.attributes import ( gen_ai_attributes as GenAIAttributes, diff --git a/pyproject.toml b/pyproject.toml index 2e7bb68..6ab3cd1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -149,7 +149,7 @@ members = [ [tool.ruff] # https://docs.astral.sh/ruff/configuration/ line-length = 79 -extend-exclude = ["_template", "*_pb2*.py*"] +extend-exclude = ["_template", "*_pb2*.py*", "examples/", "*/examples/*"] output-format = "concise" [tool.ruff.lint] diff --git a/util/opentelemetry-util-genai-traceloop-translator/src/opentelemetry/util/genai/processor/traceloop_span_processor.py b/util/opentelemetry-util-genai-traceloop-translator/src/opentelemetry/util/genai/processor/traceloop_span_processor.py index bbadcb9..290a594 100644 --- a/util/opentelemetry-util-genai-traceloop-translator/src/opentelemetry/util/genai/processor/traceloop_span_processor.py +++ b/util/opentelemetry-util-genai-traceloop-translator/src/opentelemetry/util/genai/processor/traceloop_span_processor.py @@ -26,12 +26,11 @@ from opentelemetry.context import Context from opentelemetry.sdk.trace import ReadableSpan, SpanProcessor from opentelemetry.trace import Span - -from opentelemetry.util.genai.types import LLMInvocation from opentelemetry.util.genai.handler import ( - get_telemetry_handler, TelemetryHandler, + get_telemetry_handler, ) +from opentelemetry.util.genai.types import LLMInvocation from .content_normalizer import normalize_traceloop_content diff --git a/util/opentelemetry-util-genai/src/opentelemetry/util/genai/handler.py b/util/opentelemetry-util-genai/src/opentelemetry/util/genai/handler.py index 7635bc4..084da40 100644 --- a/util/opentelemetry-util-genai/src/opentelemetry/util/genai/handler.py +++ b/util/opentelemetry-util-genai/src/opentelemetry/util/genai/handler.py @@ -53,7 +53,6 @@ import time from typing import Any, Optional - try: from opentelemetry.util.genai.debug import genai_debug_log except Exception: # pragma: no cover - fallback if debug module missing @@ -63,7 +62,6 @@ def genai_debug_log(*_args: Any, **_kwargs: Any) -> None: # type: ignore from opentelemetry import _events as _otel_events -from opentelemetry import metrics as _metrics from opentelemetry import trace as _trace_mod from opentelemetry._logs import Logger, LoggerProvider, get_logger from opentelemetry.metrics import MeterProvider, get_meter @@ -75,7 +73,6 @@ def genai_debug_log(*_args: Any, **_kwargs: Any) -> None: # type: ignore TracerProvider, get_tracer, ) - from opentelemetry.util.genai.emitters.configuration import ( build_emitter_pipeline, ) @@ -98,10 +95,10 @@ def genai_debug_log(*_args: Any, **_kwargs: Any) -> None: # type: ignore Workflow, ) from opentelemetry.util.genai.utils import ( - get_content_capturing_mode, _is_truthy_env, _load_completion_callbacks, - _parse_callback_filter + _parse_callback_filter, + get_content_capturing_mode, ) from opentelemetry.util.genai.version import __version__ diff --git a/util/opentelemetry-util-genai/src/opentelemetry/util/genai/utils.py b/util/opentelemetry-util-genai/src/opentelemetry/util/genai/utils.py index db359e1..54f9cb7 100644 --- a/util/opentelemetry-util-genai/src/opentelemetry/util/genai/utils.py +++ b/util/opentelemetry-util-genai/src/opentelemetry/util/genai/utils.py @@ -16,18 +16,17 @@ import os from typing import Optional - from opentelemetry.util._importlib_metadata import ( entry_points, # pyright: ignore[reportUnknownVariableType] ) -from .callbacks import CompletionCallback - from opentelemetry.util.genai.environment_variables import ( OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT, OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT_MODE, ) from opentelemetry.util.genai.types import ContentCapturingMode +from .callbacks import CompletionCallback + logger = logging.getLogger(__name__)