Skip to content

Tsmith023/remove default hybrid alpha #1989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tsmith023 wants to merge 11 commits into from
Closed

Tsmith023/remove default hybrid alpha #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4925446
Refactor hybrid queries to use `alpha_param` and remove `0.7` default…
tsmith023 Mar 13, 2026
1899ffd
Remove mistakenly commited local change to `regen.sh`
tsmith023 Mar 16, 2026
c057270
Update logic to use new proto message
tsmith023 Mar 16, 2026
8e5d54d
Change formatting
tsmith023 Mar 16, 2026
367ce79
Tidy version check code
tsmith023 Mar 16, 2026
81414a1
Parse correct default for BC if server < 1.36
tsmith023 Mar 16, 2026
a13da23
Update CI image
tsmith023 Mar 16, 2026
7abe7f5
Fix wrong version comparison
tsmith023 Mar 16, 2026
b5f5e55
Fix typo in ci
tsmith023 Mar 16, 2026
47841d4
Update CI image
tsmith023 Mar 16, 2026
e305b33
Remove client-side default from aggregate queries
tsmith023 Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
WEAVIATE_134: 1.34.5
WEAVIATE_135: 1.35.0
WEAVIATE_136: 1.36.0
WEAVIATE_137: 1.37.0-dev-29d5c87.amd64
WEAVIATE_137: 1.37.0-dev-4e2d51d.amd64


jobs:
Expand Down Expand Up @@ -310,7 +310,7 @@ jobs:
$WEAVIATE_133,
$WEAVIATE_134,
$WEAVIATE_135,
$WEAVIATE_136
$WEAVIATE_136,
$WEAVIATE_137
]
steps:
Expand Down
6 changes: 3 additions & 3 deletions weaviate/collections/aggregations/hybrid/async_.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class _HybridAsync(_HybridExecutor[ConnectionAsync]):
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand All @@ -36,7 +36,7 @@ class _HybridAsync(_HybridExecutor[ConnectionAsync]):
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand All @@ -53,7 +53,7 @@ class _HybridAsync(_HybridExecutor[ConnectionAsync]):
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand Down
8 changes: 4 additions & 4 deletions weaviate/collections/aggregations/hybrid/executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def hybrid(
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand All @@ -40,7 +40,7 @@ def hybrid(
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand All @@ -58,7 +58,7 @@ def hybrid(
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand All @@ -75,7 +75,7 @@ def hybrid(
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand Down
6 changes: 3 additions & 3 deletions weaviate/collections/aggregations/hybrid/sync.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class _Hybrid(_HybridExecutor[ConnectionSync]):
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand All @@ -36,7 +36,7 @@ class _Hybrid(_HybridExecutor[ConnectionSync]):
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand All @@ -53,7 +53,7 @@ class _Hybrid(_HybridExecutor[ConnectionSync]):
self,
query: Optional[str],
*,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[List[float]] = None,
query_properties: Optional[List[str]] = None,
object_limit: Optional[int] = None,
Expand Down
5 changes: 4 additions & 1 deletion weaviate/collections/grpc/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,11 +686,14 @@ def _parse_hybrid(
else:
vector_bytes = vector_bytes_tmp

is_1_37 = self._weaviate_version.is_at_least(1, 37, 0)
return (
base_search_pb2.Hybrid(
properties=properties,
query=query,
alpha=float(alpha) if alpha is not None else None,
alpha=None if is_1_37 else (alpha if alpha is not None else 0.7),
alpha_param=alpha if is_1_37 else None,
use_alpha_param=is_1_37,
fusion_type=(
cast(
base_search_pb2.Hybrid.FusionType,
Expand Down
26 changes: 13 additions & 13 deletions weaviate/collections/queries/hybrid/generate/async_.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -69,7 +69,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -96,7 +96,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -123,7 +123,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -150,7 +150,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -177,7 +177,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -204,7 +204,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -231,7 +231,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -258,7 +258,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -285,7 +285,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -312,7 +312,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -339,7 +339,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand All @@ -366,7 +366,7 @@ class _HybridGenerateAsync(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down
28 changes: 14 additions & 14 deletions weaviate/collections/queries/hybrid/generate/executor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -81,7 +81,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -109,7 +109,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -137,7 +137,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -165,7 +165,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -193,7 +193,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -223,7 +223,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -251,7 +251,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -279,7 +279,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -307,7 +307,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -335,7 +335,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -363,7 +363,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -392,7 +392,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down Expand Up @@ -421,7 +421,7 @@ def hybrid(
grouped_task: Union[str, _GroupedTask, None] = None,
grouped_properties: Optional[List[str]] = None,
generative_provider: Optional[_GenerativeConfigRuntime] = None,
alpha: NUMBER = 0.7,
alpha: Optional[NUMBER] = None,
vector: Optional[HybridVectorType] = None,
query_properties: Optional[List[str]] = None,
fusion_type: Optional[HybridFusion] = None,
Expand Down
Loading
Loading