jonbot fixes #14

Merged
crate merged 2 commits from jonbot into main 2026-06-19 06:14:32 +00:00
3 changed files with 8 additions and 8 deletions
Showing only changes of commit 39cc53d501 - Show all commits

View File

@@ -22,7 +22,6 @@ jobs:
if [ "$(docker compose ps -q)" ]; then if [ "$(docker compose ps -q)" ]; then
docker compose down docker compose down
fi fi
docker build -t git.crate.zip/crate/garfbot:latest .
docker compose up -d --build docker compose up -d --build
else else
docker restart garfbot docker restart garfbot

View File

@@ -7,7 +7,7 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
restart: always restart: always
volumes: volumes:
- ../garfbot:/usr/src/app - /home/crate/garfbot:/usr/src/app
jonbot: jonbot:
image: git.crate.zip/crate/jonbot:latest image: git.crate.zip/crate/jonbot:latest
@@ -17,4 +17,4 @@ services:
dockerfile: Dockerfile dockerfile: Dockerfile
restart: always restart: always
volumes: volumes:
- ../garfbot/jonbot:/usr/src/app - /home/crate/garfbot/jonbot:/usr/src/app

View File

@@ -33,7 +33,8 @@ if not logger.hasHandlers():
openai.api_key = config.OPENAI_TOKEN openai.api_key = config.OPENAI_TOKEN
jonkey = config.JONBOT_TOKEN jonkey = config.JONBOT_TOKEN
model = config.TXT_MODEL txtmodel = config.TXT_MODEL
sysprompt = config.SYSTEM_PROMPT
intents = discord.Intents.default() intents = discord.Intents.default()
intents.messages = True intents.messages = True
@@ -47,7 +48,7 @@ client = commands.Bot(
@client.event @client.event
async def on_ready(): async def on_ready():
print(f"Logged in as {client.user.name} running {model}.", flush=True) print(f"Logged in as {client.user.name} running {txtmodel}.", flush=True)
@client.command(name="chat") @client.command(name="chat")
async def jonchat(ctx, *, prompt): async def jonchat(ctx, *, prompt):
@@ -80,12 +81,12 @@ oai = AsyncOpenAI(
base_url=config.BASE_URL, base_url=config.BASE_URL,
) )
async def generate_chat(self, question: str) -> str: async def generate_chat(question: str) -> str:
try: try:
response = await oai.chat.completions.create( response = await oai.chat.completions.create(
model=self.txtmodel, model=txtmodel,
messages=[ messages=[
{"role": "system", "content": self.sysprompt}, {"role": "system", "content": sysprompt},
{"role": "user", "content": question}, {"role": "user", "content": question},
], ],
max_tokens=400, max_tokens=400,