From 9a6fede1ab15a6f13f4c4efdde62ac3336e88a04 Mon Sep 17 00:00:00 2001 From: Renaud Cepre <32103211+renaudcepre@users.noreply.github.com> Date: Tue, 24 Mar 2026 15:57:01 +0100 Subject: [PATCH 1/2] feat: export FilterReturn from weaviate.classes.query Replace private _Filters usage with the existing public FilterReturn type alias across all executors, stubs, and internal modules. This allows users to type-annotate filter parameters without importing private types, resolving pyright reportPrivateUsage errors in strict mode. --- integration/test_collection_aggregate.py | 4 +-- integration/test_collection_filter.py | 8 ++--- weaviate/classes/query.py | 3 +- .../collections/aggregations/base_executor.py | 6 ++-- .../aggregations/hybrid/async_.pyi | 8 ++--- .../aggregations/hybrid/executor.py | 10 +++---- .../collections/aggregations/hybrid/sync.pyi | 8 ++--- .../aggregations/near_image/async_.pyi | 8 ++--- .../aggregations/near_image/executor.py | 10 +++---- .../aggregations/near_image/sync.pyi | 8 ++--- .../aggregations/near_object/async_.pyi | 8 ++--- .../aggregations/near_object/executor.py | 10 +++---- .../aggregations/near_object/sync.pyi | 8 ++--- .../aggregations/near_text/async_.pyi | 8 ++--- .../aggregations/near_text/executor.py | 10 +++---- .../aggregations/near_text/sync.pyi | 8 ++--- .../aggregations/near_vector/async_.pyi | 8 ++--- .../aggregations/near_vector/executor.py | 10 +++---- .../aggregations/near_vector/sync.pyi | 8 ++--- .../aggregations/over_all/async_.pyi | 8 ++--- .../aggregations/over_all/executor.py | 10 +++---- .../aggregations/over_all/sync.pyi | 8 ++--- .../collections/batch/grpc_batch_delete.py | 4 +-- weaviate/collections/data/async_.pyi | 8 ++--- weaviate/collections/data/executor.py | 12 ++++---- weaviate/collections/data/sync.pyi | 8 ++--- weaviate/collections/filters.py | 12 ++++---- weaviate/collections/grpc/query.py | 20 ++++++------- .../queries/bm25/generate/async_.pyi | 28 ++++++++--------- .../queries/bm25/generate/executor.py | 30 +++++++++---------- .../queries/bm25/generate/sync.pyi | 28 ++++++++--------- .../collections/queries/bm25/query/async_.pyi | 28 ++++++++--------- .../queries/bm25/query/executor.py | 30 +++++++++---------- .../collections/queries/bm25/query/sync.pyi | 28 ++++++++--------- .../queries/fetch_objects/generate/async_.pyi | 16 +++++----- .../fetch_objects/generate/executor.py | 18 +++++------ .../queries/fetch_objects/generate/sync.pyi | 16 +++++----- .../queries/fetch_objects/query/async_.pyi | 16 +++++----- .../queries/fetch_objects/query/executor.py | 18 +++++------ .../queries/fetch_objects/query/sync.pyi | 16 +++++----- .../queries/hybrid/generate/async_.pyi | 28 ++++++++--------- .../queries/hybrid/generate/executor.py | 30 +++++++++---------- .../queries/hybrid/generate/sync.pyi | 28 ++++++++--------- .../queries/hybrid/query/async_.pyi | 28 ++++++++--------- .../queries/hybrid/query/executor.py | 30 +++++++++---------- .../collections/queries/hybrid/query/sync.pyi | 28 ++++++++--------- .../queries/near_image/generate/async_.pyi | 28 ++++++++--------- .../queries/near_image/generate/executor.py | 30 +++++++++---------- .../queries/near_image/generate/sync.pyi | 28 ++++++++--------- .../queries/near_image/query/async_.pyi | 28 ++++++++--------- .../queries/near_image/query/executor.py | 30 +++++++++---------- .../queries/near_image/query/sync.pyi | 28 ++++++++--------- .../queries/near_media/generate/async_.pyi | 28 ++++++++--------- .../queries/near_media/generate/executor.py | 30 +++++++++---------- .../queries/near_media/generate/sync.pyi | 28 ++++++++--------- .../queries/near_media/query/async_.pyi | 28 ++++++++--------- .../queries/near_media/query/executor.py | 30 +++++++++---------- .../queries/near_media/query/sync.pyi | 28 ++++++++--------- .../queries/near_object/generate/async_.pyi | 28 ++++++++--------- .../queries/near_object/generate/executor.py | 30 +++++++++---------- .../queries/near_object/generate/sync.pyi | 28 ++++++++--------- .../queries/near_object/query/async_.pyi | 28 ++++++++--------- .../queries/near_object/query/executor.py | 30 +++++++++---------- .../queries/near_object/query/sync.pyi | 28 ++++++++--------- .../queries/near_text/generate/async_.pyi | 28 ++++++++--------- .../queries/near_text/generate/executor.py | 30 +++++++++---------- .../queries/near_text/generate/sync.pyi | 28 ++++++++--------- .../queries/near_text/query/async_.pyi | 28 ++++++++--------- .../queries/near_text/query/executor.py | 30 +++++++++---------- .../queries/near_text/query/sync.pyi | 28 ++++++++--------- .../queries/near_vector/generate/async_.pyi | 28 ++++++++--------- .../queries/near_vector/generate/executor.py | 30 +++++++++---------- .../queries/near_vector/generate/sync.pyi | 28 ++++++++--------- .../queries/near_vector/query/async_.pyi | 28 ++++++++--------- .../queries/near_vector/query/executor.py | 30 +++++++++---------- .../queries/near_vector/query/sync.pyi | 28 ++++++++--------- 76 files changed, 773 insertions(+), 772 deletions(-) diff --git a/integration/test_collection_aggregate.py b/integration/test_collection_aggregate.py index aca5620c3..5518163b2 100644 --- a/integration/test_collection_aggregate.py +++ b/integration/test_collection_aggregate.py @@ -23,7 +23,7 @@ Property, ReferenceProperty, ) -from weaviate.collections.classes.filters import Filter, _Filters +from weaviate.collections.classes.filters import Filter, FilterReturn from weaviate.collections.classes.grpc import Move from weaviate.collections.classes.tenants import Tenant from weaviate.exceptions import ( @@ -153,7 +153,7 @@ def test_aggregation_groupby_no_results(collection_factory: CollectionFactory) - Filter.by_property("uuids").contains_any([UUID2]), ], ) -def test_over_all_with_filters(collection_factory: CollectionFactory, filter_: _Filters) -> None: +def test_over_all_with_filters(collection_factory: CollectionFactory, filter_: FilterReturn) -> None: collection = collection_factory( properties=[ Property(name="text", data_type=DataType.TEXT), diff --git a/integration/test_collection_filter.py b/integration/test_collection_filter.py index f3916d83a..b82f36cc5 100644 --- a/integration/test_collection_filter.py +++ b/integration/test_collection_filter.py @@ -9,7 +9,7 @@ from integration.conftest import CollectionFactory from weaviate.collections.classes.config import Configure, DataType, Property, ReferenceProperty from weaviate.collections.classes.data import DataObject -from weaviate.collections.classes.filters import Filter, _Filters, _FilterValue +from weaviate.collections.classes.filters import Filter, FilterReturn, _FilterValue from weaviate.collections.classes.grpc import MetadataQuery, QueryReference, Sort from weaviate.collections.classes.internal import ReferenceToMulti from weaviate.types import UUID @@ -34,7 +34,7 @@ ) def test_filters_text( collection_factory: CollectionFactory, - weaviate_filter: _Filters, + weaviate_filter: FilterReturn, results: List[int], ) -> None: collection = collection_factory( @@ -160,7 +160,7 @@ def test_filter_with_wrong_types( ) def test_filters_nested( collection_factory: CollectionFactory, - weaviate_filter: _Filters, + weaviate_filter: FilterReturn, results: List[int], ) -> None: collection = collection_factory( @@ -401,7 +401,7 @@ def test_filters_contains( ], ) def test_ref_filters( - collection_factory: CollectionFactory, weaviate_filter: _Filters, results: List[int] + collection_factory: CollectionFactory, weaviate_filter: FilterReturn, results: List[int] ) -> None: to_collection = collection_factory( name="Target", diff --git a/weaviate/classes/query.py b/weaviate/classes/query.py index 608162566..bb5fc392b 100644 --- a/weaviate/classes/query.py +++ b/weaviate/classes/query.py @@ -1,5 +1,5 @@ from weaviate.collections.classes.aggregate import Metrics -from weaviate.collections.classes.filters import Filter +from weaviate.collections.classes.filters import Filter, FilterReturn from weaviate.collections.classes.generative import GenerativeConfig from weaviate.collections.classes.grpc import ( BM25OperatorFactory as BM25Operator, @@ -22,6 +22,7 @@ __all__ = [ "Filter", + "FilterReturn", "GeoCoordinate", "GenerativeConfig", "GroupBy", diff --git a/weaviate/collections/aggregations/base_executor.py b/weaviate/collections/aggregations/base_executor.py index 984d5b696..d316fe76a 100644 --- a/weaviate/collections/aggregations/base_executor.py +++ b/weaviate/collections/aggregations/base_executor.py @@ -30,7 +30,7 @@ _MetricsText, ) from weaviate.collections.classes.config import ConsistencyLevel -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import Move from weaviate.collections.classes.types import GeoCoordinate from weaviate.collections.filters import _FilterToREST @@ -326,13 +326,13 @@ def _add_groupby_to_builder( def _base( self, return_metrics: Optional[List[_Metrics]], - filters: Optional[_Filters], + filters: Optional[FilterReturn], total_count: bool, ) -> AggregateBuilder: _validate_input( [ _ValidateArgument([List[_Metrics], None], "return_metrics", return_metrics), - _ValidateArgument([_Filters, None], "filters", filters), + _ValidateArgument([FilterReturn, None], "filters", filters), _ValidateArgument([bool], "total_count", total_count), ] ) diff --git a/weaviate/collections/aggregations/hybrid/async_.pyi b/weaviate/collections/aggregations/hybrid/async_.pyi index 8f217a5d4..0bf5a2aca 100644 --- a/weaviate/collections/aggregations/hybrid/async_.pyi +++ b/weaviate/collections/aggregations/hybrid/async_.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import BM25OperatorOptions from weaviate.connect.v4 import ConnectionAsync from weaviate.types import NUMBER @@ -24,7 +24,7 @@ class _HybridAsync(_HybridExecutor[ConnectionAsync]): query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, @@ -41,7 +41,7 @@ class _HybridAsync(_HybridExecutor[ConnectionAsync]): query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, @@ -58,7 +58,7 @@ class _HybridAsync(_HybridExecutor[ConnectionAsync]): query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, diff --git a/weaviate/collections/aggregations/hybrid/executor.py b/weaviate/collections/aggregations/hybrid/executor.py index fae005c9c..0bcd3a289 100644 --- a/weaviate/collections/aggregations/hybrid/executor.py +++ b/weaviate/collections/aggregations/hybrid/executor.py @@ -7,7 +7,7 @@ GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import BM25OperatorOptions from weaviate.collections.filters import _FilterToGRPC from weaviate.connect import executor @@ -27,7 +27,7 @@ def hybrid( query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, @@ -45,7 +45,7 @@ def hybrid( query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, @@ -63,7 +63,7 @@ def hybrid( query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, @@ -80,7 +80,7 @@ def hybrid( query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, diff --git a/weaviate/collections/aggregations/hybrid/sync.pyi b/weaviate/collections/aggregations/hybrid/sync.pyi index 81d632f2e..336e5b8d4 100644 --- a/weaviate/collections/aggregations/hybrid/sync.pyi +++ b/weaviate/collections/aggregations/hybrid/sync.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import BM25OperatorOptions from weaviate.connect.v4 import ConnectionSync from weaviate.types import NUMBER @@ -24,7 +24,7 @@ class _Hybrid(_HybridExecutor[ConnectionSync]): query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, @@ -41,7 +41,7 @@ class _Hybrid(_HybridExecutor[ConnectionSync]): query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, @@ -58,7 +58,7 @@ class _Hybrid(_HybridExecutor[ConnectionSync]): query_properties: Optional[List[str]] = None, object_limit: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, max_vector_distance: Optional[float] = None, diff --git a/weaviate/collections/aggregations/near_image/async_.pyi b/weaviate/collections/aggregations/near_image/async_.pyi index c2338a095..ccb40e613 100644 --- a/weaviate/collections/aggregations/near_image/async_.pyi +++ b/weaviate/collections/aggregations/near_image/async_.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.connect.v4 import ConnectionAsync from weaviate.types import BLOB_INPUT, NUMBER @@ -21,7 +21,7 @@ class _NearImageAsync(_NearImageExecutor[ConnectionAsync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -35,7 +35,7 @@ class _NearImageAsync(_NearImageExecutor[ConnectionAsync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, total_count: bool = True, @@ -49,7 +49,7 @@ class _NearImageAsync(_NearImageExecutor[ConnectionAsync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_image/executor.py b/weaviate/collections/aggregations/near_image/executor.py index 65e3770d7..0363795ab 100644 --- a/weaviate/collections/aggregations/near_image/executor.py +++ b/weaviate/collections/aggregations/near_image/executor.py @@ -7,7 +7,7 @@ GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.filters import _FilterToGRPC from weaviate.connect import executor from weaviate.connect.v4 import ConnectionType @@ -25,7 +25,7 @@ def near_image( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -40,7 +40,7 @@ def near_image( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, total_count: bool = True, @@ -55,7 +55,7 @@ def near_image( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -69,7 +69,7 @@ def near_image( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_image/sync.pyi b/weaviate/collections/aggregations/near_image/sync.pyi index 2a822306b..d18beb8ed 100644 --- a/weaviate/collections/aggregations/near_image/sync.pyi +++ b/weaviate/collections/aggregations/near_image/sync.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.connect.v4 import ConnectionSync from weaviate.types import BLOB_INPUT, NUMBER @@ -21,7 +21,7 @@ class _NearImage(_NearImageExecutor[ConnectionSync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -35,7 +35,7 @@ class _NearImage(_NearImageExecutor[ConnectionSync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, total_count: bool = True, @@ -49,7 +49,7 @@ class _NearImage(_NearImageExecutor[ConnectionSync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_object/async_.pyi b/weaviate/collections/aggregations/near_object/async_.pyi index 4f7553677..a66bc0ce3 100644 --- a/weaviate/collections/aggregations/near_object/async_.pyi +++ b/weaviate/collections/aggregations/near_object/async_.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.connect.v4 import ConnectionAsync from weaviate.types import NUMBER, UUID @@ -21,7 +21,7 @@ class _NearObjectAsync(_NearObjectExecutor[ConnectionAsync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -35,7 +35,7 @@ class _NearObjectAsync(_NearObjectExecutor[ConnectionAsync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, total_count: bool = True, @@ -49,7 +49,7 @@ class _NearObjectAsync(_NearObjectExecutor[ConnectionAsync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_object/executor.py b/weaviate/collections/aggregations/near_object/executor.py index 23d414dc8..2ac5b5668 100644 --- a/weaviate/collections/aggregations/near_object/executor.py +++ b/weaviate/collections/aggregations/near_object/executor.py @@ -7,7 +7,7 @@ GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.filters import _FilterToGRPC from weaviate.connect import executor from weaviate.connect.v4 import ConnectionType @@ -24,7 +24,7 @@ def near_object( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -39,7 +39,7 @@ def near_object( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, total_count: bool = True, @@ -54,7 +54,7 @@ def near_object( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -68,7 +68,7 @@ def near_object( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_object/sync.pyi b/weaviate/collections/aggregations/near_object/sync.pyi index b494f203f..e334599ce 100644 --- a/weaviate/collections/aggregations/near_object/sync.pyi +++ b/weaviate/collections/aggregations/near_object/sync.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.connect.v4 import ConnectionSync from weaviate.types import NUMBER, UUID @@ -21,7 +21,7 @@ class _NearObject(_NearObjectExecutor[ConnectionSync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -35,7 +35,7 @@ class _NearObject(_NearObjectExecutor[ConnectionSync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, total_count: bool = True, @@ -49,7 +49,7 @@ class _NearObject(_NearObjectExecutor[ConnectionSync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_text/async_.pyi b/weaviate/collections/aggregations/near_text/async_.pyi index af077c1bc..7c5292080 100644 --- a/weaviate/collections/aggregations/near_text/async_.pyi +++ b/weaviate/collections/aggregations/near_text/async_.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import Move from weaviate.connect.v4 import ConnectionAsync from weaviate.types import NUMBER @@ -24,7 +24,7 @@ class _NearTextAsync(_NearTextExecutor[ConnectionAsync]): move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -40,7 +40,7 @@ class _NearTextAsync(_NearTextExecutor[ConnectionAsync]): move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, total_count: bool = True, @@ -56,7 +56,7 @@ class _NearTextAsync(_NearTextExecutor[ConnectionAsync]): move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_text/executor.py b/weaviate/collections/aggregations/near_text/executor.py index 9063514ad..07b2ec841 100644 --- a/weaviate/collections/aggregations/near_text/executor.py +++ b/weaviate/collections/aggregations/near_text/executor.py @@ -7,7 +7,7 @@ GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import Move from weaviate.collections.filters import _FilterToGRPC from weaviate.connect import executor @@ -27,7 +27,7 @@ def near_text( move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -44,7 +44,7 @@ def near_text( move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, total_count: bool = True, @@ -61,7 +61,7 @@ def near_text( move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -77,7 +77,7 @@ def near_text( move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_text/sync.pyi b/weaviate/collections/aggregations/near_text/sync.pyi index 63f1d9a8c..058ee2fa4 100644 --- a/weaviate/collections/aggregations/near_text/sync.pyi +++ b/weaviate/collections/aggregations/near_text/sync.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import Move from weaviate.connect.v4 import ConnectionSync from weaviate.types import NUMBER @@ -24,7 +24,7 @@ class _NearText(_NearTextExecutor[ConnectionSync]): move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[str] = None, total_count: bool = True, @@ -40,7 +40,7 @@ class _NearText(_NearTextExecutor[ConnectionSync]): move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[str] = None, total_count: bool = True, @@ -56,7 +56,7 @@ class _NearText(_NearTextExecutor[ConnectionSync]): move_to: Optional[Move] = None, move_away: Optional[Move] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[str] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_vector/async_.pyi b/weaviate/collections/aggregations/near_vector/async_.pyi index d5ea00d39..c1006b586 100644 --- a/weaviate/collections/aggregations/near_vector/async_.pyi +++ b/weaviate/collections/aggregations/near_vector/async_.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import NearVectorInputType, TargetVectorJoinType from weaviate.connect.v4 import ConnectionAsync from weaviate.types import NUMBER @@ -22,7 +22,7 @@ class _NearVectorAsync(_NearVectorExecutor[ConnectionAsync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, @@ -36,7 +36,7 @@ class _NearVectorAsync(_NearVectorExecutor[ConnectionAsync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, @@ -50,7 +50,7 @@ class _NearVectorAsync(_NearVectorExecutor[ConnectionAsync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_vector/executor.py b/weaviate/collections/aggregations/near_vector/executor.py index 1b7b55cdd..c53062749 100644 --- a/weaviate/collections/aggregations/near_vector/executor.py +++ b/weaviate/collections/aggregations/near_vector/executor.py @@ -7,7 +7,7 @@ GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( NearVectorInputType, TargetVectorJoinType, @@ -29,7 +29,7 @@ def near_vector( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, @@ -44,7 +44,7 @@ def near_vector( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, @@ -59,7 +59,7 @@ def near_vector( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, @@ -73,7 +73,7 @@ def near_vector( certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/near_vector/sync.pyi b/weaviate/collections/aggregations/near_vector/sync.pyi index 4ec2e3baf..64d739805 100644 --- a/weaviate/collections/aggregations/near_vector/sync.pyi +++ b/weaviate/collections/aggregations/near_vector/sync.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import NearVectorInputType, TargetVectorJoinType from weaviate.connect.v4 import ConnectionSync from weaviate.types import NUMBER @@ -22,7 +22,7 @@ class _NearVector(_NearVectorExecutor[ConnectionSync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, @@ -36,7 +36,7 @@ class _NearVector(_NearVectorExecutor[ConnectionSync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, @@ -50,7 +50,7 @@ class _NearVector(_NearVectorExecutor[ConnectionSync]): certainty: Optional[NUMBER] = None, distance: Optional[NUMBER] = None, object_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, target_vector: Optional[TargetVectorJoinType] = None, total_count: bool = True, diff --git a/weaviate/collections/aggregations/over_all/async_.pyi b/weaviate/collections/aggregations/over_all/async_.pyi index 331a8323c..af34d18f9 100644 --- a/weaviate/collections/aggregations/over_all/async_.pyi +++ b/weaviate/collections/aggregations/over_all/async_.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.connect.v4 import ConnectionAsync from .executor import _OverAllExecutor @@ -16,7 +16,7 @@ class _OverAllAsync(_OverAllExecutor[ConnectionAsync]): async def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, @@ -25,7 +25,7 @@ class _OverAllAsync(_OverAllExecutor[ConnectionAsync]): async def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, @@ -34,7 +34,7 @@ class _OverAllAsync(_OverAllExecutor[ConnectionAsync]): async def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, diff --git a/weaviate/collections/aggregations/over_all/executor.py b/weaviate/collections/aggregations/over_all/executor.py index fe30e16ed..343fb3463 100644 --- a/weaviate/collections/aggregations/over_all/executor.py +++ b/weaviate/collections/aggregations/over_all/executor.py @@ -7,7 +7,7 @@ GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.filters import _FilterToGRPC from weaviate.connect import executor from weaviate.connect.v4 import ConnectionType @@ -19,7 +19,7 @@ class _OverAllExecutor(Generic[ConnectionType], _BaseExecutor[ConnectionType]): def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, @@ -29,7 +29,7 @@ def over_all( def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, @@ -39,7 +39,7 @@ def over_all( def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, @@ -48,7 +48,7 @@ def over_all( def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, diff --git a/weaviate/collections/aggregations/over_all/sync.pyi b/weaviate/collections/aggregations/over_all/sync.pyi index 6b234085d..d75933229 100644 --- a/weaviate/collections/aggregations/over_all/sync.pyi +++ b/weaviate/collections/aggregations/over_all/sync.pyi @@ -6,7 +6,7 @@ from weaviate.collections.classes.aggregate import ( GroupByAggregate, PropertiesMetrics, ) -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.connect.v4 import ConnectionSync from .executor import _OverAllExecutor @@ -16,7 +16,7 @@ class _OverAll(_OverAllExecutor[ConnectionSync]): def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, @@ -25,7 +25,7 @@ class _OverAll(_OverAllExecutor[ConnectionSync]): def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Union[str, GroupByAggregate], total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, @@ -34,7 +34,7 @@ class _OverAll(_OverAllExecutor[ConnectionSync]): def over_all( self, *, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[Union[str, GroupByAggregate]] = None, total_count: bool = True, return_metrics: Optional[PropertiesMetrics] = None, diff --git a/weaviate/collections/batch/grpc_batch_delete.py b/weaviate/collections/batch/grpc_batch_delete.py index f6803e972..9490c2be9 100644 --- a/weaviate/collections/batch/grpc_batch_delete.py +++ b/weaviate/collections/batch/grpc_batch_delete.py @@ -5,7 +5,7 @@ DeleteManyReturn, ) from weaviate.collections.classes.config import ConsistencyLevel -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.filters import _FilterToGRPC from weaviate.collections.grpc.shared import _BaseGRPC from weaviate.connect import executor @@ -29,7 +29,7 @@ def batch_delete( connection: Connection, *, name: str, - filters: _Filters, + filters: FilterReturn, verbose: bool, dry_run: bool, tenant: Optional[str], diff --git a/weaviate/collections/data/async_.pyi b/weaviate/collections/data/async_.pyi index 8dd092bf3..a536b0146 100644 --- a/weaviate/collections/data/async_.pyi +++ b/weaviate/collections/data/async_.pyi @@ -11,7 +11,7 @@ from weaviate.collections.classes.batch import ( DeleteManyReturn, ) from weaviate.collections.classes.data import DataObject, DataReferences -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.internal import ( ReferenceInput, ReferenceInputs, @@ -69,15 +69,15 @@ class _DataCollectionAsync( async def delete_by_id(self, uuid: UUID) -> bool: ... @overload async def delete_many( - self, where: _Filters, *, verbose: Literal[False] = False, dry_run: bool = False + self, where: FilterReturn, *, verbose: Literal[False] = False, dry_run: bool = False ) -> DeleteManyReturn[None]: ... @overload async def delete_many( - self, where: _Filters, *, verbose: Literal[True], dry_run: bool = False + self, where: FilterReturn, *, verbose: Literal[True], dry_run: bool = False ) -> DeleteManyReturn[List[DeleteManyObject]]: ... @overload async def delete_many( - self, where: _Filters, *, verbose: bool = False, dry_run: bool = False + self, where: FilterReturn, *, verbose: bool = False, dry_run: bool = False ) -> Union[DeleteManyReturn[List[DeleteManyObject]], DeleteManyReturn[None]]: ... async def ingest( self, objs: Iterable[Union[Properties, DataObject[Properties, Optional[ReferenceInputs]]]] diff --git a/weaviate/collections/data/executor.py b/weaviate/collections/data/executor.py index 73a07b1f9..688d2cc98 100644 --- a/weaviate/collections/data/executor.py +++ b/weaviate/collections/data/executor.py @@ -40,7 +40,7 @@ ) from weaviate.collections.classes.config import ConsistencyLevel from weaviate.collections.classes.data import DataObject, DataReferences -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.internal import ( ReferenceInput, ReferenceInputs, @@ -609,23 +609,23 @@ def resp(res: Response) -> bool: @overload def delete_many( - self, where: _Filters, *, verbose: Literal[False] = False, dry_run: bool = False + self, where: FilterReturn, *, verbose: Literal[False] = False, dry_run: bool = False ) -> executor.Result[DeleteManyReturn[None]]: ... @overload def delete_many( - self, where: _Filters, *, verbose: Literal[True], dry_run: bool = False + self, where: FilterReturn, *, verbose: Literal[True], dry_run: bool = False ) -> executor.Result[DeleteManyReturn[List[DeleteManyObject]]]: ... @overload def delete_many( - self, where: _Filters, *, verbose: bool = False, dry_run: bool = False + self, where: FilterReturn, *, verbose: bool = False, dry_run: bool = False ) -> executor.Result[ Union[DeleteManyReturn[List[DeleteManyObject]], DeleteManyReturn[None]] ]: ... def delete_many( - self, where: _Filters, *, verbose: bool = False, dry_run: bool = False + self, where: FilterReturn, *, verbose: bool = False, dry_run: bool = False ) -> executor.Result[Union[DeleteManyReturn[List[DeleteManyObject]], DeleteManyReturn[None]]]: """Delete multiple objects from the collection based on a filter. @@ -640,7 +640,7 @@ def delete_many( weaviate.exceptions.WeaviateConnectionError: If the network connection to Weaviate fails. weaviate.exceptions.UnexpectedStatusCodeError: If Weaviate reports a non-OK status. """ - _ValidateArgument(expected=[_Filters], name="where", value=where) + _ValidateArgument(expected=[FilterReturn], name="where", value=where) return self.__batch_delete.batch_delete( self._connection, name=self.name, diff --git a/weaviate/collections/data/sync.pyi b/weaviate/collections/data/sync.pyi index ab1eb3f39..200d2dce0 100644 --- a/weaviate/collections/data/sync.pyi +++ b/weaviate/collections/data/sync.pyi @@ -11,7 +11,7 @@ from weaviate.collections.classes.batch import ( DeleteManyReturn, ) from weaviate.collections.classes.data import DataObject, DataReferences -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.internal import ( ReferenceInput, ReferenceInputs, @@ -67,15 +67,15 @@ class _DataCollection(Generic[Properties,], _DataCollectionExecutor[ConnectionSy def delete_by_id(self, uuid: UUID) -> bool: ... @overload def delete_many( - self, where: _Filters, *, verbose: Literal[False] = False, dry_run: bool = False + self, where: FilterReturn, *, verbose: Literal[False] = False, dry_run: bool = False ) -> DeleteManyReturn[None]: ... @overload def delete_many( - self, where: _Filters, *, verbose: Literal[True], dry_run: bool = False + self, where: FilterReturn, *, verbose: Literal[True], dry_run: bool = False ) -> DeleteManyReturn[List[DeleteManyObject]]: ... @overload def delete_many( - self, where: _Filters, *, verbose: bool = False, dry_run: bool = False + self, where: FilterReturn, *, verbose: bool = False, dry_run: bool = False ) -> Union[DeleteManyReturn[List[DeleteManyObject]], DeleteManyReturn[None]]: ... def ingest( self, objs: Iterable[Union[Properties, DataObject[Properties, Optional[ReferenceInputs]]]] diff --git a/weaviate/collections/filters.py b/weaviate/collections/filters.py index 1e8285708..a489c7d55 100644 --- a/weaviate/collections/filters.py +++ b/weaviate/collections/filters.py @@ -2,12 +2,12 @@ from typing import Any, Dict, List, Literal, Optional, cast, overload from weaviate.collections.classes.filters import ( + FilterReturn, FilterValues, _CountRef, _FilterAnd, _FilterNot, _FilterOr, - _Filters, _FilterTargets, _FilterValue, _GeoCoordinateFilter, @@ -27,10 +27,10 @@ def convert(weav_filter: Literal[None]) -> None: ... @overload @staticmethod - def convert(weav_filter: _Filters) -> base_pb2.Filters: ... + def convert(weav_filter: FilterReturn) -> base_pb2.Filters: ... @staticmethod - def convert(weav_filter: Optional[_Filters]) -> Optional[base_pb2.Filters]: + def convert(weav_filter: Optional[FilterReturn]) -> Optional[base_pb2.Filters]: if weav_filter is None: return None elif isinstance(weav_filter, _FilterValue): @@ -169,7 +169,7 @@ def __filter_to_int_list(value: FilterValues) -> Optional[base_pb2.IntArray]: return base_pb2.IntArray(values=cast(List[int], value)) @staticmethod - def __and_or_not_filter(weav_filter: _Filters) -> Optional[base_pb2.Filters]: + def __and_or_not_filter(weav_filter: FilterReturn) -> Optional[base_pb2.Filters]: assert ( isinstance(weav_filter, _FilterAnd) or isinstance(weav_filter, _FilterOr) @@ -187,7 +187,7 @@ def __and_or_not_filter(weav_filter: _Filters) -> Optional[base_pb2.Filters]: class _FilterToREST: @staticmethod - def convert(weav_filter: _Filters) -> Dict[str, Any]: + def convert(weav_filter: FilterReturn) -> Dict[str, Any]: if isinstance(weav_filter, _FilterValue): return _FilterToREST.__value_filter(weav_filter) else: @@ -254,7 +254,7 @@ def __parse_filter(value: FilterValues) -> Dict[str, Any]: raise ValueError(f"Unknown filter value type: {type(value)}") @staticmethod - def __and_or_not_filter(weav_filter: _Filters) -> Dict[str, Any]: + def __and_or_not_filter(weav_filter: FilterReturn) -> Dict[str, Any]: assert ( isinstance(weav_filter, _FilterAnd) or isinstance(weav_filter, _FilterOr) diff --git a/weaviate/collections/grpc/query.py b/weaviate/collections/grpc/query.py index 3867de7d1..1ac014ada 100644 --- a/weaviate/collections/grpc/query.py +++ b/weaviate/collections/grpc/query.py @@ -16,7 +16,7 @@ from typing_extensions import TypeAlias from weaviate.collections.classes.config import ConsistencyLevel -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( PROPERTIES, PROPERTY, @@ -114,7 +114,7 @@ def get( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[_Sorting] = None, return_metadata: Optional[_MetadataQuery] = None, return_properties: Union[PROPERTIES, bool, None] = None, @@ -159,7 +159,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, autocut: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[_GroupBy] = None, return_metadata: Optional[_MetadataQuery] = None, return_properties: Union[PROPERTIES, bool, None] = None, @@ -200,7 +200,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, autocut: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[_GroupBy] = None, return_metadata: Optional[_MetadataQuery] = None, return_properties: Union[PROPERTIES, bool, None] = None, @@ -254,7 +254,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, autocut: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[_GroupBy] = None, generative: Optional[_Generative] = None, rerank: Optional[Rerank] = None, @@ -288,7 +288,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, autocut: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[_GroupBy] = None, generative: Optional[_Generative] = None, rerank: Optional[Rerank] = None, @@ -322,7 +322,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, autocut: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[_GroupBy] = None, generative: Optional[_Generative] = None, rerank: Optional[Rerank] = None, @@ -362,7 +362,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, autocut: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[_GroupBy] = None, generative: Optional[_Generative] = None, rerank: Optional[Rerank] = None, @@ -396,7 +396,7 @@ def __create_request( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, metadata: Optional[_MetadataQuery] = None, return_properties: Union[PROPERTIES, bool, None] = None, return_references: Optional[REFERENCES] = None, @@ -423,7 +423,7 @@ def __create_request( _ValidateArgument([int, None], "limit", limit), _ValidateArgument([int, None], "offset", offset), _ValidateArgument([uuid_lib.UUID, str, None], "after", after), - _ValidateArgument([_Filters, None], "filters", filters), + _ValidateArgument([FilterReturn, None], "filters", filters), _ValidateArgument([_MetadataQuery, None], "metadata", metadata), _ValidateArgument([_Generative, None], "generative", generative), _ValidateArgument([Rerank, None], "rerank", rerank), diff --git a/weaviate/collections/queries/bm25/generate/async_.pyi b/weaviate/collections/queries/bm25/generate/async_.pyi index f4ee8c0f4..36dae24a8 100644 --- a/weaviate/collections/queries/bm25/generate/async_.pyi +++ b/weaviate/collections/queries/bm25/generate/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -43,7 +43,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -65,7 +65,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -87,7 +87,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -109,7 +109,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -131,7 +131,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -153,7 +153,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -175,7 +175,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -197,7 +197,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -219,7 +219,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -241,7 +241,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -263,7 +263,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -285,7 +285,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -307,7 +307,7 @@ class _BM25GenerateAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, diff --git a/weaviate/collections/queries/bm25/generate/executor.py b/weaviate/collections/queries/bm25/generate/executor.py index cabffc78a..437c3197a 100644 --- a/weaviate/collections/queries/bm25/generate/executor.py +++ b/weaviate/collections/queries/bm25/generate/executor.py @@ -1,6 +1,6 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -53,7 +53,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -76,7 +76,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -99,7 +99,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -122,7 +122,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -145,7 +145,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -168,7 +168,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -193,7 +193,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -216,7 +216,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -239,7 +239,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -262,7 +262,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -285,7 +285,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -308,7 +308,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -331,7 +331,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -355,7 +355,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, diff --git a/weaviate/collections/queries/bm25/generate/sync.pyi b/weaviate/collections/queries/bm25/generate/sync.pyi index 9b77d95d9..ca5c0d303 100644 --- a/weaviate/collections/queries/bm25/generate/sync.pyi +++ b/weaviate/collections/queries/bm25/generate/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -43,7 +43,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -65,7 +65,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -87,7 +87,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -109,7 +109,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -131,7 +131,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -153,7 +153,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -175,7 +175,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -197,7 +197,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -219,7 +219,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -241,7 +241,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -263,7 +263,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -285,7 +285,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -307,7 +307,7 @@ class _BM25Generate( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, diff --git a/weaviate/collections/queries/bm25/query/async_.pyi b/weaviate/collections/queries/bm25/query/async_.pyi index 1c95a0f2a..3b844e58b 100644 --- a/weaviate/collections/queries/bm25/query/async_.pyi +++ b/weaviate/collections/queries/bm25/query/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -36,7 +36,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -54,7 +54,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -72,7 +72,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -90,7 +90,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -108,7 +108,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -126,7 +126,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -144,7 +144,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -162,7 +162,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -180,7 +180,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -198,7 +198,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -216,7 +216,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -234,7 +234,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -252,7 +252,7 @@ class _BM25QueryAsync( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, diff --git a/weaviate/collections/queries/bm25/query/executor.py b/weaviate/collections/queries/bm25/query/executor.py index e710fc748..774339641 100644 --- a/weaviate/collections/queries/bm25/query/executor.py +++ b/weaviate/collections/queries/bm25/query/executor.py @@ -1,6 +1,6 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -45,7 +45,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -64,7 +64,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -83,7 +83,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -102,7 +102,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -121,7 +121,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -140,7 +140,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -161,7 +161,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -180,7 +180,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -199,7 +199,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -218,7 +218,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -237,7 +237,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -256,7 +256,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -275,7 +275,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -295,7 +295,7 @@ def bm25( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, diff --git a/weaviate/collections/queries/bm25/query/sync.pyi b/weaviate/collections/queries/bm25/query/sync.pyi index fd404bb32..a4e6f7ae6 100644 --- a/weaviate/collections/queries/bm25/query/sync.pyi +++ b/weaviate/collections/queries/bm25/query/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -36,7 +36,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -54,7 +54,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -72,7 +72,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -90,7 +90,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -108,7 +108,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -126,7 +126,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -144,7 +144,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -162,7 +162,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -180,7 +180,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -198,7 +198,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -216,7 +216,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -234,7 +234,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, @@ -252,7 +252,7 @@ class _BM25Query( offset: Optional[int] = None, operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, include_vector: INCLUDE_VECTOR = False, diff --git a/weaviate/collections/queries/fetch_objects/generate/async_.pyi b/weaviate/collections/queries/fetch_objects/generate/async_.pyi index 8cfa64f7d..8f017f0a4 100644 --- a/weaviate/collections/queries/fetch_objects/generate/async_.pyi +++ b/weaviate/collections/queries/fetch_objects/generate/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import METADATA, PROPERTIES, REFERENCES, Sorting from weaviate.collections.classes.internal import ( CrossReferences, @@ -33,7 +33,7 @@ class _FetchObjectsGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -51,7 +51,7 @@ class _FetchObjectsGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -69,7 +69,7 @@ class _FetchObjectsGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -87,7 +87,7 @@ class _FetchObjectsGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -105,7 +105,7 @@ class _FetchObjectsGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -123,7 +123,7 @@ class _FetchObjectsGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -141,7 +141,7 @@ class _FetchObjectsGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, diff --git a/weaviate/collections/queries/fetch_objects/generate/executor.py b/weaviate/collections/queries/fetch_objects/generate/executor.py index 266c9759f..339d2dae4 100644 --- a/weaviate/collections/queries/fetch_objects/generate/executor.py +++ b/weaviate/collections/queries/fetch_objects/generate/executor.py @@ -1,6 +1,6 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import METADATA, PROPERTIES, REFERENCES, Sorting from weaviate.collections.classes.internal import ( CrossReferences, @@ -41,7 +41,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -60,7 +60,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -79,7 +79,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -98,7 +98,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -117,7 +117,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -136,7 +136,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -155,7 +155,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -175,7 +175,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, diff --git a/weaviate/collections/queries/fetch_objects/generate/sync.pyi b/weaviate/collections/queries/fetch_objects/generate/sync.pyi index 128228455..ec84f12ce 100644 --- a/weaviate/collections/queries/fetch_objects/generate/sync.pyi +++ b/weaviate/collections/queries/fetch_objects/generate/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import METADATA, PROPERTIES, REFERENCES, Sorting from weaviate.collections.classes.internal import ( CrossReferences, @@ -33,7 +33,7 @@ class _FetchObjectsGenerate( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -51,7 +51,7 @@ class _FetchObjectsGenerate( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -69,7 +69,7 @@ class _FetchObjectsGenerate( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -87,7 +87,7 @@ class _FetchObjectsGenerate( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -105,7 +105,7 @@ class _FetchObjectsGenerate( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -123,7 +123,7 @@ class _FetchObjectsGenerate( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -141,7 +141,7 @@ class _FetchObjectsGenerate( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, diff --git a/weaviate/collections/queries/fetch_objects/query/async_.pyi b/weaviate/collections/queries/fetch_objects/query/async_.pyi index f4a2591c2..d67ee318a 100644 --- a/weaviate/collections/queries/fetch_objects/query/async_.pyi +++ b/weaviate/collections/queries/fetch_objects/query/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import METADATA, PROPERTIES, REFERENCES, Sorting from weaviate.collections.classes.internal import ( CrossReferences, @@ -26,7 +26,7 @@ class _FetchObjectsQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -40,7 +40,7 @@ class _FetchObjectsQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -54,7 +54,7 @@ class _FetchObjectsQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -68,7 +68,7 @@ class _FetchObjectsQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -82,7 +82,7 @@ class _FetchObjectsQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -96,7 +96,7 @@ class _FetchObjectsQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -110,7 +110,7 @@ class _FetchObjectsQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, diff --git a/weaviate/collections/queries/fetch_objects/query/executor.py b/weaviate/collections/queries/fetch_objects/query/executor.py index 3eb7a2a3d..821db44e6 100644 --- a/weaviate/collections/queries/fetch_objects/query/executor.py +++ b/weaviate/collections/queries/fetch_objects/query/executor.py @@ -1,6 +1,6 @@ from typing import Any, Generic, Literal, Optional, Type, Union, cast, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import METADATA, PROPERTIES, REFERENCES, Sorting from weaviate.collections.classes.internal import ( CrossReferences, @@ -33,7 +33,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -48,7 +48,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -63,7 +63,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -78,7 +78,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -93,7 +93,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -108,7 +108,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -123,7 +123,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -137,7 +137,7 @@ def fetch_objects( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, diff --git a/weaviate/collections/queries/fetch_objects/query/sync.pyi b/weaviate/collections/queries/fetch_objects/query/sync.pyi index 05d471236..a861d3ac2 100644 --- a/weaviate/collections/queries/fetch_objects/query/sync.pyi +++ b/weaviate/collections/queries/fetch_objects/query/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import METADATA, PROPERTIES, REFERENCES, Sorting from weaviate.collections.classes.internal import ( CrossReferences, @@ -26,7 +26,7 @@ class _FetchObjectsQuery( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -40,7 +40,7 @@ class _FetchObjectsQuery( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -54,7 +54,7 @@ class _FetchObjectsQuery( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -68,7 +68,7 @@ class _FetchObjectsQuery( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -82,7 +82,7 @@ class _FetchObjectsQuery( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -96,7 +96,7 @@ class _FetchObjectsQuery( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, @@ -110,7 +110,7 @@ class _FetchObjectsQuery( limit: Optional[int] = None, offset: Optional[int] = None, after: Optional[UUID] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, sort: Optional[Sorting] = None, include_vector: INCLUDE_VECTOR = False, return_metadata: Optional[METADATA] = None, diff --git a/weaviate/collections/queries/hybrid/generate/async_.pyi b/weaviate/collections/queries/hybrid/generate/async_.pyi index a408a9696..259f5787b 100644 --- a/weaviate/collections/queries/hybrid/generate/async_.pyi +++ b/weaviate/collections/queries/hybrid/generate/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -51,7 +51,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -78,7 +78,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -105,7 +105,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -132,7 +132,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -159,7 +159,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -186,7 +186,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -213,7 +213,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -240,7 +240,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -267,7 +267,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -294,7 +294,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -321,7 +321,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -348,7 +348,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -375,7 +375,7 @@ class _HybridGenerateAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/hybrid/generate/executor.py b/weaviate/collections/queries/hybrid/generate/executor.py index 9b6762a2b..f516f0b5e 100644 --- a/weaviate/collections/queries/hybrid/generate/executor.py +++ b/weaviate/collections/queries/hybrid/generate/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -62,7 +62,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -90,7 +90,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -118,7 +118,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -146,7 +146,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -174,7 +174,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -202,7 +202,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -232,7 +232,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -260,7 +260,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -288,7 +288,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -316,7 +316,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -344,7 +344,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -372,7 +372,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -401,7 +401,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -430,7 +430,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/hybrid/generate/sync.pyi b/weaviate/collections/queries/hybrid/generate/sync.pyi index d2befe438..d67103519 100644 --- a/weaviate/collections/queries/hybrid/generate/sync.pyi +++ b/weaviate/collections/queries/hybrid/generate/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -50,7 +50,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -77,7 +77,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -104,7 +104,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -131,7 +131,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -158,7 +158,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -185,7 +185,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -212,7 +212,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -239,7 +239,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -266,7 +266,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -293,7 +293,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -320,7 +320,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -347,7 +347,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -374,7 +374,7 @@ class _HybridGenerate( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/hybrid/query/async_.pyi b/weaviate/collections/queries/hybrid/query/async_.pyi index 96628ea81..346231bf0 100644 --- a/weaviate/collections/queries/hybrid/query/async_.pyi +++ b/weaviate/collections/queries/hybrid/query/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -43,7 +43,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -66,7 +66,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -89,7 +89,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -112,7 +112,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -135,7 +135,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -158,7 +158,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -181,7 +181,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -204,7 +204,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -227,7 +227,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -250,7 +250,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -273,7 +273,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -296,7 +296,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -319,7 +319,7 @@ class _HybridQueryAsync( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/hybrid/query/executor.py b/weaviate/collections/queries/hybrid/query/executor.py index 7ed027abb..4c2090d76 100644 --- a/weaviate/collections/queries/hybrid/query/executor.py +++ b/weaviate/collections/queries/hybrid/query/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -54,7 +54,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -78,7 +78,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -102,7 +102,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -126,7 +126,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -150,7 +150,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -174,7 +174,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -200,7 +200,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -224,7 +224,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -248,7 +248,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -272,7 +272,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -296,7 +296,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -320,7 +320,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -345,7 +345,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -370,7 +370,7 @@ def hybrid( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/hybrid/query/sync.pyi b/weaviate/collections/queries/hybrid/query/sync.pyi index fcf5d559b..584c61263 100644 --- a/weaviate/collections/queries/hybrid/query/sync.pyi +++ b/weaviate/collections/queries/hybrid/query/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -43,7 +43,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -66,7 +66,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -89,7 +89,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -112,7 +112,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -135,7 +135,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -158,7 +158,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -181,7 +181,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -204,7 +204,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -227,7 +227,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -250,7 +250,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -273,7 +273,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -296,7 +296,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -319,7 +319,7 @@ class _HybridQuery( offset: Optional[int] = None, bm25_operator: Optional[BM25OperatorOptions] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_image/generate/async_.pyi b/weaviate/collections/queries/near_image/generate/async_.pyi index 5d519e8a0..00244e639 100644 --- a/weaviate/collections/queries/near_image/generate/async_.pyi +++ b/weaviate/collections/queries/near_image/generate/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -44,7 +44,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -67,7 +67,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -90,7 +90,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -113,7 +113,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -136,7 +136,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -159,7 +159,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -182,7 +182,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -205,7 +205,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -228,7 +228,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -251,7 +251,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -274,7 +274,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -297,7 +297,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -320,7 +320,7 @@ class _NearImageGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_image/generate/executor.py b/weaviate/collections/queries/near_image/generate/executor.py index db0036c5f..bc996c58b 100644 --- a/weaviate/collections/queries/near_image/generate/executor.py +++ b/weaviate/collections/queries/near_image/generate/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -57,7 +57,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -81,7 +81,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -105,7 +105,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -129,7 +129,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -153,7 +153,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -177,7 +177,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -202,7 +202,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -226,7 +226,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -250,7 +250,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -274,7 +274,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -298,7 +298,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -322,7 +322,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -347,7 +347,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -372,7 +372,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_image/generate/sync.pyi b/weaviate/collections/queries/near_image/generate/sync.pyi index 94396c797..b659f725b 100644 --- a/weaviate/collections/queries/near_image/generate/sync.pyi +++ b/weaviate/collections/queries/near_image/generate/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -44,7 +44,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -67,7 +67,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -90,7 +90,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -113,7 +113,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -136,7 +136,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -159,7 +159,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -182,7 +182,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -205,7 +205,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -228,7 +228,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -251,7 +251,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -274,7 +274,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -297,7 +297,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -320,7 +320,7 @@ class _NearImageGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_image/query/async_.pyi b/weaviate/collections/queries/near_image/query/async_.pyi index cb1751b94..2759b6927 100644 --- a/weaviate/collections/queries/near_image/query/async_.pyi +++ b/weaviate/collections/queries/near_image/query/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -37,7 +37,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -56,7 +56,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -75,7 +75,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -94,7 +94,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -113,7 +113,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -132,7 +132,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -151,7 +151,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -170,7 +170,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -189,7 +189,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -208,7 +208,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -227,7 +227,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -246,7 +246,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -265,7 +265,7 @@ class _NearImageQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_image/query/executor.py b/weaviate/collections/queries/near_image/query/executor.py index 4d09739c7..1d284787e 100644 --- a/weaviate/collections/queries/near_image/query/executor.py +++ b/weaviate/collections/queries/near_image/query/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -49,7 +49,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -69,7 +69,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -89,7 +89,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -109,7 +109,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -129,7 +129,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -149,7 +149,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -171,7 +171,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -191,7 +191,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -211,7 +211,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -231,7 +231,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -251,7 +251,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -271,7 +271,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -292,7 +292,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -313,7 +313,7 @@ def near_image( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_image/query/sync.pyi b/weaviate/collections/queries/near_image/query/sync.pyi index ac1ae2168..185efa25f 100644 --- a/weaviate/collections/queries/near_image/query/sync.pyi +++ b/weaviate/collections/queries/near_image/query/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -36,7 +36,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -55,7 +55,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -74,7 +74,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -93,7 +93,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -112,7 +112,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -131,7 +131,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -150,7 +150,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -169,7 +169,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -188,7 +188,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -207,7 +207,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -226,7 +226,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -245,7 +245,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -264,7 +264,7 @@ class _NearImageQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_media/generate/async_.pyi b/weaviate/collections/queries/near_media/generate/async_.pyi index 032cfcc58..34327ffe3 100644 --- a/weaviate/collections/queries/near_media/generate/async_.pyi +++ b/weaviate/collections/queries/near_media/generate/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -46,7 +46,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -70,7 +70,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -94,7 +94,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -118,7 +118,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -142,7 +142,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -166,7 +166,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -190,7 +190,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -214,7 +214,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -238,7 +238,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -262,7 +262,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -286,7 +286,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -310,7 +310,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -334,7 +334,7 @@ class _NearMediaGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_media/generate/executor.py b/weaviate/collections/queries/near_media/generate/executor.py index 11b56356a..4cf49d41b 100644 --- a/weaviate/collections/queries/near_media/generate/executor.py +++ b/weaviate/collections/queries/near_media/generate/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -58,7 +58,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -83,7 +83,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -108,7 +108,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -133,7 +133,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -158,7 +158,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -183,7 +183,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -209,7 +209,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -234,7 +234,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -259,7 +259,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -284,7 +284,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -309,7 +309,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -334,7 +334,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -360,7 +360,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -386,7 +386,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_media/generate/sync.pyi b/weaviate/collections/queries/near_media/generate/sync.pyi index e78a2474b..503462959 100644 --- a/weaviate/collections/queries/near_media/generate/sync.pyi +++ b/weaviate/collections/queries/near_media/generate/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -46,7 +46,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -70,7 +70,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -94,7 +94,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -118,7 +118,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -142,7 +142,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -166,7 +166,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -190,7 +190,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -214,7 +214,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -238,7 +238,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -262,7 +262,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -286,7 +286,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -310,7 +310,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -334,7 +334,7 @@ class _NearMediaGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_media/query/async_.pyi b/weaviate/collections/queries/near_media/query/async_.pyi index dacdb1192..2022d3b97 100644 --- a/weaviate/collections/queries/near_media/query/async_.pyi +++ b/weaviate/collections/queries/near_media/query/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -39,7 +39,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -59,7 +59,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -79,7 +79,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -99,7 +99,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -119,7 +119,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -139,7 +139,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -159,7 +159,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -179,7 +179,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -199,7 +199,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -219,7 +219,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -239,7 +239,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -259,7 +259,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -279,7 +279,7 @@ class _NearMediaQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_media/query/executor.py b/weaviate/collections/queries/near_media/query/executor.py index 1cccdf487..1200f28ba 100644 --- a/weaviate/collections/queries/near_media/query/executor.py +++ b/weaviate/collections/queries/near_media/query/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -50,7 +50,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -71,7 +71,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -92,7 +92,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -113,7 +113,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -134,7 +134,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -155,7 +155,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -178,7 +178,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -199,7 +199,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -220,7 +220,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -241,7 +241,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -262,7 +262,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -283,7 +283,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -305,7 +305,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -327,7 +327,7 @@ def near_media( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_media/query/sync.pyi b/weaviate/collections/queries/near_media/query/sync.pyi index 5f804d1fa..4bba721dd 100644 --- a/weaviate/collections/queries/near_media/query/sync.pyi +++ b/weaviate/collections/queries/near_media/query/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -38,7 +38,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -58,7 +58,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -78,7 +78,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -98,7 +98,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -118,7 +118,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -138,7 +138,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -158,7 +158,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -178,7 +178,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -198,7 +198,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -218,7 +218,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -238,7 +238,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -258,7 +258,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -278,7 +278,7 @@ class _NearMediaQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_object/generate/async_.pyi b/weaviate/collections/queries/near_object/generate/async_.pyi index 7982cb15a..31d37ebb4 100644 --- a/weaviate/collections/queries/near_object/generate/async_.pyi +++ b/weaviate/collections/queries/near_object/generate/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -44,7 +44,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -67,7 +67,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -90,7 +90,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -113,7 +113,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -136,7 +136,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -159,7 +159,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -182,7 +182,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -205,7 +205,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -228,7 +228,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -251,7 +251,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -274,7 +274,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -297,7 +297,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -320,7 +320,7 @@ class _NearObjectGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_object/generate/executor.py b/weaviate/collections/queries/near_object/generate/executor.py index 4f86cf7e5..8a0e862c0 100644 --- a/weaviate/collections/queries/near_object/generate/executor.py +++ b/weaviate/collections/queries/near_object/generate/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -55,7 +55,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -79,7 +79,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -103,7 +103,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -127,7 +127,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -151,7 +151,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -175,7 +175,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -200,7 +200,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -224,7 +224,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -248,7 +248,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -272,7 +272,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -296,7 +296,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -320,7 +320,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -346,7 +346,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -371,7 +371,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_object/generate/sync.pyi b/weaviate/collections/queries/near_object/generate/sync.pyi index b1ece8b15..a764006c4 100644 --- a/weaviate/collections/queries/near_object/generate/sync.pyi +++ b/weaviate/collections/queries/near_object/generate/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -44,7 +44,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -67,7 +67,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -90,7 +90,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -113,7 +113,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -136,7 +136,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -159,7 +159,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -182,7 +182,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -205,7 +205,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -228,7 +228,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -251,7 +251,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -274,7 +274,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -297,7 +297,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -320,7 +320,7 @@ class _NearObjectGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_object/query/async_.pyi b/weaviate/collections/queries/near_object/query/async_.pyi index c9a421295..860314f9b 100644 --- a/weaviate/collections/queries/near_object/query/async_.pyi +++ b/weaviate/collections/queries/near_object/query/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -37,7 +37,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -56,7 +56,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -75,7 +75,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -94,7 +94,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -113,7 +113,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -132,7 +132,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -151,7 +151,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -170,7 +170,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -189,7 +189,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -208,7 +208,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -227,7 +227,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -246,7 +246,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -265,7 +265,7 @@ class _NearObjectQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_object/query/executor.py b/weaviate/collections/queries/near_object/query/executor.py index 0ffee6f31..1063f2b6b 100644 --- a/weaviate/collections/queries/near_object/query/executor.py +++ b/weaviate/collections/queries/near_object/query/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -48,7 +48,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -68,7 +68,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -88,7 +88,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -108,7 +108,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -128,7 +128,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -148,7 +148,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -170,7 +170,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -190,7 +190,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -210,7 +210,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -230,7 +230,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -250,7 +250,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -270,7 +270,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -292,7 +292,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -313,7 +313,7 @@ def near_object( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_object/query/sync.pyi b/weaviate/collections/queries/near_object/query/sync.pyi index df74e7072..a95b2ee47 100644 --- a/weaviate/collections/queries/near_object/query/sync.pyi +++ b/weaviate/collections/queries/near_object/query/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -37,7 +37,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -56,7 +56,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -75,7 +75,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -94,7 +94,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -113,7 +113,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -132,7 +132,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -151,7 +151,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -170,7 +170,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -189,7 +189,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -208,7 +208,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -227,7 +227,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -246,7 +246,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -265,7 +265,7 @@ class _NearObjectQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_text/generate/async_.pyi b/weaviate/collections/queries/near_text/generate/async_.pyi index a3a7d9f9d..146758b49 100644 --- a/weaviate/collections/queries/near_text/generate/async_.pyi +++ b/weaviate/collections/queries/near_text/generate/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -47,7 +47,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -72,7 +72,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -97,7 +97,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -122,7 +122,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -147,7 +147,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -172,7 +172,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -197,7 +197,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -222,7 +222,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -247,7 +247,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -272,7 +272,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -297,7 +297,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -322,7 +322,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -347,7 +347,7 @@ class _NearTextGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_text/generate/executor.py b/weaviate/collections/queries/near_text/generate/executor.py index 3b73a190c..788a53646 100644 --- a/weaviate/collections/queries/near_text/generate/executor.py +++ b/weaviate/collections/queries/near_text/generate/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -58,7 +58,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -84,7 +84,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -110,7 +110,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -136,7 +136,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -162,7 +162,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -188,7 +188,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -215,7 +215,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -241,7 +241,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -267,7 +267,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -293,7 +293,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -319,7 +319,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -345,7 +345,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -372,7 +372,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -399,7 +399,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_text/generate/sync.pyi b/weaviate/collections/queries/near_text/generate/sync.pyi index 041e097dd..75e9167d3 100644 --- a/weaviate/collections/queries/near_text/generate/sync.pyi +++ b/weaviate/collections/queries/near_text/generate/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -47,7 +47,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -72,7 +72,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -97,7 +97,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -122,7 +122,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -147,7 +147,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -172,7 +172,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -197,7 +197,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -222,7 +222,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -247,7 +247,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -272,7 +272,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -297,7 +297,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -322,7 +322,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -347,7 +347,7 @@ class _NearTextGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_text/query/async_.pyi b/weaviate/collections/queries/near_text/query/async_.pyi index b9710c2f0..24e72e773 100644 --- a/weaviate/collections/queries/near_text/query/async_.pyi +++ b/weaviate/collections/queries/near_text/query/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -39,7 +39,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -60,7 +60,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -81,7 +81,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -102,7 +102,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -123,7 +123,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -144,7 +144,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -165,7 +165,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -186,7 +186,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -207,7 +207,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -228,7 +228,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -249,7 +249,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -270,7 +270,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -291,7 +291,7 @@ class _NearTextQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_text/query/executor.py b/weaviate/collections/queries/near_text/query/executor.py index 33d79010e..d2fff2dc8 100644 --- a/weaviate/collections/queries/near_text/query/executor.py +++ b/weaviate/collections/queries/near_text/query/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -50,7 +50,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -72,7 +72,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -94,7 +94,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -116,7 +116,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -138,7 +138,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -160,7 +160,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -184,7 +184,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -206,7 +206,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -228,7 +228,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -250,7 +250,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -272,7 +272,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -294,7 +294,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -317,7 +317,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -340,7 +340,7 @@ def near_text( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_text/query/sync.pyi b/weaviate/collections/queries/near_text/query/sync.pyi index dd9bbc69b..304bab825 100644 --- a/weaviate/collections/queries/near_text/query/sync.pyi +++ b/weaviate/collections/queries/near_text/query/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -39,7 +39,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -60,7 +60,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -81,7 +81,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -102,7 +102,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -123,7 +123,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -144,7 +144,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -165,7 +165,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -186,7 +186,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -207,7 +207,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -228,7 +228,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -249,7 +249,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -270,7 +270,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -291,7 +291,7 @@ class _NearTextQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_vector/generate/async_.pyi b/weaviate/collections/queries/near_vector/generate/async_.pyi index 32b2e0bde..029036d64 100644 --- a/weaviate/collections/queries/near_vector/generate/async_.pyi +++ b/weaviate/collections/queries/near_vector/generate/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -45,7 +45,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -68,7 +68,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -91,7 +91,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -114,7 +114,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -137,7 +137,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -160,7 +160,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -183,7 +183,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -206,7 +206,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -229,7 +229,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -252,7 +252,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -275,7 +275,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -298,7 +298,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -321,7 +321,7 @@ class _NearVectorGenerateAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_vector/generate/executor.py b/weaviate/collections/queries/near_vector/generate/executor.py index f3a0d991e..2876ed07f 100644 --- a/weaviate/collections/queries/near_vector/generate/executor.py +++ b/weaviate/collections/queries/near_vector/generate/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, List, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -56,7 +56,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -80,7 +80,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -104,7 +104,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -128,7 +128,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -152,7 +152,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -176,7 +176,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -201,7 +201,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -225,7 +225,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -249,7 +249,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -273,7 +273,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -297,7 +297,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -321,7 +321,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -346,7 +346,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -371,7 +371,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_vector/generate/sync.pyi b/weaviate/collections/queries/near_vector/generate/sync.pyi index ef0c1c8e2..f55c735cb 100644 --- a/weaviate/collections/queries/near_vector/generate/sync.pyi +++ b/weaviate/collections/queries/near_vector/generate/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, List, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -45,7 +45,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -68,7 +68,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -91,7 +91,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -114,7 +114,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -137,7 +137,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -160,7 +160,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -183,7 +183,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -206,7 +206,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -229,7 +229,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -252,7 +252,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -275,7 +275,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -298,7 +298,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -321,7 +321,7 @@ class _NearVectorGenerate( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_vector/query/async_.pyi b/weaviate/collections/queries/near_vector/query/async_.pyi index dbd3a1f7d..9231e915e 100644 --- a/weaviate/collections/queries/near_vector/query/async_.pyi +++ b/weaviate/collections/queries/near_vector/query/async_.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -38,7 +38,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -57,7 +57,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -76,7 +76,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -95,7 +95,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -114,7 +114,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -133,7 +133,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -152,7 +152,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -171,7 +171,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -190,7 +190,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -209,7 +209,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -228,7 +228,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -247,7 +247,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -266,7 +266,7 @@ class _NearVectorQueryAsync( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_vector/query/executor.py b/weaviate/collections/queries/near_vector/query/executor.py index 04c0ee12b..39729a8ef 100644 --- a/weaviate/collections/queries/near_vector/query/executor.py +++ b/weaviate/collections/queries/near_vector/query/executor.py @@ -1,7 +1,7 @@ from typing import Any, Generic, Literal, Optional, Type, Union, cast, overload from weaviate.collections.classes.filters import ( - _Filters, + FilterReturn, ) from weaviate.collections.classes.grpc import ( METADATA, @@ -48,7 +48,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -68,7 +68,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -88,7 +88,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -108,7 +108,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -128,7 +128,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -148,7 +148,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -170,7 +170,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -190,7 +190,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -210,7 +210,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -230,7 +230,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -250,7 +250,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -270,7 +270,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -291,7 +291,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -312,7 +312,7 @@ def near_vector( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, diff --git a/weaviate/collections/queries/near_vector/query/sync.pyi b/weaviate/collections/queries/near_vector/query/sync.pyi index f7eb27661..93ed9c080 100644 --- a/weaviate/collections/queries/near_vector/query/sync.pyi +++ b/weaviate/collections/queries/near_vector/query/sync.pyi @@ -1,6 +1,6 @@ from typing import Generic, Literal, Optional, Type, Union, overload -from weaviate.collections.classes.filters import _Filters +from weaviate.collections.classes.filters import FilterReturn from weaviate.collections.classes.grpc import ( METADATA, PROPERTIES, @@ -38,7 +38,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -57,7 +57,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -76,7 +76,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -95,7 +95,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -114,7 +114,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -133,7 +133,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Literal[None] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -152,7 +152,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -171,7 +171,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -190,7 +190,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -209,7 +209,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -228,7 +228,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -247,7 +247,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: GroupBy, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, @@ -266,7 +266,7 @@ class _NearVectorQuery( limit: Optional[int] = None, offset: Optional[int] = None, auto_limit: Optional[int] = None, - filters: Optional[_Filters] = None, + filters: Optional[FilterReturn] = None, group_by: Optional[GroupBy] = None, rerank: Optional[Rerank] = None, target_vector: Optional[TargetVectorJoinType] = None, From b878db5a350a19c4e4160240211f9ee21570717c Mon Sep 17 00:00:00 2001 From: Renaud Cepre <32103211+renaudcepre@users.noreply.github.com> Date: Tue, 24 Mar 2026 16:25:05 +0100 Subject: [PATCH 2/2] lint: reformat test_over_all_with_filters function signature --- integration/test_collection_aggregate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/integration/test_collection_aggregate.py b/integration/test_collection_aggregate.py index 5518163b2..3aa9af54f 100644 --- a/integration/test_collection_aggregate.py +++ b/integration/test_collection_aggregate.py @@ -153,7 +153,9 @@ def test_aggregation_groupby_no_results(collection_factory: CollectionFactory) - Filter.by_property("uuids").contains_any([UUID2]), ], ) -def test_over_all_with_filters(collection_factory: CollectionFactory, filter_: FilterReturn) -> None: +def test_over_all_with_filters( + collection_factory: CollectionFactory, filter_: FilterReturn +) -> None: collection = collection_factory( properties=[ Property(name="text", data_type=DataType.TEXT),