Merge branch 'master' into fix/2914-evalsha-cluster-pipeline

Author: petyaslavova

.github/actions/run-tests/action.yml

@@ -49,9 +49,6 @@ inputs:
   client-libs-test-image:
     description: 'Client libs test image tag'
     required: false
-  otlp-auth-token:
-    description: 'OTLP authorization token for CI visibility metrics'
-    required: false
 runs:
   using: "composite"
   steps:
@@ -60,7 +57,7 @@ runs:
         repository: ${{ inputs.repository }}
         ref: ${{ inputs.ref }}
 
-    - uses: actions/setup-python@v6
+    - uses: actions/setup-python@v7
       with:
         python-version: ${{ inputs.python-version }}
         cache: 'pip'
@@ -176,8 +173,6 @@ runs:
       run: |
         set -e
 
-        mkdir -p junit-results
-
         run_tests() {
           local test_config=$1
           local eventloop=""
@@ -315,35 +310,6 @@ runs:
         redis-cli -p 16379 CLUSTER NODES
       shell: bash
 
-    - name: Normalize JUnit XML for metrics
-      if: ${{ !cancelled() && inputs.otlp-auth-token != '' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
-      continue-on-error: true
-      run: |
-        python - <<'PY'
-        import glob
-        import xml.etree.ElementTree as ET
-
-        for path in glob.glob("junit-results/*.xml"):
-            tree = ET.parse(path)
-            root = tree.getroot()
-            if root.tag == "testsuites" and root.get("time") is None:
-                total = sum(float(ts.get("time") or 0) for ts in root.findall("testsuite"))
-                root.set("time", f"{total:.6f}")
-                tree.write(path, xml_declaration=True, encoding="utf-8")
-        PY
-      shell: bash
-
-    - name: Self Report Metrics
-      if: ${{ !cancelled() && inputs.otlp-auth-token != '' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }}
-      continue-on-error: true
-      uses: redis-developer/cae-otel-ci-visibility@v2
-      with:
-        junit-xml-folder: "junit-results"
-        otlp-endpoint: "https://otlp-gateway-prod-us-central-0.grafana.net/otlp/v1/metrics"
-        otlp-headers: "Authorization=Basic ${{ inputs.otlp-auth-token }}"
-      env:
-        OTEL_EXPORTER_OTLP_PROTOCOL: "http/protobuf"
-
     - name: Upload test results and profiling data
       uses: actions/upload-artifact@v7
       with:

.github/wordlist.txt

@@ -122,11 +122,14 @@ docstrings
 eg
 enums
 exc
+fieldset
+fieldsets
 firsttimersonly
 fo
 formatter
 genindex
 gmail
+himport
 hiredis
 http
 idx
@@ -162,6 +165,7 @@ parsers
 performant
 pmessage
 png
+positionally
 pre
 psubscribe
 pubsub

.github/workflows/codeql-analysis.yml

@@ -40,7 +40,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v4
+      uses: github/codeql-action/init@v4.37.3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,7 +51,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v4
+      uses: github/codeql-action/autobuild@v4.37.3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -65,4 +65,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v4
+      uses: github/codeql-action/analyze@v4.37.3

.github/workflows/docs.yaml

@@ -26,7 +26,7 @@ jobs:
      runs-on: ubuntu-latest
      steps:
        - uses: actions/checkout@v7
-       - uses: actions/setup-python@v6
+       - uses: actions/setup-python@v7
          with:
            python-version: "3.10"
            cache: 'pip'

.github/workflows/integration.yaml

@@ -31,7 +31,7 @@ env:
   # for example after 8.2.1 is published, 8.2 image contains 8.2.1 content
   CURRENT_REDIS_VERSION: '8.8.0'
   REDIS_VERSION_CUSTOM_MAP: >-
-    8.10:custom-29557896054-debian
+    8.10:8.10.0
 
 jobs:
   dependency-audit:
@@ -53,7 +53,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v7
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.10"
           cache: 'pip'
@@ -115,7 +115,6 @@ jobs:
             # runners are added. Run them once, on the current Redis version's
             # cluster cell.
             run-multidb-integration: ${{ (matrix.redis-version == needs.redis_version.outputs.CURRENT && matrix.test-config == 'default-unified_responses-cluster') && 'true' || 'false' }}
-            otlp-auth-token: ${{ secrets.SELF_CHECK_OTEL_AUTHORIZATION_TOKEN }}
 
   python-compatibility-tests:
     runs-on: ubuntu-latest
@@ -155,7 +154,6 @@ jobs:
           parser-backend: ${{ matrix.parser-backend }}
           redis-version: ${{ matrix.redis-version }}
           test-config: ${{ matrix.test-config }}
-          otlp-auth-token: ${{ secrets.SELF_CHECK_OTEL_AUTHORIZATION_TOKEN }}
 
   pypy-compatibility-tests:
     runs-on: ubuntu-latest
@@ -198,7 +196,6 @@ jobs:
           parser-backend: ${{ matrix.parser-backend }}
           redis-version: ${{ matrix.redis-version }}
           test-config: ${{ matrix.test-config }}
-          otlp-auth-token: ${{ secrets.SELF_CHECK_OTEL_AUTHORIZATION_TOKEN }}
 
   hiredis-tests:
     runs-on: ubuntu-latest
@@ -240,7 +237,6 @@ jobs:
           redis-version: ${{ matrix.redis-version }}
           hiredis-version: ${{ matrix.hiredis-version }}
           test-config: ${{ matrix.test-config }}
-          otlp-auth-token: ${{ secrets.SELF_CHECK_OTEL_AUTHORIZATION_TOKEN }}
 
   uvloop-tests:
     runs-on: ubuntu-latest
@@ -281,7 +277,6 @@ jobs:
           redis-version: ${{ matrix.redis-version }}
           event-loop: ${{ matrix.event-loop }}
           test-config: ${{ matrix.test-config }}
-          otlp-auth-token: ${{ secrets.SELF_CHECK_OTEL_AUTHORIZATION_TOKEN }}
 
   build-and-test-package:
     name: Validate building and installing the package
@@ -293,7 +288,7 @@ jobs:
         extension: ['tar.gz', 'whl']
     steps:
       - uses: actions/checkout@v7
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.10"
       - name: Run installed unit tests
@@ -312,7 +307,7 @@ jobs:
         python-version: ['3.10', '3.11', '3.12', '3.13', '3.14', 'pypy-3.10', 'pypy-3.11']
     steps:
       - uses: actions/checkout@v7
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'

.github/workflows/nightly-metrics.yaml

@@ -0,0 +1,82 @@
+name: Nightly test metrics
+
+# Once a day, run the redis-py standalone test suite (master, default
+# client configuration, modules included) against a Redis server built
+# from redis' unstable branch, and report per-test durations to Grafana
+# for performance regression tracking.
+
+on:
+  schedule:
+    - cron: '30 3 * * *' # nightly, staggered from the 01:00 CI run
+  workflow_dispatch:
+
+concurrency:
+  group: nightly-metrics
+  cancel-in-progress: false
+
+permissions:
+  contents: read # to fetch code (actions/checkout)
+
+jobs:
+  nightly-metrics:
+    name: Redis unstable; test metrics
+    runs-on: ubuntu-latest
+    timeout-minutes: 60
+    steps:
+      # Secrets can't be used in `if:` conditions, so a first step checks
+      # the token and later steps are gated on its output. Without the
+      # secret the job prints a warning and skips everything.
+      - name: Check for the metrics token
+        id: gate
+        env:
+          OTEL_TOKEN: ${{ secrets.OTEL_CI_VISIBILITY_TOKEN }}
+        run: |
+          if [ -z "$OTEL_TOKEN" ]; then
+            echo "::warning::The OTEL_CI_VISIBILITY_TOKEN secret is not set; skipping the nightly metrics run."
+            echo "run=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "run=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - uses: actions/checkout@v7
+        if: steps.gate.outputs.run == 'true'
+
+      - name: Resolve latest unstable Redis image
+        id: unstable-image
+        if: steps.gate.outputs.run == 'true'
+        run: |
+          set -euo pipefail
+          # Pick the newest tag client-side instead of relying on the API's
+          # ordering parameter.
+          tag=$(curl -sf "https://hub.docker.com/v2/repositories/redislabs/client-libs-test/tags?page_size=100&name=unstable-" \
+            | jq -r '.results | max_by(.last_updated) | .name // empty')
+          if [ -z "$tag" ]; then
+            echo "::error::Could not resolve an unstable client-libs-test image tag from Docker Hub"
+            exit 1
+          fi
+          echo "Using image tag: $tag"
+          echo "tag=$tag" >> "$GITHUB_OUTPUT"
+
+      - name: Run tests
+        if: steps.gate.outputs.run == 'true'
+        uses: ./.github/actions/run-tests
+        with:
+          python-version: '3.12'
+          parser-backend: 'plain'
+          # The server under test is the unstable image resolved above;
+          # redis-version only drives run-tests' setup branching and the
+          # artifact name, and it must be numeric.
+          redis-version: '8.10'
+          client-libs-test-image: ${{ steps.unstable-image.outputs.tag }}
+          # One config, so each test reports exactly one duration per night.
+          test-config: 'default-legacy_responses-standalone'
+
+      - name: Report test metrics
+        # Report even when tests fail, but not when the run was cancelled.
+        if: ${{ !cancelled() && steps.gate.outputs.run == 'true' }}
+        uses: redis-developer/cae-otel-ci-visibility@v4
+        with:
+          junit-xml-folder: 'junit-results'
+          otlp-endpoint: 'https://otlp-gateway-prod-us-central-0.grafana.net/otlp/v1/metrics'
+          otlp-headers: 'Authorization=Basic ${{ secrets.OTEL_CI_VISIBILITY_TOKEN }}'
+          server-version: 'unstable'

.github/workflows/pypi-publish.yaml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v7
       - name: install python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: "3.10"
       - run: pip install build twine

.github/workflows/spellcheck.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v7
       - name: Check Spelling
-        uses: rojopolis/spellcheck-github-actions@0.62.0
+        uses: rojopolis/spellcheck-github-actions@0.63.0
         with:
           config_path: .github/spellcheck-settings.yml
           task_name: Markdown

.github/workflows/stale-issues.yml

@@ -22,11 +22,11 @@ jobs:
     permissions:
       issues: write          # required by actions/stale to label/close issues
       pull-requests: write   # required by actions/stale to label/close PRs
-      actions: write         # required by actions/stale@v10 for its cache state
+      actions: write         # required by actions/stale@v11 for its cache state
     steps:
       # First step: Handle regular issues (excluding needs-information)
       - name: Mark regular issues as stale
-        uses: actions/stale@v10
+        uses: actions/stale@v11
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -70,7 +70,7 @@ jobs:
 
       # Second step: Handle needs-information issues with accelerated timeline
       - name: Mark needs-information issues as stale
-        uses: actions/stale@v10
+        uses: actions/stale@v11
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 

README.md

@@ -221,6 +221,66 @@ This is useful when:
 
 For the complete failover configuration options and examples, see the [Multi-database client docs](https://redis.readthedocs.io/en/latest/multi_database.html).
 
+### Bulk hash ingestion (HIMPORT)
+
+Redis 8.10 adds the `HIMPORT` command family for loading many hashes that share
+the same set of field names: register the field names once with `himport_prepare`,
+then create each hash by sending only its values. Keys written this way are regular
+hashes — every hash command works on them.
+
+``` python
+r.himport_prepare("users", ["name", "email", "age"])
+r.himport_set("user:1", "users", ["alice", "alice@example.com", "25"])
+r.himport_set("user:2", "users", ["bob", "bob@example.com", "30"])
+r.himport_discard("users")  # => 1
+```
+
+Values pair positionally with the prepared fields. Hash enumeration order
+(`HGETALL`, `HKEYS`) is not guaranteed to match the prepare order.
+
+**Fieldsets are connection state.** A prepared fieldset lives in the server-side
+session of the physical connection that prepared it: it is invisible to other
+connections and destroyed by a disconnect or `RESET`. redis-py handles this for you —
+`himport_prepare` records the fieldset in a client-level registry, and the `PREPARE`
+is applied lazily on whatever pooled connection serves each `himport_set` (and
+re-applied automatically after a reconnect, `RESET`, or Sentinel/cluster failover).
+You declare each fieldset once per client with `himport_prepare`; there is no
+constructor argument for it.
+
+For the highest ingestion throughput, send the `PREPARE` and its `SET`s in one
+pipeline — a single batch always executes on one connection:
+
+``` python
+with r.pipeline(transaction=False) as pipe:
+    pipe.himport_prepare("users", ["name", "email", "age"])
+    for uid, row in rows:
+        pipe.himport_set(f"user:{uid}", "users", row)
+    pipe.execute()
+```
+
+The automatic re-prepare applies to direct calls only, not to commands inside
+`pipeline`/`transaction` blocks: a batched `himport_set` relies on the single
+pre-flight `PREPARE` in that batch.
+
+With `RedisCluster`, `himport_prepare` / `himport_discard` / `himport_discard_all`
+update the client's shared, cluster-wide registry and return immediately — like the
+standalone API, they perform no server I/O of their own. The server-side `PREPARE`
+(and, after a discard, `DISCARD`) is applied lazily on each node's connection the
+next time it serves an `himport_set`, and re-applied after reconnects or failover;
+`himport_set` itself routes by the key's hash slot. A discard is therefore not
+removed from every server session at once: each connection drops the fieldset on its
+next `himport_set` (or on disconnect). With Sentinel, call
+`himport_prepare` on the long-lived client returned by `master_for(...)`; the fieldset
+survives failover automatically. HIMPORT is not supported on the multi-database
+(Active-Active) client.
+
+The async client mirrors this exactly:
+
+``` python
+await r.himport_prepare("users", ["name", "email", "age"])
+await r.himport_set("user:1", "users", ["alice", "alice@example.com", "25"])
+```
+
 ---------------------------------------------
 
 ### Author