Skip to content

Commit 2a8bec5

Browse files
authored
Merge branch 'develop' into feature/populate-imagepullsecret-from-container-registry
2 parents b8ed918 + a730d20 commit 2a8bec5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1374
-2487
lines changed

.test_durations

Lines changed: 0 additions & 1501 deletions
This file was deleted.

.typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ arange = "arange"
3636
cachable = "cachable"
3737
OT = "OT"
3838
cll = "cll"
39+
ser = "ser"
3940

4041
[default]
4142
locale = "en-us"

docs/mkdocs.yml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,41 @@ plugins:
2121
python:
2222
setup_commands:
2323
- import docs.sys_modules_mock
24-
rendering:
24+
options:
25+
# Include all public members, not just those in __all__
26+
members: true
27+
inherited_members: false
28+
# Show all submodules automatically
29+
show_submodules: true
30+
# Include functions, classes, modules, attributes
31+
docstring_style: google
32+
# Selection options
33+
filters:
34+
- "!^_" # Exclude private members (starting with _)
35+
- "^__init__$" # But include __init__ methods
36+
- "^__new__$" # And __new__ methods
37+
# Rendering options
2538
show_source: true
39+
show_root_heading: true
40+
show_root_toc_entry: true
41+
show_object_full_path: false
42+
show_category_heading: true
43+
# Group members by category
44+
group_by_category: true
45+
# Show type annotations
46+
show_signature_annotations: true
47+
# Show return type annotations
48+
show_return_annotations: true
49+
# Show the bases of classes
50+
show_bases: true
51+
# Merge init method documentation into class docstring
52+
merge_init_into_class: true
2653

2754
# This setting ensures links don't use directory URLs
2855
use_directory_urls: false
2956

3057
copyright: >
31-
Copyright © 2022 ZenML GmbH –
58+
Copyright © 2025 ZenML GmbH –
3259
<a href="#__consent">Change cookie settings</a>
3360
3461
extra:

docs/mkdocstrings_helper.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ def create_entity_docs(
9999
module_md = (
100100
f"# {item_name}\n\n"
101101
f"::: {zenml_import_path}.{item.stem}\n"
102-
f" handler: python\n"
103-
f" rendering:\n"
102+
f" options:\n"
104103
f" show_root_heading: true\n"
105104
f" show_source: true\n"
105+
f" members: true\n"
106106
)
107107

108108
if md_prefix:
@@ -123,8 +123,7 @@ def create_entity_docs(
123123
f"# [{item_name}]"
124124
f"({index_link})\n\n"
125125
f"::: {zenml_import_path}.{item.stem}\n"
126-
f" handler: python\n"
127-
f" selection:\n"
126+
f" options:\n"
128127
f" members: false\n"
129128
)
130129
index_file_contents.append(index_entry)
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{{- if and .Values.zenml.database.persistence.enabled (not .Values.zenml.database.url) }}
2+
{{- $pvc_name := printf "%s-config" (include "zenml.fullname" .) -}}
3+
{{- $pvc := (lookup "v1" "PersistentVolumeClaim" .Release.Namespace $pvc_name) }}
4+
{{- if not $pvc }}
5+
apiVersion: v1
6+
kind: PersistentVolumeClaim
7+
metadata:
8+
name: {{ $pvc_name }}
9+
labels:
10+
{{- include "zenml.labels" . | nindent 4 }}
11+
annotations:
12+
"helm.sh/hook": "pre-install,pre-upgrade"
13+
"helm.sh/hook-weight": "-1"
14+
"helm.sh/hook-delete-policy": before-hook-creation
15+
spec:
16+
{{- with .Values.zenml.database.persistence.storageClassName }}
17+
storageClassName: {{.}}
18+
{{- end }}
19+
accessModes:
20+
- ReadWriteOnce
21+
resources:
22+
requests:
23+
storage: {{.Values.zenml.database.persistence.size}}
24+
{{- end }}
25+
{{- end }}

helm/templates/server-db-job.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ spec:
5959
{{- toYaml .Values.podSecurityContext | nindent 8 }}
6060
volumes:
6161
- name: zenml-config
62+
{{- if and .Values.zenml.database.persistence.enabled (not .Values.zenml.database.url) }}
63+
persistentVolumeClaim:
64+
claimName: {{ include "zenml.fullname" . }}-config
65+
{{- else }}
6266
emptyDir: {}
67+
{{- end }}
6368
{{- if eq .Values.zenml.database.backupStrategy "dump-file" }}
6469
# define a volume that will hold a backup of the database
6570
- name: db-backup
@@ -227,4 +232,4 @@ spec:
227232
nodeSelector:
228233
{{- toYaml . | nindent 8 }}
229234
{{- end }}
230-
{{- end }}
235+
{{- end }}

helm/templates/server-db-pvc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ spec:
2222
storageClassName: {{ . }}
2323
{{- end }}
2424
{{- end }}
25-
{{- end }}
25+
{{- end }}

helm/templates/server-deployment.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@ spec:
5959
{{- toYaml .Values.podSecurityContext | nindent 8 }}
6060
volumes:
6161
- name: zenml-config
62+
{{- if and .Values.zenml.database.persistence.enabled (not .Values.zenml.database.url) }}
63+
persistentVolumeClaim:
64+
claimName: {{ include "zenml.fullname" . }}-config
65+
{{- else }}
6266
emptyDir: {}
67+
{{- end }}
6368
{{- if or .Values.zenml.certificates.customCAs .Values.zenml.certificates.secretRefs }}
6469
- name: custom-certs
6570
projected:

helm/values.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,19 @@ zenml:
306306
enableImplicitAuthMethods: false
307307

308308
# MySQL database configuration. If not set, a local sqlite database will be
309-
# used, which will not be persisted across pod restarts.
309+
# used. To ensure data are not lost, check the persistence part.
310310
# NOTE: the certificate files need to be copied in the helm chart folder and
311311
# the paths configured here need to be relative to the root of the helm chart.
312312
database:
313313

314+
# If set to true, path where the local database is created will be
315+
# mounted as a persistent volume so the data is not lost on pod restarts.
316+
# Only relevant for local sqlite database.
317+
persistence:
318+
enabled: false
319+
size: 1Gi
320+
storageClassName: ""
321+
314322
# The database URL. If not set, a local sqlite database will be used, which
315323
# will not be persisted across pod restarts. The URL can contain the
316324
# password or it can be provided in a secret using the `passwordSecretRef`

scripts/install-zenml-dev.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ install_integrations() {
3636
# figure out the python version
3737
python_version=$(python -c "import sys; print('.'.join(map(str, sys.version_info[:2])))")
3838

39-
ignore_integrations="feast label_studio bentoml seldon pycaret skypilot_aws skypilot_gcp skypilot_azure skypilot_kubernetes skypilot_lambda pigeon prodigy argilla"
39+
ignore_integrations="feast label_studio bentoml seldon pycaret skypilot_aws skypilot_gcp skypilot_azure skypilot_kubernetes skypilot_lambda pigeon prodigy argilla vllm"
4040

4141
# Ignore tensorflow and deepchecks only on Python 3.12
4242
if [ "$python_version" = "3.12" ]; then

0 commit comments

Comments
 (0)