From 59db27010b41efbb41b04083ada1cfea05329935 Mon Sep 17 00:00:00 2001 From: chottokun <29515187+chottokun@users.noreply.github.com> Date: Sun, 6 Sep 2026 22:17:18 +0000 Subject: [PATCH] refactor: deduplicate _determine_ruri_prefix and _apply_prefix Re-export _determine_ruri_prefix and _apply_prefix from src/app/services/embedding.py in src/app/main.py using explicit PEP 484 re-export syntax. This removes duplicate function definitions while preserving full backward compatibility. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> --- src/app/main.py | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/app/main.py b/src/app/main.py index 0d09438..d1b02e2 100644 --- a/src/app/main.py +++ b/src/app/main.py @@ -38,6 +38,10 @@ EmbeddingService, RerankService, ) +from .services.embedding import ( + _determine_ruri_prefix as _determine_ruri_prefix, + _apply_prefix as _apply_prefix, +) EMAIL_PATTERN = re.compile(r"[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+") @@ -182,25 +186,6 @@ def _get_model_or_400(model_name: str, model_type: str) -> Any: raise HTTPException(status_code=400, detail=str(e)) -def _determine_ruri_prefix(request: EmbeddingRequest) -> str: - prefix = "" - if "ruri-v3" in request.model: - if request.input_type in RURI_PREFIX_MAP: - prefix = RURI_PREFIX_MAP[request.input_type] - elif request.apply_ruri_prefix: - if isinstance(request.input, str): - prefix = RURI_PREFIX_MAP["query"] - else: - prefix = RURI_PREFIX_MAP["document"] - return prefix - - -def _apply_prefix(inputs: List[str], prefix: str) -> List[str]: - if not prefix: - return inputs - return [text if text.startswith(prefix) else f"{prefix}{text}" for text in inputs] - - # Dependency Injection Providers def get_embedding_service() -> BaseEmbeddingService: return EmbeddingService(proxy_to_tei_func=_proxy_to_tei)