Skip to content
Merged
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
36 changes: 1 addition & 35 deletions src/vectara/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ def __init__(
search: SearchCorporaParameters,
generation: Optional[GenerationParameters] = OMIT,
chat_id: Optional[str] = None,
request_timeout: Optional[int] = None,
request_timeout_millis: Optional[int] = None,
chat_config: Optional[ChatParameters] = OMIT,
request_options: Optional[RequestOptions] = None,
):
Expand All @@ -32,8 +30,6 @@ def __init__(
self.search = search
self.generation = generation
self.chat_config = chat_config
self.request_timeout = request_timeout
self.request_timeout_millis = request_timeout_millis
self.request_options = request_options

def chat(self, query: str):
Expand All @@ -46,8 +42,6 @@ def chat(self, query: str):
search=self.search,
generation=self.generation,
chat=self.chat_config,
request_timeout=self.request_timeout,
request_timeout_millis=self.request_timeout_millis,
request_options=self.request_options,
)
self.chat_id = getattr(response, "chat_id", None)
Expand All @@ -58,8 +52,6 @@ def chat(self, query: str):
search=self.search,
generation=self.generation,
chat=self.chat_config,
request_timeout=self.request_timeout,
request_timeout_millis=self.request_timeout_millis,
request_options=self.request_options,
)
return response
Expand All @@ -74,8 +66,6 @@ def chat_stream(self, query: str) -> Iterator[ChatStreamedResponse]:
search=self.search,
generation=self.generation,
chat=self.chat_config,
request_timeout=self.request_timeout,
request_timeout_millis=self.request_timeout_millis,
request_options=self.request_options,
)
else:
Expand All @@ -85,8 +75,6 @@ def chat_stream(self, query: str) -> Iterator[ChatStreamedResponse]:
search=self.search,
generation=self.generation,
chat=self.chat_config,
request_timeout=self.request_timeout,
request_timeout_millis=self.request_timeout_millis,
request_options=self.request_options,
)

Expand All @@ -95,9 +83,7 @@ def chat_stream(self, query: str) -> Iterator[ChatStreamedResponse]:

class Vectara(BaseVectara):
"""
We extend the Vectara client, adding additional helper services. Due to the methodology used in the
Vectara constructor, hard-coding dependencies and using an internal wrapper, we use lazy initialization
for the helper classes like the CorpusManager.
We extend the Vectara client, adding additional helper services.
"""

def __init__(self, *args, **kwargs):
Expand Down Expand Up @@ -127,8 +113,6 @@ def query(
search: SearchCorporaParameters,
generation: Optional[GenerationParameters] = OMIT,
save_history: Optional[bool] = OMIT,
request_timeout: Optional[int] = None,
request_timeout_millis: Optional[int] = None,
request_options: Optional[RequestOptions] = None,
) -> QueryFullResponse:
"""Convenience method for querying across corpora."""
Expand All @@ -137,8 +121,6 @@ def query(
search=search,
generation=generation,
save_history=save_history,
request_timeout=request_timeout,
request_timeout_millis=request_timeout_millis,
request_options=request_options,
)

Expand All @@ -149,8 +131,6 @@ def query_stream(
search: SearchCorporaParameters,
generation: Optional[GenerationParameters] = OMIT,
save_history: Optional[bool] = OMIT,
request_timeout: Optional[int] = None,
request_timeout_millis: Optional[int] = None,
request_options: Optional[RequestOptions] = None,
) -> Iterator[QueryStreamedResponse]:
"""Convenience method for streaming query across corpora."""
Expand All @@ -159,8 +139,6 @@ def query_stream(
search=search,
generation=generation,
save_history=save_history,
request_timeout=request_timeout,
request_timeout_millis=request_timeout_millis,
request_options=request_options,
)

Expand All @@ -172,8 +150,6 @@ def chat(
generation: Optional[GenerationParameters] = OMIT,
chat: Optional[ChatParameters] = OMIT,
save_history: Optional[bool] = OMIT,
request_timeout: Optional[int] = None,
request_timeout_millis: Optional[int] = None,
request_options: Optional[RequestOptions] = None,
) -> ChatFullResponse:
"""Convenience method for creating a chat."""
Expand All @@ -183,8 +159,6 @@ def chat(
generation=generation,
chat=chat,
save_history=save_history,
request_timeout=request_timeout,
request_timeout_millis=request_timeout_millis,
request_options=request_options,
)

Expand All @@ -196,8 +170,6 @@ def chat_stream(
generation: Optional[GenerationParameters] = OMIT,
chat: Optional[ChatParameters] = OMIT,
save_history: Optional[bool] = OMIT,
request_timeout: Optional[int] = None,
request_timeout_millis: Optional[int] = None,
request_options: Optional[RequestOptions] = None,
) -> Iterator[ChatStreamedResponse]:
"""Convenience method for streaming chat."""
Expand All @@ -207,16 +179,12 @@ def chat_stream(
generation=generation,
chat=chat,
save_history=save_history,
request_timeout=request_timeout,
request_timeout_millis=request_timeout_millis,
request_options=request_options,
)

def create_chat_session(
self,
search: SearchCorporaParameters,
request_timeout: Optional[int] = None,
request_timeout_millis: Optional[int] = None,
generation: Optional[GenerationParameters] = OMIT,
chat_config: Optional[ChatParameters] = OMIT,
request_options: Optional[RequestOptions] = None,
Expand All @@ -229,8 +197,6 @@ def create_chat_session(
search=search,
generation=generation,
chat_config=chat_config,
request_timeout=request_timeout,
request_timeout_millis=request_timeout_millis,
request_options=request_options,
)

Expand Down
Loading