Skip to content

Commit e1dbdcb

Browse files
antas-marcinantas-marcin
authored
Merge pull request #275 from weaviate/add-support-for-multi2vec-jinaai-module
Add support for multi2vec-jinaai module
2 parents de54a41 + d1c8071 commit e1dbdcb

File tree

5 files changed

+27
-2
lines changed

5 files changed

+27
-2
lines changed

‎.cicd/test.sh

+5
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ function check_creates_template() {
150150
check_modules "--set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=apiKey" "value: text2vec-jinaai"
151151
check_modules "--set modules.reranker-jinaai.enabled=true" "value: reranker-jinaai"
152152
check_modules "--set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=apiKey" "value: reranker-jinaai"
153+
check_modules "--set modules.multi2vec-jinaai.enabled=true" "value: multi2vec-jinaai"
154+
check_modules "--set modules.multi2vec-jinaai.enabled=true --set modules.multi2vec-jinaai.apiKey=apiKey" "value: multi2vec-jinaai"
153155
check_modules "--set modules.text2vec-aws.enabled=true" "value: text2vec-aws"
154156
check_modules "--set modules.generative-aws.enabled=true" "value: generative-aws"
155157
check_modules "--set modules.text2vec-aws.enabled=true --set modules.generative-aws.enabled=true" "value: generative-aws,text2vec-aws"
@@ -185,6 +187,7 @@ function check_creates_template() {
185187
check_string_existence "--set modules.qna-openai.enabled=true --set modules.qna-openai.azureApiKey=azureApiKey" "name: AZURE_APIKEY"
186188
check_string_existence "--set modules.generative-openai.enabled=true --set modules.generative-openai.azureApiKey=azureApiKey" "name: AZURE_APIKEY"
187189
check_string_existence "--set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=jinaaiApiKey" "name: JINAAI_APIKEY"
190+
check_string_existence "--set modules.multi2vec-jinaai.enabled=true --set modules.multi2vec-jinaai.apiKey=jinaaiApiKey" "name: JINAAI_APIKEY"
188191
check_string_existence "--set grpcService.enabled=true" "containerPort: 50051"
189192
check_string_existence "--set grpcService.enabled=true --set grpcService.name=weaviate-grpc-service-custom-name" "name: weaviate-grpc-service-custom-name"
190193
check_string_existence "--set grpcService.name=weaviate-grpc-defult-service-custom-name" "name: weaviate-grpc-defult-service-custom-name"
@@ -219,6 +222,8 @@ function check_creates_template() {
219222
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
220223
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
221224
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=JinaAIApiKey --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
225+
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.multi2vec-jinaai.enabled=true --set modules.multi2vec-jinaai.apiKey=JinaAIApiKey --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
226+
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.multi2vec-jinaai.enabled=true --set modules.multi2vec-jinaai.apiKey=JinaAIApiKey --set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=JinaAIApiKey --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
222227
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.generative-friendliai.enabled=true --set modules.generative-friendliai.token=FriendliToken" "name: FRIENDLI_TOKEN"
223228
check_string_existence "--set modules.text2vec-databricks.enabled=true --set modules.text2vec-databricks.token=databricksToken" "name: DATABRICKS_TOKEN"
224229
check_string_existence "--set modules.generative-databricks.enabled=true --set modules.generative-databricks.token=databricksToken" "name: DATABRICKS_TOKEN"

‎weaviate/templates/_helpers.tpl

+3
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@
8383
{{- if (index .Values "modules" "multi2vec-cohere" "enabled") -}}
8484
{{ $modules = append $modules "multi2vec-cohere" }}
8585
{{- end -}}
86+
{{- if (index .Values "modules" "multi2vec-jinaai" "enabled") -}}
87+
{{ $modules = append $modules "multi2vec-jinaai" }}
88+
{{- end -}}
8689
{{- if (index .Values "modules" "text2vec-openai" "enabled") -}}
8790
{{ $modules = append $modules "text2vec-openai" }}
8891
{{- end -}}

‎weaviate/templates/apiKeyJinaAISecret.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{{- $t2vJinaAI := and (index .Values "modules" "text2vec-jinaai" "enabled") (index .Values "modules" "text2vec-jinaai" "apiKey") }}
22
{{- $rerankerJinaAI := and (index .Values "modules" "reranker-jinaai" "enabled") (index .Values "modules" "reranker-jinaai" "apiKey") }}
3-
{{- $jinaai := or ($t2vJinaAI) ($rerankerJinaAI) }}
3+
{{- $multi2vecJinaAI := and (index .Values "modules" "multi2vec-jinaai" "enabled") (index .Values "modules" "multi2vec-jinaai" "apiKey") }}
4+
{{- $jinaai := or ($t2vJinaAI) ($rerankerJinaAI) ($multi2vecJinaAI) }}
45
{{- if $jinaai }}
56

67
{{- $apiKeys := list }}
@@ -10,6 +11,9 @@
1011
{{- if $rerankerJinaAI }}
1112
{{- $apiKeys = append $apiKeys (index .Values "modules" "reranker-jinaai" "apiKey") -}}
1213
{{- end }}
14+
{{- if $multi2vecJinaAI }}
15+
{{- $apiKeys = append $apiKeys (index .Values "modules" "multi2vec-jinaai" "apiKey") -}}
16+
{{- end }}
1317

1418
{{- if gt (len ($apiKeys | uniq)) 1 -}}
1519
{{- fail "JinaAI modules activated, but their keys differ. Use the same key on all activated JinaAI modules." }}

‎weaviate/templates/weaviateStatefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ spec:
239239
name: weaviate-google
240240
key: apiKey
241241
{{- end }}
242-
{{- if or (and (index .Values "modules" "text2vec-jinaai" "enabled") (index .Values "modules" "text2vec-jinaai" "apiKey")) (and (index .Values "modules" "reranker-jinaai" "enabled") (index .Values "modules" "reranker-jinaai" "apiKey")) }}
242+
{{- if or (and (index .Values "modules" "text2vec-jinaai" "enabled") (index .Values "modules" "text2vec-jinaai" "apiKey")) (and (index .Values "modules" "reranker-jinaai" "enabled") (index .Values "modules" "reranker-jinaai" "apiKey")) (and (index .Values "modules" "multi2vec-jinaai" "enabled") (index .Values "modules" "multi2vec-jinaai" "apiKey")) }}
243243
- name: JINAAI_APIKEY
244244
valueFrom:
245245
secretKeyRef:

‎weaviate/values.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -1237,6 +1237,19 @@ modules:
12371237
# an environment variable
12381238
apiKey: ''
12391239

1240+
# The multi2vec-jinaai module uses JinaAI Embeddings API
1241+
# to dynamically compute vector embeddings.
1242+
# More information about JinaAI Embeddings API can be found here:
1243+
# https://jina.ai/embeddings
1244+
multi2vec-jinaai:
1245+
1246+
# enable if you want to use JinaAI module
1247+
enabled: false
1248+
1249+
# Set your JinaAI API Key to be passed to Weaviate pod as
1250+
# an environment variable
1251+
apiKey: ''
1252+
12401253
# The qna-transformers module uses neural networks, such as BERT,
12411254
# DistilBERT, to find an answer in text to a given question
12421255
qna-transformers:

0 commit comments

Comments
 (0)