Skip to content

Commit 27230ef

Browse files
Elon-Jiangendxxxx
andauthored
fix: honor bearer tokens in HTTP BGE rerankers (#2626)
* fix: honor bearer tokens in HTTP BGE rerankers * fix(reranker): preserve explicit bearer authentication --------- Co-authored-by: Elon-Jiang <191222665+Elon-Jiang@users.noreply.github.com> Co-authored-by: Wenqiang Wei <46308778+endxxxx@users.noreply.github.com>
1 parent 7309312 commit 27230ef

5 files changed

Lines changed: 122 additions & 2 deletions

File tree

‎src/memos/reranker/_http_auth.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
from typing import TYPE_CHECKING
2+
3+
from requests.auth import AuthBase
4+
5+
6+
if TYPE_CHECKING:
7+
from requests import PreparedRequest
8+
9+
10+
class BearerTokenAuth(AuthBase):
11+
"""Supply an explicit Requests auth handler so .netrc cannot replace the token."""
12+
13+
def __init__(self, token: str) -> None:
14+
self.token = token
15+
16+
def __call__(self, request: "PreparedRequest") -> "PreparedRequest":
17+
request.headers.setdefault("Authorization", f"Bearer {self.token}")
18+
return request

‎src/memos/reranker/factory.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def from_config(cfg: RerankerConfigFactory | None) -> BaseReranker | None:
4040
if backend in {"http_bge", "bge"}:
4141
return HTTPBGEReranker(
4242
reranker_url=c.get("url") or c.get("endpoint") or c.get("reranker_url"),
43+
token=c.get("token", ""),
4344
model=c.get("model", "bge-reranker-v2-m3"),
4445
timeout=int(c.get("timeout", 10)),
4546
max_query_tokens=min(max(c.get("max_query_tokens", 8000), 100), 8000),
@@ -60,6 +61,7 @@ def from_config(cfg: RerankerConfigFactory | None) -> BaseReranker | None:
6061
if backend in {"http_bge_strategy", "bge_strategy"}:
6162
return HTTPBGERerankerStrategy(
6263
reranker_url=c.get("url") or c.get("endpoint") or c.get("reranker_url"),
64+
token=c.get("token", ""),
6365
model=c.get("model", "bge-reranker-v2-m3"),
6466
timeout=int(c.get("timeout", 10)),
6567
max_query_tokens=min(max(c.get("max_query_tokens", 8000), 100), 8000),

‎src/memos/reranker/http_bge.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from memos.log import get_logger
1212
from memos.utils import timed_with_status
1313

14+
from ._http_auth import BearerTokenAuth
1415
from .base import BaseReranker
1516
from .concat import concat_original_source
1617

@@ -188,10 +189,13 @@ def rerank(
188189
return []
189190

190191
headers = {"Content-Type": "application/json", **self.headers_extra}
192+
auth = BearerTokenAuth(self.token) if self.token else None
191193
payload = {"model": self.model, "query": query, "documents": documents}
192194

193195
# Make the HTTP request to the reranker service
194-
resp = requests.post(self.reranker_url, headers=headers, json=payload, timeout=self.timeout)
196+
resp = requests.post(
197+
self.reranker_url, headers=headers, auth=auth, json=payload, timeout=self.timeout
198+
)
195199
resp.raise_for_status()
196200
data = resp.json()
197201

‎src/memos/reranker/http_bge_strategy.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from memos.reranker.strategies import RerankerStrategyFactory
1313
from memos.utils import timed
1414

15+
from ._http_auth import BearerTokenAuth
1516
from .base import BaseReranker
1617

1718

@@ -174,12 +175,13 @@ def rerank(
174175
return []
175176

176177
headers = {"Content-Type": "application/json", **self.headers_extra}
178+
auth = BearerTokenAuth(self.token) if self.token else None
177179
payload = {"model": self.model, "query": query, "documents": documents}
178180

179181
try:
180182
# Make the HTTP request to the reranker service
181183
resp = requests.post(
182-
self.reranker_url, headers=headers, json=payload, timeout=self.timeout
184+
self.reranker_url, headers=headers, auth=auth, json=payload, timeout=self.timeout
183185
)
184186
resp.raise_for_status()
185187
data = resp.json()

‎tests/reranker/test_http_auth.py‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
import json
2+
3+
import pytest
4+
import requests
5+
6+
from memos.configs.reranker import RerankerConfigFactory
7+
from memos.memories.textual.item import TextualMemoryItem, TreeNodeTextualMemoryMetadata
8+
from memos.reranker.factory import RerankerFactory
9+
from memos.reranker.http_bge import HTTPBGEReranker
10+
from memos.reranker.http_bge_strategy import HTTPBGERerankerStrategy
11+
12+
13+
@pytest.mark.parametrize("backend", ["http_bge", "http_bge_strategy"])
14+
@pytest.mark.parametrize("use_factory", [False, True])
15+
@pytest.mark.parametrize(
16+
("token", "extra", "has_netrc", "expected_auth"),
17+
[
18+
("test-token", {}, False, "Bearer test-token"),
19+
("", {}, False, None),
20+
("test-token", {"authorization": "Bearer custom-token"}, False, "Bearer custom-token"),
21+
("test-token", {}, True, "Bearer test-token"),
22+
("test-token", {"authorization": "Bearer custom-token"}, True, "Bearer custom-token"),
23+
("", {}, True, "Basic dGVzdC11c2VyOnRlc3QtcGFzcw=="),
24+
],
25+
)
26+
def test_http_reranker_authenticates_prepared_request(
27+
monkeypatch, tmp_path, backend, use_factory, token, extra, has_netrc, expected_auth
28+
):
29+
"""Keep request preparation and ranking real; replace only the HTTP service."""
30+
netrc_path = tmp_path / "netrc"
31+
if has_netrc:
32+
netrc_path.write_text("machine reranker.example.test login test-user password test-pass\n")
33+
netrc_path.chmod(0o600)
34+
monkeypatch.setenv("NETRC", str(netrc_path))
35+
headers_extra = {"X-Test-Header": "preserved", **extra}
36+
original_headers = headers_extra.copy()
37+
received = []
38+
39+
def send(session, request, **kwargs):
40+
received.append(request)
41+
response = requests.Response()
42+
response.request = request
43+
response.url = request.url
44+
response.status_code = 200 if request.headers.get("Authorization") == expected_auth else 401
45+
response._content = json.dumps(
46+
{
47+
"results": [
48+
{"index": 1, "relevance_score": 0.9},
49+
{"index": 0, "relevance_score": 0.1},
50+
]
51+
}
52+
).encode()
53+
return response
54+
55+
monkeypatch.setattr(requests.Session, "send", send)
56+
options = {
57+
"reranker_url": "https://reranker.example.test/rerank",
58+
"token": token,
59+
"headers_extra": headers_extra,
60+
"reranker_strategy": "singleturn_outmem",
61+
}
62+
if use_factory:
63+
reranker = RerankerFactory.from_config(
64+
RerankerConfigFactory(backend=backend, config=options)
65+
)
66+
else:
67+
cls = HTTPBGEReranker if backend == "http_bge" else HTTPBGERerankerStrategy
68+
reranker = cls(**options)
69+
items = [
70+
TextualMemoryItem(
71+
id=f"00000000-0000-0000-0000-{i:012d}",
72+
memory=f"memory {i}",
73+
metadata=TreeNodeTextualMemoryMetadata(
74+
sources=[
75+
{"role": "user", "content": "question"},
76+
{"role": "assistant", "content": "answer"},
77+
],
78+
),
79+
)
80+
for i in (1, 2)
81+
]
82+
83+
ranked = reranker.rerank("query", items, top_k=2)
84+
85+
assert ranked == [(items[1], 0.9), (items[0], 0.1)]
86+
assert len(received) == 1
87+
request = received[0]
88+
assert request.headers.get("Authorization") == expected_auth
89+
assert request.headers["X-Test-Header"] == "preserved"
90+
assert request.headers["Content-Type"] == "application/json"
91+
payload = json.loads(request.body)
92+
assert payload["query"] == "query"
93+
assert len(payload["documents"]) == 2
94+
assert headers_extra == original_headers

0 commit comments

Comments
 (0)