Changed Local Models WorkFlow on UI

.github/actions/copy_env_files/action.yml

@@ -0,0 +1,23 @@
+name: Copy Environment Files
+description: "Copies environment files based on branch"
+runs:
+  using: "composite"
+  steps:
+    - name: Copy Environment Files
+      shell: bash
+      run: | 
+        cp ./proxy-router/models-config.json.example ./proxy-router/models-config.json
+        cp ./proxy-router/models-config.json.example models-config.json
+        if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
+          cp ./.github/workflows/proxy-router.main.env ./proxy-router/.env
+          cp ./.github/workflows/proxy-router.main.env .env
+          cp ./.github/workflows/ui-desktop.main.env ./ui-desktop/.env
+        elif [[ "${GITHUB_REF}" == "refs/heads/stg" ]]; then
+          cp ./.github/workflows/proxy-router.test.env ./proxy-router/.env
+          cp ./.github/workflows/proxy-router.test.env .env
+          cp ./.github/workflows/ui-desktop.test.env ./ui-desktop/.env
+        else
+          cp ./proxy-router/.env.example ./proxy-router/.env
+          cp ./proxy-router/.env.example .env
+          cp ./ui-desktop/.env.example ./ui-desktop/.env
+        fi

.github/actions/gen_tag_name/action.yml

@@ -0,0 +1,21 @@
+name: Generate Tag Name
+description: "Generates a tag name based on branch"
+runs:
+  using: "composite"
+  steps:
+    - name: Determine tag name
+      id: tag
+      shell: bash
+      run: |
+        SHORT_HASH="$(git rev-parse --short=7 HEAD)"
+        echo $SHORT_HASH
+        if [[ "${GITHUB_REF}" == "refs/heads/main" ]]; then
+          PREFIX="main-"
+        elif [[ "${GITHUB_REF}" == "refs/heads/stg" ]]; then
+          PREFIX="test-"
+        else
+          PREFIX="dev-"
+        fi
+        TAG_NAME="${PREFIX}${SHORT_HASH}"
+        echo $TAG_NAME
+        echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_ENV

.github/workflows/build.yml

@@ -10,6 +10,7 @@ on:
   push:
     branches:
       - main
+      - stg
     paths: ['.github/workflows/**', '**/Makefile', '**/*.go', '**/*.json', '**/*.yml', '**/*.ts', '**/*.js']
   pull_request:
     types: [opened, reopened, synchronize]
@@ -22,7 +23,7 @@ concurrency:
 defaults:
   run:
     shell: bash
-
+    
 jobs:
   Ubuntu-22-x64:
     runs-on: ubuntu-22.04
@@ -34,7 +35,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.x'
+          go-version: '1.22.x'
           cache-dependency-path: |
             launcher/go.sum
             proxy-router/go.sum
@@ -55,49 +56,45 @@ jobs:
           cd ../ui-desktop
           yarn install --network-timeout 600000
 
+      - name: Copy Environment Files
+        uses: ./.github/actions/copy_env_files
+
+      - name: Generate Tag Name
+        uses: ./.github/actions/gen_tag_name
+
       - name: Build
         id: build
         run: |
           cd launcher
           make
           cd ../proxy-router
-          cp ./models-config.json.example ../ui-desktop/models-config.json
           make build
           cd ../cli
           make build
           cd ../ui-desktop
-          cp ./.env.example .env
           yarn build:linux
 
-      - name: Determine tag name
-        id: tag
-        run: |
-          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-          echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
-
       - name: Pack artifacts
         id: pack_artifacts
         run: |
-          ARTIFACT=mor-launch-${{ steps.tag.outputs.name }}-ubuntu-x64.zip
+          ARTIFACT="mor-launch-$TAG_NAME-ubuntu-x64.zip"
           LLAMACPP=llama-b3256-bin-ubuntu-x64.zip
           MODEL=tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf
           wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b3256/$LLAMACPP
           wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
           unzip -o -j $LLAMACPP build/bin/llama-server
           echo '{"run":["./llama-server -m ./'$MODEL'","./proxy-router","./ui-desktop-1.0.0.AppImage"]}' > mor-launch.json
-          cp ./proxy-router/.env.example .env
-          cp ./proxy-router/models-config.json.example models-config.json
           mv ./cli/mor-cli mor-cli
           zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch llama-server ./proxy-router/bin/proxy-router .env $MODEL mor-launch.json ./ui-desktop/dist/ui-desktop-1.0.0.AppImage models-config.json mor-cli
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: mor-launch-${{ steps.tag.outputs.name }}-ubuntu-x64.zip
+          path: mor-launch-${{ env.TAG_NAME }}-ubuntu-x64.zip
           name: mor-launch-ubuntu-x64.zip
 
-  macOS-12-x64:
-    runs-on: macos-12
+  macOS-13-x64:
+    runs-on: macos-13
     steps:
       - name: Clone
         uses: actions/checkout@v4
@@ -106,7 +103,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.x'
+          go-version: '1.22.x'
           cache-dependency-path: |
             launcher/go.sum
             proxy-router/go.sum
@@ -127,38 +124,34 @@ jobs:
           cd ../ui-desktop
           yarn install --network-timeout 600000
 
+      - name: Copy Environment Files
+        uses: ./.github/actions/copy_env_files
+
+      - name: Generate Tag Name
+        uses: ./.github/actions/gen_tag_name
+
       - name: Build
         id: build
         run: |
           cd launcher
           make
           cd ../proxy-router
-          cp ./models-config.json.example ../ui-desktop/models-config.json
           make build
           cd ../cli
           make build
           cd ../ui-desktop
-          cp ./.env.example .env
           yarn build:mac
 
-      - name: Determine tag name
-        id: tag
-        run: |
-          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-          echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
-
       - name: Pack artifacts
         id: pack_artifacts
         run: |
-          ARTIFACT=mor-launch-${{ steps.tag.outputs.name }}-macos-x64.zip
+          ARTIFACT="mor-launch-$TAG_NAME-macos-x64.zip"
           LLAMACPP=llama-b3256-bin-macos-x64.zip
           MODEL=tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf
           wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b3256/$LLAMACPP
           wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
           unzip -o -j $LLAMACPP build/bin/llama-server
           echo '{"run":["./llama-server -m ./'$MODEL'","./proxy-router","./ui-desktop.app/Contents/MacOS/ui-desktop"]}' > mor-launch.json
-          cp ./proxy-router/.env.example .env
-          cp ./proxy-router/models-config.json.example models-config.json
           mv ./cli/mor-cli mor-cli
           unzip ./ui-desktop/dist/ui-desktop-1.0.0-mac.zip
           zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch ./proxy-router/bin/proxy-router .env llama-server $MODEL mor-launch.json models-config.json mor-cli
@@ -167,7 +160,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: mor-launch-${{ steps.tag.outputs.name }}-macos-x64.zip
+          path: mor-launch-${{ env.TAG_NAME }}-macos-x64.zip
           name: mor-launch-macos-x64.zip
 
   macOS-14-arm64:
@@ -180,7 +173,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.x'
+          go-version: '1.22.x'
           cache-dependency-path: |
             launcher/go.sum
             proxy-router/go.sum
@@ -201,38 +194,34 @@ jobs:
           cd ../ui-desktop
           yarn install --network-timeout 600000
 
+      - name: Copy Environment Files
+        uses: ./.github/actions/copy_env_files
+
+      - name: Generate Tag Name
+        uses: ./.github/actions/gen_tag_name
+
       - name: Build
         id: build
         run: |
           cd launcher
           make
           cd ../proxy-router
-          cp ./models-config.json.example ../ui-desktop/models-config.json
           make build
           cd ../cli
           make build
           cd ../ui-desktop
-          cp ./.env.example .env
           yarn build:mac
 
-      - name: Determine tag name
-        id: tag
-        run: |
-          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-          echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
-
       - name: Pack artifacts
         id: pack_artifacts
         run: |
-          ARTIFACT=mor-launch-${{ steps.tag.outputs.name }}-macos-arm64.zip
+          ARTIFACT="mor-launch-$TAG_NAME-macos-arm64.zip"
           LLAMACPP=llama-b3256-bin-macos-arm64.zip
           MODEL=tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf
           wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b3256/$LLAMACPP
           wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
           unzip -o -j $LLAMACPP build/bin/llama-server
           echo '{"run":["./llama-server -m ./'$MODEL'","./proxy-router","./ui-desktop.app/Contents/MacOS/ui-desktop"]}' > mor-launch.json
-          cp ./proxy-router/.env.example .env
-          cp ./proxy-router/models-config.json.example models-config.json
           mv ./cli/mor-cli mor-cli
           unzip ./ui-desktop/dist/ui-desktop-1.0.0-arm64-mac.zip
           zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch ./proxy-router/bin/proxy-router .env llama-server $MODEL mor-launch.json models-config.json mor-cli
@@ -241,7 +230,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: mor-launch-${{ steps.tag.outputs.name }}-macos-arm64.zip
+          path: mor-launch-${{ env.TAG_NAME }}-macos-arm64.zip
           name: mor-launch-macos-arm64.zip
 
   Windows-avx2-x64:
@@ -254,7 +243,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21.x'
+          go-version: '1.22.x'
           cache-dependency-path: |
             launcher/go.sum
             proxy-router/go.sum
@@ -266,9 +255,10 @@ jobs:
           cache: 'yarn'
           cache-dependency-path: ui-desktop/yarn.lock
 
-      - name: Install wget
+      - name: Install wget and sed
         run: |
           choco install wget --no-progress
+          choco install sed --no-progress
 
       - name: Install dependencies
         run: |
@@ -279,38 +269,36 @@ jobs:
           cd ../ui-desktop
           yarn install --network-timeout 600000
 
+      - name: Copy Environment Files
+        uses: ./.github/actions/copy_env_files
+
+      - name: Generate Tag Name
+        uses: ./.github/actions/gen_tag_name
+
       - name: Build
         id: build
         run: |
           cd launcher
           make
           cd ../proxy-router
-          cp ./models-config.json.example ../ui-desktop/models-config.json
           make build
           cd ../cli
           make build
           cd ../ui-desktop
-          cp ./.env.example .env
           yarn build:win
 
-      - name: Determine tag name
-        id: tag
-        run: |
-          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-          echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
-
       - name: Pack artifacts
         id: pack_artifacts
         run: |
-          ARTIFACT=mor-launch-${{ steps.tag.outputs.name }}-win-x64.zip
+          ARTIFACT="mor-launch-$TAG_NAME-win-x64.zip"
           LLAMACPP=llama-b3256-bin-win-avx2-x64.zip
           MODEL=tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf
           wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b3256/$LLAMACPP
           wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
           unzip -o -j $LLAMACPP llama-server.exe llama.dll ggml.dll
           echo '{"run":["./llama-server.exe -m ./'$MODEL'","./proxy-router.exe","./ui-desktop-1.0.0.exe"]}' > mor-launch.json
-          cp ./proxy-router/.env.example.win .env
-          cp ./proxy-router/models-config.json.example models-config.json
+          mv .env .env.tmp
+          sed 's|\./data/|.\\data\\|g' .env.tmp > .env
           mv ./proxy-router/bin/proxy-router proxy-router.exe
           mv ./cli/mor-cli mor-cli.exe
           mv ./launcher/mor-launch mor-launch.exe
@@ -320,27 +308,24 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          path: mor-launch-${{ steps.tag.outputs.name }}-win-x64.zip
+          path: mor-launch-${{ env.TAG_NAME }}-win-x64.zip
           name: mor-launch-win-x64.zip
 
   release:
-    if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/main' ) || github.event.inputs.create_release == 'true' }}
+    if: ${{ (github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/stg')) || github.event.inputs.create_release == 'true' }}
     runs-on: ubuntu-latest
     needs:
       - Ubuntu-22-x64
-      - macOS-12-x64
+      - macOS-13-x64
       - macOS-14-arm64
       - Windows-avx2-x64
     steps:
       - name: Clone
         id: checkout
         uses: actions/checkout@v4
 
-      - name: Determine tag name
-        id: tag
-        run: |
-          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
-          echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
+      - name: Generate Tag Name
+        uses: ./.github/actions/gen_tag_name
 
       - name: Download artifacts
         id: download-artifact
@@ -360,7 +345,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.tag.outputs.name }}
+          tag_name: ${{ env.TAG_NAME }}
+          prerelease: ${{ github.ref != 'refs/heads/main' }}
 
       - name: Upload release
         id: upload_release

.github/workflows/proxy-router.main.env

@@ -0,0 +1,14 @@
+# This file is used to set the environment variables for the cicd workflow
+# To Generate the STG or TestNet release
+# Contract and Token current as of 11/5/2024 (and are using the same values as the testnet)
+# ...when mainnet release is imminent, update the values
+
+DIAMOND_CONTRACT_ADDRESS=0x10777866547c53cbd69b02c5c76369d7e24e7b10
+MOR_TOKEN_ADDRESS=0x34a285a1b1c166420df5b6630132542923b5b27e
+EXPLORER_API_URL="https://api-sepolia.arbiscan.io/api"
+ETH_NODE_CHAIN_ID=421614
+OPENAI_BASE_URL=http://localhost:8080/v1
+PROXY_STORE_CHAT_CONTEXT=true
+# PROXY_STORAGE_PATH=.\data\ (for windows)
+PROXY_STORAGE_PATH=./data/
+LOG_COLOR=true