Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ repos:
hooks:
- id: pip-audit
additional_dependencies:
- "pip>=25.3"
- "pip>=26.0"
- "filelock>=3.20.3"
- "urllib3>=2.6.3"
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
from logging import ERROR, WARNING
from typing import List, Optional

from langchain.chains.conversational_retrieval.base import (
ConversationalRetrievalChain,
)
from langchain.retrievers.contextual_compression import (
ContextualCompressionRetriever,
)
Expand All @@ -40,6 +37,7 @@
RunnablePassthrough,
RunnableSerializable,
)
from langchain_core.runnables.config import RunnableConfig
from langchain_core.vectorstores import VectorStoreRetriever
from langfuse import get_client, propagate_attributes
from typing_extensions import Any
Expand Down Expand Up @@ -71,10 +69,7 @@
TextWithFootnotes,
)
from gen_ai_orchestrator.routers.requests.requests import RAGRequest
from gen_ai_orchestrator.routers.responses.responses import (
ObservabilityInfo,
RAGResponse,
)
from gen_ai_orchestrator.routers.responses.responses import RAGResponse
from gen_ai_orchestrator.services.langchain.callbacks.rag_callback_handler import (
RAGCallbackHandler,
)
Expand Down Expand Up @@ -129,9 +124,9 @@ async def execute_rag_chain(
message_history.add_user_message(msg.text)
else:
message_history.add_ai_message(msg.text)
session_id = (request.dialog.dialog_id,)
user_id = (request.dialog.user_id,)
tags = (request.dialog.tags,) or []
session_id = request.dialog.dialog_id
user_id = request.dialog.user_id
tags = request.dialog.tags or []

logger.debug(
'RAG chain - Use chat history: %s',
Expand Down Expand Up @@ -165,18 +160,18 @@ async def execute_rag_chain(

metadata = {}
if user_id is not None:
metadata['langfuse_user_id'] = str(user_id)
metadata['langfuse_user_id'] = user_id
if session_id is not None:
metadata['langfuse_session_id'] = str(session_id)
metadata['langfuse_session_id'] = session_id
if tags:
metadata['langfuse_tags'] = list(tags)
metadata['langfuse_tags'] = tags

response = await conversational_retrieval_chain.ainvoke(
input=inputs,
config={
'callbacks': callback_handlers,
'metadata': metadata,
},
config=RunnableConfig(
callbacks=callback_handlers,
metadata=metadata,
),
)

# RAG Guard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ repos:
hooks:
- id: pip-audit
additional_dependencies:
- "pip>=25.3"
- "pip>=26.0"
- "filelock>=3.20.3"
- "urllib3>=2.6.3"