diff --git a/src/memos/reranker/_http_auth.py b/src/memos/reranker/_http_auth.py new file mode 100644 index 000000000..69a5c3734 --- /dev/null +++ b/src/memos/reranker/_http_auth.py @@ -0,0 +1,18 @@ +from typing import TYPE_CHECKING + +from requests.auth import AuthBase + + +if TYPE_CHECKING: + from requests import PreparedRequest + + +class BearerTokenAuth(AuthBase): + """Supply an explicit Requests auth handler so .netrc cannot replace the token.""" + + def __init__(self, token: str) -> None: + self.token = token + + def __call__(self, request: "PreparedRequest") -> "PreparedRequest": + request.headers.setdefault("Authorization", f"Bearer {self.token}") + return request diff --git a/src/memos/reranker/factory.py b/src/memos/reranker/factory.py index 21282f613..331d40a69 100644 --- a/src/memos/reranker/factory.py +++ b/src/memos/reranker/factory.py @@ -40,6 +40,7 @@ def from_config(cfg: RerankerConfigFactory | None) -> BaseReranker | None: if backend in {"http_bge", "bge"}: return HTTPBGEReranker( reranker_url=c.get("url") or c.get("endpoint") or c.get("reranker_url"), + token=c.get("token", ""), model=c.get("model", "bge-reranker-v2-m3"), timeout=int(c.get("timeout", 10)), 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: if backend in {"http_bge_strategy", "bge_strategy"}: return HTTPBGERerankerStrategy( reranker_url=c.get("url") or c.get("endpoint") or c.get("reranker_url"), + token=c.get("token", ""), model=c.get("model", "bge-reranker-v2-m3"), timeout=int(c.get("timeout", 10)), max_query_tokens=min(max(c.get("max_query_tokens", 8000), 100), 8000), diff --git a/src/memos/reranker/http_bge.py b/src/memos/reranker/http_bge.py index b100badd5..87cda0b81 100644 --- a/src/memos/reranker/http_bge.py +++ b/src/memos/reranker/http_bge.py @@ -11,6 +11,7 @@ from memos.log import get_logger from memos.utils import timed_with_status +from ._http_auth import BearerTokenAuth from .base import BaseReranker from .concat import concat_original_source @@ -188,10 +189,13 @@ def rerank( return [] headers = {"Content-Type": "application/json", **self.headers_extra} + auth = BearerTokenAuth(self.token) if self.token else None payload = {"model": self.model, "query": query, "documents": documents} # Make the HTTP request to the reranker service - resp = requests.post(self.reranker_url, headers=headers, json=payload, timeout=self.timeout) + resp = requests.post( + self.reranker_url, headers=headers, auth=auth, json=payload, timeout=self.timeout + ) resp.raise_for_status() data = resp.json() diff --git a/src/memos/reranker/http_bge_strategy.py b/src/memos/reranker/http_bge_strategy.py index 871ac5ff0..5a864cf83 100644 --- a/src/memos/reranker/http_bge_strategy.py +++ b/src/memos/reranker/http_bge_strategy.py @@ -12,6 +12,7 @@ from memos.reranker.strategies import RerankerStrategyFactory from memos.utils import timed +from ._http_auth import BearerTokenAuth from .base import BaseReranker @@ -174,12 +175,13 @@ def rerank( return [] headers = {"Content-Type": "application/json", **self.headers_extra} + auth = BearerTokenAuth(self.token) if self.token else None payload = {"model": self.model, "query": query, "documents": documents} try: # Make the HTTP request to the reranker service resp = requests.post( - self.reranker_url, headers=headers, json=payload, timeout=self.timeout + self.reranker_url, headers=headers, auth=auth, json=payload, timeout=self.timeout ) resp.raise_for_status() data = resp.json() diff --git a/tests/reranker/test_http_auth.py b/tests/reranker/test_http_auth.py new file mode 100644 index 000000000..d79d01da3 --- /dev/null +++ b/tests/reranker/test_http_auth.py @@ -0,0 +1,94 @@ +import json + +import pytest +import requests + +from memos.configs.reranker import RerankerConfigFactory +from memos.memories.textual.item import TextualMemoryItem, TreeNodeTextualMemoryMetadata +from memos.reranker.factory import RerankerFactory +from memos.reranker.http_bge import HTTPBGEReranker +from memos.reranker.http_bge_strategy import HTTPBGERerankerStrategy + + +@pytest.mark.parametrize("backend", ["http_bge", "http_bge_strategy"]) +@pytest.mark.parametrize("use_factory", [False, True]) +@pytest.mark.parametrize( + ("token", "extra", "has_netrc", "expected_auth"), + [ + ("test-token", {}, False, "Bearer test-token"), + ("", {}, False, None), + ("test-token", {"authorization": "Bearer custom-token"}, False, "Bearer custom-token"), + ("test-token", {}, True, "Bearer test-token"), + ("test-token", {"authorization": "Bearer custom-token"}, True, "Bearer custom-token"), + ("", {}, True, "Basic dGVzdC11c2VyOnRlc3QtcGFzcw=="), + ], +) +def test_http_reranker_authenticates_prepared_request( + monkeypatch, tmp_path, backend, use_factory, token, extra, has_netrc, expected_auth +): + """Keep request preparation and ranking real; replace only the HTTP service.""" + netrc_path = tmp_path / "netrc" + if has_netrc: + netrc_path.write_text("machine reranker.example.test login test-user password test-pass\n") + netrc_path.chmod(0o600) + monkeypatch.setenv("NETRC", str(netrc_path)) + headers_extra = {"X-Test-Header": "preserved", **extra} + original_headers = headers_extra.copy() + received = [] + + def send(session, request, **kwargs): + received.append(request) + response = requests.Response() + response.request = request + response.url = request.url + response.status_code = 200 if request.headers.get("Authorization") == expected_auth else 401 + response._content = json.dumps( + { + "results": [ + {"index": 1, "relevance_score": 0.9}, + {"index": 0, "relevance_score": 0.1}, + ] + } + ).encode() + return response + + monkeypatch.setattr(requests.Session, "send", send) + options = { + "reranker_url": "https://reranker.example.test/rerank", + "token": token, + "headers_extra": headers_extra, + "reranker_strategy": "singleturn_outmem", + } + if use_factory: + reranker = RerankerFactory.from_config( + RerankerConfigFactory(backend=backend, config=options) + ) + else: + cls = HTTPBGEReranker if backend == "http_bge" else HTTPBGERerankerStrategy + reranker = cls(**options) + items = [ + TextualMemoryItem( + id=f"00000000-0000-0000-0000-{i:012d}", + memory=f"memory {i}", + metadata=TreeNodeTextualMemoryMetadata( + sources=[ + {"role": "user", "content": "question"}, + {"role": "assistant", "content": "answer"}, + ], + ), + ) + for i in (1, 2) + ] + + ranked = reranker.rerank("query", items, top_k=2) + + assert ranked == [(items[1], 0.9), (items[0], 0.1)] + assert len(received) == 1 + request = received[0] + assert request.headers.get("Authorization") == expected_auth + assert request.headers["X-Test-Header"] == "preserved" + assert request.headers["Content-Type"] == "application/json" + payload = json.loads(request.body) + assert payload["query"] == "query" + assert len(payload["documents"]) == 2 + assert headers_extra == original_headers