Compare commits
28 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c8bb6681c7 | |||
| c0d5bff873 | |||
| ff7b33b952 | |||
| 702e62973a | |||
| c3dd3fa7b0 | |||
| b4954b082e | |||
| 54713ed346 | |||
| 673fc0deaf | |||
| f80cc18294 | |||
| e03b26da0f | |||
| 9eef597c8d | |||
| 57acaef1b2 | |||
| aa2382f3b4 | |||
| a8d83c8768 | |||
| e7be5553cc | |||
| 895b17390d | |||
| 9145ac1bb4 | |||
| 44d0315059 | |||
| b3045bf724 | |||
| 90c97d3f54 | |||
| 6bf61fdbf0 | |||
| b2c2d4bcc2 | |||
| 1ef60193a0 | |||
| 3fbc996de1 | |||
| 8819489a7d | |||
| 3c979d855e | |||
| 5d42ab65e6 | |||
| fa70c064cf |
@ -15,12 +15,12 @@ jobs:
|
|||||||
GITHUB: ${{ secrets.GITHUB }}
|
GITHUB: ${{ secrets.GITHUB }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v6
|
||||||
with:
|
with:
|
||||||
python-version: '3.10'
|
python-version: '3.14'
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
@ -85,7 +85,7 @@ jobs:
|
|||||||
|
|
||||||
# Ergebnisse als Artefakte speichern
|
# Ergebnisse als Artefakte speichern
|
||||||
- name: Upload results as artifacts
|
- name: Upload results as artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v5
|
||||||
with:
|
with:
|
||||||
name: quality-reports
|
name: quality-reports
|
||||||
path: /tmp/results
|
path: /tmp/results
|
||||||
|
|||||||
@ -10,7 +10,7 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: Verify Docker installation
|
- name: Verify Docker installation
|
||||||
run: docker --version
|
run: docker --version
|
||||||
|
|||||||
20
.github/renovate.json
vendored
Normal file
20
.github/renovate.json
vendored
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||||
|
"extends": [
|
||||||
|
"config:recommended"
|
||||||
|
],
|
||||||
|
"baseBranches": [
|
||||||
|
"dev"
|
||||||
|
],
|
||||||
|
"packageRules": [
|
||||||
|
{
|
||||||
|
"matchUpdateTypes": [
|
||||||
|
"minor",
|
||||||
|
"patch",
|
||||||
|
"pin",
|
||||||
|
"digest"
|
||||||
|
],
|
||||||
|
"automerge": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@ -1,4 +1,4 @@
|
|||||||
FROM python:3.13.3-slim
|
FROM python:3.14.2-slim
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
|||||||
38
src/main.py
38
src/main.py
@ -10,8 +10,8 @@ import sys
|
|||||||
import time
|
import time
|
||||||
import zipfile
|
import zipfile
|
||||||
|
|
||||||
|
import aiohttp
|
||||||
import discord
|
import discord
|
||||||
import requests
|
|
||||||
from discord import app_commands
|
from discord import app_commands
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
|
|
||||||
@ -30,7 +30,7 @@ logger = logging.getLogger(__name__)
|
|||||||
|
|
||||||
if not all([NOVELAI_API_TOKEN, BOT_TOKEN, ALLOWED_CHANNEL_ID]):
|
if not all([NOVELAI_API_TOKEN, BOT_TOKEN, ALLOWED_CHANNEL_ID]):
|
||||||
raise ValueError(
|
raise ValueError(
|
||||||
"NOVELAI_API_TOKEN, DISCORD_BOT_TOKEN und DISCORD_CHANNEL_ID müssen gesetzt sein."
|
"NOVELAI_API_TOKEN, DISCORD_BOT_TOKEN and DISCORD_CHANNEL_ID have to be set."
|
||||||
)
|
)
|
||||||
|
|
||||||
intents = discord.Intents.default()
|
intents = discord.Intents.default()
|
||||||
@ -43,9 +43,9 @@ async def on_ready():
|
|||||||
print(f"Bot gestartet als {bot.user}")
|
print(f"Bot gestartet als {bot.user}")
|
||||||
try:
|
try:
|
||||||
synced = await bot.tree.sync()
|
synced = await bot.tree.sync()
|
||||||
logger.info("%d Slash-Commands synchronisiert.", len(synced))
|
logger.info("%d Slash-Commands synchronized.", len(synced))
|
||||||
except Exception as err: # pylint: disable=W0718
|
except Exception as err: # pylint: disable=W0718
|
||||||
logger.error("Fehler beim Synchronisieren der Commands: %s", err)
|
logger.error("error while syncing the command: %s", err)
|
||||||
|
|
||||||
activity = discord.Game(name="generating juicy NovelAI images 🥵")
|
activity = discord.Game(name="generating juicy NovelAI images 🥵")
|
||||||
await bot.change_presence(status=discord.Status.online, activity=activity)
|
await bot.change_presence(status=discord.Status.online, activity=activity)
|
||||||
@ -58,7 +58,7 @@ async def on_ready():
|
|||||||
orientation="portrait or landscape (Standard: portrait)",
|
orientation="portrait or landscape (Standard: portrait)",
|
||||||
seed="Optional seed (integer). If empty, a random one will be generated",
|
seed="Optional seed (integer). If empty, a random one will be generated",
|
||||||
)
|
)
|
||||||
# pylint: disable=too-many-locals,too-many-return-statements
|
# pylint: disable=too-many-locals,too-many-return-statements,too-many-statements
|
||||||
async def generate(
|
async def generate(
|
||||||
interaction: discord.Interaction,
|
interaction: discord.Interaction,
|
||||||
prompt: str,
|
prompt: str,
|
||||||
@ -159,17 +159,25 @@ async def generate(
|
|||||||
}
|
}
|
||||||
|
|
||||||
start_time = time.monotonic()
|
start_time = time.monotonic()
|
||||||
response = requests.post(
|
try:
|
||||||
|
async with aiohttp.ClientSession() as session:
|
||||||
|
async with session.post(
|
||||||
"https://image.novelai.net/ai/generate-image",
|
"https://image.novelai.net/ai/generate-image",
|
||||||
json=payload,
|
json=payload,
|
||||||
headers=headers,
|
headers=headers,
|
||||||
timeout=120,
|
timeout=aiohttp.ClientTimeout(total=120),
|
||||||
)
|
) as response:
|
||||||
|
response_bytes = await response.read()
|
||||||
|
status_code = response.status
|
||||||
|
except aiohttp.TimeoutError:
|
||||||
|
await interaction.followup.send("Error: the request timed out.")
|
||||||
|
except aiohttp.ClientError as e:
|
||||||
|
await interaction.followup.send(f"Error: {e}")
|
||||||
|
|
||||||
duration = time.monotonic() - start_time
|
duration = time.monotonic() - start_time
|
||||||
logger.info("Image creation took %.2f seconds", duration)
|
logger.info("Image creation took %.2f seconds", duration)
|
||||||
|
|
||||||
if response.status_code == 200:
|
if status_code == 200:
|
||||||
response_bytes = response.content
|
|
||||||
param_text = (
|
param_text = (
|
||||||
f"```Prompt: {prompt}\n"
|
f"```Prompt: {prompt}\n"
|
||||||
f"Undesired prompt: {negative_prompt}\n"
|
f"Undesired prompt: {negative_prompt}\n"
|
||||||
@ -206,13 +214,13 @@ async def generate(
|
|||||||
return
|
return
|
||||||
|
|
||||||
try:
|
try:
|
||||||
error_data = response.json()
|
error_data = response_bytes.decode("utf-8")
|
||||||
except Exception: # pylint: disable=W0718
|
except Exception: # pylint: disable=W0718
|
||||||
error_data = {"error": response.text}
|
error_data = "error message unreadable"
|
||||||
|
|
||||||
error_message = f"Error {response.status_code} at API-request.\n"
|
error_message = (
|
||||||
for key, value in error_data.items():
|
f"Error {status_code} at API-request.\n" f"Answer: {error_data}\n"
|
||||||
error_message += f"**{key}**: {value}\n"
|
)
|
||||||
|
|
||||||
await interaction.followup.send(error_message)
|
await interaction.followup.send(error_message)
|
||||||
|
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
discord
|
discord
|
||||||
requests
|
aiohttp
|
||||||
Loading…
x
Reference in New Issue
Block a user