fix: merge conflicts

defenseunicorns · May 9, 2024 · c560e47 · c560e47
2 parents 9acbfc1 + 5393e34
commit c560e47
Show file tree

Hide file tree

Showing 46 changed files with 291 additions and 114 deletions.
diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+    ".": "0.6.1"
+}
diff --git a/.github/release-please-config.json b/.github/release-please-config.json
@@ -0,0 +1,37 @@
+{
+  "packages": {
+    ".": {
+      "release-type": "simple",
+      "changelog-path": "CHANGELOG.md",
+      "changelog-sections": [
+        { "type": "feat", "section": "Features", "hidden": false },
+        { "type": "fix", "section": "Bug Fixes", "hidden": false },
+        { "type": "chore", "section": "Miscellaneous", "hidden": false }
+      ],
+      "versioning": "default",
+      "extra-files": [
+        "pyproject.toml",
+        {
+          "type": "generic",
+          "path": "**/Chart.yaml",
+          "glob": true
+        },
+        {
+          "type": "generic",
+          "path": "**/values.yaml",
+          "glob": true
+        },
+        {
+          "type": "generic",
+          "path": "**/zarf.yaml",
+          "glob": true
+        },
+        {
+          "type": "generic",
+          "path": "**/uds-bundle.yaml",
+          "glob": true
+        }
+      ]
+    }
+  }
+}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -59,12 +59,25 @@ jobs:
           docker image prune -af
           rm zarf-package-leapfrogai-api-*.tar.zst
 
+      - name: Build and Publish UI
+        run: |
+          docker buildx build --platform amd64,arm64 -t ghcr.io/defenseunicorns/leapfrogai/leapfrogai-ui:${{ steps.get_version.outputs.version-without-v }} --push src/leapfrogai_ui
+
+          zarf package create packages/ui --set=IMAGE_VERSION=${{ steps.get_version.outputs.version-without-v }} --architecture amd64 --confirm
+          zarf package create packages/ui --set=IMAGE_VERSION=${{ steps.get_version.outputs.version-without-v }} --architecture arm64 --confirm
+
+          zarf package publish zarf-package-leapfrogai-ui-amd64-${{ steps.get_version.outputs.version-without-v }}.tar.zst oci://ghcr.io/defenseunicorns/packages/leapfrogai
+          zarf package publish zarf-package-leapfrogai-ui-arm64-${{ steps.get_version.outputs.version-without-v }}.tar.zst oci://ghcr.io/defenseunicorns/packages/leapfrogai
+
+          docker image prune -af
+          rm zarf-package-leapfrogai-ui-*.tar.zst
+
       - name: Build and Publish repeater
         run: |
           docker buildx build --platform amd64,arm64 -t ghcr.io/defenseunicorns/leapfrogai/repeater:${{ steps.get_version.outputs.version-without-v }} --push packages/repeater
 
-          zarf package create packages/repeater --set=LEAPFROGAI_IMAGE_VERSION=${{ steps.get_version.outputs.version-without-v }} --architecture amd64 --confirm
-          zarf package create packages/repeater --set=LEAPFROGAI_IMAGE_VERSION=${{ steps.get_version.outputs.version-without-v }} --architecture arm64 --confirm
+          zarf package create packages/repeater --set=IMAGE_VERSION=${{ steps.get_version.outputs.version-without-v }} --architecture amd64 --confirm
+          zarf package create packages/repeater --set=IMAGE_VERSION=${{ steps.get_version.outputs.version-without-v }} --architecture arm64 --confirm
 
           zarf package publish zarf-package-repeater-amd64-${{ steps.get_version.outputs.version-without-v }}.tar.zst oci://ghcr.io/defenseunicorns/packages/leapfrogai
           zarf package publish zarf-package-repeater-arm64-${{ steps.get_version.outputs.version-without-v }}.tar.zst oci://ghcr.io/defenseunicorns/packages/leapfrogai

diff --git a/.github/workflows/tag-for-release.yaml b/.github/workflows/tag-for-release.yaml
@@ -0,0 +1,21 @@
+
+name: Tag LeapfrogAI
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  tag-new-version:
+    permissions:
+      contents: write
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create release tag
+        id: tag
+        uses: google-github-actions/release-please-action@a37ac6e4f6449ce8b3f7607e4d97d0146028dc0b # v4
+        with:
+          config-file: .github/release-please-config.json
+          manifest-file: .github/.release-please-manifest.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,20 @@
+# Changelog
+
+## [0.6.1](https://github.com/defenseunicorns/leapfrogai/compare/v0.6.0...v0.6.1) (2024-04-12)
+
+### Features
+
+### Bug Fixes
+* fix: remove hardcoded gpu request value by @YrrepNoj in https://github.com/defenseunicorns/leapfrogai/pull/386
+
+### Miscellaneous
+* chore: update version refs to 0.6.1 by @YrrepNoj in https://github.com/defenseunicorns/leapfrogai/pull/389
+
+
+## [0.6.0](https://github.com/defenseunicorns/leapfrogai/releases/tag/v0.6.0) (2024-04-12)
+
+### Features
+
+### Bug Fixes
+
+### Miscellaneous
diff --git a/Makefile b/Makefile
@@ -53,6 +53,18 @@ build-api: local-registry setup-api-deps ## Build the leapfrogai_api container a
 	uds zarf package create packages/api -o packages/api --registry-override=ghcr.io=localhost:5000 --insecure --set LEAPFROGAI_IMAGE_VERSION=${LOCAL_VERSION} --confirm
 
 
+build-ui: ## Build the leapfrogai_ui container and Zarf package
+	## Build the image (and tag it for the local registry)
+	docker build -t ghcr.io/defenseunicorns/leapfrogai/leapfrogai-ui:${LOCAL_VERSION} src/leapfrogai_ui
+	docker tag ghcr.io/defenseunicorns/leapfrogai/leapfrogai-ui:${LOCAL_VERSION} localhost:5000/defenseunicorns/leapfrogai/leapfrogai-ui:${LOCAL_VERSION}
+
+	## Push the image to the local registry (Zarf is super slow if the image is only in the local daemon)
+	docker push localhost:5000/defenseunicorns/leapfrogai/leapfrogai-ui:${LOCAL_VERSION}
+
+	## Build the Zarf package
+	uds zarf package create packages/ui -o packages/ui --registry-override=ghcr.io=localhost:5000 --insecure --set IMAGE_VERSION=${LOCAL_VERSION} --confirm
+
+
 setup-llama-cpp-python-deps: sdk-wheel ## Download the wheels for the optional 'llama-cpp-python' dependencies
 	-rm packages/llama-cpp-python/build/*.whl
 	python -m pip wheel packages/llama-cpp-python -w packages/llama-cpp-python/build --find-links=${SDK_DEST}

diff --git a/packages/api/chart/Chart.yaml b/packages/api/chart/Chart.yaml
@@ -15,7 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # 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.6.1
+# x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

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

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

diff --git a/packages/llama-cpp-python/chart/Chart.yaml b/packages/llama-cpp-python/chart/Chart.yaml
@@ -15,7 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # 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.6.1
+# x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/packages/llama-cpp-python/chart/values.yaml b/packages/llama-cpp-python/chart/values.yaml
@@ -8,7 +8,9 @@ image:
   repository: "ghcr.io/defenseunicorns/leapfrogai/llama-cpp-python"
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
+  # x-release-please-start-version
   tag: 0.6.1
+  # x-release-please-end
 
 nameOverride: llama-cpp-python
 fullnameOverride: ""

diff --git a/packages/llama-cpp-python/pyproject.toml b/packages/llama-cpp-python/pyproject.toml
@@ -1,8 +1,11 @@
 [project]
 name = "lfai-llama-cpp-python"
-version = "0.6.1"
 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.6.1"
+# x-release-please-end
+
 dependencies = [
     "llama-cpp-python == 0.2.28",
     "leapfrogai-sdk",

diff --git a/packages/llama-cpp-python/zarf.yaml b/packages/llama-cpp-python/zarf.yaml
@@ -19,7 +19,9 @@ components:
         namespace: leapfrogai
         localPath: chart
         releaseName: llama-cpp-python-model
+        # x-release-please-start-version
         version: 0.6.1
+        # x-release-please-end
         valuesFiles:
           - "llama-cpp-python-values.yaml"
     images:

diff --git a/packages/repeater/chart/Chart.yaml b/packages/repeater/chart/Chart.yaml
@@ -15,7 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # 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.6.1
+# x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/packages/repeater/chart/values.yaml b/packages/repeater/chart/values.yaml
@@ -8,7 +8,9 @@ image:
   repository: "ghcr.io/defenseunicorns/leapfrogai/repeater"
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
+  # x-release-please-start-version
   tag: 0.6.1
+  # x-release-please-end
 
 nameOverride: repeater
 fullnameOverride: ""

diff --git a/packages/repeater/pyproject.toml b/packages/repeater/pyproject.toml
@@ -1,8 +1,11 @@
 [project]
 name = "lfai-repeater"
-version = "0.6.1"
 description = "A LeapfrogAI API-compatible pseudo-model for testing the API."
 
+# x-release-please-start-version
+version = "0.6.1"
+# x-release-please-end
+
 dependencies = [
     "leapfrogai-sdk",
 ]

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

diff --git a/packages/repeater/zarf.yaml b/packages/repeater/zarf.yaml
@@ -17,7 +17,9 @@ components:
         namespace: leapfrogai
         localPath: chart
         releaseName: repeater
+        # x-release-please-start-version
         version: 0.6.1
+        # x-release-please-end
         valuesFiles:
           - "repeater-values.yaml"
     images:

diff --git a/packages/text-embeddings/chart/Chart.yaml b/packages/text-embeddings/chart/Chart.yaml
@@ -15,7 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # 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.6.1
+# x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/packages/text-embeddings/chart/values.yaml b/packages/text-embeddings/chart/values.yaml
@@ -8,7 +8,9 @@ image:
   repository: "ghcr.io/defenseunicorns/leapfrogai/text-embeddings"
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
+  # x-release-please-start-version
   tag: 0.6.1
+  # x-release-please-end
 
 nameOverride: text-embeddings
 fullnameOverride: ""

diff --git a/packages/text-embeddings/pyproject.toml b/packages/text-embeddings/pyproject.toml
@@ -1,8 +1,11 @@
 [project]
 name = "lfai-text-embeddings"
-version = "0.6.1"
 description = "A LeapfrogAI API-compatible embeddings library wrapper for text-based embedding generation."
 
+# x-release-please-start-version
+version = "0.6.1"
+# x-release-please-end
+
 dependencies = [
     "InstructorEmbedding >= 1.0.1",
     "torch == 2.1.2",

diff --git a/packages/text-embeddings/zarf.yaml b/packages/text-embeddings/zarf.yaml
@@ -25,7 +25,9 @@ components:
         namespace: leapfrogai
         localPath: chart
         releaseName: text-embeddings-model
+        # x-release-please-start-version
         version: 0.6.1
+        # x-release-please-end
         valuesFiles:
           - "embedding-values.yaml"
     images:

diff --git a/packages/ui/chart/Chart.yaml b/packages/ui/chart/Chart.yaml
@@ -15,10 +15,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+# x-release-please-start-version
+version: 0.6.1
+# x-release-please-end
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: '0.1.8'
+appVersion: "0.1.8"
diff --git a/packages/ui/chart/templates/ui/deployment.yaml b/packages/ui/chart/templates/ui/deployment.yaml
@@ -15,7 +15,8 @@ spec:
     spec:
       containers:
         - name: {{ .Values.package.name }}
-          image: 'ghcr.io/defenseunicorns/leapfrogai/leapfrogai-ui:###ZARF_CONST_IMAGE_VERSION###'
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 3000
           env:
@@ -41,6 +42,7 @@ spec:
                 secretKeyRef:
                   name: supabase-bootstrap-jwt
                   key: anon-key
+                  optional: true
               {{ end }}
             - name: PUBLIC_DISABLE_KEYCLOAK
               value: '###ZARF_VAR_DISABLE_KEYCLOAK###'

diff --git a/packages/ui/chart/ui-values.yaml b/packages/ui/chart/ui-values.yaml
@@ -0,0 +1,12 @@
+image:
+  repository: "ghcr.io/defenseunicorns/leapfrogai/leapfrogai-ui"
+  pullPolicy: Always
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: '###ZARF_CONST_IMAGE_VERSION###'
+
+package:
+  name: lfaiui
+  host: lfaiui
+  supabase_url: '###ZARF_VAR_SUPABASE_URL###'
+  supabase_anon_key: '###ZARF_VAR_SUPABASE_ANON_KEY###'
+  message_length_limit: '###ZARF_VAR_MESSAGE_LENGTH_LIMIT###'
diff --git a/packages/ui/chart/values.yaml b/packages/ui/chart/values.yaml
diff --git a/packages/ui/zarf-config.yaml b/packages/ui/zarf-config.yaml