Merge branch 'main' into no-logging-config

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
@@ -73,6 +71,7 @@ jobs:
           - "3.11"
           - "3.12"
           - "3.13"
+          - "3.14"
 
     name: Test on Python version ${{ matrix.python-version }}
     steps:

.github/workflows/release.yml

@@ -11,9 +11,11 @@ on:
           - patch
           - minor
           - major
-          - prerelease
+          - prepatch
+          - preminor
+          - premajor
       prerelease_type:
-        description: 'Pre-release type (only used if version is "prerelease")'
+        description: 'Pre-release type (used when version is prepatch/preminor/premajor)'
         type: choice
         default: ""
         options:
@@ -26,7 +28,7 @@ on:
         type: string
         default: ""
       confirm_major:
-        description: "Type RELEASE MAJOR to confirm a major release"
+        description: "Type RELEASE MAJOR to confirm a major or premajor release"
         required: false
         default: ""
 
@@ -52,10 +54,10 @@ jobs:
           fi
 
       - name: Confirm major release
-        if: ${{ inputs.version == 'major' && inputs.dry_run == false }}
+        if: ${{ inputs.version == 'major' || inputs.version == 'premajor' }}
         run: |
           if [ "${{ inputs.confirm_major }}" != "RELEASE MAJOR" ]; then
-            echo "❌ For major releases, set confirm_major to RELEASE MAJOR"
+            echo "❌ For major/premajor releases, set confirm_major to RELEASE MAJOR"
             exit 1
           fi
 
@@ -108,12 +110,50 @@ jobs:
           # Parse version components
           IFS='.' read -r major minor patch <<< "$base_version"
 
-          if [ "$version_type" = "prerelease" ]; then
+          if echo "$current_version" | grep -qE '(a|b|rc)[0-9]+$'; then
+            current_is_prerelease="true"
+          else
+            current_is_prerelease="false"
+          fi
+
+          if [ "$version_type" = "premajor" ] || [ "$version_type" = "preminor" ] || [ "$version_type" = "prepatch" ]; then
             if [ -z "$prerelease_type" ]; then
-              echo "❌ Error: prerelease_type must be specified when version is 'prerelease'"
+              echo "❌ Error: prerelease_type must be specified when version is a prerelease variant"
               exit 1
             fi
 
+            # Determine the prerelease base version target
+            case "$version_type" in
+              premajor)
+                if [ "$current_is_prerelease" = "true" ] && [ "$minor" -eq 0 ] && [ "$patch" -eq 0 ]; then
+                  target_major=$major
+                else
+                  target_major=$((major + 1))
+                fi
+                target_minor=0
+                target_patch=0
+                ;;
+              preminor)
+                target_major=$major
+                if [ "$current_is_prerelease" = "true" ] && [ "$patch" -eq 0 ] && [ "$minor" -gt 0 ]; then
+                  target_minor=$minor
+                else
+                  target_minor=$((minor + 1))
+                fi
+                target_patch=0
+                ;;
+              prepatch)
+                target_major=$major
+                target_minor=$minor
+                if [ "$current_is_prerelease" = "true" ] && [ "$patch" -gt 0 ]; then
+                  target_patch=$patch
+                else
+                  target_patch=$((patch + 1))
+                fi
+                ;;
+            esac
+            target_base_version="${target_major}.${target_minor}.${target_patch}"
+
             # Map prerelease type to Python suffix
             case "$prerelease_type" in
               alpha) suffix="a" ;;
@@ -126,15 +166,16 @@ jobs:
               pre_num="$prerelease_increment"
             else
               # Check if current version is same type of prerelease, if so increment
-              if echo "$current_version" | grep -qE "${suffix}[0-9]+$"; then
-                current_pre_num=$(echo "$current_version" | sed -E "s/.*${suffix}([0-9]+)$/\1/")
+              escaped_target_base_version=$(echo "$target_base_version" | sed 's/\./\\./g')
+              if echo "$current_version" | grep -qE "^${escaped_target_base_version}${suffix}[0-9]+$"; then
+                current_pre_num=$(echo "$current_version" | sed -E "s/^${escaped_target_base_version}${suffix}([0-9]+)$/\1/")
                 pre_num=$((current_pre_num + 1))
               else
                 pre_num=1
               fi
             fi
 
-            new_version="${base_version}${suffix}${pre_num}"
+            new_version="${target_base_version}${suffix}${pre_num}"
             is_prerelease="true"
           else
             # Standard version bump

.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

@@ -28,6 +28,13 @@
     LangfuseSpan,
     LangfuseTool,
 )
+from .span_filter import (
+    KNOWN_LLM_INSTRUMENTATION_SCOPE_PREFIXES,
+    is_default_export_span,
+    is_genai_span,
+    is_known_llm_instrumentor,
+    is_langfuse_span,
+)
 
 Langfuse = _client_module.Langfuse
 
@@ -55,6 +62,11 @@
     "EvaluatorStats",
     "BatchEvaluationResumeToken",
     "BatchEvaluationResult",
+    "is_default_export_span",
+    "is_langfuse_span",
+    "is_genai_span",
+    "is_known_llm_instrumentor",
+    "KNOWN_LLM_INSTRUMENTATION_SCOPE_PREFIXES",
     "experiment",
     "api",
 ]

langfuse/__init__.py

@@ -12,15 +12,16 @@
 
 import json
 from datetime import datetime
-from typing import Any, Dict, List, Literal, Optional, Union
+from typing import Any, Dict, Literal, Optional, Union
 
 from langfuse._client.constants import (
     ObservationTypeGenerationLike,
     ObservationTypeSpanLike,
 )
 from langfuse._utils.serializer import EventSerializer
+from langfuse.api import MapValue
 from langfuse.model import PromptClient
-from langfuse.types import MapValue, SpanLevel
+from langfuse.types import SpanLevel
 
 
 class LangfuseOtelSpanAttributes:
@@ -73,28 +74,14 @@ class LangfuseOtelSpanAttributes:
 
 def create_trace_attributes(
     *,
-    name: Optional[str] = None,
-    user_id: Optional[str] = None,
-    session_id: Optional[str] = None,
-    version: Optional[str] = None,
-    release: Optional[str] = None,
     input: Optional[Any] = None,
     output: Optional[Any] = None,
-    metadata: Optional[Any] = None,
-    tags: Optional[List[str]] = None,
     public: Optional[bool] = None,
 ) -> dict:
     attributes = {
-        LangfuseOtelSpanAttributes.TRACE_NAME: name,
-        LangfuseOtelSpanAttributes.TRACE_USER_ID: user_id,
-        LangfuseOtelSpanAttributes.TRACE_SESSION_ID: session_id,
-        LangfuseOtelSpanAttributes.VERSION: version,
-        LangfuseOtelSpanAttributes.RELEASE: release,
         LangfuseOtelSpanAttributes.TRACE_INPUT: _serialize(input),
         LangfuseOtelSpanAttributes.TRACE_OUTPUT: _serialize(output),
-        LangfuseOtelSpanAttributes.TRACE_TAGS: tags,
         LangfuseOtelSpanAttributes.TRACE_PUBLIC: public,
-        **_flatten_and_serialize_metadata(metadata, "trace"),
     }
 
     return {k: v for k, v in attributes.items() if v is not None}