Merge pull request lightspeed-core#1561 from mwcz/fix-rhokp-url-solr-url

Fix OKP Solr RAG URL enrichment

Author: tisnik

src/llama_stack_configuration.py

@@ -9,6 +9,7 @@
 from argparse import ArgumentParser
 from pathlib import Path
 from typing import Any, Optional
+from urllib.parse import urljoin
 
 import yaml
 from azure.core.exceptions import ClientAuthenticationError
@@ -468,9 +469,10 @@ def enrich_solr(  # pylint: disable=too-many-locals
     )
 
     rhokp_raw = okp_config.get("rhokp_url")
-    solr_url = (
+    base_url = (
         str(rhokp_raw) if rhokp_raw is not None else constants.RH_SERVER_OKP_DEFAULT_URL
     )
+    solr_url = urljoin(base_url, "/solr")
 
     logger.info("Enriching Llama Stack config with OKP")
 

src/utils/vector_search.py

@@ -7,6 +7,7 @@
 import asyncio
 import traceback
 from typing import Any, Optional, cast
+from urllib.parse import urljoin
 
 from llama_stack_api.openai_responses import (
     OpenAIResponseMessage as ResponseMessage,
@@ -580,27 +581,18 @@ async def build_rag_context(
 
 
 def _join_okp_doc_url(base_url: AnyUrl, reference: Optional[str]) -> str:
-    """Build a well-formed document URL from base and reference.
-
-    If reference is None or empty, returns ''.
-    If reference already starts with 'http', returns reference unchanged.
-    Otherwise normalizes ``base_url`` to end with a single '/', strips any leading
-    '/' from reference, and concatenates.
+    """Build a well-formed document URL from base and reference path.
 
     Args:
         base_url: OKP base URL.
-        reference: Document path or full URL.
+        reference: Origin-relative document path (e.g. ``/docs/foo``).
 
     Returns:
-        Well-formed doc_url string.
+        Well-formed doc_url string, or empty string if reference is empty.
     """
     if not reference:
         return ""
-    if reference.startswith("http"):
-        return reference
-    base = str(base_url).rstrip("/") + "/"
-    ref = reference.lstrip("/")
-    return base + ref
+    return urljoin(str(base_url), reference)
 
 
 def _build_document_url(