src-py-lib 0.1.2__tar.gz → 0.1.4__tar.gz

{src_py_lib-0.1.2 → src_py_lib-0.1.4}/.github/workflows/ci.yml

@@ -5,6 +5,7 @@ on:
 
 permissions:
   contents: read
+  pull-requests: read
 
 concurrency:
   group: ci-${{ github.workflow }}-${{ github.ref }}

{src_py_lib-0.1.2 → src_py_lib-0.1.4}/.github/workflows/release.yml

@@ -13,6 +13,7 @@ on:
 
 permissions:
   contents: write
+  pull-requests: read
 
 concurrency:
   group: release-${{ github.event.inputs.tag || github.ref_name }}
@@ -28,10 +29,10 @@ jobs:
     uses: ./.github/workflows/validate.yml
     with:
       ref: ${{ github.event.inputs.tag || github.ref }}
+      build-package: false
 
   wheel:
     name: Build wheel
-    needs: validate
     runs-on: ubuntu-24.04
     env:
       IMPORT_NAME: src_py_lib
@@ -50,10 +51,9 @@ jobs:
         uses: actions/setup-python@v6
         with:
           python-version: ${{ env.PYTHON_VERSION }}
-          cache: pip
 
       - name: Cache uv
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.cache/uv
           key: uv-${{ runner.os }}-py${{ env.PYTHON_VERSION }}-${{ hashFiles('uv.lock') }}
@@ -61,9 +61,7 @@ jobs:
             uv-${{ runner.os }}-py${{ env.PYTHON_VERSION }}-
 
       - name: Install build tools
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install "uv==${UV_VERSION}"
+        run: python -m pip install "uv==${UV_VERSION}"
 
       - name: Validate release inputs
         id: release
@@ -145,7 +143,6 @@ jobs:
         run: |
           python -m venv build/release/install-venv
           . build/release/install-venv/bin/activate
-          python -m pip install --upgrade pip
           python -m pip install "${{ steps.build.outputs.wheel_path }}"
           python - <<'PY'
           import os
@@ -213,22 +210,35 @@ jobs:
             ${{ steps.build.outputs.wheel_path }}
             ${{ steps.build.outputs.source_distribution_path }}
 
+  github-release:
+    name: Publish GitHub release assets
+    needs: [validate, wheel]
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Download release assets
+        uses: actions/download-artifact@v7
+        with:
+          name: src-py-lib-release
+          path: release-assets
+
       - name: Publish GitHub release assets
         env:
           GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}
         run: |
-          release_tag="${{ steps.release.outputs.tag }}"
-          wheel_path="${{ steps.build.outputs.wheel_path }}"
-          source_distribution_path="${{ steps.build.outputs.source_distribution_path }}"
-          wheel_checksum_path="${{ steps.build.outputs.wheel_checksum_path }}"
-          source_distribution_checksum_path="${{ steps.build.outputs.source_distribution_checksum_path }}"
-          notes_path="${{ steps.notes.outputs.path }}"
-          release_assets=(
-            "${wheel_path}"
-            "${source_distribution_path}"
-            "${wheel_checksum_path}"
-            "${source_distribution_checksum_path}"
-          )
+          release_tag="${{ github.event.inputs.tag || github.ref_name }}"
+          notes_path="$(find release-assets -name release-notes.md -print -quit)"
+          mapfile -t release_assets < <(find release-assets -type f ! -name release-notes.md | sort)
+
+          if [[ -z "${notes_path}" ]]; then
+            echo "::error title=Missing release notes::release-notes.md was not found in release artifact."
+            exit 1
+          fi
+          if [[ "${#release_assets[@]}" -eq 0 ]]; then
+            echo "::error title=Missing release assets::No release assets were downloaded."
+            exit 1
+          fi
 
           if gh release view "${release_tag}" >/dev/null 2>&1; then
             gh release edit "${release_tag}" --title "${release_tag}" --notes-file "${notes_path}"
@@ -243,7 +253,7 @@ jobs:
 
   pypi:
     name: Publish PyPI package
-    needs: wheel
+    needs: [validate, wheel]
     runs-on: ubuntu-24.04
     permissions:
       contents: read

src_py_lib-0.1.4/.github/workflows/validate.yml

@@ -0,0 +1,280 @@
+name: Validate
+
+on:
+  workflow_call:
+    inputs:
+      ref:
+        description: "Git ref to validate. Defaults to the caller's ref."
+        required: false
+        type: string
+      build-package:
+        description: "Build and smoke-test package artifacts. Release builds do this separately."
+        required: false
+        type: boolean
+        default: true
+
+permissions:
+  contents: read
+  pull-requests: read
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  changes:
+    name: Detect changed paths
+    runs-on: ubuntu-24.04
+    outputs:
+      github_actions: ${{ steps.changed_paths.outputs.github_actions }}
+      markdown: ${{ steps.changed_paths.outputs.markdown }}
+      python: ${{ steps.changed_paths.outputs.python }}
+      package: ${{ steps.changed_paths.outputs.package }}
+
+    steps:
+      - name: Detect changed paths
+        id: changed_paths
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          github_actions_changed=false
+          markdown_changed=false
+          python_changed=false
+          package_changed=false
+
+          if [[ "${{ github.event_name }}" != "pull_request" ]]; then
+            github_actions_changed=true
+            markdown_changed=true
+            python_changed=true
+            package_changed=true
+          else
+            changed_files="$(mktemp)"
+            gh api --paginate \
+              "repos/${GITHUB_REPOSITORY}/pulls/${PULL_REQUEST_NUMBER}/files" \
+              --jq '.[].filename' > "${changed_files}"
+
+            while IFS= read -r changed_file; do
+              case "${changed_file}" in
+                .github/workflows/*)
+                  github_actions_changed=true
+                  ;;
+              esac
+
+              case "${changed_file}" in
+                *.md|.markdownlint-cli2.yaml)
+                  markdown_changed=true
+                  ;;
+              esac
+
+              case "${changed_file}" in
+                .python-version|pyproject.toml|uv.lock|src/*|tests/*)
+                  python_changed=true
+                  ;;
+              esac
+
+              case "${changed_file}" in
+                .python-version|LICENSE|README.md|pyproject.toml|uv.lock|src/*)
+                  package_changed=true
+                  ;;
+              esac
+            done < "${changed_files}"
+          fi
+
+          {
+            echo "github_actions=${github_actions_changed}"
+            echo "markdown=${markdown_changed}"
+            echo "python=${python_changed}"
+            echo "package=${package_changed}"
+          } >> "${GITHUB_OUTPUT}"
+
+  github_actions:
+    name: Lint GitHub Actions
+    needs: changes
+    if: needs.changes.outputs.github_actions == 'true'
+    runs-on: ubuntu-24.04
+    env:
+      ACTIONLINT_VERSION: "1.7.12"
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+          ref: ${{ inputs.ref || github.ref }}
+
+      - name: Install actionlint
+        run: |
+          mkdir -p "${HOME}/.local/bin"
+          asset="actionlint_${ACTIONLINT_VERSION}_linux_amd64.tar.gz"
+          checksums="actionlint_${ACTIONLINT_VERSION}_checksums.txt"
+          base_url="https://github.com/rhysd/actionlint/releases/download/v${ACTIONLINT_VERSION}"
+
+          curl -fsSLO "${base_url}/${asset}"
+          curl -fsSLO "${base_url}/${checksums}"
+          grep "  ${asset}$" "${checksums}" | sha256sum --check
+          tar -xzf "${asset}" -C "${HOME}/.local/bin" actionlint
+          chmod 0755 "${HOME}/.local/bin/actionlint"
+
+      - name: Lint GitHub Actions
+        run: |
+          "${HOME}/.local/bin/actionlint"
+
+  markdown:
+    name: Lint Markdown
+    needs: changes
+    if: needs.changes.outputs.markdown == 'true'
+    runs-on: ubuntu-24.04
+    env:
+      MARKDOWNLINT_CLI2_VERSION: "0.22.1"
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+          ref: ${{ inputs.ref || github.ref }}
+
+      - name: Cache npm
+        uses: actions/cache@v5
+        with:
+          path: ~/.npm
+          key: npm-${{ runner.os }}-markdownlint-cli2-${{ env.MARKDOWNLINT_CLI2_VERSION }}
+
+      - name: Lint Markdown
+        run: npx --yes "markdownlint-cli2@${MARKDOWNLINT_CLI2_VERSION}"
+
+  python:
+    name: Validate Python
+    needs: changes
+    if: needs.changes.outputs.python == 'true'
+    runs-on: ubuntu-24.04
+    env:
+      IMPORT_NAME: src_py_lib
+      PYTHON_VERSION: "3.11"
+      UV_VERSION: "0.11.7"
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+          ref: ${{ inputs.ref || github.ref }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Cache uv
+        uses: actions/cache@v5
+        with:
+          path: ~/.cache/uv
+          key: uv-${{ runner.os }}-py${{ env.PYTHON_VERSION }}-${{ hashFiles('uv.lock') }}
+          restore-keys: |
+            uv-${{ runner.os }}-py${{ env.PYTHON_VERSION }}-
+
+      - name: Install uv
+        run: python -m pip install "uv==${UV_VERSION}"
+
+      - name: Validate lockfile
+        run: uv lock --check
+
+      - name: Lint Python
+        run: uv run --frozen ruff check .
+
+      - name: Check Python formatting
+        run: uv run --frozen ruff format --check .
+
+      - name: Type check
+        run: uv run --frozen pyright
+
+      - name: Run tests
+        run: uv run --frozen python -m unittest discover -s tests
+
+      - name: Smoke test source checkout import
+        run: |
+          uv run --frozen python - <<'PY'
+          import os
+
+          import src_py_lib
+
+          if src_py_lib.__name__ != os.environ["IMPORT_NAME"]:
+              raise SystemExit(f"unexpected import name: {src_py_lib.__name__}")
+          PY
+
+  package_build:
+    name: Build and smoke-test package
+    needs: changes
+    if: inputs.build-package && needs.changes.outputs.package == 'true'
+    runs-on: ubuntu-24.04
+    env:
+      IMPORT_NAME: src_py_lib
+      PYTHON_VERSION: "3.11"
+      UV_VERSION: "0.11.7"
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v6
+        with:
+          persist-credentials: false
+          ref: ${{ inputs.ref || github.ref }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ env.PYTHON_VERSION }}
+
+      - name: Cache uv
+        uses: actions/cache@v5
+        with:
+          path: ~/.cache/uv
+          key: uv-${{ runner.os }}-py${{ env.PYTHON_VERSION }}-${{ hashFiles('uv.lock') }}
+          restore-keys: |
+            uv-${{ runner.os }}-py${{ env.PYTHON_VERSION }}-
+
+      - name: Install uv
+        run: python -m pip install "uv==${UV_VERSION}"
+
+      - name: Build wheel
+        run: uv build --wheel --out-dir dist --no-create-gitignore
+
+      - name: Smoke test installed wheel
+        run: |
+          python -m venv build/ci-venv
+          . build/ci-venv/bin/activate
+          python -m pip install dist/*.whl
+          python - <<'PY'
+          import os
+
+          import src_py_lib
+
+          if src_py_lib.__name__ != os.environ["IMPORT_NAME"]:
+              raise SystemExit(f"unexpected import name: {src_py_lib.__name__}")
+          PY
+
+  package:
+    name: Validate package
+    needs: [changes, github_actions, markdown, python, package_build]
+    if: always()
+    runs-on: ubuntu-24.04
+
+    steps:
+      - name: Confirm validation results
+        run: |
+          for validation_result in \
+            "${{ needs.changes.result }}" \
+            "${{ needs.github_actions.result }}" \
+            "${{ needs.markdown.result }}" \
+            "${{ needs.python.result }}" \
+            "${{ needs.package_build.result }}"
+          do
+            case "${validation_result}" in
+              success|skipped)
+                ;;
+              *)
+                echo "::error title=Validation failed::At least one validation job ended with '${validation_result}'."
+                exit 1
+                ;;
+            esac
+          done

{src_py_lib-0.1.2 → src_py_lib-0.1.4}/AGENTS.md

@@ -64,7 +64,7 @@ uv run python -m unittest discover -s tests
 ```sh
 set -euo pipefail
 
-VERSION=0.1.2
+VERSION=0.1.4
 BRANCH="release-v${VERSION}"
 
 git fetch origin --tags --prune
@@ -116,7 +116,7 @@ rm -rf /tmp/src-py-lib-release-check
 ```sh
 set -euo pipefail
 
-VERSION=0.1.2
+VERSION=0.1.4
 BRANCH="release-v${VERSION}"
 GH_REPO="sourcegraph/src-py-lib"
 
@@ -140,7 +140,7 @@ gh pr merge "${BRANCH}" --repo "${GH_REPO}" --squash --delete-branch
 ```sh
 set -euo pipefail
 
-VERSION=0.1.2
+VERSION=0.1.4
 
 git fetch origin --tags --prune
 git switch main
@@ -154,7 +154,7 @@ git push origin "v${VERSION}"
 ```sh
 set -euo pipefail
 
-VERSION=0.1.2
+VERSION=0.1.4
 GH_REPO="sourcegraph/src-py-lib"
 
 RUN_ID="$(

{src_py_lib-0.1.2 → src_py_lib-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: src-py-lib
-Version: 0.1.2
+Version: 0.1.4
 Summary: Reusable libraries for Sourcegraph projects
 Project-URL: Homepage, https://github.com/sourcegraph/src-py-lib
 Project-URL: Issues, https://github.com/sourcegraph/src-py-lib/issues

{src_py_lib-0.1.2 → src_py_lib-0.1.4}/pyproject.toml

@@ -10,7 +10,7 @@ dev = [
 
 [project]
 name = "src-py-lib"
-version = "0.1.2"
+version = "0.1.4"
 description = "Reusable libraries for Sourcegraph projects"
 readme = "README.md"
 requires-python = ">=3.11"

{src_py_lib-0.1.2 → src_py_lib-0.1.4}/src/src_py_lib/__init__.py

@@ -176,6 +176,7 @@ __all__ = [
     "load_json_cache",
     "load_json_subset",
     "logging",
+    "logging_context",
     "logging_settings_from_config",
     "log",
     "log_context",

{src_py_lib-0.1.2 → src_py_lib-0.1.4}/src/src_py_lib/clients/sourcegraph.py

@@ -8,6 +8,7 @@ import json
 import queue
 import time
 from collections.abc import Iterable, Iterator, Mapping, Sequence
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass, field
 from typing import Final, cast
 from urllib.parse import urlsplit
@@ -19,6 +20,7 @@ from src_py_lib.utils.json_types import JSONDict, JSONValue, json_dict, json_lis
 from src_py_lib.utils.logging import (
     current_trace_context,
     new_trace_context,
+    submit_with_log_context,
     trace_context_from_traceparent,
     traceparent_header,
 )
@@ -244,13 +246,27 @@ class SourcegraphClient:
         traces: Iterable[SourcegraphTrace] | None = None,
         *,
         retry_delays_seconds: Sequence[float] = JAEGER_TRACE_RETRY_DELAYS_SECONDS,
+        parallelism: int = 8,
     ) -> Iterator[SourcegraphJaegerTraceSummary]:
         """Yield compact Jaeger/debug summaries for traced Sourcegraph requests."""
-        for trace in self.drain_traces() if traces is None else traces:
-            yield self.fetch_jaeger_trace_summary(
-                trace,
-                retry_delays_seconds=retry_delays_seconds,
-            )
+        if parallelism < 1:
+            raise ValueError("parallelism must be at least 1")
+        pending_traces = list(self.drain_traces() if traces is None else traces)
+        with ThreadPoolExecutor(
+            max_workers=parallelism,
+            thread_name_prefix="SourcegraphJaegerTrace",
+        ) as executor:
+            futures = [
+                submit_with_log_context(
+                    executor,
+                    self.fetch_jaeger_trace_summary,
+                    trace,
+                    retry_delays_seconds=retry_delays_seconds,
+                )
+                for trace in pending_traces
+            ]
+            for future in as_completed(futures):
+                yield future.result()
 
     def fetch_jaeger_trace_summary(
         self,

{src_py_lib-0.1.2 → src_py_lib-0.1.4}/tests/test_logging_http_clients.py

@@ -8,6 +8,7 @@ import json
 import logging
 import subprocess
 import tempfile
+import threading
 import unittest
 from collections.abc import Mapping
 from contextlib import redirect_stderr, redirect_stdout
@@ -36,6 +37,7 @@ from src_py_lib.clients.slack import SlackClient
 from src_py_lib.clients.sourcegraph import (
     SourcegraphClient,
     SourcegraphClientConfig,
+    SourcegraphTrace,
     decode_external_service_id,
     decode_repository_id,
     encode_repository_id,
@@ -1535,6 +1537,50 @@ class ClientTest(unittest.TestCase):
         self.assertEqual(summaries[0].graphql_operations[0]["operation"], "Viewer")
         self.assertEqual(summaries[0].errored_spans[0]["description"], "boom")
 
+    def test_sourcegraph_streams_jaeger_summaries_in_parallel(self) -> None:
+        trace_ids = ("1" * 32, "2" * 32, "3" * 32)
+        requested_trace_ids: list[str] = []
+        first_batch_barrier = threading.Barrier(2, timeout=1)
+
+        def handler(request: httpx.Request) -> httpx.Response:
+            trace_id = request.url.path.rsplit("/", 1)[-1]
+            requested_trace_ids.append(trace_id)
+            if trace_id in trace_ids[:2]:
+                first_batch_barrier.wait()
+            return httpx.Response(
+                200,
+                json={
+                    "data": [
+                        {
+                            "spans": [
+                                {
+                                    "operationName": f"trace {trace_id[0]}",
+                                    "duration": 1_000,
+                                    "tags": [],
+                                }
+                            ]
+                        }
+                    ]
+                },
+            )
+
+        client = SourcegraphClient(
+            "https://sourcegraph.example.com/",
+            "token",
+            http=HTTPClient(max_attempts=1, transport=httpx.MockTransport(handler)),
+        )
+
+        summaries = list(
+            client.stream_jaeger_trace_summaries(
+                [SourcegraphTrace(trace_id) for trace_id in trace_ids],
+                retry_delays_seconds=(0,),
+                parallelism=2,
+            )
+        )
+
+        self.assertCountEqual(requested_trace_ids, trace_ids)
+        self.assertCountEqual([summary.trace.trace_id for summary in summaries], trace_ids)
+
     def test_graphql_client_paginates_cursor_results(self) -> None:
         http = RecordingHTTP(
             [

{src_py_lib-0.1.2 → src_py_lib-0.1.4}/uv.lock

@@ -254,7 +254,7 @@ wheels = [
 
 [[package]]
 name = "src-py-lib"
-version = "0.1.2"
+version = "0.1.4"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },

src_py_lib-0.1.2/.github/workflows/validate.yml

@@ -1,124 +0,0 @@
-name: Validate
-
-on:
-  workflow_call:
-    inputs:
-      ref:
-        description: "Git ref to validate. Defaults to the caller's ref."
-        required: false
-        type: string
-
-permissions:
-  contents: read
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  package:
-    name: Validate package
-    runs-on: ubuntu-24.04
-    env:
-      ACTIONLINT_VERSION: "1.7.12"
-      IMPORT_NAME: src_py_lib
-      MARKDOWNLINT_CLI2_VERSION: "0.22.1"
-      PYTHON_VERSION: "3.11"
-      UV_VERSION: "0.11.7"
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-          ref: ${{ inputs.ref || github.ref }}
-
-      - name: Cache actionlint
-        id: cache-actionlint
-        uses: actions/cache@v4
-        with:
-          path: ~/.local/bin/actionlint
-          key: actionlint-${{ runner.os }}-${{ runner.arch }}-${{ env.ACTIONLINT_VERSION }}
-
-      - name: Install actionlint
-        if: steps.cache-actionlint.outputs.cache-hit != 'true'
-        run: |
-          mkdir -p "${HOME}/.local/bin"
-          go install "github.com/rhysd/actionlint/cmd/actionlint@v${ACTIONLINT_VERSION}"
-          install -m 0755 "${HOME}/go/bin/actionlint" "${HOME}/.local/bin/actionlint"
-
-      - name: Lint GitHub Actions
-        run: |
-          "${HOME}/.local/bin/actionlint"
-
-      - name: Cache npm
-        uses: actions/cache@v4
-        with:
-          path: ~/.npm
-          key: npm-${{ runner.os }}-markdownlint-cli2-${{ env.MARKDOWNLINT_CLI2_VERSION }}
-
-      - name: Lint Markdown
-        run: npx --yes "markdownlint-cli2@${MARKDOWNLINT_CLI2_VERSION}"
-
-      - name: Set up Python
-        uses: actions/setup-python@v6
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          cache: pip
-
-      - name: Cache uv
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/uv
-          key: uv-${{ runner.os }}-py${{ env.PYTHON_VERSION }}-${{ hashFiles('uv.lock') }}
-          restore-keys: |
-            uv-${{ runner.os }}-py${{ env.PYTHON_VERSION }}-
-
-      - name: Install uv
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install "uv==${UV_VERSION}"
-
-      - name: Validate lockfile
-        run: uv lock --check
-
-      - name: Lint Python
-        run: uv run --frozen ruff check .
-
-      - name: Check Python formatting
-        run: uv run --frozen ruff format --check .
-
-      - name: Type check
-        run: uv run --frozen pyright
-
-      - name: Run tests
-        run: uv run --frozen python -m unittest discover -s tests
-
-      - name: Smoke test source checkout import
-        run: |
-          uv run --frozen python - <<'PY'
-          import os
-
-          import src_py_lib
-
-          if src_py_lib.__name__ != os.environ["IMPORT_NAME"]:
-              raise SystemExit(f"unexpected import name: {src_py_lib.__name__}")
-          PY
-
-      - name: Build wheel
-        run: uv build --wheel --out-dir dist --no-create-gitignore
-
-      - name: Smoke test installed wheel
-        run: |
-          python -m venv build/ci-venv
-          . build/ci-venv/bin/activate
-          python -m pip install --upgrade pip
-          python -m pip install dist/*.whl
-          python - <<'PY'
-          import os
-
-          import src_py_lib
-
-          if src_py_lib.__name__ != os.environ["IMPORT_NAME"]:
-              raise SystemExit(f"unexpected import name: {src_py_lib.__name__}")
-          PY