chore: upgrade ruff + merge configurations (#1535)

Author: akx

.github/workflows/ci.yml

@@ -19,9 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: chartboost/ruff-action@v1
-        with:
-          args: check --config ci.ruff.toml
+      - uses: astral-sh/ruff-action@v3
 
   type-checking:
     runs-on: ubuntu-latest

.pre-commit-config.yaml

@@ -1,16 +1,15 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.4
+    rev: v0.15.2
     hooks:
       # Run the linter and fix
-      - id: ruff
+      - id: ruff-check
         types_or: [python, pyi, jupyter]
-        args: [--fix, --config=ci.ruff.toml]
+        args: [--fix]
 
       # Run the formatter.
       - id: ruff-format
         types_or: [python, pyi, jupyter]
-        args: [--config=ci.ruff.toml]
 
   - repo: https://github.com/pre-commit/mirrors-mypy
     rev: v1.18.2

CLAUDE.md

@@ -114,8 +114,6 @@ Environment variables (defined in `_client/environment_variables.py`):
 ## Important Files
 
 - `pyproject.toml`: Poetry configuration, dependencies, and tool settings
-- `ruff.toml`: Local development linting config (stricter)
-- `ci.ruff.toml`: CI linting config (more permissive)
 - `langfuse/version.py`: Version string (updated by CI release workflow)
 
 ## API Generation

ci.ruff.toml

@@ -27,7 +27,7 @@ pytest-xdist = "^3.3.1"
 pre-commit = "^3.2.2"
 pytest-asyncio = ">=0.21.1,<1.2.0"
 pytest-httpserver = "^1.0.8"
-ruff = ">=0.1.8,<0.13.0"
+ruff = "^0.15.2"
 mypy = "^1.0.0"
 langchain-openai = ">=0.0.5,<0.4"
 langchain = ">=1"
@@ -101,3 +101,20 @@ module = [
 ]
 ignore_errors = true
 
+[tool.ruff]
+target-version = "py310"
+
+[tool.ruff.lint]
+extend-select = [
+    "I", # Import formatting
+    # These used to be enabled in the "local ruff.toml",
+    # which was never enforced; hence, enabling these will
+    # cause a large number of linting errors.
+
+    # "D", # Docstring lints
+    # "D401", # Enforce imperative mood in docstrings
+]
+exclude = ["langfuse/api/**/*.py"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"

poetry.lock

@@ -1,7 +1,7 @@
 import json
 import time
-from datetime import timedelta
 from concurrent.futures import ThreadPoolExecutor
+from datetime import timedelta
 from typing import Sequence
 
 from langchain_core.prompts import PromptTemplate
@@ -573,8 +573,8 @@ def test_get_dataset_with_version():
 
 def test_run_experiment_with_versioned_dataset():
     """Test that running an experiment on a versioned dataset works correctly."""
-    from datetime import timedelta
     import time
+    from datetime import timedelta
 
     langfuse = Langfuse(debug=False)
 

pyproject.toml

@@ -1,9 +1,10 @@
 import logging
+
 import pytest
 
 from langfuse._utils.error_logging import (
-    catch_and_log_errors,
     auto_decorate_methods_with,
+    catch_and_log_errors,
 )