Skip to content

Commit

Permalink
Fix boolean values quote issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@lakinduakash
lakinduakash committed Nov 5, 2024
1 parent 86fae3c commit 9818a04
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 49 deletions.
86 changes: 43 additions & 43 deletions helm/h2ogpt-chart/templates/_helpers.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,24 @@ Config for h2oGPT

{{- define "h2ogpt.config" -}}
{{- with .Values.h2ogpt }}
verbose: {{ default "True" .overrideConfig.verbose }}
verbose: {{ default "True" ( .overrideConfig.verbose | quote ) }}
{{- if .overrideConfig.heap_app_id }}
heap_app_id: {{ .overrideConfig.heap_app_id }}
{{- end }}
num_async: {{ default 10 .overrideConfig.num_async }}
save_dir: {{ default "/docker_logs" .overrideConfig.save_dir }}
score_model: {{ default "None" .overrideConfig.score_model }}
share: {{ default "False" .overrideConfig.share }}
enforce_h2ogpt_api_key: {{ default "False" .overrideConfig.enforce_h2ogpt_api_key }}
enforce_h2ogpt_ui_key: {{ default "False" .overrideConfig.enforce_h2ogpt_ui_key }}
share: {{ default "False" (.overrideConfig.share | quote ) }}
enforce_h2ogpt_api_key: {{ default "False" ( .overrideConfig.enforce_h2ogpt_api_key | quote ) }}
enforce_h2ogpt_ui_key: {{ default "False" ( .overrideConfig.enforce_h2ogpt_ui_key | quote ) }}
{{- if .overrideConfig.h2ogpt_api_keys }}
h2ogpt_api_keys: {{ .overrideConfig.h2ogpt_api_keys }}
{{- end }}
{{- if .overrideConfig.use_auth_token }}
use_auth_token: {{ .overrideConfig.use_auth_token }}
{{- end }}
visible_models: {{ default "['meta-llama/Meta-Llama-3.1-8B-Instruct']" .overrideConfig.visible_models }}
visible_vision_models: {{ default "['mistralai/Pixtral-12B-2409']" .overrideConfig.visible_vision_models }}
{{/*visible_vision_models: {{ default "['mistralai/Pixtral-12B-2409']" .overrideConfig.visible_vision_models }}*/}}
top_k_docs_max_show: {{ default 100 .overrideConfig.top_k_docs_max_show }}
{{- if .overrideConfig.admin_pass }}
admin_pass: {{ .overrideConfig.admin_pass }}
Expand All @@ -107,33 +107,33 @@ agent_server: "True"
agent_port: 5004
agent_workers: {{ .agents.agent_workers }}
{{- end }}
function_server: {{ default "True" .overrideConfig.function_server }}
function_server: {{ default "True" ( .overrideConfig.function_server | quote ) }}
function_port: 5002
function_server_workers: {{ default 1 .overrideConfig.function_server_workers }}
multiple_workers_gunicorn: {{ default "True" .overrideConfig.multiple_workers_gunicorn }}
multiple_workers_gunicorn: {{ default "True" ( .overrideConfig.multiple_workers_gunicorn | quote ) }}
llava_model: {{ default "openai:mistralai/Pixtral-12B-2409" .overrideConfig.llava_model }}
enable_llava: {{ default "True" .overrideConfig.enable_llava }}
enable_llava: {{ default "True" ( .overrideConfig.enable_llava | quote ) }}
{{- if ge (int (index .resources.requests "nvidia.com/gpu") ) (int 1) }}
enable_tts: {{ default "False" .overrideConfig.enable_tts }}
enable_stt: {{ default "True" .overrideConfig.enable_stt }}
enable_transcriptions: {{ default "True" .overrideConfig.enable_transcriptions }}
enable_tts: {{ default "False" ( .overrideConfig.enable_tts | quote ) }}
enable_stt: {{ default "True" ( .overrideConfig.enable_stt | quote ) }}
enable_transcriptions: {{ default "True" ( .overrideConfig.enable_transcriptions | quote ) }}
asr_model: {{ default "distil-whisper/distil-large-v3" .overrideConfig.asr_model }}
pre_load_embedding_model: {{ default "True" .overrideConfig.pre_load_embedding_model }}
pre_load_image_audio_models: {{ default "True" .overrideConfig.pre_load_image_audio_models }}
pre_load_embedding_model: {{ default "True" (.overrideConfig.pre_load_embedding_model | quote ) }}
pre_load_image_audio_models: {{ default "True" ( .overrideConfig.pre_load_image_audio_models | quote ) }}
cut_distance: {{ default 10000 .overrideConfig.cut_distance }}
hf_embedding_model: {{ default "BAAI/bge-large-en-v1.5" .overrideConfig.hf_embedding_model }}
enable_captions: {{ default "False" .overrideConfig.enable_captions }}
enable_doctr: {{ default "True" .overrideConfig.enable_doctr }}
enable_captions: {{ default "False" ( .overrideConfig.enable_captions | quote ) }}
enable_doctr: {{ default "True" ( .overrideConfig.enable_doctr | quote ) }}
{{- else }}
enable_tts: {{ default "False" .overrideConfig.enable_tts }}
enable_stt: {{ default "False" .overrideConfig.enable_stt }}
enable_transcriptions: {{ default "False" .overrideConfig.enable_transcriptions }}
enable_tts: {{ default "False" ( .overrideConfig.enable_tts | quote ) }}
enable_stt: {{ default "False" ( .overrideConfig.enable_stt | quote ) }}
enable_transcriptions: {{ default "False" ( .overrideConfig.enable_transcriptions | quote ) }}
embedding_gpu_id: {{ default "cpu" .overrideConfig.embedding_gpu_id }}
hf_embedding_model: {{ default "fake" .overrideConfig.hf_embedding_model }}
pre_load_embedding_model: {{ default "False" .overrideConfig.pre_load_embedding_model }}
pre_load_image_audio_models: {{ default "False" .overrideConfig.pre_load_image_audio_models }}
enable_captions: {{ default "False" .overrideConfig.enable_captions }}
enable_doctr: {{ default "False" .overrideConfig.enable_doctr }}
pre_load_embedding_model: {{ default "False" ( .overrideConfig.pre_load_embedding_model | quote ) }}
pre_load_image_audio_models: {{ default "False" ( .overrideConfig.pre_load_image_audio_models | quote ) }}
enable_captions: {{ default "False" ( .overrideConfig.enable_captions | quote ) }}
enable_doctr: {{ default "False" ( .overrideConfig.enable_doctr | quote ) }}
{{- end }}
{{- end }}
{{- end }}
Expand All @@ -144,55 +144,55 @@ Config for agents

{{- define "agents.config" -}}
{{- with .Values.agents }}
verbose: {{ default "True" .overrideConfig.verbose }}
verbose: {{ default "True" ( .overrideConfig.verbose | quote ) }}
{{- if .overrideConfig.heap_app_id }}
heap_app_id: {{ .overrideConfig.heap_app_id }}
{{- end }}
num_async: {{ default 10 .overrideConfig.num_async }}
save_dir: {{ default "/docker_logs" .overrideConfig.save_dir }}
score_model: {{ default "None" .overrideConfig.score_model }}
share: {{ default "False" .overrideConfig.share }}
enforce_h2ogpt_api_key: {{ default "False" .overrideConfig.enforce_h2ogpt_api_key }}
enforce_h2ogpt_ui_key: {{ default "False" .overrideConfig.enforce_h2ogpt_ui_key }}
share: {{ default "False" (.overrideConfig.share | quote ) }}
enforce_h2ogpt_api_key: {{ default "False" ( .overrideConfig.enforce_h2ogpt_api_key | quote ) }}
enforce_h2ogpt_ui_key: {{ default "False" ( .overrideConfig.enforce_h2ogpt_ui_key | quote ) }}
{{- if .overrideConfig.h2ogpt_api_keys }}
h2ogpt_api_keys: {{ .overrideConfig.h2ogpt_api_keys }}
{{- end }}
{{- if .overrideConfig.use_auth_token }}
use_auth_token: {{ .overrideConfig.use_auth_token }}
{{- end }}
visible_models: {{ default "['meta-llama/Meta-Llama-3.1-8B-Instruct']" .overrideConfig.visible_models }}
visible_vision_models: {{ default "['mistralai/Pixtral-12B-2409']" .overrideConfig.visible_vision_models }}
{{/*visible_vision_models: {{ default "['mistralai/Pixtral-12B-2409']" .overrideConfig.visible_vision_models }}*/}}
top_k_docs_max_show: {{ default 100 .overrideConfig.top_k_docs_max_show }}
{{- if .overrideConfig.admin_pass }}
admin_pass: {{ .overrideConfig.admin_pass }}
{{- end }}
agent_server: "True"
agent_port: 5004
agent_workers: {{ default 5 .agent_workers }}
multiple_workers_gunicorn: {{ default "True" .overrideConfig.multiple_workers_gunicorn }}
multiple_workers_gunicorn: {{ default "True" ( .overrideConfig.multiple_workers_gunicorn | quote ) }}
llava_model: {{ default "openai:mistralai/Pixtral-12B-2409" .overrideConfig.llava_model }}
enable_llava: {{ default "True" .overrideConfig.enable_llava }}
enable_llava: {{ default "True" ( .overrideConfig.enable_llava | quote ) }}
{{- if ge (int (index .resources.requests "nvidia.com/gpu") ) (int 1) }}
enable_tts: {{ default "False" .overrideConfig.enable_tts }}
enable_stt: {{ default "True" .overrideConfig.enable_stt }}
enable_transcriptions: {{ default "True" .overrideConfig.enable_transcriptions }}
enable_tts: {{ default "False" ( .overrideConfig.enable_tts | quote ) }}
enable_stt: {{ default "True" ( .overrideConfig.enable_stt | quote ) }}
enable_transcriptions: {{ default "True" ( .overrideConfig.enable_transcriptions | quote ) }}
asr_model: {{ default "distil-whisper/distil-large-v3" .overrideConfig.asr_model }}
pre_load_embedding_model: {{ default "True" .overrideConfig.pre_load_embedding_model }}
pre_load_image_audio_models: {{ default "True" .overrideConfig.pre_load_image_audio_models }}
pre_load_embedding_model: {{ default "True" (.overrideConfig.pre_load_embedding_model | quote ) }}
pre_load_image_audio_models: {{ default "True" ( .overrideConfig.pre_load_image_audio_models | quote ) }}
cut_distance: {{ default 10000 .overrideConfig.cut_distance }}
hf_embedding_model: {{ default "BAAI/bge-large-en-v1.5" .overrideConfig.hf_embedding_model }}
enable_captions: {{ default "False" .overrideConfig.enable_captions }}
enable_doctr: {{ default "True" .overrideConfig.enable_doctr }}
enable_captions: {{ default "False" ( .overrideConfig.enable_captions | quote ) }}
enable_doctr: {{ default "True" ( .overrideConfig.enable_doctr | quote ) }}
{{- else }}
enable_tts: {{ default "False" .overrideConfig.enable_tts }}
enable_stt: {{ default "False" .overrideConfig.enable_stt }}
enable_transcriptions: {{ default "False" .overrideConfig.enable_transcriptions }}
enable_tts: {{ default "False" ( .overrideConfig.enable_tts | quote ) }}
enable_stt: {{ default "False" ( .overrideConfig.enable_stt | quote ) }}
enable_transcriptions: {{ default "False" ( .overrideConfig.enable_transcriptions | quote ) }}
embedding_gpu_id: {{ default "cpu" .overrideConfig.embedding_gpu_id }}
hf_embedding_model: {{ default "fake" .overrideConfig.hf_embedding_model }}
pre_load_embedding_model: {{ default "False" .overrideConfig.pre_load_embedding_model }}
pre_load_image_audio_models: {{ default "False" .overrideConfig.pre_load_image_audio_models }}
enable_captions: {{ default "False" .overrideConfig.enable_captions }}
enable_doctr: {{ default "False" .overrideConfig.enable_doctr }}
pre_load_embedding_model: {{ default "False" ( .overrideConfig.pre_load_embedding_model | quote ) }}
pre_load_image_audio_models: {{ default "False" ( .overrideConfig.pre_load_image_audio_models | quote ) }}
enable_captions: {{ default "False" ( .overrideConfig.enable_captions | quote ) }}
enable_doctr: {{ default "False" ( .overrideConfig.enable_doctr | quote ) }}
{{- end }}
{{- end }}
{{- end }}
10 changes: 4 additions & 6 deletions helm/h2ogpt-chart/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ h2ogpt:
class:
useEphemeral: true

# -- Defaults configs are set internally with recommended values. Set values if you really need to change. Make sure to quote boolean values ex: "True","true","false","False".
# -- Defaults configs are set internally with recommended values. Set values if you really need to change.
# -- Supported configs are commented. If you don't pass any value, keep {}
overrideConfig: {}
# verbose:
Expand All @@ -69,7 +69,6 @@ h2ogpt:
# h2ogpt_api_keys:
# use_auth_token:
# visible_models:
# visible_vision_models:
# top_k_docs_max_show:
# admin_pass:
# function_server:
Expand Down Expand Up @@ -170,9 +169,9 @@ agents:
class:
useEphemeral: true

# -- Defaults configs are set internally with recommended values. Set values if you really need to change. Make sure to quote boolean values ex: "True","true","false","False".
# -- Defaults configs are set internally with recommended values. Set values if you really need to change.
# -- Supported configs are commented. If you don't pass any value, keep {}
overrideConfig: { }
overrideConfig: {}
# verbose:
# heap_app_id:
# num_async:
Expand All @@ -184,7 +183,6 @@ agents:
# h2ogpt_api_keys:
# use_auth_token:
# visible_models:
# visible_vision_models:
# top_k_docs_max_show:
# admin_pass:
# multiple_workers_gunicorn:
Expand All @@ -203,7 +201,7 @@ agents:
# embedding_gpu_id:

# -- You can pass additional config here if overrideConfig does not have it.
additionalConfig: { }
additionalConfig: {}

service:
type: NodePort
Expand Down

0 comments on commit 9818a04

Please sign in to comment.