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
12 changes: 11 additions & 1 deletion videodb/collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,13 @@ def dub_video(
if dub_data:
return Video(self._connection, **dub_data)

def search(self, query: str, *args, **kwargs) -> Union[SearchResponse, SearchResult, RTStreamSearchResult]:
def search(
self,
query: str,
*args,
config: Optional[Dict[str, Any]] = None,
**kwargs,
) -> Union[SearchResponse, SearchResult, RTStreamSearchResult]:
"""Search the collection.

New search is used by default. Calls that use legacy-shaped parameters are
Expand All @@ -485,9 +491,13 @@ def search(self, query: str, *args, **kwargs) -> Union[SearchResponse, SearchRes
"return_fields",
"include_clip",
"session_id",
"config",
}
unsupported_params = {"index_name", "index_names", "index_id", "index_ids"}

if config is not None:
kwargs["config"] = config

if args:
legacy_arg_names = [
"search_type",
Expand Down
1 change: 1 addition & 0 deletions videodb/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ def __init__(self, _connection, **kwargs):
self.session_id = kwargs.get("session_id")
self.waiting_for = kwargs.get("waiting_for") or "none"
self.clarification = kwargs.get("clarification")
self.trace = kwargs.get("trace")
raw_results = kwargs.get("results", [])
if self.response_type in {"shots", "deepsearch"}:
self.results = SearchResult(_connection, results=raw_results)
Expand Down
12 changes: 11 additions & 1 deletion videodb/video.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,13 @@ def update(self, name: Optional[str] = None) -> None:
if name is not None:
self.name = response_data.get("name", name)

def search(self, query: str, *args, **kwargs) -> Union[SearchResponse, SearchResult]:
def search(
self,
query: str,
*args,
config: Optional[Dict[str, Any]] = None,
**kwargs,
) -> Union[SearchResponse, SearchResult]:
"""Search this video.

New search is used by default. Calls that use legacy-shaped parameters are
Expand All @@ -107,9 +113,13 @@ def search(self, query: str, *args, **kwargs) -> Union[SearchResponse, SearchRes
"return_fields",
"include_clip",
"session_id",
"config",
}
unsupported_params = {"index_name", "index_names", "index_id", "index_ids"}

if config is not None:
kwargs["config"] = config

if args:
legacy_arg_names = [
"search_type",
Expand Down
Loading