Merge branch 'dev' into more-groq-models

.github/scripts/rename-app-beta.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Check if the correct number of arguments is provided
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <path_to_json_input_file>"
+    exit 1
+fi
+
+INPUT_JSON_FILE="$1"
+
+# Check if the input file exists
+if [ ! -f "$INPUT_JSON_FILE" ]; then
+    echo "Input file not found: $INPUT_JSON_FILE"
+    exit 1
+fi
+
+# Use jq to transform the content
+jq '
+    .name = "jan-beta" |
+    .productName = "Jan-beta" |
+    .build.appId = "jan-beta.ai.app" |
+    .build.productName = "Jan-beta" |
+    .build.appId = "jan-beta.ai.app" |
+    .build.protocols[0].name = "Jan-beta" |
+    .build.protocols[0].schemes = ["jan-beta"] |
+    .build.artifactName = "jan-beta-${os}-${arch}-${version}.${ext}" |
+    .build.publish[0].channel = "beta"
+' "$INPUT_JSON_FILE" > ./package.json.tmp
+
+cat ./package.json.tmp
+
+rm $INPUT_JSON_FILE
+mv ./package.json.tmp $INPUT_JSON_FILE
+
+# Update the layout file
+LAYOUT_FILE_PATH="web/app/layout.tsx"
+
+if [ ! -f "$LAYOUT_FILE_PATH" ]; then
+    echo "File does not exist: $LAYOUT_FILE_PATH"
+    exit 1
+fi
+
+# Perform the replacements
+sed -i -e "s#Jan#Jan-beta#g" "$LAYOUT_FILE_PATH"
+
+# Notify completion
+echo "File has been updated: $LAYOUT_FILE_PATH"

.github/scripts/rename-uninstaller-beta.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# File path to be modified
+FILE_PATH="electron/scripts/uninstaller.nsh"
+
+# Check if the file exists
+if [ ! -f "$FILE_PATH" ]; then
+    echo "File does not exist: $FILE_PATH"
+    exit 1
+fi
+
+# Perform the replacements
+sed -i -e "s#jan#jan-beta#g" "$FILE_PATH"
+
+# Notify completion
+echo "File has been updated: $FILE_PATH"

.github/scripts/rename-workspace-beta.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# File path to be modified
+FILE_PATH="$1"
+
+# Check if the file exists
+if [ ! -f "$FILE_PATH" ]; then
+    echo "File does not exist: $FILE_PATH"
+    exit 1
+fi
+
+# Perform the replacements
+sed -i -e 's/yarn workspace jan/yarn workspace jan-beta/g' "$FILE_PATH"
+
+# Notify completion
+echo "File has been updated: $FILE_PATH"

.github/workflows/jan-docs.yml

@@ -83,6 +83,6 @@ jobs:
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           projectName: ${{ env.CLOUDFLARE_PROJECT_NAME }}
           directory: ./docs/out
-          branch: dev
+          branch: main
           # Optional: Enable this if you want to have GitHub Deployments triggered
           gitHubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/jan-electron-build-beta.yml

@@ -0,0 +1,136 @@
+name: Electron Builder - Beta Build
+
+on:
+  push:
+    tags: ["v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+-beta"]
+
+jobs:
+  # Job create Update app version based on latest release tag with build number and save to output
+  get-update-version:
+    uses: ./.github/workflows/template-get-update-version.yml
+
+  create-draft-release:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+      version: ${{ steps.get_version.outputs.version }}
+    permissions:
+      contents: write
+    steps:
+      - name: Extract tag name without v prefix
+        id: get_version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV && echo "::set-output name=version::${GITHUB_REF#refs/tags/v}"
+        env:
+          GITHUB_REF: ${{ github.ref }}
+      - name: Create Draft Release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.ref_name }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          name: "${{ env.VERSION }}"
+          draft: true
+          prerelease: false
+          generate_release_notes: true
+
+  build-macos-x64:
+    uses: ./.github/workflows/template-build-macos-x64.yml
+    secrets: inherit
+    needs: [get-update-version]
+    with:
+      ref: ${{ github.ref }}
+      public_provider: github
+      new_version: ${{ needs.get-update-version.outputs.new_version }}
+      beta: true
+
+  build-macos-arm64:
+    uses: ./.github/workflows/template-build-macos-arm64.yml
+    secrets: inherit
+    needs: [get-update-version]
+    with:
+      ref: ${{ github.ref }}
+      public_provider: github
+      new_version: ${{ needs.get-update-version.outputs.new_version }}
+      beta: true
+
+  build-windows-x64:
+    uses: ./.github/workflows/template-build-windows-x64.yml
+    secrets: inherit
+    needs: [get-update-version]
+    with:
+      ref: ${{ github.ref }}
+      public_provider: github
+      new_version: ${{ needs.get-update-version.outputs.new_version }}
+      beta: true
+
+  build-linux-x64:
+    uses: ./.github/workflows/template-build-linux-x64.yml
+    secrets: inherit
+    needs: [get-update-version]
+    with:
+      ref: ${{ github.ref }}
+      public_provider: github
+      new_version: ${{ needs.get-update-version.outputs.new_version }}
+      beta: true
+
+  combine-beta-mac-yml:
+    needs: [build-macos-x64, build-macos-arm64, create-draft-release, build-windows-x64, build-linux-x64]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Getting the repo
+        uses: actions/checkout@v3
+
+      - name: Download mac-x64 artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: beta-mac-x64
+          path: ./beta-mac-x64
+      - name: Download mac-arm artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: beta-mac-arm64
+          path: ./beta-mac-arm64
+
+      - name: 'Merge beta-mac.yml'
+        # unfortunately electron-builder doesn't understand that we have two different releases for mac-x64 and mac-arm, so we need to manually merge the latest files
+        # see https://github.com/electron-userland/electron-builder/issues/5592
+        run: |
+          ls -la .
+          ls -la ./beta-mac-x64
+          ls -la ./beta-mac-arm64
+          ls -la ./electron
+          cp ./electron/merge-latest-ymls.js /tmp/merge-beta-ymls.js
+          npm install js-yaml --prefix /tmp
+          node /tmp/merge-beta-ymls.js ./beta-mac-x64/beta-mac.yml ./beta-mac-arm64/beta-mac.yml ./beta-mac.yml
+          cat ./beta-mac.yml
+      
+      - name: Yet Another Upload Release Asset Action  
+        uses: shogo82148/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.create-draft-release.outputs.upload_url }}
+          asset_path: ./beta-mac.yml
+          asset_name: beta-mac.yml
+          asset_content_type: text/yaml
+          overwrite: true
+
+      - name: Upload beta-mac.yml
+        run: |
+          aws s3 cp ./beta-mac.yml "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-beta/beta-mac.yml"
+          # sync temp-beta to beta by copy files that are different or new
+          aws s3 sync "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-beta/" "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/beta/"
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: ${{ secrets.DELTA_AWS_REGION }}
+          AWS_EC2_METADATA_DISABLED: "true"
+
+      - name: set release to prerelease
+        run: |
+          gh release edit v${{ needs.create-draft-release.outputs.version }} --draft=false --prerelease
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/jan-electron-build-nightly.yml

@@ -80,7 +80,7 @@ jobs:
       new_version: ${{ needs.get-update-version.outputs.new_version }}
 
   combine-latest-mac-yml:
-    needs: [set-public-provider, build-macos-x64, build-macos-arm64]
+    needs: [set-public-provider, build-macos-x64, build-macos-arm64, build-windows-x64, build-linux-x64]
     runs-on: ubuntu-latest
     steps:
       - name: Getting the repo
@@ -114,7 +114,8 @@ jobs:
       - name: Upload latest-mac.yml
         if: ${{ needs.set-public-provider.outputs.public_provider == 'aws-s3' }}
         run: |
-          aws s3 cp ./latest-mac.yml "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/latest/latest-mac.yml"
+          aws s3 cp ./latest-mac.yml "s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-latest/latest-mac.yml"
+          aws s3 sync s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/temp-latest/ s3://${{ secrets.DELTA_AWS_S3_BUCKET_NAME }}/latest/
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.DELTA_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.DELTA_AWS_SECRET_ACCESS_KEY }}