Skip to content

Commit e893182

Browse files
dirkkuldirkkul
committed
Remove old api knobs
1 parent c015ec4 commit e893182

26 files changed

+660
-789
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ env:
2424
WEAVIATE_130: 1.30.12
2525
WEAVIATE_131: 1.31.5
2626
WEAVIATE_132: 1.32.0-rc.1-098c594
27+
WEAVIATE_133: 1.33.0-dev-725d08f.amd64
2728

2829
jobs:
2930
lint-and-format:
@@ -281,7 +282,8 @@ jobs:
281282
{ extra: "1.62.0", server: $WEAVIATE_129},
282283
{ extra: "1.69.0", server: $WEAVIATE_130},
283284
{ extra: "1.70.0", server: $WEAVIATE_131},
284-
{ extra: "1.71.0", server: $WEAVIATE_132}
285+
{ extra: "1.71.0", server: $WEAVIATE_132},
286+
{ extra: "1.72.0", server: $WEAVIATE_133}
285287
]
286288
steps:
287289
- name: Checkout

‎weaviate/collections/classes/internal.py‎

Lines changed: 64 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
)
5656
from weaviate.exceptions import (
5757
WeaviateInvalidInputError,
58-
WeaviateUnsupportedFeatureError,
5958
)
6059
from weaviate.proto.v1 import generative_pb2, search_get_pb2
6160
from weaviate.types import INCLUDE_VECTOR, UUID, UUIDS
@@ -304,96 +303,74 @@ def __init__(
304303
self.generative_provider = generative_provider
305304

306305
def to_grpc(self, server_version: _ServerVersion) -> generative_pb2.GenerativeSearch:
307-
if server_version.is_lower_than(1, 27, 14):
308-
if self.generative_provider is not None:
309-
raise WeaviateUnsupportedFeatureError("Dynamic RAG", str(server_version), "1.30.0")
310-
311-
if isinstance(self.single, _SinglePrompt):
312-
single_prompt: Optional[str] = self.single.prompt
313-
else:
314-
single_prompt = self.single
315-
316-
if isinstance(self.grouped, _GroupedTask):
317-
grouped_task: Optional[str] = self.grouped.prompt
318-
grouped_properties = self.grouped.non_blob_properties
319-
else:
320-
grouped_task = self.grouped
321-
grouped_properties = self.grouped_properties
322-
323-
return generative_pb2.GenerativeSearch(
324-
single_response_prompt=single_prompt,
325-
grouped_response_task=grouped_task,
326-
grouped_properties=grouped_properties,
327-
)
328-
else:
329-
single: Optional[generative_pb2.GenerativeSearch.Single] = None
330-
if isinstance(self.single, _SinglePrompt):
331-
single = generative_pb2.GenerativeSearch.Single(
332-
prompt=self.single.prompt,
333-
queries=(
334-
[
335-
self.generative_provider._to_grpc(
336-
_GenerativeConfigRuntimeOptions(
337-
self.single.metadata,
338-
self.single.images,
339-
self.single.image_properties,
340-
)
306+
single: Optional[generative_pb2.GenerativeSearch.Single] = None
307+
if isinstance(self.single, _SinglePrompt):
308+
single = generative_pb2.GenerativeSearch.Single(
309+
prompt=self.single.prompt,
310+
queries=(
311+
[
312+
self.generative_provider._to_grpc(
313+
_GenerativeConfigRuntimeOptions(
314+
self.single.metadata,
315+
self.single.images,
316+
self.single.image_properties,
341317
)
342-
]
343-
if self.generative_provider is not None
344-
else None
345-
),
346-
debug=self.single.debug,
347-
)
348-
if isinstance(self.single, str):
349-
single = generative_pb2.GenerativeSearch.Single(
350-
prompt=self.single,
351-
queries=(
352-
[self.generative_provider._to_grpc(_GenerativeConfigRuntimeOptions())]
353-
if self.generative_provider is not None
354-
else None
355-
),
356-
)
357-
358-
grouped: Optional[generative_pb2.GenerativeSearch.Grouped] = None
359-
if isinstance(self.grouped, _GroupedTask):
360-
grouped = generative_pb2.GenerativeSearch.Grouped(
361-
task=self.grouped.prompt,
362-
properties=_to_text_array(self.grouped.non_blob_properties),
363-
queries=(
364-
[
365-
self.generative_provider._to_grpc(
366-
_GenerativeConfigRuntimeOptions(
367-
self.grouped.metadata,
368-
self.grouped.images,
369-
self.grouped.image_properties,
370-
)
318+
)
319+
]
320+
if self.generative_provider is not None
321+
else None
322+
),
323+
debug=self.single.debug,
324+
)
325+
if isinstance(self.single, str):
326+
single = generative_pb2.GenerativeSearch.Single(
327+
prompt=self.single,
328+
queries=(
329+
[self.generative_provider._to_grpc(_GenerativeConfigRuntimeOptions())]
330+
if self.generative_provider is not None
331+
else None
332+
),
333+
)
334+
335+
grouped: Optional[generative_pb2.GenerativeSearch.Grouped] = None
336+
if isinstance(self.grouped, _GroupedTask):
337+
grouped = generative_pb2.GenerativeSearch.Grouped(
338+
task=self.grouped.prompt,
339+
properties=_to_text_array(self.grouped.non_blob_properties),
340+
queries=(
341+
[
342+
self.generative_provider._to_grpc(
343+
_GenerativeConfigRuntimeOptions(
344+
self.grouped.metadata,
345+
self.grouped.images,
346+
self.grouped.image_properties,
371347
)
372-
]
373-
if self.generative_provider is not None
374-
else None
375-
),
376-
)
377-
if isinstance(self.grouped, str):
378-
grouped = generative_pb2.GenerativeSearch.Grouped(
379-
task=self.grouped,
380-
properties=(
381-
_to_text_array(self.grouped_properties)
382-
if self.grouped_properties is not None
383-
else None
384-
),
385-
queries=(
386-
[self.generative_provider._to_grpc(_GenerativeConfigRuntimeOptions())]
387-
if self.generative_provider is not None
388-
else None
389-
),
390-
)
391-
392-
return generative_pb2.GenerativeSearch(
393-
single=single,
394-
grouped=grouped,
348+
)
349+
]
350+
if self.generative_provider is not None
351+
else None
352+
),
353+
)
354+
if isinstance(self.grouped, str):
355+
grouped = generative_pb2.GenerativeSearch.Grouped(
356+
task=self.grouped,
357+
properties=(
358+
_to_text_array(self.grouped_properties)
359+
if self.grouped_properties is not None
360+
else None
361+
),
362+
queries=(
363+
[self.generative_provider._to_grpc(_GenerativeConfigRuntimeOptions())]
364+
if self.generative_provider is not None
365+
else None
366+
),
395367
)
396368

369+
return generative_pb2.GenerativeSearch(
370+
single=single,
371+
grouped=grouped,
372+
)
373+
397374

398375
class _GroupBy:
399376
prop: str

‎weaviate/collections/grpc/query.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,8 +472,8 @@ def __create_request(
472472

473473
return search_get_pb2.SearchRequest(
474474
uses_123_api=True,
475-
uses_125_api=self.__uses_125_api,
476-
uses_127_api=self.__uses_127_api,
475+
uses_125_api=True,
476+
uses_127_api=True,
477477
collection=self._name,
478478
limit=limit,
479479
offset=offset,

‎weaviate/collections/queries/base_executor.py‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -263,16 +263,11 @@ def __deserialize_list_value_prop_125(
263263
_Warnings.unknown_type_encountered(value.WhichOneof("value"))
264264
return None
265265

266-
def __deserialize_list_value_prop_123(self, value: properties_pb2.ListValue) -> List[Any]:
267-
return [self.__deserialize_non_ref_prop(val) for val in value.values]
268-
269266
def __deserialize_non_ref_prop(self, value: properties_pb2.Value) -> Any:
270267
if value.HasField("uuid_value"):
271268
return uuid_lib.UUID(value.uuid_value)
272269
if value.HasField("date_value"):
273270
return _datetime_from_weaviate_str(value.date_value)
274-
if value.HasField("string_value"):
275-
return str(value.string_value)
276271
if value.HasField("text_value"):
277272
return str(value.text_value)
278273
if value.HasField("int_value"):
@@ -282,11 +277,7 @@ def __deserialize_non_ref_prop(self, value: properties_pb2.Value) -> Any:
282277
if value.HasField("bool_value"):
283278
return bool(value.bool_value)
284279
if value.HasField("list_value"):
285-
return (
286-
self.__deserialize_list_value_prop_125(value.list_value)
287-
if self._connection._weaviate_version.is_at_least(1, 25, 0)
288-
else self.__deserialize_list_value_prop_123(value.list_value)
289-
)
280+
return self.__deserialize_list_value_prop_125(value.list_value)
290281
if value.HasField("object_value"):
291282
return self.__parse_nonref_properties_result(value.object_value)
292283
if value.HasField("geo_value"):

‎weaviate/connect/v4.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -945,10 +945,10 @@ def connect(self) -> None:
945945
raise e
946946

947947
# do it after all other init checks so as not to break all the tests
948-
if self._weaviate_version.is_lower_than(1, 23, 7):
948+
if self._weaviate_version.is_lower_than(1, 27, 14):
949949
self._connected = False
950950
raise WeaviateStartUpError(
951-
f"Weaviate version {self._weaviate_version} is not supported. Please use Weaviate version 1.23.7 or higher."
951+
f"Weaviate version {self._weaviate_version} is not supported. Please use Weaviate version 1.27.14 or higher."
952952
)
953953

954954
if not self._skip_init_checks:

0 commit comments

Comments
 (0)