diff --git a/backup_non_stable_docker b/backup_non_stable_docker deleted file mode 100644 index e69de29..0000000 diff --git a/README.md b/backup_old_docker/README.md similarity index 100% rename from README.md rename to backup_old_docker/README.md diff --git a/accident_log.json b/backup_old_docker/accident_log.json similarity index 100% rename from accident_log.json rename to backup_old_docker/accident_log.json diff --git a/administration_commands.py b/backup_old_docker/administration_commands.py similarity index 98% rename from administration_commands.py rename to backup_old_docker/administration_commands.py index c964d48..0af1c34 100644 --- a/administration_commands.py +++ b/backup_old_docker/administration_commands.py @@ -10,8 +10,8 @@ import discord import numpy as np from discord.ext import commands, tasks -from ai_functions import get_random_cyclic_message -from constants import ( +from conjurer.backup_old_docker.ai_functions import get_random_cyclic_message +from conjurer.backup_old_docker.constants import ( ENCODING, LAST_SPONTANEOUS_CALL, LOGFILE, diff --git a/ai_commands.py b/backup_old_docker/ai_commands.py similarity index 98% rename from ai_commands.py rename to backup_old_docker/ai_commands.py index baa3bc1..1516a04 100644 --- a/ai_commands.py +++ b/backup_old_docker/ai_commands.py @@ -10,11 +10,11 @@ import discord import openai import requests from discord.ext import commands -from other_functions import discord_friendly_send, discord_friendly_reply +from conjurer.backup_old_docker.other_functions import discord_friendly_send, discord_friendly_reply -import ai_functions -from constants import ( +import conjurer.backup_old_docker.ai_functions as ai_functions +from conjurer.backup_old_docker.constants import ( ASSISTANTS, DATA, GRAPHICS_PATH, diff --git a/ai_functions.py b/backup_old_docker/ai_functions.py similarity index 99% rename from ai_functions.py rename to backup_old_docker/ai_functions.py index ef48fb7..021f980 100644 --- a/ai_functions.py +++ b/backup_old_docker/ai_functions.py @@ -6,8 +6,8 @@ import random import openai import tiktoken import time -from other_functions import discord_friendly_send -from constants import ( +from conjurer.backup_old_docker.other_functions import discord_friendly_send +from conjurer.backup_old_docker.constants import ( ASSISTANTS, CYCLIC_WORDS, ENCODING, diff --git a/cogs/music.py b/backup_old_docker/cogs/music.py similarity index 100% rename from cogs/music.py rename to backup_old_docker/cogs/music.py diff --git a/communication_subroutine.py b/backup_old_docker/communication_subroutine.py similarity index 100% rename from communication_subroutine.py rename to backup_old_docker/communication_subroutine.py diff --git a/conjurer.service b/backup_old_docker/conjurer.service similarity index 100% rename from conjurer.service rename to backup_old_docker/conjurer.service diff --git a/constants.py b/backup_old_docker/constants.py similarity index 100% rename from constants.py rename to backup_old_docker/constants.py diff --git a/deploy.sh b/backup_old_docker/deploy.sh similarity index 100% rename from deploy.sh rename to backup_old_docker/deploy.sh diff --git a/deploy_music.sh b/backup_old_docker/deploy_music.sh similarity index 100% rename from deploy_music.sh rename to backup_old_docker/deploy_music.sh diff --git a/deploy_radio.sh b/backup_old_docker/deploy_radio.sh similarity index 100% rename from deploy_radio.sh rename to backup_old_docker/deploy_radio.sh diff --git a/dj_fonts_system_install.sh b/backup_old_docker/dj_fonts_system_install.sh similarity index 100% rename from dj_fonts_system_install.sh rename to backup_old_docker/dj_fonts_system_install.sh diff --git a/docker-compose.yml b/backup_old_docker/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to backup_old_docker/docker-compose.yml diff --git a/docker/Dockerfile.bot b/backup_old_docker/docker/Dockerfile.bot similarity index 100% rename from docker/Dockerfile.bot rename to backup_old_docker/docker/Dockerfile.bot diff --git a/docker/Dockerfile.librarian b/backup_old_docker/docker/Dockerfile.librarian similarity index 100% rename from docker/Dockerfile.librarian rename to backup_old_docker/docker/Dockerfile.librarian diff --git a/docker/Dockerfile.musician b/backup_old_docker/docker/Dockerfile.musician similarity index 100% rename from docker/Dockerfile.musician rename to backup_old_docker/docker/Dockerfile.musician diff --git a/ffmpeg.pref b/backup_old_docker/ffmpeg.pref similarity index 100% rename from ffmpeg.pref rename to backup_old_docker/ffmpeg.pref diff --git a/file_search_commands.py b/backup_old_docker/file_search_commands.py similarity index 97% rename from file_search_commands.py rename to backup_old_docker/file_search_commands.py index 1e20850..18c40f8 100644 --- a/file_search_commands.py +++ b/backup_old_docker/file_search_commands.py @@ -1,7 +1,7 @@ import os import discord from discord.ext import commands -import file_search_functions +import conjurer.backup_old_docker.file_search_functions as file_search_functions class FileSelectView(discord.ui.View): def __init__(self, files): diff --git a/file_search_functions.py b/backup_old_docker/file_search_functions.py similarity index 100% rename from file_search_functions.py rename to backup_old_docker/file_search_functions.py diff --git a/fontget.sh b/backup_old_docker/fontget.sh similarity index 100% rename from fontget.sh rename to backup_old_docker/fontget.sh diff --git a/gpt_interface/app.py b/backup_old_docker/gpt_interface/app.py similarity index 100% rename from gpt_interface/app.py rename to backup_old_docker/gpt_interface/app.py diff --git a/gpt_interface/file_serv.py b/backup_old_docker/gpt_interface/file_serv.py similarity index 100% rename from gpt_interface/file_serv.py rename to backup_old_docker/gpt_interface/file_serv.py diff --git a/gpt_interface/ingest.py b/backup_old_docker/gpt_interface/ingest.py similarity index 100% rename from gpt_interface/ingest.py rename to backup_old_docker/gpt_interface/ingest.py diff --git a/gpt_interface/reinit_server.sh b/backup_old_docker/gpt_interface/reinit_server.sh similarity index 100% rename from gpt_interface/reinit_server.sh rename to backup_old_docker/gpt_interface/reinit_server.sh diff --git a/install_main_bot.sh b/backup_old_docker/install_main_bot.sh similarity index 100% rename from install_main_bot.sh rename to backup_old_docker/install_main_bot.sh diff --git a/install_music_bot.sh b/backup_old_docker/install_music_bot.sh similarity index 100% rename from install_music_bot.sh rename to backup_old_docker/install_music_bot.sh diff --git a/latex_commands.py b/backup_old_docker/latex_commands.py similarity index 99% rename from latex_commands.py rename to backup_old_docker/latex_commands.py index 012277a..bb4528c 100644 --- a/latex_commands.py +++ b/backup_old_docker/latex_commands.py @@ -10,7 +10,7 @@ import discord from discord import app_commands from discord.ext import commands -from constants import ( +from conjurer.backup_old_docker.constants import ( ALLOWED_ROLES, GUILD_ID, LATEX_MAX_ATTACH_MB, @@ -19,7 +19,7 @@ from constants import ( LATEX_TEX_ENGINE, OPENAI_MODEL, ) -from latex_functions import ( +from conjurer.backup_old_docker.latex_functions import ( compile_single_tex_bytes, compile_zip_to_zip, is_safe_asset_name, diff --git a/latex_functions.py b/backup_old_docker/latex_functions.py similarity index 100% rename from latex_functions.py rename to backup_old_docker/latex_functions.py diff --git a/librarian_commands.py b/backup_old_docker/librarian_commands.py similarity index 98% rename from librarian_commands.py rename to backup_old_docker/librarian_commands.py index 95d3010..f908d25 100644 --- a/librarian_commands.py +++ b/backup_old_docker/librarian_commands.py @@ -13,9 +13,9 @@ import PyPDF2 import requests from discord.ext import commands, tasks -from ai_functions import handle_response -from communication_subroutine import IN_COMM_Q, OUT_COMM_Q, QueryControl -from constants import ( +from conjurer.backup_old_docker.ai_functions import handle_response +from conjurer.backup_old_docker.communication_subroutine import IN_COMM_Q, OUT_COMM_Q, QueryControl +from conjurer.backup_old_docker.constants import ( DIR_PATH_SADOX, LIBRARIAN_SERVICE_ADDRESS, SEND_QUERY, diff --git a/librarian_functions.py b/backup_old_docker/librarian_functions.py similarity index 100% rename from librarian_functions.py rename to backup_old_docker/librarian_functions.py diff --git a/music_commands.py b/backup_old_docker/music_commands.py similarity index 100% rename from music_commands.py rename to backup_old_docker/music_commands.py diff --git a/music_functions.py b/backup_old_docker/music_functions.py similarity index 99% rename from music_functions.py rename to backup_old_docker/music_functions.py index 9523ae6..1382f18 100644 --- a/music_functions.py +++ b/backup_old_docker/music_functions.py @@ -9,7 +9,7 @@ import discord import requests import yt_dlp -from constants import ( +from conjurer.backup_old_docker.constants import ( FILE_SERVICE_ADDRESS, GET_MP3, GET_PLAYLIST, diff --git a/other_commands.py b/backup_old_docker/other_commands.py similarity index 99% rename from other_commands.py rename to backup_old_docker/other_commands.py index a7c45b4..0dd6bc2 100644 --- a/other_commands.py +++ b/backup_old_docker/other_commands.py @@ -7,7 +7,7 @@ from typing import Optional import discord from discord.ext import commands -from constants import ACCIDENT_LOG, DATA, ENCODING +from conjurer.backup_old_docker.constants import ACCIDENT_LOG, DATA, ENCODING historia_fabryczki = DATA["fabryczka"] diff --git a/other_functions.py b/backup_old_docker/other_functions.py similarity index 100% rename from other_functions.py rename to backup_old_docker/other_functions.py diff --git a/pamiec.json b/backup_old_docker/pamiec.json similarity index 100% rename from pamiec.json rename to backup_old_docker/pamiec.json diff --git a/pamiec_muzyki.json b/backup_old_docker/pamiec_muzyki.json similarity index 100% rename from pamiec_muzyki.json rename to backup_old_docker/pamiec_muzyki.json diff --git a/radio_commands.py b/backup_old_docker/radio_commands.py similarity index 99% rename from radio_commands.py rename to backup_old_docker/radio_commands.py index d32143e..253f054 100644 --- a/radio_commands.py +++ b/backup_old_docker/radio_commands.py @@ -8,7 +8,7 @@ import uuid import asyncio from datetime import datetime -from constants import ( +from conjurer.backup_old_docker.constants import ( RADIO_HARBOR_ADDRESS, SKIP_TRACK, FILE_SERVICE_ADDRESS, diff --git a/requirements_bot copy.txt b/backup_old_docker/requirements_bot copy.txt similarity index 100% rename from requirements_bot copy.txt rename to backup_old_docker/requirements_bot copy.txt diff --git a/requirements_bot.txt b/backup_old_docker/requirements_bot.txt similarity index 100% rename from requirements_bot.txt rename to backup_old_docker/requirements_bot.txt diff --git a/settings.json b/backup_old_docker/settings.json similarity index 100% rename from settings.json rename to backup_old_docker/settings.json diff --git a/status_report.service b/backup_old_docker/status_report.service similarity index 100% rename from status_report.service rename to backup_old_docker/status_report.service diff --git a/status_report.sh b/backup_old_docker/status_report.sh similarity index 100% rename from status_report.sh rename to backup_old_docker/status_report.sh diff --git a/status_report.timer b/backup_old_docker/status_report.timer similarity index 100% rename from status_report.timer rename to backup_old_docker/status_report.timer diff --git a/stream_test.py b/backup_old_docker/stream_test.py similarity index 100% rename from stream_test.py rename to backup_old_docker/stream_test.py diff --git a/sync.py b/backup_old_docker/sync.py similarity index 100% rename from sync.py rename to backup_old_docker/sync.py diff --git a/system_gpt_settings.json b/backup_old_docker/system_gpt_settings.json similarity index 100% rename from system_gpt_settings.json rename to backup_old_docker/system_gpt_settings.json diff --git a/thin_client.py b/backup_old_docker/thin_client.py similarity index 95% rename from thin_client.py rename to backup_old_docker/thin_client.py index a96af33..8f2eb76 100755 --- a/thin_client.py +++ b/backup_old_docker/thin_client.py @@ -18,8 +18,8 @@ from logging import handlers import discord from discord.ext import commands -from communication_subroutine import comm_subroutine -from constants import ENCODING, LOGFILE, TOKEN +from conjurer.backup_old_docker.communication_subroutine import comm_subroutine +from conjurer.backup_old_docker.constants import ENCODING, LOGFILE, TOKEN logger = logging.getLogger("discord") logger.setLevel(logging.INFO) handler = handlers.RotatingFileHandler( diff --git a/voice_recognition_commands.py b/backup_old_docker/voice_recognition_commands.py similarity index 100% rename from voice_recognition_commands.py rename to backup_old_docker/voice_recognition_commands.py diff --git a/watch_script_params.py b/backup_old_docker/watch_script_params.py similarity index 100% rename from watch_script_params.py rename to backup_old_docker/watch_script_params.py diff --git a/docker/env/bot.env.example b/docker/env/bot.env.example deleted file mode 100644 index 070ac87..0000000 --- a/docker/env/bot.env.example +++ /dev/null @@ -1,24 +0,0 @@ -# Discord bot service configuration - -DISCORD_TOKEN=HACKME! -OPENAI_API_KEY=HACKME! -CONJURER_API_KEY=HACKME! - -# Internal service endpoints -CONJURER_FILE_SERVICE=http://conjurer-musician:5000 -CONJURER_LIBRARIAN_SERVICE=http://conjurer-librarian:5001 - -# Runtime paths mounted via docker-compose volumes -CONJURER_BASE_DIR=/data/config -CONJURER_SETTINGS_FILE=/data/config/settings.json -CONJURER_MEMORY_FILE=/data/config/pamiec.json -CONJURER_MUSIC_MEMORY_FILE=/data/config/pamiec_muzyki.json -CONJURER_SYSTEM_GPT_SETTINGS=/data/config/system_gpt_settings.json -CONJURER_GRAPHICS_PATH=/data/assets/graphics -CONJURER_LOG_FILE=/data/logs/discord.log -CONJURER_LOGSTORE=/data/logs - -# Optional external integrations -CONJURER_NETRC_FILE=/data/secrets/.netrc -YOUTUBE_USERNAME=HACKME! -YOUTUBE_PASSWORD=HACKME! diff --git a/docker/env/librarian.env.example b/docker/env/librarian.env.example deleted file mode 100644 index d7ce48d..0000000 --- a/docker/env/librarian.env.example +++ /dev/null @@ -1,14 +0,0 @@ -# Librarian service configuration - -CONJURER_API_KEY=HACKME! - -CONJURER_MAIN_BOT=http://conjurer-bot:5000 - -CONJURER_LIBRARIAN_HOST=0.0.0.0 -CONJURER_LIBRARIAN_PORT=5001 -CONJURER_LIBRARIAN_MAX_RESULTS=500 - -CONJURER_CROSSREF_MAILTO=HACKME! -CONJURER_LIBRARIAN_LOG=/data/logs/librarian.log - -CONJURER_NETRC_FILE=/data/secrets/.netrc diff --git a/docker/env/musician.env.example b/docker/env/musician.env.example deleted file mode 100644 index 4c4a028..0000000 --- a/docker/env/musician.env.example +++ /dev/null @@ -1,20 +0,0 @@ -# Musician service configuration - -CONJURER_API_KEY=HACKME! - -CONJURER_MAIN_BOT=http://conjurer-bot:5000 -CONJURER_MUSIC_TRACKER_ENDPOINT=/prepped_tracks - -CONJURER_MUSICIAN_HOST=0.0.0.0 -CONJURER_MUSICIAN_PORT=5000 - -CONJURER_MUSIC_FOLDER=/data/music -CONJURER_PRIORITY_FOLDER=/data/priority -CONJURER_ALL_PLAYLIST=/data/playlists/all_playlist.playlist -CONJURER_HIT_PLAYLIST=/data/playlists/hit.playlist -CONJURER_REQUEST_PLAYLIST=/data/playlists/request.playlist -CONJURER_PRIORITY_PLAYLIST=/data/playlists/priority_queue.playlist -CONJURER_STREAM_TEMPLATE=/data/templates/stream.html - -CONJURER_RADIO_LOG=/data/logs/radio.log -CONJURER_PERSISTENCE_LOG=/data/logs/persistence.log