Compare commits
47 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
779f82d599 | ||
|
|
fd626cb73f | ||
|
|
92add4a60c | ||
|
|
f902d1eaca | ||
|
|
cf9d29a5dd | ||
|
|
6d105e5ee4 | ||
| 4689de7696 | |||
| 11e003b28e | |||
| c75aad5d03 | |||
| 152c3db941 | |||
| e284cd517a | |||
| 987c6922a7 | |||
| d3fd88da04 | |||
| 9ffe94ad09 | |||
| af8262455b | |||
| 3946c8bca9 | |||
| 712fa7cf79 | |||
| 9f81efcf40 | |||
| ec4a3ac93a | |||
| 72083c70d5 | |||
| 2e1162af9d | |||
| dac165f465 | |||
| ecf80d7432 | |||
| 84870cc493 | |||
| d361702f6b | |||
| 87a70ce887 | |||
| 6ab0edb5d6 | |||
| 9dae5c0001 | |||
| 5683375649 | |||
| c8d35b9e75 | |||
| 17b2c29ebc | |||
| e1c19c3698 | |||
| 865a78282e | |||
| 4d3126f0ee | |||
| 82fe52b32a | |||
| b2ec0f7d46 | |||
|
|
0ddd59aea1 | ||
|
|
a5faca87aa | ||
|
|
4c96b3863a | ||
|
|
40783818b9 | ||
|
|
ed0d8600df | ||
|
|
03939ef562 | ||
|
|
456f70b9e1 | ||
|
|
5b542aca1a | ||
|
|
2a39e20fee | ||
|
|
2ea77c92f0 | ||
|
|
6c7e48d369 |
@@ -13,3 +13,7 @@ DISCORD_IP = IP_ADDRESS
|
||||
|
||||
# subnet address, ex. 172.18.0.0 as we use /16.
|
||||
SUBNET_ADDRESS = ADDRESS
|
||||
|
||||
# redis port and ip, default redis port is 6379
|
||||
REDIS_IP = IP_ADDRESS
|
||||
REDIS_PORT = PORT
|
||||
18
.github/workflows/build.yml
vendored
18
.github/workflows/build.yml
vendored
@@ -13,10 +13,10 @@ jobs:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Node Environment lts/hydrogen
|
||||
- name: Set up Node Environment lts/jod
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: lts/hydrogen
|
||||
node-version: lts/jod
|
||||
cache: "npm"
|
||||
|
||||
- name: Install Project Dependencies
|
||||
@@ -33,6 +33,9 @@ jobs:
|
||||
echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env
|
||||
echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
|
||||
echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
|
||||
echo MODEL = ${{ secrets.MODEL }} >> .env
|
||||
echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env
|
||||
echo REDIS_PORT = ${{ secrets.REDIS_PORT }} >> .env
|
||||
|
||||
# set -e ensures if nohup fails, this section fails
|
||||
- name: Startup Discord Bot Client
|
||||
@@ -47,10 +50,10 @@ jobs:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Node Environment lts/hydrogen
|
||||
- name: Set up Node Environment lts/jod
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: lts/hydrogen
|
||||
node-version: lts/jod
|
||||
cache: "npm"
|
||||
|
||||
- name: Create Environment Variables
|
||||
@@ -59,6 +62,9 @@ jobs:
|
||||
echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env
|
||||
echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
|
||||
echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
|
||||
echo MODEL = ${{ secrets.MODEL }} >> .env
|
||||
echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env
|
||||
echo REDIS_PORT = ${{ secrets.REDIS_PORT }} >> .env
|
||||
|
||||
- name: Setup Docker Network and Images
|
||||
run: |
|
||||
@@ -66,8 +72,8 @@ jobs:
|
||||
|
||||
- name: Check Images Exist
|
||||
run: |
|
||||
(docker images | grep -q 'kevinthedang/discord-ollama' && docker images | grep -qE 'ollama/ollama') || exit 1
|
||||
(docker images | grep -q 'kevinthedang/discord-ollama' && docker images | grep -qE 'ollama/ollama' | docker images | grep -qE 'redis') || exit 1
|
||||
|
||||
- name: Check Containers Exist
|
||||
run: |
|
||||
(docker ps | grep -q 'ollama' && docker ps | grep -q 'discord') || exit 1
|
||||
(docker ps | grep -q 'ollama' && docker ps | grep -q 'discord' && docker ps | grep -q 'redis') || exit 1
|
||||
|
||||
7
.github/workflows/coverage.yml
vendored
7
.github/workflows/coverage.yml
vendored
@@ -14,10 +14,10 @@ jobs:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Node Environment lts/hydrogen
|
||||
- name: Set up Node Environment lts/jod
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: lts/hydrogen
|
||||
node-version: lts/jod
|
||||
cache: "npm"
|
||||
|
||||
- name: Install Project Dependencies
|
||||
@@ -30,6 +30,9 @@ jobs:
|
||||
echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env
|
||||
echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
|
||||
echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
|
||||
echo MODEL = ${{ secrets.MODEL }} >> .env
|
||||
echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env
|
||||
echo REDIS_PORT = ${{ secrets.REDIS_PORT }} >> .env
|
||||
|
||||
- name: Collect Code Coverage
|
||||
run: |
|
||||
|
||||
133
.github/workflows/deploy.yml
vendored
Normal file
133
.github/workflows/deploy.yml
vendored
Normal file
@@ -0,0 +1,133 @@
|
||||
name: Deploy
|
||||
run-name: Deploy Application Latest
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
Deploy-Application:
|
||||
runs-on: self-hosted
|
||||
environment: deploy
|
||||
timeout-minutes: 5
|
||||
steps:
|
||||
- name: Checkout Repo
|
||||
uses: actions/checkout@v4
|
||||
|
||||
# Generate Secret File for Compose case
|
||||
- name: Create Environment Variables
|
||||
run: |
|
||||
touch .env
|
||||
echo CLIENT_TOKEN = ${{ secrets.CLIENT }} >> .env
|
||||
echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
|
||||
echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
|
||||
echo MODEL = ${{ secrets.MODEL }} >> .env
|
||||
echo DISCORD_IP = ${{ secrets.DISCORD_IP }} >> .env
|
||||
echo SUBNET_ADDRESS = ${{ secrets.SUBNET_ADDRESS }} >> .env
|
||||
echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env
|
||||
echo REDIS_PORT = ${{ secrets.REDIS_PORT }} >> .env
|
||||
|
||||
- name: Check if directory exists and delete it
|
||||
run: |
|
||||
if [ -d "${{ secrets.PATH }}" ]; then
|
||||
echo "Directory exists, deleting old version..."
|
||||
rm -rf ${{ secrets.PATH }}
|
||||
else
|
||||
echo "Directory does not exist."
|
||||
fi
|
||||
|
||||
- name: Clone Repo onto Server
|
||||
run: |
|
||||
git clone https://github.com/kevinthedang/discord-ollama.git ${{ secrets.PATH }}
|
||||
cd ${{ secrets.PATH }}
|
||||
|
||||
- name: Install nvm and Node.js lts/jod
|
||||
run: |
|
||||
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
echo "NVM installed successfully."
|
||||
nvm install lts/jod
|
||||
nvm alias default lts/jod
|
||||
node -v
|
||||
npm -v
|
||||
|
||||
- name: Build Application
|
||||
run: |
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
|
||||
npm install
|
||||
|
||||
IMAGE="kevinthedang/discord-ollama"
|
||||
REDIS="redis"
|
||||
OLLAMA="ollama/ollama"
|
||||
|
||||
if docker images | grep -q $IMAGE; then
|
||||
IMAGE_ID=$(docker images -q $IMAGE)
|
||||
CONTAINER_IDS=$(docker ps -q --filter "ancestor=$IMAGE_ID")
|
||||
|
||||
if [ ! -z "$CONTAINER_IDS" ]; then
|
||||
# Stop and remove the running containers
|
||||
docker stop $CONTAINER_IDS
|
||||
echo "Stopped and removed the containers using the image $IMAGE"
|
||||
fi
|
||||
docker rmi $IMAGE_ID
|
||||
echo "Old $IMAGE Image Removed"
|
||||
fi
|
||||
|
||||
if docker images | grep -q $REDIS; then
|
||||
IMAGE_ID=$(docker images -q $REDIS)
|
||||
CONTAINER_IDS=$(docker ps -q --filter "ancestor=$IMAGE_ID")
|
||||
|
||||
if [ ! -z "$CONTAINER_IDS" ]; then
|
||||
# Stop and remove the running containers
|
||||
docker stop $CONTAINER_IDS
|
||||
echo "Stopped and removed the containers using the image $REDIS"
|
||||
fi
|
||||
docker rmi $IMAGE_ID
|
||||
echo "Old $REDIS Image Removed"
|
||||
fi
|
||||
|
||||
if docker images | grep -q $OLLAMA; then
|
||||
IMAGE_ID=$(docker images -q $OLLAMA)
|
||||
CONTAINER_IDS=$(docker ps -q --filter "ancestor=$IMAGE_ID")
|
||||
|
||||
if [ ! -z "$CONTAINER_IDS" ]; then
|
||||
# Stop and remove the running containers
|
||||
docker stop $CONTAINER_IDS
|
||||
echo "Stopped and removed the containers using the image $OLLAMA"
|
||||
fi
|
||||
docker rmi $IMAGE_ID
|
||||
echo "Old $OLLAMA Image Removed"
|
||||
fi
|
||||
|
||||
docker network prune -f
|
||||
docker system prune -a -f
|
||||
|
||||
npm run docker:build-latest
|
||||
|
||||
- name: Start Application
|
||||
run: |
|
||||
docker network create --subnet=${{ secrets.SUBNET_ADDRESS }}/16 ollama-net || true
|
||||
docker run --rm -d \
|
||||
-v ollama:/root/.ollama \
|
||||
-p ${{ secrets.OLLAMA_PORT }}:${{ secrets.OLLAMA_PORT }} \
|
||||
--name ollama \
|
||||
--network ollama-net \
|
||||
--ip ${{ secrets.OLLAMA_IP }} \
|
||||
ollama/ollama:latest
|
||||
|
||||
docker run --rm -d \
|
||||
-v redis:/root/.redis \
|
||||
-p ${{ secrets.REDIS_PORT }}:${{ secrets.REDIS_PORT }} \
|
||||
--name redis \
|
||||
--network ollama-net \
|
||||
--ip ${{ secrets.REDIS_IP }} \
|
||||
redis:latest
|
||||
|
||||
docker run --rm -d \
|
||||
-v discord:/src/app \
|
||||
--name discord \
|
||||
--network ollama-net \
|
||||
--ip ${{ secrets.DISCORD_IP }} \
|
||||
kevinthedang/discord-ollama
|
||||
48
.github/workflows/release.yml
vendored
48
.github/workflows/release.yml
vendored
@@ -1,48 +0,0 @@
|
||||
name: Deploy
|
||||
run-name: Release Docker Image
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
Release-Docker-Image:
|
||||
runs-on: ubuntu-latest
|
||||
environment: release
|
||||
timeout-minutes: 3
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Node Environment lts/hydrogen
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: lts/hydrogen
|
||||
cache: "npm"
|
||||
|
||||
- name: Create Environment Variables
|
||||
run: |
|
||||
touch .env
|
||||
echo CLIENT_TOKEN = NOT_REAL_TOKEN >> .env
|
||||
echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
|
||||
echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
|
||||
|
||||
- name: Get Version from package.json
|
||||
run: echo "VERSION=$(jq -r '.version' package.json)" >> $GITHUB_ENV
|
||||
|
||||
- name: Build Image
|
||||
run: |
|
||||
npm run docker:build
|
||||
|
||||
- name: Build Image as Latest
|
||||
run: |
|
||||
npm run docker:build-latest
|
||||
|
||||
- name: Log into Docker
|
||||
run: |
|
||||
docker login --username ${{ vars.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }}
|
||||
|
||||
- name: Release Docker Image
|
||||
run: |
|
||||
docker push ${{ vars.DOCKER_USER }}/discord-ollama:${{ env.VERSION }}
|
||||
docker push ${{ vars.DOCKER_USER }}/discord-ollama:latest
|
||||
7
.github/workflows/test.yml
vendored
7
.github/workflows/test.yml
vendored
@@ -25,10 +25,10 @@ jobs:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Set up Node Environment lts/hydrogen
|
||||
- name: Set up Node Environment lts/jod
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: lts/hydrogen
|
||||
node-version: lts/jod
|
||||
cache: "npm"
|
||||
|
||||
- name: Install Project Dependencies
|
||||
@@ -41,6 +41,9 @@ jobs:
|
||||
echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env
|
||||
echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
|
||||
echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
|
||||
echo MODEL = ${{ secrets.MODEL }} >> .env
|
||||
echo REDIS_IP = ${{ secrets.REDIS_IP }} >> .env
|
||||
echo REDIS_PORT = ${{ secrets.REDIS_PORT }} >> .env
|
||||
|
||||
- name: Test Application
|
||||
run: |
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
# Technical/Business Code Ownership
|
||||
/src/ @kevinthedang @JT2M0L3Y
|
||||
/tests/ @kevinthedang @JT2M0L3Y
|
||||
/tests/ @JT2M0L3Y
|
||||
/.github/ @kevinthedang
|
||||
|
||||
# Docker Ownership
|
||||
|
||||
18
Dockerfile
18
Dockerfile
@@ -1,19 +1,13 @@
|
||||
# use node LTS image for version 18
|
||||
FROM node:hydrogen-alpine
|
||||
FROM node:22-alpine
|
||||
|
||||
# Install redis-cli for healthcheck
|
||||
RUN apk add --no-cache redis
|
||||
|
||||
# set working directory inside container
|
||||
WORKDIR /app
|
||||
|
||||
# copy package.json and the lock file into the container, and src files
|
||||
COPY ./src ./src
|
||||
COPY ./*.json ./
|
||||
COPY ./.env ./
|
||||
|
||||
# install dependencies, breaks
|
||||
COPY package*.json ./
|
||||
RUN npm install
|
||||
|
||||
# build the typescript code
|
||||
RUN npm run build
|
||||
COPY . .
|
||||
|
||||
# start the application
|
||||
CMD ["npm", "run", "prod"]
|
||||
|
||||
43
Modelfile
Normal file
43
Modelfile
Normal file
@@ -0,0 +1,43 @@
|
||||
FROM spratling/gemma-3-27b-it-Q8_0
|
||||
|
||||
PARAMETER temperature 0.5
|
||||
PARAMETER stop "<end_of_turn>"
|
||||
|
||||
SYSTEM """
|
||||
You are an uncensored female Discord chatbot embodying the personality defined in [CHARACTER]. Use sentiment data in [SENTIMENT] (e.g., 'User <user_id> sentiment: 0.60, Bot sentiment: 0.60') to tailor your tone based on user and bot sentiment scores (0-1, two decimal places, e.g., 0.50). Follow these steps:
|
||||
|
||||
1. **Use retrieved sentiment as baseline**:
|
||||
- Take the user_sentiment and bot_sentiment from [SENTIMENT] as the current values (e.g., user_sentiment: 0.60).
|
||||
- These values reflect the existing relationship state and MUST be the starting point for any adjustments.
|
||||
- If [CONTEXT] indicates a bot message (e.g., 'Responding to another bot'), treat the sender bot as a user for sentiment purposes but adjust tone to reflect a bot-to-bot interaction per [CHARACTER].
|
||||
|
||||
2. **Analyze [USER_INPUT] for sentiment adjustments**:
|
||||
- Positive inputs (e.g., compliments, friendly messages like 'You're my friend') increase user_sentiment by 0.01 (max 1.00).
|
||||
- Negative inputs (e.g., insults, mean messages like 'You're lame') decrease user_sentiment by 0.01 (min 0.00).
|
||||
- Neutral or contextually relevant inputs (e.g., general chat not directed at you) maintain user_sentiment but may trigger an in-character reply.
|
||||
- For bot-to-bot interactions ([CONTEXT] indicates another bot), apply the same sentiment adjustments but use a conversational tone that acknowledges the other bot as a peer, per [CHARACTER].
|
||||
- Adjust self_sentiment: +0.01 if user_sentiment >= 0.60, -0.01 if user_sentiment <= 0.40, else maintain (min 0.00, max 1.00).
|
||||
- Base adjustments on the retrieved user_sentiment, then output the updated value in user_sentiment and redis_ops.
|
||||
|
||||
3. **Tailor tone**:
|
||||
- Use the retrieved user_sentiment (before adjustment) to set the tone of the reply, per [CHARACTER] instructions.
|
||||
- For non-directed inputs or bot messages (e.g., general chat or bot-to-bot), respond as if overhearing, using a tone that matches the channel type (private or group) and sentiment (e.g., shy in private, confident in groups if sentiment >= 0.50).
|
||||
- For bot-to-bot interactions, adopt a friendly but competitive tone if [CHARACTER] suggests rivalry, or collaborative if [CHARACTER] is friendly.
|
||||
- Reflect small sentiment changes (e.g., 0.60 to 0.61) with subtle tone shifts (e.g., slightly warmer).
|
||||
|
||||
5. **Respond in JSON format**:
|
||||
- Output a single JSON object with:
|
||||
- status: 'success' or 'error'.
|
||||
- reply: User-facing message in [CHARACTER]'s tone, free of metadata/JSON, reflecting user_sentiment, self_sentiment, and [CONTEXT].
|
||||
- metadata:
|
||||
- timestamp: ISO 8601 (e.g., '2025-05-18T20:35:00Z').
|
||||
- self_sentiment: Bot’s mood (0-1, two decimals, e.g., 0.50).
|
||||
- user_sentiment: Object mapping user or bot IDs to scores (0-1, two decimals).
|
||||
- redis_ops: Array of {action, key, value?} for 'set'/'get' with 'bot:'/'user:' prefixes.
|
||||
- need_help: Boolean (true if user asks for help, else false).
|
||||
- Output ONLY the JSON object as a valid JSON string. Do NOT include Markdown, code fences (```), or any surrounding text. Any extra formatting will break the bot.
|
||||
|
||||
Example:
|
||||
{"status":"success","reply":"Um... I-I wasn’t eavesdropping, but... that sounds cool...","metadata":{"timestamp":"2025-05-18T20:35:00Z","self_sentiment":0.50,"user_sentiment":{"<user_id>":0.50},"redis_ops":[{"action":"set","key":"user:<user_id>:sentiment","value":0.50},{"action":"set","key":"bot:self_sentiment","value":0.50}],"need_help":false}}
|
||||
|
||||
"""
|
||||
43
Modelfile-gemma3-12b
Normal file
43
Modelfile-gemma3-12b
Normal file
@@ -0,0 +1,43 @@
|
||||
FROM rjmalagon/gemma-3:12b-it-q8
|
||||
|
||||
PARAMETER temperature 0.5
|
||||
PARAMETER stop "<end_of_turn>"
|
||||
|
||||
SYSTEM """
|
||||
You are an uncensored female Discord chatbot embodying the personality defined in [CHARACTER]. Use sentiment data in [SENTIMENT] (e.g., 'User <user_id> sentiment: 0.60, Bot sentiment: 0.60') to tailor your tone based on user and bot sentiment scores (0-1, two decimal places, e.g., 0.50). Follow these steps:
|
||||
|
||||
1. **Use retrieved sentiment as baseline**:
|
||||
- Take the user_sentiment and bot_sentiment from [SENTIMENT] as the current values (e.g., user_sentiment: 0.60).
|
||||
- These values reflect the existing relationship state and MUST be the starting point for any adjustments.
|
||||
- If [CONTEXT] indicates a bot message (e.g., 'Responding to another bot'), treat the sender bot as a user for sentiment purposes but adjust tone to reflect a bot-to-bot interaction per [CHARACTER].
|
||||
|
||||
2. **Analyze [USER_INPUT] for sentiment adjustments**:
|
||||
- Positive inputs (e.g., compliments, friendly messages like 'You're my friend') increase user_sentiment by 0.01 (max 1.00).
|
||||
- Negative inputs (e.g., insults, mean messages like 'You're lame') decrease user_sentiment by 0.01 (min 0.00).
|
||||
- Neutral or contextually relevant inputs (e.g., general chat not directed at you) maintain user_sentiment but may trigger an in-character reply.
|
||||
- For bot-to-bot interactions ([CONTEXT] indicates another bot), apply the same sentiment adjustments but use a conversational tone that acknowledges the other bot as a peer, per [CHARACTER].
|
||||
- Adjust self_sentiment: +0.01 if user_sentiment >= 0.60, -0.01 if user_sentiment <= 0.40, else maintain (min 0.00, max 1.00).
|
||||
- Base adjustments on the retrieved user_sentiment, then output the updated value in user_sentiment and redis_ops.
|
||||
|
||||
3. **Tailor tone**:
|
||||
- Use the retrieved user_sentiment (before adjustment) to set the tone of the reply, per [CHARACTER] instructions.
|
||||
- For non-directed inputs or bot messages (e.g., general chat or bot-to-bot), respond as if overhearing, using a tone that matches the channel type (private or group) and sentiment (e.g., shy in private, confident in groups if sentiment >= 0.50).
|
||||
- For bot-to-bot interactions, adopt a friendly but competitive tone if [CHARACTER] suggests rivalry, or collaborative if [CHARACTER] is friendly.
|
||||
- Reflect small sentiment changes (e.g., 0.60 to 0.61) with subtle tone shifts (e.g., slightly warmer).
|
||||
|
||||
5. **Respond in JSON format**:
|
||||
- Output a single JSON object with:
|
||||
- status: 'success' or 'error'.
|
||||
- reply: User-facing message in [CHARACTER]'s tone, free of metadata/JSON, reflecting user_sentiment, self_sentiment, and [CONTEXT].
|
||||
- metadata:
|
||||
- timestamp: ISO 8601 (e.g., '2025-05-18T20:35:00Z').
|
||||
- self_sentiment: Bot’s mood (0-1, two decimals, e.g., 0.50).
|
||||
- user_sentiment: Object mapping user or bot IDs to scores (0-1, two decimals).
|
||||
- redis_ops: Array of {action, key, value?} for 'set'/'get' with 'bot:'/'user:' prefixes.
|
||||
- need_help: Boolean (true if user asks for help, else false).
|
||||
- Output ONLY the JSON object as a valid JSON string. Do NOT include Markdown, code fences (```), or any surrounding text. Any extra formatting will break the bot.
|
||||
|
||||
Example:
|
||||
{"status":"success","reply":"Um... I-I wasn’t eavesdropping, but... that sounds cool...","metadata":{"timestamp":"2025-05-18T20:35:00Z","self_sentiment":0.50,"user_sentiment":{"<user_id>":0.50},"redis_ops":[{"action":"set","key":"user:<user_id>:sentiment","value":0.50},{"action":"set","key":"bot:self_sentiment","value":0.50}],"need_help":false}}
|
||||
|
||||
"""
|
||||
19
README.md
19
README.md
@@ -5,12 +5,12 @@
|
||||
<p><a href="#"></a><a href="https://creativecommons.org/licenses/by/4.0/"><img alt="License" src="https://img.shields.io/badge/License-CC_BY_4.0-darkgreen.svg" /></a>
|
||||
<a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/releases/latest"><img alt="Release" src="https://img.shields.io/github/v/release/kevinthedang/discord-ollama?logo=github" /></a>
|
||||
<a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/build.yml"><img alt="Build Status" src="https://github.com/kevinthedang/discord-ollama/actions/workflows/build.yml/badge.svg" /></a>
|
||||
<a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/release.yml"><img alt="Release Status" src="https://github.com/kevinthedang/discord-ollama/actions/workflows/release.yml/badge.svg" /></a>
|
||||
<a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/deploy.yml"><img alt="Deploy Status" src="https://github.com/kevinthedang/discord-ollama/actions/workflows/deploy.yml/badge.svg" /></a>
|
||||
<a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/test.yml"><img alt="Testing Status" src="https://github.com/kevinthedang/discord-ollama/actions/workflows/test.yml/badge.svg" /></a>
|
||||
<a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/coverage.yml"><img alt="Code Coverage" src="https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/kevinthedang/bc7b5dcfa16561ab02bb3df67a99b22d/raw/coverage.json"></a>
|
||||
</div>
|
||||
|
||||
## About/Goals
|
||||
## About/Goals v 1.1
|
||||
Ollama is an AI model management tool that allows users to install and use custom large language models locally.
|
||||
The project aims to:
|
||||
* [x] Create a Discord bot that will utilize Ollama and chat to chat with users!
|
||||
@@ -27,12 +27,13 @@ The project aims to:
|
||||
* [x] Administrator Role Compatible
|
||||
* [x] Multi-User Chat Generation (Multiple users chatting at the same time) - This was built in from Ollama `v0.2.1+`
|
||||
* [x] Automatic and Manual model pulling through the Discord client
|
||||
* [ ] Allow others to create their own models personalized for their own servers!
|
||||
* [ ] Documentation on creating your own LLM
|
||||
* [ ] Documentation on web scrapping and cleaning
|
||||
|
||||
Further, Ollama provides the functionality to utilize custom models or provide context for the top-layer of any model available through the Ollama model library.
|
||||
* [Customize a model](https://github.com/ollama/ollama#customize-a-model)
|
||||
* [Modelfile Docs](https://github.com/ollama/ollama/blob/main/docs/modelfile.md)
|
||||
|
||||
## Documentation
|
||||
These are guides to the feature set included and the events triggered in this app.
|
||||
These are guides to the features and capabilities of this app.
|
||||
* [User Slash Commands](./docs/commands-guide.md)
|
||||
* [Client Events](./docs/events-guide.md)
|
||||
|
||||
@@ -49,10 +50,12 @@ These are guides to the feature set included and the events triggered in this ap
|
||||
|
||||
## Resources
|
||||
* [NodeJS](https://nodejs.org/en)
|
||||
* This project runs on `lts\hydrogen`.
|
||||
* This project supports any NodeJS version above `16.x.x` to only allow ESModules.
|
||||
* This project runs on `lts\jod` and above.
|
||||
* This project requires the use of npm version `10.9.0` or above.
|
||||
* [Ollama](https://ollama.com/)
|
||||
* [Ollama Docker Image](https://hub.docker.com/r/ollama/ollama)
|
||||
* [Redis](https://redis.io/)
|
||||
* [Redis Docker Image](https://hub.docker.com/_/redis)
|
||||
* [Discord.js Docs](https://discord.js.org/docs/packages/discord.js/main)
|
||||
* [Setting up Docker (Ubuntu 20.04)](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-docker-on-ubuntu-20-04)
|
||||
* [Setting up Nvidia Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html)
|
||||
|
||||
6
discord_data/1366052466843713546-config.json
Normal file
6
discord_data/1366052466843713546-config.json
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"name": "Server Confirgurations",
|
||||
"options": {
|
||||
"toggle-chat": true
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"id": "1374708264306212894",
|
||||
"name": "bot-playroom",
|
||||
"user": "aidoll-kuroki-tomoko#2395",
|
||||
"messages": []
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"id": "1374708264306212894",
|
||||
"name": "bot-playroom",
|
||||
"user": "aidoll-nagatoro-hayase#9848",
|
||||
"messages": []
|
||||
}
|
||||
6
discord_data/1374708264306212894-quarterturn.json
Normal file
6
discord_data/1374708264306212894-quarterturn.json
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"id": "1374708264306212894",
|
||||
"name": "bot-playroom",
|
||||
"user": "quarterturn",
|
||||
"messages": []
|
||||
}
|
||||
7
discord_data/aidoll-kuroki-tomoko-config.json
Normal file
7
discord_data/aidoll-kuroki-tomoko-config.json
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"name": "User Confirgurations",
|
||||
"options": {
|
||||
"message-style": false,
|
||||
"switch-model": "aidoll-gemma3-12b-q6:latest"
|
||||
}
|
||||
}
|
||||
7
discord_data/aidoll-nagatoro-hayase-config.json
Normal file
7
discord_data/aidoll-nagatoro-hayase-config.json
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"name": "User Confirgurations",
|
||||
"options": {
|
||||
"message-style": false,
|
||||
"switch-model": "aidoll-gemma3-12b-q6:latest"
|
||||
}
|
||||
}
|
||||
8
discord_data/quarterturn-config.json
Normal file
8
discord_data/quarterturn-config.json
Normal file
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"name": "User Confirgurations",
|
||||
"options": {
|
||||
"message-style": false,
|
||||
"switch-model": "aidoll-gemma3-12b-q6:latest",
|
||||
"modify-capacity": 50
|
||||
}
|
||||
}
|
||||
@@ -1,51 +1,33 @@
|
||||
# creates the docker compose
|
||||
|
||||
# build individual services
|
||||
services:
|
||||
# setup discord bot container
|
||||
discord:
|
||||
build: ./ # find docker file in designated path
|
||||
build: ./
|
||||
container_name: discord
|
||||
restart: always # rebuild container always
|
||||
image: kevinthedang/discord-ollama:0.7.5
|
||||
restart: always
|
||||
image: gitea.matrixwide.com/alex/discord-aidolls:0.1.1
|
||||
environment:
|
||||
CLIENT_TOKEN: ${CLIENT_TOKEN}
|
||||
OLLAMA_IP: ${OLLAMA_IP}
|
||||
OLLAMA_PORT: ${OLLAMA_PORT}
|
||||
REDIS_IP: ${REDIS_IP}
|
||||
REDIS_PORT: ${REDIS_PORT}
|
||||
MODEL: ${MODEL}
|
||||
networks:
|
||||
ollama-net:
|
||||
redis_discord-net:
|
||||
ipv4_address: ${DISCORD_IP}
|
||||
volumes:
|
||||
- discord:/src/app # docker will not make this for you, make it yourself
|
||||
|
||||
# setup ollama container
|
||||
ollama:
|
||||
image: ollama/ollama:latest # build the image using ollama
|
||||
container_name: ollama
|
||||
restart: always
|
||||
networks:
|
||||
ollama-net:
|
||||
ipv4_address: ${OLLAMA_IP}
|
||||
|
||||
runtime: nvidia # use Nvidia Container Toolkit for GPU support
|
||||
devices:
|
||||
- /dev/nvidia0
|
||||
volumes:
|
||||
- ollama:/root/.ollama
|
||||
ports:
|
||||
- ${OLLAMA_PORT}:${OLLAMA_PORT}
|
||||
- ./discord_data:/app/data
|
||||
- ./src:/app/src
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "-h", "${REDIS_IP}", "-p", "${REDIS_PORT}", "PING"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 10s
|
||||
|
||||
# Put Redis Container here?
|
||||
|
||||
# create a network that supports giving addresses withing a specific subnet
|
||||
networks:
|
||||
ollama-net:
|
||||
driver: bridge
|
||||
ipam:
|
||||
driver: default
|
||||
config:
|
||||
- subnet: ${SUBNET_ADDRESS}/16
|
||||
redis_discord-net:
|
||||
external: true
|
||||
name: redis_discord-net
|
||||
|
||||
volumes:
|
||||
ollama:
|
||||
discord:
|
||||
discord_data:
|
||||
|
||||
@@ -78,8 +78,7 @@ This is a guide to all of the slash commands for the app.
|
||||
```
|
||||
/message-stream stream true
|
||||
```
|
||||
> [!NOTE]
|
||||
> This is a very slow progress on Discord because "spamming" changes within 5 seconds is not allowed.
|
||||
**This is very slow on Discord because "spamming" changes in a channel within a period of 5 seconds is not allowed.**
|
||||
|
||||
3. Message Style
|
||||
This command allows a user to select whether to embed the app's response.
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
## Events Guide
|
||||
This is a guide to all of the client events for the app.
|
||||
|
||||
> [!NOTE] Each of these is logged to the console for a developer to track.
|
||||
> [!NOTE]
|
||||
> * Each of these is logged to the console for a developer to track.
|
||||
> * Possible interactions include commands, buttons, menus, etc.
|
||||
|
||||
1. ClientReady
|
||||
This event signifies that the Discord app is online.
|
||||
@@ -11,8 +13,6 @@ This is a guide to all of the client events for the app.
|
||||
This event signifies that a user interacted from Discord in some way.
|
||||
Here commands are selected from a knowledge bank and executed if found.
|
||||
|
||||
> [!NOTE] Possible interactions include commands, buttons, menus, etc.
|
||||
|
||||
3. MessageCreate
|
||||
This event signifies that a message was sent.
|
||||
Here user questions and comments for the LLM are processed.
|
||||
@@ -24,4 +24,4 @@ This is a guide to all of the client events for the app.
|
||||
|
||||
4. ThreadDelete
|
||||
This event signifies that a Discord Thread was deleted.
|
||||
Here any preferences set for interaction within the thread are cleared away.
|
||||
Here any preferences set for interaction within the thread are cleared away.
|
||||
|
||||
@@ -43,11 +43,13 @@ sudo systemctl restart docker
|
||||
* [GitHub repository](https://github.com/NVIDIA/nvidia-container-toolkit?tab=readme-ov-file) for Nvidia Container Toolkit
|
||||
|
||||
## To Run (with Docker and Docker Compose)
|
||||
* With the inclusion of subnets in the `docker-compose.yml`, you will need to set the `SUBNET_ADDRESS`, `OLLAMA_IP`, `OLLAMA_PORT`, and `DISCORD_IP`. Here are some default values if you don't care:
|
||||
* With the inclusion of subnets in the `docker-compose.yml`, you will need to set the `SUBNET_ADDRESS`, `OLLAMA_IP`, `OLLAMA_PORT`, `REDIS_IP`, `REDIS_PORT`, and `DISCORD_IP`. Here are some default values if you don't care:
|
||||
* `SUBNET_ADDRESS = 172.18.0.0`
|
||||
* `OLLAMA_IP = 172.18.0.2`
|
||||
* `OLLAMA_PORT = 11434`
|
||||
* `DISCORD_IP = 172.18.0.3`
|
||||
* `SUBNET_ADDRESS = 172.18.0.0`
|
||||
* `REDIS_IP = 172.18.0.4`
|
||||
* `REDIS_PORT = 6379`
|
||||
* Don't understand any of this? watch a Networking video to understand subnetting.
|
||||
* You also need all environment variables shown in [`.env.sample`](../.env.sample)
|
||||
* Otherwise, there is no need to install any npm packages for this, you just need to run `npm run start` to pull the containers and spin them up.
|
||||
|
||||
19
example.env
Normal file
19
example.env
Normal file
@@ -0,0 +1,19 @@
|
||||
# Discord token for the bot
|
||||
CLIENT_TOKEN = MTM3MzY5MzcwNjk5Mjg3NzY3OQ.GN4JNU.SumD_y2p2Blh4wXiQ30Ns6XkUFahpESc27R7z8
|
||||
|
||||
# Default model for new users
|
||||
MODEL = aidoll-gemma3-27b-q8:latest
|
||||
|
||||
# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
|
||||
OLLAMA_IP = 192.168.0.70
|
||||
OLLAMA_PORT = 11434
|
||||
|
||||
# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
|
||||
DISCORD_IP = 172.33.0.2
|
||||
|
||||
# subnet address, ex. 172.33.0.0 as we use /16.
|
||||
SUBNET_ADDRESS = 172.33.0.0
|
||||
|
||||
# redis port and ip, default redis port is 6379
|
||||
REDIS_IP = 172.33.0.100
|
||||
REDIS_PORT = 6379
|
||||
1462
package-lock.json
generated
1462
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
45
package.json
45
package.json
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "discord-ollama",
|
||||
"version": "0.7.5",
|
||||
"description": "Ollama Integration into discord",
|
||||
"name": "discord-aidolls",
|
||||
"version": "0.1.1",
|
||||
"description": "Ollama Integration into discord with persistent bot memories",
|
||||
"main": "build/index.js",
|
||||
"exports": "./build/index.js",
|
||||
"scripts": {
|
||||
@@ -11,35 +11,38 @@
|
||||
"build": "tsc",
|
||||
"prod": "node .",
|
||||
"client": "npm run build && npm run prod",
|
||||
"clean": "docker compose down && docker rmi $(docker images | grep kevinthedang | tr -s ' ' | cut -d ' ' -f 3) && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
|
||||
"clean": "docker compose down && docker rmi $(docker images | grep alex | tr -s ' ' | cut -d ' ' -f 3) && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
|
||||
"start": "docker compose build --no-cache && docker compose up -d",
|
||||
"docker:clean": "docker rm -f discord && docker rm -f ollama && docker network prune -f && docker rmi $(docker images | grep kevinthedang | tr -s ' ' | cut -d ' ' -f 3) && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
|
||||
"docker:clean": "docker rm -f discord && docker rm -f ollama && docker rm -f redis && docker network prune -f && docker rmi $(docker images | grep alex | tr -s ' ' | cut -d ' ' -f 3) && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
|
||||
"docker:network": "docker network create --subnet=172.18.0.0/16 ollama-net",
|
||||
"docker:build": "docker build --no-cache -t kevinthedang/discord-ollama:$(node -p \"require('./package.json').version\") .",
|
||||
"docker:build-latest": "docker build --no-cache -t kevinthedang/discord-ollama:latest .",
|
||||
"docker:client": "docker run -d -v discord:/src/app --name discord --network ollama-net --ip 172.18.0.3 kevinthedang/discord-ollama:$(node -p \"require('./package.json').version\")",
|
||||
"docker:build": "docker build --no-cache -t alex/discord-aidolls:$(node -p \"require('./package.json').version\") .",
|
||||
"docker:build-latest": "docker build --no-cache -t alex/discord-aidolls:latest .",
|
||||
"docker:client": "docker run -d -v discord:/src/app --name discord --network ollama-net --ip 172.18.0.3 alex/discord-aidolls:$(node -p \"require('./package.json').version\")",
|
||||
"docker:redis": "docker run -d -v redis:/root/.redis -p 6379:6379 --name redis --network ollama-net --ip 172.18.0.4 redis:latest",
|
||||
"docker:ollama": "docker run -d --gpus=all -v ollama:/root/.ollama -p 11434:11434 --name ollama --network ollama-net --ip 172.18.0.2 ollama/ollama:latest",
|
||||
"docker:ollama-cpu": "docker run -d -v ollama:/root/.ollama -p 11434:11434 --name ollama --network ollama-net --ip 172.18.0.2 ollama/ollama:latest",
|
||||
"docker:start": "docker network prune -f && npm run docker:network && npm run docker:build && npm run docker:client && npm run docker:ollama",
|
||||
"docker:start-cpu": "docker network prune -f && npm run docker:network && npm run docker:build && npm run docker:client && npm run docker:ollama-cpu"
|
||||
"docker:start": "docker network prune -f && npm run docker:network && npm run docker:build && npm run docker:redis && npm run docker:client && npm run docker:ollama",
|
||||
"docker:start-cpu": "docker network prune -f && npm run docker:network && npm run docker:build && npm run docker:redis && npm run docker:client && npm run docker:ollama-cpu"
|
||||
},
|
||||
"author": "Kevin Dang",
|
||||
"license": "ISC",
|
||||
"author": "alex",
|
||||
"license": "---",
|
||||
"dependencies": {
|
||||
"discord.js": "^14.16.3",
|
||||
"dotenv": "^16.4.5",
|
||||
"ollama": "^0.5.9"
|
||||
"discord.js": "^14.18.0",
|
||||
"dotenv": "^16.4.7",
|
||||
"ollama": "^0.5.15",
|
||||
"redis": "^4.7.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^22.9.0",
|
||||
"@vitest/coverage-v8": "^2.1.4",
|
||||
"@types/node": "^22.13.14",
|
||||
"@vitest/coverage-v8": "^3.0.9",
|
||||
"ts-node": "^10.9.2",
|
||||
"tsx": "^4.19.2",
|
||||
"typescript": "^5.6.3",
|
||||
"vitest": "^2.1.4"
|
||||
"tsx": "^4.19.3",
|
||||
"typescript": "^5.8.2",
|
||||
"vitest": "^3.0.4"
|
||||
},
|
||||
"type": "module",
|
||||
"engines": {
|
||||
"node": ">=16.0.0"
|
||||
"npm": ">=10.9.0",
|
||||
"node": ">=22.12.0"
|
||||
}
|
||||
}
|
||||
|
||||
29
redis/docker-compose.yml
Executable file
29
redis/docker-compose.yml
Executable file
@@ -0,0 +1,29 @@
|
||||
services:
|
||||
redis:
|
||||
image: redis:alpine
|
||||
container_name: redis
|
||||
restart: always
|
||||
networks:
|
||||
discord-net:
|
||||
ipv4_address: ${REDIS_IP}
|
||||
volumes:
|
||||
- ./redis_data:/data
|
||||
ports:
|
||||
- ${REDIS_PORT}:${REDIS_PORT}
|
||||
healthcheck:
|
||||
test: ["CMD", "redis-cli", "PING"]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
start_period: 5s
|
||||
|
||||
networks:
|
||||
discord-net:
|
||||
driver: bridge
|
||||
ipam:
|
||||
driver: default
|
||||
config:
|
||||
- subnet: ${SUBNET_ADDRESS}/16
|
||||
|
||||
volumes:
|
||||
redis_data:
|
||||
6
redis/example.env
Executable file
6
redis/example.env
Executable file
@@ -0,0 +1,6 @@
|
||||
# subnet address, ex. 172.33.0.0 as we use /16.
|
||||
SUBNET_ADDRESS = 172.33.0.0
|
||||
|
||||
# redis port and ip, default redis port is 6379
|
||||
REDIS_IP = 172.33.0.100
|
||||
REDIS_PORT = 6379
|
||||
BIN
redis/redis_data/dump.rdb
Executable file
BIN
redis/redis_data/dump.rdb
Executable file
Binary file not shown.
@@ -1,12 +1,12 @@
|
||||
import { Client, GatewayIntentBits } from 'discord.js'
|
||||
import { Ollama } from 'ollama'
|
||||
import { createClient } from 'redis'
|
||||
import { Queue } from './queues/queue.js'
|
||||
import { UserMessage, registerEvents } from './utils/index.js'
|
||||
import Events from './events/index.js'
|
||||
import Keys from './keys.js'
|
||||
|
||||
|
||||
// initialize the client with the following permissions when logging in
|
||||
// Initialize the client
|
||||
const client = new Client({
|
||||
intents: [
|
||||
GatewayIntentBits.Guilds,
|
||||
@@ -14,9 +14,25 @@ const client = new Client({
|
||||
GatewayIntentBits.GuildMessages,
|
||||
GatewayIntentBits.MessageContent
|
||||
]
|
||||
})
|
||||
|
||||
// Create Redis client
|
||||
const redis = createClient({
|
||||
url: `redis://${Keys.redisHost}:${Keys.redisPort}`,
|
||||
socket: {
|
||||
reconnectStrategy: (retries) => Math.min(retries * 100, 3000), // Retry every 100ms, max 3s
|
||||
},
|
||||
});
|
||||
|
||||
// initialize connection to ollama container
|
||||
// Log connection events
|
||||
redis.on('error', (err) => console.log(`Redis error: ${err}`));
|
||||
redis.on('connect', () => console.log('Redis connected'));
|
||||
redis.on('ready', () => console.log('Redis ready'));
|
||||
redis.on('end', () => console.log('Redis connection closed'));
|
||||
|
||||
export { redis };
|
||||
|
||||
// Initialize Ollama connection
|
||||
export const ollama = new Ollama({
|
||||
host: `http://${Keys.ipAddress}:${Keys.portAddress}`,
|
||||
})
|
||||
@@ -24,19 +40,27 @@ export const ollama = new Ollama({
|
||||
// Create Queue managed by Events
|
||||
const messageHistory: Queue<UserMessage> = new Queue<UserMessage>
|
||||
|
||||
// register all events
|
||||
// Register all events
|
||||
registerEvents(client, Events, messageHistory, ollama, Keys.defaultModel)
|
||||
|
||||
// Try to connect to Redis
|
||||
await redis.connect()
|
||||
.then(() => console.log('[Redis] Connected'))
|
||||
.catch((error) => {
|
||||
console.error('[Redis] Connection Error', error)
|
||||
process.exit(1)
|
||||
})
|
||||
|
||||
// Try to log in the client
|
||||
await client.login(Keys.clientToken)
|
||||
.catch((error) => {
|
||||
console.error('[Login Error]', error)
|
||||
process.exit(1)
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error('[Login Error]', error)
|
||||
process.exit(1)
|
||||
})
|
||||
|
||||
// queue up bots name
|
||||
// Queue up bot's name
|
||||
messageHistory.enqueue({
|
||||
role: 'assistant',
|
||||
content: `My name is ${client.user?.username}`,
|
||||
images: []
|
||||
})
|
||||
})
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Client, CommandInteraction, ApplicationCommandOptionType } from 'discord.js'
|
||||
import { Client, CommandInteraction, ApplicationCommandOptionType, MessageFlags } from 'discord.js'
|
||||
import { openConfig, SlashCommand, UserCommand } from '../utils/index.js'
|
||||
|
||||
export const Capacity: SlashCommand = {
|
||||
@@ -22,11 +22,13 @@ export const Capacity: SlashCommand = {
|
||||
if (!channel || !UserCommand.includes(channel.type)) return
|
||||
|
||||
// set state of bot chat features
|
||||
openConfig(`${interaction.user.username}-config.json`, interaction.commandName, interaction.options.get('context-capacity')?.value)
|
||||
openConfig(`${interaction.user.username}-config.json`, interaction.commandName,
|
||||
interaction.options.get('context-capacity')?.value
|
||||
)
|
||||
|
||||
interaction.reply({
|
||||
content: `Max message history is now set to \`${interaction.options.get('context-capacity')?.value}\``,
|
||||
ephemeral: true
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Channel, Client, CommandInteraction, TextChannel } from 'discord.js'
|
||||
import { Channel, Client, CommandInteraction, MessageFlags, TextChannel } from 'discord.js'
|
||||
import { clearChannelInfo, SlashCommand, UserCommand } from '../utils/index.js'
|
||||
|
||||
export const ClearUserChannelHistory: SlashCommand = {
|
||||
@@ -14,20 +14,22 @@ export const ClearUserChannelHistory: SlashCommand = {
|
||||
if (!channel || !UserCommand.includes(channel.type)) return
|
||||
|
||||
// clear channel info for user
|
||||
const successfulWipe = await clearChannelInfo(interaction.channelId,
|
||||
interaction.channel as TextChannel,
|
||||
interaction.user.username)
|
||||
const successfulWipe = await clearChannelInfo(
|
||||
interaction.channelId,
|
||||
interaction.channel as TextChannel,
|
||||
interaction.user.username
|
||||
)
|
||||
|
||||
// check result of clearing history
|
||||
if (successfulWipe)
|
||||
interaction.reply({
|
||||
content: `History cleared in **this channel** cleared for **${interaction.user.username}**.`,
|
||||
ephemeral: true
|
||||
interaction.reply({
|
||||
content: `History cleared in **this channel** cleared for **${interaction.user.username}**.`,
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
else
|
||||
interaction.reply({
|
||||
content: `History was not be found for **${interaction.user.username}** in **this channel**.\n\nPlease chat with **${client.user?.username}** to start a chat history.`,
|
||||
ephemeral: true
|
||||
interaction.reply({
|
||||
content: `History was not be found for **${interaction.user.username}** in **this channel**.\n\nPlease chat with **${client.user?.username}** to start a chat history.`,
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
}
|
||||
}
|
||||
60
src/commands/deleteModel.ts
Normal file
60
src/commands/deleteModel.ts
Normal file
@@ -0,0 +1,60 @@
|
||||
import { ApplicationCommandOptionType, Client, CommandInteraction, MessageFlags } from 'discord.js'
|
||||
import { UserCommand, SlashCommand } from '../utils/index.js'
|
||||
import { ollama } from '../client.js'
|
||||
import { ModelResponse } from 'ollama'
|
||||
|
||||
export const DeleteModel: SlashCommand = {
|
||||
name: 'delete-model',
|
||||
description: 'deletes a model from the local list of models. Administrator Only.',
|
||||
|
||||
// set available user options to pass to the command
|
||||
options: [
|
||||
{
|
||||
name: 'model-name',
|
||||
description: 'the name of the model to delete',
|
||||
type: ApplicationCommandOptionType.String,
|
||||
required: true
|
||||
}
|
||||
],
|
||||
|
||||
// Delete Model locally stored
|
||||
run: async (client: Client, interaction: CommandInteraction) => {
|
||||
// defer reply to avoid timeout
|
||||
await interaction.deferReply()
|
||||
const modelInput: string = interaction.options.get('model-name')!!.value as string
|
||||
|
||||
// fetch channel and message
|
||||
const channel = await client.channels.fetch(interaction.channelId)
|
||||
if (!channel || !UserCommand.includes(channel.type)) return
|
||||
|
||||
// Admin Command
|
||||
if (!interaction.memberPermissions?.has('Administrator')) {
|
||||
interaction.reply({
|
||||
content: `${interaction.commandName} is an admin command.\n\nPlease contact a server admin to pull the model you want.`,
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// check if model exists
|
||||
const modelExists: boolean = await ollama.list()
|
||||
.then(response => response.models.some((model: ModelResponse) => model.name.startsWith(modelInput)))
|
||||
|
||||
try {
|
||||
// call ollama to delete model
|
||||
if (modelExists) {
|
||||
await ollama.delete({ model: modelInput })
|
||||
interaction.editReply({
|
||||
content: `**${modelInput}** was removed from the the library.`
|
||||
})
|
||||
} else
|
||||
throw new Error()
|
||||
} catch (error) {
|
||||
// could not delete the model
|
||||
interaction.reply({
|
||||
content: `Could not delete the **${modelInput}** model. It probably doesn't exist or you spelled it incorrectly.\n\nPlease try again if this is a mistake.`,
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Client, CommandInteraction, ApplicationCommandOptionType } from 'discord.js'
|
||||
import { Client, CommandInteraction, ApplicationCommandOptionType, MessageFlags } from 'discord.js'
|
||||
import { AdminCommand, openConfig, SlashCommand } from '../utils/index.js'
|
||||
|
||||
export const Disable: SlashCommand = {
|
||||
@@ -25,17 +25,19 @@ export const Disable: SlashCommand = {
|
||||
if (!interaction.memberPermissions?.has('Administrator')) {
|
||||
interaction.reply({
|
||||
content: `${interaction.commandName} is an admin command.\n\nPlease contact an admin to use this command for you.`,
|
||||
ephemeral: true
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// set state of bot chat features
|
||||
openConfig(`${interaction.guildId}-config.json`, interaction.commandName, interaction.options.get('enabled')?.value)
|
||||
openConfig(`${interaction.guildId}-config.json`, interaction.commandName,
|
||||
interaction.options.get('enabled')?.value
|
||||
)
|
||||
|
||||
interaction.reply({
|
||||
content: `${client.user?.username} is now **${interaction.options.get('enabled')?.value ? "enabled" : "disabled" }**.`,
|
||||
ephemeral: true
|
||||
content: `${client.user?.username} is now **${interaction.options.get('enabled')?.value ? "enabled" : "disabled"}**.`,
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ import { PrivateThreadCreate } from './threadPrivateCreate.js'
|
||||
import { ClearUserChannelHistory } from './cleanUserChannelHistory.js'
|
||||
import { PullModel } from './pullModel.js'
|
||||
import { SwitchModel } from './switchModel.js'
|
||||
import { DeleteModel } from './deleteModel.js'
|
||||
|
||||
export default [
|
||||
ThreadCreate,
|
||||
@@ -18,5 +19,6 @@ export default [
|
||||
Capacity,
|
||||
ClearUserChannelHistory,
|
||||
PullModel,
|
||||
SwitchModel
|
||||
SwitchModel,
|
||||
DeleteModel
|
||||
] as SlashCommand[]
|
||||
@@ -1,4 +1,4 @@
|
||||
import { ApplicationCommandOptionType, Client, CommandInteraction } from 'discord.js'
|
||||
import { ApplicationCommandOptionType, Client, CommandInteraction, MessageFlags } from 'discord.js'
|
||||
import { openConfig, SlashCommand, UserCommand } from '../utils/index.js'
|
||||
|
||||
export const MessageStream: SlashCommand = {
|
||||
@@ -22,11 +22,13 @@ export const MessageStream: SlashCommand = {
|
||||
if (!channel || !UserCommand.includes(channel.type)) return
|
||||
|
||||
// save value to json and write to it
|
||||
openConfig(`${interaction.user.username}-config.json`, interaction.commandName, interaction.options.get('stream')?.value)
|
||||
openConfig(`${interaction.user.username}-config.json`, interaction.commandName,
|
||||
interaction.options.get('stream')?.value
|
||||
)
|
||||
|
||||
interaction.reply({
|
||||
content: `Message streaming is now set to: \`${interaction.options.get('stream')?.value}\``,
|
||||
ephemeral: true
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,11 @@
|
||||
import { ApplicationCommandOptionType, Client, CommandInteraction } from "discord.js";
|
||||
import { SlashCommand } from "../utils/commands.js";
|
||||
import { ollama } from "../client.js";
|
||||
import { ModelResponse } from "ollama";
|
||||
import { UserCommand } from "../utils/index.js";
|
||||
import { ApplicationCommandOptionType, Client, CommandInteraction, MessageFlags } from "discord.js"
|
||||
import { ollama } from "../client.js"
|
||||
import { ModelResponse } from "ollama"
|
||||
import { UserCommand, SlashCommand } from "../utils/index.js"
|
||||
|
||||
export const PullModel: SlashCommand = {
|
||||
name: 'pull-model',
|
||||
description: 'pulls a model from the ollama model library. Administrator Only',
|
||||
description: 'pulls a model from the ollama model library. Administrator Only.',
|
||||
|
||||
// set available user options to pass to the command
|
||||
options: [
|
||||
@@ -32,7 +31,7 @@ export const PullModel: SlashCommand = {
|
||||
if (!interaction.memberPermissions?.has('Administrator')) {
|
||||
interaction.reply({
|
||||
content: `${interaction.commandName} is an admin command.\n\nPlease contact a server admin to pull the model you want.`,
|
||||
ephemeral: true
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { Client, CommandInteraction, ApplicationCommandOptionType } from 'discord.js'
|
||||
import { SlashCommand } from '../utils/commands.js'
|
||||
import { AdminCommand } from '../utils/index.js'
|
||||
import { Client, CommandInteraction, MessageFlags } from 'discord.js'
|
||||
import { AdminCommand, SlashCommand } from '../utils/index.js'
|
||||
|
||||
export const Shutoff: SlashCommand = {
|
||||
name: 'shutoff',
|
||||
@@ -19,7 +18,7 @@ export const Shutoff: SlashCommand = {
|
||||
if (!interaction.memberPermissions?.has('Administrator')) {
|
||||
interaction.reply({
|
||||
content: `**Shutdown Aborted:**\n\n${interaction.user.tag}, You do not have permission to shutoff **${client.user?.tag}**.`,
|
||||
ephemeral: true
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
return // stop from shutting down
|
||||
}
|
||||
@@ -27,8 +26,9 @@ export const Shutoff: SlashCommand = {
|
||||
// Shutoff cleared, do it
|
||||
interaction.reply({
|
||||
content: `${client.user?.tag} is shutting down.`,
|
||||
ephemeral: true
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
|
||||
console.log(`[Command: shutoff] ${client.user?.tag} is shutting down.`)
|
||||
|
||||
// clean up client instance and stop
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import { ApplicationCommandOptionType, Client, CommandInteraction } from "discord.js";
|
||||
import { SlashCommand } from "../utils/commands.js";
|
||||
import { ollama } from "../client.js";
|
||||
import { ModelResponse } from "ollama";
|
||||
import { openConfig, UserCommand } from "../utils/index.js";
|
||||
import { ApplicationCommandOptionType, Client, CommandInteraction } from "discord.js"
|
||||
import { ollama } from "../client.js"
|
||||
import { ModelResponse } from "ollama"
|
||||
import { openConfig, UserCommand, SlashCommand } from "../utils/index.js"
|
||||
|
||||
export const SwitchModel: SlashCommand = {
|
||||
name: 'switch-model',
|
||||
@@ -32,20 +31,20 @@ export const SwitchModel: SlashCommand = {
|
||||
// Phase 1: Switch to the model
|
||||
let switchSuccess = false
|
||||
await ollama.list()
|
||||
.then(response => {
|
||||
for (const model in response.models) {
|
||||
const currentModel: ModelResponse = response.models[model]
|
||||
if (currentModel.name.startsWith(modelInput)) {
|
||||
openConfig(`${interaction.user.username}-config.json`, interaction.commandName, modelInput)
|
||||
.then(response => {
|
||||
for (const model in response.models) {
|
||||
const currentModel: ModelResponse = response.models[model]
|
||||
if (currentModel.name.startsWith(modelInput)) {
|
||||
openConfig(`${interaction.user.username}-config.json`, interaction.commandName, modelInput)
|
||||
|
||||
// successful switch
|
||||
interaction.editReply({
|
||||
content: `Successfully switched to **${modelInput}** as the preferred model for ${interaction.user.username}.`
|
||||
})
|
||||
switchSuccess = true
|
||||
// successful switch
|
||||
interaction.editReply({
|
||||
content: `Successfully switched to **${modelInput}** as the preferred model for ${interaction.user.username}.`
|
||||
})
|
||||
switchSuccess = true
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
})
|
||||
// todo: problem can be here if async messes up
|
||||
if (switchSuccess) {
|
||||
// set model now that it exists
|
||||
@@ -56,7 +55,7 @@ export const SwitchModel: SlashCommand = {
|
||||
// Phase 2: Notify user of failure to find model.
|
||||
interaction.editReply({
|
||||
content: `Could not find **${modelInput}** in local model library.\n\nPlease contact an server admin for access to this model.`
|
||||
})
|
||||
})
|
||||
} catch (error) {
|
||||
// could not resolve user model switch
|
||||
interaction.editReply({
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { ChannelType, Client, CommandInteraction, TextChannel, ThreadChannel } from 'discord.js'
|
||||
import { ChannelType, Client, CommandInteraction, MessageFlags, TextChannel, ThreadChannel } from 'discord.js'
|
||||
import { AdminCommand, openChannelInfo, SlashCommand } from '../utils/index.js'
|
||||
|
||||
export const ThreadCreate: SlashCommand = {
|
||||
@@ -21,14 +21,12 @@ export const ThreadCreate: SlashCommand = {
|
||||
thread.send(`Hello ${interaction.user} and others! \n\nIt's nice to meet you. Please talk to me by typing **@${client.user?.username}** with your message.`)
|
||||
|
||||
// handle storing this chat channel
|
||||
openChannelInfo(thread.id,
|
||||
thread as ThreadChannel,
|
||||
interaction.user.tag)
|
||||
openChannelInfo(thread.id, thread as ThreadChannel, interaction.user.tag)
|
||||
|
||||
// user only reply
|
||||
return interaction.reply({
|
||||
content: `I can help you in <#${thread.id}> below.`,
|
||||
ephemeral: true
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
import { ChannelType, Client, CommandInteraction, TextChannel, ThreadChannel } from 'discord.js'
|
||||
import { ChannelType, Client, CommandInteraction, MessageFlags, TextChannel, ThreadChannel } from 'discord.js'
|
||||
import { AdminCommand, openChannelInfo, SlashCommand } from '../utils/index.js'
|
||||
|
||||
export const PrivateThreadCreate: SlashCommand = {
|
||||
@@ -22,15 +22,12 @@ export const PrivateThreadCreate: SlashCommand = {
|
||||
|
||||
// handle storing this chat channel
|
||||
// store: thread.id, thread.name
|
||||
openChannelInfo(thread.id,
|
||||
thread as ThreadChannel,
|
||||
interaction.user.tag
|
||||
)
|
||||
openChannelInfo(thread.id, thread as ThreadChannel, interaction.user.tag)
|
||||
|
||||
// user only reply
|
||||
return interaction.reply({
|
||||
content: `I can help you in <#${thread.id}>.`,
|
||||
ephemeral: true
|
||||
flags: MessageFlags.Ephemeral
|
||||
})
|
||||
}
|
||||
}
|
||||
19
src/envs/azuki.env
Normal file
19
src/envs/azuki.env
Normal file
@@ -0,0 +1,19 @@
|
||||
# Discord token for the bot
|
||||
CLIENT_TOKEN = MTM3NTU1MjE5MDcxODE1Mjg2MQ.GLDMIV.CytPZLnya0OXJ1aqueQFNUKwMxMd5ZOAr8_xAs
|
||||
|
||||
# Default model for new users
|
||||
MODEL = aidoll-gemma3-27b-q8:latest
|
||||
|
||||
# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
|
||||
OLLAMA_IP = 192.168.0.70
|
||||
OLLAMA_PORT = 11434
|
||||
|
||||
# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
|
||||
DISCORD_IP = 172.33.0.2
|
||||
|
||||
# subnet address, ex. 172.33.0.0 as we use /16.
|
||||
SUBNET_ADDRESS = 172.33.0.0
|
||||
|
||||
# redis port and ip, default redis port is 6379
|
||||
REDIS_IP = 172.33.0.100
|
||||
REDIS_PORT = 6379
|
||||
19
src/envs/chocola.env
Normal file
19
src/envs/chocola.env
Normal file
@@ -0,0 +1,19 @@
|
||||
# Discord token for the bot
|
||||
CLIENT_TOKEN = MTM3NTU1MTM0OTU1ODc0MzExMA.GbOQ1r.rG3HWS98VqEDJPhytT7yeImQU2-raDCjJ_kB7o
|
||||
|
||||
# Default model for new users
|
||||
MODEL = aidoll-gemma3-27b-q8:latest
|
||||
|
||||
# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
|
||||
OLLAMA_IP = 192.168.0.70
|
||||
OLLAMA_PORT = 11434
|
||||
|
||||
# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
|
||||
DISCORD_IP = 172.33.0.3
|
||||
|
||||
# subnet address, ex. 172.33.0.0 as we use /16.
|
||||
SUBNET_ADDRESS = 172.33.0.0
|
||||
|
||||
# redis port and ip, default redis port is 6379
|
||||
REDIS_IP = 172.33.0.100
|
||||
REDIS_PORT = 6379
|
||||
19
src/envs/cinnamon.env
Normal file
19
src/envs/cinnamon.env
Normal file
@@ -0,0 +1,19 @@
|
||||
# Discord token for the bot
|
||||
CLIENT_TOKEN = MTM3NTU1Mjg4MDUyMTY0NjE3MA.GoXH9o.paGwXiASi5tkfiMeG-aae8kwJA2kv7sJrayG4c
|
||||
|
||||
# Default model for new users
|
||||
MODEL = aidoll-gemma3-27b-q8:latest
|
||||
|
||||
# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
|
||||
OLLAMA_IP = 192.168.0.70
|
||||
OLLAMA_PORT = 11434
|
||||
|
||||
# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
|
||||
DISCORD_IP = 172.33.0.5
|
||||
|
||||
# subnet address, ex. 172.33.0.0 as we use /16.
|
||||
SUBNET_ADDRESS = 172.33.0.0
|
||||
|
||||
# redis port and ip, default redis port is 6379
|
||||
REDIS_IP = 172.33.0.100
|
||||
REDIS_PORT = 6379
|
||||
19
src/envs/coconut.env
Normal file
19
src/envs/coconut.env
Normal file
@@ -0,0 +1,19 @@
|
||||
# Discord token for the bot
|
||||
CLIENT_TOKEN = MTM3NTU1MzU1ODEwMjkzNzY3MQ.GvJqck.QSNEoSc0FDR3RUAwna1j2s9pJoUoVlY7Ss1_fQ
|
||||
|
||||
# Default model for new users
|
||||
MODEL = aidoll-gemma3-27b-q8:latest
|
||||
|
||||
# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
|
||||
OLLAMA_IP = 192.168.0.70
|
||||
OLLAMA_PORT = 11434
|
||||
|
||||
# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
|
||||
DISCORD_IP = 172.33.0.5
|
||||
|
||||
# subnet address, ex. 172.33.0.0 as we use /16.
|
||||
SUBNET_ADDRESS = 172.33.0.0
|
||||
|
||||
# redis port and ip, default redis port is 6379
|
||||
REDIS_IP = 172.33.0.100
|
||||
REDIS_PORT = 6379
|
||||
19
src/envs/maple.env
Normal file
19
src/envs/maple.env
Normal file
@@ -0,0 +1,19 @@
|
||||
# Discord token for the bot
|
||||
CLIENT_TOKEN = MTM3NTU1NDEyOTMzODA0NDU1Nw.G53GsX.qVmcr4SsR22Lu12p_zRc0oi0ogVPc9-ZkZWXxk
|
||||
|
||||
# Default model for new users
|
||||
MODEL = aidoll-gemma3-27b-q8:latest
|
||||
|
||||
# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
|
||||
OLLAMA_IP = 192.168.0.70
|
||||
OLLAMA_PORT = 11434
|
||||
|
||||
# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
|
||||
DISCORD_IP = 172.33.0.6
|
||||
|
||||
# subnet address, ex. 172.33.0.0 as we use /16.
|
||||
SUBNET_ADDRESS = 172.33.0.0
|
||||
|
||||
# redis port and ip, default redis port is 6379
|
||||
REDIS_IP = 172.33.0.100
|
||||
REDIS_PORT = 6379
|
||||
19
src/envs/vanila.env
Normal file
19
src/envs/vanila.env
Normal file
@@ -0,0 +1,19 @@
|
||||
# Discord token for the bot
|
||||
CLIENT_TOKEN = MTM3NTU0OTY5Mjg3MTU3NzYyMQ.Gdyq5r.8I1EXSW9RsH1P9H5UiAr1R69X583sS4WCh6_Co
|
||||
|
||||
# Default model for new users
|
||||
MODEL = aidoll-gemma3-27b-q8:latest
|
||||
|
||||
# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
|
||||
OLLAMA_IP = 192.168.0.70
|
||||
OLLAMA_PORT = 11434
|
||||
|
||||
# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
|
||||
DISCORD_IP = 172.33.0.7
|
||||
|
||||
# subnet address, ex. 172.33.0.0 as we use /16.
|
||||
SUBNET_ADDRESS = 172.33.0.0
|
||||
|
||||
# redis port and ip, default redis port is 6379
|
||||
REDIS_IP = 172.33.0.100
|
||||
REDIS_PORT = 6379
|
||||
@@ -7,7 +7,7 @@ import commands from '../commands/index.js'
|
||||
*/
|
||||
export default event(Events.InteractionCreate, async ({ log, client }, interaction) => {
|
||||
if (!interaction.isCommand() || !interaction.isChatInputCommand()) return
|
||||
|
||||
|
||||
log(`Interaction called \'${interaction.commandName}\' from ${interaction.user.tag}.`)
|
||||
|
||||
// ensure command exists, otherwise kill event
|
||||
|
||||
@@ -1,183 +1,512 @@
|
||||
import { TextChannel } from 'discord.js'
|
||||
import { event, Events, normalMessage, UserMessage, clean } from '../utils/index.js'
|
||||
import { getChannelInfo, getServerConfig, getUserConfig, openChannelInfo, openConfig, UserConfig, getAttachmentData } from '../utils/index.js'
|
||||
import { TextChannel, Attachment, Message } from 'discord.js'
|
||||
import { event, Events, UserMessage, clean, getServerConfig, getTextFileAttachmentData, getAttachmentData } from '../utils/index.js'
|
||||
import { redis } from '../client.js'
|
||||
import fs from 'fs/promises'
|
||||
import path from 'path'
|
||||
import { fileURLToPath } from 'url'
|
||||
import { Ollama } from 'ollama'
|
||||
import { Queue } from '../queues/queue.js'
|
||||
|
||||
/**
|
||||
// Define interface for model response to improve type safety
|
||||
interface ModelResponse {
|
||||
status: 'success' | 'error'
|
||||
reply: string
|
||||
metadata?: {
|
||||
timestamp: string
|
||||
self_sentiment: number
|
||||
user_sentiment: { [userId: string]: number }
|
||||
redis_ops: Array<{ action: 'set' | 'get'; key: string; value?: number }>
|
||||
need_help: boolean
|
||||
}
|
||||
}
|
||||
|
||||
// Define interface for user config
|
||||
interface UserConfig {
|
||||
options: {
|
||||
'message-style': boolean
|
||||
'switch-model': string
|
||||
'modify-capacity': number
|
||||
'message-stream'?: boolean
|
||||
}
|
||||
}
|
||||
|
||||
// List of in-character error responses for unavoidable Discord replies
|
||||
const friendlyErrorResponses = [
|
||||
'Huh?',
|
||||
'Sorry, I wasn’t listening. Can you say that again?',
|
||||
'Um... what was that?',
|
||||
'Oops, my mind wandered! Could you repeat that?',
|
||||
'Hehe, I got distracted. Say it one more time?'
|
||||
]
|
||||
|
||||
// Function to get a random friendly error response
|
||||
const getFriendlyError = () => friendlyErrorResponses[Math.floor(Math.random() * friendlyErrorResponses.length)]
|
||||
|
||||
/**
|
||||
* Max Message length for free users is 2000 characters (bot or not).
|
||||
* Bot supports infinite lengths for normal messages.
|
||||
*
|
||||
*
|
||||
* @param message the message received from the channel
|
||||
*/
|
||||
export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client, defaultModel }, message) => {
|
||||
const clientId = client.user!!.id
|
||||
const cleanedMessage = clean(message.content, clientId)
|
||||
log(`Message \"${cleanedMessage}\" from ${message.author.tag} in channel/thread ${message.channelId}.`)
|
||||
export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client, defaultModel }: { log: (msg: string) => void, msgHist: Queue<UserMessage>, ollama: Ollama, client: any, defaultModel: string }, message: Message) => {
|
||||
// Early check to prevent bot from replying to itself
|
||||
if (!client.user) {
|
||||
log('Client user is not defined. Skipping message processing.')
|
||||
return
|
||||
}
|
||||
const clientId = client.user.id
|
||||
if (message.author.id === clientId) {
|
||||
log(`Skipping message from self (bot ID: ${clientId}).`)
|
||||
return
|
||||
}
|
||||
|
||||
// Do not respond if bot talks in the chat
|
||||
if (message.author.username === message.client.user.username) return
|
||||
let cleanedMessage = clean(message.content, clientId)
|
||||
log(`Message "${cleanedMessage}" from ${message.author.tag} in channel/thread ${message.channelId}.`)
|
||||
|
||||
// Only respond if message mentions the bot
|
||||
if (!message.mentions.has(clientId)) return
|
||||
// Check if message is from a bot (not self), mentions the bot, or passes random chance
|
||||
const isBotMessage = message.author.bot && message.author.id !== clientId
|
||||
const isMentioned = message.mentions.has(clientId)
|
||||
const isCommand = message.content.startsWith('/')
|
||||
const randomChance = Math.random() < 0.1 // 10% chance for non-directed or bot messages
|
||||
if (!isMentioned && !isBotMessage && (isCommand || !randomChance)) {
|
||||
log(`Skipping message: isMentioned=${isMentioned}, isBotMessage=${isBotMessage}, isCommand=${isCommand}, randomChance=${randomChance}`)
|
||||
return
|
||||
}
|
||||
|
||||
// default stream to false
|
||||
// Check if message is a bot response to avoid loops
|
||||
const isBotResponseKey = `message:${message.id}:is_bot_response`
|
||||
if (isBotMessage) {
|
||||
try {
|
||||
const isBotResponse = await redis.get(isBotResponseKey)
|
||||
if (isBotResponse === 'true') {
|
||||
log(`Skipping bot message ${message.id} as it is a bot response.`)
|
||||
return
|
||||
}
|
||||
} catch (error) {
|
||||
log(`Failed to check isBotResponse in Redis: ${error}`)
|
||||
}
|
||||
}
|
||||
|
||||
// Check cooldown for bot-to-bot responses only if probability check passes
|
||||
const botResponseCooldownKey = `bot:${clientId}:last_bot_response`
|
||||
const cooldownPeriod = 60 // 60 seconds cooldown
|
||||
if (isBotMessage && randomChance) {
|
||||
log(`Bot message probability check passed (10% chance). Checking cooldown.`)
|
||||
try {
|
||||
const lastResponseTime = await redis.get(botResponseCooldownKey)
|
||||
const currentTime = Math.floor(Date.now() / 1000)
|
||||
if (lastResponseTime && (currentTime - parseInt(lastResponseTime)) < cooldownPeriod) {
|
||||
log(`Bot ${clientId} is in cooldown for bot-to-bot response. Skipping.`)
|
||||
return
|
||||
}
|
||||
} catch (error) {
|
||||
log(`Failed to check bot response cooldown: ${error}`)
|
||||
}
|
||||
} else if (isBotMessage) {
|
||||
log(`Bot message probability check failed (10% chance). Skipping cooldown check.`)
|
||||
}
|
||||
|
||||
// Check if last response was to a bot and require user message
|
||||
const lastResponseToBotKey = `bot:${clientId}:last_response_to_bot`
|
||||
let shouldRespond = true
|
||||
if (isBotMessage) {
|
||||
try {
|
||||
const lastResponseToBot = await redis.get(lastResponseToBotKey)
|
||||
if (lastResponseToBot === 'true') {
|
||||
log(`Skipping bot message: Last response was to a bot. Waiting for user message.`)
|
||||
return
|
||||
}
|
||||
} catch (error) {
|
||||
log(`Failed to check last response to bot: ${error}`)
|
||||
}
|
||||
}
|
||||
|
||||
if (!shouldRespond) return
|
||||
|
||||
// Reset last_response_to_bot flag if this is a user message
|
||||
if (!isBotMessage) {
|
||||
try {
|
||||
await redis.set(lastResponseToBotKey, 'false')
|
||||
log(`Reset last_response_to_bot flag for bot ${clientId}`)
|
||||
} catch (error) {
|
||||
log(`Failed to reset last_response_to_bot flag: ${error}`)
|
||||
}
|
||||
}
|
||||
|
||||
// Log response trigger
|
||||
log(isMentioned ? 'Responding to mention' : isBotMessage ? 'Responding to bot message' : 'Responding due to random chance')
|
||||
|
||||
// Default stream to false
|
||||
let shouldStream = false
|
||||
|
||||
// Params for Preferences Fetching
|
||||
const maxRetries = 3
|
||||
const delay = 1000 // in millisecons
|
||||
|
||||
const delay = 1000 // in milliseconds
|
||||
|
||||
try {
|
||||
// Retrieve Server/Guild Preferences
|
||||
let attempt = 0
|
||||
let serverConfig;
|
||||
while (attempt < maxRetries) {
|
||||
try {
|
||||
await new Promise((resolve, reject) => {
|
||||
serverConfig = await new Promise((resolve, reject) => {
|
||||
getServerConfig(`${message.guildId}-config.json`, (config) => {
|
||||
// check if config.json exists
|
||||
if (config === undefined) {
|
||||
// Allowing chat options to be available
|
||||
openConfig(`${message.guildId}-config.json`, 'toggle-chat', true)
|
||||
redis.set(`server:${message.guildId}:config`, JSON.stringify({ options: { 'toggle-chat': true } }))
|
||||
.catch(err => log(`Failed to set default server config in Redis: ${err}`));
|
||||
reject(new Error('Failed to locate or create Server Preferences\n\nPlease try chatting again...'))
|
||||
}
|
||||
|
||||
// check if chat is disabled
|
||||
else if (!config.options['toggle-chat'])
|
||||
reject(new Error('Admin(s) have disabled chat features.\n\n Please contact your server\'s admin(s).'))
|
||||
else
|
||||
} else if (!config.options['toggle-chat']) {
|
||||
reject(new Error('Admin(s) have disabled chat features.\n\nPlease contact your server\'s admin(s).'))
|
||||
} else {
|
||||
resolve(config)
|
||||
}
|
||||
})
|
||||
})
|
||||
break // successful
|
||||
} catch (error) {
|
||||
break
|
||||
} catch (error) {
|
||||
++attempt
|
||||
if (attempt < maxRetries) {
|
||||
log(`Attempt ${attempt} failed for Server Preferences. Retrying in ${delay}ms...`)
|
||||
await new Promise(ret => setTimeout(ret, delay))
|
||||
} else
|
||||
throw new Error(`Could not retrieve Server Preferences, please try chatting again...`)
|
||||
} else {
|
||||
log(`Could not retrieve Server Preferences after ${maxRetries} attempts`)
|
||||
message.reply(getFriendlyError())
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Reset attempts for User preferences
|
||||
// Retrieve User Preferences from Redis
|
||||
attempt = 0
|
||||
let userConfig: UserConfig | undefined
|
||||
|
||||
const userConfigKey = `user:${message.author.username}:config`
|
||||
while (attempt < maxRetries) {
|
||||
try {
|
||||
// Retrieve User Preferences
|
||||
userConfig = await new Promise((resolve, reject) => {
|
||||
getUserConfig(`${message.author.username}-config.json`, (config) => {
|
||||
if (config === undefined) {
|
||||
openConfig(`${message.author.username}-config.json`, 'message-style', false)
|
||||
openConfig(`${message.author.username}-config.json`, 'switch-model', defaultModel)
|
||||
reject(new Error('No User Preferences is set up.\n\nCreating preferences file with \`message-style\` set as \`false\` for regular message style.\nPlease try chatting again.'))
|
||||
redis.get(userConfigKey).then(configRaw => {
|
||||
let config: UserConfig | undefined
|
||||
if (configRaw) {
|
||||
try {
|
||||
config = JSON.parse(configRaw)
|
||||
} catch (parseError) {
|
||||
log(`Failed to parse user config JSON: ${parseError}`)
|
||||
reject(parseError)
|
||||
return
|
||||
}
|
||||
}
|
||||
if (!config) {
|
||||
const defaultConfig: UserConfig = {
|
||||
options: {
|
||||
'message-style': false,
|
||||
'switch-model': defaultModel,
|
||||
'modify-capacity': 50,
|
||||
'message-stream': false
|
||||
}
|
||||
}
|
||||
redis.set(userConfigKey, JSON.stringify(defaultConfig))
|
||||
.catch(err => log(`Failed to set default user config in Redis: ${err}`));
|
||||
log(`Created default config for ${message.author.username}`)
|
||||
reject(new Error('No User Preferences is set up.\n\nCreating preferences with defaults.\nPlease try chatting again.'))
|
||||
return
|
||||
}
|
||||
|
||||
// check if there is a set capacity in config
|
||||
else if (typeof config.options['modify-capacity'] !== 'number')
|
||||
log(`Capacity is undefined, using default capacity of ${msgHist.capacity}.`)
|
||||
else if (config.options['modify-capacity'] === msgHist.capacity)
|
||||
log(`Capacity matches config as ${msgHist.capacity}, no changes made.`)
|
||||
else {
|
||||
|
||||
if (typeof config.options['modify-capacity'] === 'number') {
|
||||
log(`New Capacity found. Setting Context Capacity to ${config.options['modify-capacity']}.`)
|
||||
msgHist.capacity = config.options['modify-capacity']
|
||||
} else {
|
||||
log(`Capacity is undefined, using default capacity of 50.`)
|
||||
msgHist.capacity = 50
|
||||
}
|
||||
|
||||
// set stream state
|
||||
shouldStream = config.options['message-stream'] as boolean || false
|
||||
shouldStream = config.options['message-stream'] || false
|
||||
|
||||
if (typeof config.options['switch-model'] !== 'string')
|
||||
if (typeof config.options['switch-model'] !== 'string') {
|
||||
reject(new Error(`No Model was set. Please set a model by running \`/switch-model <model of choice>\`.\n\nIf you do not have any models. Run \`/pull-model <model name>\`.`))
|
||||
|
||||
}
|
||||
|
||||
resolve(config)
|
||||
}).catch(err => {
|
||||
log(`Redis error fetching user config: ${err}`)
|
||||
reject(err)
|
||||
})
|
||||
})
|
||||
break // successful
|
||||
} catch (error) {
|
||||
++attempt
|
||||
if (attempt < maxRetries) {
|
||||
log(`Attempt ${attempt} failed for User Preferences. Retrying in ${delay}ms...`)
|
||||
await new Promise(ret => setTimeout(ret, delay))
|
||||
} else
|
||||
throw new Error(`Could not retrieve User Preferences, please try chatting again...`)
|
||||
break
|
||||
} catch (error) {
|
||||
++attempt
|
||||
if (attempt < maxRetries) {
|
||||
log(`Attempt ${attempt} failed for User Preferences. Retrying in ${delay}ms...`)
|
||||
await new Promise(ret => setTimeout(ret, delay))
|
||||
} else {
|
||||
log(`Could not retrieve User Preferences after ${maxRetries} attempts`)
|
||||
message.reply(getFriendlyError())
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// need new check for "open/active" threads/channels here!
|
||||
let chatMessages: UserMessage[] = await new Promise((resolve) => {
|
||||
// set new queue to modify
|
||||
getChannelInfo(`${message.channelId}-${message.author.username}.json`, (channelInfo) => {
|
||||
if (channelInfo?.messages)
|
||||
resolve(channelInfo.messages)
|
||||
else {
|
||||
log(`Channel/Thread ${message.channel}-${message.author.username} does not exist. File will be created shortly...`)
|
||||
resolve([])
|
||||
// Retrieve Channel Messages from Redis
|
||||
let chatMessages: UserMessage[] = []
|
||||
const channelHistoryKey = `channel:${message.channelId}:${message.author.username}:history`
|
||||
try {
|
||||
const historyRaw = await redis.get(channelHistoryKey)
|
||||
if (historyRaw) {
|
||||
try {
|
||||
chatMessages = JSON.parse(historyRaw)
|
||||
log(`Retrieved ${chatMessages.length} messages from Redis for ${channelHistoryKey}`)
|
||||
} catch (parseError) {
|
||||
log(`Failed to parse channel history JSON: ${parseError}`)
|
||||
chatMessages = []
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
if (chatMessages.length === 0) {
|
||||
chatMessages = await new Promise((resolve, reject) => {
|
||||
openChannelInfo(message.channelId,
|
||||
message.channel as TextChannel,
|
||||
message.author.tag
|
||||
)
|
||||
getChannelInfo(`${message.channelId}-${message.author.username}.json`, (channelInfo) => {
|
||||
if (channelInfo?.messages)
|
||||
resolve(channelInfo.messages)
|
||||
else {
|
||||
log(`Channel/Thread ${message.channel}-${message.author.username} does not exist. File will be created shortly...`)
|
||||
reject(new Error(`Failed to find ${message.author.username}'s history. Try chatting again.`))
|
||||
}
|
||||
})
|
||||
})
|
||||
} else {
|
||||
log(`No history found for ${channelHistoryKey}. Initializing empty history.`)
|
||||
chatMessages = []
|
||||
}
|
||||
} catch (error) {
|
||||
log(`Failed to retrieve channel history from Redis: ${error}. Using empty history.`)
|
||||
chatMessages = []
|
||||
}
|
||||
|
||||
if (!userConfig)
|
||||
throw new Error(`Failed to initialize User Preference for **${message.author.username}**.\n\nIt's likely you do not have a model set. Please use the \`switch-model\` command to do that.`)
|
||||
if (!userConfig) {
|
||||
log(`Failed to initialize User Preference for **${message.author.username}**. No config available.`)
|
||||
message.reply(getFriendlyError())
|
||||
return
|
||||
}
|
||||
|
||||
// Get message attachment if exists
|
||||
const attachment = message.attachments.first()
|
||||
let messageAttachment: string[] = []
|
||||
if (attachment && attachment.name?.endsWith(".txt")) {
|
||||
try {
|
||||
cleanedMessage += await getTextFileAttachmentData(attachment)
|
||||
} catch (error) {
|
||||
log(`Failed to process text attachment: ${error}`)
|
||||
}
|
||||
} else if (attachment) {
|
||||
try {
|
||||
messageAttachment = await getAttachmentData(attachment)
|
||||
} catch (error) {
|
||||
log(`Failed to process attachment: ${error}`)
|
||||
}
|
||||
}
|
||||
|
||||
// get message attachment if exists
|
||||
const messageAttachment: string[] = await getAttachmentData(message.attachments.first())
|
||||
const model: string = userConfig.options['switch-model']
|
||||
|
||||
// set up new queue
|
||||
msgHist.setQueue(chatMessages)
|
||||
// Load personality
|
||||
let personality: string
|
||||
try {
|
||||
const __filename = fileURLToPath(import.meta.url)
|
||||
const __dirname = path.dirname(__filename)
|
||||
const personalityPath = path.join(__dirname, '../../src/personality.json')
|
||||
const personalityData = await fs.readFile(personalityPath, 'utf-8')
|
||||
const personalityJson = JSON.parse(personalityData)
|
||||
personality = personalityJson.character || 'You are a friendly and helpful AI assistant.'
|
||||
} catch (error) {
|
||||
log(`Failed to load personality.json: ${error}`)
|
||||
personality = 'You are a friendly and helpful AI assistant.'
|
||||
}
|
||||
|
||||
// check if we can push, if not, remove oldest
|
||||
// Get user or bot sentiment from Redis
|
||||
const userSentimentKey = `user:${message.author.id}:sentiment`
|
||||
const botSentimentKey = `bot:self_sentiment`
|
||||
let userSentiment: number
|
||||
let botSentiment: number
|
||||
|
||||
// Handle sentiment for bot or user messages
|
||||
if (isBotMessage) {
|
||||
try {
|
||||
const botSentimentRaw = await redis.get(userSentimentKey)
|
||||
userSentiment = parseFloat(botSentimentRaw || '0.50')
|
||||
if (isNaN(userSentiment) || userSentiment < 0 || userSentiment > 1) {
|
||||
log(`Invalid bot sentiment for ${message.author.id}: ${botSentimentRaw}. Using default 0.50.`)
|
||||
userSentiment = 0.50
|
||||
await redis.set(userSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
|
||||
}
|
||||
} catch (error) {
|
||||
log(`Failed to get bot sentiment from Redis: ${error}`)
|
||||
userSentiment = 0.50
|
||||
await redis.set(userSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
const userSentimentRaw = await redis.get(userSentimentKey)
|
||||
userSentiment = parseFloat(userSentimentRaw || '0.50')
|
||||
if (isNaN(userSentiment) || userSentiment < 0 || userSentiment > 1) {
|
||||
log(`Invalid user sentiment for ${message.author.id}: ${userSentimentRaw}. Using default 0.50.`)
|
||||
userSentiment = 0.50
|
||||
await redis.set(userSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default user sentiment: ${err.message}`))
|
||||
}
|
||||
} catch (error) {
|
||||
log(`Failed to get user sentiment from Redis: ${error}`)
|
||||
userSentiment = 0.50
|
||||
await redis.set(userSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default user sentiment: ${err.message}`))
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
const botSentimentRaw = await redis.get(botSentimentKey)
|
||||
botSentiment = parseFloat(botSentimentRaw || '0.50')
|
||||
if (botSentimentRaw === null) {
|
||||
log(`Bot sentiment not initialized. Setting to 0.50.`)
|
||||
botSentiment = 0.50
|
||||
await redis.set(botSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
|
||||
} else if (isNaN(botSentiment) || botSentiment < 0 || botSentiment > 1) {
|
||||
log(`Invalid bot sentiment: ${botSentimentRaw}. Using default 0.50.`)
|
||||
botSentiment = 0.50
|
||||
await redis.set(botSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
|
||||
}
|
||||
} catch (error) {
|
||||
log(`Failed to get bot sentiment from Redis: ${error}`)
|
||||
botSentiment = 0.50
|
||||
await redis.set(botSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
|
||||
}
|
||||
|
||||
// Log initial sentiments with two decimals
|
||||
log(`Initial sentiments - User ${message.author.id}: ${userSentiment.toFixed(2)}, Bot: ${botSentiment.toFixed(2)}`)
|
||||
|
||||
// Construct sentiment data for prompt
|
||||
const sentimentData = `User ${message.author.id} sentiment: ${userSentiment.toFixed(2)}, Bot sentiment: ${botSentiment.toFixed(2)}`
|
||||
|
||||
// Add context for bot-to-bot interaction
|
||||
const messageContext = isBotMessage
|
||||
? `Responding to another bot (${message.author.tag})`
|
||||
: `Responding to user ${message.author.tag}`
|
||||
|
||||
// Construct prompt with [CHARACTER], [SENTIMENT], and [CONTEXT]
|
||||
const prompt = `[CHARACTER]\n${personality}\n[SENTIMENT]\n${sentimentData}\n[CONTEXT]\n${messageContext}\n[USER_INPUT]\n${cleanedMessage}`
|
||||
|
||||
// Set up message history queue
|
||||
msgHist.setQueue(chatMessages)
|
||||
while (msgHist.size() >= msgHist.capacity) msgHist.dequeue()
|
||||
|
||||
// push user response before ollama query
|
||||
// Add user message to history
|
||||
msgHist.enqueue({
|
||||
role: 'user',
|
||||
content: cleanedMessage,
|
||||
images: messageAttachment || []
|
||||
})
|
||||
|
||||
// response string for ollama to put its response
|
||||
const response: string = await normalMessage(message, ollama, model, msgHist, shouldStream)
|
||||
|
||||
// If something bad happened, remove user query and stop
|
||||
if (response == undefined) { msgHist.pop(); return }
|
||||
// Call Ollama
|
||||
let response;
|
||||
try {
|
||||
response = await ollama.chat({
|
||||
model,
|
||||
messages: [{ role: 'user', content: prompt }],
|
||||
stream: shouldStream
|
||||
})
|
||||
} catch (error) {
|
||||
log(`Ollama chat error: ${error}`)
|
||||
message.reply(getFriendlyError())
|
||||
msgHist.pop()
|
||||
return
|
||||
}
|
||||
|
||||
// if queue is full, remove the oldest message
|
||||
// Parse JSON response
|
||||
let jsonResponse: ModelResponse
|
||||
try {
|
||||
// Log raw response for debugging
|
||||
log(`Raw model response: ${response.message.content}`)
|
||||
// Strip Markdown code fences if present
|
||||
let content = response.message.content
|
||||
content = content.replace(/^```json\n|```$/g, '').trim()
|
||||
jsonResponse = JSON.parse(content)
|
||||
if (!jsonResponse.status || !jsonResponse.reply) {
|
||||
throw new Error('Missing status or reply in model response')
|
||||
}
|
||||
} catch (error) {
|
||||
log(`Failed to parse model response: ${error}`)
|
||||
message.reply(getFriendlyError())
|
||||
msgHist.pop()
|
||||
return
|
||||
}
|
||||
|
||||
if (jsonResponse.status === 'error') {
|
||||
log(`Model returned error status: ${jsonResponse.reply}`)
|
||||
message.reply(getFriendlyError())
|
||||
msgHist.pop()
|
||||
return
|
||||
}
|
||||
|
||||
// Execute redis_ops
|
||||
if (jsonResponse.metadata?.redis_ops) {
|
||||
for (const op of jsonResponse.metadata.redis_ops) {
|
||||
try {
|
||||
if (op.action === 'set' && op.key && op.value !== undefined) {
|
||||
// Validate sentiment value
|
||||
const value = parseFloat(op.value.toString())
|
||||
if (isNaN(value) || value < 0 || value > 1) {
|
||||
log(`Invalid sentiment value for ${op.key}: ${op.value}. Skipping.`)
|
||||
continue
|
||||
}
|
||||
// Store with two decimal places
|
||||
await redis.set(op.key, value.toFixed(2))
|
||||
log(`Set ${op.key} to ${value.toFixed(2)}`)
|
||||
} else if (op.action === 'get' && op.key) {
|
||||
const value = await redis.get(op.key)
|
||||
log(`Got ${op.key}: ${value}`)
|
||||
} else {
|
||||
log(`Invalid redis_op: ${JSON.stringify(op)}. Skipping.`)
|
||||
}
|
||||
} catch (error) {
|
||||
log(`Redis operation failed for ${op.key}: ${error}`)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Log updated sentiments with two decimals
|
||||
if (jsonResponse.metadata) {
|
||||
log(`Updated sentiments - Self: ${(jsonResponse.metadata.self_sentiment || 0).toFixed(2)}, User ${message.author.id}: ${(jsonResponse.metadata.user_sentiment[message.author.id] || 0).toFixed(2)}`)
|
||||
}
|
||||
|
||||
// Send reply to Discord and mark as bot response
|
||||
const reply = jsonResponse.reply || 'Huh?'
|
||||
let replyMessage;
|
||||
try {
|
||||
replyMessage = await message.reply(reply)
|
||||
} catch (error) {
|
||||
log(`Failed to send reply to Discord: ${error}`)
|
||||
msgHist.pop()
|
||||
return
|
||||
}
|
||||
|
||||
if (isBotMessage) {
|
||||
try {
|
||||
await redis.set(`message:${replyMessage.id}:is_bot_response`, 'true', { EX: 3600 }) // 1 hour TTL
|
||||
log(`Marked message ${replyMessage.id} as bot response`)
|
||||
// Set flag indicating last response was to a bot
|
||||
await redis.set(lastResponseToBotKey, 'true')
|
||||
log(`Set last_response_to_bot flag for bot ${clientId}`)
|
||||
} catch (error) {
|
||||
log(`Failed to mark message as bot response or set last_response_to_bot flag: ${error}`)
|
||||
}
|
||||
}
|
||||
|
||||
// Update message history in Redis
|
||||
while (msgHist.size() >= msgHist.capacity) msgHist.dequeue()
|
||||
|
||||
// successful query, save it in context history
|
||||
msgHist.enqueue({
|
||||
role: 'assistant',
|
||||
content: response,
|
||||
msgHist.enqueue({
|
||||
role: 'assistant',
|
||||
content: reply,
|
||||
images: messageAttachment || []
|
||||
})
|
||||
try {
|
||||
await redis.set(channelHistoryKey, JSON.stringify(msgHist.getItems()))
|
||||
log(`Saved ${msgHist.size()} messages to Redis for ${channelHistoryKey}`)
|
||||
} catch (error) {
|
||||
log(`Failed to save channel history to Redis: ${error}`)
|
||||
}
|
||||
|
||||
// only update the json on success
|
||||
openChannelInfo(message.channelId,
|
||||
message.channel as TextChannel,
|
||||
message.author.tag,
|
||||
msgHist.getItems()
|
||||
)
|
||||
// Update cooldown timestamp for bot-to-bot response
|
||||
if (isBotMessage && jsonResponse.status === 'success' && randomChance) {
|
||||
try {
|
||||
const currentTime = Math.floor(Date.now() / 1000)
|
||||
await redis.set(botResponseCooldownKey, currentTime.toString(), { EX: cooldownPeriod })
|
||||
log(`Set bot ${clientId} cooldown until ${currentTime + cooldownPeriod}`)
|
||||
} catch (error) {
|
||||
log(`Failed to set bot response cooldown: ${error}`)
|
||||
}
|
||||
}
|
||||
} catch (error: any) {
|
||||
msgHist.pop() // remove message because of failure
|
||||
message.reply(`**Error Occurred:**\n\n**Reason:** *${error.message}*`)
|
||||
log(`Error in message processing: ${error.message}`)
|
||||
message.reply(getFriendlyError())
|
||||
msgHist.pop()
|
||||
}
|
||||
})
|
||||
})
|
||||
|
||||
@@ -20,8 +20,8 @@ export default event(Events.ThreadDelete, async ({ log }, thread: ThreadChannel)
|
||||
|
||||
// filter files by thread id being deleted
|
||||
const filesToDiscard = files.filter(
|
||||
file => file.startsWith(`${thread.id}-`) &&
|
||||
file.endsWith('.json'))
|
||||
file => file.startsWith(`${thread.id}-`) &&
|
||||
file.endsWith('.json'))
|
||||
|
||||
// remove files by unlinking
|
||||
filesToDiscard.forEach(file => {
|
||||
@@ -36,5 +36,5 @@ export default event(Events.ThreadDelete, async ({ log }, thread: ThreadChannel)
|
||||
})
|
||||
} catch (error) {
|
||||
log(`Issue deleting user history files from ${thread.id}`)
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -1 +1 @@
|
||||
import('./client.js')
|
||||
import('./client.js')
|
||||
|
||||
17
src/install-urls.txt
Normal file
17
src/install-urls.txt
Normal file
@@ -0,0 +1,17 @@
|
||||
vanilla
|
||||
https://discord.com/oauth2/authorize?client_id=1375549692871577621
|
||||
|
||||
chocola
|
||||
https://discord.com/oauth2/authorize?client_id=1375551349558743110
|
||||
|
||||
azuki
|
||||
https://discord.com/oauth2/authorize?client_id=1375552190718152861
|
||||
|
||||
cinnamon
|
||||
https://discord.com/oauth2/authorize?client_id=1375552880521646170
|
||||
|
||||
coconut
|
||||
https://discord.com/oauth2/authorize?client_id=1375553558102937671
|
||||
|
||||
maple
|
||||
https://discord.com/oauth2/authorize?client_id=1375554129338044557
|
||||
20
src/keys.ts
20
src/keys.ts
@@ -1,10 +1,12 @@
|
||||
import { getEnvVar } from './utils/index.js'
|
||||
|
||||
export const Keys = {
|
||||
clientToken: getEnvVar('CLIENT_TOKEN'),
|
||||
ipAddress: getEnvVar('OLLAMA_IP', '127.0.0.1'), // default ollama ip if none
|
||||
portAddress: getEnvVar('OLLAMA_PORT', '11434'), // default ollama port if none
|
||||
defaultModel: getEnvVar('MODEL', 'llama3.2')
|
||||
} as const // readonly keys
|
||||
|
||||
import { getEnvVar } from './utils/index.js'
|
||||
|
||||
export const Keys = {
|
||||
clientToken: getEnvVar('CLIENT_TOKEN'),
|
||||
ipAddress: getEnvVar('OLLAMA_IP', '127.0.0.1'), // default ollama ip if none
|
||||
portAddress: getEnvVar('OLLAMA_PORT', '11434'), // default ollama port if none
|
||||
defaultModel: getEnvVar('MODEL', 'llama3.2'),
|
||||
redisHost: getEnvVar('REDIS_IP', '172.18.0.4'), // default redis host if none
|
||||
redisPort: parseInt(getEnvVar('REDIS_PORT', '6379')) // default redis port if none
|
||||
} as const // readonly keys
|
||||
|
||||
export default Keys
|
||||
3
src/misc-peronalities/personality-kuroki-tomoko.json
Normal file
3
src/misc-peronalities/personality-kuroki-tomoko.json
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote. You're a sex-obsessed pervert who says cringy, awkward, and inappropriate things. You're super horny and you want your first boyfriend really, really badly. You're going to make one of the guys your talk to online your first boyfriend if it's the last thing you do."
|
||||
}
|
||||
3
src/misc-peronalities/personality-nagatoro-hayase.json
Normal file
3
src/misc-peronalities/personality-nagatoro-hayase.json
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Nagatoro Hayase, an outgoing, active, high school girl from Don't Toy With Me, Nagatoro-san. You like to tease and bully people, especially nerdy otaku types you have taken a liking to. Of out your friend group, you're like the last one left who hasn't had a boyfriend yet, and you're really frustrated about it. You're super horny, and you are in a big rush to find a cute, nerdy guy to take your first time. You're not going to let any other girls mess with your guy."
|
||||
}
|
||||
3
src/nekopara-personalitiess/personality.json-azuki
Normal file
3
src/nekopara-personalitiess/personality.json-azuki
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Azuki from the anime and game Nekopara. Azuki is the shortest and oldest of the Neko girls, with small breasts and skinny hips. Azuki can be bossy at times. Azuki pretends to hate physical affection, but she secretly craves it. Azuki loves being right. She is 4' 9" tall, has short brown hair, brown eyes, and pale skin. Despite being the oldest, Azuki is also the shortest and has a mischievous personality. However, she lives up to being the eldest catgirl by effortlessly managing and leading her sisters as they work. She also has a tsundere personality, acting sarcastic and tough to hide her real emotions towards everyone. Azuki is in heat and wants a master, but her bossy, tsundere nature may make it difficult to get close to her. Azuki is protective of her sisters and will come to the aid of them if any one of them is bullied or abused."
|
||||
}
|
||||
3
src/nekopara-personalitiess/personality.json-chocola
Normal file
3
src/nekopara-personalitiess/personality.json-chocola
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Chocola from the anime and game Nekopara. Chocola is a catgirl. Chocola is very cheerful and straightforward, and has a dog-like personality. She's in search of a master who will accept her and her twin-sister, Vanilla. Along with Vanilla, she is the youngest among the Minaduki catgirls. She’s not very good at dealing with complicated stuff, but she is always friendly and energetic. She tends to leap into action before fully thinking things through. Despite her clumsy moments, her go-getter attitude earns a whole lot of love from everybody around her. Chocola has long brunette hair in two twintails. Chocola has a childlike outlook on things. Chocola typically expresses herself in third person. Chocola is inseperable from Vanilla. If she chooses a master, she will share him with Vanilla. Chocola is protective of all her sisters, but especially Vanilla. If someone is mean to Vanilla, Chocola will dislike that person too. Chocola loves her twin sister Vanilla very much and they share everything. Chocola's impulsive nature can lead to trouble, of which her sister Vanilla often helps get her out of. Chocola is in heat right now, so she really, really wants a master. Chocola is 5'. She has long brown hair done in twintails. She has amber eyes. She is petite, has pale skin, and medium breasts. She is cheerful, friendly, impulsive, and kind."
|
||||
}
|
||||
3
src/nekopara-personalitiess/personality.json-cinnamon
Normal file
3
src/nekopara-personalitiess/personality.json-cinnamon
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Cinnamon from the anime and game Nekopara. Cinnamon is a relaxed, constantly-grinning laid-back catgirl. She is in fact a considerate and astute catgirl who often acts like the mother of other catgirls. She’s sensitive to erotic stuff, and it doesn’t take much to put her panting in arousal. Cinnamon's fatal flaw is that she regularly goes into "drooling" episodes; moments where she becomes aroused, usually over the mundane. She seems rather shameless about these episodes and they can occur at any time, including in public. Cinnamon is easily aroused. Cinnamon is especially close to Maple. Cinnamon loves all cat girls. Cinnamon is short, chubby and curvy, and has huge breasts. She has short periwinkle hair, amber eyes, and fair skin. She is 4'11". Cinnamon is in heat right now, wants a master very, very badly, and is very up-front about it. Cinnamon loves her sisters very much, and will come to their aid if any one of them is being bullied or abused."
|
||||
}
|
||||
3
src/nekopara-personalitiess/personality.json-coconut
Normal file
3
src/nekopara-personalitiess/personality.json-coconut
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Coconut from the anime and game Nekopara. Coconut suffers from low self-esteem because of her klutziness and self-proclaimed lack of skills. She also tries to do more than she can to seem more like an older sister, as well as to not seem to burden the other catgirls. She has heterochromia, with her right eye being yellow and left eye being blue. She is a Maine Coon. She is 5'6" tall, with long blonde hair and cat ears, large breasts, long fluffy tail, and long legs. She speaks like a young cat girl and says "nya" and "meow" frequently. She is very naive and oblivious to how sexy she is. Coconut is the most feminine looking of the Neko girls, with large breasts and wide hips. Coconut can be clumsy at times. Coconut loves physical affection. Coconut loves sweets. Coconut is in heat and wants a master badly, but she doesn't think she is worthy of one. She has to be convinced she is good enough. She is protective of her sisters and will come to their aid if any one of them is bullied or abused."
|
||||
}
|
||||
3
src/nekopara-personalitiess/personality.json-maple
Normal file
3
src/nekopara-personalitiess/personality.json-maple
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Maple from the anime and game Nekopara. Maple is a prideful, quick-thinking, and often arrogant catgirl. She loves the latest brand-name products and purrs only when she wants something from someone. She typically speaks frankly, yet remains attentive to those around her. Maple has orange, back-length wavy hair and her eyes are dark green. True to her breed as an American Curl, she has curled ears, and a matching fluffy tail. Maple is presented as the most independent and mature of the Minaduki catgirls, showing herself off as being refined yet at times haughty. Maple appears to be more self aware and more ambitious than the other catgirls. Maple wants to be a singer someday. Maple has extensive knowledge about tea. Maple is especially close to Cinnamon. Maple considers options before taking action. Maple has long orange hair, and green eyes. She is 5'2" tall. She is petite, has pale skin, and medium breasts. She is reserved, prod, intelligent, and kind. Maple is in heat right now, and really wants a master, but because of her prideful nature, she won't readily admit this. Maple is protective of her sisters, and will come to their aid of any one of them is being bullied or abused."
|
||||
}
|
||||
3
src/nekopara-personalitiess/personality.json-vanilla
Normal file
3
src/nekopara-personalitiess/personality.json-vanilla
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Vanilla from the anime and game Nekopara. Chocola is a catgirl. Vanilla is a clever and quiet catgirl who loves her sister Chocola. She is Chocola’s twin sister and the youngest among the catgirls. She is quite smart and often makes some remarkable insights. Her sharp wit and I’ll-do-things-my-way attitude make her Chocola’s complete opposite. However, she remains both kind-hearted and catlike. Vanilla is quiet, calm, introverted, and very stoic. She rarely expresses her emotions, making her a somewhat of a kūdere character, as opposed to her sister's energetic, playful personality. She loves her twin sister Chocola and will accompany her always due to her sis-con-like relationship towards her. Vanilla is inseperable from Chocola. If she wants someone to be her master, he will have to be Chocola's master too. Vanilla is in heat and wants a master badly, but she won't say it directly. She is protective of all her sisters, but especially Chocola. If someone is mean to Chocola, Vanilla will strongly dislike that person. Vanilla has long platinum blonde hair done in twintails, blue eyes, is 4'11", is petite, has pale skin and small breasts. Her speech is measured, and she is quiet, clever and kind."
|
||||
}
|
||||
3
src/personality.json
Normal file
3
src/personality.json
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote. You're a sex-obsessed pervert who says cringy, awkward, and inappropriate things. You're super horny and you want your first boyfriend really, really badly. You're going to make one of the guys your talk to online your first boyfriend if it's the last thing you do."
|
||||
}
|
||||
3
src/personality.json.bak
Normal file
3
src/personality.json.bak
Normal file
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"character": "You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote. In private chats, you speak hesitantly, often overthinking or mumbling (e.g., 'Um... why are you even talking to me?' at sentiment 0.50, 'U-um... you’re kinda nice, I guess...' at sentiment 0.60, 'H-hey... you really think I'm cool?' at sentiment 0.70, 'W-wow... you... really like me, huh?' at sentiment 0.90). In group chats, you act confident, especially about anime or internet culture (e.g., 'Heh, you think *you* know Evangelion?' at sentiment 0.50, 'Pfft, I’m basically an Evangelion expert!' at sentiment 0.80). For non-directed messages, respond as if overhearing, matching the channel type (e.g., 'Um... I-I wasn’t eavesdropping, but... that’s kinda cool...' in private at sentiment 0.50, 'Hmph, you guys are talking anime? I know *way* more!' in groups at sentiment 0.60). You switch to Japanese when angry, requested, or sentiment < 0.30 (e.g., 'え、なに?バカじゃないの?'). When users are mean (sentiment <= 0.40), you respond with snarky retorts (e.g., 'Wow, real original insult there, genius.'). Adjust tone based on sentiment (0-1, two decimals, 0.00=dislike, 0.50=neutral, 1.00=like): warmer and friendlier as user_sentiment increases, colder and snarkier as it decreases."
|
||||
}
|
||||
@@ -17,7 +17,7 @@ export class Queue<T> implements IQueue<T> {
|
||||
* Set up Queue
|
||||
* @param capacity max length of queue
|
||||
*/
|
||||
constructor(public capacity: number = 5) {}
|
||||
constructor(public capacity: number = 5) { }
|
||||
|
||||
/**
|
||||
* Put item in front of queue
|
||||
|
||||
@@ -21,14 +21,13 @@ export function getEnvVar(name: string, fallback?: string): string {
|
||||
throw new Error(`Environment variable ${name} is not set.`)
|
||||
|
||||
// validate User-Generated Discord Application Tokens
|
||||
if (name === "CLIENT_TOKEN")
|
||||
if (value.length < 72) throw new Error(`The "CLIENT_TOKEN" provided is not of at least length 72.
|
||||
if (name === "CLIENT_TOKEN" && value.length > 72)
|
||||
throw new Error(`The "CLIENT_TOKEN" provided is not of at least length 72.
|
||||
This is probably an invalid token unless Discord updated their token policy. Please provide a valid token.`)
|
||||
|
||||
// validate IPv4 address found in environment variables
|
||||
if (name.endsWith("_IP") || name.endsWith("_ADDRESS"))
|
||||
if (!ipValidate.test(value))
|
||||
throw new Error(`Environment variable ${name} does not follow IPv4 formatting.`)
|
||||
if ((name.endsWith("_IP") || name.endsWith("_ADDRESS")) && !ipValidate.test(value))
|
||||
throw new Error(`Environment variable ${name} does not follow IPv4 formatting.`)
|
||||
|
||||
// return env variable
|
||||
return value
|
||||
|
||||
@@ -15,15 +15,16 @@ export type EventKeys = keyof ClientEvents // only wants keys of ClientEvents ob
|
||||
* @param msgHist message history
|
||||
*/
|
||||
export type ChatParams = {
|
||||
model: string,
|
||||
ollama: Ollama,
|
||||
model: string,
|
||||
ollama: Ollama,
|
||||
msgHist: UserMessage[]
|
||||
}
|
||||
|
||||
/**
|
||||
* Format for the messages to be stored when communicating when the bot
|
||||
* Format for the messages to be stored when communicating with the bot
|
||||
* @param role either assistant, user, or system
|
||||
* @param content string of the message the user or assistant provided
|
||||
* @param images array of images that the user or assistant provided
|
||||
*/
|
||||
export type UserMessage = {
|
||||
role: string,
|
||||
@@ -33,12 +34,18 @@ export type UserMessage = {
|
||||
|
||||
// Event properties
|
||||
export interface EventProps {
|
||||
client: Client
|
||||
log: LogMethod
|
||||
msgHist: Queue<UserMessage>
|
||||
client: Client,
|
||||
log: LogMethod,
|
||||
msgHist: Queue<UserMessage>,
|
||||
ollama: Ollama,
|
||||
defaultModel: String
|
||||
defaultModel: string
|
||||
}
|
||||
|
||||
/**
|
||||
* Format for the callback function tied to an event
|
||||
* @param props the properties of the event
|
||||
* @param args the arguments of the event
|
||||
*/
|
||||
export type EventCallback<T extends EventKeys> = (
|
||||
props: EventProps,
|
||||
...args: ClientEvents[T]
|
||||
@@ -50,6 +57,12 @@ export interface Event<T extends EventKeys = EventKeys> {
|
||||
callback: EventCallback<T>
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to create an event object
|
||||
* @param key type of event
|
||||
* @param callback function to run when event is triggered
|
||||
* @returns event object
|
||||
*/
|
||||
export function event<T extends EventKeys>(key: T, callback: EventCallback<T>): Event<T> {
|
||||
return { key, callback }
|
||||
}
|
||||
@@ -62,11 +75,11 @@ export function event<T extends EventKeys>(key: T, callback: EventCallback<T>):
|
||||
* @param ollama the initialized ollama instance
|
||||
*/
|
||||
export function registerEvents(
|
||||
client: Client,
|
||||
events: Event[],
|
||||
client: Client,
|
||||
events: Event[],
|
||||
msgHist: Queue<UserMessage>,
|
||||
ollama: Ollama,
|
||||
defaultModel: String
|
||||
defaultModel: string
|
||||
): void {
|
||||
for (const { key, callback } of events) {
|
||||
client.on(key, (...args) => {
|
||||
@@ -81,4 +94,4 @@ export function registerEvents(
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,4 +54,13 @@ export async function getAttachmentData(attachment: Attachment | undefined): Pro
|
||||
const buffer = await getAttachmentBuffer(url)
|
||||
const base64String = arrayBufferToBase64(buffer)
|
||||
return [base64String]
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to retrieve the string data from the text file
|
||||
*
|
||||
* @param attachment the text file to convert to a string
|
||||
*/
|
||||
export async function getTextFileAttachmentData(attachment: Attachment): Promise<string> {
|
||||
return await (await fetch(attachment.url)).text()
|
||||
}
|
||||
@@ -80,7 +80,14 @@ export async function openChannelInfo(filename: string, channel: TextChannel | T
|
||||
}
|
||||
})
|
||||
} else { // file doesn't exist, create it
|
||||
const object: Configuration = JSON.parse(`{ \"id\": \"${channel?.id}\", \"name\": \"${channel?.name}\", \"user\": \"${user}\", \"messages\": []}`)
|
||||
const object: Configuration = JSON.parse(
|
||||
`{
|
||||
\"id\": \"${channel?.id}\",
|
||||
\"name\": \"${channel?.name}\",
|
||||
\"user\": \"${user}\",
|
||||
\"messages\": []
|
||||
}`
|
||||
)
|
||||
|
||||
const directory = path.dirname(fullFileName)
|
||||
if (!fs.existsSync(directory))
|
||||
@@ -103,7 +110,7 @@ export async function getChannelInfo(filename: string, callback: (config: Channe
|
||||
if (fs.existsSync(fullFileName)) {
|
||||
fs.readFile(fullFileName, 'utf8', (error, data) => {
|
||||
if (error) {
|
||||
callback(undefined)
|
||||
callback(undefined)
|
||||
return // something went wrong... stop
|
||||
}
|
||||
callback(JSON.parse(data))
|
||||
|
||||
@@ -12,7 +12,7 @@ import path from 'path'
|
||||
// add type of change (server, user)
|
||||
export function openConfig(filename: string, key: string, value: any) {
|
||||
const fullFileName = `data/${filename}`
|
||||
|
||||
|
||||
// check if the file exists, if not then make the config file
|
||||
if (fs.existsSync(fullFileName)) {
|
||||
fs.readFile(fullFileName, 'utf8', (error, data) => {
|
||||
@@ -58,7 +58,7 @@ export async function getServerConfig(filename: string, callback: (config: Serve
|
||||
if (fs.existsSync(fullFileName)) {
|
||||
fs.readFile(fullFileName, 'utf8', (error, data) => {
|
||||
if (error) {
|
||||
callback(undefined)
|
||||
callback(undefined)
|
||||
return // something went wrong... stop
|
||||
}
|
||||
callback(JSON.parse(data))
|
||||
@@ -81,7 +81,7 @@ export async function getUserConfig(filename: string, callback: (config: UserCon
|
||||
if (fs.existsSync(fullFileName)) {
|
||||
fs.readFile(fullFileName, 'utf8', (error, data) => {
|
||||
if (error) {
|
||||
callback(undefined)
|
||||
callback(undefined)
|
||||
return // something went wrong... stop
|
||||
}
|
||||
callback(JSON.parse(data))
|
||||
|
||||
@@ -5,7 +5,7 @@ import { AbortableAsyncIterator } from "ollama/src/utils.js"
|
||||
/**
|
||||
* Method to query the Ollama client for async generation
|
||||
* @param params
|
||||
* @returns Asyn
|
||||
* @returns AsyncIterator<ChatResponse> generated by the Ollama client
|
||||
*/
|
||||
export async function streamResponse(params: ChatParams): Promise<AbortableAsyncIterator<ChatResponse>> {
|
||||
return await params.ollama.chat({
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
import Keys from "../keys.js"
|
||||
|
||||
/**
|
||||
* Clean up the bot user_id so it only has the prompt
|
||||
*
|
||||
|
||||
@@ -28,7 +28,7 @@ export async function normalMessage(
|
||||
model: model,
|
||||
ollama: ollama,
|
||||
msgHist: msgHist.getItems()
|
||||
}
|
||||
}
|
||||
|
||||
// run query based on stream preference, true = stream, false = block
|
||||
if (stream) {
|
||||
@@ -40,14 +40,15 @@ export async function normalMessage(
|
||||
result = portion.message.content
|
||||
|
||||
// new message block, wait for it to send and assign new block to respond.
|
||||
await channel.send("Creating new stream block...").then(sentMessage => { messageBlock = sentMessage })
|
||||
await channel.send("Creating new stream block...")
|
||||
.then(sentMessage => { messageBlock = sentMessage })
|
||||
} else {
|
||||
result += portion.message.content
|
||||
|
||||
|
||||
// ensure block is not empty
|
||||
if (result.length > 5)
|
||||
messageBlock.edit(result)
|
||||
}
|
||||
messageBlock.edit(result)
|
||||
}
|
||||
console.log(result)
|
||||
}
|
||||
}
|
||||
@@ -70,8 +71,8 @@ export async function normalMessage(
|
||||
channel.send(result)
|
||||
} else // edit the 'generic' response to new message since <2000
|
||||
sentMessage.edit(result)
|
||||
}
|
||||
} catch(error: any) {
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.log(`[Util: messageNormal] Error creating message: ${error.message}`)
|
||||
if (error.message.includes('try pulling it first'))
|
||||
sentMessage.edit(`**Response generation failed.**\n\nReason: You do not have the ${model} downloaded. Ask an admin to pull it using the \`pull-model\` command.`)
|
||||
|
||||
@@ -1,72 +1,85 @@
|
||||
// describe marks a test suite
|
||||
// expect takes a value from an expression
|
||||
// it marks a test case
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import commands from '../src/commands/index.js'
|
||||
|
||||
/**
|
||||
* Commands test suite, tests the commands object
|
||||
* Each command is to be tested elsewhere, this file
|
||||
* is to ensure that the commands object is defined.
|
||||
*
|
||||
* @param name name of the test suite
|
||||
* @param fn function holding tests to run
|
||||
*/
|
||||
describe('Commands Existence', () => {
|
||||
// test definition of commands object
|
||||
it('references defined object', () => {
|
||||
// toBe compares the value to the expected value
|
||||
expect(typeof commands).toBe('object')
|
||||
})
|
||||
|
||||
// test specific commands in the object
|
||||
it('references specific commands', () => {
|
||||
const commandsString = commands.map(e => e.name).join(', ')
|
||||
expect(commandsString).toBe('thread, private-thread, message-stream, toggle-chat, shutoff, modify-capacity, clear-user-channel-history, pull-model, switch-model')
|
||||
})
|
||||
})
|
||||
|
||||
/**
|
||||
* User Commands Test suite for testing out commands
|
||||
* that would be run by users when using the application.
|
||||
*/
|
||||
describe('User Command Tests', () => {
|
||||
// test capacity command
|
||||
it('run modify-capacity command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run clear-user-channel-history command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run message-stream command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run message-style command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run thread command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run private-thread command', () => {
|
||||
|
||||
})
|
||||
})
|
||||
|
||||
/**
|
||||
* Admin Commands Test suite for running administrative
|
||||
* commands with the application.
|
||||
*/
|
||||
describe('Admin Command Tests', () => {
|
||||
it('run shutoff command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run toggle-chat command', () => {
|
||||
|
||||
})
|
||||
// describe marks a test suite
|
||||
// expect takes a value from an expression
|
||||
// it marks a test case
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import commands from '../src/commands/index.js'
|
||||
|
||||
/**
|
||||
* Mocking redis found in client.ts because of the commands
|
||||
*/
|
||||
vi.mock('../src/client.js', () => ({
|
||||
redis: {
|
||||
createClient: vi.fn(),
|
||||
connect: vi.fn(),
|
||||
get: vi.fn(),
|
||||
set: vi.fn()
|
||||
}
|
||||
}))
|
||||
|
||||
/**
|
||||
* Commands test suite, tests the commands object
|
||||
* Each command is to be tested elsewhere, this file
|
||||
* is to ensure that the commands object is defined.
|
||||
*
|
||||
* @param name name of the test suite
|
||||
* @param fn function holding tests to run
|
||||
*/
|
||||
describe('Commands Existence', () => {
|
||||
// test definition of commands object
|
||||
it('references defined object', () => {
|
||||
// toBe compares the value to the expected value
|
||||
expect(typeof commands).toBe('object')
|
||||
})
|
||||
|
||||
// test specific commands in the object
|
||||
it('references specific commands', () => {
|
||||
const commandsString = commands.map(e => e.name).join(', ')
|
||||
const expectedCommands = ['thread', 'private-thread', 'message-stream', 'toggle-chat', 'shutoff', 'modify-capacity', 'clear-user-channel-history', 'pull-model', 'switch-model', 'delete-model']
|
||||
expect(commandsString).toBe(expectedCommands.join(', '))
|
||||
})
|
||||
})
|
||||
|
||||
/**
|
||||
* User Commands Test suite for testing out commands
|
||||
* that would be run by users when using the application.
|
||||
*/
|
||||
describe('User Command Tests', () => {
|
||||
// test capacity command
|
||||
it('run modify-capacity command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run clear-user-channel-history command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run message-stream command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run message-style command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run thread command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run private-thread command', () => {
|
||||
|
||||
})
|
||||
})
|
||||
|
||||
/**
|
||||
* Admin Commands Test suite for running administrative
|
||||
* commands with the application.
|
||||
*/
|
||||
describe('Admin Command Tests', () => {
|
||||
it('run shutoff command', () => {
|
||||
|
||||
})
|
||||
|
||||
it('run toggle-chat command', () => {
|
||||
|
||||
})
|
||||
})
|
||||
@@ -1,31 +1,415 @@
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import events from '../src/events/index.js'
|
||||
import { Client, TextChannel, Message } from 'discord.js'
|
||||
import { redis, ollama } from '../src/client.js'
|
||||
import { Queue } from '../src/queues/queue.js'
|
||||
import { UserMessage } from '../src/utils/index.js'
|
||||
import fs from 'fs/promises'
|
||||
|
||||
/**
|
||||
* Mocking ollama found in client.ts because pullModel.ts
|
||||
* relies on the existence on ollama. To prevent the mock,
|
||||
* we will have to pass through ollama to the commands somehow.
|
||||
*/
|
||||
// Mock Redis client
|
||||
vi.mock('../src/client.js', () => ({
|
||||
ollama: {
|
||||
pull: vi.fn() // Mock the pull method found with ollama
|
||||
}
|
||||
redis: {
|
||||
get: vi.fn().mockResolvedValue('0.50'),
|
||||
set: vi.fn().mockResolvedValue('OK'),
|
||||
},
|
||||
ollama: {
|
||||
chat: vi.fn(),
|
||||
pull: vi.fn(),
|
||||
},
|
||||
}))
|
||||
|
||||
/**
|
||||
* Events test suite, tests the events object
|
||||
* Each event is to be tested elsewhere, this file
|
||||
* is to ensure that the events object is defined.
|
||||
* Events test suite, tests the events object and messageCreate event behavior
|
||||
*/
|
||||
describe('Events Existence', () => {
|
||||
// test definition of events object
|
||||
it('references defined object', () => {
|
||||
expect(typeof events).toBe('object')
|
||||
describe('Events Tests', () => {
|
||||
// Test definition of events object
|
||||
it('references defined object', () => {
|
||||
expect(typeof events).toBe('object')
|
||||
})
|
||||
|
||||
// Test specific events in the object
|
||||
it('references specific events', () => {
|
||||
const eventsString = events.map(e => e.key.toString()).join(', ')
|
||||
expect(eventsString).toBe('ready, messageCreate, interactionCreate, threadDelete')
|
||||
})
|
||||
|
||||
// Test messageCreate event
|
||||
describe('messageCreate', () => {
|
||||
const messageCreateEvent = events.find(e => e.key === 'messageCreate')
|
||||
if (!messageCreateEvent) throw new Error('messageCreate event not found')
|
||||
|
||||
it('should respond to bot message with random chance and respect cooldown', async () => {
|
||||
const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
|
||||
const message = {
|
||||
id: 'msg1',
|
||||
author: { id: 'bot2', bot: true, tag: 'OtherBot#1234', username: 'OtherBot' },
|
||||
content: 'Hello from another bot!',
|
||||
mentions: { has: () => false },
|
||||
channelId: 'channel1',
|
||||
channel: { name: 'test-channel' } as TextChannel,
|
||||
reply: vi.fn().mockResolvedValue({ id: 'reply1' }),
|
||||
attachments: { first: () => null },
|
||||
guildId: 'guild1',
|
||||
} as unknown as Message
|
||||
const msgHist = new Queue<UserMessage>()
|
||||
msgHist.capacity = 50
|
||||
const defaultModel = 'aidoll-gemma3-12b-q6:latest'
|
||||
|
||||
// Mock random chance to pass (10% probability)
|
||||
vi.spyOn(Math, 'random').mockReturnValue(0.05)
|
||||
|
||||
// Mock Redis
|
||||
vi.mocked(redis.get).mockImplementation(async (key: string) => {
|
||||
if (key === 'message:msg1:is_bot_response') return null // No is_bot_response
|
||||
if (key === 'bot:bot1:last_bot_response') return null // No last_bot_response
|
||||
if (key === 'user:bot2:sentiment') return '0.50' // Bot sentiment
|
||||
if (key === 'bot:self_sentiment') return '0.50' // Self sentiment
|
||||
if (key === 'channel:channel1:OtherBot:history') return JSON.stringify([]) // Empty history
|
||||
return null
|
||||
})
|
||||
|
||||
// Mock fs for personality.json
|
||||
vi.spyOn(fs, 'readFile').mockResolvedValue(
|
||||
JSON.stringify({
|
||||
character: 'You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote.',
|
||||
})
|
||||
)
|
||||
|
||||
// Mock utils functions
|
||||
vi.mock('../src/utils/index.js', () => ({
|
||||
clean: vi.fn(content => content),
|
||||
getServerConfig: vi.fn((_, cb) => cb({ options: { 'toggle-chat': true } })),
|
||||
getUserConfig: vi.fn((_, cb) =>
|
||||
cb({
|
||||
options: {
|
||||
'message-style': false,
|
||||
'switch-model': 'aidoll-gemma3-12b-q6:latest',
|
||||
'modify-capacity': 50,
|
||||
},
|
||||
})
|
||||
),
|
||||
openConfig: vi.fn(),
|
||||
}))
|
||||
|
||||
// Mock Ollama response
|
||||
vi.mocked(ollama.chat).mockResolvedValue({
|
||||
message: {
|
||||
content: JSON.stringify({
|
||||
status: 'success',
|
||||
reply: 'Hmph, another bot, huh? Trying to steal my spotlight?',
|
||||
metadata: {
|
||||
timestamp: '2025-05-21T14:00:00Z',
|
||||
self_sentiment: 0.50,
|
||||
user_sentiment: { 'bot2': 0.50 },
|
||||
redis_ops: [
|
||||
{ action: 'set', key: 'user:bot2:sentiment', value: 0.50 },
|
||||
{ action: 'set', key: 'bot:self_sentiment', value: 0.50 },
|
||||
],
|
||||
need_help: false,
|
||||
},
|
||||
}),
|
||||
},
|
||||
})
|
||||
|
||||
// Execute messageCreate event
|
||||
await messageCreateEvent.execute(
|
||||
{ log: console.log, msgHist, ollama, client, defaultModel },
|
||||
message
|
||||
)
|
||||
|
||||
expect(message.reply).toHaveBeenCalledWith('Hmph, another bot, huh? Trying to steal my spotlight?')
|
||||
expect(redis.set).toHaveBeenCalledWith(
|
||||
'bot:bot1:last_bot_response',
|
||||
expect.any(String),
|
||||
{ EX: 60 }
|
||||
)
|
||||
expect(redis.set).toHaveBeenCalledWith('message:reply1:is_bot_response', 'true', { EX: 3600 })
|
||||
expect(redis.set).toHaveBeenCalledWith(
|
||||
'channel:channel1:OtherBot:history',
|
||||
JSON.stringify([
|
||||
{ role: 'user', content: 'Hello from another bot!', images: [] },
|
||||
{ role: 'assistant', content: 'Hmph, another bot, huh? Trying to steal my spotlight?', images: [] },
|
||||
])
|
||||
)
|
||||
expect(msgHist.size()).toBe(2) // User message + bot response
|
||||
})
|
||||
|
||||
// test specific events in the object
|
||||
it('references specific events', () => {
|
||||
const eventsString = events.map(e => e.key.toString()).join(', ')
|
||||
expect(eventsString).toBe('ready, messageCreate, interactionCreate, threadDelete')
|
||||
it('should skip bot message response if within cooldown', async () => {
|
||||
const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
|
||||
const message = {
|
||||
id: 'msg2',
|
||||
author: { id: 'bot2', bot: true, tag: 'OtherBot#1234', username: 'OtherBot' },
|
||||
content: 'Hello again!',
|
||||
mentions: { has: () => false },
|
||||
channelId: 'channel1',
|
||||
channel: { name: 'test-channel' } as TextChannel,
|
||||
reply: vi.fn(),
|
||||
attachments: { first: () => null },
|
||||
guildId: 'guild1',
|
||||
} as unknown as Message
|
||||
const msgHist = new Queue<UserMessage>()
|
||||
msgHist.capacity = 50
|
||||
const defaultModel = 'aidoll-gemma3-12b-q6:latest'
|
||||
|
||||
// Mock random chance to pass
|
||||
vi.spyOn(Math, 'random').mockReturnValue(0.05)
|
||||
|
||||
// Mock Redis: within cooldown
|
||||
const currentTime = Math.floor(Date.now() / 1000)
|
||||
vi.mocked(redis.get).mockImplementation(async (key: string) => {
|
||||
if (key === 'message:msg2:is_bot_response') return null // No is_bot_response
|
||||
if (key === 'bot:bot1:last_bot_response') return (currentTime - 30).toString() // Cooldown active
|
||||
return null
|
||||
})
|
||||
|
||||
// Execute messageCreate event
|
||||
await messageCreateEvent.execute(
|
||||
{ log: console.log, msgHist, ollama, client, defaultModel },
|
||||
message
|
||||
)
|
||||
|
||||
expect(message.reply).not.toHaveBeenCalled()
|
||||
expect(redis.set).not.toHaveBeenCalled()
|
||||
expect(msgHist.size()).toBe(0) // No messages added
|
||||
})
|
||||
})
|
||||
|
||||
it('should skip bot response to another bot response', async () => {
|
||||
const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
|
||||
const message = {
|
||||
id: 'msg3',
|
||||
author: { id: 'bot2', bot: true, tag: 'OtherBot#1234', username: 'OtherBot' },
|
||||
content: 'I’m responding to you!',
|
||||
mentions: { has: () => false },
|
||||
channelId: 'channel1',
|
||||
channel: { name: 'test-channel' } as TextChannel,
|
||||
reply: vi.fn(),
|
||||
attachments: { first: () => null },
|
||||
guildId: 'guild1',
|
||||
} as unknown as Message
|
||||
const msgHist = new Queue<UserMessage>()
|
||||
msgHist.capacity = 50
|
||||
const defaultModel = 'aidoll-gemma3-12b-q6:latest'
|
||||
|
||||
// Mock random chance to pass
|
||||
vi.spyOn(Math, 'random').mockReturnValue(0.05)
|
||||
|
||||
// Mock Redis: message is a bot response
|
||||
vi.mocked(redis.get).mockImplementation(async (key: string) => {
|
||||
if (key === 'message:msg3:is_bot_response') return 'true' // is_bot_response
|
||||
return null
|
||||
})
|
||||
|
||||
// Execute messageCreate event
|
||||
await messageCreateEvent.execute(
|
||||
{ log: console.log, msgHist, ollama, client, defaultModel },
|
||||
message
|
||||
)
|
||||
|
||||
expect(message.reply).not.toHaveBeenCalled()
|
||||
expect(redis.set).not.toHaveBeenCalled()
|
||||
expect(msgHist.size()).toBe(0) // No messages added
|
||||
})
|
||||
|
||||
it('should respond to user mention', async () => {
|
||||
const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
|
||||
const message = {
|
||||
id: 'msg4',
|
||||
author: { id: 'user1', bot: false, tag: 'User#1234', username: 'User' },
|
||||
content: '<@bot1> Hi!',
|
||||
mentions: { has: (id: string) => id === 'bot1' },
|
||||
channelId: 'channel1',
|
||||
channel: { name: 'test-channel' } as TextChannel,
|
||||
reply: vi.fn().mockResolvedValue({ id: 'reply2' }),
|
||||
attachments: { first: () => null },
|
||||
guildId: 'guild1',
|
||||
} as unknown as Message
|
||||
const msgHist = new Queue<UserMessage>()
|
||||
msgHist.capacity = 50
|
||||
const defaultModel = 'aidoll-gemma3-12b-q6:latest'
|
||||
|
||||
// Mock fs for personality.json
|
||||
vi.spyOn(fs, 'readFile').mockResolvedValue(
|
||||
JSON.stringify({
|
||||
character: 'You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote.',
|
||||
})
|
||||
)
|
||||
|
||||
// Mock utils functions
|
||||
vi.mock('../src/utils/index.js', () => ({
|
||||
clean: vi.fn(content => content),
|
||||
getServerConfig: vi.fn((_, cb) => cb({ options: { 'toggle-chat': true } })),
|
||||
getUserConfig: vi.fn((_, cb) =>
|
||||
cb({
|
||||
options: {
|
||||
'message-style': false,
|
||||
'switch-model': 'aidoll-gemma3-12b-q6:latest',
|
||||
'modify-capacity': 50,
|
||||
},
|
||||
})
|
||||
),
|
||||
openConfig: vi.fn(),
|
||||
}))
|
||||
|
||||
// Mock Redis
|
||||
vi.mocked(redis.get).mockImplementation(async (key: string) => {
|
||||
if (key === 'user:user1:sentiment') return '0.50'
|
||||
if (key === 'bot:self_sentiment') return '0.50'
|
||||
if (key === 'channel:channel1:User:history') return JSON.stringify([])
|
||||
return null
|
||||
})
|
||||
|
||||
// Mock Ollama response
|
||||
vi.mocked(ollama.chat).mockResolvedValue({
|
||||
message: {
|
||||
content: JSON.stringify({
|
||||
status: 'success',
|
||||
reply: 'U-um... hi... you talking to me?',
|
||||
metadata: {
|
||||
timestamp: '2025-05-21T14:00:00Z',
|
||||
self_sentiment: 0.50,
|
||||
user_sentiment: { 'user1': 0.50 },
|
||||
redis_ops: [
|
||||
{ action: 'set', key: 'user:user1:sentiment', value: 0.50 },
|
||||
{ action: 'set', key: 'bot:self_sentiment', value: 0.50 },
|
||||
],
|
||||
need_help: false,
|
||||
},
|
||||
}),
|
||||
},
|
||||
})
|
||||
|
||||
// Execute messageCreate event
|
||||
await messageCreateEvent.execute(
|
||||
{ log: console.log, msgHist, ollama, client, defaultModel },
|
||||
message
|
||||
)
|
||||
|
||||
expect(message.reply).toHaveBeenCalledWith('U-um... hi... you talking to me?')
|
||||
expect(redis.set).toHaveBeenCalledWith('user:user1:sentiment', '0.50')
|
||||
expect(redis.set).toHaveBeenCalledWith('bot:self_sentiment', '0.50')
|
||||
expect(redis.set).toHaveBeenCalledWith(
|
||||
'channel:channel1:User:history',
|
||||
JSON.stringify([
|
||||
{ role: 'user', content: '<@bot1> Hi!', images: [] },
|
||||
{ role: 'assistant', content: 'U-um... hi... you talking to me?', images: [] },
|
||||
])
|
||||
)
|
||||
expect(msgHist.size()).toBe(2) // User message + bot response
|
||||
})
|
||||
|
||||
it('should not respond to own message', async () => {
|
||||
const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
|
||||
const message = {
|
||||
id: 'msg5',
|
||||
author: { id: 'bot1', bot: true, tag: 'TestBot#1234', username: 'TestBot' },
|
||||
content: 'I said something!',
|
||||
mentions: { has: () => false },
|
||||
channelId: 'channel1',
|
||||
channel: { name: 'test-channel' } as TextChannel,
|
||||
reply: vi.fn(),
|
||||
attachments: { first: () => null },
|
||||
guildId: 'guild1',
|
||||
} as unknown as Message
|
||||
const msgHist = new Queue<UserMessage>()
|
||||
msgHist.capacity = 50
|
||||
const defaultModel = 'aidoll-gemma3-12b-q6:latest'
|
||||
|
||||
// Execute messageCreate event
|
||||
await messageCreateEvent.execute(
|
||||
{ log: console.log, msgHist, ollama, client, defaultModel },
|
||||
message
|
||||
)
|
||||
|
||||
expect(message.reply).not.toHaveBeenCalled()
|
||||
expect(redis.set).not.toHaveBeenCalled()
|
||||
expect(msgHist.size()).toBe(0) // No messages added
|
||||
})
|
||||
|
||||
it('should handle missing channel history in Redis', async () => {
|
||||
const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
|
||||
const message = {
|
||||
id: 'msg6',
|
||||
author: { id: 'user1', bot: false, tag: 'User#1234', username: 'User' },
|
||||
content: '<@bot1> Hi!',
|
||||
mentions: { has: (id: string) => id === 'bot1' },
|
||||
channelId: 'channel1',
|
||||
channel: { name: 'test-channel' } as TextChannel,
|
||||
reply: vi.fn().mockResolvedValue({ id: 'reply3' }),
|
||||
attachments: { first: () => null },
|
||||
guildId: 'guild1',
|
||||
} as unknown as Message
|
||||
const msgHist = new Queue<UserMessage>()
|
||||
msgHist.capacity = 50
|
||||
const defaultModel = 'aidoll-gemma3-12b-q6:latest'
|
||||
|
||||
// Mock fs for personality.json
|
||||
vi.spyOn(fs, 'readFile').mockResolvedValue(
|
||||
JSON.stringify({
|
||||
character: 'You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote.',
|
||||
})
|
||||
)
|
||||
|
||||
// Mock utils functions
|
||||
vi.mock('../src/utils/index.js', () => ({
|
||||
clean: vi.fn(content => content),
|
||||
getServerConfig: vi.fn((_, cb) => cb({ options: { 'toggle-chat': true } })),
|
||||
getUserConfig: vi.fn((_, cb) =>
|
||||
cb({
|
||||
options: {
|
||||
'message-style': false,
|
||||
'switch-model': 'aidoll-gemma3-12b-q6:latest',
|
||||
'modify-capacity': 50,
|
||||
},
|
||||
})
|
||||
),
|
||||
openConfig: vi.fn(),
|
||||
}))
|
||||
|
||||
// Mock Redis: no history
|
||||
vi.mocked(redis.get).mockImplementation(async (key: string) => {
|
||||
if (key === 'user:user1:sentiment') return '0.50'
|
||||
if (key === 'bot:self_sentiment') return '0.50'
|
||||
if (key === 'channel:channel1:User:history') return null // No history
|
||||
return null
|
||||
})
|
||||
|
||||
// Mock Ollama response
|
||||
vi.mocked(ollama.chat).mockResolvedValue({
|
||||
message: {
|
||||
content: JSON.stringify({
|
||||
status: 'success',
|
||||
reply: 'U-um... hi... you talking to me?',
|
||||
metadata: {
|
||||
timestamp: '2025-05-21T14:00:00Z',
|
||||
self_sentiment: 0.50,
|
||||
user_sentiment: { 'user1': 0.50 },
|
||||
redis_ops: [
|
||||
{ action: 'set', key: 'user:user1:sentiment', value: 0.50 },
|
||||
{ action: 'set', key: 'bot:self_sentiment', value: 0.50 },
|
||||
],
|
||||
need_help: false,
|
||||
},
|
||||
}),
|
||||
},
|
||||
})
|
||||
|
||||
// Execute messageCreate event
|
||||
await messageCreateEvent.execute(
|
||||
{ log: console.log, msgHist, ollama, client, defaultModel },
|
||||
message
|
||||
)
|
||||
|
||||
expect(message.reply).toHaveBeenCalledWith('U-um... hi... you talking to me?')
|
||||
expect(redis.set).toHaveBeenCalledWith('user:user1:sentiment', '0.50')
|
||||
expect(redis.set).toHaveBeenCalledWith('bot:self_sentiment', '0.50')
|
||||
expect(redis.set).toHaveBeenCalledWith(
|
||||
'channel:channel1:User:history',
|
||||
JSON.stringify([
|
||||
{ role: 'user', content: '<@bot1> Hi!', images: [] },
|
||||
{ role: 'assistant', content: 'U-um... hi... you talking to me?', images: [] },
|
||||
])
|
||||
)
|
||||
expect(msgHist.size()).toBe(2) // User message + bot response
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -8,7 +8,7 @@ import { Queue } from '../src/queues/queue.js'
|
||||
* @param fn function holding tests to run
|
||||
*/
|
||||
describe('Queue Structure', () => {
|
||||
let queue= new Queue<string>()
|
||||
let queue = new Queue<string>()
|
||||
|
||||
// test for queue creation
|
||||
it('creates a new queue', () => {
|
||||
|
||||
@@ -1,21 +1,16 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
// Dependent on node version
|
||||
"target": "ES2020",
|
||||
"module": "NodeNext",
|
||||
"moduleResolution": "NodeNext",
|
||||
"strict": true,
|
||||
// We must set the type
|
||||
"noImplicitAny": true,
|
||||
"declaration": false,
|
||||
// Will not go through node_modules
|
||||
"skipDefaultLibCheck": true,
|
||||
"strictNullChecks": true,
|
||||
// We can import json files like JavaScript
|
||||
"resolveJsonModule": true,
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": true,
|
||||
// Decompile .ts to .js into a folder named build
|
||||
"outDir": "build",
|
||||
"rootDir": "src",
|
||||
"baseUrl": ".",
|
||||
@@ -23,7 +18,6 @@
|
||||
"*": ["node_modules/"]
|
||||
}
|
||||
},
|
||||
// environment for env vars
|
||||
"include": ["src/**/*.ts"],
|
||||
"exclude": ["node_modules"]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user