pre-release demo

.github/workflows/build.yml

@@ -10,7 +10,10 @@ on:
   push:
     branches:
       - main
-    paths: ['.github/workflows/**', '**/Makefile', '**/*.go']
+    paths: ['.github/workflows/**', '**/Makefile', '**/*.go', '**/*.json', '**/*.yml', '**/*.ts', '**/*.js']
+  pull_request:
+    types: [opened, reopened, synchronize]
+    paths: ['.github/workflows/**', '**/Makefile', '**/*.go', '**/*.json', '**/*.yml', '**/*.ts', '**/*.js']
 
 concurrency:
   group: ci-${{ github.ref }}
@@ -32,14 +35,25 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: '1.21.x'
-          cache-dependency-path: launcher/go.sum
+          cache-dependency-path: |
+            launcher/go.sum
+            proxy-router/go.sum
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: ui-desktop/yarn.lock
 
       - name: Install dependencies
         run: |
           cd launcher
           go mod tidy
           cd ../proxy-router
           go mod download
+          cd ../ui-desktop
+          yarn install --network-timeout 600000
 
       - name: Build
         id: build
@@ -48,6 +62,8 @@ jobs:
           make
           cd ../proxy-router
           make build
+          cd ../ui-desktop
+          yarn build:linux
 
       - name: Determine tag name
         id: tag
@@ -61,12 +77,12 @@ jobs:
           ARTIFACT=mor-launch-${{ steps.tag.outputs.name }}-ubuntu-x64.zip
           LLAMACPP=llama-b2699-bin-ubuntu-x64.zip
           MODEL=tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf
-          wget https://github.com/ggerganov/llama.cpp/releases/download/b2699/$LLAMACPP
-          wget https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
+          wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b2699/$LLAMACPP
+          wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
           unzip -o -j $LLAMACPP build/bin/server
-          echo '{"run":["./server -m ./'$MODEL'","./proxy-router"]}' > mor-launch.json
+          echo '{"run":["./server -m ./'$MODEL'","./proxy-router","./ui-desktop-1.0.0.AppImage"]}' > mor-launch.json
           cp ./proxy-router/.env.example .env
-          zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch server ./proxy-router/bin/proxy-router .env $MODEL mor-launch.json
+          zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch server ./proxy-router/bin/proxy-router .env $MODEL mor-launch.json ./ui-desktop/dist/ui-desktop-1.0.0.AppImage
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -85,14 +101,25 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: '1.21.x'
-          cache-dependency-path: launcher/go.sum
+          cache-dependency-path: |
+            launcher/go.sum
+            proxy-router/go.sum
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: ui-desktop/yarn.lock
 
       - name: Install dependencies
         run: |
           cd launcher
           go mod tidy
           cd ../proxy-router
           go mod download
+          cd ../ui-desktop
+          yarn install --network-timeout 600000
 
       - name: Build
         id: build
@@ -101,6 +128,8 @@ jobs:
           make
           cd ../proxy-router
           make build
+          cd ../ui-desktop
+          yarn build:mac
 
       - name: Determine tag name
         id: tag
@@ -114,12 +143,14 @@ jobs:
           ARTIFACT=mor-launch-${{ steps.tag.outputs.name }}-macos-x64.zip
           LLAMACPP=llama-b2699-bin-macos-x64.zip
           MODEL=tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf
-          wget https://github.com/ggerganov/llama.cpp/releases/download/b2699/$LLAMACPP
-          wget https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
+          wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b2699/$LLAMACPP
+          wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
           unzip -o -j $LLAMACPP build/bin/server
-          echo '{"run":["./server -m ./'$MODEL'","./proxy-router"]}' > mor-launch.json
+          echo '{"run":["./server -m ./'$MODEL'","./proxy-router","./ui-desktop.app/Contents/MacOS/ui-desktop"]}' > mor-launch.json
           cp ./proxy-router/.env.example .env
+          unzip ./ui-desktop/dist/ui-desktop-1.0.0-mac.zip
           zip -j $ARTIFACT ./LICENSE ./launcher/mor-launch ./proxy-router/bin/proxy-router .env server $MODEL mor-launch.json
+          zip -r $ARTIFACT ui-desktop.app
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -138,14 +169,25 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: '1.21.x'
-          cache-dependency-path: launcher/go.sum
+          cache-dependency-path: |
+            launcher/go.sum
+            proxy-router/go.sum
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: ui-desktop/yarn.lock
 
       - name: Install dependencies
         run: |
           cd launcher
           go mod tidy
           cd ../proxy-router
           go mod download
+          cd ../ui-desktop
+          yarn install --network-timeout 600000
 
       - name: Build
         id: build
@@ -154,6 +196,8 @@ jobs:
           make
           cd ../proxy-router
           make build
+          cd ../ui-desktop
+          yarn build:mac
 
       - name: Determine tag name
         id: tag
@@ -167,26 +211,102 @@ jobs:
           ARTIFACT=mor-launch-${{ steps.tag.outputs.name }}-macos-arm64.zip
           LLAMACPP=llama-b2699-bin-macos-arm64.zip
           MODEL=tinyllama-1.1b-chat-v1.0.Q4_K_M.gguf
-          wget https://github.com/ggerganov/llama.cpp/releases/download/b2699/$LLAMACPP
-          wget https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
+          wget -nv https://github.com/ggerganov/llama.cpp/releases/download/b2699/$LLAMACPP
+          wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
           unzip -o -j $LLAMACPP build/bin/server
-          echo '{"run":["./server -m ./'$MODEL'","./proxy-router"]}' > mor-launch.json
+          echo '{"run":["./server -m ./'$MODEL'","./proxy-router","./ui-desktop.app/Contents/MacOS/ui-desktop"]}' > mor-launch.json
           cp ./proxy-router/.env.example .env
+          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 server $MODEL mor-launch.json
+          zip -r $ARTIFACT ui-desktop.app
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           path: mor-launch-${{ steps.tag.outputs.name }}-macos-arm64.zip
           name: mor-launch-macos-arm64.zip
 
+  Windows-avx2-x64:
+    runs-on: windows-latest
+    steps:
+      - name: Clone
+        uses: actions/checkout@v4
+        id: checkout
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.21.x'
+          cache-dependency-path: |
+            launcher/go.sum
+            proxy-router/go.sum
+
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'yarn'
+          cache-dependency-path: ui-desktop/yarn.lock
+
+      - name: Install wget
+        run: |
+          choco install wget --no-progress
+
+      - name: Install dependencies
+        run: |
+          cd launcher
+          go mod tidy
+          cd ../proxy-router
+          go mod download
+          cd ../ui-desktop
+          yarn install --network-timeout 600000
+
+      - name: Build
+        id: build
+        run: |
+          cd launcher
+          make
+          cd ../proxy-router
+          make build
+          cd ../ui-desktop
+          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
+          LLAMACPP=llama-b2699-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/b2699/$LLAMACPP
+          wget -nv https://huggingface.co/TheBloke/TinyLlama-1.1B-Chat-v1.0-GGUF/resolve/main/$MODEL
+          unzip -o -j $LLAMACPP server.exe llama.dll
+          echo '{"run":["./server.exe -m ./'$MODEL'","./proxy-router.exe","./ui-desktop-1.0.0.exe"]}' > mor-launch.json
+          cp ./proxy-router/.env.example .env
+          mv ./proxy-router/bin/proxy-router proxy-router.exe
+          mv ./launcher/mor-launch mor-launch.exe
+          mv "./ui-desktop/dist/ui-desktop 1.0.0.exe" ui-desktop-1.0.0.exe
+          7z a $ARTIFACT LICENSE mor-launch.exe proxy-router.exe .env server.exe llama.dll $MODEL mor-launch.json ui-desktop-1.0.0.exe
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          path: mor-launch-${{ steps.tag.outputs.name }}-win-x64.zip
+          name: mor-launch-win-x64.zip
+
   release:
-    if: ${{ github.event.inputs.create_release == 'true' }}
+    if: ${{ ( github.event_name == 'push' && github.ref == 'refs/heads/main' ) || github.event.inputs.create_release == 'true' }}
     runs-on: ubuntu-latest
     needs:
       - Ubuntu-22-x64
       - macOS-12-x64
       - macOS-14-arm64
+      - Windows-avx2-x64
     steps:
       - name: Clone
         id: checkout

launcher/cmd/main.go

@@ -7,6 +7,7 @@ import (
     "io"
     "os"
     "os/exec"
+    "path/filepath"
     "sync"
     "github.com/google/shlex"
 )
@@ -15,20 +16,29 @@ type Config struct {
     Run []string `json:"run"`
 }
 
-func findConfig(fileName string) (string, error) {
-    homeFile := path.Join(os.Getenv("HOME"), fileName)
+func findConfig(fileName string, base string) (string, error) {
     if _, err := os.Stat(fileName); err == nil {
         return fileName, nil
-    } else if _, err := os.Stat(homeFile); err == nil {
+    }
+    homeFile := path.Join(os.Getenv("HOME"), fileName)
+    if _, err := os.Stat(homeFile); err == nil {
         return homeFile, nil
-    } else {
-        return "", os.ErrNotExist
     }
+    siblingFile := path.Join(base, fileName)
+    if _, err := os.Stat(siblingFile); err == nil {
+        return siblingFile, nil
+    }
+    return "", os.ErrNotExist
 }
 
 func main() {
+    exepath, err := os.Executable()
+    if err != nil {
+        log.Panic(err)
+    }
+    base := filepath.Dir(exepath)
     confName := "mor-launch.json"
-    confFile, err := findConfig(confName)
+    confFile, err := findConfig(confName, base)
     if err != nil {
         log.Fatalf("Error finding %s: %v", confName, err)
     }
@@ -58,6 +68,7 @@ func main() {
                 return
             }
             cmd := exec.Command(args[0], args[1:]...)
+            cmd.Dir = base
             stdout, err := cmd.StdoutPipe()
             if err != nil {
                 log.Print(err)

proxy-router/.env.example

@@ -1,28 +1,24 @@
-ETH_NODE_ADDRESS=https://rpc.ankr.com/eth
-ETH_NODE_LEGACY_TX=false
+DIAMOND_CONTRACT_ADDRESS=0x70768f0fF919e194E11aBFC3a2eDF43213359dc1
 ENVIRONMENT=development
-
-WALLET_PRIVATE_KEY=
-
+ETH_NODE_ADDRESS=https://arbitrum-sepolia.blockpi.network/v1/rpc/public	
+ETH_NODE_LEGACY_TX=false
+EXPLORER_API_URL="https://api-sepolia.arbiscan.io/api"
 LOG_COLOR=true
+LOG_FOLDER_PATH=
 LOG_LEVEL_APP=info
-LOG_LEVEL_SCHEDULER=info
-LOG_LEVEL_PROXY=info
 LOG_LEVEL_CONNECTION=info
-LOG_FOLDER_PATH=./logs/
-
+LOG_LEVEL_PROXY=info
+LOG_LEVEL_SCHEDULER=info
+MOR_TOKEN_ADDRESS=0xc1664f994fd3991f98ae944bc16b9aed673ef5fd
+OPENAI_BASE_URL=http://localhost:11434/v1
 PROXY_ADDRESS=0.0.0.0:3333
-
 SYS_ENABLE=false
 SYS_LOCAL_PORT_RANGE=1024 65535
 SYS_NET_DEV_MAX_BACKLOG=100000
 SYS_RLIMIT_HARD=524288
 SYS_RLIMIT_SOFT=524288
 SYS_SOMAXCONN=100000
 SYS_TCP_MAX_SYN_BACKLOG=100000
-
-WEB_PUBLIC_URL=
-PROVIDER_REGISTRY_ADDRESS=
-MODEL_REGISTRY_ADDRESS=
-MARKETPLACE_ADDRESS=
+WALLET_PRIVATE_KEY=
 WEB_ADDRESS=0.0.0.0:8080
+WEB_PUBLIC_URL=

proxy-router/build.sh

@@ -1,3 +1,5 @@
+#!/bin/sh
+
 VERSION=$(grep '^VERSION=' .version | cut -d '=' -f 2-)
 echo VERSION=$VERSION