refac/fix: rag template placeholder substitution
Some checks are pending
Python CI / Format Backend (push) Waiting to run
Deploy to HuggingFace Spaces / check-secret (push) Waiting to run
Deploy to HuggingFace Spaces / deploy (push) Blocked by required conditions
Create and publish Docker images with specific build args / build-main-image (linux/amd64, ubuntu-latest) (push) Waiting to run
Create and publish Docker images with specific build args / build-main-image (linux/arm64, ubuntu-24.04-arm) (push) Waiting to run
Create and publish Docker images with specific build args / build-cuda-image (linux/amd64, ubuntu-latest) (push) Waiting to run
Create and publish Docker images with specific build args / build-cuda-image (linux/arm64, ubuntu-24.04-arm) (push) Waiting to run
Create and publish Docker images with specific build args / build-cuda126-image (linux/amd64, ubuntu-latest) (push) Waiting to run
Create and publish Docker images with specific build args / build-cuda126-image (linux/arm64, ubuntu-24.04-arm) (push) Waiting to run
Create and publish Docker images with specific build args / build-ollama-image (linux/amd64, ubuntu-latest) (push) Waiting to run
Create and publish Docker images with specific build args / build-ollama-image (linux/arm64, ubuntu-24.04-arm) (push) Waiting to run
Create and publish Docker images with specific build args / build-slim-image (linux/amd64, ubuntu-latest) (push) Waiting to run
Create and publish Docker images with specific build args / build-slim-image (linux/arm64, ubuntu-24.04-arm) (push) Waiting to run
Create and publish Docker images with specific build args / merge-main-images (push) Blocked by required conditions
Create and publish Docker images with specific build args / merge-cuda-images (push) Blocked by required conditions
Create and publish Docker images with specific build args / merge-cuda126-images (push) Blocked by required conditions
Create and publish Docker images with specific build args / merge-ollama-images (push) Blocked by required conditions
Create and publish Docker images with specific build args / merge-slim-images (push) Blocked by required conditions

This commit is contained in:
Timothy Jaeryang Baek 2025-11-11 00:08:05 -05:00
parent b2667470cd
commit 5aa2d01c17

View file

@ -208,20 +208,21 @@ def rag_template(template: str, context: str, query: str):
if "[query]" in context: if "[query]" in context:
query_placeholder = "{{QUERY" + str(uuid.uuid4()) + "}}" query_placeholder = "{{QUERY" + str(uuid.uuid4()) + "}}"
template = template.replace("[query]", query_placeholder) template = template.replace("[query]", query_placeholder)
query_placeholders.append(query_placeholder) query_placeholders.append((query_placeholder, "[query]"))
if "{{QUERY}}" in context: if "{{QUERY}}" in context:
query_placeholder = "{{QUERY" + str(uuid.uuid4()) + "}}" query_placeholder = "{{QUERY" + str(uuid.uuid4()) + "}}"
template = template.replace("{{QUERY}}", query_placeholder) template = template.replace("{{QUERY}}", query_placeholder)
query_placeholders.append(query_placeholder) query_placeholders.append((query_placeholder, "{{QUERY}}"))
template = template.replace("[context]", context) template = template.replace("[context]", context)
template = template.replace("{{CONTEXT}}", context) template = template.replace("{{CONTEXT}}", context)
template = template.replace("[query]", query) template = template.replace("[query]", query)
template = template.replace("{{QUERY}}", query) template = template.replace("{{QUERY}}", query)
for query_placeholder in query_placeholders: for query_placeholder, original_placeholder in query_placeholders:
template = template.replace(query_placeholder, query) template = template.replace(query_placeholder, original_placeholder)
return template return template