Skip to content

Commit d64a55c

Browse files
authored
Merge pull request #254 from weaviate/add-generative-friendliai-module
Add support for generative-friendliai module
2 parents 858ae40 + 497720b commit d64a55c

File tree

5 files changed

+37
-0
lines changed

5 files changed

+37
-0
lines changed

.cicd/test.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ function check_creates_template() {
165165
check_modules "--set offload.s3.enabled=true" "value: offload-s3"
166166
check_modules "--set modules.generative-anthropic.enabled=true" "value: generative-anthropic"
167167
check_modules "--set modules.generative-anthropic.enabled=true --set modules.generative-anthropic.apiKey=apiKey" "value: generative-anthropic"
168+
check_modules "--set modules.generative-friendliai.enabled=true" "value: generative-friendliai"
169+
check_modules "--set modules.generative-friendliai.enabled=true --set modules.generative-friendliai.token=token" "value: generative-friendliai"
168170

169171
check_modules "--set modules.text2vec-openai.enabled=true --set modules.text2vec-openai.azureApiKey=azureApiKey" "value: text2vec-openai"
170172
check_modules "--set modules.qna-openai.enabled=true --set modules.qna-openai.azureApiKey=azureApiKey" "value: qna-openai"
@@ -208,6 +210,7 @@ function check_creates_template() {
208210
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.text2vec-jinaai.enabled=true --set modules.text2vec-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
209211
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.reranker-jinaai.enabled=true --set modules.reranker-jinaai.apiKey=JinaAIApiKey" "name: JINAAI_APIKEY"
210212
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"
213+
check_string_existence "--set modules.text2vec-openai.enabled=true --set modules.generative-friendliai.enabled=true --set modules.generative-friendliai.token=FriendliToken" "name: FRIENDLI_TOKEN"
211214

212215
check_setting_has_value "--set replicas=3 --set env.RAFT_BOOTSTRAP_EXPECT=3" "name: RAFT_JOIN" "value: \"weaviate-0,weaviate-1,weaviate-2\""
213216
check_setting_has_value "--set replicas=3 --set env.RAFT_BOOTSTRAP_EXPECT=3" "name: RAFT_BOOTSTRAP_EXPECT" "value: \"3\""

weaviate/templates/_helpers.tpl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
{{- if (index .Values "modules" "generative-anthropic" "enabled") -}}
4848
{{ $modules = append $modules "generative-anthropic" }}
4949
{{- end -}}
50+
{{- if (index .Values "modules" "generative-friendliai" "enabled") -}}
51+
{{ $modules = append $modules "generative-friendliai" }}
52+
{{- end -}}
5053
{{- if or (index .Values "modules" "img2vec-neural" "enabled") (index .Values "modules" "img2vec-neural" "inferenceUrl") -}}
5154
{{ $modules = append $modules "img2vec-neural" }}
5255
{{- end -}}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{{ if and (index .Values "modules" "generative-friendliai" "enabled") (index .Values "modules" "generative-friendliai" "token") }}
2+
apiVersion: v1
3+
kind: Secret
4+
metadata:
5+
name: weaviate-friendliai
6+
labels:
7+
app.kubernetes.io/name: weaviate
8+
app.kubernetes.io/managed-by: helm
9+
type: Opaque
10+
data:
11+
token: {{ index .Values "modules" "generative-friendliai" "token" | b64enc }}
12+
{{ end }}

weaviate/templates/weaviateStatefulset.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,13 @@ spec:
274274
name: weaviate-octoai
275275
key: apiKey
276276
{{- end }}
277+
{{- if and (index .Values "modules" "generative-friendliai" "enabled") (index .Values "modules" "generative-friendliai" "token") }}
278+
- name: FRIENDLI_TOKEN
279+
valueFrom:
280+
secretKeyRef:
281+
name: weaviate-friendliai
282+
key: token
283+
{{- end }}
277284
{{- if and (index .Values "offload" "s3" "enabled") (index .Values "offload" "s3" "envconfig") }}
278285
{{- range $key, $value := index .Values "offload" "s3" "envconfig" }}
279286
- name: {{ $key }}

weaviate/values.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,6 +1374,18 @@ modules:
13741374
# an environment variable
13751375
apiKey: ''
13761376

1377+
# The generative-friendliai module uses FriendliAI API.
1378+
# More information about FriendliAI API can be found here:
1379+
# https://docs.friendli.ai/openapi/create-chat-completions
1380+
generative-friendliai:
1381+
1382+
# enable if you want to use FriendliAI module
1383+
enabled: false
1384+
1385+
# Set your FriendliAI Token to be passed to Weaviate pod as
1386+
# an environment variable
1387+
token: ''
1388+
13771389
# The img2vec-neural module uses neural networks, to generate
13781390
# a vector representation of the image
13791391
img2vec-neural:

0 commit comments

Comments
 (0)