From bbe0199bb70d56c3ec86d7066b3db0712afdd3f7 Mon Sep 17 00:00:00 2001 From: Nathan Weinberg <31703736+nathan-weinberg@users.noreply.github.com> Date: Thu, 10 Jul 2025 10:47:59 -0400 Subject: [PATCH] chore: update pre-commit hook versions (#2708) While investigating the `uv.lock` changes made in https://github.com/meta-llama/llama-stack/pull/2695 I noticed several of the pre-commit hook versions were out of date This PR updates them and fixes some new `ruff` errors --------- Signed-off-by: Nathan Weinberg --- .pre-commit-config.yaml | 10 +++++----- llama_stack/distribution/utils/context.py | 5 +---- .../providers/utils/telemetry/trace_protocol.py | 6 ++---- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ebbadefa6..f3a5a718b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -29,7 +29,7 @@ repos: - id: check-toml - repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.5.4 + rev: v1.5.5 hooks: - id: insert-license files: \.py$|\.sh$ @@ -38,7 +38,7 @@ repos: - docs/license_header.txt - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.9.4 + rev: v0.12.2 hooks: - id: ruff args: [ --fix ] @@ -46,14 +46,14 @@ repos: - id: ruff-format - repo: https://github.com/adamchainz/blacken-docs - rev: 1.19.0 + rev: 1.19.1 hooks: - id: blacken-docs additional_dependencies: - black==24.3.0 - repo: https://github.com/astral-sh/uv-pre-commit - rev: 0.7.8 + rev: 0.7.20 hooks: - id: uv-lock - id: uv-export @@ -66,7 +66,7 @@ repos: ] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.15.0 + rev: v1.16.1 hooks: - id: mypy additional_dependencies: diff --git a/llama_stack/distribution/utils/context.py b/llama_stack/distribution/utils/context.py index 3fcd3315f..24b249890 100644 --- a/llama_stack/distribution/utils/context.py +++ b/llama_stack/distribution/utils/context.py @@ -6,12 +6,9 @@ from collections.abc import AsyncGenerator from contextvars import ContextVar -from typing import TypeVar - -T = TypeVar("T") -def preserve_contexts_async_generator( +def preserve_contexts_async_generator[T]( gen: AsyncGenerator[T, None], context_vars: list[ContextVar] ) -> AsyncGenerator[T, None]: """ diff --git a/llama_stack/providers/utils/telemetry/trace_protocol.py b/llama_stack/providers/utils/telemetry/trace_protocol.py index eb6d8b331..916f7622a 100644 --- a/llama_stack/providers/utils/telemetry/trace_protocol.py +++ b/llama_stack/providers/utils/telemetry/trace_protocol.py @@ -9,14 +9,12 @@ import inspect import json from collections.abc import AsyncGenerator, Callable from functools import wraps -from typing import Any, TypeVar +from typing import Any from pydantic import BaseModel from llama_stack.models.llama.datatypes import Primitive -T = TypeVar("T") - def serialize_value(value: Any) -> Primitive: return str(_prepare_for_json(value)) @@ -44,7 +42,7 @@ def _prepare_for_json(value: Any) -> str: return str(value) -def trace_protocol(cls: type[T]) -> type[T]: +def trace_protocol[T](cls: type[T]) -> type[T]: """ A class decorator that automatically traces all methods in a protocol/base class and its inheriting classes.