Skip to content

Python: fix(redis): let an injected redis_client take precedence in RedisHistoryProvider - #10041

Open
Fish (wxhking) wants to merge 2 commits into
microsoft:mainfrom
wxhking:fix/history-provider-client-precedence
Open

Fish (wxhking) wants to merge 2 commits into
microsoft:mainfrom
wxhking:fix/history-provider-client-precedence

Conversation

@wxhking

Copy link
Copy Markdown

Fixes #9966

Summary

RedisHistoryProvider treated redis_client, redis_url and credential_provider as strictly mutually exclusive, so a working caller-owned client passed together with a stray redis_url (or credential provider) raised ValueError: redis_client, redis_url, and credential_provider are mutually exclusive at construction instead of using the injected client.

The Redis vector-store constructors already follow the intended behavior: they bypass URL, credential and host settings whenever redis_client is supplied. This gives the history provider the same precedence:

  • the mutual-exclusion check only rejects multiple non-client connection sources
  • the host is required check only applies when the provider will build a client itself
  • the injected client stays caller-owned (_owns_client=False) and nothing about it is validated beyond the existing type / decode_responses checks
  • provider-level storage settings (key scope, retention) keep applying
  • docstrings and the Raises block updated to state the precedence

Test plan

  • new test_borrowed_client_takes_precedence_over_other_connection_sources (parametrized over redis_url / credential_provider+host): the injected client is used and no mutual-exclusion error is raised — replaces the test that pinned the old rejection
  • test_url_and_credential_stay_mutually_exclusive_without_client keeps the no-client case covered (already existed as test_both_url_and_credential_raises)
  • pytest tests -m 'not integration' in python/packages/redis — 337 passed, 58 deselected (integration), no new failures
  • ruff check / format clean on both changed files

RedisContextProvider passed the user's message straight into TextQuery /
AggregateHybridQuery as the search text. RediSearch reads several
punctuation marks as query syntax there — '|' unions terms, '?' is a fuzzy
marker, backticks quote exact phrases — so ordinary messages like
'ps aux | grep python' or 'Why ?' reached the engine as malformed grammar
(e.g. '@content:(ps | aux | | | grep | python)') and raised a syntax error
that failed the whole agent run; the model was never called.

Escape the search text with a TokenEscaper configured for the RediSearch
syntax characters before building either query. Spaces stay unescaped, so
the terms keep tokenizing and BM25 scoring works as before. Tag filter
values were already escaped through _vector_store's escaper; only the
free-text path was exposed.

Fixes microsoft#10002
…oryProvider

RedisHistoryProvider treated redis_client, redis_url and credential_provider
as strictly mutually exclusive, so a working caller-owned client passed
together with a stray redis_url (or credential provider) raised at
construction instead of using the injected client. The Redis vector-store
constructors already follow the intended behavior: they bypass URL and
.env connection settings whenever redis_client is supplied.

Give redis_client the same precedence in the history provider: the
mutual-exclusion and host checks only apply to provider-created clients,
so the injected client stays caller-owned and the other settings are
never validated.

Fixes microsoft#9966
Copilot AI balanced review requested due to automatic review settings November 3, 2026 13:47
@wxhking
Fish (wxhking) deployed to github-app-auth November 3, 2026 13:47 — with GitHub Actions Active
@agent-framework-automation agent-framework-automation Bot added the python Usage: [Issues, PRs], Target: Python label Nov 3, 2026
@github-actions github-actions Bot changed the title fix(redis): let an injected redis_client take precedence in RedisHistoryProvider Python: fix(redis): let an injected redis_client take precedence in RedisHistoryProvider Nov 3, 2026
@microsoft-github-policy-service

Copy link
Copy Markdown

Fish (@wxhking) please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"
Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”),
and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your
contributions to Microsoft open source projects. This Agreement is effective as of the latest signature
date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 Changes recommended

Query escaping also alters the text passed to aembed(), potentially changing hybrid rankings; embeddings should use the original stripped text, with regression coverage asserting that input.

1 open issue
What changed in this PR

This PR aligns RedisHistoryProvider with Redis vector-store behavior by prioritizing caller-owned clients, addressing #9966. It also adds query-syntax escaping to Redis context searches.

Changes:

  • Prefer injected history clients over other connection settings while preserving ownership and compatibility checks.
  • Escape user text before constructing text and hybrid search queries.
  • Add regression tests for client precedence and query escaping.
File Description
python/​packages/​redis/​tests/​test_providers.py Tests injected-client precedence and caller ownership.
python/​packages/​redis/​tests/​test_context_provider_edges.py Tests punctuation escaping in text and hybrid searches.
python/​packages/​redis/​agent_framework_redis/​_history_provider.py Updates connection validation and documents client precedence.
python/​packages/​redis/​agent_framework_redis/​_context_provider.py Adds escaping for Redis search text.

Review effort: Balanced

self._validate_filters()

q = (text or "").strip()
q = _SEARCH_TEXT_ESCAPER.escape((text or "").strip())

This branch was successfully deployed

No deployments
github-app-auth — 1727065e Deployed Nov 3, 2026 by wxhking via team_check #8565
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

python Usage: [Issues, PRs], Target: Python

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Python: [Bug]: RedisHistoryProvider rejects connection settings instead of preferring an injected client

2 participants