chore: switch to using prek (#32)

Signed-off-by: Frost Ming <me@frostming.com>

Author: frostming

.github/workflows/main.yml

@@ -16,8 +16,8 @@ jobs:
 
       - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830
         with:
-          path: ~/.cache/pre-commit
-          key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+          path: ~/.cache/prek
+          key: prek-${{ hashFiles('.pre-commit-config.yaml') }}
 
       - name: Set up the environment
         uses: ./.github/actions/setup-python-env

Makefile

@@ -2,7 +2,7 @@
 install: ## Install the virtual environment and install the pre-commit hooks
 	@echo "🚀 Creating virtual environment using uv"
 	@uv sync
-	@uv run pre-commit install
+	@uv run prek install
 
 .PHONY: gen-all
 gen-all: ## Generate all code from schema
@@ -13,8 +13,8 @@ gen-all: ## Generate all code from schema
 check: ## Run code quality tools.
 	@echo "🚀 Checking lock file consistency with 'pyproject.toml'"
 	@uv lock --locked
-	@echo "🚀 Linting code: Running pre-commit"
-	@uv run pre-commit run -a
+	@echo "🚀 Linting code: Running pre-commit via prek"
+	@uv run prek run -a
 	@echo "🚀 Static type checking: Running ty"
 	@uv run ty check --exclude "src/acp/meta.py" --exclude "src/acp/schema.py" --exclude "examples/*.py"
 	@echo "🚀 Checking for obsolete dependencies: Running deptry"

pyproject.toml

@@ -32,7 +32,6 @@ dev = [
     "datamodel-code-generator>=0.25",
     "pytest>=7.2.0",
     "pytest-asyncio>=0.21.0",
-    "pre-commit>=2.20.0",
     "tox-uv>=1.11.3",
     "deptry>=0.23.0",
     "ty>=0.0.1a16",
@@ -41,6 +40,7 @@ dev = [
     "mkdocs-material>=8.5.10",
     "mkdocstrings[python]>=0.26.1",
     "python-dotenv>=1.1.1",
+    "prek>=0.2.17",
 ]
 
 [project.optional-dependencies]
@@ -117,3 +117,6 @@ exclude = [
     "src/acp/meta.py",
     "src/acp/schema.py",
 ]
+
+[tool.deptry.package_module_name_map]
+opentelemetry-sdk = "opentelemetry"

src/acp/telemetry.py

@@ -6,15 +6,15 @@
 from typing import Any, cast
 
 try:
-    from logfire import span as logfire_span
-except Exception:  # pragma: no cover - logfire is optional
+    from logfire import span as logfire_span  # type: ignore[unresolved-import]
+except ModuleNotFoundError:  # pragma: no cover - logfire is optional
     logfire_span = None  # type: ignore[assignment]
 else:  # pragma: no cover - optional
     os.environ.setdefault("LOGFIRE_IGNORE_NO_CONFIG", "1")
 
 try:  # pragma: no cover - opentelemetry is optional
-    from opentelemetry.trace import get_tracer as otel_get_tracer
-except Exception:  # pragma: no cover - opentelemetry is optional
+    from opentelemetry.trace import get_tracer as otel_get_tracer  # type: ignore[unresolved-import]
+except ModuleNotFoundError:  # pragma: no cover - opentelemetry is optional
     otel_get_tracer = None  # type: ignore[assignment]
 
 DEFAULT_TAGS = ["acp"]