Skip to content

Commit

Permalink
Add back tast prompt override and include title if availible
Browse files Browse the repository at this point in the history
  • Loading branch information
NolanTrem committed Aug 22, 2024
1 parent 7d6c7f2 commit 144bc1c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
6 changes: 6 additions & 0 deletions js/sdk/src/r2rClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1139,6 +1139,8 @@ export class r2rClient {
* @param vector_search_settings Vector search settings.
* @param kg_search_settings KG search settings.
* @param rag_generation_config RAG generation configuration.
* @param task_prompt_override Task prompt override.
* @param include_title_if_available Include title if available.
* @returns A promise that resolves to the response from the server.
*/
@feature("rag")
Expand All @@ -1147,6 +1149,8 @@ export class r2rClient {
vector_search_settings?: VectorSearchSettings | Record<string, any>,
kg_search_settings?: KGSearchSettings | Record<string, any>,
rag_generation_config?: GenerationConfig | Record<string, any>,
task_prompt_override?: string,
include_title_if_available?: boolean,
): Promise<any> {
this._ensureAuthenticated();

Expand All @@ -1155,6 +1159,8 @@ export class r2rClient {
vector_search_settings,
kg_search_settings,
rag_generation_config,
task_prompt_override,
include_title_if_available,
};

Object.keys(json_data).forEach(
Expand Down
12 changes: 6 additions & 6 deletions py/sdk/retrieval.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ async def search(
Union[dict, VectorSearchSettings]
] = None,
kg_search_settings: Optional[Union[dict, KGSearchSettings]] = None,
*args,
**kwargs,
) -> SearchResponse:
"""
Conduct a vector and/or KG search.
Expand Down Expand Up @@ -56,8 +54,8 @@ async def rag(
Union[dict, VectorSearchSettings]
] = None,
kg_search_settings: Optional[Union[dict, KGSearchSettings]] = None,
*args,
**kwargs,
task_prompt_override: Optional[str] = None,
include_title_if_available: Optional[bool] = False,
) -> Union[RAGResponse, AsyncGenerator[RAGResponse, None]]:
"""
Conducts a Retrieval Augmented Generation (RAG) search with the given query.
Expand All @@ -67,6 +65,8 @@ async def rag(
rag_generation_config (Optional[Union[dict, GenerationConfig]]): RAG generation configuration.
vector_search_settings (Optional[Union[dict, VectorSearchSettings]]): Vector search settings.
kg_search_settings (Optional[Union[dict, KGSearchSettings]]): KG search settings.
task_prompt_override (Optional[str]): Task prompt override.
include_title_if_available (Optional[bool]): Include the title if available.
Returns:
Union[RAGResponse, AsyncGenerator[RAGResponse, None]]: The RAG response
Expand All @@ -87,6 +87,8 @@ async def rag(
"rag_generation_config": rag_generation_config,
"vector_search_settings": vector_search_settings,
"kg_search_settings": kg_search_settings,
"task_prompt_override": task_prompt_override,
"include_title_if_available": include_title_if_available,
}

if rag_generation_config and rag_generation_config.get(
Expand All @@ -107,8 +109,6 @@ async def agent(
kg_search_settings: Optional[Union[dict, KGSearchSettings]] = None,
task_prompt_override: Optional[str] = None,
include_title_if_available: Optional[bool] = False,
*args,
**kwargs,
) -> Union[list[Message], AsyncGenerator[Message, None]]:
"""
Performs a single turn in a conversation with a RAG agent.
Expand Down

0 comments on commit 144bc1c

Please sign in to comment.