|
@@ -586,13 +586,16 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
|
|
if len(contexts) > 0:
|
|
if len(contexts) > 0:
|
|
context_string = "/n".join(contexts).strip()
|
|
context_string = "/n".join(contexts).strip()
|
|
prompt = get_last_user_message(body["messages"])
|
|
prompt = get_last_user_message(body["messages"])
|
|
|
|
+
|
|
if prompt is None:
|
|
if prompt is None:
|
|
raise Exception("No user message found")
|
|
raise Exception("No user message found")
|
|
- if rag_app.state.config.RELEVANCE_THRESHOLD == 0:
|
|
|
|
- if context_string.strip() == "":
|
|
|
|
- log.debug(
|
|
|
|
- f"With a 0 relevancy threshold for RAG, the context cannot be empty"
|
|
|
|
- )
|
|
|
|
|
|
+ if (
|
|
|
|
+ rag_app.state.config.RELEVANCE_THRESHOLD == 0
|
|
|
|
+ and context_string.strip() == ""
|
|
|
|
+ ):
|
|
|
|
+ log.debug(
|
|
|
|
+ f"With a 0 relevancy threshold for RAG, the context cannot be empty"
|
|
|
|
+ )
|
|
|
|
|
|
# Workaround for Ollama 2.0+ system prompt issue
|
|
# Workaround for Ollama 2.0+ system prompt issue
|
|
# TODO: replace with add_or_update_system_message
|
|
# TODO: replace with add_or_update_system_message
|