mirror of
https://github.com/migatu/conjurer.git
synced 2026-07-15 22:32:10 +00:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| da8260d164 | |||
| b266db5bf3 | |||
| 0a29c9950d | |||
| 8ba954176a | |||
| 759c04a48f | |||
| 4ff0427b64 | |||
| 934e7a6240 | |||
| 597bc004fc |
@@ -0,0 +1,17 @@
|
|||||||
|
# Keep build contexts lean. Component dirs (conjurer_librarian, conjurer_musician)
|
||||||
|
# are intentionally NOT ignored — their images copy them from this same context.
|
||||||
|
.git
|
||||||
|
.github
|
||||||
|
.trunk
|
||||||
|
.vscode
|
||||||
|
**/__pycache__/
|
||||||
|
*.pyc
|
||||||
|
*.pyo
|
||||||
|
*.log
|
||||||
|
*.mp3
|
||||||
|
docs/
|
||||||
|
tests/
|
||||||
|
conftest.py
|
||||||
|
pytest.ini
|
||||||
|
docker/env/*.env
|
||||||
|
secrets/
|
||||||
@@ -4,9 +4,21 @@
|
|||||||
# pylint: disable=too-many-lines
|
# pylint: disable=too-many-lines
|
||||||
"""
|
"""
|
||||||
Module of a python bot named Conjurer - used to work on BDSM discord servers.
|
Module of a python bot named Conjurer - used to work on BDSM discord servers.
|
||||||
|
|
||||||
|
Startup is defensive by design:
|
||||||
|
|
||||||
|
* every cog is loaded independently - one broken/missing dependency disables
|
||||||
|
that cog only, never the whole bot,
|
||||||
|
* cogs that need a sibling service (musician / librarian) are only enabled
|
||||||
|
after a positive health check; a watchdog keeps re-checking and enables them
|
||||||
|
the moment the service comes alive,
|
||||||
|
* fatal misconfiguration (missing Discord token) exits loudly on stderr with a
|
||||||
|
clear message instead of dying silently into a log file.
|
||||||
"""
|
"""
|
||||||
import asyncio
|
import asyncio
|
||||||
import logging
|
import logging
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
# *=========================================== Standard Library Imports
|
# *=========================================== Standard Library Imports
|
||||||
import random
|
import random
|
||||||
@@ -15,12 +27,26 @@ from logging import handlers
|
|||||||
|
|
||||||
# *==============Imported libraries
|
# *==============Imported libraries
|
||||||
import discord
|
import discord
|
||||||
|
import requests
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
|
|
||||||
from communication_subroutine import comm_subroutine
|
from communication_subroutine import comm_subroutine
|
||||||
from constants import ENCODING, LOGFILE, TOKEN
|
from constants import (
|
||||||
|
ENCODING,
|
||||||
|
FILE_SERVICE_ADDRESS,
|
||||||
|
GET_MP3,
|
||||||
|
LIBRARIAN_SERVICE_ADDRESS,
|
||||||
|
LOGFILE,
|
||||||
|
TOKEN,
|
||||||
|
)
|
||||||
|
|
||||||
logger = logging.getLogger("discord")
|
logger = logging.getLogger("discord")
|
||||||
logger.setLevel(logging.INFO)
|
logger.setLevel(logging.DEBUG)
|
||||||
|
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
|
||||||
|
|
||||||
|
# File log (rotated). constants ensures the directory exists; this is belt and
|
||||||
|
# braces for exotic overrides.
|
||||||
|
os.makedirs(os.path.dirname(LOGFILE) or ".", exist_ok=True)
|
||||||
handler = handlers.RotatingFileHandler(
|
handler = handlers.RotatingFileHandler(
|
||||||
filename=LOGFILE,
|
filename=LOGFILE,
|
||||||
encoding=ENCODING,
|
encoding=ENCODING,
|
||||||
@@ -28,10 +54,18 @@ handler = handlers.RotatingFileHandler(
|
|||||||
maxBytes=6 * 1024 * 1024,
|
maxBytes=6 * 1024 * 1024,
|
||||||
backupCount=6,
|
backupCount=6,
|
||||||
)
|
)
|
||||||
formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
|
|
||||||
handler.setFormatter(formatter)
|
handler.setFormatter(formatter)
|
||||||
logger.addHandler(handler)
|
logger.addHandler(handler)
|
||||||
|
|
||||||
|
# Console log so `docker logs` / journalctl actually show what happened.
|
||||||
|
console_handler = logging.StreamHandler()
|
||||||
|
console_handler.setLevel(logging.INFO)
|
||||||
|
console_handler.setFormatter(formatter)
|
||||||
|
logger.addHandler(console_handler)
|
||||||
|
# Some dependency calls logging.basicConfig(), adding a root handler; without
|
||||||
|
# this the 'discord' logger's records get printed twice (our format + root's).
|
||||||
|
logger.propagate = False
|
||||||
|
|
||||||
# *=========================================== Initializations
|
# *=========================================== Initializations
|
||||||
intents = discord.Intents.default()
|
intents = discord.Intents.default()
|
||||||
intents.message_content = True
|
intents.message_content = True
|
||||||
@@ -48,37 +82,129 @@ intents.moderation = True
|
|||||||
random.seed()
|
random.seed()
|
||||||
client = commands.Bot(intents=intents, command_prefix="$")
|
client = commands.Bot(intents=intents, command_prefix="$")
|
||||||
|
|
||||||
|
# *=========================================== Extension groups
|
||||||
|
# Core cogs depend on nothing but the bot itself (broken ones are skipped
|
||||||
|
# individually). Service groups are gated on a health check of the service
|
||||||
|
# they talk to and enabled later by the watchdog when the service appears.
|
||||||
|
CORE_EXTENSIONS = [
|
||||||
|
"administration_commands",
|
||||||
|
"ai_commands",
|
||||||
|
"other_commands",
|
||||||
|
"latex_commands",
|
||||||
|
"voice_recognition_commands",
|
||||||
|
"conanjurer_commands",
|
||||||
|
]
|
||||||
|
|
||||||
|
SERVICE_EXTENSION_GROUPS = {
|
||||||
|
# musician (file service): music download/search, radio control, file shares
|
||||||
|
"musician": {
|
||||||
|
"health_url": f"{FILE_SERVICE_ADDRESS}{GET_MP3}",
|
||||||
|
"extensions": ["music_commands", "radio_commands", "file_search_commands"],
|
||||||
|
},
|
||||||
|
# librarian: DOI / Crossref search
|
||||||
|
"librarian": {
|
||||||
|
"health_url": f"{LIBRARIAN_SERVICE_ADDRESS}/",
|
||||||
|
"extensions": ["librarian_commands"],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
SERVICE_RECHECK_SECONDS = 300
|
||||||
|
|
||||||
|
|
||||||
|
def _service_alive(url: str) -> bool:
|
||||||
|
"""True when the service answers HTTP at all (any status code counts)."""
|
||||||
|
try:
|
||||||
|
requests.get(url, timeout=3)
|
||||||
|
return True
|
||||||
|
except requests.exceptions.RequestException:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
async def _load_extension_safe(name: str) -> bool:
|
||||||
|
"""Load one extension; log and continue instead of killing startup."""
|
||||||
|
if name in client.extensions:
|
||||||
|
return True
|
||||||
|
try:
|
||||||
|
await client.load_extension(name)
|
||||||
|
logger.info("Extension loaded: %s", name)
|
||||||
|
return True
|
||||||
|
except Exception: # pylint: disable=broad-exception-caught
|
||||||
|
logger.exception("Extension FAILED (disabled, bot continues): %s", name)
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
async def _load_service_groups() -> bool:
|
||||||
|
"""Health-check each service group and load its cogs when alive.
|
||||||
|
|
||||||
|
Returns True when anything new was loaded (caller may want to re-sync).
|
||||||
|
"""
|
||||||
|
loaded_any = False
|
||||||
|
for service, group in SERVICE_EXTENSION_GROUPS.items():
|
||||||
|
missing = [e for e in group["extensions"] if e not in client.extensions]
|
||||||
|
if not missing:
|
||||||
|
continue
|
||||||
|
alive = await asyncio.to_thread(_service_alive, group["health_url"])
|
||||||
|
if not alive:
|
||||||
|
logger.warning(
|
||||||
|
"Service '%s' unreachable (%s) - cogs stay disabled: %s",
|
||||||
|
service,
|
||||||
|
group["health_url"],
|
||||||
|
", ".join(missing),
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
logger.info("Service '%s' is alive - enabling: %s", service, ", ".join(missing))
|
||||||
|
for extension in missing:
|
||||||
|
if await _load_extension_safe(extension):
|
||||||
|
loaded_any = True
|
||||||
|
return loaded_any
|
||||||
|
|
||||||
|
|
||||||
|
async def _sync_tree() -> None:
|
||||||
|
try:
|
||||||
|
await client.tree.sync()
|
||||||
|
except Exception: # pylint: disable=broad-exception-caught
|
||||||
|
logger.exception("Slash-command tree sync failed (commands may lag)")
|
||||||
|
|
||||||
|
|
||||||
|
async def _service_watchdog() -> None:
|
||||||
|
"""Periodically retry offline services and enable their cogs when up."""
|
||||||
|
while not client.is_closed():
|
||||||
|
await asyncio.sleep(SERVICE_RECHECK_SECONDS)
|
||||||
|
try:
|
||||||
|
if await _load_service_groups():
|
||||||
|
await _sync_tree()
|
||||||
|
except Exception: # pylint: disable=broad-exception-caught
|
||||||
|
logger.exception("Service watchdog tick failed")
|
||||||
|
|
||||||
|
|
||||||
|
_STARTUP_DONE = False
|
||||||
|
|
||||||
|
|
||||||
# *=========================================== Define Events
|
# *=========================================== Define Events
|
||||||
@client.event
|
@client.event
|
||||||
async def on_ready():
|
async def on_ready():
|
||||||
"""Metoda wywoływana przy połączeniu do serwera."""
|
"""Metoda wywoływana przy połączeniu do serwera."""
|
||||||
logger = logging.getLogger("discord")
|
global _STARTUP_DONE # pylint: disable=global-statement
|
||||||
logger.debug("SAMPLE DEBUG LOG")
|
|
||||||
logger.info("%s has connected to Discord!", client.user)
|
logger.info("%s has connected to Discord!", client.user)
|
||||||
# TODO: load vs reload
|
if _STARTUP_DONE:
|
||||||
|
logger.info("Reconnected - extensions already loaded")
|
||||||
|
return
|
||||||
|
_STARTUP_DONE = True
|
||||||
logger.info("Reactor: online")
|
logger.info("Reactor: online")
|
||||||
|
|
||||||
await client.load_extension("administration_commands")
|
for extension in CORE_EXTENSIONS:
|
||||||
|
await _load_extension_safe(extension)
|
||||||
|
|
||||||
await client.load_extension("librarian_commands")
|
await _load_service_groups()
|
||||||
await client.load_extension("music_commands")
|
|
||||||
await client.load_extension("radio_commands")
|
|
||||||
|
|
||||||
await client.load_extension("ai_commands")
|
|
||||||
|
|
||||||
await client.load_extension("other_commands")
|
|
||||||
await client.load_extension("voice_recognition_commands")
|
|
||||||
await client.load_extension("file_search_commands")
|
|
||||||
await client.load_extension("latex_commands")
|
|
||||||
await client.load_extension("conanjurer_commands")
|
|
||||||
logger.info("Sensors: online")
|
logger.info("Sensors: online")
|
||||||
|
|
||||||
logger.info(client.cogs)
|
logger.info(client.cogs)
|
||||||
await client.tree.sync()
|
await _sync_tree()
|
||||||
for com in client.commands:
|
for com in client.commands:
|
||||||
logger.info("Command %s is awejleble", com.qualified_name)
|
logger.info("Command %s is awejleble", com.qualified_name)
|
||||||
|
|
||||||
|
asyncio.create_task(_service_watchdog())
|
||||||
|
|
||||||
logger.info("Logged in as ----> %s", client.user)
|
logger.info("Logged in as ----> %s", client.user)
|
||||||
logger.info("ID:%s ", client.user.id)
|
logger.info("ID:%s ", client.user.id)
|
||||||
logger.info("All systems: operational")
|
logger.info("All systems: operational")
|
||||||
@@ -93,22 +219,64 @@ async def on_ready():
|
|||||||
|
|
||||||
|
|
||||||
async def _run_comm_subroutine(stop_event: threading.Event) -> None:
|
async def _run_comm_subroutine(stop_event: threading.Event) -> None:
|
||||||
"""Run the blocking comm subroutine in a worker thread."""
|
"""Run the blocking comm subroutine in a worker thread.
|
||||||
await asyncio.to_thread(comm_subroutine, stop_event)
|
|
||||||
|
A crash here takes down the internal HTTP endpoints only - the Discord
|
||||||
|
side keeps running, so log loudly and swallow.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
await asyncio.to_thread(comm_subroutine, stop_event)
|
||||||
|
except Exception: # pylint: disable=broad-exception-caught
|
||||||
|
logger.exception(
|
||||||
|
"Comm layer crashed - internal HTTP endpoints are down "
|
||||||
|
"(musician/librarian callbacks will not arrive); bot continues"
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
async def _run_bot(token: str, shutdown_event: asyncio.Event) -> None:
|
async def _run_bot(token: str, shutdown_event: asyncio.Event) -> None:
|
||||||
"""Start the Discord client and flag shutdown when it returns."""
|
"""Start the Discord client; log WHY it died before flagging shutdown.
|
||||||
|
|
||||||
|
Exceptions were previously swallowed by ``gather(return_exceptions=True)``
|
||||||
|
which made a failed login look like a clean exit (silent crash-loop in
|
||||||
|
docker). Now every death is diagnosed on the console first.
|
||||||
|
"""
|
||||||
try:
|
try:
|
||||||
await client.start(token, log_handler=None)
|
# NOTE: log_handler is a Client.run()-only kwarg (run() configures
|
||||||
|
# logging, then calls start()); start() takes just the token. We set
|
||||||
|
# up our own handlers above, so nothing is lost.
|
||||||
|
await client.start(token)
|
||||||
|
except discord.LoginFailure:
|
||||||
|
logger.critical(
|
||||||
|
"FATAL: Discord REJECTED the token (Improper token). Fix the "
|
||||||
|
"'discord' entry in the netrc mounted at CONJURER_NETRC_FILE or "
|
||||||
|
"the DISCORD_TOKEN env var. If the token leaked/reset, generate a "
|
||||||
|
"new one in the Discord Developer Portal -> Bot -> Reset Token."
|
||||||
|
)
|
||||||
|
raise
|
||||||
|
except discord.PrivilegedIntentsRequired:
|
||||||
|
logger.critical(
|
||||||
|
"FATAL: this bot application does not have the Privileged Gateway "
|
||||||
|
"Intents enabled. Open Discord Developer Portal -> your app -> "
|
||||||
|
"Bot -> enable 'Presence', 'Server Members' and 'Message Content' "
|
||||||
|
"Intents, then restart."
|
||||||
|
)
|
||||||
|
raise
|
||||||
|
except Exception: # pylint: disable=broad-exception-caught
|
||||||
|
logger.exception("FATAL: Discord client crashed at startup/runtime")
|
||||||
|
raise
|
||||||
finally:
|
finally:
|
||||||
shutdown_event.set()
|
shutdown_event.set()
|
||||||
|
|
||||||
|
|
||||||
async def main() -> None:
|
async def main() -> int:
|
||||||
if not TOKEN:
|
"""Run both halves; return a process exit code (0 = clean shutdown)."""
|
||||||
logger.error("Discord token missing - set DISCORD_TOKEN or configure netrc")
|
if TOKEN:
|
||||||
return
|
token_source = (
|
||||||
|
"env DISCORD_TOKEN" if os.getenv("DISCORD_TOKEN") else "netrc file"
|
||||||
|
)
|
||||||
|
logger.info(
|
||||||
|
"Discord token: loaded from %s (length %d)", token_source, len(TOKEN)
|
||||||
|
)
|
||||||
|
|
||||||
logger.info("Starting discord bot")
|
logger.info("Starting discord bot")
|
||||||
shutdown_event = asyncio.Event()
|
shutdown_event = asyncio.Event()
|
||||||
@@ -117,6 +285,7 @@ async def main() -> None:
|
|||||||
comm_task = asyncio.create_task(_run_comm_subroutine(comm_stop_event))
|
comm_task = asyncio.create_task(_run_comm_subroutine(comm_stop_event))
|
||||||
bot_task = asyncio.create_task(_run_bot(TOKEN, shutdown_event))
|
bot_task = asyncio.create_task(_run_bot(TOKEN, shutdown_event))
|
||||||
|
|
||||||
|
exit_code = 0
|
||||||
try:
|
try:
|
||||||
await shutdown_event.wait()
|
await shutdown_event.wait()
|
||||||
except (KeyboardInterrupt, asyncio.CancelledError):
|
except (KeyboardInterrupt, asyncio.CancelledError):
|
||||||
@@ -127,9 +296,31 @@ async def main() -> None:
|
|||||||
comm_stop_event.set()
|
comm_stop_event.set()
|
||||||
if not client.is_closed():
|
if not client.is_closed():
|
||||||
await client.close()
|
await client.close()
|
||||||
await asyncio.gather(bot_task, comm_task, return_exceptions=True)
|
results = await asyncio.gather(bot_task, comm_task, return_exceptions=True)
|
||||||
|
for result in results:
|
||||||
|
if isinstance(result, BaseException) and not isinstance(
|
||||||
|
result, asyncio.CancelledError
|
||||||
|
):
|
||||||
|
# Already logged with full traceback inside the task; repeat
|
||||||
|
# the one-liner so it is the LAST thing in `docker logs`.
|
||||||
|
logger.critical("Task died: %r", result)
|
||||||
|
exit_code = 1
|
||||||
|
return exit_code
|
||||||
|
|
||||||
|
|
||||||
# *================================== Run
|
# *================================== Run
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
asyncio.run(main())
|
if not TOKEN:
|
||||||
|
# Loud, unmissable and in `docker logs`: this is THE most common cause
|
||||||
|
# of a silent container crash-loop.
|
||||||
|
MSG = (
|
||||||
|
"FATAL: Discord token missing.\n"
|
||||||
|
"Provide it via the DISCORD_TOKEN environment variable or a netrc "
|
||||||
|
"file (machine 'discord') at the path in CONJURER_NETRC_FILE.\n"
|
||||||
|
"Docker: check that your secrets mount exists, e.g.\n"
|
||||||
|
" -v /srv/conjurer/secrets/.netrc:/secrets/.netrc:ro\n"
|
||||||
|
" CONJURER_NETRC_FILE=/secrets/.netrc"
|
||||||
|
)
|
||||||
|
logger.critical(MSG)
|
||||||
|
sys.exit(MSG)
|
||||||
|
sys.exit(asyncio.run(main()))
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ from urllib import request as urequest
|
|||||||
from flask import Flask, abort, jsonify, request
|
from flask import Flask, abort, jsonify, request
|
||||||
from waitress import serve
|
from waitress import serve
|
||||||
|
|
||||||
HOST_ADDRESS = os.getenv("CONJURER_DISCORD_HOST", "192.168.1.31")
|
HOST_ADDRESS = os.getenv("CONJURER_DISCORD_HOST", "192.168.1.92")
|
||||||
PORT_ADDRESS = int(os.getenv("CONJURER_DISCORD_PORT", "5000"))
|
PORT_ADDRESS = int(os.getenv("CONJURER_DISCORD_PORT", "5000"))
|
||||||
ICECAST_ADDRESS = os.getenv("CONJURER_ICECAST", "http://192.168.1.15:8000")
|
ICECAST_ADDRESS = os.getenv("CONJURER_ICECAST", "http://192.168.1.12:8000")
|
||||||
API_KEY = os.getenv("CONJURER_API_KEY")
|
API_KEY = os.getenv("CONJURER_API_KEY")
|
||||||
OUT_COMM_Q = Queue()
|
OUT_COMM_Q = Queue()
|
||||||
IN_COMM_Q = Queue()
|
IN_COMM_Q = Queue()
|
||||||
@@ -234,10 +234,13 @@ def comm_subroutine(stop_event: Optional[threading.Event] = None):
|
|||||||
:param stop_event: optional :class:`threading.Event` shared with the caller
|
:param stop_event: optional :class:`threading.Event` shared with the caller
|
||||||
to coordinate a cooperative shutdown.
|
to coordinate a cooperative shutdown.
|
||||||
"""
|
"""
|
||||||
# logger.setLevel(logging.DEBUG)
|
|
||||||
logger = logging.getLogger("discord")
|
logger = logging.getLogger("discord")
|
||||||
|
logger.setLevel(logging.DEBUG)
|
||||||
logger.info("Started comms")
|
logger.info("Started comms")
|
||||||
threads = []
|
threads = []
|
||||||
|
# NOTE: flask_debug is the dev server bound to the SAME host:port as
|
||||||
|
# waitress - running both kills the comm layer with 'address in use'.
|
||||||
|
# Enable it only INSTEAD of waitress_run, never alongside.
|
||||||
# threads.append(threading.Thread(target=flask_debug))
|
# threads.append(threading.Thread(target=flask_debug))
|
||||||
threads.append(threading.Thread(target=waitress_run, daemon=True))
|
threads.append(threading.Thread(target=waitress_run, daemon=True))
|
||||||
threads.append(
|
threads.append(
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ This module contains the code for the scrape bot.
|
|||||||
|
|
||||||
import json
|
import json
|
||||||
import logging
|
import logging
|
||||||
|
import os
|
||||||
import random
|
import random
|
||||||
import re
|
import re
|
||||||
import time
|
import time
|
||||||
@@ -15,9 +16,9 @@ from urllib.request import urlopen
|
|||||||
from requests import ConnectionError as RequestsConnectionError
|
from requests import ConnectionError as RequestsConnectionError
|
||||||
from requests import ConnectTimeout, Timeout
|
from requests import ConnectTimeout, Timeout
|
||||||
|
|
||||||
SCR_DATABASE_PATH = r"C:\\Database\\chunks\\"
|
SCR_DATABASE_PATH = os.getenv("CONJURER_LIBRARIAN_DB_PATH", r"C:\\Database\\chunks\\")
|
||||||
SCR_FILENAME = "40_chunk.txt"
|
SCR_FILENAME = os.getenv("CONJURER_LIBRARIAN_SCRAPE_CHUNK", "40_chunk.txt")
|
||||||
SCR_ENCODING = "utf-8"
|
SCR_ENCODING = os.getenv("CONJURER_ENCODING", "utf-8")
|
||||||
|
|
||||||
WORK_Q = Queue()
|
WORK_Q = Queue()
|
||||||
random.seed()
|
random.seed()
|
||||||
|
|||||||
@@ -19,22 +19,20 @@ Global Variables:
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
# TODO: Wpiemdolić to wszystko w klasę z loggerem przysłanym z góry
|
# TODO: Wpiemdolić to wszystko w klasę z loggerem przysłanym z góry
|
||||||
|
import os
|
||||||
from queue import Empty, Queue
|
from queue import Empty, Queue
|
||||||
from threading import Thread
|
from threading import Thread
|
||||||
import time
|
import time
|
||||||
q = Queue()
|
q = Queue()
|
||||||
#TODO: Count number of lines in files and print to approximate on which part of the file search is
|
#TODO: Count number of lines in files and print to approximate on which part of the file search is
|
||||||
|
|
||||||
# DATA FOR TEST ONLY
|
# Deployment data is environment-overridable so the local DOI database can live
|
||||||
# MAXTHREADS = 5
|
# on a mounted volume (Docker/Linux) instead of the hardcoded Windows path.
|
||||||
# DATABASE_PATH = r'C:\\Database\\chunks_1\\'
|
MAXTHREADS = int(os.getenv("CONJURER_LIBRARIAN_MAXTHREADS", "41"))
|
||||||
|
DATABASE_PATH = os.getenv("CONJURER_LIBRARIAN_DB_PATH", r"C:\\Database\\chunks\\")
|
||||||
|
|
||||||
# DEPLOYMENT DATA
|
ENCODING = os.getenv("CONJURER_ENCODING", "utf-8")
|
||||||
MAXTHREADS = 41
|
CHUNK = os.getenv("CONJURER_LIBRARIAN_CHUNK", "_chunk.txt")
|
||||||
DATABASE_PATH = r"C:\\Database\\chunks\\"
|
|
||||||
|
|
||||||
ENCODING = "utf-8"
|
|
||||||
CHUNK = "_chunk.txt"
|
|
||||||
_sentinel = object()
|
_sentinel = object()
|
||||||
WORK_Q_SIZE = 35500000
|
WORK_Q_SIZE = 35500000
|
||||||
|
|
||||||
|
|||||||
+98
-11
@@ -107,18 +107,18 @@ if platform in ("linux", "linux2"):
|
|||||||
DIR_PATH_SADOX = "/mnt/c/Users/mtusz/OneDrive/Dokumenty/Fansadox"
|
DIR_PATH_SADOX = "/mnt/c/Users/mtusz/OneDrive/Dokumenty/Fansadox"
|
||||||
|
|
||||||
else:
|
else:
|
||||||
LOGFILE = "/home/pi/Conjurer/discord.log"
|
LOGFILE = "./discord.log"
|
||||||
MEMORY_FIVE_SIARA = "/home/pi/Conjurer/pamiec.json"
|
MEMORY_FIVE_SIARA = "./pamiec.json"
|
||||||
SYSTEM_GPT_SETTINGS = "/home/pi/Conjurer/system_gpt_settings.json"
|
SYSTEM_GPT_SETTINGS = "./system_gpt_settings.json"
|
||||||
MEMORY_FIVE_MUZYKA = "/home/pi/Conjurer/pamiec_muzyki.json"
|
MEMORY_FIVE_MUZYKA = "./pamiec_muzyki.json"
|
||||||
MUSIC_FOLDER = "/home/pi/MediaShare/mp3/"
|
MUSIC_FOLDER = "./"
|
||||||
SETTINGS_FILE = "/home/pi/Conjurer/settings.json"
|
SETTINGS_FILE = "./settings.json"
|
||||||
NETRC_FILE = "/home/pi/.netrc"
|
NETRC_FILE = "/srv/conjurer/secrets/.netrc"
|
||||||
LOGSTORE = "/home/pi/MediaShara/logs/"
|
LOGSTORE = "./logs/"
|
||||||
ACCIDENT_LOG = "/home/pi/Conjurer/accident_log.json"
|
ACCIDENT_LOG = "./accident_log.json"
|
||||||
ENCODING = "utf-8"
|
ENCODING = "utf-8"
|
||||||
GRAPHICS_PATH = "/home/pi/MediaShare/Conjurer_graphics/"
|
GRAPHICS_PATH = "./Conjurer_graphics/"
|
||||||
DIR_PATH_SADOX = "/home/pi/MediaShare/Fansadox/"
|
DIR_PATH_SADOX = "./Fansadox/"
|
||||||
|
|
||||||
|
|
||||||
elif platform == "win32":
|
elif platform == "win32":
|
||||||
@@ -158,6 +158,23 @@ else:
|
|||||||
# Values stay as plain strings so existing ``PATH + filename`` concatenation in
|
# Values stay as plain strings so existing ``PATH + filename`` concatenation in
|
||||||
# the command modules keeps working unchanged.
|
# the command modules keeps working unchanged.
|
||||||
|
|
||||||
|
# Container-friendly shortcut: point CONJURER_DATA_DIR at a single mounted
|
||||||
|
# volume and every writable data file/dir is rooted under it. The per-variable
|
||||||
|
# CONJURER_* overrides below still take precedence, so granular control remains
|
||||||
|
# possible and the native (Pi) deployment is unaffected when it is unset.
|
||||||
|
_DATA_DIR = os.getenv("CONJURER_DATA_DIR")
|
||||||
|
if _DATA_DIR:
|
||||||
|
LOGFILE = os.path.join(_DATA_DIR, "discord.log")
|
||||||
|
SETTINGS_FILE = os.path.join(_DATA_DIR, "settings.json")
|
||||||
|
MEMORY_FIVE_SIARA = os.path.join(_DATA_DIR, "pamiec.json")
|
||||||
|
MEMORY_FIVE_MUZYKA = os.path.join(_DATA_DIR, "pamiec_muzyki.json")
|
||||||
|
SYSTEM_GPT_SETTINGS = os.path.join(_DATA_DIR, "system_gpt_settings.json")
|
||||||
|
ACCIDENT_LOG = os.path.join(_DATA_DIR, "accident_log.json")
|
||||||
|
LOGSTORE = os.path.join(_DATA_DIR, "logs") + os.sep
|
||||||
|
GRAPHICS_PATH = os.path.join(_DATA_DIR, "Conjurer_graphics") + os.sep
|
||||||
|
MUSIC_FOLDER = os.path.join(_DATA_DIR, "music") + os.sep
|
||||||
|
DIR_PATH_SADOX = os.path.join(_DATA_DIR, "Fansadox") + os.sep
|
||||||
|
|
||||||
LOGFILE = os.getenv("CONJURER_LOG_FILE", LOGFILE)
|
LOGFILE = os.getenv("CONJURER_LOG_FILE", LOGFILE)
|
||||||
NETRC_FILE = os.getenv("CONJURER_NETRC_FILE", NETRC_FILE)
|
NETRC_FILE = os.getenv("CONJURER_NETRC_FILE", NETRC_FILE)
|
||||||
SETTINGS_FILE = os.getenv("CONJURER_SETTINGS_FILE", SETTINGS_FILE)
|
SETTINGS_FILE = os.getenv("CONJURER_SETTINGS_FILE", SETTINGS_FILE)
|
||||||
@@ -172,6 +189,13 @@ DIR_PATH_SADOX = os.getenv("CONJURER_SADOX_DIR", DIR_PATH_SADOX)
|
|||||||
ENCODING = os.getenv("CONJURER_ENCODING", ENCODING)
|
ENCODING = os.getenv("CONJURER_ENCODING", ENCODING)
|
||||||
SEPARATOR_FILE_PATH = os.getenv("CONJURER_PATH_SEPARATOR", SEPARATOR_FILE_PATH)
|
SEPARATOR_FILE_PATH = os.getenv("CONJURER_PATH_SEPARATOR", SEPARATOR_FILE_PATH)
|
||||||
|
|
||||||
|
# Voice-recognition transcript dumps. Defaults next to the log file (so on the
|
||||||
|
# Pi it lands in /home/pi/Conjurer/transcripts/, in docker under /data).
|
||||||
|
TRANSCRIPTS_PATH = os.getenv(
|
||||||
|
"CONJURER_TRANSCRIPTS_PATH",
|
||||||
|
os.path.join(os.path.dirname(LOGFILE) or ".", "transcripts") + os.sep,
|
||||||
|
)
|
||||||
|
|
||||||
FILE_SERVICE_ADDRESS = os.getenv("CONJURER_FILE_SERVICE", "http://192.168.1.15:5000")
|
FILE_SERVICE_ADDRESS = os.getenv("CONJURER_FILE_SERVICE", "http://192.168.1.15:5000")
|
||||||
RADIO_HARBOR_ADDRESS = os.getenv("CONJURER_RADIO_HARBOR", "http://192.168.1.15:54321")
|
RADIO_HARBOR_ADDRESS = os.getenv("CONJURER_RADIO_HARBOR", "http://192.168.1.15:54321")
|
||||||
SKIP_TRACK = os.getenv("CONJURER_SKIP_ENDPOINT", "/skip")
|
SKIP_TRACK = os.getenv("CONJURER_SKIP_ENDPOINT", "/skip")
|
||||||
@@ -185,6 +209,66 @@ PORT_ADDRESS = int(os.getenv("CONJURER_DISCORD_PORT", "5000"))
|
|||||||
API_SHARED_KEY = os.getenv("CONJURER_API_KEY", "")
|
API_SHARED_KEY = os.getenv("CONJURER_API_KEY", "")
|
||||||
|
|
||||||
|
|
||||||
|
# *=========================================== Self-healing runtime layout
|
||||||
|
# A fresh host/volume must never kill the bot at import time. Missing
|
||||||
|
# directories are created and missing state files are seeded - first from the
|
||||||
|
# templates shipped alongside this file (repo checkout / docker image), then
|
||||||
|
# from a safe empty structure. Existing files are never touched, so preserved
|
||||||
|
# history always wins.
|
||||||
|
|
||||||
|
_TEMPLATE_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
|
|
||||||
|
|
||||||
|
def _ensure_dir(path: str) -> None:
|
||||||
|
if not path:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
os.makedirs(path, exist_ok=True)
|
||||||
|
except OSError as exc:
|
||||||
|
logger.warning("Cannot create directory %s: %s", path, exc)
|
||||||
|
|
||||||
|
|
||||||
|
def _seed_file(path: str, template_name: str, empty_content: str) -> None:
|
||||||
|
"""Create *path* from the repo template (or *empty_content*) if missing."""
|
||||||
|
if not path or os.path.exists(path):
|
||||||
|
return
|
||||||
|
_ensure_dir(os.path.dirname(path) or ".")
|
||||||
|
template = os.path.join(_TEMPLATE_DIR, template_name)
|
||||||
|
try:
|
||||||
|
if os.path.exists(template) and os.path.abspath(template) != os.path.abspath(path):
|
||||||
|
import shutil
|
||||||
|
|
||||||
|
shutil.copyfile(template, path)
|
||||||
|
logger.warning("Seeded missing %s from repo template", path)
|
||||||
|
else:
|
||||||
|
with open(path, "w", encoding=ENCODING) as handle:
|
||||||
|
handle.write(empty_content)
|
||||||
|
logger.warning("Created missing %s as empty state", path)
|
||||||
|
except OSError as exc:
|
||||||
|
logger.warning("Cannot seed %s: %s", path, exc)
|
||||||
|
|
||||||
|
|
||||||
|
def _ensure_runtime_layout() -> None:
|
||||||
|
for directory in (
|
||||||
|
os.path.dirname(LOGFILE) or ".",
|
||||||
|
LOGSTORE,
|
||||||
|
GRAPHICS_PATH,
|
||||||
|
MUSIC_FOLDER,
|
||||||
|
TRANSCRIPTS_PATH,
|
||||||
|
):
|
||||||
|
_ensure_dir(directory)
|
||||||
|
|
||||||
|
# (target path, template shipped next to this file, empty fallback)
|
||||||
|
_seed_file(SETTINGS_FILE, "settings.json", "{}")
|
||||||
|
_seed_file(SYSTEM_GPT_SETTINGS, "system_gpt_settings.json", "{}")
|
||||||
|
_seed_file(MEMORY_FIVE_SIARA, "pamiec.json", "[]")
|
||||||
|
_seed_file(MEMORY_FIVE_MUZYKA, "pamiec_muzyki.json", "[]")
|
||||||
|
_seed_file(ACCIDENT_LOG, "accident_log.json", "[]")
|
||||||
|
|
||||||
|
|
||||||
|
_ensure_runtime_layout()
|
||||||
|
|
||||||
|
|
||||||
# *=========================================== Defensive state loading
|
# *=========================================== Defensive state loading
|
||||||
def _load_json(path: str, fallback):
|
def _load_json(path: str, fallback):
|
||||||
"""Load JSON from *path*, falling back gracefully on missing/corrupt files."""
|
"""Load JSON from *path*, falling back gracefully on missing/corrupt files."""
|
||||||
@@ -251,6 +335,9 @@ else:
|
|||||||
|
|
||||||
TOKEN = _resolve_token("discord", "DISCORD_TOKEN")
|
TOKEN = _resolve_token("discord", "DISCORD_TOKEN")
|
||||||
|
|
||||||
|
# Voice recognition (AssemblyAI). None = the voice cog reports and disables.
|
||||||
|
ASSEMBLYAI_API_KEY = _resolve_token("assemblyai", "ASSEMBLYAI_API_KEY")
|
||||||
|
|
||||||
if spotipy:
|
if spotipy:
|
||||||
_spotify_creds = _load_netrc_credentials("spotipy")
|
_spotify_creds = _load_netrc_credentials("spotipy")
|
||||||
if _spotify_creds and SpotifyClientCredentials:
|
if _spotify_creds and SpotifyClientCredentials:
|
||||||
|
|||||||
@@ -0,0 +1,64 @@
|
|||||||
|
# Conjurer main Discord bot.
|
||||||
|
# Build from the repository root:
|
||||||
|
# docker build -f docker/Dockerfile.bot -t conjurer-bot .
|
||||||
|
FROM python:3.13-trixie
|
||||||
|
|
||||||
|
# System dependencies:
|
||||||
|
# ffmpeg - audio download/convert (yt_dlp) and Discord voice
|
||||||
|
# libopus0 - Discord voice (PyNaCl / discord-ext-voice-recv)
|
||||||
|
# poppler-utils - pdf2image (librarian/latex previews)
|
||||||
|
# git - required by the git+https entry in requirements
|
||||||
|
# build-essential - native wheels (PyNaCl etc.)
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
ffmpeg \
|
||||||
|
libopus0 \
|
||||||
|
poppler-utils \
|
||||||
|
git \
|
||||||
|
build-essential \
|
||||||
|
curl \
|
||||||
|
ca-certificates \
|
||||||
|
python3-dev \
|
||||||
|
build-essential \
|
||||||
|
portaudio19-dev \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
# Optional: Tectonic for the $latex command. Remove this layer if unused.
|
||||||
|
RUN curl -fsSL https://drop-sh.fullyjustified.net | sh \
|
||||||
|
&& mv tectonic /usr/local/bin/tectonic \
|
||||||
|
|| echo "tectonic not installed - the LaTeX feature will be disabled"
|
||||||
|
|
||||||
|
COPY requirements_bot.txt requirements_conan.txt ./
|
||||||
|
RUN pip install --no-cache-dir --upgrade pip \
|
||||||
|
&& pip install --no-cache-dir -r requirements_bot.txt
|
||||||
|
# Best-effort Conan bridge extras: aiomcrcon supports Python <= 3.11 only, so
|
||||||
|
# on this 3.13 image the install fails harmlessly and the conanjurer cog stays
|
||||||
|
# dormant (its imports are guarded).
|
||||||
|
RUN pip install --no-cache-dir -r requirements_conan.txt \
|
||||||
|
|| echo "conan extras skipped - conanjurer cog will stay dormant"
|
||||||
|
|
||||||
|
# Vendored forks take import precedence over the pip packages of the same name,
|
||||||
|
# because /app (the script dir) is first on sys.path when running `python bot.py`.
|
||||||
|
COPY yt_dlp ./yt_dlp
|
||||||
|
COPY spotify_dl ./spotify_dl
|
||||||
|
|
||||||
|
# Bot sources + default config/asset templates. Runtime state (conversation
|
||||||
|
# history etc.) is read from the mounted /data volume via CONJURER_DATA_DIR,
|
||||||
|
# so these committed copies only act as first-run fallbacks.
|
||||||
|
COPY *.py ./
|
||||||
|
COPY settings.json system_gpt_settings.json accident_log.json pamiec.json pamiec_muzyki.json ./
|
||||||
|
COPY fuckery.jpg willowisp.png wod_beacon.jpg ./
|
||||||
|
COPY docker/entrypoint.bot.sh /usr/local/bin/entrypoint.sh
|
||||||
|
RUN chmod +x /usr/local/bin/entrypoint.sh
|
||||||
|
|
||||||
|
ENV PYTHONUNBUFFERED=1 \
|
||||||
|
CONJURER_DATA_DIR=/data \
|
||||||
|
CONJURER_DISCORD_HOST=0.0.0.0 \
|
||||||
|
CONJURER_DISCORD_PORT=5000
|
||||||
|
|
||||||
|
VOLUME ["/data"]
|
||||||
|
EXPOSE 5000
|
||||||
|
|
||||||
|
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||||
|
CMD ["python", "bot.py"]
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# Conjurer librarian (Crossref search + local DOI database lookup).
|
||||||
|
# Build from the repository root:
|
||||||
|
# docker build -f docker/Dockerfile.librarian -t conjurer-librarian .
|
||||||
|
FROM python:3.11-slim
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
build-essential \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY conjurer_librarian/requirements_librarian.txt ./
|
||||||
|
RUN pip install --no-cache-dir --upgrade pip \
|
||||||
|
&& pip install --no-cache-dir -r requirements_librarian.txt requests
|
||||||
|
|
||||||
|
COPY conjurer_librarian/ ./
|
||||||
|
|
||||||
|
ENV PYTHONUNBUFFERED=1 \
|
||||||
|
CONJURER_LIBRARIAN_HOST=0.0.0.0 \
|
||||||
|
CONJURER_LIBRARIAN_PORT=5001 \
|
||||||
|
CONJURER_LIBRARIAN_DB_PATH=/doi/
|
||||||
|
|
||||||
|
# The local DOI chunk database (large) is mounted here.
|
||||||
|
VOLUME ["/doi"]
|
||||||
|
EXPOSE 5001
|
||||||
|
|
||||||
|
CMD ["python", "conjurer_librarian.py"]
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
# Conjurer musician (Flask file/playlist service backing the radio).
|
||||||
|
# Build from the repository root:
|
||||||
|
# docker build -f docker/Dockerfile.musician -t conjurer-musician .
|
||||||
|
#
|
||||||
|
# NOTE: this containerises the musician *web service* only. The Liquidsoap
|
||||||
|
# radio (radio_conjurer.liq) and any Samba/NFS share tooling run separately.
|
||||||
|
FROM python:3.11-slim
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
build-essential \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY conjurer_musician/requirements_musician.txt ./
|
||||||
|
RUN pip install --no-cache-dir --upgrade pip \
|
||||||
|
&& pip install --no-cache-dir -r requirements_musician.txt
|
||||||
|
|
||||||
|
COPY conjurer_musician/ ./
|
||||||
|
COPY docker/entrypoint.musician.sh /usr/local/bin/entrypoint.sh
|
||||||
|
RUN chmod +x /usr/local/bin/entrypoint.sh
|
||||||
|
|
||||||
|
ENV PYTHONUNBUFFERED=1 \
|
||||||
|
CONJURER_MUSICIAN_HOST=0.0.0.0 \
|
||||||
|
CONJURER_MUSICIAN_PORT=5000 \
|
||||||
|
CONJURER_MUSIC_FOLDER=/music \
|
||||||
|
CONJURER_MUSICIAN_BASE=/data \
|
||||||
|
CONJURER_STREAM_TEMPLATE=/app/stream.html
|
||||||
|
|
||||||
|
# /music = the mp3 library (read-only ok); /data = writable playlists + logs.
|
||||||
|
VOLUME ["/music", "/data"]
|
||||||
|
EXPOSE 5000
|
||||||
|
|
||||||
|
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
|
||||||
|
CMD ["python", "conjurer_musician.py"]
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# Main bot VM. Run from the repository root:
|
||||||
|
# cp docker/env/bot.env.example docker/env/bot.env # then edit
|
||||||
|
# docker compose -f docker/compose.bot.yaml up -d --build
|
||||||
|
services:
|
||||||
|
conjurer-bot:
|
||||||
|
build:
|
||||||
|
context: ..
|
||||||
|
dockerfile: docker/Dockerfile.bot
|
||||||
|
image: conjurer-bot:latest
|
||||||
|
container_name: conjurer-bot
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- env/bot.env
|
||||||
|
ports:
|
||||||
|
# Flask comm layer — musician/librarian POST results here (/prepped_tracks, /conjurer).
|
||||||
|
- "5000:5000"
|
||||||
|
volumes:
|
||||||
|
# Persistent state (conversation history, settings, logs). Populate this
|
||||||
|
# host dir with your existing pamiec.json etc. to preserve command history.
|
||||||
|
- /srv/conjurer/data:/data
|
||||||
|
# Tokens: a read-only netrc covers discord/openai/spotipy/youtube in one file.
|
||||||
|
- /srv/conjurer/secrets/.netrc:/secrets/.netrc:ro
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
# Librarian VM. Run from the repository root:
|
||||||
|
# cp docker/env/librarian.env.example docker/env/librarian.env # then edit
|
||||||
|
# docker compose -f docker/compose.librarian.yaml up -d --build
|
||||||
|
services:
|
||||||
|
conjurer-librarian:
|
||||||
|
build:
|
||||||
|
context: ..
|
||||||
|
dockerfile: docker/Dockerfile.librarian
|
||||||
|
image: conjurer-librarian:latest
|
||||||
|
container_name: conjurer-librarian
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- env/librarian.env
|
||||||
|
ports:
|
||||||
|
- "5001:5001"
|
||||||
|
volumes:
|
||||||
|
# Local DOI chunk database (0_chunk.txt ... N_chunk.txt).
|
||||||
|
- /srv/librarian/doi:/doi:ro
|
||||||
|
# Optional: netrc holding Crossref credentials (or use CONJURER_CROSSREF_MAILTO).
|
||||||
|
- /srv/librarian/secrets/.netrc:/secrets/.netrc:ro
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
# Musician VM (optional — you plan to adapt/implement this yourself).
|
||||||
|
# Run from the repository root:
|
||||||
|
# cp docker/env/musician.env.example docker/env/musician.env # then edit
|
||||||
|
# docker compose -f docker/compose.musician.yaml up -d --build
|
||||||
|
services:
|
||||||
|
conjurer-musician:
|
||||||
|
build:
|
||||||
|
context: ..
|
||||||
|
dockerfile: docker/Dockerfile.musician
|
||||||
|
image: conjurer-musician:latest
|
||||||
|
container_name: conjurer-musician
|
||||||
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- env/musician.env
|
||||||
|
ports:
|
||||||
|
- "5000:5000"
|
||||||
|
volumes:
|
||||||
|
# The mp3 library the service indexes and serves.
|
||||||
|
- /srv/musician/music:/music
|
||||||
|
# Runtime playlists/logs the service writes.
|
||||||
|
- /srv/musician/data:/data
|
||||||
Executable
+16
@@ -0,0 +1,16 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# Seed the data volume with the baked-in default JSON state on first run only.
|
||||||
|
# Existing files (e.g. your preserved pamiec.json history) are never overwritten.
|
||||||
|
set -e
|
||||||
|
|
||||||
|
DATA="${CONJURER_DATA_DIR:-/data}"
|
||||||
|
mkdir -p "$DATA"
|
||||||
|
|
||||||
|
for f in settings.json system_gpt_settings.json pamiec.json pamiec_muzyki.json accident_log.json; do
|
||||||
|
if [ ! -e "$DATA/$f" ] && [ -e "/app/$f" ]; then
|
||||||
|
cp "/app/$f" "$DATA/$f"
|
||||||
|
echo "entrypoint: seeded $f into $DATA"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
exec "$@"
|
||||||
Executable
+23
@@ -0,0 +1,23 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
# Prepare the musician's writable volume so the web service starts cleanly on a
|
||||||
|
# fresh container. Existing files are never overwritten (preserves your data).
|
||||||
|
set -e
|
||||||
|
|
||||||
|
DATA="${CONJURER_MUSICIAN_BASE:-/data}"
|
||||||
|
MUSIC="${CONJURER_MUSIC_FOLDER:-/music}"
|
||||||
|
mkdir -p "$DATA" "$DATA/logs" "$MUSIC"
|
||||||
|
|
||||||
|
# The track-forwarding thread tails the Liquidsoap radio logs. When the radio
|
||||||
|
# runs separately (or hasn't started yet) these files may not exist; create
|
||||||
|
# them empty so the tailer waits instead of crashing.
|
||||||
|
for f in radio_log.log persistence.log; do
|
||||||
|
[ -e "$DATA/$f" ] || : > "$DATA/$f"
|
||||||
|
done
|
||||||
|
|
||||||
|
# Ensure the managed playlists exist (routes/rescan also create them; this just
|
||||||
|
# avoids a first-tick race before the initial scan).
|
||||||
|
for f in all_playlist.playlist hit.playlist request.playlist priority_queue.playlist; do
|
||||||
|
[ -e "$DATA/$f" ] || : > "$DATA/$f"
|
||||||
|
done
|
||||||
|
|
||||||
|
exec "$@"
|
||||||
Vendored
+39
@@ -0,0 +1,39 @@
|
|||||||
|
# Copy to docker/env/bot.env and fill in. Do NOT commit the real file.
|
||||||
|
|
||||||
|
# --- Secrets ------------------------------------------------------------
|
||||||
|
# Option A: mount a netrc (recommended — covers discord/openai/spotipy/youtube).
|
||||||
|
CONJURER_NETRC_FILE=/secrets/.netrc
|
||||||
|
# Option B: pass tokens directly (these take precedence over netrc).
|
||||||
|
# DISCORD_TOKEN=
|
||||||
|
# OPENAI_API_KEY=
|
||||||
|
# ASSEMBLYAI_API_KEY= # voice recognition; netrc machine 'assemblyai' works too
|
||||||
|
# YOUTUBE_USERNAME=
|
||||||
|
# YOUTUBE_PASSWORD=
|
||||||
|
|
||||||
|
# --- Data ---------------------------------------------------------------
|
||||||
|
# Single mounted volume; all writable state is rooted here.
|
||||||
|
CONJURER_DATA_DIR=/data
|
||||||
|
|
||||||
|
# --- Flask comm layer (inbound from musician/librarian) -----------------
|
||||||
|
CONJURER_DISCORD_HOST=0.0.0.0
|
||||||
|
CONJURER_DISCORD_PORT=5000
|
||||||
|
|
||||||
|
# --- Internal service auth ----------------------------------------------
|
||||||
|
# Set the SAME value on bot + musician + librarian. Empty = auth disabled.
|
||||||
|
CONJURER_API_KEY=
|
||||||
|
|
||||||
|
# --- Where the bot reaches the other services (other Proxmox VMs) --------
|
||||||
|
CONJURER_FILE_SERVICE=http://MUSICIAN_VM_IP:5000
|
||||||
|
CONJURER_RADIO_HARBOR=http://MUSICIAN_VM_IP:54321
|
||||||
|
CONJURER_LIBRARIAN_SERVICE=http://LIBRARIAN_VM_IP:5001
|
||||||
|
|
||||||
|
# --- Conan Exiles bridge (optional; empty/0 = disabled) -----------------
|
||||||
|
# CONAN_GM_ROLE_ID=0
|
||||||
|
# CONAN_RCON_HOST=
|
||||||
|
# CONAN_RCON_PORT=25575
|
||||||
|
# CONAN_RCON_PASSWORD=
|
||||||
|
# CONAN_CHAT_CHANNEL_ID=0
|
||||||
|
# CONAN_EVENTS_CHANNEL_ID=0
|
||||||
|
# CONAN_JOIN_CHANNEL_ID=0
|
||||||
|
# CONAN_LOG_MODE=local
|
||||||
|
# CONAN_LOG_PATH=
|
||||||
Vendored
+21
@@ -0,0 +1,21 @@
|
|||||||
|
# Copy to docker/env/librarian.env and fill in.
|
||||||
|
|
||||||
|
CONJURER_LIBRARIAN_HOST=0.0.0.0
|
||||||
|
CONJURER_LIBRARIAN_PORT=5001
|
||||||
|
|
||||||
|
# Same shared secret as the bot (empty = auth disabled).
|
||||||
|
CONJURER_API_KEY=
|
||||||
|
|
||||||
|
# Where to POST search results back to (the bot's comm layer).
|
||||||
|
CONJURER_MAIN_BOT=http://BOT_VM_IP:5000
|
||||||
|
|
||||||
|
# Crossref polite-pool contact (or put credentials in netrc under "crossref").
|
||||||
|
CONJURER_CROSSREF_MAILTO=you@example.com
|
||||||
|
|
||||||
|
# Local DOI chunk database (mounted volume): expects 0_chunk.txt .. N_chunk.txt
|
||||||
|
CONJURER_LIBRARIAN_DB_PATH=/doi/
|
||||||
|
CONJURER_LIBRARIAN_MAXTHREADS=41
|
||||||
|
CONJURER_LIBRARIAN_CHUNK=_chunk.txt
|
||||||
|
|
||||||
|
# Optional netrc (for Crossref credentials)
|
||||||
|
CONJURER_NETRC_FILE=/secrets/.netrc
|
||||||
Vendored
+17
@@ -0,0 +1,17 @@
|
|||||||
|
# Copy to docker/env/musician.env and fill in.
|
||||||
|
|
||||||
|
CONJURER_MUSICIAN_HOST=0.0.0.0
|
||||||
|
CONJURER_MUSICIAN_PORT=5000
|
||||||
|
|
||||||
|
# Same shared secret as the bot (empty = auth disabled).
|
||||||
|
CONJURER_API_KEY=
|
||||||
|
|
||||||
|
# Where to POST "now playing" / prepped-track updates (the bot's comm layer).
|
||||||
|
CONJURER_MAIN_BOT=http://BOT_VM_IP:5000
|
||||||
|
|
||||||
|
# The mp3 library (mounted volume).
|
||||||
|
CONJURER_MUSIC_FOLDER=/music
|
||||||
|
|
||||||
|
# Runtime paths (mounted volume) — playlists/logs the service writes.
|
||||||
|
CONJURER_MUSICIAN_BASE=/data
|
||||||
|
CONJURER_LOGSTORE=/data/logs
|
||||||
@@ -0,0 +1,292 @@
|
|||||||
|
# Conjurer on Docker / Proxmox
|
||||||
|
|
||||||
|
Runbook for running Conjurer as Docker containers across Proxmox VMs:
|
||||||
|
|
||||||
|
| Component | VM | Container | Port | Image |
|
||||||
|
|-----------|----|-----------|------|-------|
|
||||||
|
| **Main bot** | VM-bot | `conjurer-bot` | 5000 (Flask comm) | `docker/Dockerfile.bot` |
|
||||||
|
| **Librarian** | VM-librarian | `conjurer-librarian` | 5001 | `docker/Dockerfile.librarian` |
|
||||||
|
| **Musician** | VM-musician | `conjurer-musician` | 5000 (+ radio) | `docker/Dockerfile.musician` |
|
||||||
|
|
||||||
|
The three talk to each other over HTTP on the Proxmox LAN. Direction of calls:
|
||||||
|
|
||||||
|
```
|
||||||
|
bot --(/mp3,/get_music,/add_to_priority,...)--> musician
|
||||||
|
bot --(/query)--------------------------------> librarian
|
||||||
|
musician --(/prepped_tracks)--------------------> bot
|
||||||
|
librarian --(/conjurer results)-----------------> bot
|
||||||
|
```
|
||||||
|
|
||||||
|
Everything is configured through `CONJURER_*` environment variables (see the
|
||||||
|
`docker/env/*.env.example` files). Nothing is hardcoded to a host path anymore.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 0. Prerequisites (per VM)
|
||||||
|
|
||||||
|
Create a small Linux VM in Proxmox (Debian 12 / Ubuntu 22.04+ is fine), then
|
||||||
|
install Docker:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo apt-get update && sudo apt-get install -y ca-certificates curl git
|
||||||
|
curl -fsSL https://get.docker.com | sh
|
||||||
|
sudo usermod -aG docker "$USER" # log out/in afterwards
|
||||||
|
```
|
||||||
|
|
||||||
|
Clone the repo on each VM (they build from it):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo mkdir -p /opt && cd /opt
|
||||||
|
git clone https://github.com/migatu/conjurer.git
|
||||||
|
cd conjurer
|
||||||
|
```
|
||||||
|
|
||||||
|
> All `docker compose` commands below are run **from the repo root** (`/opt/conjurer`),
|
||||||
|
> because the compose files use `context: ..` relative to `docker/`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 1. Main bot (VM-bot)
|
||||||
|
|
||||||
|
### 1a. Prepare host directories
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo mkdir -p /srv/conjurer/data /srv/conjurer/secrets
|
||||||
|
```
|
||||||
|
|
||||||
|
### 1b. Preserve existing command history ⭐
|
||||||
|
|
||||||
|
The bot's conversation memory and settings live in JSON files. Copy them from
|
||||||
|
your current deployment (e.g. the Pi's `/home/pi/Conjurer/`) into the data
|
||||||
|
volume so the history carries over:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# run on the Pi, or scp the files across, then place them here:
|
||||||
|
sudo cp pamiec.json /srv/conjurer/data/ # AI conversation history
|
||||||
|
sudo cp pamiec_muzyki.json /srv/conjurer/data/ # music-DJ memory
|
||||||
|
sudo cp settings.json /srv/conjurer/data/ # word/cyclic reactions
|
||||||
|
sudo cp system_gpt_settings.json /srv/conjurer/data/
|
||||||
|
sudo cp accident_log.json /srv/conjurer/data/ # if present
|
||||||
|
```
|
||||||
|
|
||||||
|
If you skip this, the container starts with the (empty) template files baked
|
||||||
|
into the image and history begins fresh.
|
||||||
|
|
||||||
|
### 1c. Tokens
|
||||||
|
|
||||||
|
Drop your existing netrc (the one with `discord`, `openai`, `spotipy`,
|
||||||
|
`youtube` entries) into the secrets dir:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo cp ~/.netrc /srv/conjurer/secrets/.netrc
|
||||||
|
sudo chmod 600 /srv/conjurer/secrets/.netrc
|
||||||
|
```
|
||||||
|
|
||||||
|
(Alternatively skip netrc and set `DISCORD_TOKEN` / `OPENAI_API_KEY` in the env
|
||||||
|
file — those take precedence.)
|
||||||
|
|
||||||
|
### 1d. Configure and launch
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cp docker/env/bot.env.example docker/env/bot.env
|
||||||
|
# edit docker/env/bot.env: set CONJURER_FILE_SERVICE / _LIBRARIAN_SERVICE to the
|
||||||
|
# other VMs' IPs, and CONJURER_API_KEY (same value on all three) if you want auth.
|
||||||
|
|
||||||
|
docker compose -f docker/compose.bot.yaml up -d --build
|
||||||
|
docker logs -f conjurer-bot
|
||||||
|
```
|
||||||
|
|
||||||
|
Look for `Extension loaded: …` for each cog and `All systems: operational`.
|
||||||
|
|
||||||
|
### 1e. Startup model: core cogs vs service-gated cogs
|
||||||
|
|
||||||
|
The bot **always** starts with the cogs that depend on nothing but itself
|
||||||
|
(administration, AI, other, latex, voice, conanjurer). Cogs that need a
|
||||||
|
sibling service are **health-gated**:
|
||||||
|
|
||||||
|
| Group | Cogs | Enabled when |
|
||||||
|
|-------|------|--------------|
|
||||||
|
| musician | `music_commands`, `radio_commands`, `file_search_commands` | `GET {FILE_SERVICE}/mp3` answers |
|
||||||
|
| librarian | `librarian_commands` | librarian answers HTTP at all |
|
||||||
|
|
||||||
|
When a service is down its cogs stay disabled (commands simply don't exist)
|
||||||
|
and the log says so. A watchdog re-checks every 5 minutes and enables the
|
||||||
|
cogs the moment the service starts answering — no bot restart needed.
|
||||||
|
A single broken cog (missing pip package, bad import) is skipped with a full
|
||||||
|
traceback in the log; it never takes the whole bot down.
|
||||||
|
|
||||||
|
### 1f. Troubleshooting a crash-looping container
|
||||||
|
|
||||||
|
`docker logs conjurer-bot` now shows the real reason (the bot logs to stdout
|
||||||
|
as well as the rotating file). The most common cases:
|
||||||
|
|
||||||
|
- **`FATAL: Discord token missing`** — the secrets mount is missing/empty or
|
||||||
|
`CONJURER_NETRC_FILE` points elsewhere. Check:
|
||||||
|
`docker inspect -f '{{json .Mounts}}' conjurer-bot | jq` and
|
||||||
|
`docker exec conjurer-bot ls -la /secrets/` (after a manual
|
||||||
|
`docker run … sleep infinity` if it crash-loops too fast).
|
||||||
|
- **Missing state files** — not fatal anymore: missing dirs are created and
|
||||||
|
missing JSON state is seeded from the repo templates baked into the image
|
||||||
|
(existing files are never overwritten). Fix the mount at your leisure.
|
||||||
|
|
||||||
|
**About files "disappearing" from `/srv/conjurer/...`:** nothing in this stack
|
||||||
|
deletes host files — the entrypoint and the bot only ever *create* missing
|
||||||
|
files. With a bind mount, `/srv/conjurer/data` **is** the live state (not an
|
||||||
|
installation staging area): don't delete it after a successful install.
|
||||||
|
If files vanished, the usual suspects are `docker compose down -v` (only
|
||||||
|
affects *named* volumes, not binds), a re-provisioned VM, or copying the files
|
||||||
|
to a different path than the one in the compose `volumes:` line — verify with
|
||||||
|
`docker inspect -f '{{json .Mounts}}' conjurer-bot`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 2. Librarian (VM-librarian)
|
||||||
|
|
||||||
|
### 2a. Mount the DOI database
|
||||||
|
|
||||||
|
The librarian checks keyword hits from Crossref against a local database of
|
||||||
|
DOI chunk files (`0_chunk.txt … N_chunk.txt`). Put that database on the VM and
|
||||||
|
point the volume at it:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo mkdir -p /srv/librarian/doi /srv/librarian/secrets
|
||||||
|
# copy/replicate your chunk files into /srv/librarian/doi/
|
||||||
|
```
|
||||||
|
|
||||||
|
> The old Windows path `C:\Database\chunks\` is now `CONJURER_LIBRARIAN_DB_PATH`
|
||||||
|
> (defaults to `/doi/` in the container). `CONJURER_LIBRARIAN_MAXTHREADS` (41)
|
||||||
|
> and `CONJURER_LIBRARIAN_CHUNK` (`_chunk.txt`) are configurable too.
|
||||||
|
|
||||||
|
### 2b. Configure and launch
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cp docker/env/librarian.env.example docker/env/librarian.env
|
||||||
|
# edit: CONJURER_MAIN_BOT=http://BOT_VM_IP:5000, CONJURER_CROSSREF_MAILTO, CONJURER_API_KEY
|
||||||
|
|
||||||
|
docker compose -f docker/compose.librarian.yaml up -d --build
|
||||||
|
docker logs -f conjurer-librarian
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 3. Musician (VM-musician)
|
||||||
|
|
||||||
|
The web service is container-ready (`docker/Dockerfile.musician` +
|
||||||
|
`compose.musician.yaml`). It containerises the **Flask file/playlist service
|
||||||
|
only** — the Liquidsoap radio (`radio_conjurer.liq`), `script.params` and any
|
||||||
|
Samba/NFS share tooling are separate and typically stay on the host or a
|
||||||
|
dedicated setup (you'll adapt those yourself).
|
||||||
|
|
||||||
|
### 3a. Two volumes: the library and the writable state
|
||||||
|
|
||||||
|
| Mount | Container path | Holds |
|
||||||
|
|-------|---------------|-------|
|
||||||
|
| `/srv/musician/music` | `/music` (`CONJURER_MUSIC_FOLDER`) | your mp3 library (indexed/served) |
|
||||||
|
| `/srv/musician/data` | `/data` (`CONJURER_MUSICIAN_BASE`) | playlists, logs, `radio_log.log`/`persistence.log` |
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo mkdir -p /srv/musician/music /srv/musician/data
|
||||||
|
# point /srv/musician/music at (or copy in) your mp3s
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3b. Preserve existing playlists/state (optional)
|
||||||
|
|
||||||
|
If you already run the musician, copy its working playlists into the data
|
||||||
|
volume so nothing is regenerated from scratch:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
sudo cp all_playlist.playlist hit.playlist request.playlist \
|
||||||
|
priority_queue.playlist playlist.json /srv/musician/data/ 2>/dev/null || true
|
||||||
|
```
|
||||||
|
|
||||||
|
The container's entrypoint (`docker/entrypoint.musician.sh`) creates any
|
||||||
|
missing playlists and touches `radio_log.log` / `persistence.log` empty so the
|
||||||
|
track-forwarding thread waits instead of crashing when the radio runs
|
||||||
|
elsewhere. It never overwrites files you copied in.
|
||||||
|
|
||||||
|
### 3c. Configure and launch
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cp docker/env/musician.env.example docker/env/musician.env
|
||||||
|
# edit: CONJURER_MAIN_BOT=http://BOT_VM_IP:5000 and CONJURER_API_KEY (match the bot)
|
||||||
|
|
||||||
|
docker compose -f docker/compose.musician.yaml up -d --build
|
||||||
|
docker logs -f conjurer-musician
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3d. Radio coupling (if you keep Liquidsoap separate)
|
||||||
|
|
||||||
|
The musician only forwards "now playing" to the bot by tailing the radio's
|
||||||
|
`radio_log.log` / `persistence.log`. To wire them up, have Liquidsoap write
|
||||||
|
those two files into the same `/srv/musician/data` directory (or set
|
||||||
|
`CONJURER_RADIO_LOG` / `CONJURER_PERSISTENCE_LOG` to wherever it writes). The
|
||||||
|
`/stream` page template is served from the baked-in `/app/stream.html`
|
||||||
|
(override with `CONJURER_STREAM_TEMPLATE` if you customise it).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 4. Networking & auth
|
||||||
|
|
||||||
|
- Open the ports between VMs on the Proxmox LAN: **bot 5000**, **librarian 5001**,
|
||||||
|
**musician 5000** (+ radio harbor 54321 if used). A simple `ufw allow from
|
||||||
|
<lan-subnet>` per port is enough; do not expose them to the internet.
|
||||||
|
- **Auth:** set the same `CONJURER_API_KEY` in all three `*.env` files. Then
|
||||||
|
every internal call carries `X-Conjurer-Api-Key` and each service rejects
|
||||||
|
requests without it (HTTP 401). Leave it empty everywhere to disable auth
|
||||||
|
(fully backward compatible). ⚠️ Setting it on only one side breaks the link.
|
||||||
|
- The addresses point at each other by VM IP (or a DNS name). Set:
|
||||||
|
- bot: `CONJURER_FILE_SERVICE`, `CONJURER_RADIO_HARBOR`, `CONJURER_LIBRARIAN_SERVICE`
|
||||||
|
- librarian & musician: `CONJURER_MAIN_BOT`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5. Verify
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# bot is up and reachable from another VM:
|
||||||
|
curl http://BOT_VM_IP:5000/conjurer # -> "ALIVE"
|
||||||
|
# librarian answers:
|
||||||
|
curl http://LIBRARIAN_VM_IP:5001/ -I # service reachable
|
||||||
|
docker ps # all containers "Up"
|
||||||
|
docker logs conjurer-bot --tail 50
|
||||||
|
```
|
||||||
|
|
||||||
|
In Discord, exercise a command that round-trips through a service (e.g. a music
|
||||||
|
search that hits the musician, or a librarian query) to confirm the wiring and
|
||||||
|
the API key.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6. Updates
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /opt/conjurer && git pull
|
||||||
|
docker compose -f docker/compose.bot.yaml up -d --build # rebuild + restart
|
||||||
|
```
|
||||||
|
|
||||||
|
Data in `/srv/.../data` and `/doi` / `/music` volumes survives rebuilds, so
|
||||||
|
history and databases persist across updates.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 7. Rollback / coexistence
|
||||||
|
|
||||||
|
- The native (Raspberry Pi / systemd) deployment is unaffected — none of the
|
||||||
|
defaults changed; the container behaviour is opt-in via `CONJURER_DATA_DIR`
|
||||||
|
and the other env vars. You can run both during migration.
|
||||||
|
- To roll back a VM: `docker compose -f docker/compose.<svc>.yaml down` and
|
||||||
|
restart the previous deployment. The JSON state in `/srv/.../data` is plain
|
||||||
|
files you can copy back to the Pi if needed.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Notes on the images
|
||||||
|
|
||||||
|
- **Bot** uses the vendored `yt_dlp/` and `spotify_dl/` forks (they win over the
|
||||||
|
pip packages because `/app` is first on `sys.path`), so your patches stay
|
||||||
|
active without the old `sed` hacks from `install_main_bot.sh`.
|
||||||
|
- **Tectonic** (LaTeX `$latex` command) is installed best-effort; if the build
|
||||||
|
step fails the bot still runs, just without LaTeX. Remove that layer from
|
||||||
|
`Dockerfile.bot` if you don't need it.
|
||||||
|
- Voice needs `ffmpeg` + `libopus0` (both in the image). No microphone/pyaudio
|
||||||
|
is required — voice is received over Discord and transcribed via AssemblyAI.
|
||||||
@@ -17,6 +17,5 @@ PyMuPDF
|
|||||||
waitress
|
waitress
|
||||||
assemblyai[extras]
|
assemblyai[extras]
|
||||||
SpeechRecognition
|
SpeechRecognition
|
||||||
aiomcrcon
|
|
||||||
asyncssh
|
asyncssh
|
||||||
git+https://github.com/imayhaveborkedit/discord-ext-voice-recv
|
git+https://github.com/imayhaveborkedit/discord-ext-voice-recv
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# Optional extras for the Conan Exiles bridge (conanjurer cog).
|
||||||
|
#
|
||||||
|
# aiomcrcon currently installs only on Python <= 3.11, while the main image
|
||||||
|
# runs 3.13. Install is therefore best-effort: when it fails the conanjurer
|
||||||
|
# cog simply stays dormant (its imports are guarded) and the bot runs fine.
|
||||||
|
aiomcrcon
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
import logging
|
import logging
|
||||||
import netrc
|
|
||||||
import time
|
import time
|
||||||
import wave
|
import wave
|
||||||
|
|
||||||
@@ -9,11 +8,17 @@ import discord
|
|||||||
from discord.ext import commands, tasks, voice_recv
|
from discord.ext import commands, tasks, voice_recv
|
||||||
from discord.opus import Decoder as OpusDecoder
|
from discord.opus import Decoder as OpusDecoder
|
||||||
|
|
||||||
# Replace with your API key
|
from constants import ASSEMBLYAI_API_KEY, TRANSCRIPTS_PATH
|
||||||
NETRC_FILE = "/home/pi/.netrc"
|
|
||||||
netrc_mod = netrc.netrc(NETRC_FILE)
|
# Credentials come from constants (env ASSEMBLYAI_API_KEY, or the 'assemblyai'
|
||||||
authTokens = netrc_mod.authenticators("assemblyai")
|
# machine in the netrc at CONJURER_NETRC_FILE). Raising here means the guarded
|
||||||
aai.settings.api_key = authTokens[2]
|
# extension loader logs the reason and disables ONLY this cog.
|
||||||
|
if not ASSEMBLYAI_API_KEY:
|
||||||
|
raise RuntimeError(
|
||||||
|
"AssemblyAI API key not configured (netrc machine 'assemblyai' or "
|
||||||
|
"ASSEMBLYAI_API_KEY env) - voice recognition stays disabled"
|
||||||
|
)
|
||||||
|
aai.settings.api_key = ASSEMBLYAI_API_KEY
|
||||||
|
|
||||||
discord.opus._load_default()
|
discord.opus._load_default()
|
||||||
CHANNELS = OpusDecoder.CHANNELS
|
CHANNELS = OpusDecoder.CHANNELS
|
||||||
@@ -23,7 +28,7 @@ SAMPLING_RATE = OpusDecoder.SAMPLING_RATE
|
|||||||
# rotate file after there is 0.5s between last received pcm for user.
|
# rotate file after there is 0.5s between last received pcm for user.
|
||||||
# delete messsages after user disconnect
|
# delete messsages after user disconnect
|
||||||
|
|
||||||
LOCATION = "/home/pi/Conjurer/transcripts/"
|
LOCATION = TRANSCRIPTS_PATH
|
||||||
|
|
||||||
|
|
||||||
class CommunicationObject:
|
class CommunicationObject:
|
||||||
|
|||||||
Reference in New Issue
Block a user