update

charts/langsmith/README.md

@@ -90,6 +90,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | clickhouse.external.enabled | bool | `false` |  |
 | clickhouse.external.existingSecretName | string | `""` |  |
 | clickhouse.external.host | string | `""` |  |
+| clickhouse.external.hosting | string | `"self-hosted"` | Either "self-hosted" or "hybrid" |
 | clickhouse.external.nativePort | string | `"9000"` |  |
 | clickhouse.external.password | string | `"password"` |  |
 | clickhouse.external.port | string | `"8123"` |  |
@@ -192,12 +193,11 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | config.basicAuth.initialOrgAdminEmail | string | `""` |  |
 | config.basicAuth.initialOrgAdminPassword | string | `""` |  |
 | config.basicAuth.jwtSecret | string | `""` |  |
-| config.blobStorage | object | `{"accessKey":"","accessKeySecret":"","apiURL":"https://s3.us-west-2.amazonaws.com","azureStorageAccountKey":"","azureStorageAccountName":"","azureStorageConnectionString":"","azureStorageContainerName":"","azureStorageServiceUrlOverride":"","bucketName":"","chSearchEnabled":true,"enabled":false,"engine":"S3","hosting":"self-hosted","minBlobStorageSizeKb":"20"}` | Blob storage configuration Optional. Used to store inputs, outputs, and errors in Blob Storage. We currently support S3, GCS, Minio, and Azure as Blob Storage providers. |
+| config.blobStorage | object | `{"accessKey":"","accessKeySecret":"","apiURL":"https://s3.us-west-2.amazonaws.com","azureStorageAccountKey":"","azureStorageAccountName":"","azureStorageConnectionString":"","azureStorageContainerName":"","azureStorageServiceUrlOverride":"","bucketName":"","chSearchEnabled":true,"enabled":false,"engine":"S3","minBlobStorageSizeKb":"20"}` | Blob storage configuration Optional. Used to store inputs, outputs, and errors in Blob Storage. We currently support S3, GCS, Minio, and Azure as Blob Storage providers. |
 | config.blobStorage.azureStorageAccountName | string | `""` | Optional. Set this along with azureStorageAccountKey to use a storage account and access key. Higher precedence than azureStorageConnectionString. |
 | config.blobStorage.azureStorageConnectionString | string | `""` | Optional. Use this to specify the full connection string including any authentication params. |
 | config.blobStorage.azureStorageContainerName | string | `""` | Required if using Azure blob storage |
 | config.blobStorage.azureStorageServiceUrlOverride | string | `""` | Optional. Use this to customize the service URL, which by default is 'https://<storage_account_name>.blob.core.windows.net/' |
-| config.blobStorage.hosting | string | `"self-hosted"` | Either "self-hosted" or "hybrid" |
 | config.existingSecretName | string | `""` |  |
 | config.hostname | string | `""` | Base URL of the LangSmith installation. Used for redirects. |
 | config.langsmithLicenseKey | string | `""` |  |
@@ -349,6 +349,7 @@ For information on how to use this chart, up-to-date release notes, and other gu
 | clickhouse.external.enabled | bool | `false` |  |
 | clickhouse.external.existingSecretName | string | `""` |  |
 | clickhouse.external.host | string | `""` |  |
+| clickhouse.external.hosting | string | `"self-hosted"` | Either "self-hosted" or "hybrid" |
 | clickhouse.external.nativePort | string | `"9000"` |  |
 | clickhouse.external.password | string | `"password"` |  |
 | clickhouse.external.port | string | `"8123"` |  |

charts/langsmith/examples/blob_storage_config.yaml

@@ -5,8 +5,6 @@ config:
     enabled: true
     # Set engine: "Azure" if using Azure blob storage
     engine: "S3"
-    # Set hosting: "hybrid" if using managed ClickHouse
-    hosting: "self-hosted"
 
     # S3-specific
     bucketName: "langsmith-s3-assets"
@@ -21,6 +19,12 @@ config:
     azureStorageServiceUrlOverride: "https://your.service.override.net" # If constructing a service URL of a different format
     azureStorageContainerName: "your-container"
 
+clickhouse:
+  external:
+    enabled: true
+    # Set hosting: "hybrid" if using managed ClickHouse
+    hosting: "self-hosted"
+
 # If using IRSA (only for EKS), you can specify the service account annotations here.
 #backend:
 #  serviceAccount:

charts/langsmith/templates/_helpers.tpl

@@ -279,7 +279,7 @@ Template containing common environment variables that are used by several servic
 - name: BLOB_STORAGE_ENGINE
   value: {{ .Values.config.blobStorage.engine | quote }}
 - name: MIN_BLOB_STORAGE_SIZE_KB
-  value: {{ ternary 0 .Values.config.blobStorage.minBlobStorageSizeKb (eq .Values.config.blobStorage.hosting "hybrid") | quote }}
+  value: {{ ternary 0 .Values.config.blobStorage.minBlobStorageSizeKb (eq .Values.clickhouse.external.hosting "hybrid") | quote }}
 {{- if eq .Values.config.blobStorage.engine "S3" }}
 - name: S3_BUCKET_NAME
   value: {{ .Values.config.blobStorage.bucketName | quote }}
@@ -322,7 +322,7 @@ Template containing common environment variables that are used by several servic
 {{- end }}
 {{- end }}
 - name: FF_CH_SEARCH_ENABLED
-  value: {{ ternary "false" .Values.config.blobStorage.chSearchEnabled (eq .Values.config.blobStorage.hosting "hybrid") | quote }}
+  value: {{ ternary "false" .Values.config.blobStorage.chSearchEnabled (eq .Values.clickhouse.external.hosting "hybrid") | quote }}
 {{ include "langsmith.conditionalEnvVarsResolved" . }}
 {{- end }}
 

charts/langsmith/values.yaml

@@ -111,8 +111,6 @@ config:
   blobStorage:
     enabled: false
     engine: "S3"
-    # -- Either "self-hosted" or "hybrid"
-    hosting: "self-hosted"
     # If you are using langsmith-managed-clickhouse, you may not want inputs to be stored in clickhouse for search.
     # Set this as false to ensure that inputs/outputs/errors are not stored in clickhouse.
     # hosting: "hybrid" overrides this to false.
@@ -392,6 +390,8 @@ clickhouse:
     # If enabled, use the following values to connect to an external database. This will also disable the
     # creation of a clickhouse stateful-set and service.
     enabled: false
+    # -- Either "self-hosted" or "hybrid"
+    hosting: "self-hosted"
     host: ""
     port: "8123"
     nativePort: "9000"