Added Ollama and Ollama Web UI

Invalid json

.github/workflows/dotnet.yml

@@ -7,10 +7,13 @@ on:
 jobs:
   build:
 
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0 # required for github-action-get-previous-tag
 
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
@@ -27,15 +30,19 @@ jobs:
       run: dotnet publish ./Bot/Lunaris2.csproj --configuration Release --output ./out
 
     - name: Zip the build
-      run: 7z a -tzip ./out/Bot.zip ./out/*
+      run: 7z a -tzip ./out/Lunaris.zip ./out/*
 
-    - name: Get the tag name
+    - name: Get previous tag
-      id: get_tag
+      id: previoustag
-      run: echo "::set-output name=tag::${GITHUB_REF#refs/tags/}"
+      uses: 'WyriHaximus/github-action-get-previous-tag@v1'
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Get the version
+    - name: Get next minor version
-      id: get_version
+      id: semver
-      run: echo "::set-output name=version::$(date +%s).${{ github.run_id }}"
+      uses: 'WyriHaximus/github-action-next-semvers@v1'
+      with:
+        version: ${{ steps.previoustag.outputs.tag }}
 
     - name: Create Release
       id: create_release
@@ -43,8 +50,8 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
       with:
-        tag_name: ${{ steps.get_version.outputs.version }}
+        tag_name: ${{ steps.semver.outputs.patch }}
-        release_name: Release v${{ steps.get_version.outputs.version }}
+        release_name: Release ${{ steps.semver.outputs.patch }}
         draft: false
         prerelease: false
 
@@ -55,6 +62,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./out/Bot.zip
+        asset_path: ./out/Lunaris.zip
-        asset_name: Bot.zip
+        asset_name: Lunaris.zip
         asset_content_type: application/zip

Bot/appsettings.json

@@ -9,7 +9,7 @@
     "Token": "discordToken",
     "LavaLinkPassword": "youshallnotpass",
     "LavaLinkHostname": "127.0.0.1",
-    "LavaLinkPort": 2333
+    "LavaLinkPort": 2333,
     "LLM": {
         "Url": "http://192.168.50.54:11434",
         "Model": "gemma"

README.md

@@ -25,7 +25,3 @@ Lunaris2 is a Discord bot designed to play music in your server's voice channels
 ## Contributing
 
 Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.
-
-## License
-
-[MIT](https://choosealicense.com/licenses/mit/)

docker-compose.yml

@@ -24,6 +24,40 @@ services:
     ports:
       # you only need this if you want to make your lavalink accessible from outside of containers
       - "2333:2333"
+      
+  ollama:
+    volumes:
+      - ollama:/root/.ollama
+    # comment below to not expose Ollama API outside the container stack
+    ports:
+      - 11434:11434
+    container_name: ollama
+    pull_policy: always
+    tty: true
+    restart: unless-stopped
+    image: ollama/ollama:latest
+
+  ollama-webui:
+    build:
+      context: .
+      args:
+        OLLAMA_API_BASE_URL: '/ollama/api'
+      dockerfile: Dockerfile
+    image: ollama-webui:latest
+    container_name: ollama-webui
+    depends_on:
+      - ollama
+    ports:
+      - 3000:8080
+    environment:
+      - "OLLAMA_API_BASE_URL=http://ollama:11434/api"
+    extra_hosts:
+      - host.docker.internal:host-gateway
+    restart: unless-stopped
+
+volumes:
+  ollama: {}
+
 networks:
   # create a lavalink network you can add other containers to, to give them access to Lavalink
   lavalink: