Merge branch 'main' into justin-the-law

defenseunicorns · Jul 22, 2024 · 8edb8e5 · 8edb8e5
2 parents 3550eda + 56274f6
commit 8edb8e5
Show file tree

Hide file tree

Showing 74 changed files with 878 additions and 670 deletions.
diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "0.9.1"
+    ".": "0.9.2"
 }
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -45,7 +45,7 @@ jobs:
           docker buildx build --platform amd64,arm64 -t ghcr.io/defenseunicorns/leapfrogai/leapfrogai-sdk:${{ steps.get_version.outputs.version-without-v }} --push -f src/leapfrogai_sdk/Dockerfile .
 
       - name: Install Zarf
-        uses: defenseunicorns/setup-zarf@f95763914e20e493bb5d45d63e30e17138f981d6 # v1.0.0
+        uses: defenseunicorns/setup-zarf@10e539efed02f75ec39eb8823e22a5c795f492ae #v1.0.1
 
       - name: Build and Publish API
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.9.2](https://github.com/defenseunicorns/leapfrogai/compare/v0.9.1...v0.9.2) (2024-07-19)
+
+
+### Bug Fixes
+
+* address Docker warning about case mismatch between 'as' and 'from'. ([#780](https://github.com/defenseunicorns/leapfrogai/issues/780)) ([a72bc94](https://github.com/defenseunicorns/leapfrogai/commit/a72bc94d96a975ca40687cf76cd525d293076102))
+* disable forceRun for supabase jwt generation ([#806](https://github.com/defenseunicorns/leapfrogai/issues/806)) ([eb9b1e0](https://github.com/defenseunicorns/leapfrogai/commit/eb9b1e034eeb65b78f32263e92a1e99c421a01e2))
+
+
+### Miscellaneous
+
+* **supabase:** Increases supabase-storage file size and makes it configurable ([#775](https://github.com/defenseunicorns/leapfrogai/issues/775)) ([0c01f36](https://github.com/defenseunicorns/leapfrogai/commit/0c01f3628aa770dcd29b2254138f92e7dee537d9))
+
 ## [0.9.1](https://github.com/defenseunicorns/leapfrogai/compare/v0.9.0...v0.9.1) (2024-07-15)
 
 

diff --git a/packages/api/chart/Chart.yaml b/packages/api/chart/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 # x-release-please-start-version
-version: 0.9.1
+version: 0.9.2
 # x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be

diff --git a/packages/api/chart/values.yaml b/packages/api/chart/values.yaml
@@ -1,6 +1,6 @@
 image:
   # x-release-please-start-version
-  lfaiAPITag: 0.9.1
+  lfaiAPITag: 0.9.2
   # x-release-please-end
   kiwigridTag: 1.23.3
 

diff --git a/packages/api/zarf.yaml b/packages/api/zarf.yaml
@@ -28,7 +28,7 @@ components:
       namespace: leapfrogai
       localPath: chart
       # x-release-please-start-version
-      version: 0.9.1
+      version: 0.9.2
       # x-release-please-end
       valuesFiles:
         - "lfai-values.yaml"

diff --git a/packages/llama-cpp-python/chart/Chart.yaml b/packages/llama-cpp-python/chart/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 # x-release-please-start-version
-version: 0.9.1
+version: 0.9.2
 # x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be

diff --git a/packages/llama-cpp-python/chart/values.yaml b/packages/llama-cpp-python/chart/values.yaml
@@ -9,7 +9,7 @@ image:
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   # x-release-please-start-version
-  tag: 0.9.1
+  tag: 0.9.2
   # x-release-please-end
 
 nameOverride: llama-cpp-python

diff --git a/packages/llama-cpp-python/pyproject.toml b/packages/llama-cpp-python/pyproject.toml
@@ -3,7 +3,7 @@ name = "lfai-llama-cpp-python"
 description = "A LeapfrogAI API-compatible llama-cpp-python wrapper for quantized and un-quantized model inferencing on CPU infrastructures."
 
 # x-release-please-start-version
-version = "0.9.1"
+version = "0.9.2"
 # x-release-please-end
 
 dependencies = [

diff --git a/packages/llama-cpp-python/zarf.yaml b/packages/llama-cpp-python/zarf.yaml
@@ -20,7 +20,7 @@ components:
         localPath: chart
         releaseName: llama-cpp-python-model
         # x-release-please-start-version
-        version: 0.9.1
+        version: 0.9.2
         # x-release-please-end
         valuesFiles:
           - "llama-cpp-python-values.yaml"

diff --git a/packages/repeater/chart/Chart.yaml b/packages/repeater/chart/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 # x-release-please-start-version
-version: 0.9.1
+version: 0.9.2
 # x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be

diff --git a/packages/repeater/chart/values.yaml b/packages/repeater/chart/values.yaml
@@ -9,7 +9,7 @@ image:
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   # x-release-please-start-version
-  tag: 0.9.1
+  tag: 0.9.2
   # x-release-please-end
 
 nameOverride: repeater

diff --git a/packages/repeater/pyproject.toml b/packages/repeater/pyproject.toml
@@ -3,7 +3,7 @@ name = "lfai-repeater"
 description = "A LeapfrogAI API-compatible pseudo-model for testing the API."
 
 # x-release-please-start-version
-version = "0.9.1"
+version = "0.9.2"
 # x-release-please-end
 
 dependencies = [

diff --git a/packages/repeater/zarf-config.yaml b/packages/repeater/zarf-config.yaml
@@ -3,7 +3,7 @@ package:
     set:
       image_repository: "ghcr.io/defenseunicorns/leapfrogai/repeater"
       # x-release-please-start-version
-      image_version: 0.9.1
+      image_version: 0.9.2
       # x-release-please-end
       name: repeater
     max_package_size: "1000000000"

diff --git a/packages/repeater/zarf.yaml b/packages/repeater/zarf.yaml
@@ -18,7 +18,7 @@ components:
         localPath: chart
         releaseName: repeater
         # x-release-please-start-version
-        version: 0.9.1
+        version: 0.9.2
         # x-release-please-end
         valuesFiles:
           - "repeater-values.yaml"

diff --git a/packages/supabase/bitnami-values-bootstrap.yaml b/packages/supabase/bitnami-values-bootstrap.yaml
@@ -25,7 +25,7 @@ jwt:
   autoGenerate:
     ## @param jwt.autoGenerate.forceRun Force the run of the JWT generation job
     ##
-    forceRun: true
+    forceRun: false
     ## @param jwt.autoGenerate.annotations [object] Add annotations to the job
     ##
     annotations:
@@ -110,4 +110,4 @@ kong:
 ## @param postgresql.service.ports.postgresql PostgreSQL service port
 ##
 postgresql:
-  enabled: false
+  enabled: false
diff --git a/packages/supabase/bitnami-values.yaml b/packages/supabase/bitnami-values.yaml
@@ -87,6 +87,13 @@ storage:
   resourcesPreset: "none"
   podLabels:
     sidecar.istio.io/inject: "false"
+  extraEnvVars:
+    # FILE_SIZE_LIMIT and UPLOAD_FILE_SIZE_LIMIT do the same thing, Supabase has a primary and fallback variable,
+    # so we have opted to set both of the variables to the same value.
+    - name: FILE_SIZE_LIMIT
+      value: "###ZARF_VAR_MAX_FILE_UPLOAD_SIZE_IN_BYTES###"
+    - name: UPLOAD_FILE_SIZE_LIMIT
+      value: "###ZARF_VAR_MAX_FILE_UPLOAD_SIZE_IN_BYTES###"
 
 studio:
   enabled: ###ZARF_VAR_ENABLE_STUDIO###

diff --git a/packages/supabase/zarf.yaml b/packages/supabase/zarf.yaml
@@ -49,6 +49,9 @@ variables:
   - name: ENABLE_EXTERNAL_KEYCLOAK
     description: 'Enable the integration between Supabase and an external keycloak instance be enabled'
     default: "true"
+  - name: MAX_FILE_UPLOAD_SIZE_IN_BYTES
+    description: 'The maximum upload file size for Supabase storage in bytes, default is equivalent to 512Mb'
+    default: "536870912"
 
 components:
   - name: supabase

diff --git a/packages/text-embeddings/chart/Chart.yaml b/packages/text-embeddings/chart/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 # x-release-please-start-version
-version: 0.9.1
+version: 0.9.2
 # x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be

diff --git a/packages/text-embeddings/chart/values.yaml b/packages/text-embeddings/chart/values.yaml
@@ -9,7 +9,7 @@ image:
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   # x-release-please-start-version
-  tag: 0.9.1
+  tag: 0.9.2
   # x-release-please-end
 
 nameOverride: text-embeddings

diff --git a/packages/text-embeddings/pyproject.toml b/packages/text-embeddings/pyproject.toml
@@ -3,7 +3,7 @@ name = "lfai-text-embeddings"
 description = "A LeapfrogAI API-compatible embeddings library wrapper for text-based embedding generation."
 
 # x-release-please-start-version
-version = "0.9.1"
+version = "0.9.2"
 # x-release-please-end
 
 dependencies = [

diff --git a/packages/text-embeddings/zarf.yaml b/packages/text-embeddings/zarf.yaml
@@ -26,7 +26,7 @@ components:
         localPath: chart
         releaseName: text-embeddings-model
         # x-release-please-start-version
-        version: 0.9.1
+        version: 0.9.2
         # x-release-please-end
         valuesFiles:
           - "embedding-values.yaml"

diff --git a/packages/ui/chart/Chart.yaml b/packages/ui/chart/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 # x-release-please-start-version
-version: 0.9.1
+version: 0.9.2
 # x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be

diff --git a/packages/ui/zarf.yaml b/packages/ui/zarf.yaml
@@ -69,7 +69,7 @@ components:
         valuesFiles:
           - 'chart/ui-values.yaml'
         # x-release-please-start-version
-        version: 0.9.1
+        version: 0.9.2
         # x-release-please-end
     images:
       - ghcr.io/defenseunicorns/leapfrogai/leapfrogai-ui:###ZARF_PKG_TMPL_IMAGE_VERSION###

diff --git a/packages/vllm/chart/Chart.yaml b/packages/vllm/chart/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 # x-release-please-start-version
-version: 0.9.1
+version: 0.9.2
 # x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be

diff --git a/packages/vllm/chart/values.yaml b/packages/vllm/chart/values.yaml
@@ -9,7 +9,7 @@ image:
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   # x-release-please-start-version
-  tag: 0.9.1
+  tag: 0.9.2
   # x-release-please-end
 
 nameOverride: vllm

diff --git a/packages/vllm/pyproject.toml b/packages/vllm/pyproject.toml
@@ -3,7 +3,7 @@ name = "lfai-vllm"
 description = "A LeapfrogAI API-compatible VLLM wrapper for quantized and un-quantized model inferencing across GPU infrastructures."
 
 # x-release-please-start-version
-version = "0.9.1"
+version = "0.9.2"
 # x-release-please-end
 
 dependencies = [

diff --git a/packages/vllm/zarf.yaml b/packages/vllm/zarf.yaml
@@ -19,7 +19,7 @@ components:
         localPath: chart
         releaseName: vllm-model
         # x-release-please-start-version
-        version: 0.9.1
+        version: 0.9.2
         # x-release-please-end
         valuesFiles:
           - "vllm-values.yaml"

diff --git a/packages/whisper/chart/Chart.yaml b/packages/whisper/chart/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 # x-release-please-start-version
-version: 0.9.1
+version: 0.9.2
 # x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be

diff --git a/packages/whisper/chart/values.yaml b/packages/whisper/chart/values.yaml
@@ -9,7 +9,7 @@ image:
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   # x-release-please-start-version
-  tag: 0.9.1
+  tag: 0.9.2
   # x-release-please-end
 
 nameOverride: whisper

diff --git a/packages/whisper/pyproject.toml b/packages/whisper/pyproject.toml
@@ -3,7 +3,7 @@ name = "lfai-whisper"
 description = "A LeapfrogAI API-compatible faster-whisper wrapper for audio transcription generation across CPU and GPU infrastructures."
 
 # x-release-please-start-version
-version = "0.9.1"
+version = "0.9.2"
 # x-release-please-end
 
 dependencies = [

diff --git a/packages/whisper/zarf.yaml b/packages/whisper/zarf.yaml
@@ -26,7 +26,7 @@ components:
         localPath: chart
         releaseName: whisper-model
         # x-release-please-start-version
-        version: 0.9.1
+        version: 0.9.2
         # x-release-please-end
         valuesFiles:
           - "whisper-values.yaml"

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ description = "ChatGPT type capabilities for secure, local, air-gapped systems."
 authors = [{ name = "LeapfrogAI Team", email = "ai@defenseunicorns.com" }]
 
 # x-release-please-start-version
-version = "0.9.1"
+version = "0.9.2"
 # x-release-please-end
 
 readme = "README.md"

diff --git a/src/leapfrogai_api/pyproject.toml b/src/leapfrogai_api/pyproject.toml
@@ -3,7 +3,7 @@ name = "leapfrogai-api"
 description = "An API for LeapfrogAI that allows LeapfrogAI backends to connect seamlessly"
 
 # x-release-please-start-version
-version = "0.9.1"
+version = "0.9.2"
 # x-release-please-end
 
 dependencies = [

diff --git a/src/leapfrogai_api/supabase/config.toml b/src/leapfrogai_api/supabase/config.toml
@@ -65,7 +65,7 @@ port = 54324
 [storage]
 enabled = true
 # The maximum file size allowed (e.g. "5MB", "500KB").
-file_size_limit = "50MiB"
+file_size_limit = "512MiB"
 
 [auth]
 enabled = true

diff --git a/src/leapfrogai_sdk/pyproject.toml b/src/leapfrogai_sdk/pyproject.toml
@@ -3,7 +3,7 @@ name = "leapfrogai-sdk"
 description = "A tool for building gRPC-based model backends for LeapfrogAI"
 
 # x-release-please-start-version
-version = "0.9.1"
+version = "0.9.2"
 # x-release-please-end
 
 dependencies = [

diff --git a/src/leapfrogai_ui/.env.example b/src/leapfrogai_ui/.env.example
@@ -7,8 +7,8 @@ PUBLIC_MESSAGE_LENGTH_LIMIT=10000
 # PRIVATE DYNAMIC
 DEFAULT_TEMPERATURE=0.1
 DEFAULT_SYSTEM_PROMPT="You are a helpful AI assistant created by Defense Unicorns."
-DEFAULT_MODEL=vllm # ex. for OpenAI would be: gpt-3.5-turbo
-LEAPFROGAI_API_BASE_URL=https://leapfrogai-api.uds.dev
+DEFAULT_MODEL=vllm #for OpenAI it could be: gpt-3.5-turbo
+LEAPFROGAI_API_BASE_URL=https://leapfrogai-api.uds.dev #for OpenAI it would be: https://api.openai.com
 #If specified, app will use OpenAI instead of Leapfrog
 OPENAI_API_KEY=
 

diff --git a/src/leapfrogai_ui/README.md b/src/leapfrogai_ui/README.md
@@ -86,7 +86,7 @@ Set the following .env variables:
 
 ```
 DEFAULT_MODEL=gpt-3.5-turbo
-LEAPFROGAI_API_BASE_URL=https://api.openai.com/v1
+LEAPFROGAI_API_BASE_URL=https://api.openai.com
 #If specified, app will use OpenAI instead of Leapfrog
 OPENAI_API_KEY=<your_openai_api_key>
 ```