mirror of
https://github.com/kevinthedang/discord-ollama.git
synced 2025-12-12 11:56:06 -05:00
Add: Filter out think tags in bot message (#190)
This commit is contained in:
@@ -7,7 +7,7 @@ services:
|
|||||||
build: ./ # find docker file in designated path
|
build: ./ # find docker file in designated path
|
||||||
container_name: discord
|
container_name: discord
|
||||||
restart: always # rebuild container always
|
restart: always # rebuild container always
|
||||||
image: kevinthedang/discord-ollama:0.8.6
|
image: kevinthedang/discord-ollama:0.8.7
|
||||||
environment:
|
environment:
|
||||||
CLIENT_TOKEN: ${CLIENT_TOKEN}
|
CLIENT_TOKEN: ${CLIENT_TOKEN}
|
||||||
OLLAMA_IP: ${OLLAMA_IP}
|
OLLAMA_IP: ${OLLAMA_IP}
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "discord-ollama",
|
"name": "discord-ollama",
|
||||||
"version": "0.8.5",
|
"version": "0.8.7",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "discord-ollama",
|
"name": "discord-ollama",
|
||||||
"version": "0.8.5",
|
"version": "0.8.7",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"discord.js": "^14.20.0",
|
"discord.js": "^14.20.0",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "discord-ollama",
|
"name": "discord-ollama",
|
||||||
"version": "0.8.6",
|
"version": "0.8.7",
|
||||||
"description": "Ollama Integration into discord",
|
"description": "Ollama Integration into discord",
|
||||||
"main": "build/index.js",
|
"main": "build/index.js",
|
||||||
"exports": "./build/index.js",
|
"exports": "./build/index.js",
|
||||||
|
|||||||
@@ -56,6 +56,10 @@ export async function normalMessage(
|
|||||||
response = await blockResponse(params)
|
response = await blockResponse(params)
|
||||||
result = response.message.content
|
result = response.message.content
|
||||||
|
|
||||||
|
// check if there is a <think>...</think> sequence from the bot.
|
||||||
|
if (hasThinking(result))
|
||||||
|
result = result.replace(/<think>[\s\S]*?<\/think>/g, '').trim()
|
||||||
|
|
||||||
// check if message length > discord max for normal messages
|
// check if message length > discord max for normal messages
|
||||||
if (result.length > 2000) {
|
if (result.length > 2000) {
|
||||||
sentMessage.edit(result.slice(0, 2000))
|
sentMessage.edit(result.slice(0, 2000))
|
||||||
@@ -85,3 +89,7 @@ export async function normalMessage(
|
|||||||
// return the string representation of ollama query response
|
// return the string representation of ollama query response
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasThinking(message: string): boolean {
|
||||||
|
return /<think>[\s\S]*?<\/think>/i.test(message)
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user