Skip to content

Commit 929aa12

Browse files
author
yazan-amer
committed
chore: #1763 
1 parent 179c481 commit 929aa12

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎test/collection/test_config.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,11 @@ def test_basic_config():
321321
},
322322
),
323323
(
324-
Configure.Vectorizer.text2vec_palm(
324+
Configure.Vectorizer.text2vec_google(
325325
project_id="project",
326326
),
327327
{
328-
"text2vec-palm": {
328+
"text2vec-google": {
329329
"projectId": "project",
330330
"vectorizeClassName": True,
331331
}
@@ -336,7 +336,7 @@ def test_basic_config():
336336
project_id="project",
337337
),
338338
{
339-
"text2vec-palm": {
339+
"text2vec-google": {
340340
"projectId": "project",
341341
"vectorizeClassName": True,
342342
}
@@ -345,21 +345,21 @@ def test_basic_config():
345345
(
346346
Configure.Vectorizer.text2vec_google_aistudio(),
347347
{
348-
"text2vec-palm": {
348+
"text2vec-google": {
349349
"apiEndpoint": "generativelanguage.googleapis.com",
350350
"vectorizeClassName": True,
351351
}
352352
},
353353
),
354354
(
355-
Configure.Vectorizer.text2vec_palm(
355+
Configure.Vectorizer.text2vec_palm( # not changed to text2vec_google to ensure BC
356356
project_id="project",
357357
api_endpoint="api.google.com",
358358
model_id="model",
359359
vectorize_collection_name=False,
360360
),
361361
{
362-
"text2vec-palm": {
362+
"text2vec-google": {
363363
"projectId": "project",
364364
"apiEndpoint": "api.google.com",
365365
"modelId": "model",
@@ -375,7 +375,7 @@ def test_basic_config():
375375
vectorize_collection_name=False,
376376
),
377377
{
378-
"text2vec-palm": {
378+
"text2vec-google": {
379379
"projectId": "project",
380380
"apiEndpoint": "api.google.com",
381381
"modelId": "model",
@@ -520,7 +520,7 @@ def test_basic_config():
520520
},
521521
),
522522
(
523-
Configure.Vectorizer.multi2vec_palm(
523+
Configure.Vectorizer.multi2vec_palm( # not changed to _google to ensure BC
524524
image_fields=["image"],
525525
text_fields=["text"],
526526
video_fields=["video"],
@@ -529,7 +529,7 @@ def test_basic_config():
529529
location="us-central1",
530530
),
531531
{
532-
"multi2vec-palm": {
532+
"multi2vec-google": {
533533
"imageFields": ["image"],
534534
"textFields": ["text"],
535535
"videoFields": ["video"],
@@ -549,7 +549,7 @@ def test_basic_config():
549549
location="us-central1",
550550
),
551551
{
552-
"multi2vec-palm": {
552+
"multi2vec-google": {
553553
"imageFields": ["image"],
554554
"textFields": ["text"],
555555
"videoFields": ["video"],
@@ -1637,7 +1637,7 @@ def test_vector_config_flat_pq() -> None:
16371637
{
16381638
"test": {
16391639
"vectorizer": {
1640-
"text2vec-palm": {
1640+
"text2vec-google": {
16411641
"projectId": "project",
16421642
"properties": ["prop"],
16431643
"vectorizeClassName": True,
@@ -1658,7 +1658,7 @@ def test_vector_config_flat_pq() -> None:
16581658
{
16591659
"test": {
16601660
"vectorizer": {
1661-
"text2vec-palm": {
1661+
"text2vec-google": {
16621662
"projectId": "project",
16631663
"properties": ["prop"],
16641664
"vectorizeClassName": True,
@@ -1678,7 +1678,7 @@ def test_vector_config_flat_pq() -> None:
16781678
{
16791679
"test": {
16801680
"vectorizer": {
1681-
"text2vec-palm": {
1681+
"text2vec-google": {
16821682
"apiEndpoint": "generativelanguage.googleapis.com",
16831683
"properties": ["prop"],
16841684
"vectorizeClassName": True,
@@ -1815,7 +1815,7 @@ def test_vector_config_flat_pq() -> None:
18151815
{
18161816
"test": {
18171817
"vectorizer": {
1818-
"multi2vec-palm": {
1818+
"multi2vec-google": {
18191819
"imageFields": ["image"],
18201820
"textFields": ["text"],
18211821
"projectId": "project",
@@ -1839,7 +1839,7 @@ def test_vector_config_flat_pq() -> None:
18391839
{
18401840
"test": {
18411841
"vectorizer": {
1842-
"multi2vec-palm": {
1842+
"multi2vec-google": {
18431843
"imageFields": ["image"],
18441844
"textFields": ["text"],
18451845
"projectId": "project",
@@ -2165,7 +2165,7 @@ def test_config_with_named_vectors(
21652165
{
21662166
"test": {
21672167
"vectorizer": {
2168-
"text2vec-palm": {
2168+
"text2vec-google": {
21692169
"projectId": "project",
21702170
"properties": ["prop"],
21712171
"vectorizeClassName": True,
@@ -2187,7 +2187,7 @@ def test_config_with_named_vectors(
21872187
{
21882188
"test": {
21892189
"vectorizer": {
2190-
"text2vec-palm": {
2190+
"text2vec-google": {
21912191
"apiEndpoint": "generativelanguage.googleapis.com",
21922192
"properties": ["prop"],
21932193
"vectorizeClassName": True,
@@ -2322,7 +2322,7 @@ def test_config_with_named_vectors(
23222322
{
23232323
"test": {
23242324
"vectorizer": {
2325-
"multi2vec-palm": {
2325+
"multi2vec-google": {
23262326
"imageFields": ["image"],
23272327
"textFields": ["text"],
23282328
"projectId": "project",

‎weaviate/collections/classes/config_vectorizers.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@ class Vectorizers(str, Enum):
9191
TEXT2VEC_GPT4ALL: Weaviate module backed by GPT-4-All text-based embedding models.
9292
TEXT2VEC_HUGGINGFACE: Weaviate module backed by HuggingFace text-based embedding models.
9393
TEXT2VEC_OPENAI: Weaviate module backed by OpenAI and Azure-OpenAI text-based embedding models.
94-
TEXT2VEC_PALM: Weaviate module backed by PaLM text-based embedding models.
94+
TEXT2VEC_GOOGLE: Weaviate module backed by a Google (and formerly PaLM) text-based embedding models.
9595
TEXT2VEC_TRANSFORMERS: Weaviate module backed by Transformers text-based embedding models.
9696
TEXT2VEC_JINAAI: Weaviate module backed by Jina AI text-based embedding models.
9797
TEXT2VEC_VOYAGEAI: Weaviate module backed by Voyage AI text-based embedding models.
9898
TEXT2VEC_NVIDIA: Weaviate module backed by NVIDIA text-based embedding models.
9999
TEXT2VEC_WEAVIATE: Weaviate module backed by Weaviate's self-hosted text-based embedding models.
100100
IMG2VEC_NEURAL: Weaviate module backed by a ResNet-50 neural network for images.
101101
MULTI2VEC_CLIP: Weaviate module backed by a Sentence-BERT CLIP model for images and text.
102-
MULTI2VEC_PALM: Weaviate module backed by a palm model for images and text.
102+
MULTI2VEC_GOOGLE: Weaviate module backed by a Google (and formerly PaLM) model for images and text.
103103
MULTI2VEC_BIND: Weaviate module backed by the ImageBind model for images, text, audio, depth, IMU, thermal, and video.
104104
MULTI2VEC_VOYAGEAI: Weaviate module backed by a Voyage AI multimodal embedding models.
105105
MULTI2VEC_NVIDIA: Weaviate module backed by NVIDIA multimodal embedding models.
@@ -118,7 +118,7 @@ class Vectorizers(str, Enum):
118118
TEXT2VEC_NVIDIA = "text2vec-nvidia"
119119
TEXT2VEC_OLLAMA = "text2vec-ollama"
120120
TEXT2VEC_OPENAI = "text2vec-openai"
121-
TEXT2VEC_PALM = "text2vec-palm" # change to google once 1.27 is the lowest supported version
121+
TEXT2VEC_GOOGLE = "text2vec-google"
122122
TEXT2VEC_TRANSFORMERS = "text2vec-transformers"
123123
TEXT2VEC_JINAAI = "text2vec-jinaai"
124124
TEXT2VEC_VOYAGEAI = "text2vec-voyageai"
@@ -129,7 +129,7 @@ class Vectorizers(str, Enum):
129129
MULTI2VEC_JINAAI = "multi2vec-jinaai"
130130
MULTI2MULTI_JINAAI = "multi2multivec-jinaai"
131131
MULTI2VEC_BIND = "multi2vec-bind"
132-
MULTI2VEC_PALM = "multi2vec-palm" # change to google once 1.27 is the lowest supported version
132+
MULTI2VEC_GOOGLE = "multi2vec-google"
133133
MULTI2VEC_VOYAGEAI = "multi2vec-voyageai"
134134
MULTI2VEC_NVIDIA = "multi2vec-nvidia"
135135
REF2VEC_CENTROID = "ref2vec-centroid"
@@ -316,7 +316,7 @@ def _to_dict(self) -> Dict[str, Any]:
316316

317317
class _Text2VecGoogleConfig(_VectorizerConfigCreate):
318318
vectorizer: Union[Vectorizers, _EnumLikeStr] = Field(
319-
default=Vectorizers.TEXT2VEC_PALM, frozen=True, exclude=True
319+
default=Vectorizers.TEXT2VEC_GOOGLE, frozen=True, exclude=True
320320
)
321321
projectId: Optional[str]
322322
apiEndpoint: Optional[str]
@@ -480,7 +480,7 @@ class _Multi2VecClipConfig(_Multi2VecBase):
480480

481481
class _Multi2VecGoogleConfig(_Multi2VecBase, _VectorizerConfigCreate):
482482
vectorizer: Union[Vectorizers, _EnumLikeStr] = Field(
483-
default=Vectorizers.MULTI2VEC_PALM, frozen=True, exclude=True
483+
default=Vectorizers.MULTI2VEC_GOOGLE, frozen=True, exclude=True
484484
)
485485
videoFields: Optional[List[Multi2VecField]]
486486
projectId: str

0 commit comments

Comments
 (0)