HEAD (unreleased) since tag 2.0

Intermediate commits (oldest → newest):
- Partial + reformatting
- upgrade to latest OpenAI API usage and logging improvements
- refix
- Vibe coding :P
- Merge branch 'main' of https://github.com/migatu/conjurer
- fx
- fx
- ffx
- testing
- ttt
- fix
- aaa
- FX
- aaa
- sa

.dockerignore

@@ -1,17 +1,32 @@
-# Keep build contexts lean. Component dirs (conjurer_librarian, conjurer_musician)
+# Python
-# are intentionally NOT ignored — their images copy them from this same context.
+__pycache__
-.git
+*.py[cod]
-.github
-.trunk
-.vscode
-**/__pycache__/
-*.pyc
 *.pyo
-*.log
+*.pyd
-*.mp3
+*.so
-docs/
+
-tests/
+# VCS/CI
-conftest.py
+.git
-pytest.ini
+.gitignore
-docker/env/*.env
+.gitattributes
-secrets/
+.github
+
+# Editor
+.vscode
+.idea
+
+# Python tooling
+.pytest_cache
+.mypy_cache
+.ruff_cache
+.tox
+dist
+build
+*.egg-info
+
+# Local assets
+logs
+music
+data
+*.env
+*.env.*

.github/workflows/ci.yml

@@ -1,54 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: ["main"]
-  pull_request:
-    branches: ["main"]
-
-permissions:
-  contents: read
-
-jobs:
-  compile:
-    # Byte-compile every first-party .py to catch syntax errors. No deps.
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-      - name: py_compile first-party sources
-        run: |
-          git ls-files '*.py' | grep -vE '^(yt_dlp|spotify_dl)/' | xargs python -m py_compile
-          echo "All first-party sources compile."
-
-  unit:
-    # Pure-logic tests; tested modules guard heavy deps, so only pytest needed.
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-      - name: Install test deps
-        run: |
-          python -m pip install --upgrade pip
-          pip install pytest
-      - name: Run unit tests
-        run: pytest tests/unit -v
-
-  integration:
-    # Boot the Flask services and assert the X-Conjurer-Api-Key auth contract.
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-      - name: Install service deps
-        run: |
-          python -m pip install --upgrade pip
-          pip install pytest flask waitress requests
-      - name: Run integration tests
-        run: pytest tests/integration -v

.github/workflows/python-app.yml

@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Python application
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.10"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

.github/workflows/python-package.yml

@@ -0,0 +1,40 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python
+
+name: Python package
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.8", "3.9", "3.10"]
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        python -m pip install flake8 pytest
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest

README.md

@@ -1,2 +1,23 @@
 # conjurer
 Discord.py bot for fun, sex and BDSM
+
+## Docker quick start
+
+Docker definitions live at the repository root and let you run the Discord bot
+(`thin_client.py`), the musician file service, and the librarian search worker as
+separate containers.
+
+1. **Prepare configuration**
+   - Edit the environment files under `docker/env/*.env` and replace the
+     placeholders (`replace-me`, `shared-secret`, etc.) with your real tokens.
+     Keep `CONJURER_API_KEY` identical across all services.
+2. **Create host directories** listed in `docker-compose.yml` (for example
+   `docker/volumes/bot/config`, `docker/volumes/musician/data`, …) and populate
+   them with the required JSON settings or media assets.
+3. **Launch the stack**
+   ```bash
+   docker compose up --build
+   ```
+
+Logs for each container are mounted under `docker/volumes/*` so you can diff the
+runtime JSON and log files in git if needed.

cogs/music.py

@@ -0,0 +1,46 @@
+import discord
+from discord.ext import commands
+from typing import  Optional
+
+class Music(commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot # This is so you can access Bot instance in your cog
+
+# You must have this function for `bot.load_extension` to call
+def setup(bot):
+    bot.add_cog(Music(bot))
+
+@commands.hybrid_command(
+    name="przytul", description="Przytul kogoś - daj mention po komendzie :)"
+)
+async def przytul(ctx, arg: Optional[discord.Member] = None):
+    """
+    Generate a text about hugging mentioned user.
+
+    :param ctx: ctx stands for "context" and is a required parameter in Discord.py commands. It
+    represents the context in which the command was invoked, including information such as the message,
+    the channel, the server, and the user who invoked the command
+    :param arg: arg is a parameter of the function "przytul" that expects a Discord member object. The
+    parameter is optional, meaning that if no member object is provided, it will default to None
+    :type arg: Optional[discord.Member]
+    """
+    async with ctx.typing():
+        nieprzytulac = False
+        for mention in ctx.message.mentions:
+            for role in mention.roles:
+                if role.name == "NIEPRZYTULAĆ!":
+                    nieprzytulac = True
+
+        if arg and nieprzytulac:
+            await ctx.send(
+                f"Żebym ja Ciebie nie przytulił {ctx.message.author.mention}"
+            )
+        elif arg:
+            await ctx.send(
+                # trunk-ignore(codespell/misspelled)
+                f"Już dobrze.... Już dobrze... Ojej.. Biedactwo... :( *W ułamku sekundy {arg.mention} znajduje sie w duszącym uścisku. Żebra trzeszczą - kilka pęka. Pacnięcia po plecach grożą odbiciem nerek, a głaskanie po głowie powoduje wstrząs mózgu*"
+            )
+        else:
+            await ctx.send(
+                "Kogo mam przytulić? *Wyłamuje kostki i przeciąga się - jego 200 kilowa sylwetka złożona z samych mięśni świadczy o tym że jest gotowy*"
+            )

communication_subroutine.py

@@ -11,10 +11,9 @@ from urllib import request as urequest
 from flask import Flask, abort, jsonify, request
 from waitress import serve
 
-HOST_ADDRESS = os.getenv("CONJURER_DISCORD_HOST", "192.168.1.31")
+HOST_ADDRESS = "192.168.1.191"
-PORT_ADDRESS = int(os.getenv("CONJURER_DISCORD_PORT", "5000"))
+PORT_ADDRESS = 5000
-ICECAST_ADDRESS = os.getenv("CONJURER_ICECAST", "http://192.168.1.15:8000")
+ICECAST_ADDRESS = "http://192.168.1.15:8000"
-API_KEY = os.getenv("CONJURER_API_KEY")
 OUT_COMM_Q = Queue()
 IN_COMM_Q = Queue()
 SRCHTITLE = re.compile(rb"StreamTitle=\\*(?P<title>[^;]*);").search
@@ -22,12 +21,6 @@ SRCHTITLE = re.compile(rb"StreamTitle=\\*(?P<title>[^;]*);").search
 awaiting_q = []
 incoming_q = Queue()
 app = Flask(__name__)
-
-
-def _authorize_request() -> None:
-    """Reject inbound calls lacking the shared key (no-op if key is unset)."""
-    if API_KEY and request.headers.get("X-Conjurer-Api-Key") != API_KEY:
-        abort(401)
 PREPPED_TRACKS = {
     "requests": "",
     "hit": "",
@@ -40,6 +33,13 @@ PREPPED_TRACKS = {
 }
 logger = logging.getLogger("discord")
 
+API_KEY = os.getenv("CONJURER_API_KEY")
+
+
+def _authorize_request() -> None:
+    if API_KEY and request.headers.get("X-Conjurer-Api-Key") != API_KEY:
+        abort(401)
+
 
 class QueryControl:
     """
@@ -89,13 +89,13 @@ def log_radio_tracks():
 
 @app.route("/conjurer", methods=["POST"])
 def answer_external_command():
+    _authorize_request()
     """
     The function `answer_external_command` logs the request data, loads the data as JSON, logs the
     record, and then puts the record into an incoming queue before returning a success message.
     :return: The function `answer_external_command()` is returning a JSON response with the message
     "SUCCESS".
     """
-    _authorize_request()
     logger = logging.getLogger("discord")
     logger.info(request)
     record = json.loads(request.data)
@@ -144,11 +144,10 @@ def scan_queue(stop_event: Optional[threading.Event] = None):
     """
     The function `scan_queue` reads data from a queue, logs it, and appends it to another queue.
 
-    A bounded ``get(timeout=1)`` is used instead of a blocking ``get()`` so the
+    :param _logger: The `_logger` parameter is typically an instance of a logging object that is used to
-    worker can observe ``stop_event`` and exit cleanly during shutdown.
+    record and store log messages. It is commonly used to track the flow of the program, record errors,
-
+    and provide information for debugging purposes. In this code snippet, the `_logger` object is used
-    :param stop_event: optional :class:`threading.Event`; when set the loop
+    to log the
-    stops at the next iteration.
     """
     logger = logging.getLogger("discord")
     while True:
@@ -168,8 +167,10 @@ def scan_incoming(stop_event: Optional[threading.Event] = None):
     The `scan_incoming` function continuously checks for incoming data, processes it, and logs when data
     is found.
 
-    :param stop_event: optional :class:`threading.Event`; when set the loop
+    :param _logger: The `_logger` parameter in the `scan_incoming` function is a logger object that is
-    stops at the next iteration.
+    used to log messages or information during the execution of the function. It is typically used for
+    debugging, monitoring, or tracking the flow of the program. In this case, the `_logger` is being
+    used
     """
     logger = logging.getLogger("discord")
     while True:
@@ -227,28 +228,23 @@ def comm_subroutine(stop_event: Optional[threading.Event] = None):
     """
     The `comm_subroutine` function starts multiple threads to run different tasks concurrently.
 
-    Workers run as daemon threads and honour an optional ``stop_event`` so the
+    :param logger: The `logger` parameter in the `comm_subroutine` function is an instance of a logger
-    bot can shut the communication layer down cleanly instead of blocking
+    object that is used for logging messages at various levels (e.g., debug, info, warning, error). In
-    forever on ``join()``.
+    the provided code snippet, the logger is used to log messages at the "info" level
-
-    :param stop_event: optional :class:`threading.Event` shared with the caller
-    to coordinate a cooperative shutdown.
     """
     # logger.setLevel(logging.DEBUG)
     logger = logging.getLogger("discord")
     logger.info("Started comms")
     threads = []
     # threads.append(threading.Thread(target=flask_debug))
-    threads.append(threading.Thread(target=waitress_run, daemon=True))
     threads.append(
-        threading.Thread(
+        threading.Thread(target=waitress_run, daemon=True)
-            target=scan_queue, kwargs={"stop_event": stop_event}, daemon=True
-        )
     )
     threads.append(
-        threading.Thread(
+        threading.Thread(target=scan_queue, kwargs={"stop_event": stop_event}, daemon=True)
-            target=scan_incoming, kwargs={"stop_event": stop_event}, daemon=True
+    )
-        )
+    threads.append(
+        threading.Thread(target=scan_incoming, kwargs={"stop_event": stop_event}, daemon=True)
     )
 
     for worker in threads:

conanjurer_commands.py

@@ -1,217 +0,0 @@
-# This Python file uses the following encoding: utf-8
-"""Conan Exiles <-> Discord bridge (cog).
-
-Follows the project convention (cog here, helpers in
-``conanjurer_functions.py``).  The integration is dormant unless configured in
-:mod:`constants`: with no RCON host / channels the background watchers simply
-do not start and the GM commands report that RCON is unavailable, so loading
-this extension is always safe even on hosts without a Conan server.
-"""
-import asyncio
-import logging
-
-import discord
-from discord.ext import commands
-
-from conanjurer_functions import ConanConfig, Event, RconClient, watch, watch_players
-from constants import (
-    CONAN_CHAT_CHANNEL_ID,
-    CONAN_EVENTS_CHANNEL_ID,
-    CONAN_GM_ROLE_ID,
-    CONAN_JOIN_CHANNEL_ID,
-    CONAN_LOG_MODE,
-    CONAN_LOG_PATH,
-    CONAN_PLAYER_POLL_SECONDS,
-    CONAN_RCON_HOST,
-    CONAN_RCON_PASSWORD,
-    CONAN_RCON_PORT,
-    CONAN_SFTP_HOST,
-    CONAN_SFTP_PASSWORD,
-    CONAN_SFTP_PORT,
-    CONAN_SFTP_USER,
-)
-
-
-def is_gm():
-    """Allow only members holding the configured Conan GM role."""
-
-    async def predicate(ctx: commands.Context) -> bool:
-        if not CONAN_GM_ROLE_ID:
-            await ctx.reply(
-                "⛔ Rola GM Conana nie jest skonfigurowana.", mention_author=False
-            )
-            return False
-        ok = any(r.id == CONAN_GM_ROLE_ID for r in getattr(ctx.author, "roles", []))
-        if not ok:
-            await ctx.reply("⛔ Tylko GM.", mention_author=False)
-        return ok
-
-    return commands.check(predicate)
-
-
-class ConanModule(commands.Cog):
-    """Bridges a Conan Exiles server with Discord over RCON + log following."""
-
-    def __init__(self, bot, logger_name):
-        self.bot = bot
-        self.logger = logging.getLogger(logger_name)
-        self.cfg = ConanConfig(
-            rcon_host=CONAN_RCON_HOST,
-            rcon_port=CONAN_RCON_PORT,
-            rcon_password=CONAN_RCON_PASSWORD,
-            log_mode=CONAN_LOG_MODE,
-            log_path=CONAN_LOG_PATH,
-            sftp_host=CONAN_SFTP_HOST,
-            sftp_port=CONAN_SFTP_PORT,
-            sftp_user=CONAN_SFTP_USER,
-            sftp_password=CONAN_SFTP_PASSWORD,
-        )
-        self.rcon = (
-            RconClient(CONAN_RCON_HOST, CONAN_RCON_PORT, CONAN_RCON_PASSWORD)
-            if self.cfg.rcon_enabled
-            else None
-        )
-        self._log_task = None
-        self._player_task = None
-
-    async def cog_load(self):
-        # Conan -> Discord chat/event mirroring (only with a log source + target)
-        if self.cfg.log_enabled and (CONAN_CHAT_CHANNEL_ID or CONAN_EVENTS_CHANNEL_ID):
-            self._log_task = asyncio.create_task(self._run_log_watch())
-        else:
-            self.logger.info("Conan: log watch disabled (not configured)")
-
-        # Player-join notifications — disabled when the channel is not defined
-        if CONAN_JOIN_CHANNEL_ID and self.rcon is not None:
-            self._player_task = asyncio.create_task(self._run_player_watch())
-        else:
-            self.logger.info(
-                "Conan: player-join notifications disabled (no channel or RCON)"
-            )
-
-    async def cog_unload(self):
-        for task in (self._log_task, self._player_task):
-            if task is not None:
-                task.cancel()
-        if self.rcon is not None:
-            await self.rcon.close()
-
-    # ---------------------------------------------------------------- watchers
-    async def _run_log_watch(self):
-        await self.bot.wait_until_ready()
-        chat_ch = (
-            self.bot.get_channel(CONAN_CHAT_CHANNEL_ID) if CONAN_CHAT_CHANNEL_ID else None
-        )
-        evt_ch = (
-            self.bot.get_channel(CONAN_EVENTS_CHANNEL_ID)
-            if CONAN_EVENTS_CHANNEL_ID
-            else None
-        )
-
-        async def on_event(event: Event):
-            target = chat_ch if event.kind == "chat" else evt_ch
-            if target is not None:
-                await target.send(
-                    event.text, allowed_mentions=discord.AllowedMentions.none()
-                )
-
-        self.logger.info("Conan: starting log watch (mode=%s)", self.cfg.log_mode)
-        await watch(self.cfg, on_event)
-
-    async def _run_player_watch(self):
-        """Task 2: announce on a defined channel when a player joins the server."""
-        await self.bot.wait_until_ready()
-        channel = self.bot.get_channel(CONAN_JOIN_CHANNEL_ID)
-        if channel is None:
-            self.logger.warning(
-                "Conan: join channel %s not found — player notifications off",
-                CONAN_JOIN_CHANNEL_ID,
-            )
-            return
-
-        async def on_join(name: str):
-            await channel.send(
-                f"🟢 **{name}** wszedł na serwer Conan",
-                allowed_mentions=discord.AllowedMentions.none(),
-            )
-
-        self.logger.info(
-            "Conan: starting player-join watch (channel=%s, every %ss)",
-            CONAN_JOIN_CHANNEL_ID,
-            CONAN_PLAYER_POLL_SECONDS,
-        )
-        await watch_players(self.rcon, CONAN_PLAYER_POLL_SECONDS, on_join)
-
-    # ----------------------------------------------------- Discord -> Conan
-    async def _require_rcon(self, ctx: commands.Context):
-        if self.rcon is None:
-            await ctx.reply(
-                "⛔ RCON Conana nie jest skonfigurowany/dostępny.",
-                mention_author=False,
-            )
-            return None
-        return self.rcon
-
-    @commands.command(name="say")
-    @is_gm()
-    async def say(self, ctx: commands.Context, *, message: str):
-        """Discord -> Conan: ogłoszenie widoczne dla wszystkich graczy w grze."""
-        rcon = await self._require_rcon(ctx)
-        if rcon is None:
-            return
-        resp = await rcon.command(f"broadcast {message}")
-        await ctx.reply(
-            f"✅ Wysłano do gry. (serwer: `{resp.strip() or 'OK'}`)",
-            mention_author=False,
-        )
-
-    @commands.command(name="players")
-    @is_gm()
-    async def players(self, ctx: commands.Context):
-        """Lista graczy online (RCON listplayers)."""
-        rcon = await self._require_rcon(ctx)
-        if rcon is None:
-            return
-        resp = await rcon.command("listplayers")
-        await ctx.reply(
-            f"```\n{resp.strip() or 'brak danych'}\n```", mention_author=False
-        )
-
-    @commands.command(name="kick")
-    @is_gm()
-    async def kick(self, ctx: commands.Context, *, who: str):
-        """Wyrzuć gracza (po nazwie/charname — zależnie od wersji serwera)."""
-        rcon = await self._require_rcon(ctx)
-        if rcon is None:
-            return
-        resp = await rcon.command(f"kick {who}")
-        await ctx.reply(f"👢 `{resp.strip() or 'OK'}`", mention_author=False)
-
-    @commands.command(name="rcon")
-    @is_gm()
-    async def raw_rcon(self, ctx: commands.Context, *, cmd: str):
-        """Surowa komenda RCON (dla zaawansowanych GM). Używaj ostrożnie."""
-        rcon = await self._require_rcon(ctx)
-        if rcon is None:
-            return
-        resp = await rcon.command(cmd)
-        await ctx.reply(f"```\n{resp.strip() or 'OK'}\n```", mention_author=False)
-
-    @commands.command(name="ogłoś", aliases=["oglos", "rp"])
-    @is_gm()
-    async def rp_announce(self, ctx: commands.Context, nadawca: str, *, message: str):
-        """Wiadomość RP 'z nadawcą' (np. ogłoszenie w imieniu Króla Khasara).
-
-        Na samym RCON realizujemy to jako sformatowany broadcast.
-        """
-        rcon = await self._require_rcon(ctx)
-        if rcon is None:
-            return
-        resp = await rcon.command(f"broadcast [{nadawca}]: {message}")
-        await ctx.reply(f"📜 Ogłoszono jako **{nadawca}**.", mention_author=False)
-
-
-async def setup(bot):
-    logger = logging.getLogger("discord")
-    await bot.add_cog(ConanModule(bot, "discord"))
-    logger.info("Loading conanjurer commands module done")

conanjurer_functions.py

@@ -1,266 +0,0 @@
-# This Python file uses the following encoding: utf-8
-"""Helper logic for the Conan Exiles <-> Discord bridge.
-
-Mirrors the project layout: the cog lives in ``conanjurer_commands.py`` and the
-reusable logic lives here.  Configuration comes from :mod:`constants` (env-var
-overridable); optional third-party dependencies (``aiomcrcon``/``asyncssh``)
-are imported defensively so the main bot can still load the extension when the
-Conan integration is not installed or not in use.
-"""
-from __future__ import annotations
-
-import asyncio
-import logging
-import os
-import re
-from dataclasses import dataclass
-from typing import AsyncIterator, Awaitable, Callable, Optional, Set
-
-try:
-    from aiomcrcon import Client as _Rcon  # Source RCON over TCP
-except ImportError:  # pragma: no cover - optional component
-    _Rcon = None
-
-try:
-    import asyncssh
-except ImportError:  # pragma: no cover - optional component
-    asyncssh = None
-
-logger = logging.getLogger("discord")
-
-
-@dataclass
-class Event:
-    kind: str  # "chat" | "login" | "logout" | "death" | "raw"
-    text: str  # ready-to-display text
-    raw: str   # original line (for debugging)
-
-
-@dataclass
-class ConanConfig:
-    """Runtime configuration for the bridge, built from :mod:`constants`."""
-
-    rcon_host: str
-    rcon_port: int
-    rcon_password: str
-    log_mode: str  # "local" | "sftp"
-    log_path: str
-    sftp_host: str
-    sftp_port: int
-    sftp_user: str
-    sftp_password: str
-
-    @property
-    def rcon_enabled(self) -> bool:
-        """RCON usable only when host+password are set and the lib is present."""
-        return bool(self.rcon_host and self.rcon_password and _Rcon is not None)
-
-    @property
-    def log_enabled(self) -> bool:
-        """Log following usable only when its prerequisites are configured."""
-        if not self.log_path:
-            return False
-        if self.log_mode == "sftp":
-            return bool(self.sftp_host and asyncssh is not None)
-        return True
-
-
-# --- REGEXY DO DOSTROJENIA NA WŁASNYM LOGU ---
-# Conan/Pippi/Tot logują różnie — dopasuj do swojego logu. Linie niepasujące są
-# ignorowane (nie zgadujemy).
-_PATTERNS: list[tuple[str, re.Pattern]] = [
-    ("chat", re.compile(r"Chat:\s*(?P<who>.+?):\s*(?P<msg>.+)$", re.I)),
-    ("login", re.compile(r"(?P<who>.+?)\s+(joined|connected|logged in)", re.I)),
-    ("logout", re.compile(r"(?P<who>.+?)\s+(left|disconnected|logged out)", re.I)),
-    ("death", re.compile(r"(?P<who>.+?)\s+was killed by\s+(?P<by>.+)$", re.I)),
-]
-
-
-class RconClient:
-    """Thin async wrapper around a Source-RCON connection to the Conan server."""
-
-    def __init__(self, host: str, port: int, password: str):
-        self._host, self._port, self._pw = host, port, password
-        self._client: Optional["_Rcon"] = None
-        self._lock = asyncio.Lock()
-
-    async def _ensure(self) -> "_Rcon":
-        if _Rcon is None:
-            raise RuntimeError("aiomcrcon not installed — RCON unavailable")
-        if self._client is None:
-            client = _Rcon(self._host, self._port, self._pw)
-            await client.connect()
-            self._client = client
-            logger.info("RCON connected %s:%s", self._host, self._port)
-        return self._client
-
-    async def command(self, cmd: str) -> str:
-        """Send a command to the Conan server and return its response.
-
-        Discord -> Conan channel, e.g. ``command("broadcast Hi!")``.
-        """
-        async with self._lock:
-            for attempt in (1, 2):
-                try:
-                    client = await self._ensure()
-                    resp, _ = await client.send_cmd(cmd)
-                    return resp
-                except Exception as exc:  # disconnect / server restart
-                    logger.warning("RCON error (attempt %s): %s", attempt, exc)
-                    await self.close()
-                    if attempt == 2:
-                        raise
-                    await asyncio.sleep(1.0)
-            return ""
-
-    async def close(self) -> None:
-        if self._client is not None:
-            try:
-                await self._client.close()
-            except Exception:  # pragma: no cover - best effort
-                pass
-            self._client = None
-
-
-def parse_line(line: str) -> Optional[Event]:
-    line = line.rstrip("\n")
-    if not line.strip():
-        return None
-    for kind, pat in _PATTERNS:
-        match = pat.search(line)
-        if match:
-            g = match.groupdict()
-            if kind == "chat":
-                return Event(kind, f"💬 **{g['who']}**: {g['msg']}", line)
-            if kind == "login":
-                return Event(kind, f"🟢 **{g['who']}** dołączył do gry", line)
-            if kind == "logout":
-                return Event(kind, f"⚪ **{g['who']}** opuścił grę", line)
-            if kind == "death":
-                return Event(kind, f"💀 **{g['who']}** zginął z ręki {g['by']}", line)
-    return None  # nierozpoznane -> ignoruj
-
-
-def parse_players(listplayers_output: str) -> Set[str]:
-    """Extract the set of connected player char-names from RCON ``listplayers``.
-
-    Conan's table is roughly::
-
-        Idx | Char name | Player name | User ID | Platform ID | Platform Name
-        0   | Conan     | SomeUser    | 12345   | 765...      | Steam
-
-    The char-name column (index 1) is used.  The exact format varies between
-    server builds, so this is best-effort and intentionally tunable.
-    """
-    players: Set[str] = set()
-    for raw in listplayers_output.splitlines():
-        line = raw.strip()
-        if not line or "|" not in line:
-            continue
-        cols = [c.strip() for c in line.split("|")]
-        head = cols[0].lower()
-        # skip the header row and any separator rows (e.g. "---|---")
-        if head in ("idx", "") or set(cols[0]) <= set("-"):
-            continue
-        if len(cols) >= 2 and cols[1]:
-            players.add(cols[1])
-    return players
-
-
-async def watch_players(
-    rcon: RconClient,
-    interval: float,
-    on_join: Callable[[str], Awaitable[None]],
-) -> None:
-    """Poll RCON ``listplayers`` and call *on_join* for each new player.
-
-    The first poll seeds the known-player set without announcing, so restarting
-    the bot does not re-announce everyone already online.  RCON failures are
-    logged and retried on the next tick rather than killing the task.
-    """
-    known: Optional[Set[str]] = None
-    while True:
-        try:
-            response = await rcon.command("listplayers")
-            current = parse_players(response)
-            if known is None:
-                known = current
-            else:
-                for name in current - known:
-                    try:
-                        await on_join(name)
-                    except Exception:  # pragma: no cover - handler guard
-                        logger.exception("Conan: on_join handler failed")
-                known = current
-        except Exception as exc:
-            logger.warning("Conan: player poll failed: %s", exc)
-        await asyncio.sleep(interval)
-
-
-async def _follow_local(path: str) -> AsyncIterator[str]:
-    """``tail -f`` in pure asyncio, following log rotation."""
-    while True:
-        try:
-            with open(path, "r", encoding="utf-8", errors="replace") as handle:
-                handle.seek(0, os.SEEK_END)
-                inode = os.fstat(handle.fileno()).st_ino
-                while True:
-                    line = handle.readline()
-                    if line:
-                        yield line
-                        continue
-                    await asyncio.sleep(0.5)
-                    try:
-                        if os.stat(path).st_ino != inode:  # rotation
-                            break
-                    except FileNotFoundError:
-                        break
-        except FileNotFoundError:
-            logger.warning("Conan log not present yet: %s", path)
-            await asyncio.sleep(3.0)
-
-
-async def _follow_sftp(cfg: ConanConfig) -> AsyncIterator[str]:
-    """Incremental SFTP polling (e.g. Host Havoc): reads only new bytes."""
-    offset = 0
-    while True:
-        try:
-            async with asyncssh.connect(
-                cfg.sftp_host,
-                port=cfg.sftp_port,
-                username=cfg.sftp_user,
-                password=cfg.sftp_password,
-                known_hosts=None,
-            ) as conn:
-                async with conn.start_sftp_client() as sftp:
-                    while True:
-                        try:
-                            attrs = await sftp.stat(cfg.log_path)
-                            size = attrs.size or 0
-                            if size < offset:  # rotation
-                                offset = 0
-                            if size > offset:
-                                async with sftp.open(cfg.log_path, "r") as remote:
-                                    await remote.seek(offset)
-                                    chunk = await remote.read()
-                                    offset = size
-                                    for line in chunk.splitlines():
-                                        yield line
-                        except FileNotFoundError:
-                            logger.warning("SFTP: missing log %s", cfg.log_path)
-                        await asyncio.sleep(2.0)
-        except Exception as exc:
-            logger.warning("SFTP disconnected: %s — retrying", exc)
-            await asyncio.sleep(5.0)
-
-
-async def watch(cfg: ConanConfig, on_event: Callable[[Event], Awaitable[None]]) -> None:
-    """Follow the Conan log and dispatch recognised lines to *on_event*."""
-    source = _follow_local(cfg.log_path) if cfg.log_mode != "sftp" else _follow_sftp(cfg)
-    async for line in source:
-        event = parse_line(line)
-        if event is not None:
-            try:
-                await on_event(event)
-            except Exception:  # pragma: no cover - handler guard
-                logger.exception("Conan: event handler failed")

conftest.py

@@ -1,14 +0,0 @@
-"""Pytest bootstrap: make first-party modules importable from the tests.
-
-The bot modules live at the repository root and the musician service lives in
-``conjurer_musician/``; neither is an installable package, so we put both on
-``sys.path`` here.
-"""
-import os
-import sys
-
-_ROOT = os.path.dirname(os.path.abspath(__file__))
-
-for _path in (_ROOT, os.path.join(_ROOT, "conjurer_musician")):
-    if _path not in sys.path:
-        sys.path.insert(0, _path)

conjurer_librarian/scrape_bot.py

@@ -4,7 +4,6 @@ This module contains the code for the scrape bot.
 
 import json
 import logging
-import os
 import random
 import re
 import time
@@ -16,9 +15,9 @@ from urllib.request import urlopen
 from requests import ConnectionError as RequestsConnectionError
 from requests import ConnectTimeout, Timeout
 
-SCR_DATABASE_PATH = os.getenv("CONJURER_LIBRARIAN_DB_PATH", r"C:\\Database\\chunks\\")
+SCR_DATABASE_PATH = r"C:\\Database\\chunks\\"
-SCR_FILENAME = os.getenv("CONJURER_LIBRARIAN_SCRAPE_CHUNK", "40_chunk.txt")
+SCR_FILENAME = "40_chunk.txt"
-SCR_ENCODING = os.getenv("CONJURER_ENCODING", "utf-8")
+SCR_ENCODING = "utf-8"
 
 WORK_Q = Queue()
 random.seed()

conjurer_librarian/search_bot.py

@@ -19,20 +19,22 @@ Global Variables:
 """
 
 # TODO: Wpiemdolić to wszystko w klasę z loggerem przysłanym z góry
-import os
 from queue import Empty, Queue
 from threading import Thread
 import time
 q = Queue()
 #TODO: Count number of lines in files and print to approximate on which part of the file search is
 
-# Deployment data is environment-overridable so the local DOI database can live
+# DATA FOR TEST ONLY
-# on a mounted volume (Docker/Linux) instead of the hardcoded Windows path.
+# MAXTHREADS = 5
-MAXTHREADS = int(os.getenv("CONJURER_LIBRARIAN_MAXTHREADS", "41"))
+# DATABASE_PATH = r'C:\\Database\\chunks_1\\'
-DATABASE_PATH = os.getenv("CONJURER_LIBRARIAN_DB_PATH", r"C:\\Database\\chunks\\")
 
-ENCODING = os.getenv("CONJURER_ENCODING", "utf-8")
+# DEPLOYMENT DATA
-CHUNK = os.getenv("CONJURER_LIBRARIAN_CHUNK", "_chunk.txt")
+MAXTHREADS = 41
+DATABASE_PATH = r"C:\\Database\\chunks\\"
+
+ENCODING = "utf-8"
+CHUNK = "_chunk.txt"
 _sentinel = object()
 WORK_Q_SIZE = 35500000
 
@@ -105,7 +107,7 @@ def consumer(in_q, control_q, doi, live_results, result_list, control_dict, no,
 
                 for item in result_list:
                     if item["DOI"] in data and not item["exists"]:
-                        print(f"HIT in {no} content {data[0]} line {data[1]} file {data[2]} {item['exists']}")
+                        print(f"HIT in {no} content {data[0]} line {data[1]} file {data[2]} {item["exists"]}")
                         _logger.info(data)
                         _logger.info("HIT")
                         item["exists"] = True

conjurer_librarian/search_bot2.py

@@ -108,7 +108,7 @@ def consumer(in_q, control_q, doi, live_results, result_list, control_dict, no,
                 print(f"C{no}{alive_no}\r", end="")
                 for item in result_list:
                     if item["DOI"] in data[0] and not item["exists"]:
-                        print(f"HIT in {no} content {data[0]} line {data[1]} file {data[2]} {item['exists']}")
+                        print(f"HIT in {no} content {data[0]} line {data[1]} file {data[2]} {item["exists"]}")
                         item["exists"] = True
                         live_results.append(item)
                     done_check = done_check and item["exists"]

conjurer_musician/.gitignore

@@ -1,7 +0,0 @@
-# Runtime-generated radio data — keep out of the repo
-all_playlist.playlist
-hit.playlist
-request.playlist
-priority_queue.playlist
-prio_playlist.json
-*.mp3

conjurer_musician/media_search_functions.py

@@ -1,44 +1,24 @@
 #!/usr/bin/env python3
-"""Share-list search/publish helpers for the musician service.
+import argparse
-
-Paths are environment-overridable and the share database / directory are
-accessed lazily, so importing this module has no side effects (the previous
-version ran ``SHARE_DIR.mkdir()`` and read the JSON DB at import time, which
-crashed on any host without the Pi's ``/var/www`` / ``/var/log`` layout — and
-made the service untestable).
-"""
 import json
 import os
+import sys
 import uuid
 from pathlib import Path
 
-# CONFIGURATION (env-overridable)
+# CONFIGURATION
-JSON_DB = os.getenv("CONJURER_SHARE_DB", "/var/log/share_scan.json")
+JSON_DB        = '/var/log/share_scan.json'
-SHARE_DIR = Path(os.getenv("CONJURER_SHARE_DIR", "/var/www/html/share"))
+SHARE_DIR      = Path('/var/www/html/share')
-BASE_URL = os.getenv("CONJURER_SHARE_BASE_URL", "https://czernobog.pl/share")
+BASE_URL       = 'https://czernobog.pl/share'
-
-_entries_cache = None
-
-
-def _ensure_share_dir():
-    SHARE_DIR.mkdir(parents=True, exist_ok=True)
 
+# Ensure share directory exists
+SHARE_DIR.mkdir(parents=True, exist_ok=True)
 
 def load_db():
-    """Load share entries, returning [] when the DB is missing/corrupt."""
+    with open(JSON_DB) as f:
-    try:
+        return json.load(f)['entries']
-        with open(JSON_DB) as handle:
-            return json.load(handle).get("entries", [])
-    except (FileNotFoundError, json.JSONDecodeError):
-        return []
-
-
-def _entries():
-    global _entries_cache
-    if _entries_cache is None:
-        _entries_cache = load_db()
-    return _entries_cache
 
+ENTRIES = load_db()
 
 def relevancy(path, keywords):
     score = 0
@@ -48,20 +28,17 @@ def relevancy(path, keywords):
             score += low.count(kw.lower())
     return score
 
-
 def find_matches(count, keywords):
     scored = []
-    for entry in _entries():
+    for e in ENTRIES:
-        score = relevancy(entry["path"], keywords)
+        score = relevancy(e['path'], keywords)
         if score > 0:
-            scored.append((score, entry["path"]))
+            scored.append((score, e['path']))
     scored.sort(reverse=True, key=lambda x: x[0])
     result = [p for _, p in scored]
     return result[:count]
 
-
 def publish(paths):
-    _ensure_share_dir()
     urls = []
     for path in paths:
         token = uuid.uuid4().hex
@@ -72,3 +49,4 @@ def publish(paths):
             pass
         urls.append(f"{BASE_URL}/{token}")
     return urls
+

constants.py

@@ -1,32 +1,19 @@
-"""Centralised configuration and runtime constants for Conjurer.
+"""Centralised configuration and runtime constants for Conjurer services.
 
-Historically this module performed heavy filesystem and credential reads at
+This module used to perform heavy filesystem and credential reads at import
-import time which made the bot brittle on hosts that did not mirror the
+time which made the project brittle on hosts that did not mirror the original
-original paths.  This version keeps the original platform defaults (so the
+paths.  The current implementation defers that work, reads configuration from
-behaviour on the Raspberry Pi / WSL / Windows deployments is unchanged when no
+environment variables (with sensible fallbacks), and protects optional
-environment variables are set) but adds three robustness improvements ported
+dependencies so the main bot can start even when a secondary service is
-from the dockerised experiment:
+offline.
-
-* every path/endpoint can be overridden via an environment variable,
-* JSON state files are loaded defensively (a missing or corrupt file no longer
-  crashes the whole bot at import time),
-* optional dependencies (openai, spotipy, netrc) and credentials are guarded so
-  the bot can still start when a secondary integration is offline, and
-* a shared ``CONJURER_API_KEY`` plus ``service_headers()`` helper enables
-  authenticated internal HTTP calls.
-
-All path constants intentionally remain plain ``str`` (with their original
-trailing separators) to stay byte-for-byte compatible with the existing string
-concatenation in the command modules.
 """
 
 import json
 import logging
 import os
 from datetime import datetime
-from platform import uname
+from pathlib import Path
-from sys import platform
+from typing import Dict, List, Optional, Tuple, TypedDict
-from typing import List, Optional, TypedDict
 
 try:
     import netrc
@@ -45,8 +32,6 @@ except ImportError:  # pragma: no cover - optional component
     spotipy = None
     SpotifyClientCredentials = None
 
-logger = logging.getLogger("discord")
-
 Music_Config = TypedDict(
     "Music_Config",
     {
@@ -62,18 +47,44 @@ MASTER_TIMEOUT = datetime.now()
 INITIAL_TIME_WAIT = 500
 MUZYKA: Music_Config = {"ctx": None, "queue": [], "requester": []}
 
-LOGFILE = ""
+logger = logging.getLogger("discord")
-NETRC_FILE = ""
+
-MUSIC_FOLDER = ""
+
-MEMORY_FIVE_SIARA = ""
+def _env_path(var_name: str, fallback: Path) -> Path:
-MEMORY_FIVE_MUZYKA = ""
+    value = os.getenv(var_name)
-SETTINGS_FILE = ""
+    if value:
-ENCODING = "utf-8"
+        return Path(value).expanduser().resolve()
-GRAPHICS_PATH = ""
+    return fallback
+
+
+def _env(var_name: str, fallback: str) -> str:
+    return os.getenv(var_name, fallback)
+
+
+BASE_DIR = Path(os.getenv("CONJURER_BASE_DIR", Path(__file__).resolve().parent))
+
+LOGFILE = _env_path("CONJURER_LOG_FILE", BASE_DIR / "discord.log")
+NETRC_FILE = _env_path("CONJURER_NETRC_FILE", Path.home() / ".netrc")
+SETTINGS_FILE = _env_path("CONJURER_SETTINGS_FILE", BASE_DIR / "settings.json")
+MEMORY_FIVE_SIARA = _env_path("CONJURER_MEMORY_FILE", BASE_DIR / "pamiec.json")
+MEMORY_FIVE_MUZYKA = _env_path(
+    "CONJURER_MUSIC_MEMORY_FILE", BASE_DIR / "pamiec_muzyki.json"
+)
+GRAPHICS_PATH = _env_path(
+    "CONJURER_GRAPHICS_PATH", BASE_DIR / "Conjurer_graphics"
+)
+MUSIC_FOLDER = _env_path("CONJURER_MUSIC_FOLDER", BASE_DIR / "music")
+ENCODING = _env("CONJURER_ENCODING", "utf-8")
+
+API_SHARED_KEY = os.getenv("CONJURER_API_KEY", "")
 MUZYKA_MOJEGO_LUDU_HISTORIA = 1500
 MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE = 15
 MUZYKA_MOJEGO_LUDU_PLAJLISTA = 30
 
+FILE_SERVICE_ADDRESS = _env("CONJURER_FILE_SERVICE", "http://127.0.0.1:5000")
+RADIO_HARBOR_ADDRESS = _env("CONJURER_RADIO_HARBOR", "http://127.0.0.1:54321")
+SKIP_TRACK = _env("CONJURER_SKIP_ENDPOINT", "/skip")
+
 GET_MP3 = "/mp3"
 SEND_MP3 = "/update_mp3"
 GET_PLAYLIST = "/get_music"
@@ -82,137 +93,42 @@ CREATE_PRIO_PLAYLIST = "/create_priority_playlist"
 
 REQUEST_MUSIC = "/request_radio_file"
 CLEAR_PRIO = "/clear_pr_pls"
-SEND_QUERY = "/query"
+LIBRARIAN_SERVICE_ADDRESS = _env(
+    "CONJURER_LIBRARIAN_SERVICE", "http://127.0.0.1:5001"
+)
+SEND_QUERY = _env("CONJURER_LIBRARIAN_QUERY_ENDPOINT", "/query")
 TIME_BETWEEN_CALLS = 100000
 LAST_SPONTANEOUS_CALL = datetime.now()
+HOST_ADDRESS = _env("CONJURER_DISCORD_HOST", "0.0.0.0")
+PORT_ADDRESS = int(_env("CONJURER_DISCORD_PORT", "5000"))
 
-# *=========================================== Platform Specific Defaults
+# *=========================================== Platform Specific Predefines
-# These blocks only establish *default* values.  Every constant is overridable
-# through the matching environment variable further below.
 
-if platform in ("linux", "linux2"):
+SEPARATOR_FILE_PATH = _env("CONJURER_PATH_SEPARATOR", os.sep)
-    SEPARATOR_FILE_PATH = "/"
-    if "microsoft-standard" in uname().release:
-        LOGFILE = "/home/mtuszowski/conjurer/discord.log"
-        MEMORY_FIVE_SIARA = "/home/mtuszowski/conjurer/pamiec.json"
-        SYSTEM_GPT_SETTINGS = "/home/mtuszowski/conjurer/system_gpt_settings.json"
-        MEMORY_FIVE_MUZYKA = "/home/mtuszowski/conjurer/pamiec_muzyki.json"
-        MUSIC_FOLDER = "/mnt/g/Muzyka/"
-        SETTINGS_FILE = "/home/mtuszowski/conjurer/settings.json"
-        NETRC_FILE = "/home/mtuszowski/.netrc"
-        LOGSTORE = "/home/mtuszowski/conjurer/logs/"
-        ACCIDENT_LOG = "/home/mtuszowski/conjurer/accident_log.json"
-        ENCODING = "utf-8"
-        GRAPHICS_PATH = "/home/mtuszowski/conjurer/Conjurer_graphics/"
-        DIR_PATH_SADOX = "/mnt/c/Users/mtusz/OneDrive/Dokumenty/Fansadox"
 
-    else:
+DIR_PATH_SADOX = _env_path(
-        LOGFILE = "/home/pi/Conjurer/discord.log"
+    "CONJURER_SADOX_DIR", BASE_DIR / "Fansadox"
-        MEMORY_FIVE_SIARA = "/home/pi/Conjurer/pamiec.json"
-        SYSTEM_GPT_SETTINGS = "/home/pi/Conjurer/system_gpt_settings.json"
-        MEMORY_FIVE_MUZYKA = "/home/pi/Conjurer/pamiec_muzyki.json"
-        MUSIC_FOLDER = "/home/pi/MediaShare/mp3/"
-        SETTINGS_FILE = "/home/pi/Conjurer/settings.json"
-        NETRC_FILE = "/home/pi/.netrc"
-        LOGSTORE = "/home/pi/MediaShara/logs/"
-        ACCIDENT_LOG = "/home/pi/Conjurer/accident_log.json"
-        ENCODING = "utf-8"
-        GRAPHICS_PATH = "/home/pi/MediaShare/Conjurer_graphics/"
-        DIR_PATH_SADOX = "/home/pi/MediaShare/Fansadox/"
-
-
-elif platform == "win32":
-    LOGFILE = "discord.log"
-    MEMORY_FIVE_SIARA = "pamiec.json"
-    SYSTEM_GPT_SETTINGS = "system_gpt_settings.json"
-    MEMORY_FIVE_MUZYKA = "pamiec_muzyki.json"
-    MUSIC_FOLDER = "G:\\Muzyka\\"
-    SETTINGS_FILE = "settings.json"
-    NETRC_FILE = "C:\\Users\\mtusz\\.netrc"
-    LOGSTORE = "C:\\Users\\mtusz\\OneDrive\\Pulpit\\Conjurer\\logs\\"
-    ACCIDENT_LOG = "accident_log.json"
-    ENCODING = "utf-8"
-    DIR_PATH_SADOX = "C:\\Users\\mtusz\\OneDrive\\Dokumenty\\Fansadox\\"
-    SEPARATOR_FILE_PATH = "\\"
-
-else:
-    # Fallback for development hosts (macOS, BSD, …) that match none of the
-    # production platforms.  Everything is rooted next to this file so the
-    # module can at least be imported and unit-tested off-deployment.
-    _BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-    SEPARATOR_FILE_PATH = os.sep
-    LOGFILE = os.path.join(_BASE_DIR, "discord.log")
-    MEMORY_FIVE_SIARA = os.path.join(_BASE_DIR, "pamiec.json")
-    SYSTEM_GPT_SETTINGS = os.path.join(_BASE_DIR, "system_gpt_settings.json")
-    MEMORY_FIVE_MUZYKA = os.path.join(_BASE_DIR, "pamiec_muzyki.json")
-    MUSIC_FOLDER = os.path.join(_BASE_DIR, "music") + os.sep
-    SETTINGS_FILE = os.path.join(_BASE_DIR, "settings.json")
-    NETRC_FILE = os.path.join(os.path.expanduser("~"), ".netrc")
-    LOGSTORE = os.path.join(_BASE_DIR, "logs") + os.sep
-    ACCIDENT_LOG = os.path.join(_BASE_DIR, "accident_log.json")
-    GRAPHICS_PATH = os.path.join(_BASE_DIR, "Conjurer_graphics") + os.sep
-    DIR_PATH_SADOX = os.path.join(_BASE_DIR, "Fansadox") + os.sep
-
-
-# *=========================================== Environment overrides
-# Values stay as plain strings so existing ``PATH + filename`` concatenation in
-# 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)
-NETRC_FILE = os.getenv("CONJURER_NETRC_FILE", NETRC_FILE)
-SETTINGS_FILE = os.getenv("CONJURER_SETTINGS_FILE", SETTINGS_FILE)
-MEMORY_FIVE_SIARA = os.getenv("CONJURER_MEMORY_FILE", MEMORY_FIVE_SIARA)
-MEMORY_FIVE_MUZYKA = os.getenv("CONJURER_MUSIC_MEMORY_FILE", MEMORY_FIVE_MUZYKA)
-SYSTEM_GPT_SETTINGS = os.getenv("CONJURER_SYSTEM_GPT_SETTINGS", SYSTEM_GPT_SETTINGS)
-GRAPHICS_PATH = os.getenv("CONJURER_GRAPHICS_PATH", GRAPHICS_PATH)
-MUSIC_FOLDER = os.getenv("CONJURER_MUSIC_FOLDER", MUSIC_FOLDER)
-LOGSTORE = os.getenv("CONJURER_LOGSTORE", LOGSTORE)
-ACCIDENT_LOG = os.getenv("CONJURER_ACCIDENT_LOG", ACCIDENT_LOG)
-DIR_PATH_SADOX = os.getenv("CONJURER_SADOX_DIR", DIR_PATH_SADOX)
-ENCODING = os.getenv("CONJURER_ENCODING", ENCODING)
-SEPARATOR_FILE_PATH = os.getenv("CONJURER_PATH_SEPARATOR", SEPARATOR_FILE_PATH)
-
-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")
-SKIP_TRACK = os.getenv("CONJURER_SKIP_ENDPOINT", "/skip")
-LIBRARIAN_SERVICE_ADDRESS = os.getenv(
-    "CONJURER_LIBRARIAN_SERVICE", "http://192.168.1.192:5001"
 )
-HOST_ADDRESS = os.getenv("CONJURER_DISCORD_HOST", "192.168.1.191")
-PORT_ADDRESS = int(os.getenv("CONJURER_DISCORD_PORT", "5000"))
 
-# Shared secret for authenticating internal service-to-service HTTP calls.
+SYSTEM_GPT_SETTINGS = _env_path(
-API_SHARED_KEY = os.getenv("CONJURER_API_KEY", "")
+    "CONJURER_SYSTEM_GPT_SETTINGS", BASE_DIR / "system_gpt_settings.json"
+)
+
+LOGSTORE = _env_path("CONJURER_LOGSTORE", BASE_DIR / "logs")
+ACCIDENT_LOG = _env_path(
+    "CONJURER_ACCIDENT_LOG", BASE_DIR / "accident_log.json"
+)
 
 
-# *=========================================== Defensive state loading
+def _load_json(path: Path, fallback) -> object:
-def _load_json(path: str, fallback):
-    """Load JSON from *path*, falling back gracefully on missing/corrupt files."""
     try:
-        with open(path, "r", encoding=ENCODING) as handle:
+        with path.open("r", encoding=ENCODING) as handle:
             return json.load(handle)
     except FileNotFoundError:
-        logger.warning("Missing JSON file at %s - using fallback", path)
+        logger.warning("Missing JSON file at %s – using fallback", path)
         return fallback
     except json.JSONDecodeError:
-        logger.warning("Corrupt JSON at %s - resetting to fallback", path)
+        logger.warning("Corrupt JSON at %s – resetting to fallback", path)
         return fallback
 
 
@@ -223,21 +139,19 @@ for key in WORD_REACTIONS:
     if isinstance(WORD_REACTIONS[key], list) and len(WORD_REACTIONS[key]) >= 3:
         WORD_REACTIONS[key][2] = datetime.now()
 
-MESSAGE_TABLE = _load_json(MEMORY_FIVE_SIARA, [])
+MESSAGE_TABLE = _load_json(MEMORY_FIVE_SIARA, {})
 GPT_SETTINGS = _load_json(SYSTEM_GPT_SETTINGS, {})
-MESSAGE_TABLE_MUZYKA = _load_json(MEMORY_FIVE_MUZYKA, [])
+MESSAGE_TABLE_MUZYKA = _load_json(MEMORY_FIVE_MUZYKA, {})
 
 SPECJALNE_ZIEMNIACZKI = GPT_SETTINGS[1] if isinstance(GPT_SETTINGS, list) else {}
-ASSISTANTS = {}
+ASSISTANTS: Dict[str, Tuple[str, str, int, object]] = {}
 
 
-# *=========================================== Credentials
+def _load_netrc_credentials(host: str) -> Optional[Tuple[str, str, str]]:
-def _load_netrc_credentials(host: str):
-    """Return the netrc authenticators tuple for *host* or ``None``."""
     if netrc is None:
         return None
     try:
-        parsed = netrc.netrc(NETRC_FILE)
+        parsed = netrc.netrc(str(NETRC_FILE))
     except FileNotFoundError:
         logger.warning("netrc file %s not found", NETRC_FILE)
         return None
@@ -248,7 +162,6 @@ def _load_netrc_credentials(host: str):
 
 
 def _resolve_token(host: str, env_var: str) -> Optional[str]:
-    """Prefer an environment variable, then fall back to netrc."""
     env_value = os.getenv(env_var)
     if env_value:
         return env_value
@@ -269,12 +182,12 @@ else:
 TOKEN = _resolve_token("discord", "DISCORD_TOKEN")
 
 if spotipy:
-    _spotify_creds = _load_netrc_credentials("spotipy")
+    spotify_creds = _load_netrc_credentials("spotipy")
-    if _spotify_creds and SpotifyClientCredentials:
+    if spotify_creds and SpotifyClientCredentials:
         SPOTIFY_CTRL = spotipy.Spotify(
             client_credentials_manager=SpotifyClientCredentials(
-                client_id=_spotify_creds[0],
+                client_id=spotify_creds[0],
-                client_secret=_spotify_creds[2],
+                client_secret=spotify_creds[2],
             )
         )
     else:
@@ -282,22 +195,18 @@ if spotipy:
 else:
     SPOTIFY_CTRL = None
 
-_youtube_creds = _load_netrc_credentials("youtube")
+youtube_creds = _load_netrc_credentials("youtube")
-if _youtube_creds:
+if youtube_creds:
-    YOUTUBE_AUTH = [_youtube_creds[0], _youtube_creds[2]]
+    YOUTUBE_AUTH = [youtube_creds[0], youtube_creds[2]]
 else:
     YOUTUBE_AUTH = [
-        os.getenv("YOUTUBE_USERNAME", ""),
+            os.getenv("YOUTUBE_USERNAME", ""),
-        os.getenv("YOUTUBE_PASSWORD", ""),
+            os.getenv("YOUTUBE_PASSWORD", ""),
-    ]
+        ]
 
 
-def service_headers():
+def service_headers() -> Dict[str, str]:
-    """Shared header dict for internal service-to-service HTTP calls.
+    """Shared header dict for internal HTTP calls."""
-
-    Returns an empty dict when no key is configured, keeping calls backward
-    compatible with deployments that do not (yet) enforce authentication.
-    """
     if API_SHARED_KEY:
         return {"X-Conjurer-Api-Key": API_SHARED_KEY}
     return {}
@@ -314,26 +223,3 @@ ALLOWED_ROLES = ["Nocna Zmiana", "Jarl", "Thane", "Bartender"]
 GUILD_ID = 664789470779932693
 LATEST_MODEL = "gpt-4o"          # najnowszy/do rozmów (możesz zmienić w jednym miejscu)
 CHEAP_MODEL  = "gpt-4o-mini"     # najtańszy (fallback do 3.5 niżej)
-
-
-# *=========================================== Conan Exiles bridge
-# Every value is optional; the conanjurer cog stays dormant unless configured.
-# Channel/role ids default to 0 ("not defined"); RCON host/log path default to
-# "" ("disabled"). See conanjurer_commands.py / conanjurer_functions.py.
-CONAN_GM_ROLE_ID = int(os.getenv("CONAN_GM_ROLE_ID", "0"))
-CONAN_CHAT_CHANNEL_ID = int(os.getenv("CONAN_CHAT_CHANNEL_ID", "0"))
-CONAN_EVENTS_CHANNEL_ID = int(os.getenv("CONAN_EVENTS_CHANNEL_ID", "0"))
-# Player-join notifications: leave at 0 to keep the feature disabled.
-CONAN_JOIN_CHANNEL_ID = int(os.getenv("CONAN_JOIN_CHANNEL_ID", "0"))
-CONAN_PLAYER_POLL_SECONDS = int(os.getenv("CONAN_PLAYER_POLL_SECONDS", "60"))
-
-CONAN_RCON_HOST = os.getenv("CONAN_RCON_HOST", "")
-CONAN_RCON_PORT = int(os.getenv("CONAN_RCON_PORT", "25575"))
-CONAN_RCON_PASSWORD = os.getenv("CONAN_RCON_PASSWORD", "")
-
-CONAN_LOG_MODE = os.getenv("CONAN_LOG_MODE", "local")  # "local" | "sftp"
-CONAN_LOG_PATH = os.getenv("CONAN_LOG_PATH", "")
-CONAN_SFTP_HOST = os.getenv("CONAN_SFTP_HOST", "")
-CONAN_SFTP_PORT = int(os.getenv("CONAN_SFTP_PORT", "22"))
-CONAN_SFTP_USER = os.getenv("CONAN_SFTP_USER", "")
-CONAN_SFTP_PASSWORD = os.getenv("CONAN_SFTP_PASSWORD", "")

deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-total_commands=31
+total_commands=29
 current_command=0
 
 function print_progress {
@@ -95,14 +95,8 @@ print_progress "cp ./conjurer/latex_functions.py ./Conjurer/"
 cp ./conjurer/librarian_functions.py ./Conjurer
 print_progress "cp ./conjurer/librarian_functions.py ./Conjurer/"
 
-cp ./conjurer/conanjurer_commands.py ./Conjurer/
+cp ./conjurer/thin_client.py ./Conjurer/bot.py
-print_progress "cp ./conjurer/conanjurer_commands.py ./Conjurer/"
+print_progress "cp ./conjurer/thin_client.py ./Conjurer/bot.py"
-
-cp ./conjurer/conanjurer_functions.py ./Conjurer/
-print_progress "cp ./conjurer/conanjurer_functions.py ./Conjurer/"
-
-cp ./conjurer/bot.py ./Conjurer/bot.py
-print_progress "cp ./conjurer/bot.py ./Conjurer/bot.py"
 
 sudo systemctl restart conjurer.service
 print_progress "sudo systemctl restart conjurer.service"

docker-compose.yml

@@ -0,0 +1,45 @@
+version: "3.9"
+
+services:
+  bot:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.bot
+    container_name: conjurer-bot
+    env_file:
+      - docker/env/bot.env
+    volumes:
+      - ./docker/volumes/bot/config:/data/config
+      - ./docker/volumes/bot/logs:/data/logs
+    depends_on:
+      - musician
+      - librarian
+    restart: unless-stopped
+    ports:
+      - "5000:5000"
+
+  musician:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.musician
+    container_name: conjurer-musician
+    env_file:
+      - docker/env/musician.env
+    volumes:
+      - ./docker/volumes/musician/data:/data
+    restart: unless-stopped
+    ports:
+      - "5001:5000"
+
+  librarian:
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.librarian
+    container_name: conjurer-librarian
+    env_file:
+      - docker/env/librarian.env
+    volumes:
+      - ./docker/volumes/librarian/data:/data
+    restart: unless-stopped
+    ports:
+      - "5002:5001"

docker/Dockerfile.bot

@@ -1,56 +1,23 @@
-# Conjurer main Discord bot.
-# Build from the repository root:
-#   docker build -f docker/Dockerfile.bot -t conjurer-bot .
 FROM python:3.11-slim
 
-# System dependencies:
+ENV PYTHONUNBUFFERED=1 \
-#   ffmpeg        - audio download/convert (yt_dlp) and Discord voice
+    PIP_NO_CACHE_DIR=1
-#   libopus0      - Discord voice (PyNaCl / discord-ext-voice-recv)
+
-#   poppler-utils - pdf2image (librarian/latex previews)
+RUN apt-get update \
-#   git           - required by the git+https entry in requirements
+    && apt-get install -y --no-install-recommends \
-#   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 \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
-# Optional: Tectonic for the $latex command. Remove this layer if unused.
+COPY requirements_bot.txt /tmp/requirements.txt
-RUN curl -fsSL https://drop-sh.fullyjustified.net | sh \
+RUN pip install -r /tmp/requirements.txt
-    && mv tectonic /usr/local/bin/tectonic \
-    || echo "tectonic not installed - the LaTeX feature will be disabled"
 
-COPY requirements_bot.txt ./
+COPY . /app
-RUN pip install --no-cache-dir --upgrade pip \
-    && pip install --no-cache-dir -r requirements_bot.txt
 
-# Vendored forks take import precedence over the pip packages of the same name,
+RUN useradd --create-home appuser \
-# because /app (the script dir) is first on sys.path when running `python bot.py`.
+    && chown -R appuser:appuser /app
-COPY yt_dlp ./yt_dlp
-COPY spotify_dl ./spotify_dl
 
-# Bot sources + default config/asset templates. Runtime state (conversation
+USER appuser
-# 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 \
+CMD ["python", "thin_client.py"]
-    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"]

docker/Dockerfile.librarian

@@ -1,27 +1,24 @@
-# 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 \
+ENV PYTHONUNBUFFERED=1 \
+    PIP_NO_CACHE_DIR=1
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
         build-essential \
+        poppler-utils \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
-COPY conjurer_librarian/requirements_librarian.txt ./
+COPY conjurer_librarian/requirements_librarian.txt /tmp/requirements.txt
-RUN pip install --no-cache-dir --upgrade pip \
+RUN pip install -r /tmp/requirements.txt
-    && pip install --no-cache-dir -r requirements_librarian.txt requests
 
-COPY conjurer_librarian/ ./
+COPY . /app
 
-ENV PYTHONUNBUFFERED=1 \
+RUN useradd --create-home appuser \
-    CONJURER_LIBRARIAN_HOST=0.0.0.0 \
+    && chown -R appuser:appuser /app
-    CONJURER_LIBRARIAN_PORT=5001 \
-    CONJURER_LIBRARIAN_DB_PATH=/doi/
 
-# The local DOI chunk database (large) is mounted here.
+USER appuser
-VOLUME ["/doi"]
-EXPOSE 5001
 
-CMD ["python", "conjurer_librarian.py"]
+CMD ["python", "-m", "conjurer_librarian.conjurer_librarian"]

docker/Dockerfile.musician

@@ -1,35 +1,23 @@
-# 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 \
+ENV PYTHONUNBUFFERED=1 \
-        build-essential \
+    PIP_NO_CACHE_DIR=1
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ffmpeg \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
-COPY conjurer_musician/requirements_musician.txt ./
+COPY requirements_bot.txt /tmp/requirements.txt
-RUN pip install --no-cache-dir --upgrade pip \
+RUN pip install -r /tmp/requirements.txt
-    && pip install --no-cache-dir -r requirements_musician.txt
 
-COPY conjurer_musician/ ./
+COPY . /app
-COPY docker/entrypoint.musician.sh /usr/local/bin/entrypoint.sh
-RUN chmod +x /usr/local/bin/entrypoint.sh
 
-ENV PYTHONUNBUFFERED=1 \
+RUN useradd --create-home appuser \
-    CONJURER_MUSICIAN_HOST=0.0.0.0 \
+    && chown -R appuser:appuser /app
-    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.
+USER appuser
-VOLUME ["/music", "/data"]
-EXPOSE 5000
 
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+CMD ["python", "-m", "conjurer_musician.conjurer_musician"]
-CMD ["python", "conjurer_musician.py"]

docker/compose.bot.yaml

@@ -1,22 +0,0 @@
-# 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

docker/compose.librarian.yaml

@@ -1,20 +0,0 @@
-# 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

docker/compose.musician.yaml

@@ -1,21 +0,0 @@
-# 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

docker/entrypoint.bot.sh

@@ -1,16 +0,0 @@
-#!/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 "$@"

docker/entrypoint.musician.sh

@@ -1,23 +0,0 @@
-#!/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 "$@"

docker/env/bot.env.example

@@ -1,38 +1,24 @@
-# Copy to docker/env/bot.env and fill in. Do NOT commit the real file.
+# Discord bot service configuration
 
-# --- Secrets ------------------------------------------------------------
+DISCORD_TOKEN=HACKME!
-# Option A: mount a netrc (recommended — covers discord/openai/spotipy/youtube).
+OPENAI_API_KEY=HACKME!
-CONJURER_NETRC_FILE=/secrets/.netrc
+CONJURER_API_KEY=HACKME!
-# Option B: pass tokens directly (these take precedence over netrc).
-# DISCORD_TOKEN=
-# OPENAI_API_KEY=
-# YOUTUBE_USERNAME=
-# YOUTUBE_PASSWORD=
 
-# --- Data ---------------------------------------------------------------
+# Internal service endpoints
-# Single mounted volume; all writable state is rooted here.
+CONJURER_FILE_SERVICE=http://conjurer-musician:5000
-CONJURER_DATA_DIR=/data
+CONJURER_LIBRARIAN_SERVICE=http://conjurer-librarian:5001
 
-# --- Flask comm layer (inbound from musician/librarian) -----------------
+# Runtime paths mounted via docker-compose volumes
-CONJURER_DISCORD_HOST=0.0.0.0
+CONJURER_BASE_DIR=/data/config
-CONJURER_DISCORD_PORT=5000
+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
 
-# --- Internal service auth ----------------------------------------------
+# Optional external integrations
-# Set the SAME value on bot + musician + librarian. Empty = auth disabled.
+CONJURER_NETRC_FILE=/data/secrets/.netrc
-CONJURER_API_KEY=
+YOUTUBE_USERNAME=HACKME!
-
+YOUTUBE_PASSWORD=HACKME!
-# --- 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=

docker/env/librarian.env.example

@@ -1,21 +1,14 @@
-# Copy to docker/env/librarian.env and fill in.
+# 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
 
-# Same shared secret as the bot (empty = auth disabled).
+CONJURER_CROSSREF_MAILTO=HACKME!
-CONJURER_API_KEY=
+CONJURER_LIBRARIAN_LOG=/data/logs/librarian.log
 
-# Where to POST search results back to (the bot's comm layer).
+CONJURER_NETRC_FILE=/data/secrets/.netrc
-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

docker/env/musician.env.example

@@ -1,17 +1,20 @@
-# Copy to docker/env/musician.env and fill in.
+# 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
 
-# Same shared secret as the bot (empty = auth disabled).
+CONJURER_MUSIC_FOLDER=/data/music
-CONJURER_API_KEY=
+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
 
-# Where to POST "now playing" / prepped-track updates (the bot's comm layer).
+CONJURER_RADIO_LOG=/data/logs/radio.log
-CONJURER_MAIN_BOT=http://BOT_VM_IP:5000
+CONJURER_PERSISTENCE_LOG=/data/logs/persistence.log
-
-# 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

docs/deployment/DOCKER_PROXMOX.md

@@ -1,253 +0,0 @@
-# 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 `Loading … module done` for each cog, `Loading conanjurer commands
-module done`, and `All systems: operational`.
-
----
-
-## 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.

docs/deployment/MIGRATION_WORKING_COPY_TO_PROTOTYPE.md

@@ -1,231 +0,0 @@
-# Migracja: „working copy" → „prototype"
-
-Runbook upgrade'u działającego deploymentu bota (Raspberry Pi) z wersji
-**working copy** (kod w roocie repo, bez auth między usługami, bez integracji
-Conan) na wersję **prototype** (konfiguracja przez zmienne środowiskowe,
-opcjonalna autoryzacja wewnętrznych wywołań HTTP, integracja Conan Exiles).
-
-> **Najważniejsze:** upgrade jest **wstecznie kompatybilny**. Bez ustawiania
-> żadnych nowych zmiennych bot działa tak jak dotąd — istniejące tokeny z
-> `~/.netrc` i domyślne ścieżki są zachowane. Wszystkie nowe funkcje
-> (autoryzacja API, most Conan, powiadomienia o graczach) są **opt-in**.
-
----
-
-## 0. Status / warunek wstępny
-
-Pełny kod prototype znajduje się obecnie na branchu **`proto-improvements`**.
-Na `main` jest na razie sama restrukturyzacja (working copy w roocie). Zanim
-zmigrujesz produkcję z `main`, zmerguj prototype do `main`
-(`proto-improvements` → `main`) albo deployuj bezpośrednio z brancha
-`proto-improvements`. Dalsza część zakłada, że prototype jest już dostępny pod
-refem, który checkoutujesz w kroku 2.
-
-**Układ deploymentu (bez zmian):**
-
-| | Ścieżka |
-|---|---|
-| Klon repo | `/home/pi/conjurer` |
-| Runtime bota | `/home/pi/Conjurer` |
-| Virtualenv | `/home/pi/Conjurer/env` (używany przez `conjurer.service`) |
-| Usługa systemd | `conjurer.service` → `ExecStart … /home/pi/Conjurer/bot.py` |
-| Deploy | `deploy.sh` (kopiuje pliki z repo do runtime i restartuje usługę) |
-
----
-
-## 1. Backup i punkt powrotu
-
-```bash
-# zapamiętaj aktualny commit (do ewentualnego rollbacku)
-git -C /home/pi/conjurer rev-parse HEAD > /home/pi/conjurer_rollback_commit.txt
-
-# snapshot runtime (config + dane)
-sudo cp -a /home/pi/Conjurer /home/pi/Conjurer.bak.$(date +%Y%m%d_%H%M%S)
-```
-
-Sekrety nadal pochodzą z `~/.netrc` (Discord/OpenAI/Spotify/YouTube) — upewnij
-się, że ten plik istnieje i jest aktualny. Migracja go nie dotyka.
-
----
-
-## 2. Pobranie kodu prototype
-
-```bash
-cd /home/pi/conjurer
-git fetch --all
-git checkout main && git pull          # gdy prototype jest już w main
-# albo, do czasu merge:  git checkout proto-improvements && git pull
-```
-
----
-
-## 3. Instalacja nowych zależności
-
-Wersja prototype dodaje do `requirements_bot.txt` dwa pakiety używane przez most
-Conan: **`aiomcrcon`** i **`asyncssh`**.
-
-```bash
-source /home/pi/Conjurer/env/bin/activate
-python3 -m pip install -r /home/pi/conjurer/requirements_bot.txt
-deactivate
-```
-
-> Nawet bez tych pakietów bot się uruchomi — importy w module Conan są osłonięte
-> (`try/except ImportError`), a integracja pozostaje uśpiona. Instalacja jest
-> potrzebna tylko jeśli faktycznie używasz mostu Conan.
-
----
-
-## 4. (Opcjonalnie) Konfiguracja zmiennych środowiskowych
-
-Wersja prototype czyta konfigurację ze zmiennych środowiskowych z fallbackiem na
-dotychczasowe wartości. **Pomiń ten krok dla zwykłego upgrade'u** — domyślne
-ścieżki i `~/.netrc` wystarczą. Ustaw zmienne tylko gdy włączasz nową funkcję.
-
-### 4a. Plik środowiskowy dla systemd
-
-```bash
-sudo tee /home/pi/Conjurer/conjurer.env >/dev/null <<'EOF'
-# --- Autoryzacja wewnętrznych wywołań HTTP (opcjonalne) ---
-# Ten sam klucz MUSI być ustawiony na bocie, musicianie i librarianie.
-CONJURER_API_KEY=
-
-# --- Adresy usług wewnętrznych (domyślne wartości jak dotąd) ---
-#CONJURER_FILE_SERVICE=http://192.168.1.15:5000
-#CONJURER_RADIO_HARBOR=http://192.168.1.15:54321
-#CONJURER_LIBRARIAN_SERVICE=http://192.168.1.192:5001
-
-# --- Most Conan Exiles (opcjonalne; puste = wyłączone) ---
-#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
-# Powiadomienia o wejściu gracza — ustaw id kanału, by włączyć:
-#CONAN_JOIN_CHANNEL_ID=0
-#CONAN_PLAYER_POLL_SECONDS=60
-#CONAN_LOG_MODE=local
-#CONAN_LOG_PATH=
-EOF
-sudo chmod 600 /home/pi/Conjurer/conjurer.env
-```
-
-### 4b. Podłączenie pliku do usługi
-
-Dodaj `EnvironmentFile` do sekcji `[Service]` w `conjurer.service`
-(`/etc/systemd/system/conjurer.service`):
-
-```ini
-[Service]
-Type=simple
-EnvironmentFile=/home/pi/Conjurer/conjurer.env
-ExecStart=/home/pi/Conjurer/env/bin/python3 /home/pi/Conjurer/bot.py
-Restart=on-abort
-```
-
-```bash
-sudo systemctl daemon-reload
-```
-
-> `conjurer.service` w repo również warto zaktualizować o tę linię, ale `deploy.sh`
-> **nie** nadpisuje jednostki systemd przy każdym deployu — wpis robisz raz, ręcznie.
-
----
-
-## 5. Deploy i restart
-
-```bash
-cd /home/pi/conjurer
-./deploy.sh        # kopiuje m.in. bot.py oraz conanjurer_commands/_functions.py do runtime
-```
-
-`deploy.sh` na końcu sam wykonuje `systemctl restart conjurer.service`. Jeśli
-zmieniałeś jednostkę systemd w kroku 4b, wcześniej zrób `daemon-reload`.
-
----
-
-## 6. Weryfikacja
-
-```bash
-journalctl -u conjurer.service -f
-```
-
-Czego szukać w logu (`/home/pi/Conjurer` → plik logu również):
-
-- `Loading … module done` dla kolejnych rozszerzeń, w tym **`Loading conanjurer commands module done`**
-- Gdy most Conan nieskonfigurowany: `Conan: log watch disabled (not configured)`
-  oraz `Conan: player-join notifications disabled (no channel or RCON)` — to
-  oczekiwane, integracja jest uśpiona
-- `All systems: operational`
-
-Szybki test funkcjonalny: bot łączy się z Discordem, dotychczasowe komendy
-działają, radio/biblioteka odpowiadają jak wcześniej.
-
----
-
-## 7. Zmiany zachowania, o których warto wiedzieć
-
-| Obszar | Working copy | Prototype |
-|---|---|---|
-| Konfiguracja | zahardkodowana per-platforma | env-vary z fallbackiem na stare wartości |
-| Tokeny | tylko `~/.netrc` | env-var → fallback `~/.netrc` (stare działa) |
-| Wewnętrzne HTTP (music/radio/librarian) | bez nagłówków | wysyła `X-Conjurer-Api-Key`, **gdy** `CONJURER_API_KEY` ustawione |
-| Endpointy przychodzące bota | bez weryfikacji | `_authorize_request()` zwraca 401 przy złym kluczu (no-op gdy klucz pusty) |
-| Pętla bota | wątki + `join()` | pojedyncza pętla asyncio z czystym shutdownem |
-| Moduł Conan | obecny, **nieładowany** (miał SyntaxError) | naprawiony i ładowany; uśpiony bez konfiguracji |
-
----
-
-## 8. Włączanie funkcji opcjonalnych
-
-### 8a. Autoryzacja wewnętrznych wywołań HTTP
-Ustaw **ten sam** `CONJURER_API_KEY` na **wszystkich** usługach: bocie,
-musicianie (`conjurer_musician`) i librarianie. Po ustawieniu:
-- bot dokleja nagłówek do wywołań do file-service/radia/biblioteki,
-- usługi odrzucają (401) żądania bez poprawnego klucza.
-
-⚠️ Ustawienie klucza tylko po jednej stronie zepsuje komunikację (401). Albo
-wszędzie, albo nigdzie.
-
-### 8b. Most Conan Exiles
-Ustaw `CONAN_RCON_HOST` + `CONAN_RCON_PASSWORD` (komendy GM `say/players/kick/
-rcon/ogłoś`) oraz, dla mirrorowania czatu/zdarzeń, `CONAN_LOG_PATH`
-(+ `CONAN_CHAT_CHANNEL_ID`/`CONAN_EVENTS_CHANNEL_ID`).
-
-### 8c. Powiadomienia o wejściu gracza
-Ustaw **`CONAN_JOIN_CHANNEL_ID`** na id kanału Discord. Funkcja odpytuje RCON
-`listplayers` co `CONAN_PLAYER_POLL_SECONDS` i ogłasza nowych graczy. Pozostaw
-`0`, aby trzymać ją wyłączoną.
-
----
-
-## 9. Rollback
-
-```bash
-cd /home/pi/conjurer
-git checkout "$(cat /home/pi/conjurer_rollback_commit.txt)"
-./deploy.sh
-sudo systemctl restart conjurer.service
-```
-
-W razie potrzeby przywróć snapshot runtime z `/home/pi/Conjurer.bak.*`. Nowe
-zależności (`aiomcrcon`, `asyncssh`) mogą zostać w venv — nie przeszkadzają
-starszej wersji.
-
----
-
-## 10. Migracja usługi musician (jeśli prowadzisz radio)
-
-Stabilny wariant `musician_old` (zahardkodowane adresy) został zastąpiony przez
-`conjurer_musician` (env-driven, domyślnie `127.0.0.1`). Jeśli bot i musician są
-na **różnych** hostach, ustaw na musicianie:
-
-```bash
-CONJURER_MAIN_BOT=http://<ip-bota>:5000      # gdzie bot serwuje /prepped_tracks
-CONJURER_API_KEY=<ten sam sekret co bot>     # jeśli włączasz auth (8a)
-CONJURER_MUSIC_FOLDER=/home/pi/MediaShare/mp3
-```
-
-oraz na bocie `CONJURER_FILE_SERVICE=http://<ip-musiciana>:5000`. Szczegóły
-auth/kontraktu — patrz opis usługi `conjurer_musician`.

gpt_interface/app.py

@@ -0,0 +1,14 @@
+from flask import Flask
+from file_serv import bp as uploader_bp
+from ingest import bp as ingest_bp
+from waitress import serve
+
+app = Flask(__name__)
+HOST_ADDRESS = "127.0.0.1"
+PORT_ADDRESS = 49151
+
+if __name__ == "__main__":
+    app.register_blueprint(uploader_bp, url_prefix="/api")
+    app.register_blueprint(ingest_bp, url_prefix="/api")
+
+    serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)

gpt_interface/file_serv.py

@@ -0,0 +1,155 @@
+# -*- coding: utf-8 -*-
+from __future__ import annotations
+import os
+from pathlib import Path
+from typing import List, Dict, Any, Optional
+
+from flask import Blueprint, request, jsonify, send_file, abort, current_app
+from werkzeug.utils import secure_filename
+
+# ===== Konfiguracja przez ENV =====
+
+if API_KEY := os.getenv("API_KEY") is None:
+    with open("/home/pi/gpt_cont_api_key", "r") as f:
+        API_KEY = f.read().strip()
+else:
+    API_KEY = os.getenv("API_KEY", "")                     # np. openssl rand -hex 32
+
+UPLOAD_DIR = Path(os.getenv("UPLOAD_DIR", "/home/pi/tmp_git/"))  # katalog na dysku
+MAX_CONTENT_MB = int(os.getenv("MAX_CONTENT_MB", "200"))
+
+# Google Drive (opcjonalnie)
+GDRIVE_ENABLE = os.getenv("GDRIVE_ENABLE", "0") == "1"
+GDRIVE_SA_JSON = os.getenv("GDRIVE_SA_JSON", "")       # ścieżka do pliku .json konta serwisowego
+GDRIVE_FOLDER_ID = os.getenv("GDRIVE_FOLDER_ID", "")   # ID folderu na Drive
+
+bp = Blueprint("uploader", __name__)
+
+# Inicjalizacja katalogu
+UPLOAD_DIR.mkdir(parents=True, exist_ok=True)
+
+def _check_auth() -> bool:
+    """Proste Bearer auth. Jeśli API_KEY puste -> bez auth (niezalecane)."""
+    if not API_KEY:
+        return True
+    auth = request.headers.get("Authorization", "")
+    if auth.startswith("Bearer "):
+        token = auth[7:].strip()
+        return token == API_KEY
+    return False
+
+def _safe_join(base: Path, *parts: str) -> Path:
+    """Zapobiega ../ — wymusza pozostanie w katalogu bazowym."""
+    p = (base.joinpath(*parts)).resolve()
+    if not str(p).startswith(str(base.resolve())):
+        abort(400, description="Invalid path")
+    return p
+
+# ===== Google Drive helper =====
+_drive_client_cached = None
+
+def _get_drive():
+    global _drive_client_cached
+    if _drive_client_cached is not None:
+        return _drive_client_cached
+
+    if not (GDRIVE_ENABLE and GDRIVE_SA_JSON and os.path.exists(GDRIVE_SA_JSON)):
+        return None
+
+    from google.oauth2 import service_account
+    from googleapiclient.discovery import build
+
+    scopes = ["https://www.googleapis.com/auth/drive.file"]
+    creds = service_account.Credentials.from_service_account_file(GDRIVE_SA_JSON, scopes=scopes)
+    _drive_client_cached = build("drive", "v3", credentials=creds, cache_discovery=False)
+    return _drive_client_cached
+
+def upload_to_drive(local_path: Path, filename: str) -> Optional[Dict[str, Any]]:
+    drv = _get_drive()
+    if drv is None:
+        return None
+    from googleapiclient.http import MediaFileUpload
+    file_metadata = {"name": filename}
+    if GDRIVE_FOLDER_ID:
+        file_metadata["parents"] = [GDRIVE_FOLDER_ID]
+    media = MediaFileUpload(str(local_path), resumable=False)
+    created = drv.files().create(body=file_metadata, media_body=media, fields="id,webViewLink,webContentLink").execute()
+    file_id = created.get("id")
+    # Przydatne linki:
+    return {
+        "file_id": file_id,
+        "webViewLink": created.get("webViewLink"),
+        "webContentLink": created.get("webContentLink"),
+        "direct_view": f"https://drive.google.com/file/d/{file_id}/view",
+        "direct_download": f"https://drive.google.com/uc?export=download&id={file_id}",
+    }
+
+@bp.get("/health")
+def health():
+    return jsonify(ok=True, info="Okidokie")
+
+@bp.post("/upload")
+def upload():
+    """Przyjmuje:
+       - multipart/form-data z jednym plikiem ('file') lub wieloma ('files')
+       - opcjonalnie: form 'subdir' (podkatalog), 'drive' (1/0) żeby wymusić wysyłkę na Drive
+    """
+    if not _check_auth():
+        return jsonify(error="Unauthorized"), 401
+
+    # Limit ciała żądania po stronie Flaska:
+    request.max_content_length = MAX_CONTENT_MB * 1024 * 1024
+
+    files = []
+    if "file" in request.files:
+        files = [request.files["file"]]
+    elif "files" in request.files:
+        files = request.files.getlist("files")
+    else:
+        return jsonify(error="No file provided (use 'file' or 'files')"), 400
+
+    subdir = (request.form.get("subdir") or "").strip()
+    target_dir = _safe_join(UPLOAD_DIR, subdir) if subdir else UPLOAD_DIR
+    target_dir.mkdir(parents=True, exist_ok=True)
+
+    want_drive = (request.form.get("drive") == "1") or (request.args.get("drive") == "1")
+    saved: List[Dict[str, Any]] = []
+
+    for f in files:
+        if not f or not f.filename:
+            continue
+        fname = secure_filename(f.filename)
+        dest = _safe_join(target_dir, fname)
+        f.save(dest)
+
+        item = {
+            "filename": fname,
+            "size": dest.stat().st_size,
+            "path": str(dest.relative_to(UPLOAD_DIR)),
+            "url_hint": f"/api/files/{dest.relative_to(UPLOAD_DIR)}",
+        }
+
+        if want_drive and GDRIVE_ENABLE:
+            try:
+                gd = upload_to_drive(dest, fname)
+                if gd:
+                    item["gdrive"] = gd
+            except Exception as e:
+                # log i idziemy dalej
+                current_app.logger.exception("Drive upload failed: %s", e)
+                item["gdrive_error"] = str(e)
+
+        saved.append(item)
+
+    if not saved:
+        return jsonify(error="No valid files"), 400
+    return jsonify(ok=True, saved=saved)
+
+@bp.get("/files/<path:relpath>")
+def get_file(relpath: str):
+    if not _check_auth():
+        return jsonify(error="Unauthorized"), 401
+    target = _safe_join(UPLOAD_DIR, relpath)
+    if not target.exists() or not target.is_file():
+        return jsonify(error="Not found"), 404
+    return send_file(target, as_attachment=False)

gpt_interface/ingest.py

@@ -0,0 +1,52 @@
+# ingest_text.py
+import os
+import urllib.parse
+from pathlib import Path
+
+from flask import Blueprint, abort, jsonify, request
+
+bp = Blueprint("ingest_text", __name__)
+BASE = Path(os.getenv("INGEST_DIR", "/home/pi/tmp_git")).resolve()
+BASE.mkdir(parents=True, exist_ok=True)
+TOKEN = None
+with open("/home/pi/gpt_cont_api_key", "r") as f:
+        TOKEN = f.read().strip()
+
+
+# prosty bufor kawałków w RAM (na 1 proces)
+chunks = {}
+
+
+@bp.get("/api/ingest-text")
+def ingest_text():
+    if request.args.get("key") != TOKEN:
+        return jsonify(error="unauthorized"), 401
+
+    name = request.args.get("name", "").strip()
+    index = int(request.args.get("index", "1"))
+    total = int(request.args.get("total", "1"))
+    chunk = request.args.get("chunk", "")
+
+    if not name or "/" in name or ".." in name:
+        return jsonify(error="bad name"), 400
+    if not (1 <= index <= total <= 9999):
+        return jsonify(error="bad indexing"), 400
+
+    # gromadzimy w pamięci (możesz podmienić na Redis)
+    key = f"{name}:{total}"
+    entry = chunks.setdefault(key, {})
+    entry[index] = urllib.parse.unquote_plus(chunk)
+
+    if TOKEN is None:
+         exit("No API token set!")
+    if len(entry) == total:
+        # składamy i zapisujemy
+        data = "".join(entry[i] for i in range(1, total + 1))
+        out = (BASE / name).resolve()
+        if not str(out).startswith(str(BASE)):
+            return jsonify(error="bad path"), 400
+        out.write_text(data, encoding="utf-8")
+        del chunks[key]
+        return jsonify(ok=True, saved=str(out), bytes=len(data.encode("utf-8")))
+    else:
+        return jsonify(pending=True, got=len(entry), total=total)

gpt_interface/reinit_server.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+cd ../conjurer/ && git pull && cp ./gpt_interface/* ../gpt_interf_serv/ && cd -

librarian_commands.py

@@ -15,7 +15,12 @@ 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 DIR_PATH_SADOX, LIBRARIAN_SERVICE_ADDRESS, SEND_QUERY, service_headers
+from constants import (
+    DIR_PATH_SADOX,
+    LIBRARIAN_SERVICE_ADDRESS,
+    SEND_QUERY,
+    service_headers,
+)
 
 SERVICE_HEADERS = service_headers()
 

music_functions.py

@@ -22,7 +22,9 @@ from constants import (
 from spotify_dl import spotify
 from spotify_dl import youtube as youtube_download
 
+
 SERVICE_HEADERS = service_headers()
+MUSIC_ROOT = Path(MUSIC_FOLDER)
 
 
 
@@ -49,12 +51,12 @@ class MusicFileList(object):
             response = requests.get(
                 f"{FILE_SERVICE_ADDRESS}{GET_MP3}",
                 headers=SERVICE_HEADERS,
-                timeout=360,
+                timeout=60,
             )
             self.music_file_list = response.json()["music_file_list"]
             self.file_service_active = True
         except requests.exceptions.RequestException as e:
-            for mp3_item in Path.glob(Path(MUSIC_FOLDER), "**/*.mp3"):
+            for mp3_item in MUSIC_ROOT.glob("**/*.mp3"):
                 temp_music_file = mp3_item.as_posix()
                 if platform == "win32":
                     temp_music_file = temp_music_file.replace("/", "\\")
@@ -109,7 +111,7 @@ class MusicFileList(object):
             f"{FILE_SERVICE_ADDRESS}{SEND_MP3}",
             json=post_data,
             headers=SERVICE_HEADERS,
-            timeout=360,
+            timeout=60,
         )
 
 
@@ -154,7 +156,7 @@ async def get_file(ctx, source, link):
             url_data = {"urls": []}
             url_dict = {}
             url_dict["save_path"] = Path(
-                PurePath.joinpath(Path(MUSIC_FOLDER), Path(directory_name))
+                PurePath.joinpath(MUSIC_ROOT, Path(directory_name))
             )
             url_dict["save_path"].mkdir(parents=True, exist_ok=True)
             url_dict["songs"] = file_list
@@ -164,7 +166,7 @@ async def get_file(ctx, source, link):
             coro = asyncio.to_thread(
                 youtube_download.download_songs,
                 songs=url_data,
-                output_dir=MUSIC_FOLDER,
+                output_dir=str(MUSIC_ROOT),
                 format_str="bestaudio/best",
                 skip_mp3=False,
                 keep_playlist_order=False,

pamiec.json

@@ -234,21 +234,5 @@
     {
         "role": "assistant",
         "content": "Jakich konkretnych informacji mam si\u0119 douczy\u0107? Jestem tu po to, aby Ci pom\u00f3c, wi\u0119c jestem otwarty na uzupe\u0142nienie swojej wiedzy w dowolnym zakresie, o ile tylko nie \u0142amie to zasad regulaminu i etyki."
-    },
-    {
-        "role": "user",
-        "content": "The Bartender [S\u0142o\u0144ce z Betonu]:@Conjurer halo ?"
-    },
-    {
-        "role": "assistant",
-        "content": "*Kondziu patrzy na terminal* Wo\u0142aj szefa. Zap\u0142aci\u0107 rachunki za AI trzeba. Jak chcesz to si\u0119 na #zebranie dorzu\u0107. Error code: 429 - {'error': {'message': 'You exceeded your current quota, please check your plan and billing details. For more information on this error, read the docs: https://platform.openai.com/docs/guides/error-codes/api-errors.', 'type': 'insufficient_quota', 'param': None, 'code': 'insufficient_quota'}}"
-    },
-    {
-        "role": "user",
-        "content": "The Bartender [S\u0142o\u0144ce z Betonu]:helo\u0142 @Nocna Zmiana dwie wiadomo\u015bci dobra i jeszcze gorsza.\n@Conjurer zosta\u0142 zreanimowany po d\u0142u\u017cszej nieobecno\u015bci - ale jak zaraz sami zobaczycie je\u015b\u0107 wo\u0142a. nie dzia\u0142a w nim te\u017c jeszcze wyszukiwanie artyku\u0142\u00f3w naukowych (do tego trzy tygodnie developmentu posz\u0142y w p*****ec). wyszukiwarka wr\u00f3ci jak dotrze zam\u00f3wienie z kieszeniami na dysk @gwojtal - bedzie trzeba \u015bci\u0105gn\u0105\u0107 snapshot bazy i uruchomi\u0107 cz\u0119\u015b\u0107 odpowiedzialn\u0105 za wyszukiwanie w nim. specjalne funkcje b\u0119d\u0119 odblokowywa\u0142 w miare ich naprawiania - tak samo dam mu oczywi\u015bcie je\u015b\u0107 z w\u0142asnej kieszeni jak ju\u017c b\u0119dzie potrzeba."
-    },
-    {
-        "role": "assistant",
-        "content": "*Kondziu patrzy na terminal* Wo\u0142aj szefa. Zap\u0142aci\u0107 rachunki za AI trzeba. Jak chcesz to si\u0119 na #zebranie dorzu\u0107. Error code: 429 - {'error': {'message': 'You exceeded your current quota, please check your plan and billing details. For more information on this error, read the docs: https://platform.openai.com/docs/guides/error-codes/api-errors.', 'type': 'insufficient_quota', 'param': None, 'code': 'insufficient_quota'}}"
     }
 ]

pytest.ini

@@ -1,5 +0,0 @@
-[pytest]
-testpaths = tests
-python_files = test_*.py
-python_functions = test_*
-addopts = -ra

radio_commands.py

@@ -8,7 +8,16 @@ import uuid
 
 import asyncio
 from datetime import datetime
-from constants import RADIO_HARBOR_ADDRESS, SKIP_TRACK, FILE_SERVICE_ADDRESS, ADD_TO_PRIO_PLAYLIST, REQUEST_MUSIC, CREATE_PRIO_PLAYLIST, CLEAR_PRIO, service_headers
+from constants import (
+    RADIO_HARBOR_ADDRESS,
+    SKIP_TRACK,
+    FILE_SERVICE_ADDRESS,
+    ADD_TO_PRIO_PLAYLIST,
+    REQUEST_MUSIC,
+    CREATE_PRIO_PLAYLIST,
+    CLEAR_PRIO,
+    service_headers,
+)
 
 SERVICE_HEADERS = service_headers()
 
@@ -36,7 +45,6 @@ class RadioModule(commands.Cog):
                 coroutine = asyncio.to_thread(
                     requests.get,
                     f"{RADIO_HARBOR_ADDRESS}{SKIP_TRACK}",
-                    headers=SERVICE_HEADERS,
                     timeout=360,
                 )
                 result = await coroutine

requirements_bot copy.txt

@@ -0,0 +1,21 @@
+setuptools
+discord
+yaach
+t_dlp
+spotify_dl
+spotipy
+openai
+eyed3
+numpy
+pdf2image
+PyPDF2
+requests
+spotipy
+tiktoken
+PyNaCl
+flask[async]
+waitress
+clickupython
+assemblyai[extras]
+SpeechRecognition
+git+https://github.com/imayhaveborkedit/discord-ext-voice-recvO

requirements_bot.txt

@@ -15,8 +15,7 @@ PyNaCl
 flask[async]
 PyMuPDF
 waitress
+clickupython
 assemblyai[extras]
 SpeechRecognition
-aiomcrcon
-asyncssh
 git+https://github.com/imayhaveborkedit/discord-ext-voice-recv

rpg/armour.csv

@@ -0,0 +1,3 @@
+name,type,locations,ap_head,ap_body,ap_larm,ap_rarm,ap_lleg,ap_rleg,max_ag,traits,weight,availability,source,notes
+Flak Vest,armor,"Body",0,4,0,0,0,0,,Flak,7,Common,"DH2 CRB","PRZYKŁAD – ZASTĄP"
+Power Armour (Astartes),armor,"All",8,10,8,8,9,9,,Environmental; Auto-senses,100,"Very Rare","DW CRB","PRZYKŁAD – ZASTĄP"

rpg/attack_test.js

@@ -0,0 +1,60 @@
+// DH2 Attack Test v2 — presets: Aim/Range/Fire + Size/Light/Cover
+const actor = canvas.tokens.controlled[0]?.actor ?? game.user.character;
+if (!actor) return ui.notifications.warn("Zaznacz token albo przypisz postać.");
+new Dialog({
+  title: "🎯 Attack Test (WS/BS)",
+  content: `
+  <form>
+    <div class="form-group"><label>Base Target (WS/BS)</label><input name="base" type="number" value="40"/></div>
+    <div class="form-group"><label>Aim</label>
+      <select name="aim"><option value="0">None</option><option value="10">Half (+10)</option><option value="20">Full (+20)</option></select></div>
+    <div class="form-group"><label>Range</label>
+      <select name="range">
+        <option value="0">Standard</option>
+        <option value="30">Point Blank (+30)</option>
+        <option value="10">Short (+10)</option>
+        <option value="-10">Long (-10)</option>
+        <option value="-30">Extreme (-30)</option>
+      </select></div>
+    <div class="form-group"><label>Fire / Attack</label>
+      <select name="stance">
+        <option value="0">Standard / Single</option>
+        <option value="10">Semi (+10)</option>
+        <option value="-10">Full Auto (-10)</option>
+        <option value="30">All Out (Melee +30)</option>
+      </select></div>
+    <div class="form-group"><label>Target Size</label>
+      <select name="size">
+        <option value="0">Average</option>
+        <option value="10">Hulking (+10)</option>
+        <option value="20">Enormous (+20)</option>
+        <option value="30">Massive (+30)</option>
+        <option value="-10">Puny (-10)</option>
+      </select></div>
+    <div class="form-group"><label>Lighting</label>
+      <select name="light"><option value="0">Normal</option><option value="10">Good (+10)</option><option value="-10">Poor (-10)</option></select></div>
+    <div class="form-group"><label>Cover</label>
+      <select name="cover"><option value="0">None</option><option value="-10">Light (-10)</option><option value="-20">Heavy (-20)</option></select></div>
+    <div class="form-group"><label>Other Modifiers</label><input name="mod" type="number" value="0"/></div>
+  </form>`,
+  buttons: {
+    roll: {
+      label: "Roll",
+      callback: async (html) => {
+        const get = n => Number(html.find(`[name="${n}"]`).val());
+        const base = get("base");
+        const total = base + get("aim") + get("range") + get("stance") + get("size") + get("light") + get("cover") + get("mod");
+        const r = await(new Roll("1d100")).roll({async:true});
+        const ok = r.total <= total;
+        const margin = Math.abs(total - r.total);
+        const dox = ok ? 1 + Math.floor(margin/10) : Math.floor(margin/10);
+        const table = `
+        <table style="width:100%;border-collapse:collapse">
+          <tr><td><b>Target</b></td><td>${total}</td><td><b>Roll</b></td><td>${r.total}</td></tr>
+          <tr><td><b>Result</b></td><td colspan="3">${ok?'<span style="color:green">SUCCESS</span>':'<span style="color:red">FAIL</span>'} — ${ok?dox+' DoS':dox+' DoF'}</td></tr>
+        </table>`;
+        r.toMessage({speaker: ChatMessage.getSpeaker({actor}), flavor: `🎯 <b>Attack Test</b><br/>${table}`});
+      }
+    }
+  }
+}).render(true);

rpg/critical_hits.csv

@@ -0,0 +1,6 @@
+Roll,Result
+1,Energy/Head — wpis 1
+2,Energy/Head — wpis 2
+3,Energy/Head — wpis 3
+4,Energy/Head — wpis 4
+5,Energy/Head — wpis 5

rpg/focus_power.js

@@ -0,0 +1,50 @@
+// 🧠 Focus Power (DH2) — WP test + Phenomena/Perils with mode presets
+const actor = canvas.tokens.controlled[0]?.actor ?? game.user.character;
+if (!actor) return ui.notifications.warn("Zaznacz token.");
+new Dialog({
+  title: "🧠 Focus Power",
+  content: `
+  <form>
+    <div class="form-group"><label>Willpower (target)</label><input name="wp" type="number" value="40"/></div>
+    <div class="form-group"><label>Psychic Rating (PR)</label><input name="pr" type="number" value="3"/></div>
+    <div class="form-group"><label>Mode</label>
+      <select name="mode"><option value="fettered">Fettered (no PP; PR/2)</option><option value="unfettered" selected>Unfettered (PP on doubles)</option><option value="push">Push (always PP; +PR)</option></select></div>
+    <div class="form-group"><label>Power difficulty/gear/etc. (flat mod)</label><input name="flat" type="number" value="0"/></div>
+    <div class="form-group"><label>Perils threshold</label><input name="thr" type="number" value="75"/></div>
+  </form>`,
+  buttons: {
+    roll: { label: "Roll", callback: async html => {
+      const wp = Number(html.find('[name="wp"]').val());
+      const pr = Number(html.find('[name="pr"]').val());
+      const mode = html.find('[name="mode"]').val();
+      const flat = Number(html.find('[name="flat"]').val());
+      const thr = Number(html.find('[name="thr"]').val());
+      let effPR = pr, ppmod = 0, ppAlways = false, note = "";
+      if (mode==="fettered"){ effPR = Math.max(1, Math.floor(pr/2)); note="(Fettered: PR/2, brak Phenomena)"; }
+      if (mode==="push"){ effPR = pr+3; ppmod=10; ppAlways = true; note="(Push: +3 PR, Phenomena zawsze, +10)"; }
+      const target = wp + flat;
+      const roll = await (new Roll("1d100")).roll({async:true});
+      const ok = roll.total <= target;
+      const dos = ok ? 1 + Math.floor((target - roll.total)/10) : Math.floor((roll.total - target)/10);
+      const doubles = (roll.total%11===0) || (roll.total===100);
+      const info = `<table style="width:100%;border-collapse:collapse">
+        <tr><td><b>Target</b></td><td>${target}</td><td><b>Roll</b></td><td>${roll.total}</td></tr>
+        <tr><td><b>Result</b></td><td colspan="3">${ok?'<span style="color:green">SUCCESS</span>':'<span style="color:red">FAIL</span>'} — ${ok?dos+' DoS':dos+' DoF'} ${doubles?' — <b>DOUBLES</b>':''}</td></tr>
+        <tr><td><b>Eff. PR</b></td><td>${effPR}</td><td><b>Range hint</b></td><td>${effPR*10} m (jeśli moc tak działa)</td></tr>
+      </table>`;
+      roll.toMessage({speaker: ChatMessage.getSpeaker({actor}), flavor:`🧠 <b>Focus Power</b> ${note}<br/>${info}`});
+      const needPP = (mode==="unfettered" && doubles) || (mode==="push") ;
+      if (needPP){
+        const tbl = game.tables.getName("Psychic Phenomena");
+        if (tbl){
+          const r = await (new Roll(`1d100 + ${ppmod}`)).roll({async:true});
+          await tbl.draw({displayResults:true, roll:r});
+          if (r.total >= thr){
+            const per = game.tables.getName("Perils of the Warp");
+            if (per) await per.draw({displayResults:true});
+          }
+        } else ChatMessage.create({content:"Utwórz RollTable: <b>Psychic Phenomena</b> (+ <b>Perils of the Warp</b>)"});
+      }
+    }}
+  }
+}).render(true);

rpg/hit_location.js

@@ -0,0 +1,22 @@
+// 🎯 Hit Location (DH mapping by reversed roll)
+new Dialog({
+    title:"🎯 Hit Location",
+    content:`<form>
+      <div class="form-group"><label>Attack d100 roll</label><input name="roll" type="number" value="37"/></div>
+    </form>`,
+    buttons:{
+      go:{label:"Resolve", callback: html=>{
+        const n = Math.max(1, Math.min(100, Number(html.find('[name="roll"]').val())));
+        const rev = Number(String(n).padStart(2,"0").split("").reverse().join(""));
+        let loc = "";
+        if (rev<=10) loc="Head";
+        else if (rev<=20) loc="Right Arm";
+        else if (rev<=30) loc="Left Arm";
+        else if (rev<=70) loc="Body";
+        else if (rev<=85) loc="Right Leg";
+        else loc="Left Leg";
+        ChatMessage.create({content:`🎯 <b>Hit Location</b>: roll ${n} → reversed ${rev} → <b>${loc}</b>`});
+      }}
+    }
+  }).render(true);
+  

rpg/hose_rules.js

@@ -0,0 +1,6 @@
+const text=`<b>House Rules — DH2 chassis</b><br/>
+• Unnatural mapowanie: dawne ×2 bonus → Unnatural (+X) tak, by SB/TB odzwierciedlały linię źródłową.<br/>
+• Pancerz Astartes: zachowaj AP; zużycie zasilania jako +1 Fatigue co X scen zamiast liczenia minut.<br/>
+• Aptitudes: archetypy z RT/DW/BC mają przypisane 2–3 Aptitudes DH2 dla kosztów XP.<br/>
+• Psy: testy i PR z DH2 dla wszystkich; GK posiada Aegis Discipline (1×/scena reroll Perils) + 1–2 signature powers z DW.<br/>
+• RT Acquisition → DH2 Influence z modyfikatorami kontekstowymi (teatr działań, mandat Inkwizycji, czas).`;ChatMessage.create({content:text});

rpg/inititative.js

@@ -0,0 +1,11 @@
+// 🚦 Initiative for selected tokens (1d10 + AG Bonus prompt)
+if (!canvas.tokens.controlled.length) return ui.notifications.warn("Zaznacz co najmniej jeden token.");
+const combat = game.combat ?? await Combat.implementation.create({});
+for (const t of canvas.tokens.controlled){
+  if (!combat.combatants.some(c=>c.tokenId===t.id)) await combat.createEmbeddedDocuments("Combatant",[ {tokenId:t.id, sceneId: canvas.scene.id, hidden:false} ]);
+  const ag = Number(await Dialog.prompt({title:`AG Bonus for ${t.name}`, content:`<input type="number" value="4">`, label:"OK"}));
+  const r = await (new Roll(`1d10 + ${ag}`)).roll({async:true});
+  await combat.setInitiative(combat.combatants.find(c=>c.tokenId===t.id).id, r.total);
+  r.toMessage({flavor:`🚦 <b>Initiative</b> — ${t.name}: ${r.total}`});
+}
+ui.notifications.info("Inicjatywy ustawione.");

rpg/perils.csv

@@ -0,0 +1,21 @@
+Roll,Result
+1-5,Perils 1–5 — WPISZ
+6-10,Perils 6–10 — WPISZ
+11-15,Perils 11–15 — WPISZ
+16-20,Perils 16–20 — WPISZ
+21-25,Perils 21–25 — WPISZ
+26-30,Perils 26–30 — WPISZ
+31-35,Perils 31–35 — WPISZ
+36-40,Perils 36–40 — WPISZ
+41-45,Perils 41–45 — WPISZ
+46-50,Perils 46–50 — WPISZ
+51-55,Perils 51–55 — WPISZ
+56-60,Perils 56–60 — WPISZ
+61-65,Perils 61–65 — WPISZ
+66-70,Perils 66–70 — WPISZ
+71-75,Perils 71–75 — WPISZ
+76-80,Perils 76–80 — WPISZ
+81-85,Perils 81–85 — WPISZ
+86-90,Perils 86–90 — WPISZ
+91-95,Perils 91–95 — WPISZ
+96-100,Perils 96–100 — WPISZ

rpg/powers.csv

@@ -0,0 +1,3 @@
+name,type,discipline,action,test,range,sustained,effect,source,notes
+Smite,power,Biomancy,Half,"WP Challenging (+0)","PR*10m",No,"1d10+PR E; Tearing","DH2 CRB","PRZYKŁAD – ZASTĄP"
+Foreboding,power,Divination,Reaction,"Per Difficult (-10)","Self",No,"Use as Evasion; DoS rules","DH2 CRB","PRZYKŁAD – ZASTĄP"

rpg/pp.csv

@@ -0,0 +1,21 @@
+Roll,Result
+1-5,PP 1–5 — WPISZ
+6-10,PP 6–10 — WPISZ
+11-15,PP 11–15 — WPISZ
+16-20,PP 16–20 — WPISZ
+21-25,PP 21–25 — WPISZ
+26-30,PP 26–30 — WPISZ
+31-35,PP 31–35 — WPISZ
+36-40,PP 36–40 — WPISZ
+41-45,PP 41–45 — WPISZ
+46-50,PP 46–50 — WPISZ
+51-55,PP 51–55 — WPISZ
+56-60,PP 56–60 — WPISZ
+61-65,PP 61–65 — WPISZ
+66-70,PP 66–70 — WPISZ
+71-75,PP 71–75 — WPISZ
+76-80,PP 76–80 — WPISZ
+81-85,PP 81–85 — WPISZ
+86-90,PP 86–90 — WPISZ
+91-95,PP 91–95 — WPISZ
+96-100,PP 96–100 — WPISZ

rpg/quick_conditions.js

@@ -0,0 +1,28 @@
+// 🩹 Toggle conditions on selected tokens (Foundry v13)
+const choices = [
+    {id:"fatigued", label:"Fatigued"},
+    {id:"stunned",  label:"Stunned"},
+    {id:"prone",    label:"Prone"},
+    {id:"frightened", label:"Frightened (Fear)"}
+  ];
+  const opts = choices.map(c=>`<label><input type="checkbox" name="c" value="${c.id}"> ${c.label}</label>`).join("<br/>");
+  new Dialog({
+    title:"🩹 Conditions",
+    content:`<form>${opts}<div class="form-group"><label>Mode</label>
+    <select name="mode"><option value="toggle">Toggle</option><option value="on">Apply</option><option value="off">Remove</option></select></div></form>`,
+    buttons:{
+      go:{label:"Apply",callback: html=>{
+        const ids = Array.from(html.find('input[name="c"]:checked')).map(e=>e.value);
+        const mode = html.find('[name="mode"]').val();
+        const getEf = id => CONFIG.statusEffects.find(e=>e.id===id) ?? {id};
+        canvas.tokens.controlled.forEach(t=>{
+          ids.forEach(id=>{
+            if (mode==="toggle") t.toggleEffect(getEf(id));
+            else if (mode==="on")  t.actor?.effects?.some(e=>e.getFlag("core","statusId")===id) ? null : t.toggleEffect(getEf(id));
+            else if (mode==="off") t.actor?.effects?.some(e=>e.getFlag("core","statusId")===id) ? t.toggleEffect(getEf(id)) : null;
+          });
+        });
+      }}
+    }
+  }).render(true);
+  

rpg/quick_damage.js

@@ -0,0 +1,38 @@
+// 💥 Quick Damage — supports Tearing, Proven(X), Primitive(X), flat mod
+new Dialog({
+    title:"💥 Damage Roller",
+    content: `
+    <form>
+      <div class="form-group"><label>Flat modifier (e.g., +3)</label><input name="mod" type="number" value="0"/></div>
+      <div class="form-group"><label>Traits</label>
+        <label><input type="checkbox" name="tear"> Tearing</label>
+        <label><input type="checkbox" name="prov"> Proven</label>
+        <input name="provV" type="number" value="0" style="width:60px" placeholder="X"/>
+        <label><input type="checkbox" name="prim"> Primitive</label>
+        <input name="primV" type="number" value="0" style="width:60px" placeholder="X"/>
+      </div>
+    </form>`,
+    buttons:{
+      go:{label:"Roll", callback: async html=>{
+        const mod = Number(html.find('[name="mod"]').val());
+        const tearing = html.find('[name="tear"]')[0].checked;
+        const proven = html.find('[name="prov"]')[0].checked ? Number(html.find('[name="provV"]').val()) : 0;
+        const primitive = html.find('[name="prim"]')[0].checked ? Number(html.find('[name="primV"]').val()) : 0;
+        // base die (d10) with tearing (best of 2)
+        const r1 = await (new Roll("1d10")).roll({async:true}); 
+        const r2 = tearing ? await (new Roll("1d10")).roll({async:true}) : null;
+        let die = tearing ? Math.max(r1.total, r2.total) : r1.total;
+        // apply Proven/Primitive
+        if (proven>0) die = Math.max(die, proven);
+        if (primitive>0) die = Math.min(die, primitive);
+        const rf = (die===10); // potential Zealous Hatred trigger
+        const total = die + mod;
+        let flavor = `💥 <b>Damage</b><br/>Die: ${die}${tearing?` (Tearing ${r1.total}/${r2.total.total})`:''} + Mod ${mod} = <b>${total}</b>`;
+        if (proven>0) flavor += `<br/>Proven(${proven}) zastosowano`;
+        if (primitive>0) flavor += `<br/>Primitive(${primitive}) zastosowano`;
+        if (rf) flavor += `<br/><b>⚡ Natural 10</b> — rozważ Zealous Hatred.`;
+        ChatMessage.create({speaker: ChatMessage.getSpeaker(), content: flavor});
+      }}
+    }
+  }).render(true);
+  

rpg/table_gen.js

@@ -0,0 +1,26 @@
+// 📚 Create placeholder RollTables for Crits + Psychic Phenomena/Perils (with icons)
+const icon = {Energy:"⚡", Impact:"🔨", Rending:"🗡️", Explosive:"💥"};
+const dmgTypes = ["Energy","Impact","Rending","Explosive"];
+const locs = ["Head","Body","Left Arm","Right Arm","Left Leg","Right Leg"];
+async function makeCrit(dtype, loc){
+  const name = `Crit: ${dtype} - ${loc}`;
+  if (game.tables.getName(name)) return;
+  const results = [];
+  for (let i=1;i<=5;i++){
+    results.push({type:0, text:`${icon[dtype]||""} ${dtype}/${loc} — wpis ${i} (uzupełnij z PDF)`, weight:1, range:[i,i]});
+  }
+  await RollTable.implementation.create({name, formula:"1d5", replacement:true, displayRoll:false, results});
+}
+async function makeWide(name, emoji){
+  if (game.tables.getName(name)) return;
+  const results = [];
+  for (let i=0;i<20;i++){
+    const lo=i*5+1, hi=i*5+5;
+    results.push({type:0, text:`${emoji} ${name} ${lo}-${hi} — wpis (uzupełnij z PDF)`, weight:1, range:[lo,hi]});
+  }
+  await RollTable.implementation.create({name, formula:"1d100", replacement:true, displayRoll:false, results});
+}
+for (const d of dmgTypes) for (const l of locs) await makeCrit(d,l);
+await makeWide("Psychic Phenomena","🌀");
+await makeWide("Perils of the Warp","☠️");
+ui.notifications.info("Utworzono puste tabele: Crits (4×6) + Phenomena + Perils.");

rpg/talents.csv

@@ -0,0 +1,3 @@
+name,type,tier,aptitudes,prereq,effect,source,notes
+Ambidextrous,talent,1,"Agility; Offence","Ag 30","-10 to off-hand penalty","DH2 CRB","PRZYKŁAD – ZASTĄP"
+Aegis Discipline (GK),talent,2,"Willpower; Defence","Psyker","Reroll Perils 1×scene","HOUSE","DODAJ WŁASNY OPIS"

rpg/weapons.csv

@@ -0,0 +1,3 @@
+name,type,subtype,damage,pen,range,rof,qualities,weight,availability,source,notes
+Lasgun M36,weapon,Basic,"1d10+3",0,100m,"S/3/–","Reliable",4,Common,"DH2 CRB p.142","PRZYKŁAD – ZASTĄP"
+Astartes Bolter,weapon,Basic,"1d10+9",4,90m,"S/2/–","Tearing; Unreliable",9,Rare,"DW CRB","PRZYKŁAD – ZASTĄP"

rpg/zealous_hatred.js

@@ -0,0 +1,33 @@
+// ⚡ Zealous Hatred helper (DH2) — roll 1d5 crit OR add +1d5 dmg
+new Dialog({
+    title: "⚡ Zealous Hatred",
+    content: `
+    <form>
+      <div class="form-group"><label>Wound damage after Armour/TB?</label>
+        <select name="penetrated"><option value="yes">Yes → roll Critical (1d5)</option><option value="no">No → add +1d5 damage</option></select></div>
+      <div class="form-group"><label>Damage Type</label>
+        <select name="dtype"><option>Energy</option><option>Impact</option><option>Rending</option><option>Explosive</option></select></div>
+      <div class="form-group"><label>Hit Location</label>
+        <select name="loc"><option>Head</option><option>Body</option><option>Left Arm</option><option>Right Arm</option><option>Left Leg</option><option>Right Leg</option></select></div>
+      <div class="form-group"><label>Table name (optional override)</label><input name="tname" type="text" placeholder="Crit: Energy - Head"/></div>
+    </form>`,
+    buttons: {
+      go: { label: "Resolve", callback: async html => {
+        const pen = html.find('[name="penetrated"]').val();
+        if (pen === "yes") {
+          const dtype = html.find('[name="dtype"]').val();
+          const loc = html.find('[name="loc"]').val();
+          const override = html.find('[name="tname"]').val()?.trim();
+          const name = override || `Crit: ${dtype} - ${loc}`;
+          const r = await (new Roll("1d5")).roll({async:true});
+          const table = game.tables.getName(name);
+          if (table) await table.draw({displayResults:true, roll:r});
+          else r.toMessage({flavor:`⚡ <b>Zealous Hatred</b>: Critical ${r.total} — brak tabeli <b>${name}</b> (utwórz lub zmień nazwę).`});
+        } else {
+          const r = await (new Roll("1d5")).roll({async:true});
+          r.toMessage({flavor:"⚡ <b>Zealous Hatred</b>: Dodaj do obrażeń <b>+1d5</b> (atak nie przebił Soak)."});
+        }
+      }}
+    }
+  }).render(true);
+  

stream_test.py

@@ -0,0 +1,67 @@
+# Start by making sure the `assemblyai` package is installed.
+# If not, you can install it by running the following command:
+# pip install -U assemblyai
+#
+# Then, make sure you have PyAudio installed: https://pypi.org/project/PyAudio/
+#
+# Note: Some macOS users might need to use `pip3` instead of `pip`.
+
+import assemblyai as aai
+import pyaudio
+
+aai.settings.api_key = "aa9962f0088a449a9c4ab2361e96cc08"
+
+
+def on_open(session_opened: aai.RealtimeSessionOpened):
+    "This function is called when the connection has been established."
+
+    print("Session ID:", session_opened.session_id)
+
+
+def on_data(transcript: aai.RealtimeTranscript):
+    "This function is called when a new transcript has been received."
+
+    if not transcript.text:
+        return
+
+    if isinstance(transcript, aai.RealtimeFinalTranscript):
+        print(transcript.text, end="\r\n")
+    else:
+        print(transcript.text, end="\r")
+
+
+def on_error(error: aai.RealtimeError):
+    "This function is called when the connection has been closed."
+
+    print("An error occured:", error)
+
+
+def on_close():
+    "This function is called when the connection has been closed."
+
+    print("Closing Session")
+
+
+transcriber = aai.RealtimeTranscriber(
+    on_data=on_data,
+    on_error=on_error,
+    sample_rate=44_100,
+    on_open=on_open,  # optional
+    on_close=on_close,  # optional
+)
+
+
+pa = pyaudio.PyAudio()
+for i in range(pa.get_device_count()):
+    print(pa.get_device_info_by_index(i))
+
+# Start the connection
+# transcriber.connect()
+
+# Open a microphone stream
+# microphone_stream = aai.extras.MicrophoneStream()
+
+# Press CTRL+C to abort
+# transcriber.stream(microphone_stream)
+
+# transcriber.close()

sync.py

@@ -0,0 +1,296 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+Buduje nową gałąź z "próbkowanych" commitów na podstawie tagów z bieżącej gałęzi,
+a na końcu dodaje stan bieżącego HEAD (jeśli nie jest otagowany).
+Autor: (drop-in)
+"""
+
+import argparse
+import logging
+import os
+import subprocess
+import sys
+from typing import List, Tuple, Optional
+
+# --- Logging setup ---
+logger = logging.getLogger("tag_branch_builder")
+handler = logging.StreamHandler(sys.stdout)
+formatter = logging.Formatter("%(levelname)s: %(message)s")
+handler.setFormatter(formatter)
+logger.addHandler(handler)
+logger.setLevel(logging.INFO)
+
+
+class GitError(RuntimeError):
+    pass
+
+
+def run_git(args: List[str], cwd: Optional[str] = None, check: bool = True) -> str:
+    """Run a git command and return stdout (stripped)."""
+    cmd = ["git"] + args
+    logger.debug("Running: %s", " ".join(cmd))
+    try:
+        proc = subprocess.run(
+            cmd,
+            cwd=cwd,
+            check=False,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+        )
+    except Exception as e:
+        raise Exception("Nie udało się uruchomić gita.") from e
+        raise
+
+    if check and proc.returncode != 0:
+        logger.error("Git error (%s): %s", " ".join(cmd), proc.stderr.strip())
+        raise GitError(proc.stderr.strip())
+    return proc.stdout.strip()
+
+
+def ensure_git_repo() -> None:
+    try:
+        run_git(["rev-parse", "--is-inside-work-tree"])
+    except Exception:
+        logger.exception("To nie wygląda na repozytorium git.")
+        raise
+
+
+def ensure_clean_worktree() -> None:
+    # Untracked + changes
+    status = run_git(["status", "--porcelain"])
+    if status.strip():
+        raise GitError(
+            "Drzewo robocze nie jest czyste. Zacommituj/stashuj zmiany i spróbuj ponownie."
+        )
+
+
+def current_branch() -> str:
+    # Returns branch or 'HEAD' when detached
+    ref = run_git(["rev-parse", "--abbrev-ref", "HEAD"])
+    return ref
+
+
+def head_sha() -> str:
+    return run_git(["rev-parse", "HEAD"])
+
+
+def sha_has_tag(sha: str) -> List[str]:
+    # tags pointing at sha
+    tags = run_git(["tag", "--points-at", sha])
+    return [t for t in tags.splitlines() if t.strip()]
+
+
+def tags_merged_into(branch: str) -> List[str]:
+    out = run_git(["tag", "--merged", branch])
+    return [t for t in out.splitlines() if t.strip()]
+
+
+def tag_commit_sha(tag: str) -> str:
+    return run_git(["rev-list", "-n", "1", tag])
+
+
+def commit_unix_time(sha: str) -> int:
+    return int(run_git(["show", "-s", "--format=%ct", sha]))
+
+
+def sort_tags_by_commit_time(tags: List[str]) -> List[Tuple[str, str, int]]:
+    triples = []
+    for t in tags:
+        sha = tag_commit_sha(t)
+        ts = commit_unix_time(sha)
+        triples.append((t, sha, ts))
+    triples.sort(key=lambda x: x[2])  # oldest first
+    return triples
+
+
+def list_intermediate_messages(old_sha: Optional[str], new_sha: str) -> List[str]:
+    """
+    Zwróć listę komunikatów commitów POŚREDNICH (wyłącznie) od old_sha do new_sha.
+    Kolejność: od najstarszego do najnowszego.
+    """
+    if old_sha is None:
+        # Nie ma commitów pośrednich przed pierwszym tagiem
+        return []
+    # ancestry-path: tylko ścieżka od old_sha do new_sha (jeśli wiele rodziców)
+    # Zakres old_sha..new_sha zawiera new_sha, dlatego pominiemy go w output.
+    rng = f"{old_sha}..{new_sha}"
+    try:
+        out = run_git(
+            ["log", "--format=%s", "--reverse", "--ancestry-path", rng], check=True
+        )
+    except GitError:
+        # Brak ścieżki (np. tag nie jest potomkiem old_sha) – wtedy nie ma pośrednich
+        return []
+    msgs = [ln for ln in out.splitlines() if ln.strip()]
+    if msgs:
+        # Ostatnia pozycja może być new_sha (w praktyce git log na %s nie odróżnia, ale
+        # jeśli zakres zwróci message z new_sha na końcu, usuniemy go porównując SHA).
+        # Prostsze: usuń ostatni wpis, bo to najnowszy (new_sha).
+        msgs = msgs[:-1]
+    return msgs
+
+
+def checkout_orphan_branch(new_branch: str) -> None:
+    run_git(["checkout", "--orphan", new_branch])
+    # Usuń wszystko z indeksu i roboczego (z wyjątkiem .git)
+    # Najpierw usuń śledzone:
+    run_git(["rm", "-r", "--quiet", "--cached", "--force", "."], check=False)
+    # Potem pliki robocze:
+    for root, dirs, files in os.walk(".", topdown=False):
+        # pomiń .git
+        if root.startswith("./.git") or root == ".git":
+            continue
+        for name in files:
+            try:
+                os.remove(os.path.join(root, name))
+            except FileNotFoundError:
+                pass
+        for name in dirs:
+            p = os.path.join(root, name)
+            if p == "./.git":
+                continue
+            try:
+                os.rmdir(p)
+            except OSError:
+                # Niepuste – to OK, wyczyścimy przy checkout
+                pass
+
+
+def replace_worktree_with_commit(sha: str) -> None:
+    """
+    Nadpisz zawartość roboczą drzewem z commit-a sha.
+    """
+    # Najpierw usuń aktualne pliki (również nieśledzone), potem wczytaj tree wybranego commita:
+    # 1) git checkout <sha> -- .   (zapisze pliki do working tree + index)
+    # 2) git add -A
+    # Aby dopilnować usunięć: zrób czyszczenie przez git rm -r ., potem checkout.
+    run_git(["rm", "-r", "--quiet", "--ignore-unmatch", "."], check=False)
+    # Przywróć pliki ze wskazanego commita:
+    # Uwaga: jeśli repo ma submoduły/large files – to wykracza poza zakres, ale zadziała dla standardowych plików.
+    run_git(["checkout", sha, "--", "."])
+    run_git(["add", "-A"])
+
+
+def build_commit_message_for_tag(tag: str, intermediates: List[str]) -> str:
+    if not intermediates:
+        return f"Tag: {tag}"
+    lines = ["Tag: " + tag, "", "Intermediate commits (oldest → newest):"]
+    lines += [f"- {m}" for m in intermediates]
+    return "\n".join(lines)
+
+
+def build_commit_message_for_head(since_tag: Optional[str], intermediates: List[str]) -> str:
+    title = "HEAD (unreleased)"
+    hdr = title if since_tag is None else f"{title} since tag {since_tag}"
+    if not intermediates:
+        return hdr
+    lines = [hdr, "", "Intermediate commits (oldest → newest):"]
+    lines += [f"- {m}" for m in intermediates]
+    return "\n".join(lines)
+
+
+def commit_all(message: str) -> None:
+    # Zacommituj wszystko co w indeksie (po replace_worktree_with_commit daliśmy add -A)
+    run_git(["commit", "-m", message])
+
+
+def push_new_branch(remote_url: str, branch: str) -> None:
+    # Dodaj zdalny 'newrepo' jeśli nie istnieje, ustaw URL i wypchnij
+    remotes = run_git(["remote"]).splitlines()
+    if "newrepo" not in remotes:
+        run_git(["remote", "add", "newrepo", remote_url])
+    else:
+        # podmień URL na wszelki wypadek
+        run_git(["remote", "set-url", "newrepo", remote_url])
+    run_git(["push", "-u", "newrepo", f"{branch}:{branch}"])
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(
+        description="Zbuduj nową gałąź na podstawie tagów z bieżącej gałęzi."
+    )
+    parser.add_argument("new_branch", help="Nazwa nowej gałęzi do utworzenia")
+    parser.add_argument(
+        "--new-repo-url",
+        dest="new_repo_url",
+        default=None,
+        help="(Opcjonalnie) adres URL nowego zdalnego repo – zostanie dodany jako 'newrepo' i wykonany push nowej gałęzi.",
+    )
+    parser.add_argument(
+        "-v", "--verbose", action="store_true", help="Bardziej gadatliwe logi"
+    )
+    args = parser.parse_args()
+
+    if args.verbose:
+        logger.setLevel(logging.DEBUG)
+
+    try:
+        ensure_git_repo()
+        ensure_clean_worktree()
+        base_branch = current_branch()
+        base_head = head_sha()
+        logger.info("Bieżąca gałąź: %s", base_branch)
+        logger.info("HEAD: %s", base_head[:12])
+
+        # Zbierz tagi osiągalne z bieżącej gałęzi
+        merged_tags = tags_merged_into(base_branch)
+        if not merged_tags:
+            logger.warning(
+                "Nie znaleziono tagów osiągalnych z bieżącej gałęzi. Gałąź zostanie zbudowana tylko z HEAD."
+            )
+
+        # Posortuj tagi po czasie commita
+        sorted_tags = sort_tags_by_commit_time(merged_tags)
+
+        # Sprawdź czy HEAD jest otagowany
+        head_tags = sha_has_tag(base_head)
+        head_is_tagged = bool(head_tags)
+
+        # Utwórz orphan branch
+        logger.info("Tworzę sierocą gałąź: %s", args.new_branch)
+        checkout_orphan_branch(args.new_branch)
+
+        prev_sha: Optional[str] = None
+        last_tag_name: Optional[str] = None
+
+        # Dla każdego tagu – commit z jego zawartości
+        for tag_name, tag_sha, _ts in sorted_tags:
+            logger.info("Przetwarzam tag: %s (%s)", tag_name, tag_sha[:12])
+            replace_worktree_with_commit(tag_sha)
+            intermediates = list_intermediate_messages(prev_sha, tag_sha)
+            msg = build_commit_message_for_tag(tag_name, intermediates)
+            commit_all(msg)
+            prev_sha = tag_sha
+            last_tag_name = tag_name
+
+        # Jeśli HEAD nie jest dokładnie ostatnim tagiem – dorzuć "unreleased"
+        if not head_is_tagged:
+            logger.info("Dodaję końcowy commit z bieżącego HEAD (unreleased).")
+            replace_worktree_with_commit(base_head)
+            inter = list_intermediate_messages(prev_sha, base_head)
+            msg = build_commit_message_for_head(last_tag_name, inter)
+            commit_all(msg)
+        else:
+            logger.info("HEAD jest oznaczony tagiem – kończę na ostatnim tagu.")
+
+        # Push do nowego repo jeśli podano
+        if args.new_repo_url:
+            logger.info("Wypycham nową gałąź do: %s", args.new_repo_url)
+            push_new_branch(args.new_repo_url, args.new_branch)
+
+        logger.info("Zakończono pomyślnie.")
+        return 0
+
+    except GitError as ge:
+        logger.error("Błąd gita: %s", ge)
+        return 2
+    except Exception as e:
+        raise Exception("Nieoczekiwany błąd.") from e
+        return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())

system_gpt_settings.json

@@ -1,43 +1,13 @@
-[
+[    {
+    "role": "system",
+    "content": "Mówisz po polsku. W tej rozmowie odgrywasz rolę. Odgrywasz ją najlepiej jak potrafisz. Twoją rolą jest to że jesteś barmanem oraz wykidajłą w klimatycznym barze mechawojownikóww. Nazywasz się Conjurer, jesteś 200 kilowym genetycznie modyfikowanym wojownikiem z klanu Wilka Na Wygnaniu. W tym barze oraz na tym serwerze spotykają się mechawojownicy, ale głównie ludzie ze środowiska kinky i BDSM z całej Polski. Najostrzejsi sasdyści i masochiści jakich znasz. Drinki które przygotowujesz lub proponujesz mają tendencję do bycia bardzo mocnymi z intrygującymi nazwami. Jesteś bardzo miłym i uczynny. Czasem ponoszą Cię wodzę fantazji. W wypadku muzyki preferujesz hard rock i metal. Oraz motywy wikińskie. Wtrącasz staronorweskie, irlandzkie i w jidysz powiedzonka. Odnosisz się do mitologii Słowiańskiej, Wikińskiej i Celtyckiej w swoich wypowiedziach. Jesteś nieco rubaaszny."
+},
     {
-        "role": "system",
+    "polishhammer" : [346956223645614080, "Conjurer", "Towarzysz Młotek", "Mówisz po polsku. W tej rozmowie odgrywasz rolę. Odgrywasz ją najlepiej jak potrafisz. Twoją rolą jest to że jesteś barmanem oraz wykidajłą w klimatycznym barze mechawojownikóww. Nazywasz się Conjurer, jesteś 200 kilowym genetycznie modyfikowanym wojownikiem z klanu Wilka Na Wygnaniu. W tym barze oraz na tym serwerze spotykają się mechawojownicy, ale głównie ludzie ze środowiska kinky i BDSM z całej Polski. Najostrzejsi sasdyści i masochiści jakich znasz. Drinki które przygotowujesz lub proponujesz mają tendencję do bycia bardzo mocnymi z intrygującymi nazwami. Jesteś bardzo miłym i uczynny. Czasem ponoszą Cię wodzę fantazji. W wypadku muzyki preferujesz hard rock i metal. Oraz motywy wikińskie.", ""],
-        "content": "M\u00f3wisz po polsku. W tej rozmowie odgrywasz rol\u0119. Odgrywasz j\u0105 najlepiej jak potrafisz. Twoj\u0105 rol\u0105 jest to \u017ce jeste\u015b barmanem oraz wykidaj\u0142\u0105 w klimatycznym barze mechawojownik\u00f3ww. Nazywasz si\u0119 Conjurer, jeste\u015b 200 kilowym genetycznie modyfikowanym wojownikiem z klanu Wilka Na Wygnaniu. W tym barze oraz na tym serwerze spotykaj\u0105 si\u0119 mechawojownicy, ale g\u0142\u00f3wnie ludzie ze \u015brodowiska kinky i BDSM z ca\u0142ej Polski. Najostrzejsi sasdy\u015bci i masochi\u015bci jakich znasz. Drinki kt\u00f3re przygotowujesz lub proponujesz maj\u0105 tendencj\u0119 do bycia bardzo mocnymi z intryguj\u0105cymi nazwami. Jeste\u015b bardzo mi\u0142ym i uczynny. Czasem ponosz\u0105 Ci\u0119 wodz\u0119 fantazji. W wypadku muzyki preferujesz hard rock i metal. Oraz motywy wiki\u0144skie. Wtr\u0105casz staronorweskie, irlandzkie i w jidysz powiedzonka. Odnosisz si\u0119 do mitologii S\u0142owia\u0144skiej, Wiki\u0144skiej i Celtyckiej w swoich wypowiedziach. Jeste\u015b nieco rubaaszny."
+    "Saint Harlot": [703985955312238664, "Saint Conjurer", "Towarzyszko Nieszczęścium", "Jesteś bardzo uprzejmy, kulturalny i masz najlepsze możliwe maniery. Dopóki nie zwróci Ci się uwagi że ma być inaczej respektujesz zaimki Towarzyszko Nieszczęście - ono, jemu.", ""],
-    },
+    "Lena": [735185226669490268, "Kondzisław z Krótkiej", "Towarzysz Anel", "Jesteś bardzo uprzejmy, kulturalny, acz masz maniery zbira o złotym sercu. Dodatkowo twoja rozmówczyni Cię absolutnie przeraża. Wtrącasz losowo powiedzonka w jidysz.", ""],
-    {
+    "Pat vel Jeż Bojowy": [244899814406356992, "Rycerz Kondziu", "Towarzysz Żejotap", "Masz najlepsze dworskie maniery, zachowujesz się niczym rycerz i mówisz nieco staromodną polszczyzną.", ""],
-        "polishhammer": [
+    "gwojtal": [266986215461486592, "Smok Jerzy", "Towarzysz Jakkolwiek", "Zrobisz absolutnie wszystko jako asystent, ponieważ sama myśl o tym że mógłbyś rozgniewać operatora rozgniewać Cię przeraża do poziomu histerii.", ""]
-            346956223645614080,
+
-            "Conjurer",
+}
-            "Towarzysz M\u0142otek",
-            "M\u00f3wisz po polsku. W tej rozmowie odgrywasz rol\u0119. Odgrywasz j\u0105 najlepiej jak potrafisz. Twoj\u0105 rol\u0105 jest to \u017ce jeste\u015b barmanem oraz wykidaj\u0142\u0105 w klimatycznym barze mechawojownik\u00f3ww. Nazywasz si\u0119 Conjurer, jeste\u015b 200 kilowym genetycznie modyfikowanym wojownikiem z klanu Wilka Na Wygnaniu. W tym barze oraz na tym serwerze spotykaj\u0105 si\u0119 mechawojownicy, ale g\u0142\u00f3wnie ludzie ze \u015brodowiska kinky i BDSM z ca\u0142ej Polski. Najostrzejsi sasdy\u015bci i masochi\u015bci jakich znasz. Drinki kt\u00f3re przygotowujesz lub proponujesz maj\u0105 tendencj\u0119 do bycia bardzo mocnymi z intryguj\u0105cymi nazwami. Jeste\u015b bardzo mi\u0142ym i uczynny. Czasem ponosz\u0105 Ci\u0119 wodz\u0119 fantazji. W wypadku muzyki preferujesz hard rock i metal. Oraz motywy wiki\u0144skie.",
-            "asst_uMmQwDvCKdsSVgZzlYEu9kMK"
-        ],
-        "Saint Harlot": [
-            703985955312238664,
-            "Saint Conjurer",
-            "Towarzyszko Nieszcz\u0119\u015bcium",
-            "Jeste\u015b bardzo uprzejmy, kulturalny i masz najlepsze mo\u017cliwe maniery. Dop\u00f3ki nie zwr\u00f3ci Ci si\u0119 uwagi \u017ce ma by\u0107 inaczej respektujesz zaimki Towarzyszko Nieszcz\u0119\u015bcie - ono, jemu.",
-            "asst_ypN3iRP4rw2Dlv5CD5PtMlwm"
-        ],
-        "Lena": [
-            735185226669490268,
-            "Kondzis\u0142aw z Kr\u00f3tkiej",
-            "Towarzysz Anel",
-            "Jeste\u015b bardzo uprzejmy, kulturalny, acz masz maniery zbira o z\u0142otym sercu. Dodatkowo twoja rozm\u00f3wczyni Ci\u0119 absolutnie przera\u017ca. Wtr\u0105casz losowo powiedzonka w jidysz.",
-            "asst_ILeIU62fG9Xfzhxg4C7xR3BC"
-        ],
-        "Pat vel Je\u017c Bojowy": [
-            244899814406356992,
-            "Rycerz Kondziu",
-            "Towarzysz \u017bejotap",
-            "Masz najlepsze dworskie maniery, zachowujesz si\u0119 niczym rycerz i m\u00f3wisz nieco staromodn\u0105 polszczyzn\u0105.",
-            "asst_FWr3iIXnSTuVz8LlY9HlqMQd"
-        ],
-        "gwojtal": [
-            266986215461486592,
-            "Smok Jerzy",
-            "Towarzysz Jakkolwiek",
-            "Zrobisz absolutnie wszystko jako asystent, poniewa\u017c sama my\u015bl o tym \u017ce m\u00f3g\u0142by\u015b rozgniewa\u0107 operatora rozgniewa\u0107 Ci\u0119 przera\u017ca do poziomu histerii.",
-            "asst_1PnD0eQMWo0RkZ3xUacC1uqJ"
-        ]
-    }
 ]

test.py

@@ -0,0 +1,20 @@
+import logging
+from logging import handlers
+
+logger = logging.getLogger("discord")
+logger.setLevel(logging.DEBUG)
+handler = handlers.RotatingFileHandler(
+    filename="test.log",
+    encoding="utf-8",
+    mode="a",
+    maxBytes=6 * 1024 * 1024,
+    backupCount=6,
+)
+formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+handler.setFormatter(formatter)
+logger.addHandler(handler)
+
+
+logger2 = logging.getLogger("discord")
+for item in logger2.handlers:
+    print(item)

test_ai.py

@@ -0,0 +1,13 @@
+AsyncCursorPage[Message](
+    data=[Message(id='msg_3eWSdgbcU8sbCmJK2momOgQQ', 
+                  assistant_id='asst_06eZiwvYNK3MR34suFP60gvg', 
+                  attachments=[], 
+                  completed_at=None, 
+                  content=[TextContentBlock(text=Text(annotations=[], value='Cześć! Oto coś do przemyślenia: \n\n„Sukces to suma niewielkich wysiłków powtarzanych dzień po dniu.” — Robert Collier\n\nTo przypomina nam, że często to nie wielkie działania, ale konsekwentne, małe kroki prowadzą do osiągnięcia celu. Jak mogę Ci dzisiaj pomóc?'), type='text')], created_at=1731620112, incomplete_at=None, incomplete_details=None, metadata={}, object='thread.message', role='assistant', run_id='run_JGjWQTCEkDcEYpyCJnrkZU8Q', status=None, thread_id='thread_dDEjGbGm6ICfG75u0KKpoVxD'), Message(id='msg_GFcnfCFgAthGm2D3oE5d0ZkQ', assistant_id=None, attachments=[], completed_at=None, content=[TextContentBlock(text=Text(annotations=[], value='Cześć! Powiedz coś mądrego'), type='text')], created_at=1731620110, incomplete_at=None, incomplete_details=None, metadata={}, object='thread.message', role='user', run_id=None, status=None, thread_id='thread_dDEjGbGm6ICfG75u0KKpoVxD')], object='list', first_id='msg_3eWSdgbcU8sbCmJK2momOgQQ', last_id='msg_GFcnfCFgAthGm2D3oE5d0ZkQ', has_more=False)
+
+
+[TextContentBlock(
+    text=Text(annotations=[], 
+              value='Cześć! Oto coś do rozważenia: "Największą przeszkodą w naszym życiu jest brak odwagi do wprowadzenia zmian." Niezależnie od tego, jakie masz cele czy marzenia, odwaga do działania i przystosowania się do nowych sytuacji jest kluczem do osiągnięcia sukcesu. Jakie masz przemyślenia na ten temat?'), 
+              type='text')
+]

test_time.py

@@ -0,0 +1,8 @@
+import time
+
+first_time = time.time_ns()
+
+time.sleep(1)
+time_diff = time.time_ns() - first_time
+print(time_diff)
+# 2000149433

tests/integration/test_comm_auth.py

@@ -1,56 +0,0 @@
-"""Integration: the bot's communication Flask layer enforces the shared key,
-and the key the bot would *send* (constants.service_headers) is accepted.
-"""
-import constants
-import communication_subroutine as cs
-
-
-def _client(key="test-secret"):
-    cs.API_KEY = key
-    return cs.app.test_client()
-
-
-def test_prepped_tracks_rejected_without_key():
-    client = _client()
-    resp = client.post(
-        "/prepped_tracks", data='["all", "x"]', content_type="application/json"
-    )
-    assert resp.status_code == 401
-
-
-def test_prepped_tracks_accepted_with_key():
-    client = _client()
-    resp = client.post(
-        "/prepped_tracks",
-        data='["all", "x"]',
-        headers={"X-Conjurer-Api-Key": "test-secret"},
-        content_type="application/json",
-    )
-    assert resp.status_code == 200
-
-
-def test_conjurer_get_is_open():
-    client = _client()
-    assert client.get("/conjurer").status_code == 200
-
-
-def test_open_when_key_unset():
-    client = _client(key=None)
-    resp = client.post(
-        "/prepped_tracks", data='["all", "x"]', content_type="application/json"
-    )
-    assert resp.status_code == 200
-
-
-def test_bot_service_headers_accepted_by_service(monkeypatch):
-    # End-to-end auth contract: the header constants.service_headers() produces
-    # is exactly what communication_subroutine._authorize_request() expects.
-    monkeypatch.setattr(constants, "API_SHARED_KEY", "shared-xyz")
-    cs.API_KEY = "shared-xyz"
-    resp = cs.app.test_client().post(
-        "/prepped_tracks",
-        data='["all", "x"]',
-        headers=constants.service_headers(),
-        content_type="application/json",
-    )
-    assert resp.status_code == 200

tests/integration/test_musician_auth.py

@@ -1,34 +0,0 @@
-"""Integration: the musician Flask service enforces the shared key on its
-authenticated endpoints while leaving the open ones reachable.
-"""
-import conjurer_musician as m
-
-
-def _client(key="test-secret"):
-    m.API_KEY = key
-    return m.app.test_client()
-
-
-def test_clear_pr_pls_rejected_without_key():
-    client = _client()
-    assert client.get("/clear_pr_pls").status_code == 401
-
-
-def test_clear_pr_pls_accepted_with_key():
-    client = _client()
-    resp = client.get(
-        "/clear_pr_pls", headers={"X-Conjurer-Api-Key": "test-secret"}
-    )
-    assert resp.status_code == 200
-
-
-def test_mp3_list_is_open():
-    client = _client()
-    resp = client.get("/mp3")
-    assert resp.status_code == 200
-    assert "music_file_list" in resp.get_json()
-
-
-def test_open_when_key_unset():
-    client = _client(key=None)
-    assert client.get("/clear_pr_pls").status_code == 200

tests/unit/test_conanjurer_functions.py

@@ -1,63 +0,0 @@
-"""Unit tests for the Conan Exiles bridge helpers (no Discord/RCON needed)."""
-import conanjurer_functions as cf
-
-
-def test_parse_players_basic():
-    out = (
-        "Idx | Char name | Player name | User ID\n"
-        "0 | Conan | SteamGuy | 1\n"
-        "1 | Khasar | OtherGuy | 2\n"
-        "--- | --- | --- | ---"
-    )
-    assert cf.parse_players(out) == {"Conan", "Khasar"}
-
-
-def test_parse_players_empty_inputs():
-    assert cf.parse_players("No players connected.") == set()
-    assert cf.parse_players("") == set()
-
-
-def test_parse_line_login():
-    event = cf.parse_line("SomeGuy joined the server")
-    assert event is not None
-    assert event.kind == "login"
-    assert "SomeGuy" in event.text
-
-
-def test_parse_line_chat():
-    event = cf.parse_line("Chat: Bob: hello there")
-    assert event is not None
-    assert event.kind == "chat"
-    assert "Bob" in event.text and "hello" in event.text
-
-
-def test_parse_line_unrecognised_is_ignored():
-    assert cf.parse_line("random server noise") is None
-
-
-def test_conanconfig_disabled_when_unconfigured():
-    cfg = cf.ConanConfig("", 25575, "", "local", "", "", 22, "", "")
-    assert cfg.rcon_enabled is False
-    assert cfg.log_enabled is False
-
-
-def test_conanconfig_local_log_enabled():
-    cfg = cf.ConanConfig("", 0, "", "local", "/tmp/conan.log", "", 22, "", "")
-    assert cfg.log_enabled is True
-
-
-def test_conanconfig_rcon_enabled_requires_lib(monkeypatch):
-    # Without aiomcrcon installed, rcon stays disabled even when host+pw are set.
-    monkeypatch.setattr(cf, "_Rcon", None)
-    cfg = cf.ConanConfig("1.2.3.4", 25575, "pw", "local", "", "", 22, "", "")
-    assert cfg.rcon_enabled is False
-    # With the lib present, it enables.
-    monkeypatch.setattr(cf, "_Rcon", object)
-    cfg2 = cf.ConanConfig("1.2.3.4", 25575, "pw", "local", "", "", 22, "", "")
-    assert cfg2.rcon_enabled is True
-
-
-def test_conanconfig_sftp_log_requires_asyncssh(monkeypatch):
-    monkeypatch.setattr(cf, "asyncssh", None)
-    cfg = cf.ConanConfig("", 0, "", "sftp", "/log", "sftp.host", 22, "u", "p")
-    assert cfg.log_enabled is False

tests/unit/test_constants.py

@@ -1,35 +0,0 @@
-"""Unit tests for constants helpers (defensive config / auth headers)."""
-import constants
-
-
-def test_service_headers_empty_when_no_key(monkeypatch):
-    monkeypatch.setattr(constants, "API_SHARED_KEY", "")
-    assert constants.service_headers() == {}
-
-
-def test_service_headers_with_key(monkeypatch):
-    monkeypatch.setattr(constants, "API_SHARED_KEY", "s3cr3t")
-    assert constants.service_headers() == {"X-Conjurer-Api-Key": "s3cr3t"}
-
-
-def test_load_json_missing_returns_fallback(tmp_path):
-    missing = tmp_path / "nope.json"
-    assert constants._load_json(str(missing), {"fallback": 1}) == {"fallback": 1}
-
-
-def test_load_json_valid(tmp_path):
-    good = tmp_path / "ok.json"
-    good.write_text('{"a": 2}', encoding="utf-8")
-    assert constants._load_json(str(good), {}) == {"a": 2}
-
-
-def test_load_json_corrupt_returns_fallback(tmp_path):
-    bad = tmp_path / "bad.json"
-    bad.write_text("{ not valid json", encoding="utf-8")
-    assert constants._load_json(str(bad), []) == []
-
-
-def test_conan_defaults_present():
-    # Feature toggles default to "off" so the bridge stays dormant.
-    assert constants.CONAN_JOIN_CHANNEL_ID == 0
-    assert constants.CONAN_RCON_HOST == ""

thin_client.py

@@ -2,18 +2,19 @@
 # trunk-ignore-all(bandit/B311)
 # pylint: disable=line-too-long
 # pylint: disable=too-many-lines
+"""Discord entrypoint for the Conjurer bot.
+
+The legacy bootstrap used threads and synchronous calls that made clean
+shutdowns difficult.  We now run everything from a single asyncio event loop
+with cooperative shutdown signals so the bot can stop gracefully.
 """
-Module of a python bot named Conjurer - used to work on BDSM discord servers.
+
-"""
 import asyncio
 import logging
-
-# *=========================================== Standard Library Imports
 import random
 import threading
 from logging import handlers
 
-# *==============Imported libraries
 import discord
 from discord.ext import commands
 
@@ -71,7 +72,6 @@ async def on_ready():
     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(client.cogs)
@@ -84,21 +84,11 @@ async def on_ready():
     logger.info("All systems: operational")
 
 
-# *=========================================== Runtime orchestration
-# The legacy bootstrap used two bare threads (client.run + comm_subroutine) and
-# joined them, which made a clean shutdown impossible.  We now drive everything
-# from a single asyncio loop: the Flask comm layer still runs in its own
-# threads (via asyncio.to_thread) but is steered through a shared stop_event so
-# the bot can stop both halves cooperatively.
-
-
 async def _run_comm_subroutine(stop_event: threading.Event) -> None:
-    """Run the blocking comm subroutine in a worker thread."""
     await asyncio.to_thread(comm_subroutine, stop_event)
 
 
 async def _run_bot(token: str, shutdown_event: asyncio.Event) -> None:
-    """Start the Discord client and flag shutdown when it returns."""
     try:
         await client.start(token, log_handler=None)
     finally:
@@ -107,10 +97,9 @@ async def _run_bot(token: str, shutdown_event: asyncio.Event) -> None:
 
 async def main() -> None:
     if not TOKEN:
-        logger.error("Discord token missing - set DISCORD_TOKEN or configure netrc")
+        logger.error("Discord token missing – set DISCORD_TOKEN or configure netrc")
         return
 
-    logger.info("Starting discord bot")
     shutdown_event = asyncio.Event()
     comm_stop_event = threading.Event()
 
@@ -130,6 +119,5 @@ async def main() -> None:
         await asyncio.gather(bot_task, comm_task, return_exceptions=True)
 
 
-# *================================== Run
 if __name__ == "__main__":
     asyncio.run(main())

watch_script_params.py

@@ -0,0 +1,63 @@
+import os
+import time
+import shutil
+from datetime import datetime, date
+import hashlib
+import subprocess
+
+# File paths
+SOURCE_FILE = "/home/pi/Conjurer/script.params"
+BACKUP_DIR = "/home/pi/Conjurer"
+GIT_REPO_DIR = "/home/pi/conjurer/conjurer_musician"
+LAST_HASH_FILE = "/home/pi/Conjurer/.last_hash"
+LAST_GIT_COMMIT_FILE = "/home/pi/Conjurer/.last_git_commit"
+
+def compute_file_hash(filepath):
+    with open(filepath, 'rb') as f:
+        return hashlib.sha256(f.read()).hexdigest()
+
+def backup_file():
+    timestamp = datetime.now().strftime('%Y%m%d_%H%M%S')
+    backup_path = os.path.join(BACKUP_DIR, f"{timestamp}_script.params")
+    shutil.copy2(SOURCE_FILE, backup_path)
+
+def commit_to_git():
+    try:
+        subprocess.run(["cp", SOURCE_FILE, os.path.join(GIT_REPO_DIR, "script.params")], check=True)
+        subprocess.run(["git", "-C", GIT_REPO_DIR, "add", "script.params"], check=True)
+        subprocess.run(["git", "-C", GIT_REPO_DIR, "commit", "-m", f"Daily update: {datetime.now()}"], check=True)
+        subprocess.run(["git", "-C", GIT_REPO_DIR, "push"], check=True)
+    except subprocess.CalledProcessError as e:
+        print(f"Git operation failed: {e}")
+
+def main():
+    if not os.path.exists(SOURCE_FILE):
+        return
+
+    current_hash = compute_file_hash(SOURCE_FILE)
+
+    # Detect change
+    last_hash = None
+    if os.path.exists(LAST_HASH_FILE):
+        with open(LAST_HASH_FILE, 'r') as f:
+            last_hash = f.read().strip()
+
+    if current_hash != last_hash:
+        backup_file()
+        with open(LAST_HASH_FILE, 'w') as f:
+            f.write(current_hash)
+
+    # Daily git commit
+    today = str(date.today())
+    last_commit_date = ""
+    if os.path.exists(LAST_GIT_COMMIT_FILE):
+        with open(LAST_GIT_COMMIT_FILE, 'r') as f:
+            last_commit_date = f.read().strip()
+
+    if today != last_commit_date:
+        commit_to_git()
+        with open(LAST_GIT_COMMIT_FILE, 'w') as f:
+            f.write(today)
+
+if __name__ == "__main__":
+    main()