Revert "Merge branch '601-testing-rigor-vector-store' into 419-runs-e…

…ndpoints-420-run-steps-endpoints" This reverts commit 82a6b2b, reversing changes made to d517bef.
defenseunicorns · Jun 13, 2024 · 760d07b · 760d07b
1 parent 9fca5cc
commit 760d07b
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 194 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -83,7 +83,7 @@ jobs:
             rm packages/supabase/zarf-package-supabase-amd64-e2e-test.tar.zst
 
         - name: Set environment variable
-          id: set-env-api-key
+          id: set-env-var
           run: |
             echo "ANON_KEY=$(uds zarf tools kubectl get secret supabase-bootstrap-jwt -n leapfrogai -o jsonpath='{.data.anon-key}' | base64 -d)" >> "$GITHUB_ENV"
 
@@ -101,11 +101,6 @@ jobs:
             docker image prune -af
             uds zarf package deploy packages/api/zarf-package-leapfrogai-api-amd64-e2e-test.tar.zst --set=EXPOSE_OPENAPI_SCHEMA=true --confirm
             rm packages/api/zarf-package-leapfrogai-api-amd64-e2e-test.tar.zst
-            
-        - name: Set environment variable
-          id: set-env-anon-key
-          run: |
-            echo "ANON_KEY=$(uds zarf tools kubectl get secret supabase-bootstrap-jwt -n leapfrogai -o jsonpath='{.data.anon-key}' | base64 -d)" >> "$GITHUB_ENV"
 
         - name: Test API
           run: |

diff --git a/.gitignore b/.gitignore
@@ -38,5 +38,3 @@ vocabulary.json
 
 # go binaries
 api/main
-
-.jwt
diff --git a/Makefile b/Makefile
@@ -164,6 +164,3 @@ build-cpu: build-supabase build-api build-ui build-llama-cpp-python build-text-e
 build-gpu: build-supabase build-api build-ui build-vllm build-text-embeddings build-whisper ## Build all zarf packages for a gpu-enabled deployment of LFAI
 
 build-all: build-cpu build-gpu ## Build all of the LFAI packages
-
-include make-supabase.mk
-include make-tests.mk
diff --git a/make-supabase.mk b/make-supabase.mk
diff --git a/make-tests.mk b/make-tests.mk
diff --git a/src/leapfrogai_api/Makefile b/src/leapfrogai_api/Makefile
@@ -1,3 +1,8 @@
+SHELL := /bin/bash
+
+
+export SUPABASE_URL=$(shell supabase status | grep -oP '(?<=API URL: ).*')
+export SUPABASE_ANON_KEY=$(shell supabase status | grep -oP '(?<=anon key: ).*')
 
 install:
 	python -m pip install ../../src/leapfrogai_sdk

diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/mocks/mock_crud_base.py b/tests/mocks/mock_crud_base.py
diff --git a/tests/unit/leapfrogai_api/data/test_crud_base.py b/tests/unit/leapfrogai_api/data/test_crud_base.py
diff --git a/tests/utils/crud_utils.py b/tests/utils/crud_utils.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,5 +38,3 @@ vocabulary.json

		# go binaries
		api/main

		.jwt