Skip to content

Commit e415929

Browse files
antas-marcinantas-marcin
authored
Merge pull request #282 from weaviate/add-support-for-text2colbert-jinaai-module
Add support for text2colbert-jinaai module
2 parents 32d546d + 4cbddc7 commit e415929

File tree

5 files changed

+26
-2
lines changed

5 files changed

+26
-2
lines changed

‎.cicd/test.sh

+3
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ function check_creates_template() {
191191
check_string_existence "--set modules.qna-openai.enabled=true --set modules.qna-openai.azureApiKey=azureApiKey" "name: AZURE_APIKEY"
192192
check_string_existence "--set modules.generative-openai.enabled=true --set modules.generative-openai.azureApiKey=azureApiKey" "name: AZURE_APIKEY"
193193
check_string_existence "--set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=jinaaiApiKey" "name: JINAAI_APIKEY"
194+
check_string_existence "--set modules.text2colbert-jinaai.enabled=true --set modules.text2colbert-jinaai.apiKey=jinaaiApiKey" "name: JINAAI_APIKEY"
194195
check_string_existence "--set modules.multi2vec-jinaai.enabled=true --set modules.multi2vec-jinaai.apiKey=jinaaiApiKey" "name: JINAAI_APIKEY"
195196
check_string_existence "--set grpcService.enabled=true" "containerPort: 50051"
196197
check_string_existence "--set grpcService.enabled=true --set grpcService.name=weaviate-grpc-service-custom-name" "name: weaviate-grpc-service-custom-name"
@@ -224,8 +225,10 @@ function check_creates_template() {
224225
check_string_existence "--set initContainers.ensureFileOwnershipContainer.enabled=true --set containerSecurityContext.runAsUser=1000 --set containerSecurityContext.fsGroup=2000" "name: ensure-file-ownership"
225226
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.generative-anthropic.enabled=true --set modules.generative-anthropic.apiKey=azureApiKey" "name: ANTHROPIC_APIKEY"
226227
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
228+
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.text2colbert-jinaai.enabled=true --set modules.text2colbert-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
227229
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
228230
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"
231+
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 --set modules.text2colbert-jinaai.enabled=true --set modules.text2colbert-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
229232
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"
230233
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"
231234
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.generative-friendliai.enabled=true --set modules.generative-friendliai.token=FriendliToken" "name: FRIENDLI_TOKEN"

‎weaviate/templates/_helpers.tpl

+3
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@
128128
{{- if (index .Values "modules" "ref2vec-centroid" "enabled") -}}
129129
{{ $modules = append $modules "ref2vec-centroid" }}
130130
{{- end -}}
131+
{{- if (index .Values "modules" "text2colbert-jinaai" "enabled") -}}
132+
{{ $modules = append $modules "text2colbert-jinaai" }}
133+
{{- end -}}
131134
{{- if (index .Values "modules" "reranker-cohere" "enabled") -}}
132135
{{ $modules = append $modules "reranker-cohere" }}
133136
{{- end -}}

‎weaviate/templates/apiKeyJinaAISecret.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
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") }}
33
{{- $multi2vecJinaAI := and (index .Values "modules" "multi2vec-jinaai" "enabled") (index .Values "modules" "multi2vec-jinaai" "apiKey") }}
4-
{{- $jinaai := or ($t2vJinaAI) ($rerankerJinaAI) ($multi2vecJinaAI) }}
4+
{{- $t2cJinaAI := and (index .Values "modules" "text2colbert-jinaai" "enabled") (index .Values "modules" "text2colbert-jinaai" "apiKey") }}
5+
{{- $jinaai := or ($t2vJinaAI) ($rerankerJinaAI) ($multi2vecJinaAI) ($t2cJinaAI) }}
56
{{- if $jinaai }}
67

78
{{- $apiKeys := list }}
@@ -14,6 +15,9 @@
1415
{{- if $multi2vecJinaAI }}
1516
{{- $apiKeys = append $apiKeys (index .Values "modules" "multi2vec-jinaai" "apiKey") -}}
1617
{{- end }}
18+
{{- if $t2cJinaAI }}
19+
{{- $apiKeys = append $apiKeys (index .Values "modules" "text2colbert-jinaai" "apiKey") -}}
20+
{{- end }}
1721

1822
{{- if gt (len ($apiKeys | uniq)) 1 -}}
1923
{{- 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")) (and (index .Values "modules" "multi2vec-jinaai" "enabled") (index .Values "modules" "multi2vec-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")) (and (index .Values "modules" "text2colbert-jinaai" "enabled") (index .Values "modules" "text2colbert-jinaai" "apiKey")) }}
243243
- name: JINAAI_APIKEY
244244
valueFrom:
245245
secretKeyRef:

‎weaviate/values.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,20 @@ modules:
982982
# an environment variable
983983
apiKey: ''
984984

985+
# The text2colbert-jinaai module uses JinaAI Embeddings API
986+
# to dynamically compute ColBERT embeddings based on the
987+
# sentence's context.
988+
# More information about JinaAI Embeddings API can be found here:
989+
# https://jina.ai/embeddings
990+
text2colbert-jinaai:
991+
992+
# enable if you want to use JinaAI module
993+
enabled: false
994+
995+
# Set your JinaAI API Key to be passed to Weaviate pod as
996+
# an environment variable
997+
apiKey: ''
998+
985999
# The ref2vec-centroid module
9861000
ref2vec-centroid:
9871001

0 commit comments

Comments
 (0)