Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken main #646

Merged
merged 4 commits into from
Jan 25, 2025
+17 −8
Merged

Fix broken main #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d196951
Add conversation history to naive_query prompt
danielaskdd Jan 25, 2025
66dcc55
Fix LLM binding variable name in create_app function
danielaskdd Jan 25, 2025
cf2f833
fix linting
danielaskdd Jan 25, 2025
06673b6
Add logging for high and low-level keywords
danielaskdd Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions lightrag/api/lightrag_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,16 +719,13 @@ async def lifespan(app: FastAPI):

# Create working directory if it doesn't exist
Path(args.working_dir).mkdir(parents=True, exist_ok=True)
if args.llm_binding_host == "lollms" or args.embedding_binding == "lollms":
if args.llm_binding == "lollms" or args.embedding_binding == "lollms":
from lightrag.llm.lollms import lollms_model_complete, lollms_embed
if args.llm_binding_host == "ollama" or args.embedding_binding == "ollama":
if args.llm_binding == "ollama" or args.embedding_binding == "ollama":
from lightrag.llm.ollama import ollama_model_complete, ollama_embed
if args.llm_binding_host == "openai" or args.embedding_binding == "openai":
if args.llm_binding == "openai" or args.embedding_binding == "openai":
from lightrag.llm.openai import openai_complete_if_cache, openai_embed
if (
args.llm_binding_host == "azure_openai"
or args.embedding_binding == "azure_openai"
):
if args.llm_binding == "azure_openai" or args.embedding_binding == "azure_openai":
from lightrag.llm.azure_openai import (
azure_openai_complete_if_cache,
azure_openai_embed,
Expand Down
14 changes: 13 additions & 1 deletion lightrag/operate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,9 @@ async def kg_query(
query, query_param, global_config, hashing_kv
)

logger.info(f"High-level keywords: {hl_keywords}")
logger.info(f"Low-level keywords: {ll_keywords}")

# Handle empty keywords
if hl_keywords == [] and ll_keywords == []:
logger.warning("low_level_keywords and high_level_keywords is empty")
Expand Down Expand Up @@ -1534,9 +1537,18 @@ async def naive_query(
if query_param.only_need_context:
return section

# Process conversation history
history_context = ""
if query_param.conversation_history:
history_context = get_conversation_turns(
query_param.conversation_history, query_param.history_turns
)

sys_prompt_temp = PROMPTS["naive_rag_response"]
sys_prompt = sys_prompt_temp.format(
content_data=section, response_type=query_param.response_type
content_data=section,
response_type=query_param.response_type,
history=history_context,
)

if query_param.only_need_prompt:
Expand Down
Loading