finally fixed the bug

,

.dockerignore

@@ -1,32 +0,0 @@
-# Python
-__pycache__
-*.py[cod]
-*.pyo
-*.pyd
-*.so
-
-# VCS/CI
-.git
-.gitignore
-.gitattributes
-.github
-
-# Editor
-.vscode
-.idea
-
-# Python tooling
-.pytest_cache
-.mypy_cache
-.ruff_cache
-.tox
-dist
-build
-*.egg-info
-
-# Local assets
-logs
-music
-data
-*.env
-*.env.*

.gitignore

@@ -201,4 +201,3 @@ cr_results.json
 not_in_db.json
 rr_results.json
 s_results.json
-*.bak

README.md

@@ -1,23 +1,2 @@
 # 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.

ai_commands.py

@@ -132,7 +132,6 @@ class Events(commands.Cog):
             await discord_friendly_send(channel, message_txt)
         await discord_friendly_reply(ctx, "Poszło")
 
-    #TODO: NOT IMPLEMENTED YET
     @commands.Cog.listener(name="dodaj_do_bazy_wiedzy")
     async def dodaj_do_bazy_wiedzy(self, ctx):
         for superfryta in SPECJALNE_ZIEMNIACZKI.values():
@@ -141,7 +140,6 @@ class Events(commands.Cog):
                 return
         await ctx.reply("Tylko członkowie Armii Hammera mogą używać. Nie jesteś jednym z nich")
 
-    #TODO: NOT IMPLEMENTED YET
     @commands.Cog.listener(name="listuj_baze_wiedzy")
     async def listuj_baze_wiedzy(self, ctx):
         for superfryta in SPECJALNE_ZIEMNIACZKI.values():
@@ -150,7 +148,6 @@ class Events(commands.Cog):
                 return
         await ctx.reply("Tylko członkowie Armii Hammera mogą używać. Nie jesteś jednym z nich")
 
-    #TODO: NOT IMPLEMENTED YET
     @commands.Cog.listener(name="usun_z_bazy_wiedzy")
     async def usun_z_bazy_wiedzy(self, ctx):
         for superfryta in SPECJALNE_ZIEMNIACZKI.values():
@@ -159,7 +156,6 @@ class Events(commands.Cog):
                 return
         await ctx.reply("Tylko członkowie Armii Hammera mogą używać. Nie jesteś jednym z nich")
 
-    #TODO: NOT IMPLEMENTED YET
     @commands.Cog.listener(name="przetworz_plik_linia_po_linii")
     async def przetworz_plik_linia_po_linii(self, ctx):
         for superfryta in SPECJALNE_ZIEMNIACZKI.values():
@@ -268,7 +264,7 @@ class Events(commands.Cog):
 
         if kondziu_mentioned or "conjurer:" in message_content_lower:
             async with channel.typing():
-                self.logger.info("Procedura chatu")
+                self.logger.debug("Procedura chatu")
 
                 message_content_lower = message_content_lower.replace("conjurer: ", "")
                 if message.author.nick:
@@ -294,10 +290,15 @@ class Events(commands.Cog):
                     bartender,
                     MESSAGE_TABLE,
                     username,
-                    "GENERAL",
+                    "CONVERSATION",
                 )
 
-                await discord_friendly_reply(message, result)
+                if len(result) < 999:
+                    await message.reply(result)
+                else:
+                    while len(result) > 999:
+                        await message.reply(result[:999])
+                        result = result[999:]
         if "imaginuje sobie:" in message.content:
             async with channel.typing():
                 self.logger.info("Poczatek procedury obrazkowej")
@@ -332,7 +333,7 @@ class Events(commands.Cog):
                         True,
                         MESSAGE_TABLE,
                         username,
-                        "GENERAL",
+                        "RANDOM",
                     )
                     await discord_friendly_reply(
                         message, f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
@@ -364,34 +365,20 @@ class Events(commands.Cog):
                     image_desc = response.data[0].revised_prompt
                     self.logger.debug("Wynikowy obrazek pod url: %s", image_url)
                     response = requests.get(image_url, timeout=360)
+
+
                     temp_file_name = message.content + ".png"
                     temp_file_name = GRAPHICS_PATH + message.content + ".png"
                     num = 0
                     while (Path(temp_file_name)).exists():
                         temp_file_name = GRAPHICS_PATH + message.content + str(num) +  ".png"
                         num += 1
-                    try:
-                       with open(temp_file_name, "wb") as dalle_file:
-                           dalle_file.write(response.content)
-                    except OSError:
-                       temp_file_name = "/home/pi/oserror.png"
-                       with open(temp_file_name, "wb") as dalle_file:
-                           dalle_file.write(response.content)
-                    except FileNotFoundError:
-                       temp_file_name = "/home/pi/fnferror.png"
-                       with open(temp_file_name, "wb") as dalle_file:
-                           dalle_file.write(response.content)
-                    except Exception as e:
-                        self.logger.error("Nieznany błąd: %s", e)
-                        temp_file_name = "/home/pi/error.png"
-                        with open(temp_file_name, "wb") as dalle_file:
-                            dalle_file.write(response.content)
-                    finally:
-                        self.logger.info("Koniec procedury obrazkowej.")
-                        fnord = discord.File(
-                            temp_file_name, spoiler=False, description=message.content
-                        )
-
+                    with open(temp_file_name, "wb") as dalle_file:
+                        dalle_file.write(response.content)
+                    self.logger.info("Koniec procedury obrazkowej.")
+                    fnord = discord.File(
+                        temp_file_name, spoiler=False, description=message.content
+                    )
                 #await message.reply(f"{image_desc}", file=fnord)
                 await discord_friendly_reply(message,f"{image_desc}", file = fnord)
 # *=========================================== Define Functions

ai_functions.py

@@ -5,7 +5,6 @@ import random
 
 import openai
 import tiktoken
-import time
 from other_functions import discord_friendly_send
 from constants import (
     ASSISTANTS,
@@ -19,67 +18,18 @@ from constants import (
     OPENAICLIENT,
     SYSTEM_GPT_SETTINGS,
     WORD_REACTIONS,
-    CHEAP_MODEL,
-    LATEST_MODEL
 )
 
-# this do per user
+#this do per user
 VECTOR_STORE_ID = -1
-def select_model(req_type: str, algo: str) -> str:
-    # Jeżeli jawnie podano algorithm (i nie jest 'auto'/''):
-    if algo and str(algo).strip().lower() not in ("auto",):
-        # wyjątek: MUZYKA ma zawsze być tania — nadpisujemy TYLKO jeśli przyszedł domyślny 'gpt-4o'
-        if req_type == "MUSIC" and algo.strip() in (LATEST_MODEL,):
-            return CHEAP_MODEL
-        return algo
-    # Auto-dobór:
-    if req_type == "MUSIC":
-        return CHEAP_MODEL
-    return LATEST_MODEL
-
-
-async def openai_call(messages, model, temperature=0.2):
-    """
-    Responses API dla 4o/4.1*, fallback Chat Completions dla gpt-3.5-turbo.
-    Zwraca czysty string odpowiedzi.
-    """
-    logger = logging.getLogger("discord")
-
-    if model.startswith("gpt-3.5"):
-        logger.info("3.5")
-        # legacy path – bez zmian w Twoim kodzie wyżej/niżej
-        resp = await OPENAICLIENT.chat.completions.create(
-            model=model,
-            messages=messages,
-            temperature=temperature,
-        )
-        result = ""
-        for choice in resp.choices:
-            result += choice.message.content
-        return result.strip()
-
-    else:
-        logger.info("4.0+")
-        # Responses API (zalecane dla 4o/4.1*)
-        resp = await OPENAICLIENT.responses.create(
-            model=model,
-            temperature=temperature,
-            input=messages,
-        )
-        # SDK zapewnia output_text dla zwykłych odpowiedzi
-        return (getattr(resp.output_text, "output_text", None) or "").strip() or str(
-            resp.output_text
-        )
-
 
 def create_vector_store():
     # Create a vector store caled "Financial Statements"
     return OPENAICLIENT.beta.vector_stores.create_and_poll(name="Hammer Stash")
-    # expires_after={
-    # "anchor": "last_active_at",
-    # "days": 7}
-    # )
-
+    #expires_after={
+    #"anchor": "last_active_at",
+    #"days": 7}
+    #)
 
 def upload_files_to_vector_store(assistant):
 
@@ -87,14 +37,15 @@ def upload_files_to_vector_store(assistant):
     file_paths = ["edgar/goog-10k.pdf", "edgar/brka-10k.txt"]
     file_streams = [open(path, "rb") for path in file_paths]
 
-    # file = client.beta.vector_stores.files.create_and_poll(
-    # vector_store_id="vs_abc123",
-    # file_id="file-abc123"
-    # )
-    # batch = client.beta.vector_stores.file_batches.create_and_poll(
-    # vector_store_id="vs_abc123",
-    # file_ids=['file_1', 'file_2', 'file_3', 'file_4', 'file_5']
-    # )
+    #file = client.beta.vector_stores.files.create_and_poll(
+    #vector_store_id="vs_abc123",
+    #file_id="file-abc123"
+    #)
+    #batch = client.beta.vector_stores.file_batches.create_and_poll(
+    #vector_store_id="vs_abc123",
+    #file_ids=['file_1', 'file_2', 'file_3', 'file_4', 'file_5']
+    #)
+
 
     # Use the upload and poll SDK helper to upload the files, add them to the vector store,
     # and poll the status of the file batch for completion.
@@ -106,11 +57,10 @@ def upload_files_to_vector_store(assistant):
     print(file_batch.status)
     print(file_batch.file_counts)
     assistant = OPENAICLIENT.beta.assistants.update(
-        assistant_id=assistant.id,
-        tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
+    assistant_id=assistant.id,
+    tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
     )
 
-
 def delete_files_from_vector_store(assistant, file_id):
     result = OPENAICLIENT.beta.vector_stores.file_batches.delete(
         vector_store_id=VECTOR_STORE_ID, files=file_id
@@ -119,8 +69,8 @@ def delete_files_from_vector_store(assistant, file_id):
     # You can print the status and the file counts of the batch to see the result of this operation.
     print(result)
     assistant = OPENAICLIENT.beta.assistants.update(
-        assistant_id=assistant.id,
-        tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
+    assistant_id=assistant.id,
+    tool_resources={"file_search": {"vector_store_ids": [VECTOR_STORE_ID]}},
     )
 
 
@@ -149,15 +99,7 @@ def num_tokens_from_string(message, model):
 
 
 async def handle_response(
-    prompt,
-    vykidailo,
-    bartender,
-    history,
-    username,
-    request_type,
-    algorithm="gpt-4o",
-    none_request="",
-    internal_retry: bool = False
+    prompt, vykidailo, bartender, history, username, request_type
 ):
     """
     Handle responses by appending them to a history, use OpenAI to
@@ -173,165 +115,182 @@ async def handle_response(
     :param music: The "music" parameter is a boolean value that indicates whether the conversation is
     related to music or not. If it is True, the conversation history will be stored in a different file
     and the response will be generated using a different model
-    :param request_type: The type of request being made, which can be "MUSIC", "RANDOM", "NONE" or "GENERAL"
-        GENERAL is for regular conversations, MUSIC is for music-related requests,
-        RANDOM is for random requests, and NONE is to not store the request in memory
-    :param algorithm: The algorithm to be used for generating the response, default is "gpt-4o"
     :return: The function `handle_response` returns a tuple containing the `result` and `MESSAGE_TABLE`.
     """
     logger = logging.getLogger("discord")
     logger.info("Wywolanie procedury openai z promptem: %s", prompt)
+    temp = {"role": "user", "content": username + ":" + prompt}
     if vykidailo or bartender:
         logger.info("Administrator coś chciał")
-    model_to_use = select_model(request_type, algorithm)
-    logger.info("Wybrany model: %s", model_to_use)
-    if request_type == "MUSIC" and model_to_use == "gpt-4o-mini":
-        try:
-            # nic — normalnie pójdzie Responses API
-            pass
-        except Exception:
-            model_to_use = "gpt-3.5-turbo"
-    # --- 2) Budowa historii (token budget + reguły systemowe) ---
-    # NOTE: ignorujemy przekazany 'history' jako listę (tak było wcześniej),
-    # ale zwracamy aktualną tablicę do nadpisania w miejscach wołania (back-compat).
-    base_system = GPT_SETTINGS[0]  # zakładamy {"role":"system","content":...}
-    history_msgs = []
-
-    if request_type != "NONE":
-        history_msgs.append(base_system)
-        chat_gpt_config_request_size = num_tokens_from_string(base_system, "gpt-4")
-
-        # Dynamiczne mikro-reguły (WORD_REACTIONS), jak w Twoim kodzie
-        for slowo, reakcja in WORD_REACTIONS.items():
-            if not reakcja[3]:
-                content = f"Kiedy słyszysz {slowo} to reagujesz lub dzieje się to {reakcja[0]}"
-                sys_msg = {"role": "system", "content": content}
-                chat_gpt_config_request_size += num_tokens_from_string(sys_msg, "gpt-4")
-                history_msgs.append(sys_msg)
-
-        # wybór właściwej tablicy pamięci i budżetu
-        if request_type == "MUSIC":
-            table = MESSAGE_TABLE_MUZYKA
-            token_amount = 10700
-        elif request_type in ("RANDOM", "GENERAL"):
-            table = MESSAGE_TABLE
-            token_amount = 10700
-        else:
-            table = []
-            token_amount = 10000
-
-        # doklejanie historii od końca aż do limitu (zachowana kolejność czasowa)
-        final_prompt = f"{username}:{prompt}"
-        prompt_gpt_request_size = num_tokens_from_string({"role": "user", "content": final_prompt}, "gpt-4")
-
-        acc = []
-        for msg in reversed(table):
-            t = num_tokens_from_string(msg, "gpt-4")
-            if chat_gpt_config_request_size + prompt_gpt_request_size + t <= token_amount:
-                acc.append(msg)
-                chat_gpt_config_request_size += t
-            else:
-                break
-        # przywróć chronologicznie
-        history_msgs.extend(reversed(acc))
-
-        # aktualny prompt
-        history_msgs.append({"role": "user", "content": final_prompt})
-        logger.info("Rozmiar zapytania (tok): %s", prompt_gpt_request_size)  # tokeny już policzone wyżej
-
+    history.append(temp)
+    if request_type == "MUSIC":
+        with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as file_music_memory:
+            # First we load existing data into a dict.
+            file_data = json.load(file_music_memory)
+            # Join new_data with file_data inside emp_details
+            file_data.append(temp)
+            file_music_memory.seek(0)
+            # convert back to json.
+            json.dump(file_data, file_music_memory, indent=4)
+    elif request_type == "RANDOM":
+        with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
+            # First we load existing data into a dict.
+            file_data = json.load(file_memory)
+            # Join new_data with file_data inside emp_details
+            file_data.append(temp)
+            file_memory.seek(0)
+            # convert back to json.
+            json.dump(file_data, file_memory, indent=4)
     else:
-        # --- tryb NONE: nie dotykamy pamięci i pozwalamy przekazać własny 'none_request' ---
-        if isinstance(none_request, list):
-            history_msgs = none_request
-        elif isinstance(none_request, str) and none_request.strip():
-            history_msgs = [{"role": "user", "content": none_request}]
-        else:
-            history_msgs = [{"role": "user", "content": f"{username}:{prompt}"}]
+        with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
+            # First we load existing data into a dict.
+            file_data = json.load(file_memory)
+            # Join new_data with file_data inside emp_details
+            file_data.append(temp)
+            file_memory.seek(0)
+            # convert back to json.
+            json.dump(file_data, file_memory, indent=4)
+    history = []
+    history.append(GPT_SETTINGS[0])
+    chat_gpt_config_request_size = num_tokens_from_string(GPT_SETTINGS[0], "gpt-4")
 
-        logger.info("Rozmiar zapytania (tok): %s", "n/a")  # tokeny już policzone wyżej
+    for slowo, reakcja in WORD_REACTIONS.items():
+        if not reakcja[3]:
+            content = (
+                "Kiedy słyszysz "
+                + slowo
+                + " to reagujesz lub dzieje się to "
+                + reakcja[0]
+            )
+            temp = {"role": "system", "content": content}
+            chat_gpt_config_request_size += num_tokens_from_string(temp, "gpt-4")
+            history.append(temp)
 
-    try:
-        # ...przygotowanie messages/system prompt/itp. jak masz...
-        # retry/backoff + deadline (zachowuje Twoją semantykę logowania)
-        timeout_sec = 120
-        deadline = time.time() + timeout_sec
-        response = await asyncio.wait_for(
-            openai_call(messages=history_msgs, model=model_to_use),
-            timeout=max(0.1, deadline - time.time()),
+    final_prompt = username + ":" + prompt
+    logger.debug(
+        "Rozmiar zapytania przed dodaniem historii %s", chat_gpt_config_request_size
+    )
+    if request_type == "MUSIC":
+        algorithm = "gpt-4o"
+        table = MESSAGE_TABLE_MUZYKA
+        token_amount = 10700
+    elif request_type == "RANDOM":
+        algorithm = "gpt-4o"
+        table = MESSAGE_TABLE
+        token_amount = 10700
+    else:
+        table = MESSAGE_TABLE
+        algorithm = "gpt-4o"
+        token_amount = 10700
+
+    prompt_gpt_request_size = num_tokens_from_string(
+        {"role": "user", "content": final_prompt}, "gpt-4"
+    )
+    temptable = []
+    for i in reversed(table):
+        temp_token = num_tokens_from_string(i, "gpt-4")
+        logger.debug(
+            "Rozmiar zapytania %s prompt %s temp %s",
+            chat_gpt_config_request_size,
+            prompt_gpt_request_size,
+            temp_token,
+        )
+        if (
+            chat_gpt_config_request_size
+            < token_amount + prompt_gpt_request_size + temp_token
+        ):
+            temptable.insert(1, i)
+            chat_gpt_config_request_size += temp_token
+    history.extend(temptable)
+    temp = {"role": "user", "content": final_prompt}
+    history.append(temp)
+    logger.info("Rozmiar zapytania po wyslaniu %s", chat_gpt_config_request_size)
+    try:
+        response = await OPENAICLIENT.chat.completions.create(
+            model=algorithm, messages=history
         )
-
     except openai.APITimeoutError as e:
         # Handle timeout error, e.g. retry or log
-        response = f"*Kondziu patrzy na terminal, czeka, czeka, czeka,.... Jeszcze chwile czeka Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai spróbuj od nowa. *Na ekranie pojawia się*: {e}"
+        result = f"*Kondziu patrzy na terminal, czeka, czeka, czeka,.... Jeszcze chwile czeka Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai spróbuj od nowa. *Na ekranie pojawia się*: {e}"
     except openai.APIConnectionError as e:
-        response = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai. *Na ekranie pojawia się*: {e}"
+        result = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Nie mogę się połączyć z Openai. *Na ekranie pojawia się*: {e}"
     except openai.BadRequestError as e:
         # Handle invalid request error, e.g. validate parameters or log
-        if internal_retry:
-            resp = "Nie umiem tego teraz ładnie wytłumaczyć — OpenAI mnie zastrzeliło."
-        else:
-            resp, _ = await handle_response(
-
-                f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie 'prompt'",
-                True,
-                True,
-                MESSAGE_TABLE,
-                username,
-                "RANDOM",
-            )
-            response = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
+        resp, _ = await handle_response(
+            f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie 'prompt'",
+            True,
+            True,
+            MESSAGE_TABLE,
+            username,
+            "RANDOM",
+        )
+        result = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
     except openai.APIResponseValidationError as e:
         # Handle invalid request error, e.g. validate parameters or log
-        if internal_retry:
-            resp = "Nie umiem tego teraz ładnie wytłumaczyć — OpenAI mnie zastrzeliło."
-        else:
-            resp, _ = await handle_response(
-                f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie 'prompt'",
-                True,
-                True,
-                MESSAGE_TABLE,
-                username,
-                "RANDOM",
-            )
-            response = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
+        resp, _ = await handle_response(
+            f"Wytlumacz jakie sa zasady dotyczące treści które możesz generować używając Dalle. Wytłumacz błąd {e} prostym językiem. Przeproś za nadmierną cenzurę. Wytłumacz co mogło być nie tak w prompcie 'prompt'",
+            True,
+            True,
+            MESSAGE_TABLE,
+            username,
+            "RANDOM",
+        )
+        result = f"Sorki, cenzura: {resp}. Jak chcesz to są kanały na nudle #sexy-foteczky i #kanal-do-fapania *Na ekranie pojawia się: {e}"
     except openai.AuthenticationError as e:
         # Handle authentication error, e.g. check credentials or log
-        response = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z hasłem zjebało. *Na terminalu pojawia się:* {e}"
+        result = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z hasłem zjebało. *Na terminalu pojawia się:* {e}"
     except openai.PermissionDeniedError as e:
         # Handle permission error, e.g. check scope or log
-        response = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z uprawnieniami zjebało. *Na terminalu pojawia się:* {e}"
+        result = f"*Kondziu patrzy na terminal, chwile się zastanawia. Przypierdala w niego pięścią....* Wołaj szefa - coś się z uprawnieniami zjebało. *Na terminalu pojawia się:* {e}"
     except openai.RateLimitError as e:
-        response = f"*Kondziu patrzy na terminal* Wołaj szefa. Zapłacić rachunki za AI trzeba. Jak chcesz to się na #zebranie dorzuć. {e}"
+        result = f"*Kondziu patrzy na terminal* Wołaj szefa. Zapłacić rachunki za AI trzeba. Jak chcesz to się na #zebranie dorzuć. {e}"
     except openai.UnprocessableEntityError as e:
-        response = f"*Kondziu patrzy na terminal. Potem na to co każesz mu wysłać....* Ja wiem że jesteśmy w barze BDSM - ale nie da się włożyć TEGO w TO. *Za jego plecami na terminalu pojawia się:* {e}"
+        result = f"*Kondziu patrzy na terminal. Potem na to co każesz mu wysłać....* Ja wiem że jesteśmy w barze BDSM - ale nie da się włożyć TEGO w TO. *Za jego plecami na terminalu pojawia się:* {e}"
     except openai.APIError as e:
         # Handle API error, e.g. retry or log
-        response = f"*Kondziu nurkuje za bar, terminal wybucha. Przed tobą ląduje pergamin zapisany pięknym gotykiem a na nim*: {e}"
+        result = f"*Kondziu nurkuje za bar, terminal wybucha. Przed tobą ląduje pergamin zapisany pięknym gotykiem a na nim*: {e}"
 
     logger.info("Historia wysłana:")
-    temp_assistant = {"role": "assistant", "content": response}
-    logger.info(temp_assistant)
+    logger.info(history)
+    await asyncio.sleep(15)
+    result = ""
+    logger.debug("Odpowiedzi")
+    logger.info(response)
+    logger.debug(response.choices)
+    for choice in response.choices:
+        result += choice.message.content
+    logger.info("Sformatowane odpowiedzi")
+    logger.info(result)
+    temp = {"role": "assistant", "content": result}
+    history.append(temp)
     if request_type == "MUSIC":
-        # zapis do pliku MUZYKA
-        with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as fh:
-            file_data = json.load(fh)
-            file_data.append({"role": "user", "content": f"{username}:{prompt}"})
-            file_data.append(temp_assistant)
-            fh.seek(0)
-            json.dump(file_data, fh, indent=4)
-        return response, MESSAGE_TABLE_MUZYKA
-
-    elif request_type in ("RANDOM", "GENERAL"):
-        with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as fh:
-            file_data = json.load(fh)
-            file_data.append({"role": "user", "content": f"{username}:{prompt}"})
-            file_data.append(temp_assistant)
-            fh.seek(0)
-            json.dump(file_data, fh, indent=4)
-        return response, MESSAGE_TABLE
-
-    else:  # NONE
-        return response, []
+        with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as file_music_memory:
+            # First we load existing data into a dict.
+            file_data = json.load(file_music_memory)
+            # Join new_data with file_data inside emp_details
+            file_data.append(temp)
+            file_music_memory.seek(0)
+            # convert back to json.
+            json.dump(file_data, file_music_memory, indent=4)
+    elif request_type == "RANDOM":
+        with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
+            # First we load existing data into a dict.
+            file_data = json.load(file_memory)
+            # Join new_data with file_data inside emp_details
+            file_data.append(temp)
+            file_memory.seek(0)
+            # convert back to json.
+            json.dump(file_data, file_memory, indent=4)
+    else:
+        with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file_memory:
+            # First we load existing data into a dict.
+            file_data = json.load(file_memory)
+            # Join new_data with file_data inside emp_details
+            file_data.append(temp)
+            file_memory.seek(0)
+            # convert back to json.
+            json.dump(file_data, file_memory, indent=4)
+    return result, MESSAGE_TABLE
 
 
 async def get_random_cyclic_message(client):
@@ -436,7 +395,7 @@ async def chat_with_assistant(message, assistant_name):
                 logger.info(block.text.value)
                 chat_response += block.text.value
                 await discord_friendly_send(message.channel, chat_response)
-                # await message.channel.send(chat_response)
+                #await message.channel.send(chat_response)
             done = True
         elif run.status == "cancelled":
             await discord_friendly_send(message.channel, "Cos sie wywaliło")

communication_subroutine.py

@@ -1,14 +1,12 @@
 import json
 import logging
-import os
 import re
 import threading
 import time
 from queue import Empty, Queue
-from typing import Optional
 from urllib import request as urequest
 
-from flask import Flask, abort, jsonify, request
+from flask import Flask, jsonify, request
 from waitress import serve
 
 HOST_ADDRESS = "192.168.1.191"
@@ -33,13 +31,6 @@ 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:
     """
@@ -62,7 +53,6 @@ class QueryControl:
 
 @app.route("/prepped_tracks", methods=["POST"])
 def log_radio_tracks():
-    _authorize_request()
     app.logger = logging.getLogger("discord")
 
     app.logger.info(request)
@@ -89,7 +79,6 @@ 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.
@@ -140,7 +129,7 @@ def waitress_run():
     serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)
 
 
-def scan_queue(stop_event: Optional[threading.Event] = None):
+def scan_queue():
     """
     The function `scan_queue` reads data from a queue, logs it, and appends it to another queue.
 
@@ -151,18 +140,12 @@ def scan_queue(stop_event: Optional[threading.Event] = None):
     """
     logger = logging.getLogger("discord")
     while True:
-        if stop_event and stop_event.is_set():
-            logger.info("scan_queue: stop requested")
-            break
-        try:
-            data = OUT_COMM_Q.get(timeout=1)
-        except Empty:
-            continue
+        data = OUT_COMM_Q.get()
         logger.info(data)
         awaiting_q.append(data)
 
 
-def scan_incoming(stop_event: Optional[threading.Event] = None):
+def scan_incoming():
     """
     The `scan_incoming` function continuously checks for incoming data, processes it, and logs when data
     is found.
@@ -174,9 +157,6 @@ def scan_incoming(stop_event: Optional[threading.Event] = None):
     """
     logger = logging.getLogger("discord")
     while True:
-        if stop_event and stop_event.is_set():
-            logger.info("scan_incoming: stop requested")
-            break
         try:
             answer = incoming_q.get(block=False)
             logger.info("DATA FOUND")
@@ -224,7 +204,7 @@ def id3(url: str) -> dict:
         return tagdata
 
 
-def comm_subroutine(stop_event: Optional[threading.Event] = None):
+def comm_subroutine():
     """
     The `comm_subroutine` function starts multiple threads to run different tasks concurrently.
 
@@ -237,27 +217,14 @@ def comm_subroutine(stop_event: Optional[threading.Event] = None):
     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(target=scan_queue, kwargs={"stop_event": stop_event}, daemon=True)
-    )
-    threads.append(
-        threading.Thread(target=scan_incoming, kwargs={"stop_event": stop_event}, daemon=True)
-    )
+    threads.append(threading.Thread(target=waitress_run))
+    threads.append(threading.Thread(target=scan_queue))
+    threads.append(threading.Thread(target=scan_incoming))
 
     for worker in threads:
         worker.start()
-
-    try:
-        while any(thread.is_alive() for thread in threads):
-            if stop_event and stop_event.is_set():
-                break
-            time.sleep(0.5)
-    finally:
-        if stop_event:
-            stop_event.set()
+    for worker in threads:
+        worker.join()
 
 
 if __name__ == "__main__":

conjurer_librarian/conjurer_librarian.py

@@ -16,52 +16,34 @@ Functions:
 import asyncio
 import json
 import logging
-import os
+import netrc
 import threading
+import time
 from json.decoder import JSONDecodeError
 from logging import handlers
-from pathlib import Path
 from queue import Queue
-from typing import Dict, Optional
 
 import requests
 import scrape_bot
 import search_bot
-# import search_bot2 as search_bot
-from flask import Flask, jsonify, request, abort
+#import search_bot2 as search_bot
+from flask import Flask, jsonify, request
 from habanero import Crossref
 from waitress import serve
 
-try:
-    import netrc
-except ImportError:  # pragma: no cover
-    netrc = None
-
 # Constants
+NETRC_FILE = r"C:\Users\Activcom.pl\.netrc"
+HOST_ADDRESS = "192.168.1.192"
+PORT_ADDRESS = 5001
+MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
+SEND_RESULTS = "/conjurer"
+BDSM_UUID_TEST = "96b7f85a-1142-4908-8986-62a2ea25a147"
 
+MAX_CR_RESULTS = 1000
+#TEST PURPOSES ONLY!
+#MAX_CR_RESULTS = 5
 
-def _env(name: str, default: str) -> str:
-    return os.getenv(name, default)
-
-
-def _env_path(name: str, default: str) -> Path:
-    return Path(os.getenv(name, default)).expanduser().resolve()
-
-
-BASE_DIR = Path(
-    os.getenv("CONJURER_LIBRARIAN_BASE", str(Path(__file__).resolve().parent))
-)
-NETRC_FILE = _env_path("CONJURER_NETRC_FILE", str(Path.home() / ".netrc"))
-HOST_ADDRESS = _env("CONJURER_LIBRARIAN_HOST", "0.0.0.0")
-PORT_ADDRESS = int(_env("CONJURER_LIBRARIAN_PORT", "5001"))
-MAIN_BOT_ADDRESS = _env("CONJURER_MAIN_BOT", "http://127.0.0.1:5000")
-SEND_RESULTS = _env("CONJURER_LIBRARIAN_RESULTS_ENDPOINT", "/conjurer")
-MAX_CR_RESULTS = int(_env("CONJURER_LIBRARIAN_MAX_RESULTS", "500"))
-ENCODING = _env("CONJURER_ENCODING", "utf-8")
-API_KEY = os.getenv("CONJURER_API_KEY")
-LOGFILE_PATH = _env_path(
-    "CONJURER_LIBRARIAN_LOG", str(BASE_DIR / "librarian.log")
-)
+ENCODING = "utf-8"
 
 app = Flask(__name__)
 
@@ -69,17 +51,6 @@ librarian_queue = Queue()
 librarian_list = []
 
 
-def _service_headers() -> Dict[str, str]:
-    if API_KEY:
-        return {"X-Conjurer-Api-Key": API_KEY}
-    return {}
-
-
-def _authorize_request() -> None:
-    if API_KEY and request.headers.get("X-Conjurer-Api-Key") != API_KEY:
-        abort(401)
-
-
 # trunk-ignore(pylint/R0902)
 class Librarian(object):
     """
@@ -110,24 +81,11 @@ class Librarian(object):
         - search_result_from_cr: A dictionary to store the search results from Crossref.
         - done: A flag indicating if the search is done.
         """
-        mailto_contact: Optional[str] = os.getenv("CONJURER_CROSSREF_MAILTO")
-        if netrc:
-            try:
-                netrc_mod = netrc.netrc(str(NETRC_FILE))
-                auth_tokens = netrc_mod.authenticators("crossref")
-                if auth_tokens:
-                    mailto_contact = auth_tokens[0]
-            except (FileNotFoundError, netrc.NetrcParseError):
-                logging.getLogger("conjurer_librarian").warning(
-                    "Crossref credentials missing in netrc %s", NETRC_FILE
-                )
-        if not mailto_contact:
-            raise RuntimeError(
-                "Crossref credentials not configured. Set CONJURER_CROSSREF_MAILTO or add to netrc."
-            )
+        netrc_mod = netrc.netrc(NETRC_FILE)
+        auth_tokens = netrc_mod.authenticators("crossref")
         self.cr = Crossref(
-            mailto=mailto_contact,
-            ua_string=f"Conjurer project. mailto:{mailto_contact}"
+            mailto=auth_tokens[0],
+            ua_string=f"Conjurer project. mailto:{auth_tokens[0]}"
         )
         self.query = query
         self.uuid = str(uuid)
@@ -174,7 +132,7 @@ class Librarian(object):
                 self.fetched = len(cr_result["message"]["items"])
                 self.app.logger.info(self.total)
                 self.app.logger.info(self.fetched)
-                await asyncio.sleep(0.1)
+                time.sleep(0.1)
 
         else:
             cr_result = self.cr.works(query=query, cursor_max=15000, cursor='*', progress_bar = True)
@@ -453,20 +411,18 @@ class BackgroundTaskSearch(threading.Thread):
                 requests.post,
                 f"{MAIN_BOT_ADDRESS}{SEND_RESULTS}",
                 json=result,
-                headers=_service_headers(),
                 timeout=360,
             )
             self.app.logger.info("SENT")
             result = await coroutine
             self.app.logger.info(result.status_code)
             self.app.logger.info("SEND CONFIRMED")
-            await asyncio.sleep(1)
+            time.sleep(1)
 
 
 # ==================================SERVER ROUTES==========================================
 @app.route("/query", methods=["POST"])
 async def query_database():
-    _authorize_request()
     """
     Endpoint for querying the database.
 
@@ -499,7 +455,6 @@ async def query_database():
 
 @app.route("/get_partial_result", methods=["POST"])
 async def get_partial():
-    _authorize_request()
     """
     Retrieves the partial result for a given UUID.
 
@@ -523,10 +478,9 @@ async def get_partial():
 # =======================================MAIN===================================================
 if __name__ == "__main__":
     app.logger.setLevel(logging.DEBUG)
-    LOGFILE_PATH.parent.mkdir(parents=True, exist_ok=True)
     h1 = handlers.RotatingFileHandler(
-        filename=str(LOGFILE_PATH),
-        encoding=ENCODING,
+        filename="D:\\logs\\librarian.log",
+        encoding="utf-8",
         mode="a",
         maxBytes=6 * 1024 * 1024,
         backupCount=6,
@@ -534,24 +488,20 @@ if __name__ == "__main__":
 
     app.logger.addHandler(h1)
     threads = []
-    threads.append(threading.Thread(target=waitress_run, daemon=True))
+    threads.append(threading.Thread(target=waitress_run))
     # threads.append(threading.Thread(target=flask_debug))
     bgtask = BackgroundTaskSearch()
     bgtask.app = app
-    bgtask.daemon = True
     threads.append(bgtask)
-    threads.append(
-        threading.Thread(
-            target=scrape_bot.scraper, args=(app.logger,), daemon=True
-        )
-    )
+    threads.append(threading.Thread(target=scrape_bot.scraper, args=(app.logger,)))
     i = 0
-    try:
-        for worker in threads:
+    for worker in threads:
+        try:
             app.logger.info("App number: %s", i)
             i += 1
             worker.start()
-        for worker in threads:
-            worker.join()
-    except KeyboardInterrupt:
-        app.logger.info("Shutdown requested - exiting librarian service")
+        except RuntimeError as e:
+            app.logger.error("Exploded")
+            print(str(e))
+    for worker in threads:
+        worker.join()

conjurer_librarian/scrape_bot.py

@@ -104,8 +104,9 @@ def check_if_exists_brute_force(logger):
             pass
         if blocked:
             logger.info(item)
+            logger.info(text)
             logger.error("Got blocked. Fuck.")
-            time.sleep(60 * 60)
+            time.sleep(60 * 60 * 72)
         # trunk-ignore(bandit/B311)
         rand = random.randint(1, 60)
         logger.info(f"Sleeping for {2*rand} minutes")

conjurer_musician/conjurer_musician.py

@@ -1,9 +1,9 @@
+# This Python file uses the following encoding: utf-8
 """
 The provided Python script sets up a Flask web server to manage a list of music files, with
 functions for rescanning the music folder, updating the music list, and serving the music list via
 API endpoints.
 """
-
 import json
 import logging
 import os
@@ -11,15 +11,16 @@ import random
 import re
 import threading
 import time
+from flask_autoindex import AutoIndex
 from datetime import datetime
 from logging import handlers
 from pathlib import Path
-from typing import Dict, List
+from platform import uname
+from sys import platform
 
 import requests
 from flask import (
     Flask,
-    abort,
     jsonify,
     redirect,
     render_template,
@@ -28,98 +29,34 @@ from flask import (
 )
 from waitress import serve
 
-import media_search_functions
+MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
+MUSIC_TRACKER = "/prepped_tracks"
+HOST_ADDRESS = "192.168.1.15"
+PORT_ADDRESS = 5000
+if platform in ("linux", "linux2"):
+    SEPARATOR_FILE_PATH = "/"
+    if "microsoft-standard" in uname().release:
+        LOGFILE = "/home/mtuszowski/conjurer/discord_mus_service.log"
+        MUSIC_FOLDER = "/mnt/g/Muzyka/"
+        NETRC_FILE = "/home/mtuszowski/.netrc"
+        LOGSTORE = "/home/mtuszowski/conjurer/logs/"
+        ENCODING = "utf-8"
+        RADIOLOG_PATH = "/home/pi/Conjurer/radio_log.log"
+        PERSISTENCE_PATH = "/home/pi/Conjurer/persistence.log"
 
-
-def _env(name: str, default: str) -> str:
-    return os.getenv(name, default)
-
-
-def _env_path(name: str, default: str) -> Path:
-    value = os.getenv(name, default)
-    return Path(value).expanduser().resolve()
-
-
-API_KEY = os.getenv("CONJURER_API_KEY")
-MAIN_BOT_ADDRESS = _env("CONJURER_MAIN_BOT", "http://127.0.0.1:5000")
-MUSIC_TRACKER = _env("CONJURER_MUSIC_TRACKER_ENDPOINT", "/prepped_tracks")
-HOST_ADDRESS = _env("CONJURER_MUSICIAN_HOST", "0.0.0.0")
-PORT_ADDRESS = int(_env("CONJURER_MUSICIAN_PORT", "5000"))
-
-BASE_DIR = Path(
-    os.getenv("CONJURER_MUSICIAN_BASE", str(Path(__file__).resolve().parent))
-)
-LOGFILE = _env_path(
-    "CONJURER_MUSICIAN_LOG", str(BASE_DIR / "discord_mus_service.log")
-)
-LOGSTORE = _env_path("CONJURER_LOGSTORE", str(BASE_DIR / "logs"))
-MUSIC_FOLDER = _env_path(
-    "CONJURER_MUSIC_FOLDER", str(BASE_DIR / "music")
-)
-PRIORITY_FOLDER = _env_path(
-    "CONJURER_PRIORITY_FOLDER", str(MUSIC_FOLDER / "priority")
-)
-RADIOLOG_PATH = _env_path(
-    "CONJURER_RADIO_LOG", str(BASE_DIR / "radio_log.log")
-)
-PERSISTENCE_PATH = _env_path(
-    "CONJURER_PERSISTENCE_LOG", str(BASE_DIR / "persistence.log")
-)
-ALL_PLAYLIST_PATH = _env_path(
-    "CONJURER_ALL_PLAYLIST", str(BASE_DIR / "all_playlist.playlist")
-)
-HIT_PLAYLIST_PATH = _env_path(
-    "CONJURER_HIT_PLAYLIST", str(BASE_DIR / "hit.playlist")
-)
-REQUEST_PLAYLIST_PATH = _env_path(
-    "CONJURER_REQUEST_PLAYLIST", str(BASE_DIR / "request.playlist")
-)
-PRIORITY_PLAYLIST_PATH = _env_path(
-    "CONJURER_PRIORITY_PLAYLIST", str(BASE_DIR / "priority_queue.playlist")
-)
-STREAM_TEMPLATE = _env_path(
-    "CONJURER_STREAM_TEMPLATE", str(BASE_DIR / "stream.html")
-)
-
-ENCODING = _env("CONJURER_ENCODING", "utf-8")
-SEPARATOR_FILE_PATH = os.sep
-
-for playlist_path in (
-    ALL_PLAYLIST_PATH,
-    HIT_PLAYLIST_PATH,
-    REQUEST_PLAYLIST_PATH,
-    PRIORITY_PLAYLIST_PATH,
-):
-    playlist_path.parent.mkdir(parents=True, exist_ok=True)
+    else:
+        LOGFILE = "/home/pi/Conjurer/discord_mus_service.log"
+        NETRC_FILE = "/home/pi/.netrc"
+        LOGSTORE = "/home/pi/RetroPie/logs/"
+        ENCODING = "utf-8"
+        MUSIC_FOLDER = "/home/pi/RetroPie/mp3/"
+        PRIORITY_FOLDER = "/home/pi/RetroPie/mp3/Magiczne i chuj/"
+        RADIOLOG_PATH = "/home/pi/Conjurer/radio_log.log"
+        PERSISTENCE_PATH = "/home/pi/Conjurer/persistence.log"
 
 random.seed()
-music_file_list: List[str] = []
-priority_list: List[str] = []
-
-
-def _build_headers() -> Dict[str, str]:
-    headers: Dict[str, str] = {}
-    if API_KEY:
-        headers["X-Conjurer-Api-Key"] = API_KEY
-    return headers
-
-
-def _authorize_request() -> None:
-    if API_KEY and request.headers.get("X-Conjurer-Api-Key") != API_KEY:
-        abort(401)
-
-
-def _post_to_bot(payload: List[str]) -> None:
-    response = requests.post(
-        f"{MAIN_BOT_ADDRESS}{MUSIC_TRACKER}",
-        json=payload,
-        headers=_build_headers(),
-        timeout=60,
-    )
-    logger = logging.getLogger("conjurer_musician")
-    logger.info("SENT")
-    logger.info(response.status_code)
-    logger.info("SEND CONFIRMED")
+music_file_list = []
+priority_list = []
 
 
 def rescan():
@@ -130,29 +67,28 @@ def rescan():
     logger = logging.getLogger("conjurer_musician")
     logger.info("Rescan triggered")
 
-    music_file_list.clear()
-    priority_list.clear()
-
-    for mp3_item in MUSIC_FOLDER.glob("**/*.mp3"):
+    for mp3_item in Path.glob(Path(MUSIC_FOLDER), "**/*.mp3"):
         temp_music_file = mp3_item.as_posix()
-        if os.name == "nt":
+        if platform == "win32":
             temp_music_file = temp_music_file.replace("/", "\\")
         music_file_list.append(temp_music_file)
 
-    for mp3_item in PRIORITY_FOLDER.glob("**/*.mp3"):
+    for mp3_item in Path.glob(Path(PRIORITY_FOLDER), "**/*.mp3"):
         temp_music_file = mp3_item.as_posix()
-        if os.name == "nt":
+        if platform == "win32":
             temp_music_file = temp_music_file.replace("/", "\\")
         priority_list.append(temp_music_file)
 
-    with ALL_PLAYLIST_PATH.open("w", encoding=ENCODING) as w_file:
+    with open(
+        "/home/pi/Conjurer/all_playlist.playlist", "w", encoding="utf-8"
+    ) as w_file:
         try:
             for item in music_file_list:
                 w_file.write(item)
                 w_file.write("\n")
         except json.JSONDecodeError:
             pass
-    with HIT_PLAYLIST_PATH.open("w", encoding=ENCODING) as w_file:
+    with open("/home/pi/Conjurer/hit.playlist", "w", encoding="utf-8") as w_file:
         try:
             for item in priority_list:
                 w_file.write(item)
@@ -177,55 +113,76 @@ def thread_rescan():
 def scan_tracks():
     # Set the filename and open the file
     logger = logging.getLogger("conjurer_musician")
-    with open(RADIOLOG_PATH, "r", encoding=ENCODING) as log_file:
-        log_file.seek(os.stat(RADIOLOG_PATH).st_size)
-        prev_size = os.stat(PERSISTENCE_PATH).st_size
 
-        while True:
-            current_size = os.stat(PERSISTENCE_PATH).st_size
-            if prev_size != current_size:
-                while prev_size != current_size:
-                    prev_size = current_size
-                    time.sleep(0.1)
-                    current_size = os.stat(PERSISTENCE_PATH).st_size
-                with open(PERSISTENCE_PATH, "r", encoding=ENCODING) as persistence:
-                    lines = persistence.readlines()
-                if len(lines) >= 3:
-                    _post_to_bot(["next", lines[2]])
+    file = open(RADIOLOG_PATH, "r")
+    # Find the size of the file and move to the end
+    st_results = os.stat(RADIOLOG_PATH)
+    st_size = st_results[6]
+    file.seek(st_size)
+    st_results1 = os.stat(PERSISTENCE_PATH)
+    prev_st_size1 = st_results[6]
 
-            position = log_file.tell()
-            line = log_file.readline()
-            if not line:
-                time.sleep(1)
-                log_file.seek(position)
-                continue
+    while 1:
 
-            if not re.match(r".*Prepared.*", line):
+        st_results1 = os.stat(PERSISTENCE_PATH)
+        st_size1 = st_results1[6]
+        if prev_st_size1 != st_size1:
+            while prev_st_size1 != st_size1:
+                prev_st_size1 = st_size1
+                st_results1 = os.stat(PERSISTENCE_PATH)
+                st_size1 = st_results1[6]
                 time.sleep(0.1)
-                continue
+            file1 = open(PERSISTENCE_PATH, "r")
+            lines = file1.readlines()
+            result = ["next", lines[2]]
+            file1.close()
+            returned = requests.post(
+                f"{MAIN_BOT_ADDRESS}{MUSIC_TRACKER}", json=result, timeout=360
+            )
+            logger.info("SENT")
+            logger.info(returned.status_code)
+            logger.info("SEND CONFIRMED")
 
-            result = None
-            if re.match(r".*jingles.*", line):
-                result = ["jingles", line]
-            elif re.match(r".*priority.*", line):
-                result = ["priority", line]
-            elif re.match(r".*hit.*", line):
-                result = ["hit", line]
-            elif re.match(r".*all_playlist.*", line):
-                result = ["all", line]
-            elif re.match(r".*request.*", line):
-                result = ["requests", line]
-
-            if result:
-                logger.info("Forwarding radio log entry: %s", result[0])
-                _post_to_bot(result)
-
-            time.sleep(0.1)
+        where = file.tell()
+        line = file.readline()
+        if not line:
+            time.sleep(1)
+            file.seek(where)
+        else:
+            if re.match(".*Prepared.*", line):
+                result = None
+                if re.match(".*jingles.*", line):
+                    logger.info("jingles")
+                    logger.info(line)  # already has newline
+                    result = ["jingles", line]
+                elif re.match(".*priority.*", line):
+                    logger.info("priority")
+                    logger.info(line)  # already has newline
+                    result = ["priority", line]
+                elif re.match(".*hit.*", line):
+                    logger.info("hit")
+                    logger.info(line)  # already has newline
+                    result = ["hit", line]
+                elif re.match(".*all_playlist.*", line):
+                    logger.info("all")
+                    logger.info(line)  # already has newline
+                    result = ["all", line]
+                elif re.match(".*request.*", line):
+                    logger.info("requests")
+                    logger.info(line)  # already has newline
+                    result = ["requests", line]
+                if result:
+                    returned = requests.post(
+                        f"{MAIN_BOT_ADDRESS}{MUSIC_TRACKER}", json=result, timeout=360
+                    )
+                    logger.info("SENT")
+                    logger.info(returned.status_code)
+                    logger.info("SEND CONFIRMED")
+        time.sleep(0.1)
 
 
 app = Flask(__name__)
-# AutoIndex(app, browse_root="/")
-
+#AutoIndex(app, browse_root="/")
 
 # TODO: Odpalić wyszukiwarki w wątkach i dopiero po wszystkim zsumować wyszukiwanie.
 def wyszukaj(word_list, how_many, _logger=None, return_to_bot=True):
@@ -329,8 +286,12 @@ def wyszukaj(word_list, how_many, _logger=None, return_to_bot=True):
             if search_weight[itr][0] == item_to_search:
                 return_list.append(search_weight[itr])
                 if not return_to_bot:
-                    with PRIORITY_PLAYLIST_PATH.open("a", encoding=ENCODING) as s_file:
-                        s_file.write(search_weight[itr][1] + "\n")
+                    with open(
+                        "/home/pi/Conjurer/priority_queue.playlist",
+                        "r+",
+                        encoding="utf-8",
+                    ) as s_file:
+                        s_file.write(search_weight[itr][1])
                 break
             itr += 1
     else:
@@ -369,38 +330,6 @@ def remove_characters(string, character):
     return string.replace(character, "")
 
 
-@app.route('/get_share_list', methods=['POST'])
-def get_share_list():
-    _authorize_request()
-    data = request.get_json()
-    entries = data.get('entries')
-    keywords = data.get('keywords')
-    # Validate entries
-    if not isinstance(entries, int) or not (1 <= entries <= 10):
-        return jsonify({'error': '"entries" must be an integer between 1 and 10.'}), 400
-    # Validate keywords list
-    if not isinstance(keywords, list) or not all(isinstance(k, str) for k in keywords):
-        return jsonify({'error': '"keywords" must be a list of strings.'}), 400
-    # Call external search
-    files = media_search_functions.find_matches(entries, keywords)
-    # Return each file path as a JSON list
-    return jsonify({'files': files}), 200
-
-@app.route('/get_share_links', methods=['POST'])
-def get_share_links():
-    _authorize_request()
-    data = request.get_json()
-    file_paths = data.get('file_paths')
-    # Validate file_paths list
-    if not isinstance(file_paths, list) or not all(isinstance(p, str) for p in file_paths):
-        return jsonify({'error': '"file_paths" must be a list of strings.'}), 400
-    # Call external publish
-    links = media_search_functions.publish(file_paths)
-    # Return list of published links
-    return jsonify({'links': links}), 200
-
-
-
 @app.route("/stream", methods=["GET"])
 def stream_music():
     """
@@ -411,7 +340,7 @@ def stream_music():
     """
 
     # return send_from_directory("/tmp/hls", "stream.m3u8")
-    return render_template(str(STREAM_TEMPLATE))
+    return render_template("/home/pi/Conjurer/stream.html")
 
 
 @app.route("/<string:file_name>")
@@ -443,14 +372,15 @@ def stream_music_mp3():
 
 @app.route("/clear_pr_pls", methods=["GET"])
 def clear_pr_pls():
-    _authorize_request()
     """
     The function `clear_pr_pls` clears the contents of the priority queue playlist file.
 
     :return: A JSON response indicating the success of the operation.
     """
     app.logger.info("CLEARING PLAYLIST")
-    with PRIORITY_PLAYLIST_PATH.open("w", encoding=ENCODING) as cleared_pl:
+    with open(
+        "/home/pi/Conjurer/priority_queue.playlist", "w", encoding="utf-8"
+    ) as cleared_pl:
         cleared_pl.write("")
 
     return_data = jsonify(isError=False, message="Success", statusCode=200, data=[])
@@ -478,7 +408,6 @@ def update_music_list():
     received and added to the `music_file_list`.
     The status code returned is 200, indicating a successful response.
     """
-    _authorize_request()
     record = json.loads(request.data)
     app.logger.info(record["item"])
     music_file_list.append(record["item"])
@@ -500,7 +429,6 @@ def look_for_playlist():
              data that was received and added to the `music_file_list`. The status code returned is 200,
              indicating a successful response.
     """
-    _authorize_request()
     record = json.loads(request.data)
     app.logger.info(record)
     app.logger.info(record["lista_slow"])
@@ -519,14 +447,13 @@ def look_for_playlist():
 
 @app.route("/request_radio_file", methods=["POST"])
 def add_request():
-    _authorize_request()
     record = json.loads(request.data)
     app.logger.info(record)
     app.logger.info(record["lista_slow"])
     app.logger.info(record["UUID"])
     return_data = wyszukaj(record["lista_slow"], 0, app.logger, False)
 
-    with REQUEST_PLAYLIST_PATH.open("a", encoding=ENCODING) as s_file:
+    with open("/home/pi/Conjurer/request.playlist", "a", encoding="utf-8") as s_file:
         for item in return_data:
             s_file.write(item[1] + "\n")
     return_data = (
@@ -551,7 +478,6 @@ def create_priority_playlist():
         data that was received and added to the `music_file_list`.
         The status code returned is 200,indicating a successful response.
     """
-    _authorize_request()
     record = json.loads(request.data)
     app.logger.info(record)
     app.logger.info(record["lista_slow"])
@@ -560,8 +486,8 @@ def create_priority_playlist():
     return_data = wyszukaj(
         record["lista_slow"], record["dlugosc_plejlisty"], app.logger, False
     )
-    random.shuffle(return_data)
-    with REQUEST_PLAYLIST_PATH.open("a", encoding=ENCODING) as s_file:
+    return_data = random.shuffle(return_data)
+    with open("/home/pi/Conjurer/request.playlist", "a", encoding="utf-8") as s_file:
         for item in return_data:
             s_file.write(item[1] + "\n")
     return_data = (
@@ -586,7 +512,6 @@ def add_to_priority():
         data that was received and added to the `music_file_list`.
         The status code returned is 200,indicating a successful response.
     """
-    _authorize_request()
     record = json.loads(request.data)
     app.logger.info(record)
     app.logger.info(record["lista_slow"])
@@ -595,7 +520,9 @@ def add_to_priority():
     return_data = wyszukaj(
         record["lista_slow"], record["dlugosc_plejlisty"], app.logger, False
     )
-    with PRIORITY_PLAYLIST_PATH.open("a", encoding=ENCODING) as s_file:
+    with open(
+        "/home/pi/Conjurer/priority_queue.playlist", "a", encoding="utf-8"
+    ) as s_file:
         for item in return_data:
             s_file.write(item[1] + "\n")
     return_data = (
@@ -654,19 +581,15 @@ if __name__ == "__main__":
     logger.info("Started")
     threads = []
     # threads.append(threading.Thread(target=flask_debug))
-    threads.append(threading.Thread(target=waitress_run, daemon=True))
-    threads.append(threading.Thread(target=thread_rescan, daemon=True))
+    threads.append(threading.Thread(target=waitress_run))
+    threads.append(threading.Thread(target=thread_rescan))
 
     for worker in threads:
         worker.start()
 
     time.sleep(60)
-    track_thread = threading.Thread(target=scan_tracks, daemon=True)
-    track_thread.start()
+    threads.append(threading.Thread(target=scan_tracks))
+    threads[2].start()
 
-    try:
-        for worker in threads:
-            worker.join()
-        track_thread.join()
-    except KeyboardInterrupt:
-        logger.info("Shutdown requested - exiting musician service")
+    for worker in threads:
+        worker.join()

conjurer_musician/media_search_functions.py

@@ -1,52 +0,0 @@
-#!/usr/bin/env python3
-import argparse
-import json
-import os
-import sys
-import uuid
-from pathlib import Path
-
-# CONFIGURATION
-JSON_DB        = '/var/log/share_scan.json'
-SHARE_DIR      = Path('/var/www/html/share')
-BASE_URL       = 'https://czernobog.pl/share'
-
-# Ensure share directory exists
-SHARE_DIR.mkdir(parents=True, exist_ok=True)
-
-def load_db():
-    with open(JSON_DB) as f:
-        return json.load(f)['entries']
-
-ENTRIES = load_db()
-
-def relevancy(path, keywords):
-    score = 0
-    low = path.lower()
-    for kw in keywords:
-        if kw.lower() in low:
-            score += low.count(kw.lower())
-    return score
-
-def find_matches(count, keywords):
-    scored = []
-    for e in ENTRIES:
-        score = relevancy(e['path'], keywords)
-        if score > 0:
-            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):
-    urls = []
-    for path in paths:
-        token = uuid.uuid4().hex
-        link = SHARE_DIR / token
-        try:
-            os.symlink(path, link)
-        except FileExistsError:
-            pass
-        urls.append(f"{BASE_URL}/{token}")
-    return urls
-

conjurer_musician/music_utils.py

@@ -2,47 +2,9 @@
 """This module contains utility scripts used by musi radiostation Conjurer"""
 import time
 import re
-import os
-import argparse
-
-from mutagen.easyid3 import EasyID3
-from mutagen.mp3 import MP3
-
-
-def update_metadata(folder_path):
-    for root, _, files in os.walk(folder_path):
-        for file in files:
-            if file.endswith(".mp3"):
-                file_path = os.path.join(root, file)
-
-                # Sample logic for guessing metadata from filename
-                # Assuming the filename format is "Artist - Title.mp3"
-                try:
-                    artist, title = file.rsplit(" - ", 1)
-                    title = title.replace(".mp3", "")
-                except ValueError:
-                    # If file name doesn't fit the expected pattern, skip
-                    print(f"Skipping file due to unexpected format: {file}")
-                    continue
-
-                try:
-                    # Load the mp3 file
-                    audio = MP3(file_path, ID3=EasyID3)
-
-                    # Update metadata
-                    audio["artist"] = artist.strip()
-                    audio["title"] = title.strip()
-
-                    # Save changes
-                    audio.save()
-                    print(f"Updated metadata for: {file}")
-                except Exception as e:
-                    print(f"Failed to update metadata for {file}: {e}")
-
 
 NAME = "/home/pi/Conjurer/persistence.log"
 
-
 def print_top():
     """
     Prints the top 65 lines from a file specified by the NAME variable.
@@ -51,7 +13,7 @@ def print_top():
         line = ""
         buffer = ""
         with open(NAME, "r", encoding="utf-8") as f:
-            for _ in range(45):
+            for _ in range (45):
                 line = f.readline()
                 if re.match(".*mp3", line):
                     buffer += line
@@ -60,39 +22,5 @@ def print_top():
             print("=====================================")
         time.sleep(180)
 
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Perform operations on a directory of .mp3 files."
-    )
-
-    # Positional argument for choosing the function to execute
-    parser.add_argument(
-        "operation",
-        type=str,
-        choices=["update_metadata", "print_top"],
-        help="Operation to perform: update_metadata or print_top.",
-        default="print_top",
-    )
-
-    # Positional argument for folder path
-    parser.add_argument("folder", type=str, help="Path to the folder to operate on.")
-
-    args = parser.parse_args()
-    if args.operation == "update_metadata":
-        if args.folder:
-            folder_to_scan = args.folder
-        else:
-            print("Please provide a folder path to scan.")
-            raise ValueError("No folder path provided.")
-
-    if args.operation == "update_metadata" and os.path.isdir(folder_to_scan):
-        update_metadata(folder_to_scan)
-    elif args.operation == "print_top":
-        print_top()
-    else:
-        print(f"The specified path is not a directory: {folder_to_scan}")
-
-
 if __name__ == "__main__":
-    main()
+    print_top()

conjurer_musician/radio_conjurer.etc.logrotate

@@ -1,9 +0,0 @@
-/home/pi/Conjurer/radio_log.log {
-    daily
-    rotate 7
-    compress
-    delaycompress
-    missingok
-    notifempty
-    copytruncate
-}

conjurer_musician/radio_conjurer.liq

@@ -43,22 +43,6 @@ def queue_processing()
     end
 end
 
-# Configure output formats and destinations
-def now_playing(m)
-  # raw lookup ("" if missing)
-  raw_title  = m["title"]
-  raw_artist = m["artist"]
-
-  # default if empty
-  title  = if raw_title  == "" then "Unknown" else raw_title  end
-  artist = if raw_artist == "" then "Unknown" else raw_artist end
-  log.critical("Now playing #{artist} - #{title}")
-  # write it out
-  system("echo '#{artist} - #{title}' > /tmp/now_playing.txt")
-  m
-end
-
-
 # Randomly select a playlist with weights
 s4 = random(id="randomizer", weights=[2, 3, 5], [s1, s2, s3])
 
@@ -68,8 +52,7 @@ jingles = (playlist(reload_mode="watch", "/home/pi/Conjurer/jingles.playlist"))
 # Create the main stream with random playlist and jingles
 s = rotate(id="randomizer", weights=[10, 1], [s4, jingles])
 
-s = crossfade(fade_out=2., fade_in=2., duration=4., fallback(id="switcher", track_sensitive=true, [requests_queue, s]))
-s = metadata.map(now_playing, s)
+s = crossfade(fade_out=2., fade_in=2., duration=4., fallback(id="switcher", track_sensitive=false, [requests_queue, s]))
 
 # Set up an interactive harbor for controlling the stream
 interactive.harbor(port = 9999)
@@ -104,7 +87,7 @@ s = blank.skip(max_blank=10., s)
 live_enabled = interactive.bool("Going Live!", true)
 
 s = add([mic,s])
-s=switch(track_sensitive=true,
+s=switch(track_sensitive=false,
     [(live_enabled, mic),
     ({true}, s)])
 
@@ -119,8 +102,9 @@ set("log.level", loglevel)
 # Enable logging to file
 set("log.file", log_to_file)
 set("log.file.path", logpath)
+
 # Set up emergency fallback track
-emergency = single("/home/pi/MediaFolder/mp3/Youtube/Dr. Peacock - Trip to Ireland [GvrvQTUbUcA].mp3")
+emergency = single("/home/pi/RetroPie/mp3/Youtube/Dr. Peacock - Trip to Ireland [GvrvQTUbUcA].mp3")
 radio =  fallback(id="switcher2", track_sensitive=false, [s, emergency])
 
 # Set up an interactive control for skipping tracks
@@ -154,7 +138,8 @@ interactive.persistent("script.params")
 
 # Configure output formats and destinations
 
-output.icecast(%mp3, host="radio", port=8000, password=credentials.password, icy_metadata="true", mount="mp3-stream", radio)
+
+output.icecast(%mp3, host="retropie", port=8000, password=credentials.password, icy_metadata="true", mount="mp3-stream", radio)
 output.pulseaudio(radio)
 #output.file.hls("/tmp/hls", [("mp3-low", %mp3(bitrate=96)), ("mp3-hi", %mp3(bitrate=160))], radio)
 # Uncomment the following lines to enable additional output formats

conjurer_musician/requirements_musician.txt

@@ -1,4 +1,3 @@
 flask
 waitress
-sshtunnel
-requests
+sshtunnel

conjurer_musician/revoke_shares.py

@@ -1,99 +0,0 @@
-#!/usr/bin/env python3
-import os
-import re
-import time
-import json
-import argparse
-import sys
-from pathlib import Path
-
-# — CONFIGURATION — adjust as needed —
-APACHE_LOG     = '/var/log/apache2/share_access.log'  # <- point to your share-specific log!
-SHARE_DIR      = Path('/var/www/html/share')
-METADATA_FILE  = SHARE_DIR / '.downloads.json'
-STATE_FILE     = SHARE_DIR / '.logpos'
-# Regex to match lines like: "GET /share/abcdef1234... HTTP/1.1"
-TOKEN_REGEX    = re.compile(r'"\s*GET\s+/share/([0-9a-f]{32})\s+HTTP/')
-
-def debug(msg, args):
-    if args.debug:
-        print(f"[DEBUG] {msg}", file=sys.stderr)
-
-def load_metadata(args):
-    if METADATA_FILE.exists():
-        data = json.loads(METADATA_FILE.read_text())
-        debug(f"Loaded metadata: {data}", args)
-        return data
-    return {}
-
-def save_metadata(md, args):
-    METADATA_FILE.write_text(json.dumps(md))
-    debug(f"Saved metadata: {md}", args)
-
-def load_state(args):
-    if STATE_FILE.exists():
-        pos = int(STATE_FILE.read_text())
-        debug(f"Loaded last log position: {pos}", args)
-        return pos
-    return 0
-
-def save_state(pos, args):
-    STATE_FILE.write_text(str(pos))
-    debug(f"Saved new log position: {pos}", args)
-
-def scan_log(since_pos, args):
-    try:
-        with open(APACHE_LOG, 'r') as f:
-            f.seek(since_pos)
-            lines = f.readlines()
-            newpos = f.tell()
-        debug(f"Read {len(lines)} new lines", args)
-        return lines, newpos
-    except Exception as e:
-        print(f"Error reading log: {e}", file=sys.stderr)
-        return [], since_pos
-
-def record_downloads(lines, metadata, args):
-    now = time.time()
-    for line in lines:
-        m = TOKEN_REGEX.search(line)
-        if m:
-            tok = m.group(1)
-            if tok not in metadata:
-                metadata[tok] = now
-                debug(f"Recorded download of token {tok} at {now}", args)
-    return metadata
-
-def revoke_old(metadata, args):
-    now = time.time()
-    to_remove = [tok for tok, ts in metadata.items() if now - ts >= 3600]
-    for tok in to_remove:
-        link = SHARE_DIR / tok
-        try:
-            link.unlink()
-            debug(f"Unlinked token {tok}", args)
-        except FileNotFoundError:
-            debug(f"Link {link} not found when revoking", args)
-        metadata.pop(tok, None)
-    return bool(to_remove)
-
-def main():
-    p = argparse.ArgumentParser(description="Revoke share links 2min after download")
-    p.add_argument('--debug', action='store_true', help='print debug info to stderr')
-    args = p.parse_args()
-
-    SHARE_DIR.mkdir(parents=True, exist_ok=True)
-    metadata = load_metadata(args)
-    state    = load_state(args)
-
-    lines, newpos = scan_log(state, args)
-    metadata      = record_downloads(lines, metadata, args)
-    save_metadata(metadata, args)               # always persist new downloads
-
-    if revoke_old(metadata, args):
-        save_metadata(metadata, args)           # persist removals
-
-    save_state(newpos, args)
-
-if __name__ == '__main__':
-    main()

conjurer_musician/scan_shares.py

@@ -1,44 +0,0 @@
-#!/usr/bin/env python3
-import os
-import json
-import time
-from pathlib import Path
-
-# Configuration
-SCAN_PATH = '/mnt/shares'
-OUTPUT_FILE = '/var/log/share_scan.json'
-
-def scan_directory(root):
-    """Recursively walk `root` and collect metadata."""
-    entries = []
-    for dirpath, dirs, files in os.walk(root):
-        for name in dirs + files:
-            full = os.path.join(dirpath, name)
-            try:
-                stat = os.stat(full)
-                entries.append({
-                    'path': full,
-                    'is_dir': os.path.isdir(full),
-                    'size_bytes': stat.st_size,
-                    'mtime': time.strftime('%Y-%m-%dT%H:%M:%S%z',
-                                           time.localtime(stat.st_mtime)),
-                })
-            except Exception as e:
-                # skip items we can't stat
-                continue
-    return entries
-
-def main():
-    data = {
-        'scanned_at': time.strftime('%Y-%m-%dT%H:%M:%S%z', time.localtime()),
-        'root': SCAN_PATH,
-        'entries': scan_directory(SCAN_PATH),
-    }
-    # Write atomically
-    temp = OUTPUT_FILE + '.tmp'
-    with open(temp, 'w') as f:
-        json.dump(data, f, indent=2)
-    os.replace(temp, OUTPUT_FILE)
-
-if __name__ == '__main__':
-    main()

conjurer_musician/scan_shares.service

@@ -1,6 +0,0 @@
-[Unit]
-Description=One‑shot scan of /mnt/shares → JSON
-
-[Service]
-Type=oneshot
-ExecStart=/usr/local/bin/scan_shares.py

conjurer_musician/scan_shares.timer

@@ -1,11 +0,0 @@
-[Unit]
-Description=Hourly timer for share‑scanner
-
-[Timer]
-# delay 2min after boot, then every hour
-OnBootSec=20min
-OnUnitActiveSec=24h
-Unit=scan_shares.service
-
-[Install]
-WantedBy=timers.target

conjurer_musician/script.params

@@ -1,195 +0,0 @@
-{
-  "string": [],
-  "bool": [ [ "Skip track", false ], [ "Going Live!", false ] ],
-  "int": [],
-  "float": [
-    [
-    "mic_volume",
-    0.0
-  ],
-    [
-    "compress_gain6",
-    0.1
-  ],
-    [
-    "compress_ratio6",
-    7.9
-  ],
-    [
-    "compress_threshold6",
-    -15.8
-  ],
-    [
-    "compress_release6",
-    30.0
-  ],
-    [
-    "compress_attack6",
-    30.0
-  ],
-    [
-    "compress_frequency6",
-    18610.0
-  ],
-    [
-    "compress_gain5",
-    5.4
-  ],
-    [
-    "compress_ratio5",
-    4.8
-  ],
-    [
-    "compress_threshold5",
-    -13.6
-  ],
-    [
-    "compress_release5",
-    120.0
-  ],
-    [
-    "compress_attack5",
-    160.0
-  ],
-    [
-    "compress_frequency5",
-    13950.0
-  ],
-    [
-    "compress_gain4",
-    6.5
-  ],
-    [
-    "compress_ratio4",
-    4.0
-  ],
-    [
-    "compress_threshold4",
-    -12.2
-  ],
-    [
-    "compress_release4",
-    130.0
-  ],
-    [
-    "compress_attack4",
-    200.0
-  ],
-    [
-    "compress_frequency4",
-    3890.0
-  ],
-    [
-    "compress_gain3",
-    5.5
-  ],
-    [
-    "compress_ratio3",
-    3.5
-  ],
-    [
-    "compress_threshold3",
-    -11.7
-  ],
-    [
-    "compress_release3",
-    140.0
-  ],
-    [
-    "compress_attack3",
-    250.0
-  ],
-    [
-    "compress_frequency3",
-    2270.0
-  ],
-    [
-    "compress_gain2",
-    3.3
-  ],
-    [
-    "compress_ratio2",
-    3.9
-  ],
-    [
-    "compress_threshold2",
-    -11.5
-  ],
-    [
-    "compress_release2",
-    120.0
-  ],
-    [
-    "compress_attack2",
-    250.0
-  ],
-    [
-    "compress_frequency2",
-    1920.0
-  ],
-    [
-    "compress_gain1",
-    5.6
-  ],
-    [
-    "compress_ratio1",
-    3.4
-  ],
-    [
-    "compress_threshold1",
-    -12.2
-  ],
-    [
-    "compress_release1",
-    120.0
-  ],
-    [
-    "compress_attack1",
-    220.0
-  ],
-    [
-    "compress_frequency1",
-    650.0
-  ],
-    [
-    "compress_gain0",
-    7.5
-  ],
-    [
-    "compress_ratio0",
-    3.2
-  ],
-    [
-    "compress_threshold0",
-    -13.1
-  ],
-    [
-    "compress_release0",
-    110.0
-  ],
-    [
-    "compress_attack0",
-    140.0
-  ],
-    [
-    "compress_frequency0",
-    110.0
-  ],
-    [
-    "compress_wet",
-    1.0
-  ],
-    [
-    "main_volume",
-    1.8
-  ],
-    [
-    "g",
-    1.0
-  ],
-    [
-    "f",
-    106.4
-  ]
-  ]
-}

conjurer_musician/search_and_share.py

@@ -1,93 +0,0 @@
-#!/usr/bin/env python3
-import argparse
-import json
-import os
-import sys
-import uuid
-from pathlib import Path
-
-# CONFIGURATION
-JSON_DB        = '/var/log/share_scan.json'
-SHARE_DIR      = Path('/var/www/html/share')
-BASE_URL       = 'https://czernobog.pl/share'
-
-# Ensure share directory exists
-SHARE_DIR.mkdir(parents=True, exist_ok=True)
-
-def load_db():
-    with open(JSON_DB) as f:
-        return json.load(f)['entries']
-
-def relevancy(path, keywords):
-    score = 0
-    low = path.lower()
-    for kw in keywords:
-        if kw.lower() in low:
-            score += low.count(kw.lower())
-    return score
-
-def find_matches(entries, keywords):
-    scored = []
-    for e in entries:
-        score = relevancy(e['path'], keywords)
-        if score > 0:
-            scored.append((score, e['path']))
-    scored.sort(reverse=True, key=lambda x: x[0])
-    return [p for _, p in scored]
-
-def interactive_select(candidates):
-    print("Search results:")
-    for idx, p in enumerate(candidates, 1):
-        print(f" {idx:3d}. {p}")
-    sel = input("\nSelect files (e.g. 1,3-5): ").strip()
-    nums = set()
-    for part in sel.split(','):
-        if '-' in part:
-            a,b = part.split('-',1)
-            nums.update(range(int(a), int(b)+1))
-        else:
-            nums.add(int(part))
-    return [candidates[i-1] for i in sorted(nums) if 1 <= i <= len(candidates)]
-
-def publish(paths):
-    urls = []
-    for path in paths:
-        token = uuid.uuid4().hex
-        link = SHARE_DIR / token
-        try:
-            os.symlink(path, link)
-        except FileExistsError:
-            pass
-        urls.append(f"{BASE_URL}/{token}")
-    return urls
-
-def main():
-    parser = argparse.ArgumentParser(description="Search and share files from JSON DB")
-    parser.add_argument('keywords', nargs='*',
-                        help='Search keywords (interactive if omitted)')
-    parser.add_argument('-n','--count', type=int, default=10,
-                        help='How many top results to share')
-    args = parser.parse_args()
-
-    if not args.keywords:
-        # Interactive: ask for query
-        q = input("Enter search keywords (space-separated): ").strip().split()
-        args.keywords = q
-
-    entries   = load_db()
-    matches   = find_matches(entries, args.keywords)
-    top_n     = matches[:args.count]
-
-    if sys.stdin.isatty():
-        # interactive selection
-        sel = interactive_select(top_n)
-    else:
-        # non-interactive: share all top_n
-        sel = top_n
-
-    urls = publish(sel)
-    for u in urls:
-        print(u)
-
-if __name__=='__main__':
-    main()

constants.py

@@ -1,36 +1,13 @@
-"""Centralised configuration and runtime constants for Conjurer services.
-
-This module used to perform heavy filesystem and credential reads at import
-time which made the project brittle on hosts that did not mirror the original
-paths.  The current implementation defers that work, reads configuration from
-environment variables (with sensible fallbacks), and protects optional
-dependencies so the main bot can start even when a secondary service is
-offline.
-"""
-
 import json
-import logging
-import os
+import netrc
 from datetime import datetime
-from pathlib import Path
-from typing import Dict, List, Optional, Tuple, TypedDict
+from platform import uname
+from sys import platform
+from typing import List, Optional, TypedDict
 
-try:
-    import netrc
-except ImportError:  # pragma: no cover - standard on CPython
-    netrc = None
-
-try:
-    import openai
-except ImportError:  # pragma: no cover - optional at runtime
-    openai = None
-
-try:
-    import spotipy
-    from spotipy.oauth2 import SpotifyClientCredentials
-except ImportError:  # pragma: no cover - optional component
-    spotipy = None
-    SpotifyClientCredentials = None
+import openai
+import spotipy
+from spotipy.oauth2 import SpotifyClientCredentials
 
 Music_Config = TypedDict(
     "Music_Config",
@@ -47,43 +24,21 @@ MASTER_TIMEOUT = datetime.now()
 INITIAL_TIME_WAIT = 500
 MUZYKA: Music_Config = {"ctx": None, "queue": [], "requester": []}
 
-logger = logging.getLogger("discord")
-
-
-def _env_path(var_name: str, fallback: Path) -> Path:
-    value = os.getenv(var_name)
-    if value:
-        return Path(value).expanduser().resolve()
-    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", "")
+LOGFILE = ""
+NETRC_FILE = ""
+MUSIC_FOLDER = ""
+MEMORY_FIVE_SIARA = ""
+MEMORY_FIVE_MUZYKA = ""
+SETTINGS_FILE = ""
+ENCODING = ""
+GRAPHICS_PATH = ""
 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")
+FILE_SERVICE_ADDRESS = "http://192.168.1.15:5000"
+RADIO_HARBOR_ADDRESS = "http://192.168.1.15:54321"
+SKIP_TRACK = "/skip"
 
 GET_MP3 = "/mp3"
 SEND_MP3 = "/update_mp3"
@@ -93,133 +48,92 @@ CREATE_PRIO_PLAYLIST = "/create_priority_playlist"
 
 REQUEST_MUSIC = "/request_radio_file"
 CLEAR_PRIO = "/clear_pr_pls"
-LIBRARIAN_SERVICE_ADDRESS = _env(
-    "CONJURER_LIBRARIAN_SERVICE", "http://127.0.0.1:5001"
-)
-SEND_QUERY = _env("CONJURER_LIBRARIAN_QUERY_ENDPOINT", "/query")
+LIBRARIAN_SERVICE_ADDRESS = "http://192.168.1.192:5001"
+SEND_QUERY = "/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"))
+HOST_ADDRESS = "192.168.1.191"
+PORT_ADDRESS = 5000
 
 # *=========================================== Platform Specific Predefines
 
-SEPARATOR_FILE_PATH = _env("CONJURER_PATH_SEPARATOR", os.sep)
+if platform in ("linux", "linux2"):
+    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"
 
-DIR_PATH_SADOX = _env_path(
-    "CONJURER_SADOX_DIR", BASE_DIR / "Fansadox"
-)
-
-SYSTEM_GPT_SETTINGS = _env_path(
-    "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"
-)
-
-
-def _load_json(path: Path, fallback) -> object:
-    try:
-        with path.open("r", encoding=ENCODING) as handle:
-            return json.load(handle)
-    except FileNotFoundError:
-        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)
-        return fallback
-
-
-DATA = _load_json(SETTINGS_FILE, {})
-WORD_REACTIONS = DATA.get("word_reactions", {})
-CYCLIC_WORDS = DATA.get("cyclic_words", {})
-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, {})
-GPT_SETTINGS = _load_json(SYSTEM_GPT_SETTINGS, {})
-MESSAGE_TABLE_MUZYKA = _load_json(MEMORY_FIVE_MUZYKA, {})
-
-SPECJALNE_ZIEMNIACZKI = GPT_SETTINGS[1] if isinstance(GPT_SETTINGS, list) else {}
-ASSISTANTS: Dict[str, Tuple[str, str, int, object]] = {}
-
-
-def _load_netrc_credentials(host: str) -> Optional[Tuple[str, str, str]]:
-    if netrc is None:
-        return None
-    try:
-        parsed = netrc.netrc(str(NETRC_FILE))
-    except FileNotFoundError:
-        logger.warning("netrc file %s not found", NETRC_FILE)
-        return None
-    except netrc.NetrcParseError:
-        logger.warning("netrc file %s is invalid", NETRC_FILE)
-        return None
-    return parsed.authenticators(host)
-
-
-def _resolve_token(host: str, env_var: str) -> Optional[str]:
-    env_value = os.getenv(env_var)
-    if env_value:
-        return env_value
-    creds = _load_netrc_credentials(host)
-    if creds:
-        return creds[2]
-    logger.warning("Token for %s not configured", host)
-    return None
-
-
-OPENAI_API_KEY = _resolve_token("openai", "OPENAI_API_KEY")
-if openai and OPENAI_API_KEY:
-    openai.api_key = OPENAI_API_KEY
-    OPENAICLIENT = openai.AsyncOpenAI(api_key=OPENAI_API_KEY)
-else:
-    OPENAICLIENT = None
-
-TOKEN = _resolve_token("discord", "DISCORD_TOKEN")
-
-if spotipy:
-    spotify_creds = _load_netrc_credentials("spotipy")
-    if spotify_creds and SpotifyClientCredentials:
-        SPOTIFY_CTRL = spotipy.Spotify(
-            client_credentials_manager=SpotifyClientCredentials(
-                client_id=spotify_creds[0],
-                client_secret=spotify_creds[2],
-            )
-        )
     else:
-        SPOTIFY_CTRL = None
-else:
-    SPOTIFY_CTRL = None
-
-youtube_creds = _load_netrc_credentials("youtube")
-if youtube_creds:
-    YOUTUBE_AUTH = [youtube_creds[0], youtube_creds[2]]
-else:
-    YOUTUBE_AUTH = [
-            os.getenv("YOUTUBE_USERNAME", ""),
-            os.getenv("YOUTUBE_PASSWORD", ""),
-        ]
+        LOGFILE = "/home/pi/Conjurer/discord.log"
+        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/RetroPie/mp3/"
+        SETTINGS_FILE = "/home/pi/Conjurer/settings.json"
+        NETRC_FILE = "/home/pi/.netrc"
+        LOGSTORE = "/home/pi/RetroPie/logs/"
+        ACCIDENT_LOG = "/home/pi/Conjurer/accident_log.json"
+        ENCODING = "utf-8"
+        GRAPHICS_PATH = "/home/pi/RetroPie/Conjurer_graphics/"
+        DIR_PATH_SADOX = "/home/pi/RetroPie/Fansadox/"
 
 
-def service_headers() -> Dict[str, str]:
-    """Shared header dict for internal HTTP calls."""
-    if API_SHARED_KEY:
-        return {"X-Conjurer-Api-Key": API_SHARED_KEY}
-    return {}
+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 = "\\"
+with open(SETTINGS_FILE, "r", encoding=ENCODING) as f_settings_file:
+    DATA = json.load(f_settings_file)
+REMOTE_HOST_NAME = "openai"
+netrc_mod = netrc.netrc(NETRC_FILE)
+authTokens = netrc_mod.authenticators(REMOTE_HOST_NAME)
+openai.api_key = authTokens[2]
+OPENAICLIENT = openai.AsyncOpenAI(api_key=openai.api_key)
+REMOTE_HOST_NAME = "discord"
+authTokens = netrc_mod.authenticators(REMOTE_HOST_NAME)
+TOKEN = authTokens[2]
 
+REMOTE_HOST_NAME = "spotipy"
+authTokens = netrc_mod.authenticators(REMOTE_HOST_NAME)
+SPOTIFY_CTRL = spotipy.Spotify(
+    client_credentials_manager=SpotifyClientCredentials(
+        client_id=authTokens[0],
+        client_secret=authTokens[2],
+    )
+)
 
-LATEX_TEX_ENGINE = "tectonic"
-LATEX_MAX_COMPILE_SECONDS = 45
-LATEX_MAX_ATTACH_MB = 8
-LATEX_MAX_ZIP_MB =  25
+WORD_REACTIONS = DATA["word_reactions"]
+CYCLIC_WORDS = DATA["cyclic_words"]
+for key in WORD_REACTIONS:
+    WORD_REACTIONS[key][2] = datetime.now()
+with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as temp_memory_file:
+    # First we load existing data into a dict.
+    MESSAGE_TABLE = json.load(temp_memory_file)
 
-OPENAI_MODEL = "gpt-4o-mini"
-
-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)
+with open(SYSTEM_GPT_SETTINGS, "r+", encoding=ENCODING) as temp_settings_file:
+    # First we load existing data into a dict.
+    GPT_SETTINGS = json.load(temp_settings_file)
+with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as temp_music_memory_file:
+    # First we load existing data into a dict.
+    MESSAGE_TABLE_MUZYKA = json.load(temp_music_memory_file)
+SPECJALNE_ZIEMNIACZKI = GPT_SETTINGS[1]
+ASSISTANTS = {}

deploy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-total_commands=29
+total_commands=24
 current_command=0
 
 function print_progress {
@@ -79,24 +79,8 @@ print_progress "cp ./conjurer/radio_commands.py ./Conjurer/"
 cp ./conjurer/voice_recognition_commands.py ./Conjurer/
 print_progress "cp ./conjurer/voice_recognition_commands.py ./Conjurer/"
 
-cp ./conjurer/file_search_functions.py ./Conjurer/
-
-print_progress "cp ./conjurer/file_search_functions.py ./Conjurer/"
-
-cp ./conjurer/file_search_commands.py ./Conjurer
-print_progress "cp ./conjurer/file_search_functions.py ./Conjurer/"
-
-cp ./conjurer/latex_commands.py ./Conjurer/
-print_progress "cp ./conjurer/latex_commands.py ./Conjurer/"
-
-cp ./conjurer/latex_functions.py ./Conjurer/
-print_progress "cp ./conjurer/latex_functions.py ./Conjurer/"
-
-cp ./conjurer/librarian_functions.py ./Conjurer
-print_progress "cp ./conjurer/librarian_functions.py ./Conjurer/"
-
 cp ./conjurer/thin_client.py ./Conjurer/bot.py
 print_progress "cp ./conjurer/thin_client.py ./Conjurer/bot.py"
 
 sudo systemctl restart conjurer.service
-print_progress "sudo systemctl restart conjurer.service"
+print_progress "sudo systemctl restart conjurer.service"

deploy_music.sh

@@ -2,6 +2,5 @@
 cd ./conjurer || exit
 git pull
 cd ..
-cp ./conjurer/conjurer_musician/media_search_functions.py ./Conjurer
 cp ./conjurer/conjurer_musician/conjurer_musician.py ./Conjurer
-sudo systemctl restart conjurer_musician.service
+sudo systemctl restart conjurer_musician.service

dj_fonts_system_install.sh

@@ -1,141 +0,0 @@
-#!/usr/bin/env bash
-# System-wide install & verify (Debian/RPi):
-#  - EB Garamond (APT)
-#  - Cinzel Decorative Black (RAW TTF)
-#  - IM Fell English SC (gstatic/RAW)
-# No TeX build here. Very verbose + clear final report.
-
-set -Eeuo pipefail
-
-SUDO=sudo; [ "$(id -u)" -eq 0 ] && SUDO=
-log(){ echo -e "[+] $*"; }
-warn(){ echo -e "[WARN] $*" >&2; }
-die(){ echo -e "[FATAL] $*" >&2; exit 1; }
-
-need(){ command -v "$1" >/dev/null 2>&1 || die "Missing tool: $1"; }
-fetch(){
-  local url="$1" out="$2"
-  if command -v wget >/dev/null 2>&1; then
-    log "wget -> $url"
-    wget -O "$out" --https-only --no-verbose "$url"
-  else
-    log "curl -> $url"
-    curl -L --fail --show-error --output "$out" "$url"
-  fi
-}
-
-# ---- detection using fc-list families (robust, no PCRE) ----
-fc_families_lower() {
-  fc-list -f '%{family}\n' \
-  | tr ',' '\n' \
-  | sed 's/^[[:space:]]*//; s/[[:space:]]*$//' \
-  | tr '[:upper:]' '[:lower:]' \
-  | sort -u
-}
-has_family_re() {  # $1 = POSIX ERE anchored-at-start pattern (lowercase)
-  fc_families_lower | grep -Eiq "$1"
-}
-
-# ---- prereqs ----
-for t in fc-cache fc-list grep sed awk; do need "$t"; done
-command- v wget >/dev/null 2>&1 || command -v curl >/dev/null 2>&1 || die "Need wget or curl"
-
-SYSTEM_DIR="/usr/local/share/fonts/dj"
-DIR_CINZEL="$SYSTEM_DIR/cinzel-decorative"
-DIR_IMFELL="$SYSTEM_DIR/im-fell-english-sc"
-$SUDO mkdir -p "$DIR_CINZEL" "$DIR_IMFELL"
-
-echo "=== APT phase (EB Garamond) ==="
-if command -v apt-get >/dev/null 2>&1; then
-  $SUDO apt-get update -y || warn "apt update failed (continuing)"
-  if $SUDO apt-get install -y --no-install-recommends fonts-ebgaramond; then
-    log "installed: fonts-ebgaramond"
-  else
-    warn "apt install failed: fonts-ebgaramond"
-  fi
-else
-  warn "apt-get not found — skipping"
-fi
-
-echo
-log "Families BEFORE web fallback (sample grep):"
-fc-list | grep -Ei "Garamond|Cinzel|Fell" || echo "  (none)"
-
-echo
-echo "=== Web fallback (system-wide to $SYSTEM_DIR) ==="
-
-# --- Cinzel Decorative Black ---
-CINZEL_TTF="$DIR_CINZEL/CinzelDecorative-Black.ttf"
-if ! has_family_re '^cinzel decorative( |$)'; then
-  fetch "https://github.com/google/fonts/raw/main/ofl/cinzeldecorative/CinzelDecorative-Black.ttf" "$CINZEL_TTF" || warn "Cinzel Decorative Black download failed"
-  [ -s "$CINZEL_TTF" ] && $SUDO chmod 0644 "$CINZEL_TTF"
-else
-  log "Cinzel Decorative already present."
-fi
-
-# --- IM Fell English SC ---
-IMFELL_TTF="$DIR_IMFELL/IMFeENsc.ttf"
-if ! has_family_re '^im fell english sc( |$)'; then
-  # Try known gstatic TTFs (stable direct links)
-  for u in \
-    "https://fonts.gstatic.com/s/imfellenglishsc/v7/h3Tn6yWfw4b5qaLD1RWvz5ATixNthKRRR1XVH3rJNiw.ttf" \
-    "https://fonts.gstatic.com/s/imfellenglishsc/v6/h3Tn6yWfw4b5qaLD1RWvz5ATixNthKRRR1XVH3rJNiw.ttf"
-  do
-    if fetch "$u" "$IMFELL_TTF"; then
-      [ -s "$IMFELL_TTF" ] && { $SUDO chmod 0644 "$IMFELL_TTF"; log "IM Fell SC from gstatic OK"; break; }
-    fi
-  done
-  # Secondary RAW in google/fonts (names changed over time)
-  if [ ! -s "$IMFELL_TTF" ]; then
-    for u in \
-      "https://github.com/google/fonts/raw/main/ofl/imfellenglishsc/IMFeENsc28P.ttf" \
-      "https://github.com/google/fonts/raw/main/ofl/imfellenglishsc/IMFellEnglishSC-Regular.ttf"
-    do
-      if fetch "$u" "$IMFELL_TTF"; then
-        [ -s "$IMFELL_TTF" ] && { $SUDO chmod 0644 "$IMFELL_TTF"; log "IM Fell SC from google/fonts RAW OK"; break; }
-      fi
-    done
-  fi
-  # Minimal mirror fallback (only if naprawdę trzeba)
-  if [ ! -s "$IMFELL_TTF" ]; then
-    for u in \
-      "https://www.wfonts.com/download/data/2016/06/14/im-fell-english-sc/IMFeENsc28P.ttf" \
-      "https://www.1001freefonts.com/d/6800/IMFeENsc28P.ttf"
-    do
-      fetch "$u" "$IMFELL_TTF" || true
-      [ -s "$IMFELL_TTF" ] && { $SUDO chmod 0644 "$IMFELL_TTF"; log "IM Fell SC from mirror OK"; break; }
-    done
-  fi
-  [ -s "$IMFELL_TTF" ] || warn "IM Fell English SC still missing."
-else
-  log "IM Fell English SC already present."
-fi
-
-echo
-log "Fix perms & rebuild cache..."
-$SUDO find "$SYSTEM_DIR" -type f -size 0 -print -delete || true
-$SUDO find "$SYSTEM_DIR" -type f \( -name "*.ttf" -o -name "*.otf" \) -exec chmod 0644 {} \; || true
-$SUDO find "$SYSTEM_DIR" -type d -exec chmod 0755 {} \; || true
-$SUDO fc-cache -f -v >/dev/null || warn "fc-cache returned non-zero"
-
-# ---- FINAL REPORT ----
-echo
-log "FINAL STATUS (fc-list families & file presence)"
-families="$(fc_families_lower)"
-
-report(){
-  local label="$1" fam_re="$2" file_hint="$3"
-  local fam_ok file_ok="n/a"
-  if echo "$families" | grep -Eiq "$fam_re"; then fam_ok="OK"; else fam_ok="MISSING"; fi
-  if [ -n "$file_hint" ]; then
-    if [ -s "$file_hint" ]; then file_ok="yes"; else file_ok="no"; fi
-  fi
-  printf "  %-22s : families=%-8s file=%-3s  (%s)\n" "$label" "$fam_ok" "$file_ok" "${file_hint:-no-file-hint}"
-}
-
-report "EB Garamond"           '^eb garamond( |$)'           ""                 # from APT
-report "Cinzel Decorative"     '^cinzel decorative( |$)'      "$CINZEL_TTF"
-report "IM Fell English SC"    '^im fell english sc( |$)'     "$IMFELL_TTF"
-
-echo
-log "Done. (Run your LaTeX pipeline next.)"

docker-compose.yml

@@ -1,45 +0,0 @@
-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,23 +0,0 @@
-FROM python:3.11-slim
-
-ENV PYTHONUNBUFFERED=1 \
-    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 requirements_bot.txt /tmp/requirements.txt
-RUN pip install -r /tmp/requirements.txt
-
-COPY . /app
-
-RUN useradd --create-home appuser \
-    && chown -R appuser:appuser /app
-
-USER appuser
-
-CMD ["python", "thin_client.py"]

docker/Dockerfile.librarian

@@ -1,24 +0,0 @@
-FROM python:3.11-slim
-
-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 /tmp/requirements.txt
-RUN pip install -r /tmp/requirements.txt
-
-COPY . /app
-
-RUN useradd --create-home appuser \
-    && chown -R appuser:appuser /app
-
-USER appuser
-
-CMD ["python", "-m", "conjurer_librarian.conjurer_librarian"]

docker/Dockerfile.musician

@@ -1,23 +0,0 @@
-FROM python:3.11-slim
-
-ENV PYTHONUNBUFFERED=1 \
-    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 requirements_bot.txt /tmp/requirements.txt
-RUN pip install -r /tmp/requirements.txt
-
-COPY . /app
-
-RUN useradd --create-home appuser \
-    && chown -R appuser:appuser /app
-
-USER appuser
-
-CMD ["python", "-m", "conjurer_musician.conjurer_musician"]

docker/env/bot.env.example

@@ -1,24 +0,0 @@
-# Discord bot service configuration
-
-DISCORD_TOKEN=HACKME!
-OPENAI_API_KEY=HACKME!
-CONJURER_API_KEY=HACKME!
-
-# Internal service endpoints
-CONJURER_FILE_SERVICE=http://conjurer-musician:5000
-CONJURER_LIBRARIAN_SERVICE=http://conjurer-librarian:5001
-
-# Runtime paths mounted via docker-compose volumes
-CONJURER_BASE_DIR=/data/config
-CONJURER_SETTINGS_FILE=/data/config/settings.json
-CONJURER_MEMORY_FILE=/data/config/pamiec.json
-CONJURER_MUSIC_MEMORY_FILE=/data/config/pamiec_muzyki.json
-CONJURER_SYSTEM_GPT_SETTINGS=/data/config/system_gpt_settings.json
-CONJURER_GRAPHICS_PATH=/data/assets/graphics
-CONJURER_LOG_FILE=/data/logs/discord.log
-CONJURER_LOGSTORE=/data/logs
-
-# Optional external integrations
-CONJURER_NETRC_FILE=/data/secrets/.netrc
-YOUTUBE_USERNAME=HACKME!
-YOUTUBE_PASSWORD=HACKME!

docker/env/librarian.env.example

@@ -1,14 +0,0 @@
-# Librarian service configuration
-
-CONJURER_API_KEY=HACKME!
-
-CONJURER_MAIN_BOT=http://conjurer-bot:5000
-
-CONJURER_LIBRARIAN_HOST=0.0.0.0
-CONJURER_LIBRARIAN_PORT=5001
-CONJURER_LIBRARIAN_MAX_RESULTS=500
-
-CONJURER_CROSSREF_MAILTO=HACKME!
-CONJURER_LIBRARIAN_LOG=/data/logs/librarian.log
-
-CONJURER_NETRC_FILE=/data/secrets/.netrc

docker/env/musician.env.example

@@ -1,20 +0,0 @@
-# Musician service configuration
-
-CONJURER_API_KEY=HACKME!
-
-CONJURER_MAIN_BOT=http://conjurer-bot:5000
-CONJURER_MUSIC_TRACKER_ENDPOINT=/prepped_tracks
-
-CONJURER_MUSICIAN_HOST=0.0.0.0
-CONJURER_MUSICIAN_PORT=5000
-
-CONJURER_MUSIC_FOLDER=/data/music
-CONJURER_PRIORITY_FOLDER=/data/priority
-CONJURER_ALL_PLAYLIST=/data/playlists/all_playlist.playlist
-CONJURER_HIT_PLAYLIST=/data/playlists/hit.playlist
-CONJURER_REQUEST_PLAYLIST=/data/playlists/request.playlist
-CONJURER_PRIORITY_PLAYLIST=/data/playlists/priority_queue.playlist
-CONJURER_STREAM_TEMPLATE=/data/templates/stream.html
-
-CONJURER_RADIO_LOG=/data/logs/radio.log
-CONJURER_PERSISTENCE_LOG=/data/logs/persistence.log

docs/deployment/DEPLOYMENT_GUIDE.md

@@ -1,163 +0,0 @@
-# Conjurer Deployment Guide
-
-This document walks through deploying the Conjurer stack (Discord bot, music
-service, librarian service) on two Raspberry Pi 4s and one Windows host, first
-with plain Docker Compose, then with a future Kubernetes setup.
-
-## 1. Current Hardware Layout
-
-- **Windows PC**: Stores persistent data (JSON memories, configs, music
-  catalogue). Shares folders over the network (SMB) for the Pis.
-- **Raspberry Pi A** (“radio”): Runs the Liquidsoap/liq radio pipeline and the
-  musician service (Flask + file watcher).
-- **Raspberry Pi B** (“bot”): Runs the Discord bot, communication bridge, and
-  librarian Flask service.
-
-You can rebalance as follows:
-
-| Service             | Recommended Host | Notes |
-|---------------------|------------------|-------|
-| Discord bot + comms | Raspberry Pi B   | Needs outbound internet, moderate CPU |
-| Librarian service   | Raspberry Pi B   | CPU-heavy during Crossref queries; keep close to bot |
-| Musician service    | Raspberry Pi A   | Has direct disk access to music, same box as Liquidsoap |
-| Data storage        | Windows          | Expose via SMB; mount inside containers |
-
-## 2. Prepare Shared Storage on Windows
-
-1. Create directories, e.g. `C:\Conjurer\config`, `C:\Conjurer\logs`,
-   `C:\Conjurer\music`, `C:\Conjurer\playlists`, `C:\Conjurer\secrets`.
-2. Copy your existing JSON settings (`settings.json`, `pamiec.json`,
-   `pamiec_muzyki.json`, `system_gpt_settings.json`, etc.) into `config`.
-3. Create blank placeholder files if they do not exist yet.
-4. Share the root folder (`C:\Conjurer`) over SMB with read/write access for the
-   Pi user (create credentials if necessary).
-
-## 3. Configure Environment Files
-
-1. On your workstation, copy the example env files:
-   ```bash
-   cp docker/env/bot.env.example docker/env/bot.env
-   cp docker/env/musician.env.example docker/env/musician.env
-   cp docker/env/librarian.env.example docker/env/librarian.env
-   ```
-2. Edit each `docker/env/*.env` to replace `HACKME!` with real values:
-   - `DISCORD_TOKEN`, `OPENAI_API_KEY`, `CONJURER_API_KEY` (use the same value for
-     all services).
-   - For musician/librarian, adjust mounts to the SMB paths you will mount on the
-     Pis, e.g. `/mnt/conjurer/music`.
-   - Set `CONJURER_CROSSREF_MAILTO` to a real email as required by Crossref.
-3. If you rely on `.netrc`, copy it to `C:\Conjurer\secrets\.netrc` and set
-   `CONJURER_NETRC_FILE` accordingly.
-
-## 4. Install Docker on Raspberry Pis and Windows
-
-### Raspberry Pi
-```bash
-curl -fsSL https://get.docker.com | sh
-sudo usermod -aG docker $USER
-sudo reboot
-
-# Install docker compose plugin
-sudo apt-get install docker-compose-plugin
-```
-
-### Windows
-- Install **Docker Desktop**.
-- Enable WSL2 backend and expose the shared Windows folders to the containers
-  (Docker Desktop settings → Resources → File Sharing).
-
-## 5. Deploy Musician Service (Pi A)
-
-1. SSH into Raspberry Pi A.
-2. Mount the Windows SMB share:
-   ```bash
-   sudo mkdir -p /mnt/conjurer
-   sudo apt-get install cifs-utils
-   sudo mount -t cifs //WINDOWS_HOST/Conjurer /mnt/conjurer -o user=YOURUSER
-   ```
-   Add an entry to `/etc/fstab` for persistence.
-3. Copy the repo to the Pi or `git clone` it.
-4. On Pi A, create override compose file (optional) pointing volumes to
-   `/mnt/conjurer`.
-5. Start only the musician service:
-   ```bash
-   docker compose up --build -d musician
-   ```
-   Alternatively, duplicate `docker-compose.yml`, strip other services, and run
-   `docker compose up -d`.
-
-## 6. Deploy Bot + Librarian (Pi B)
-
-1. Repeat SMB mount on Pi B (same mount path).
-2. Copy repo / pull latest changes.
-3. Create `.env` files with tokens (or copy from control machine).
-4. Start bot and librarian:
-   ```bash
-   docker compose up -d bot librarian
-   ```
-
-## 7. Optional: Run Supporting Liquidsoap Radio
-
-- Keep Liquidsoap on Pi A as-is, using the same music directories. Ensure the
-  musician container has read access to those directories (bind mount).
-
-## 8. Verifying
-
-1. `docker ps` on each Pi to confirm containers running.
-2. Inspect logs under the mounted logs directory (`/mnt/conjurer/logs`).
-3. Join Discord server; issue commands to confirm functionality.
-4. Hit health endpoints manually (e.g. `curl http://PIB:5000/conjurer`).
-
-## Rebalancing Suggestions
-
-- If librarian CPU spikes become an issue, move it to Pi A or another host.
-- If you add a dedicated NAS, mount the network share read-only for the musician
-  container and read/write for other services.
-
-## 9. Future Kubernetes Deployment (Outline)
-
-### Hardware Considerations
-
-- Minimum three nodes for HA: use the existing two Pis plus one additional Pi 4
-  (8 GB preferred). Use Windows PC as storage provider via NFS/SMB CSI driver or
-  as a data gateway.
-- Consider Pi clusters with USB SSDs for better I/O.
-
-### Cluster Setup Steps
-
-1. Install a lightweight Kubernetes distribution (e.g., k3s) on each Pi:
-   ```bash
-   curl -sfL https://get.k3s.io | sh -
-   # On additional nodes
-   curl -sfL https://get.k3s.io | K3S_URL=https://MASTER:6443 K3S_TOKEN=HACKME sh -
-   ```
-2. Install MetalLB for load balancer support on LAN.
-3. Configure persistent volumes using:
-   - `nfs-subdir-external-provisioner` pointing to Windows share (ensure Windows
-     host supports NFS or run an NFS gateway on another machine).
-   - Alternatively, attach individual USB drives to each Pi and use
-     `local-path-provisioner` for node-local storage.
-4. Create Kubernetes `Secret` objects for tokens (`DISCORD_TOKEN`, etc.).
-5. Define `Deployment` manifests for each service (bot, musician, librarian) and
-   associated `Services`.
-6. Expose Discord bot ports via `NodePort` or Ingress.
-7. Use `StatefulSet` if you need stable identity for the musician service (due to
-   local storage).
-
-### Optimisation Tips
-
-- Keep CPU-heavy librarian pods optionally on a beefier node; use
-  `nodeSelector`/`affinity` to pin workloads.
-- Consider splitting the persistent storage: music on Pi A (USB disk), logs and
-  configs on Pi B, backups on Windows.
-- For improved reliability, add at least one extra Pi for quorum and to host the
-  communication bridge if the bot node fails.
-
-## Summary Checklist
-
-1. Prepare Windows shares & tokens.
-2. Configure `docker/env/*.env` using `HACKME!` templates as reference.
-3. Install Docker on Pis, mount network shares.
-4. Launch musician on Pi A, bot + librarian on Pi B.
-5. Verify Discord functionality and API endpoints.
-6. Plan Kubernetes migration when ready (k3s + MetalLB + storage provisioner).

ffmpeg.pref

@@ -1,3 +0,0 @@
-Package: ffmpeg libavcodec-dev libavcodec59 libavdevice59 libavfilter8 libavformat-dev libavformat59 libavutil-dev libavutil57 libpostproc56 libswresample-dev libswresample4 libswscale-dev libswscale6 libavdevice-dev libavfilter-dev libpostproc-dev
-Pin: origin deb.debian.org
-Pin-Priority: 1001

file_search_commands.py

@@ -1,71 +0,0 @@
-import os
-import discord
-from discord.ext import commands
-import file_search_functions
-
-class FileSelectView(discord.ui.View):
-    def __init__(self, files):
-        super().__init__(timeout=60)
-        options = [discord.SelectOption(label=os.path.basename(f)[:100], description=f, value=f) for f in files]
-        self.select = discord.ui.Select(
-            placeholder="Select files...",
-            min_values=1,
-            max_values=len(options),
-            options=options
-        )
-        self.select.callback = self.select_callback
-        self.add_item(self.select)
-        self.selected = []
-
-    async def select_callback(self, interaction: discord.Interaction):
-        # Store selected file paths
-        self.selected = self.select.values
-        await interaction.response.defer()
-
-    @discord.ui.button(label="Accept", style=discord.ButtonStyle.green)
-    async def accept_callback(self, interaction: discord.Interaction, button: discord.ui.Button):
-        # Handle acceptance
-        if not self.selected:
-            await interaction.response.send_message("No files selected.", ephemeral=True)
-            return
-        # Publish selected files
-        links = file_search_functions.publish(self.selected)
-        # Display the returned links
-        await interaction.response.edit_message(content="Published Links:\n" + "\n".join(links), view=None)
-
-    @discord.ui.button(label="Cancel", style=discord.ButtonStyle.red)
-    async def cancel_callback(self, interaction: discord.Interaction, button: discord.ui.Button):
-        # Handle cancellation
-        await interaction.response.edit_message(content="Operation cancelled.", view=None)
-
-class FileSearchCog(commands.Cog):
-    """Cog providing a file search and publish command."""
-
-    def __init__(self, bot: commands.Bot):
-        self.bot = bot
-
-    @commands.has_any_role("Jarl", "Thane")
-    @commands.command(name="tajna_biblioteka_inkwizycji")
-    async def findfiles(self, ctx: commands.Context, entries: int, *, keywords: str):
-        """
-        Search for files matching keywords and publish selected ones.
-
-        Usage: !findfiles <entries 1-10> <keywords>
-        """
-        if entries < 1 or entries > 10:
-            await ctx.send("❌ Entries must be between 1 and 10.")
-            return
-        keyword_list = keywords.split()
-        files = file_search_functions.find_matches(entries, keyword_list)
-        if not files:
-            await ctx.send("🔍 No matching files found.")
-            return
-        view = FileSelectView(files)
-        file_list = "\n".join(f"{i+1}. {f}" for i, f in enumerate(files))
-        await ctx.send(
-            f"🔍 Found files (select and click Accept or Cancel):\n{file_list}",
-            view=view
-        )
-
-async def setup(bot: commands.Bot):
-    await bot.add_cog(FileSearchCog(bot))

file_search_functions.py

@@ -1,31 +0,0 @@
-import requests
-
-# Base URL for Flask service
-BASE_URL = 'http://192.168.1.15:5000'
-
-
-def find_matches(entries, keywords):
-    """
-    Call the get_share_list endpoint.
-    entries: int (1-10)
-    keywords: list of strings
-    Returns: list of file paths
-    """
-    payload = {'entries': entries, 'keywords': keywords}
-    response = requests.post(f"{BASE_URL}/get_share_list", json=payload)
-    response.raise_for_status()
-    data = response.json()
-    return data.get('files', [])
-
-
-def publish(file_paths):
-    """
-    Call the get_share_links endpoint.
-    file_paths: list of file path strings
-    Returns: list of published URLs
-    """
-    payload = {'file_paths': file_paths}
-    response = requests.post(f"{BASE_URL}/get_share_links", json=payload)
-    response.raise_for_status()
-    data = response.json()
-    return data.get('links', [])

fontget.sh

@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-# "apt dla fontów": Google Fonts ZIP → GitHub (ofl RAW) → fonts.gstatic.com → mirrory.
-# System-wide install do /usr/local/share/fonts/fontget/<rodzina> + fc-cache.
-# Usage: sudo ./fontget.sh "IM Fell English SC" "Cinzel Decorative" "EB Garamond"
-
-set -Eeuo pipefail
-SUDO=sudo; [ "$(id -u)" -eq 0 ] && SUDO=
-log(){ echo -e "[+] $*"; }
-warn(){ echo -e "[WARN] $*" >&2; }
-die(){ echo -e "[FATAL] $*" >&2; exit 1; }
-
-need(){ command -v "$1" >/dev/null 2>&1 || die "Missing: $1"; }
-need fc-cache
-command -v wget >/dev/null 2>&1 || command -v curl >/dev/null 2>&1 || die "Need wget/curl"
-command -v unzip >/dev/null 2>&1 || warn "unzip missing — ZIP installs limited"
-command -v file  >/dev/null 2>&1 || warn "file missing — MIME checks limited"
-command -v fc-list >/dev/null 2>&1 || die "Missing: fc-list"
-
-fetch(){ local u="$1" o="$2"; if command -v wget >/dev/null 2>&1; then wget -O "$o" --https-only --no-verbose "$u"; else curl -L --fail --show-error --output "$o" "$u"; fi; }
-slug(){ echo "$1" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+|-+$//g'; }
-present(){ fc-list -f '%{family}\n' | tr ',' '\n' | sed 's/^[[:space:]]*//; s/[[:space:]]*$//' | tr '[:upper:]' '[:lower:]' | sort -u | grep -Eiq "$1"; }
-
-install_dir="/usr/local/share/fonts/fontget"; $SUDO mkdir -p "$install_dir"
-
-is_zip(){ command -v file >/dev/null 2>&1 && file "$1" | grep -qi zip; }
-gf_zip_try(){
-  local name="$1" outdir="$2" enc zip
-  enc="$(python3 - <<PY
-import urllib.parse,sys
-print(urllib.parse.quote(sys.argv[1]))
-PY
-"$name")" || enc="$(echo "$name" | sed 's/ /%20/g')"
-  zip="$(mktemp /tmp/fontget.XXXXXX.zip)"
-  if fetch "https://fonts.google.com/download?family=${enc}" "$zip"; then
-    if is_zip "$zip"; then $SUDO mkdir -p "$outdir"; $SUDO unzip -o -q "$zip" -d "$outdir" || true; rm -f "$zip"; return 0; fi
-  fi
-  rm -f "$zip" || true; return 1
-}
-gh_ofl_try(){
-  local family="$1" outdir="$2" html
-  html="$(mktemp /tmp/ofl.$(slug "$family").html)"
-  if fetch "https://github.com/google/fonts/tree/main/ofl/$(slug "$family")" "$html"; then
-    mapfile -t paths < <(grep -Eo '/google/fonts/blob/main/ofl/'"$(slug "$family")"'/[^"]+\.(ttf|otf)' "$html" | sed 's|/blob/|/raw/|g' | sort -u)
-    [ "${#paths[@]}" -gt 0 ] || { rm -f "$html"; return 1; }
-    $SUDO mkdir -p "$outdir"
-    for p in "${paths[@]}"; do fetch "https://github.com$p" "$outdir/$(basename "$p")" || true; done
-    rm -f "$html"; return 0
-  fi
-  rm -f "$html"; return 1
-}
-gstatic_try(){ local out="$2"; shift 2; for u in "$@"; do fetch "$u" "$out" && [ -s "$out" ] && return 0; done; return 1; }
-
-report(){ local label="$1" re="$2"; if present "$re"; then printf "RESULT: %-24s : OK\n" "$label"; else printf "RESULT: %-24s : FAIL\n" "$label"; fi }
-
-if [ $# -lt 1 ]; then echo "Usage: $0 <Font Family> [Another ...]"; exit 1; fi
-
-for family in "$@"; do
-  echo; log "=== $family ==="
-  fam_slug="$(slug "$family")"
-  outdir="$install_dir/$fam_slug"
-  $SUDO mkdir -p "$outdir"
-
-  case "$fam_slug" in
-    cinzel-decorative|cinzel|cinzel-decorative-black)
-      fetch "https://github.com/google/fonts/raw/main/ofl/cinzeldecorative/CinzelDecorative-Black.ttf" "$outdir/CinzelDecorative-Black.ttf" || warn "Cinzel fetch failed"
-      ;;
-    im-fell-english-sc)
-      gstatic_try "$fam_slug" "$outdir/IMFeENsc.ttf" \
-        "https://fonts.gstatic.com/s/imfellenglishsc/v7/h3Tn6yWfw4b5qaLD1RWvz5ATixNthKRRR1XVH3rJNiw.ttf" \
-        "https://fonts.gstatic.com/s/imfellenglishsc/v6/h3Tn6yWfw4b5qaLD1RWvz5ATixNthKRRR1XVH3rJNiw.ttf" \
-      || { fetch "https://github.com/google/fonts/raw/main/ofl/imfellenglishsc/IMFeENsc28P.ttf" "$outdir/IMFeENsc.ttf" || true
-           [ -s "$outdir/IMFeENsc.ttf" ] || fetch "https://github.com/google/fonts/raw/main/ofl/imfellenglishsc/IMFellEnglishSC-Regular.ttf" "$outdir/IMFeENsc.ttf" || true
-           [ -s "$outdir/IMFeENsc.ttf" ] || fetch "https://www.wfonts.com/download/data/2016/06/14/im-fell-english-sc/IMFeENsc28P.ttf" "$outdir/IMFeENsc.ttf" || true
-           [ -s "$outdir/IMFeENsc.ttf" ] || fetch "https://www.1001freefonts.com/d/6800/IMFeENsc28P.ttf" "$outdir/IMFeENsc.ttf" || true; }
-      ;;
-    eb-garamond|ebgaramond)
-      # Najpierw apt (jeśli chcesz: sudo apt install fonts-ebgaramond), tu tylko web:
-      gf_zip_try "$family" "$outdir" || gh_ofl_try "$family" "$outdir" || true
-      ;;
-    *)
-      gf_zip_try "$family" "$outdir" || gh_ofl_try "$family" "$outdir" || true
-      ;;
-  esac
-
-  $SUDO find "$outdir" -type f -size 0 -print -delete || true
-  $SUDO find "$outdir" -type f \( -name "*.ttf" -o -name "*.otf" \) -exec chmod 0644 {} \; || true
-  $SUDO find "$outdir" -type d -exec chmod 0755 {} \; || true
-  $SUDO fc-cache -f -v >/dev/null || true
-
-  case "$fam_slug" in
-    cinzel* )            report "Cinzel Decorative"   '^cinzel decorative( |$)' ;;
-    im-fell-english-sc ) report "IM Fell English SC"  '^im fell english sc( |$)' ;;
-    eb-garamond* )       report "EB Garamond"         '^eb garamond( |$)' ;;
-    * )                  report "$family"             "$(echo "$family" | tr '[:upper:]' '[:lower:]' | sed 's/ /.* /g')" ;;
-  esac
-done
-
-echo; log "All done."

gpt_interface/app.py

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

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

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

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

install_main_bot.sh

@@ -1,22 +1,20 @@
 #!/bin/bash
 sudo apt-get install python3-dev
-sudo apt-get install portaudio19-dev python3-pyaudio
-sudo apt-get install
 cd /home/pi || exit
 mdkir Conjurer
 cd Conjurer ||exit
-python3 -m venv /home/pi/Conjurer/.env
+python3 -m venv /home/pi/Conjurer/.venv
 cp /home/pi/conjurer/requirements_bot.txt /home/pi/Conjurer/
 # trunk-ignore(shellcheck/SC1091)
-source /home/pi/Conjurer/.env/bin/activate
-./.env/bin/python3 -m pip install --upgrade pip
-./.env/bin/python3 -m pip install -r requirements_bot.txt
-sed -i -e 's/os.rename/shutil.copy/g' ./.env/lib/python3.11/site-packages/spotify_dl/youtube.py
-sed -i '1i\import shutil' ./.env/lib/python3.11/site-packages/spotify_dl/youtube.py
-sed -i '1i\import logging' ./.env/lib/python3.11/site-packages/spotify_dl/spotify.py
+source /home/pi/Conjurer/.venv/bin/activate
+./env/bin/python3 -m pip install --upgrade pip
+./env/bin/python3 -m pip install -r requirements_bot.txt
+sed -i -e 's/os.rename/shutil.copy/g' ./env/lib/python3.11/site-packages/spotify_dl/youtube.py
+sed -i '1i\import shutil' ./env/lib/python3.11/site-packages/spotify_dl/youtube.py
+sed -i '1i\import logging' ./env/lib/python3.11/site-packages/spotify_dl/spotify.py
 
-sed -i '21i\         logger = logging.getLogger("discord")' ./.env/lib/python3.11/site-packages/spotify_dl/spotify.py
-sed -i '22i\         logger.info("Playlist")' ./.env/lib/python3.11/site-packages/spotify_dl/spotify.py
+sed -i '21i\         logger = logging.getLogger("discord")' ./env/lib/python3.11/site-packages/spotify_dl/spotify.py
+sed -i '22i\         logger.info("Playlist")' ./env/lib/python3.11/site-packages/spotify_dl/spotify.py
 #add sed changing signal registration to catch exception in spotify dl init
 deactivate
 sudo cp ./conjurer.service /etc/systemd/system/

install_music_bot.sh

@@ -25,12 +25,8 @@ sudo usermod -aG pulse-access root
 sudo usermod -aG audio pi
 sudo usermod -aG audio root
 
-echo "Add exception suppresion to signal handler in spotify __ini__.py"
-echo "Add password to youtube opts in spotify_dl youtube.py"
-echo "Downgrade ffmpeg by copying ffmpeg.pref from repository to /etc/apt/preferences.d"
-echo "Install opam from installation link"
-echo "Initialize opam"
-echo "Install liquidsoap and its dependencies"
+
+
 
 touch /home/pi/Conjurer/radio_log.log
 ./env/bin/python3 -m pip install --upgrade pip

latex_commands.py

@@ -1,280 +0,0 @@
-# latex_commands.py
-# -*- coding: utf-8 -*-
-from __future__ import annotations
-
-import io
-import logging
-from typing import Optional
-
-import discord
-from discord import app_commands
-from discord.ext import commands
-
-from constants import (
-    ALLOWED_ROLES,
-    GUILD_ID,
-    LATEX_MAX_ATTACH_MB,
-    LATEX_MAX_COMPILE_SECONDS,
-    LATEX_MAX_ZIP_MB,
-    LATEX_TEX_ENGINE,
-    OPENAI_MODEL,
-)
-from latex_functions import (
-    compile_single_tex_bytes,
-    compile_zip_to_zip,
-    is_safe_asset_name,
-    is_safe_tex_name,
-)
-
-
-async def _collect_attachments_bytes(attachments, max_mb: int):
-    """
-    Zwraca słownik {filename: bytes} dla wszystkich załączników, do limitu MB.
-    Nie podbija wyjątków z .read() — zostawiamy to wyżej; tu zwracamy, co się udało.
-    """
-    out = {}
-    for a in attachments or []:
-        # limit rozmiaru
-        if (getattr(a, "size", 0) or 0) > max_mb * 1024 * 1024:
-            continue
-        data = await a.read()
-        out[a.filename] = data
-    return out
-
-
-class LatexModule(commands.Cog):
-    def __init__(self, bot: commands.Bot, logger_name: str):
-        self.bot = bot
-        self.logger = logging.getLogger(logger_name)
-        self.logger_name = logger_name
-
-    # -------- /tex (PDF + diagnoza; log -> debug logger) --------
-    @commands.hybrid_command(
-        nsfw=False,
-        name="tex",
-        description="Kompiluje załączone .tex; PDF-y odsyła. Błędy: diagnoza z OpenAI.",
-        guild=None if GUILD_ID is None else discord.Object(id=GUILD_ID),
-    )
-    @commands.has_any_role(*ALLOWED_ROLES)
-    async def tex(
-        self, ctx: commands.Context, include_source_excerpt: Optional[bool] = True
-    ):
-        self.logger.info("LaTeX command invoked by %s", ctx.author)
-        ch = ctx.message.channel
-        # ZBIERZ WSZYSTKIE ZAŁĄCZNIKI
-        async with ch.typing():
-            all_bytes = await _collect_attachments_bytes(
-                ctx.message.attachments, LATEX_MAX_ATTACH_MB
-            )
-            if not all_bytes:
-                return await ctx.reply(
-                    f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False
-                )
-
-            # PODZIEL NA GŁÓWNE .TEX i WSPIERAJĄCE
-            tex_names = [
-                n
-                for n in all_bytes.keys()
-                if n.lower().endswith(".tex") and is_safe_tex_name(n)
-            ]
-            if not tex_names:
-                return await ctx.reply(
-                    f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False
-                )
-
-            support_names = [
-                n
-                for n in all_bytes.keys()
-                if n not in tex_names and is_safe_asset_name(n)
-            ]
-
-            files_to_send = []
-            parts = []
-
-            for tex_name in tex_names:
-                try:
-                    main_bytes = all_bytes[tex_name]
-                    support = [
-                        (n, all_bytes[n])
-                        for n in support_names
-                        if n != tex_name and is_safe_asset_name(n)
-                    ]
-                    # (ważne) do supportów dopuszczamy również **inne .tex** – dla \input/\include
-                    other_tex = [
-                        (n, all_bytes[n])
-                        for n in tex_names
-                        if n != tex_name and is_safe_tex_name(n)
-                    ]
-                    support.extend(other_tex)
-
-                    res = await compile_single_tex_bytes(
-                        main_bytes,
-                        tex_name,
-                        LATEX_TEX_ENGINE,
-                        LATEX_MAX_COMPILE_SECONDS,
-                        logger="discord",
-                        support_files=support,
-                    )
-
-                    # Twoja dotychczasowa obsługa success/fail – przykładowo:
-                    if res["ok"] and res["pdf_bytes"]:
-                        b = io.BytesIO(res["pdf_bytes"])
-                        b.seek(0)
-                        b.name = res["pdf_name"]
-                        files_to_send.append(discord.File(b, filename=res["pdf_name"]))
-                        parts.append(f"✅ `{tex_name}` → `{res['pdf_name']}`")
-                    else:
-                        parts.append(
-                            f"❌ `{tex_name}` — błąd kompilacji.)"
-                        )
-                        # Tutaj wywołujesz swoją ścieżkę do OpenAI diagnozy, którą ogarnęliśmy wcześniej.
-                except Exception:
-                    # let it crash — pełny stack w logu i re-raise (Discord.py to pokaże sensownie)
-                    logging.getLogger("discord").exception(
-                        "Unhandled exception while compiling %s", tex_name
-                    )
-                    raise
-
-                content = (
-                    f"**LaTeX** — {len(tex_names)} plik(ów). Model: `{OPENAI_MODEL}`\n\n"
-                    + "\n\n".join(parts)
-                )
-                await ctx.reply(
-                    content if len(content) < 1900 else content[:1900] + "…",
-                    files=files_to_send,
-                    mention_author=False,
-                )
-
-    # -------- /latexclean (PDF only; log -> debug logger) --------
-    @commands.hybrid_command(
-        nsfw=False,
-        name="latexclean",
-        description="Kompiluje .tex i odsyła TYLKO PDF (log w debug).",
-        guild=None if GUILD_ID is None else discord.Object(id=GUILD_ID),
-    )
-    @commands.has_any_role(*ALLOWED_ROLES)
-    async def latexclean(self, ctx: commands.Context):
-        ch = ctx.message.channel
-        async with ch.typing():
-            all_bytes = await _collect_attachments_bytes(
-                ctx.message.attachments, LATEX_MAX_ATTACH_MB
-            )
-            if not all_bytes:
-                return await ctx.reply(
-                    f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False
-                )
-
-            # PODZIEL NA GŁÓWNE .TEX i WSPIERAJĄCE
-            tex_names = [
-                n
-                for n in all_bytes.keys()
-                if n.lower().endswith(".tex") and is_safe_tex_name(n)
-            ]
-            if not tex_names:
-                return await ctx.reply(
-                    f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False
-                )
-
-            support_names = [
-                n
-                for n in all_bytes.keys()
-                if n not in tex_names and is_safe_asset_name(n)
-            ]
-
-            files_to_send = []
-            parts = []
-
-            for tex_name in tex_names:
-                try:
-                    main_bytes = all_bytes[tex_name]
-                    support = [
-                        (n, all_bytes[n])
-                        for n in support_names
-                        if n != tex_name and is_safe_asset_name(n)
-                    ]
-                    # (ważne) do supportów dopuszczamy również **inne .tex** – dla \input/\include
-                    other_tex = [
-                        (n, all_bytes[n])
-                        for n in tex_names
-                        if n != tex_name and is_safe_tex_name(n)
-                    ]
-                    support.extend(other_tex)
-
-                    res = await compile_single_tex_bytes(
-                        main_bytes,
-                        tex_name,
-                        LATEX_TEX_ENGINE,
-                        LATEX_MAX_COMPILE_SECONDS,
-                        logger="discord",
-                        support_files=support,
-                    )
-
-                    # Twoja dotychczasowa obsługa success/fail – przykładowo:
-                    if res["ok"] and res["pdf_bytes"]:
-                        b = io.BytesIO(res["pdf_bytes"])
-                        b.seek(0)
-                        b.name = res["pdf_name"]
-                        files_to_send.append(discord.File(b, filename=res["pdf_name"]))
-                        parts.append(f"✅ `{tex_name}` → `{res['pdf_name']}`")
-                    else:
-                        parts.append(
-                            f"❌ `{tex_name}` — błąd kompilacji.)"
-                        )
-                        # Tutaj wywołujesz swoją ścieżkę do OpenAI diagnozy, którą ogarnęliśmy wcześniej.
-                except Exception:
-                    # let it crash — pełny stack w logu i re-raise (Discord.py to pokaże sensownie)
-                    logging.getLogger("discord").exception(
-                        "Unhandled exception while compiling %s", tex_name
-                    )
-                    raise
-            await ctx.reply(
-                "**LaTeX clean** — " + ", ".join(parts),
-                files=files_to_send,
-                mention_author=False,
-            )
-
-    # -------- /texbatch (ZIP -> ZIP) --------
-    @app_commands.command(
-        name="texbatch",
-        description="Wyślij ZIP z .tex → odeślę ZIP z PDF-ami (tylko udane).",
-    )
-    @app_commands.describe(archive=f"Archiwum .zip (max ~{LATEX_MAX_ZIP_MB} MiB)")
-    @app_commands.checks.has_any_role(*ALLOWED_ROLES)
-    async def texbatch(
-        self, interaction: discord.Interaction, archive: discord.Attachment
-    ):
-        await interaction.response.defer()
-        if not archive or not archive.filename.lower().endswith(".zip"):
-            return await interaction.followup.send(
-                "Dołącz ZIP (.zip) z plikami .tex.", ephemeral=True
-            )
-        if archive.size > LATEX_MAX_ZIP_MB * 1024 * 1024:
-            return await interaction.followup.send(
-                f"ZIP > {LATEX_MAX_ZIP_MB} MiB — za duży.", ephemeral=True
-            )
-
-        data = await archive.read()
-        out_zip_bytes, failed = await compile_zip_to_zip(
-            data, LATEX_TEX_ENGINE, LATEX_MAX_COMPILE_SECONDS, logger=self.logger_name
-        )
-        if not out_zip_bytes and failed:
-            return await interaction.followup.send(
-                "Brak PDF-ów. " + "; ".join(failed[:10]), ephemeral=True
-            )
-
-        bio = io.BytesIO(out_zip_bytes)
-        bio.seek(0)
-        bio.name = "compiled_pdfs.zip"
-        if failed:
-            self.logger.debug("BATCH failed: %s", ", ".join(failed))
-        await interaction.followup.send(
-            "✅ Gotowe (ZIP w załączniku)."
-            + (f" ❌ Błędy: {len(failed)}" if failed else ""),
-            files=[discord.File(bio, filename=bio.name)],
-        )
-
-
-async def setup(bot):
-    logger = logging.getLogger("discord")
-    await bot.add_cog(LatexModule(bot, logger_name="discord"))
-    logger.info("Loading kinky latex module done")

latex_functions.py

@@ -1,179 +0,0 @@
-import asyncio
-import logging
-import re
-import shutil
-import tempfile
-import zipfile
-from pathlib import Path
-from typing import Dict, Iterable, List, Optional, Tuple
-
-# ===== Bezpieczeństwo nazw/rozszerzeń =====
-SAFE_TEX_NAME = re.compile(r"^[\w\-. ]+\.tex$", re.IGNORECASE)
-SAFE_ASSET_NAME = re.compile(
-    r"^[\w\-. /]+?\.(tex|png|jpg|jpeg|pdf|svg|eps|bmp|gif|sty|cls|bib|bst|bbx|cbx|def|cfg)$",
-    re.IGNORECASE,
-)
-
-def is_safe_tex_name(name: str) -> bool:
-    return bool(SAFE_TEX_NAME.match(name or ""))
-
-def is_safe_asset_name(name: str) -> bool:
-    return bool(SAFE_ASSET_NAME.match(name or ""))
-
-# ===== Uruchamianie kompilatora =====
-
-async def _run(cmd: List[str], cwd: Path, timeout_sec: int, logger_name: Optional[str]) -> Tuple[int, str]:
-    """Uruchamia proces kompilatora w cwd, zwraca (rc, sklejone_stdout_stderr)."""
-    logger = logging.getLogger(logger_name) if logger_name else logging.getLogger()
-    logger.debug("RUN %s (cwd=%s, timeout=%s)", " ".join(cmd), cwd, timeout_sec)
-
-    proc = await asyncio.create_subprocess_exec(
-        *cmd,
-        stdout=asyncio.subprocess.PIPE,
-        stderr=asyncio.subprocess.STDOUT,
-        cwd=str(cwd),
-    )
-    try:
-        out = await asyncio.wait_for(proc.communicate(), timeout=timeout_sec)
-    except asyncio.TimeoutError:
-        try:
-            proc.kill()
-        finally:
-            pass
-        return 124, "TIMEOUT: compiler took too long"
-    rc = proc.returncode
-    log = (out[0] or b"").decode("utf-8", errors="ignore")
-    logger.debug("RC=%s, LOG TAIL:\n%s", rc, log[-1500:])
-    return rc, log
-
-def _build_cmd(tex_engine: str, main_tex: str) -> List[str]:
-    """Buduje komendę kompilatora; domyślnie tectonic/pdflatex/xelatex."""
-    if tex_engine.lower() == "tectonic":
-        # Tectonic sam robi wielofazowość, ale i tak uruchamiamy 2x (bezpiecznie dla bib/refs)
-        return ["tectonic", "--keep-intermediates", "--synctex", main_tex]
-    elif tex_engine.lower() in ("pdflatex", "xelatex", "lualatex"):
-        return [tex_engine, "-interaction=nonstopmode", "-halt-on-error", main_tex]
-    else:
-        # fallback – traktujemy jak pdflatex
-        return ["pdflatex", "-interaction=nonstopmode", "-halt-on-error", main_tex]
-
-async def run_latex_two_passes(
-    tex_filename: str, workdir: Path, tex_engine: str, timeout_sec: int, logger: Optional[str] = None
-) -> Tuple[bool, str, Path]:
-    """
-    Uruchamia kompilację 2 razy (bezpieczeństwo referencji/bib).
-    Zwraca: (ok, log_text, pdf_path).
-    """
-    logger_obj = logging.getLogger(logger) if logger else logging.getLogger()
-    logger_obj.info("Compiling %s with %s engine two passes", tex_filename, tex_engine)
-    logs: List[str] = []
-    pdf_path = workdir / (Path(tex_filename).stem + ".pdf")
-
-    # PASS 1
-    rc1, log1 = await _run(_build_cmd(tex_engine, tex_filename), workdir, timeout_sec, logger)
-    logs.append(log1)
-    if rc1 != 0:
-        return False, "".join(logs), pdf_path
-
-    # PASS 2 (często już nic nie robi, ale nie szkodzi)
-    rc2, log2 = await _run(_build_cmd(tex_engine, tex_filename), workdir, timeout_sec, logger)
-    logs.append(log2)
-    ok = (rc2 == 0) and pdf_path.exists()
-    return ok, "".join(logs), pdf_path
-
-# ===== Kompilacje: pojedynczy TEX + ZIP =====
-
-async def compile_single_tex_bytes(
-    tex_bytes: bytes,
-    filename: str,
-    tex_engine: str,
-    timeout_sec: int,
-    logger: Optional[str] = None,
-    support_files: Optional[Iterable[Tuple[str, bytes]]] = None,
-) -> Dict[str, Optional[object]]:
-    """
-    Kompiluje pojedynczy .tex + dowolne pliki pomocnicze (obrazy, sty/cls/bib, inne .tex).
-    Każdy plik zapisujemy w katalogu roboczym widocznym dla kompilatora.
-    """
-    log = logging.getLogger(logger) if logger else logging.getLogger()
-    log.info("Compiling %s with %s engine single tex", filename, tex_engine)
-    if not is_safe_tex_name(filename):
-        return {"ok": False, "pdf_bytes": None, "log_text": "Invalid .tex filename", "pdf_name": None}
-
-    with tempfile.TemporaryDirectory(prefix="latex_one_") as td:
-        wd = Path(td)
-        (wd / Path(filename).name).write_bytes(tex_bytes)
-
-        # Zapisz wszystkie supporty obok głównego pliku
-        if support_files:
-            for fname, data in support_files:
-                if not fname or not is_safe_asset_name(fname):
-                    continue
-                # spłaszczamy do nazwy bazowej (bez podkatalogów z zewn. źródeł)
-                (wd / Path(fname).name).write_bytes(data)
-
-        ok, log_text, pdf_path = await run_latex_two_passes(Path(filename).name, wd, tex_engine, timeout_sec, logger)
-        log.info("LaTeX compile finished: %s", "OK" if ok else "FAIL")
-        log.info("Log text:\n%s", log_text[-2000:])  # Log last 2000 chars
-        log.info("PDF path: %s", pdf_path)
-        if ok and pdf_path.exists():
-            return {
-                "ok": True,
-                "pdf_bytes": pdf_path.read_bytes(),
-                "log_text": log_text,
-                "pdf_name": pdf_path.name,
-            }
-        return {"ok": False, "pdf_bytes": None, "log_text": log_text, "pdf_name": pdf_path.name}
-
-async def compile_zip_to_zip(
-    zip_bytes: bytes, tex_engine: str, timeout_sec: int, logger: Optional[str] = None
-) -> Tuple[bytes, List[str]]:
-    """
-    Rozpakowuje ZIP, znajduję wszystkie .tex i dla KAŻDEGO tworzy osobny katalog roboczy
-    ze skopiowanym CAŁYM drzewem, by zachować ścieżki względne obrazków/plików.
-    Zwraca (zip_pdf_bytes, lista_rel_sciezek_które_padły).
-    """
-    log = logging.getLogger(logger) if logger else logging.getLogger()
-    failed: List[str] = []
-    out_pdf_paths: List[Path] = []
-
-    with tempfile.TemporaryDirectory(prefix="latex_zip_") as td:
-        td_path = Path(td)
-        src_root = td_path / "src"
-        src_root.mkdir(parents=True, exist_ok=True)
-
-        # 1) Rozpakuj
-        zpath = td_path / "in.zip"
-        zpath.write_bytes(zip_bytes)
-        with zipfile.ZipFile(zpath, "r") as zf:
-            zf.extractall(src_root)
-
-        # 2) Zbierz .tex
-        tex_files = [p for p in src_root.rglob("*.tex") if is_safe_tex_name(p.name)]
-        if not tex_files:
-            return b"", ["No .tex files found in archive."]
-
-        # 3) Kompiluj każdy .tex w izolacji (kopiujemy całe drzewo do osobnego workdiru)
-        for tex_path in tex_files:
-            rel_tex = tex_path.relative_to(src_root).as_posix()
-            work = td_path / f"build_{tex_path.stem}"
-            try:
-                shutil.copytree(src_root, work / "src")
-                ok, log_text, pdf = await run_latex_two_passes(rel_tex, work / "src", tex_engine, timeout_sec, logger)
-                if ok and pdf.exists():
-                    out_pdf_paths.append(pdf)
-                else:
-                    failed.append(rel_tex)
-                    log.info("LaTeX FAIL %s\n%s", rel_tex, (log_text or "")[-2000:])
-            except Exception:
-                # let it crash – log + re-raise (to zobaczy wyższa warstwa/discord.py)
-                log.exception("Exception while compiling %s", rel_tex)
-                raise
-
-        # 4) Spakuj wyjściowe PDF-y
-        out_zip = td_path / "compiled_pdfs.zip"
-        with zipfile.ZipFile(out_zip, "w", compression=zipfile.ZIP_DEFLATED) as zf:
-            for pdf in out_pdf_paths:
-                zf.write(pdf, arcname=pdf.name)
-
-        return out_zip.read_bytes(), failed

librarian_commands.py

@@ -8,21 +8,13 @@ from queue import Empty
 
 import discord
 import pdf2image
-import fitz
 import PyPDF2
 import requests
 from discord.ext import commands, tasks
 
 from ai_functions import handle_response
 from communication_subroutine import IN_COMM_Q, OUT_COMM_Q, QueryControl
-from constants import (
-    DIR_PATH_SADOX,
-    LIBRARIAN_SERVICE_ADDRESS,
-    SEND_QUERY,
-    service_headers,
-)
-
-SERVICE_HEADERS = service_headers()
+from constants import DIR_PATH_SADOX, LIBRARIAN_SERVICE_ADDRESS, SEND_QUERY
 
 
 class DataModule(commands.Cog):
@@ -61,34 +53,20 @@ class DataModule(commands.Cog):
             filename = res[random.randrange(0, len(res) - 1)]
             # select random page
             file = open(DIR_PATH_SADOX + filename, "rb")
-            if  True:
-                doc = fitz.open(DIR_PATH_SADOX + filename)
-                totalpages = len(doc)
-                # trunk-ignore(bandit/B311)
-                page_index = random.randrange(0, totalpages)
-                page = doc.load_page(page_index)
-                mat = fitz.Matrix(2.0, 2.0)  # powiększenie
-                pix = page.get_pixmap(matrix=mat, alpha=False)
-
-                byte_io_stream = io.BytesIO(pix.tobytes("png"))
-                byte_io_stream.seek(0)
-                byte_io_stream.name = "image.png"
-                await ctx.send(file=discord.File(byte_io_stream))
-            else: #legacy
-                readpdf = PyPDF2.PdfReader(file)
-                totalpages = len(readpdf.pages)
-                # trunk-ignore(bandit/B311)
-                page = random.randrange(1, totalpages)
-                # convert page to image
-                image = pdf2image.convert_from_path(
-                    DIR_PATH_SADOX + filename, first_page=page, last_page=page
-                )
-                byte_io_stream = io.BytesIO()
-                image[0].save(byte_io_stream, "JPEG")
-                byte_io_stream.seek(0)
-                byte_io_stream.name = "image.jpg"
-                file = discord.File(byte_io_stream)
-                await ctx.send(file=file)
+            readpdf = PyPDF2.PdfReader(file)
+            totalpages = len(readpdf.pages)
+            # trunk-ignore(bandit/B311)
+            page = random.randrange(1, totalpages)
+            # convert page to image
+            image = pdf2image.convert_from_path(
+                DIR_PATH_SADOX + filename, first_page=page, last_page=page
+            )
+            byte_io_stream = io.BytesIO()
+            image[0].save(byte_io_stream, "JPEG")
+            byte_io_stream.seek(0)
+            byte_io_stream.name = "image.jpg"
+            file = discord.File(byte_io_stream)
+            await ctx.send(file=file)
             self.logger.info("Get sadox completed")
 
     @tasks.loop(seconds=3)
@@ -172,7 +150,6 @@ class DataModule(commands.Cog):
             requests.post,
             f"{LIBRARIAN_SERVICE_ADDRESS}{SEND_QUERY}",
             json=json_query,
-            headers=SERVICE_HEADERS,
             timeout=360,
         )
         await ctx.send(
@@ -245,7 +222,7 @@ class DataModule(commands.Cog):
             global MESSAGE_TABLE  # pylint: disable=global-statement
 
             result, MESSAGE_TABLE = await handle_response(
-                prompt, vykidailo, bartender, MESSAGE_TABLE, username, "GENERAL"
+                prompt, vykidailo, bartender, MESSAGE_TABLE, username, "CONVERSATION"
             )
             if len(result) < 1500:
                 await ctx.send(result)
@@ -268,7 +245,6 @@ class DataModule(commands.Cog):
             requests.post,
             f"{LIBRARIAN_SERVICE_ADDRESS}{SEND_QUERY}",
             json=json_query,
-            headers=SERVICE_HEADERS,
             timeout=360,
         )
         await ctx.send(

librarian_functions.py

@@ -1,28 +0,0 @@
-# pdf_render.py
-import io
-
-try:
-    import fitz  # PyMuPDF
-    _HAS_PYMUPDF = True
-except Exception:
-    _HAS_PYMUPDF = False
-    from pdf2image import convert_from_path
-
-def pdf_page_to_image_bytes(path: str, page_index: int = 0, zoom: float = 2.0, fmt: str = "PNG") -> bytes:
-    """
-    Zwraca bytes obrazka z jednej strony PDF:
-      - PyMuPDF (szybki) jeśli dostępny,
-      - inaczej pdf2image + poppler (wymaga 'pdftoppm').
-    page_index: 0-based
-    """
-    if _HAS_PYMUPDF:
-        doc = fitz.open(path)
-        page = doc.load_page(page_index)
-        mat = fitz.Matrix(zoom, zoom)
-        pix = page.get_pixmap(matrix=mat, alpha=False)
-        return pix.tobytes(fmt.lower())
-    # fallback
-    images = convert_from_path(path, first_page=page_index+1, last_page=page_index+1, fmt=fmt)
-    bio = io.BytesIO()
-    images[0].save(bio, fmt)
-    return bio.getvalue()

manual_set_up_radio.txt

@@ -1,101 +0,0 @@
-# === SYSTEM SETUP ===
-sudo apt update && sudo apt install -y \
-  pulseaudio pulseaudio-utils pavucontrol \
-  libgtk-3-dev gtk-3-examples \
-  xauth dbus-x11 \
-  samba
-
-# === SAMBA CONFIGURATION ===
-sudo nano /etc/samba/smb.conf
-# Add at the end of the file:
-# [RaspberryPiNAS]
-#    path = /home/pi/Public
-#    comment = Pi Share
-#    browseable = yes
-#    writeable = yes
-#    guest ok = no
-#    valid users = pi
-
-# Set permissions
-chmod 755 /home/pi
-mkdir -p /home/pi/Public
-chmod 777 /home/pi/Public
-chown -R pi:pi /home/pi/Public
-
-# Set Samba password for pi
-sudo smbpasswd -a pi
-
-# Restart Samba
-sudo systemctl restart smbd
-
-# === PULSEAUDIO SYSTEM-WIDE SERVICE ===
-sudo nano /etc/systemd/system/pulseaudio.service
-# Paste this content:
-# [Unit]
-# Description=PulseAudio System-wide Daemon
-# After=sound.target network.target
-#
-# [Service]
-# Type=simple
-# ExecStart=/usr/bin/pulseaudio --system --disallow-exit --disallow-module-loading=0 --daemonize=no
-# Restart=always
-#
-# [Install]
-# WantedBy=multi-user.target
-
-# === PULSEAUDIO MODULES FOR LEXICON LAMBDA USB ===
-sudo nano /etc/pulse/system.pa
-# Comment out:
-# load-module module-udev-detect
-# load-module module-detect
-# Add this at the bottom:
-# load-module module-alsa-sink device=hw:1,0 sink_name=LambdaOutput sink_properties=device.description="Lexicon_Lambda_USB_Output"
-# load-module module-alsa-source device=hw:1,0 source_name=LambdaInput source_properties=device.description="Lexicon_Lambda_USB_Input"
-# load-module module-native-protocol-unix auth-anonymous=1 socket=/tmp/pulseaudio.socket
-
-# Set client default socket
-sudo nano /etc/pulse/client.conf
-# Add this line:
-# default-server = unix:/tmp/pulseaudio.socket
-
-# Enable and start PulseAudio system-wide
-sudo systemctl daemon-reload
-sudo systemctl enable pulseaudio.service
-sudo systemctl restart pulseaudio.service
-
-# === X11 & GUI FIXES FOR SSH/MOBAXTERM ===
-sudo nano /etc/ssh/sshd_config
-# Ensure these lines are present:
-# X11Forwarding yes
-# X11UseLocalhost no
-# XAuthLocation /usr/bin/xauth
-
-# Restart SSH
-sudo systemctl restart ssh
-
-# Ensure xauth is installed
-sudo apt install -y xauth
-
-# === BASHRC: MAKE GUI EXPORTS PERSISTENT ===
-nano ~/.bashrc
-# Add this at the end:
-# export GDK_BACKEND=x11
-# export LIBGL_ALWAYS_INDIRECT=1
-# export NO_AT_BRIDGE=1
-# export $(dbus-launch)
-
-# Reload bashrc immediately
-source ~/.bashrc
-
-# === TESTING GUI ===
-# (Reconnect via MobaXterm SSH with X11 forwarding enabled before running below)
-
-# Run pavucontrol GUI
-pavucontrol &
-
-# Optional: Test GTK GUI rendering
-gtk3-demo &
-
-# Check audio devices
-pactl list sinks short
-pactl list sources short

music_functions.py

@@ -16,16 +16,11 @@ from constants import (
     MUSIC_FOLDER,
     SEND_MP3,
     SPOTIFY_CTRL,
-    YOUTUBE_AUTH,
-    service_headers,
 )
 from spotify_dl import spotify
 from spotify_dl import youtube as youtube_download
 
-
-SERVICE_HEADERS = service_headers()
-MUSIC_ROOT = Path(MUSIC_FOLDER)
-
+logger = logging.getLogger("discord")
 
 
 class MusicFileList(object):
@@ -34,11 +29,10 @@ class MusicFileList(object):
     file service or local directory and update the list with new items.
     """
 
-    def __init__(self, logger_name) -> None:
+    def __init__(self, uplogger,) -> None:
         self.music_file_list = []
         self.file_service_active = False
-        self.logger = logging.getLogger("discord")
-
+        self.logger = uplogger
         self.logger.info("Created Playlist organizer class")
 
     async def refresh_file_list(self, bot):
@@ -48,15 +42,11 @@ class MusicFileList(object):
         """
         try:
             self.logger.info("Attempt to connect to file service")
-            response = requests.get(
-                f"{FILE_SERVICE_ADDRESS}{GET_MP3}",
-                headers=SERVICE_HEADERS,
-                timeout=60,
-            )
+            response = requests.get(f"{FILE_SERVICE_ADDRESS}{GET_MP3}", timeout=360)
             self.music_file_list = response.json()["music_file_list"]
             self.file_service_active = True
         except requests.exceptions.RequestException as e:
-            for mp3_item in MUSIC_ROOT.glob("**/*.mp3"):
+            for mp3_item in Path.glob(Path(MUSIC_FOLDER), "**/*.mp3"):
                 temp_music_file = mp3_item.as_posix()
                 if platform == "win32":
                     temp_music_file = temp_music_file.replace("/", "\\")
@@ -107,15 +97,10 @@ class MusicFileList(object):
         """
         self.music_file_list.append(item)
         post_data = {"item": str(item)}
-        requests.post(
-            f"{FILE_SERVICE_ADDRESS}{SEND_MP3}",
-            json=post_data,
-            headers=SERVICE_HEADERS,
-            timeout=60,
-        )
+        requests.post(f"{FILE_SERVICE_ADDRESS}{SEND_MP3}", json=post_data, timeout=360)
 
 
-MUSIC_FILE_LIST = MusicFileList("discord")
+MUSIC_FILE_LIST = MusicFileList(logger)
 
 
 async def get_file(ctx, source, link):
@@ -133,7 +118,6 @@ async def get_file(ctx, source, link):
     :param link: The "link" parameter is likely a string that represents a URL or file path to the
     location of the file that the function is trying to retrieve
     """
-    logger = logging.getLogger("discord")
     item_id = None
     item_type = None
     file_list = []
@@ -156,7 +140,7 @@ async def get_file(ctx, source, link):
             url_data = {"urls": []}
             url_dict = {}
             url_dict["save_path"] = Path(
-                PurePath.joinpath(MUSIC_ROOT, Path(directory_name))
+                PurePath.joinpath(Path(MUSIC_FOLDER), Path(directory_name))
             )
             url_dict["save_path"].mkdir(parents=True, exist_ok=True)
             url_dict["songs"] = file_list
@@ -166,7 +150,7 @@ async def get_file(ctx, source, link):
             coro = asyncio.to_thread(
                 youtube_download.download_songs,
                 songs=url_data,
-                output_dir=str(MUSIC_ROOT),
+                output_dir=MUSIC_FOLDER,
                 format_str="bestaudio/best",
                 skip_mp3=False,
                 keep_playlist_order=False,
@@ -176,7 +160,6 @@ async def get_file(ctx, source, link):
                 file_name_f=file_name_f,
                 multi_core=0,
                 proxy="",
-                YT_AUTH = YOUTUBE_AUTH
             )
             _ = await coro
             logger.info("YT-DL done")
@@ -219,8 +202,6 @@ async def get_file(ctx, source, link):
             else:
                 dir_path = "/home/pi/RetroPie/mp3/Youtube"
             ydl_opts = {
-                "username": YOUTUBE_AUTH[0],
-                "password": YOUTUBE_AUTH[1],
                 "proxy": "",
                 "default_search": "ytsearch",
                 "format": "bestaudio/best",
@@ -276,7 +257,7 @@ async def get_file(ctx, source, link):
         ]
         # TODO: Make sponsorblock work
         sponsorblock_postprocessor = []
-        dir_path = "/home/pi/MediaShare/movies/porn"
+        dir_path = "/home/pi/RetroPie/movies/porn"
         ydl_opts = {
             "postprocessors": sponsorblock_postprocessor,
             "paths": {"home": dir_path},
@@ -307,7 +288,6 @@ async def search_music(ctx, how_many=0, slowa_kluczowe=None):
     how_many, the function will return all search results, defaults to 0 (optional)
     """
     # i sieć neuronową z możliwością wyrażenia opinii o dopasowaniu.
-    logger = logging.getLogger("discord")
     if slowa_kluczowe:
         word_list = slowa_kluczowe
     else:
@@ -322,7 +302,6 @@ async def search_music(ctx, how_many=0, slowa_kluczowe=None):
         requests.post,
         f"{FILE_SERVICE_ADDRESS}{GET_PLAYLIST}",
         json=jrequest,
-        headers=SERVICE_HEADERS,
         timeout=360,
     )
     return_data = await coroutine

other_commands.py

@@ -66,22 +66,6 @@ class OtherModule(commands.Cog):
         """
         await ctx.send(historia_fabryczki)
 
-    @commands.hybrid_command(
-        name="set_logging_level",
-        description="Nie intererer bo kici kici",
-        guild=discord.Object(id=664789470779932693),
-    )
-    @commands.has_any_role('Legenda', 'Jarl', 'Bartender')
-    async def set_logging_level(self,ctx):
-        if "DEBUG" in ctx.message.content:
-            logger = logging.getLogger("discord")
-            logger.setLevel(logging.DEBUG)
-        elif "INFO" in ctx.message.content:
-            logger = logging.getLogger("discord")
-            logger.setLevel(logging.INFO)
-        else:
-            await ctx.send("Weź się kurwa zdecyduj co ?")
-
     @commands.hybrid_command(
         name="reset_the_clock",
         description="Resetowanie zegara - dostępne wyłącznie dla Hammera",

other_functions.py

@@ -1,6 +1,4 @@
-import logging
 # define an asynchronous generator
-
 async def async_iterator_generator(range_of_iterable):
     """
     Generate asynchronouse iterator.
@@ -88,30 +86,20 @@ async def get_stats(client, ctx, history_limit):
             yield name, how_many
 
 async def discord_friendly_reply(ctx, message_content, file=None):
-    logger = logging.getLogger("discord")
-
     if len(message_content) < 999:
-        logger.info("Answer reply - message below 999")
         await ctx.reply(message_content)
     else:
-        logger.info("Answer reply - message above 999")
-        while len(message_content) > 0:
-            logger.info("Mesaage content: %s", message_content[:999])
+        while len(message_content) > 999:
             await ctx.reply(message_content[:999])
             message_content = message_content[999:]
     if file:
         await ctx.reply("Attachment:", file=file)
 
 async def discord_friendly_send(ctx, message_content, file=None):
-    logger = logging.getLogger("discord")
-
     if len(message_content) < 999:
-        logger.info("Answer send - message below 999")
         await ctx.send(message_content)
     else:
-        logger.info("Answer send - message above 999")
-        while len(message_content) > 0:
-            logger.info("Mesaage content: %s", message_content[:999])
+        while len(message_content) > 999:
             await ctx.send(message_content[:999])
             message_content = message_content[999:]
     if file:

pulseaudio.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=PulseAudio System-wide Daemon
-After=sound.target network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/pulseaudio --system --disallow-exit --disallow-module-loading=0 --daemonize=no
-Restart=always
-
-[Install]
-WantedBy=multi-user.target

radio_commands.py

@@ -8,18 +8,7 @@ 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,
-)
-
-SERVICE_HEADERS = service_headers()
+from constants import RADIO_HARBOR_ADDRESS, SKIP_TRACK, FILE_SERVICE_ADDRESS, ADD_TO_PRIO_PLAYLIST, REQUEST_MUSIC, CREATE_PRIO_PLAYLIST, CLEAR_PRIO
 
 class RadioModule(commands.Cog):
     def __init__(self, bot, logger_name):
@@ -106,7 +95,6 @@ class RadioModule(commands.Cog):
                 requests.post,
                 f"{FILE_SERVICE_ADDRESS}{ADD_TO_PRIO_PLAYLIST}",
                 json=jrequest,
-                headers=SERVICE_HEADERS,
                 timeout=360,
             )
             result = await coroutine
@@ -142,7 +130,6 @@ class RadioModule(commands.Cog):
                 requests.post,
                 f"{FILE_SERVICE_ADDRESS}{REQUEST_MUSIC}",
                 json=jrequest,
-                headers=SERVICE_HEADERS,
                 timeout=360,
             )
             result = await coroutine
@@ -180,7 +167,6 @@ class RadioModule(commands.Cog):
                 requests.post,
                 f"{FILE_SERVICE_ADDRESS}{CREATE_PRIO_PLAYLIST}",
                 json=jrequest,
-                headers=SERVICE_HEADERS,
                 timeout=360,
             )
             result = await coroutine
@@ -208,7 +194,6 @@ class RadioModule(commands.Cog):
             coroutine = asyncio.to_thread(
                 requests.get,
                 f"{FILE_SERVICE_ADDRESS}{CLEAR_PRIO}",
-                headers=SERVICE_HEADERS,
                 timeout=360,
             )
             result = await coroutine

requirements_bot.txt

@@ -13,9 +13,8 @@ spotipy
 tiktoken
 PyNaCl
 flask[async]
-PyMuPDF
 waitress
 clickupython
 assemblyai[extras]
 SpeechRecognition
-git+https://github.com/imayhaveborkedit/discord-ext-voice-recv
+git+https://github.com/imayhaveborkedit/discord-ext-voice-recvO

rpg/armour.csv

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

@@ -1,60 +0,0 @@
-// 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

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

@@ -1,50 +0,0 @@
-// 🧠 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

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

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

@@ -1,11 +0,0 @@
-// 🚦 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

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

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

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

@@ -1,28 +0,0 @@
-// 🩹 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

@@ -1,38 +0,0 @@
-// 💥 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

@@ -1,26 +0,0 @@
-// 📚 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

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

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

@@ -1,33 +0,0 @@
-// ⚡ 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);
-  

settings.json

@@ -22,6 +22,20 @@
             false,
             false
         ],
+        "indie\\b": [
+            "Indie? *Wyciąga rewolwerową wyrzutnię taktycznych bomb jądrowych* Gdzie??? *Zaczyna się maniakalnie śmiać*",
+            15.0,
+            0,
+            false,
+            false
+        ],
+        "hindus": [
+            "Hindus? Gdzie.... *Wyciąga spod lady ciężki miotacz płomieni i zaczyna się maniakalnie śmiać*",
+            15.0,
+            0,
+            false,
+            false
+        ],
         "chuj\\b": [
             "Eeeee.... Szefie... ktoś cię woła! Wskazuje na Hammera",
             15.0,
@@ -85,6 +99,27 @@
             false,
             false
         ],
+        "tatarek\\b": [
+            "Tatarek? Nie dramatyzuj....",
+            15.0,
+            0,
+            false,
+            false
+        ],
+        "krowa\\b": [
+            "Krówka? Nie dramatyzuj....",
+            15.0,
+            0,
+            false,
+            false
+        ],
+        "krówka\\b": [
+            "Krówka? Nie dramatyzuj....",
+            15.0,
+            0,
+            false,
+            false
+        ],
         "jessenia\\b": [
             "Jessenia? Jak przyszła tu w różowej pidżamie z uszkami to nawet nie mrugnąłem okiem. Te oczy.... No ale jakiś debil Ją prowokował mówiąc \"Zdominuj mnie\" Akurat miała dobry humor więc przeżył - ale po 115.0 sekundach był już na \"Tak Pani, przepraszam że zająłem czas Pani\" Respect dla kobitki",
             15.0,
@@ -155,6 +190,20 @@
             false,
             false
         ],
+        "elokwentna\\b": [
+            "O matko. Znowu ta dyskusja? Hammer ma stary słownik gdzie elokwentna i pyskata są praktycznie synonimami. Jedyna różnica że swojej uległej można za bycie pyskatym dać po dupie.",
+            15.0,
+            0,
+            false,
+            false
+        ],
+        "elokwencja\\b": [
+            "O matko. Znowu ta dyskusja? Hammer ma stary słownik gdzie elokwentna i pyskata są praktycznie synonimami. Jedyna różnica że swojej uległej można za bycie pyskatym dać po dupie.",
+            15.0,
+            0,
+            false,
+            false
+        ],
         "same plusy\\b": [
             "Jak na cmentarzu Szefie. Jak na cmentarzu",
             15.0,
@@ -204,6 +253,13 @@
             false,
             false
         ],
+        "fallain\\b": [
+            "Kochana Krówka. Skłonność do dramatów i zakrwawiania ścian. Jedna z kilku NAPRAWDE srogich masochistek... Ach ta krew :drool:",
+            15.0,
+            0,
+            false,
+            false
+        ],
         "roar": [
             "Kici, kici....",
             15.0,
@@ -260,6 +316,13 @@
             false,
             true
         ],
+        "revalyacyjnie\\b": [
+            "Zajebisty dowcip szefie. Na pewno się \"Twojej Byłej Dziewczynie\":tm: spodoba.",
+            15.0,
+            0,
+            false,
+            true
+        ],
         "nocna zmiana\\b": [
             "Nocna Zmiana? No to właściciele tego baru. Taki troche Hammer Harema. Kto to jest Harem>? Łokurwa. Harem Hammera. Ale on tu robi za jedyną hurysę, a reszta to szejkowie. Tak zrobię Ci szejka.",
             15.0,

spotify_dl/__init__.py

@@ -8,7 +8,5 @@ def signal_handler(sig, frame):
     print("\nCaught interrupt(did you press Ctrl+C?), stopping spotify_dl")
     sys.exit(0)
 
-try:
-    signal.signal(signal.SIGINT, signal_handler)
-except ValueError:
-    print("Exception in signal handler")
+
+signal.signal(signal.SIGINT, signal_handler)

spotify_dl/constants.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 __all__ = ["VERSION"]
 
-VERSION = "8.9.0"
+VERSION = "8.8.1"
 
 if os.getenv("XDG_CACHE_HOME") is not None:
     SAVE_PATH = os.getenv("XDG_CACHE_HOME") + "/spotifydl"

spotify_dl/spotify.py

@@ -1,17 +1,15 @@
-
 import sys
-import logging
 from spotify_dl.scaffold import log
 from spotify_dl.utils import sanitize
 from rich.progress import Progress
 
 
-def fetch_tracks(sp, item_type, item_id):
+def fetch_tracks(sp, item_type, url):
     """
-    Fetches tracks from the provided item_id.
+    Fetches tracks from the provided URL.
     :param sp: Spotify client
     :param item_type: Type of item being requested for: album/playlist/track
-    :param item_id: id of the item
+    :param url: URL of the item
     :return Dictionary of song and artist
     """
     songs_list = []
@@ -19,14 +17,11 @@ def fetch_tracks(sp, item_type, item_id):
     songs_fetched = 0
 
     if item_type == "playlist":
-        logger =  logging.getLogger("discord")
-        
-        logger.info("Playlist")
         with Progress() as progress:
             songs_task = progress.add_task(description="Fetching songs from playlist..")
             while True:
                 items = sp.playlist_items(
-                    playlist_id=item_id,
+                    playlist_id=url,
                     fields="items.track.name,items.track.artists(name, uri),"
                     "items.track.album(name, release_date, total_tracks, images),"
                     "items.track.track_number,total, next,offset,"
@@ -35,7 +30,6 @@ def fetch_tracks(sp, item_type, item_id):
                     offset=offset,
                 )
                 total_songs = items.get("total")
-                logger.info(total_songs)
                 track_info_task = progress.add_task(
                     description="Fetching track info", total=len(items["items"])
                 )
@@ -43,32 +37,16 @@ def fetch_tracks(sp, item_type, item_id):
                     track_info = item.get("track")
                     # If the user has a podcast in their playlist, there will be no track
                     # Without this conditional, the program will fail later on when the metadata is fetched
-                    logger.info(item)
                     if track_info is None:
                         offset += 1
                         continue
-                    if not track_info.get("artists")[0]["name"]:
-                       offset +=1
-                       continue
                     track_album_info = track_info.get("album")
                     track_num = track_info.get("track_number")
-                    track_name = track_info.get("name")
                     spotify_id = track_info.get("id")
-                    track_audio_data = "No audio data"
-                    try:
-                        track_audio_data = sp.audio_analysis(spotify_id)
-                        tempo = track_audio_data.get("track").get("tempo")
-                    except:
-                        log.error("Couldn't fetch audio analysis for %s", track_name)
-                        tempo = None
-                    print(track_info.get("artists"))
-                    print(track_audio_data)
-                    track_artist = ""
-                    for artist in track_info.get("artists"):
-                        if artist["name"]:
-                            track_artist = ", ".join(
-                                [artist["name"]]
-                            )
+                    track_name = track_info.get("name")
+                    track_artist = ", ".join(
+                        [artist["name"] for artist in track_info.get("artists")]
+                    )
                     if track_album_info:
                         track_album = track_album_info.get("name")
                         track_year = (
@@ -108,7 +86,6 @@ def fetch_tracks(sp, item_type, item_id):
                             "genre": genre,
                             "spotify_id": spotify_id,
                             "track_url": None,
-                            "tempo": tempo,
                         }
                     )
                     offset += 1
@@ -134,8 +111,8 @@ def fetch_tracks(sp, item_type, item_id):
                 description="Fetching songs from the album.."
             )
             while True:
-                album_info = sp.album(album_id=item_id)
-                items = sp.album_tracks(album_id=item_id, offset=offset)
+                album_info = sp.album(album_id=url)
+                items = sp.album_tracks(album_id=url, offset=offset)
                 total_songs = items.get("total")
                 track_album = album_info.get("name")
                 track_year = (
@@ -164,12 +141,6 @@ def fetch_tracks(sp, item_type, item_id):
                     )
                     track_num = item["track_number"]
                     spotify_id = item.get("id")
-                    try:
-                        track_audio_data = sp.audio_analysis(spotify_id)
-                        tempo = track_audio_data.get("track").get("tempo")
-                    except:
-                        log.error("Couldn't fetch audio analysis for %s", track_name)
-                        tempo = None
                     songs_list.append(
                         {
                             "name": track_name,
@@ -183,7 +154,6 @@ def fetch_tracks(sp, item_type, item_id):
                             "cover": cover,
                             "genre": genre,
                             "spotify_id": spotify_id,
-                            "tempo": tempo,
                         }
                     )
                     offset += 1
@@ -198,7 +168,7 @@ def fetch_tracks(sp, item_type, item_id):
                     break
 
     elif item_type == "track":
-        items = sp.track(track_id=item_id)
+        items = sp.track(track_id=url)
         track_name = items.get("name")
         album_info = items.get("album")
         track_artist = ", ".join([artist["name"] for artist in items["artists"]])
@@ -212,12 +182,6 @@ def fetch_tracks(sp, item_type, item_id):
             album_total = album_info.get("total_tracks")
         track_num = items["track_number"]
         spotify_id = items["id"]
-        try:
-            track_audio_data = sp.audio_analysis(spotify_id)
-            tempo = track_audio_data.get("track").get("tempo")
-        except:
-            log.error("Couldn't fetch audio analysis for %s", track_name)
-            tempo = None
         if len(items["album"]["images"]) > 0:
             cover = items["album"]["images"][0]["url"]
         else:
@@ -239,7 +203,6 @@ def fetch_tracks(sp, item_type, item_id):
                 "genre": genre,
                 "track_url": None,
                 "spotify_id": spotify_id,
-                "tempo": tempo,
             }
         )
 
@@ -256,10 +219,9 @@ def parse_spotify_url(url):
     if url.startswith("spotify:"):
         log.error("Spotify URI was provided instead of a playlist/album/track URL.")
         sys.exit(1)
-    parsed_url = url.replace("https://open.spotify.com/", "").split("?")[0].split("/")
-    index_adjustment = 1 if parsed_url[0].startswith("intl") else 0
-    item_type = parsed_url[0+index_adjustment]
-    item_id = parsed_url[1+index_adjustment]
+    parsed_url = url.replace("https://open.spotify.com/", "").split("?")[0]
+    item_type = parsed_url.split("/")[0]
+    item_id = parsed_url.split("/")[1]
     return item_type, item_id
 
 
@@ -277,6 +239,8 @@ def get_item_name(sp, item_type, item_id):
         name = sp.album(album_id=item_id).get("name")
     elif item_type == "track":
         name = sp.track(track_id=item_id).get("name")
+    elif item_type == "artist_top_tracks":
+        name = sp.artist_top_tracks(artist_id=item_id).get("name")
     return sanitize(name)
 
 

spotify_dl/spotify_dl.py

@@ -198,7 +198,7 @@ def spotify_dl():
         )
         url_dict["save_path"].mkdir(parents=True, exist_ok=True)
         log.info("Saving songs to %s directory", directory_name)
-        url_dict["songs"] = fetch_tracks(sp, item_type, item_id)
+        url_dict["songs"] = fetch_tracks(sp, item_type, url)
         url_data["urls"].append(url_dict.copy())
     if args.dump_json is True:
         dump_json(url_dict["songs"])

spotify_dl/youtube.py

@@ -1,9 +1,9 @@
-import shutil
 import urllib.request
 from os import path
 import os
 import multiprocessing
 
+import shutil
 import json
 import mutagen
 import csv
@@ -65,13 +65,13 @@ def write_tracks(tracks_file, song_dict):
         i = 0
         writer = csv.writer(file_out, delimiter=";")
         for url_dict in song_dict["urls"]:
+            # for track in url_dict['songs']:
             for track in url_dict["songs"]:
                 track_url = track["track_url"]  # here
                 track_name = track["name"]
                 track_artist = track["artist"]
                 track_num = track["num"]
                 track_album = track["album"]
-                track_tempo = track["tempo"]
                 track["save_path"] = url_dict["save_path"]
                 track_db.append(track)
                 track_index = i
@@ -82,7 +82,6 @@ def write_tracks(tracks_file, song_dict):
                     track_url,
                     str(track_num),
                     track_album,
-                    str(track_tempo),
                     str(track_index),
                 ]
                 try:
@@ -98,8 +97,8 @@ def write_tracks(tracks_file, song_dict):
 def set_tags(temp, filename, kwargs):
     """
      sets song tags after they are downloaded
-    :param temp: contains index used to obtain more info about song being editted
-    :param filename: location of song whose tags are to be editted
+    :param temp: contains index used to obtain more info about song being edited
+    :param filename: location of song whose tags are to be edited
     :param kwargs: a dictionary of extra arguments to be used in tag editing
     """
     song = kwargs["track_db"][int(temp[-1])]
@@ -121,8 +120,6 @@ def set_tags(temp, filename, kwargs):
         )
 
     song_file["genre"] = song.get("genre")
-    if song.get("tempo") is not None:
-        song_file["bpm"] = str(song.get("tempo"))
     song_file.save()
     song_file = MP3(filename, ID3=ID3)
     cover = song.get("cover")
@@ -165,7 +162,7 @@ def find_and_download_songs(kwargs):
             print(f"Initiating download for {query}.")
 
             file_name = kwargs["file_name_f"](
-                name=name, artist=artist, track_num=kwargs["track_db"][i].get("playlist_num")
+                name=name, artist=artist, track_num=kwargs["track_db"][i].get("num")
             )
 
             if kwargs["use_sponsorblock"][0].lower() == "y":
@@ -200,10 +197,9 @@ def find_and_download_songs(kwargs):
             ):
                 print(f"File {mp3file_path} already exists, we do not overwrite it ")
                 continue
+
             outtmpl = f"{file_path}.%(ext)s"
             ydl_opts = {
-                "username":kwargs["YT_AUTH"][0],
-                "password":kwargs["YT_AUTH"][1],
                 "proxy": kwargs.get("proxy"),
                 "default_search": "ytsearch",
                 "format": "bestaudio/best",
@@ -316,7 +312,11 @@ def download_songs(**kwargs):
         log.debug("Downloading to %s", url["save_path"])
     reference_file = DOWNLOAD_LIST
     track_db = write_tracks(reference_file, kwargs["songs"])
-    shutil.copy(reference_file, kwargs["output_dir"] + "/" + reference_file)
+    try:
+        shutil.copy(reference_file, kwargs["output_dir"] + "/" + reference_file)
+        os.remove(reference_file)
+    except:
+        os.rename(reference_file, kwargs["output_dir"] + "/" + reference_file)
     reference_file = str(kwargs["output_dir"]) + "/" + reference_file
     kwargs["reference_file"] = reference_file
     kwargs["track_db"] = track_db

status_report.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Check Raspberry Pi Parameters
-After=network.target
-
-[Service]
-Type=oneshot
-ExecStart=/bin/bash -c '/home/pi/conjurer/status_report.sh >> /home/pi/Conjurer/discord.log'
-
-[Install]
-WantedBy=multi-user.target

status_report.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Script to check and display Raspberry Pi parameters using libgpiod
-
-echo "=== Raspberry Pi System Information ==="
-
-# General system information
-echo "Hostname: $(hostname)"
-echo "Model: $(cat /proc/device-tree/model | tr -d '\0')"
-echo "CPU Temperature: $(vcgencmd measure_temp | cut -d '=' -f2)"
-echo "CPU Frequency: $(vcgencmd measure_clock arm | awk -F= '{print $2}') Hz"
-echo "GPU Frequency: $(vcgencmd measure_clock core | awk -F= '{print $2}') Hz"
-echo "Voltage: $(vcgencmd measure_volts | cut -d '=' -f2)"
-
-# Memory and disk usage
-echo "Total Memory: $(free -h | grep Mem | awk '{print $2}')"
-echo "Used Memory: $(free -h | grep Mem | awk '{print $3}')"
-echo "Free Memory: $(free -h | grep Mem | awk '{print $4}')"
-echo "Disk Usage:"
-df -h | grep '^/dev/root'
-
-# Network information
-echo "IP Address: $(hostname -I | awk '{print $1}')"
-echo "MAC Address: $(cat /sys/class/net/eth0/address 2>/dev/null || echo 'No Ethernet')"
-
-# Uptime
-echo "Uptime: $(uptime -p)"
-echo "Last Boot: $(who -b | awk '{print $3, $4}')"
-
-# GPIO Information using libgpiod
-echo "GPIO Chip Info:"
-if command -v gpioinfo &>/dev/null; then
-    gpioinfo
-else
-    echo "gpiod tools not installed. Please install libgpiod using 'sudo apt install gpiod'."
-fi
-
-echo "=== End of Raspberry Pi System Information ==="

status_report.timer

@@ -1,9 +0,0 @@
-[Unit]
-Description=Run Check Raspberry Pi Parameters Script Hourly
-
-[Timer]
-OnCalendar=hourly
-Persistent=true
-
-[Install]
-WantedBy=timers.target

sync.py

@@ -1,296 +0,0 @@
-#!/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())

thin_client.py

@@ -2,36 +2,22 @@
 # 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.
 """
-
-import asyncio
+Module of a python bot named Conjurer - used to work on BDSM discord servers.
+"""
 import logging
+
+# *=========================================== Standard Library Imports
 import random
 import threading
 from logging import handlers
 
+# *==============Imported libraries
 import discord
 from discord.ext import commands
 
 from communication_subroutine import comm_subroutine
 from constants import ENCODING, LOGFILE, TOKEN
-logger = logging.getLogger("discord")
-logger.setLevel(logging.INFO)
-handler = handlers.RotatingFileHandler(
-    filename=LOGFILE,
-    encoding=ENCODING,
-    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)
 
 # *=========================================== Initializations
 intents = discord.Intents.default()
@@ -46,6 +32,18 @@ intents.moderation = True
 # on_member_ban - wyswietl na glownym kanale pieczatke "Niech spierdala"
 # on_member_unban - "mam wyjebane"
 
+logger = logging.getLogger("discord")
+logger.setLevel(logging.DEBUG)
+handler = handlers.RotatingFileHandler(
+    filename=LOGFILE,
+    encoding=ENCODING,
+    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)
 random.seed()
 client = commands.Bot(intents=intents, command_prefix="$")
 
@@ -54,12 +52,8 @@ client = commands.Bot(intents=intents, command_prefix="$")
 @client.event
 async def on_ready():
     """Metoda wywoływana przy połączeniu do serwera."""
-    logger = logging.getLogger("discord")
-    logger.debug("SAMPLE DEBUG LOG")
-    logger.info("%s has connected to Discord!", client.user)
+    logger.debug("%s has connected to Discord!", client.user)
     # TODO: load vs reload
-    logger.info("Reactor: online")
-
     await client.load_extension("administration_commands")
 
     await client.load_extension("librarian_commands")
@@ -70,54 +64,31 @@ async def on_ready():
 
     await client.load_extension("other_commands")
     await client.load_extension("voice_recognition_commands")
-    await client.load_extension("file_search_commands")
-    await client.load_extension("latex_commands")
-    logger.info("Sensors: online")
 
     logger.info(client.cogs)
     await client.tree.sync()
     for com in client.commands:
         logger.info("Command %s is awejleble", com.qualified_name)
-
-    logger.info("Logged in as ----> %s", client.user)
-    logger.info("ID:%s ", client.user.id)
-    logger.info("All systems: operational")
-
-
-async def _run_comm_subroutine(stop_event: threading.Event) -> None:
-    await asyncio.to_thread(comm_subroutine, stop_event)
-
-
-async def _run_bot(token: str, shutdown_event: asyncio.Event) -> None:
-    try:
-        await client.start(token, log_handler=None)
-    finally:
-        shutdown_event.set()
-
-
-async def main() -> None:
-    if not TOKEN:
-        logger.error("Discord token missing – set DISCORD_TOKEN or configure netrc")
-        return
-
-    shutdown_event = asyncio.Event()
-    comm_stop_event = threading.Event()
-
-    comm_task = asyncio.create_task(_run_comm_subroutine(comm_stop_event))
-    bot_task = asyncio.create_task(_run_bot(TOKEN, shutdown_event))
-
-    try:
-        await shutdown_event.wait()
-    except (KeyboardInterrupt, asyncio.CancelledError):
-        logger.info("Shutdown signal received")
-        comm_stop_event.set()
-        await client.close()
-    finally:
-        comm_stop_event.set()
-        if not client.is_closed():
-            await client.close()
-        await asyncio.gather(bot_task, comm_task, return_exceptions=True)
+    logger.info("Logged in as ---->", client.user)
+    logger.info("ID:", client.user.id)
 
 
+# *================================== Run
 if __name__ == "__main__":
-    asyncio.run(main())
+    logger.info("Starting discord bot")
+    threads = []
+    logger.info("Starting discord bot: Creating threads")
+    threads.append(threading.Thread(target=client.run, args=(TOKEN,)))
+    threads.append(threading.Thread(target=comm_subroutine))
+    logger.info("Starting discord bot: Starting threads")
+    WRK_CNT = 0
+    for worker in threads:
+        WRK_CNT += 1
+        logger.info("Starting discord bot: Starting thread %s", WRK_CNT)
+        worker.start()
+    logger.info("Starting discord bot: Joining threads")
+    WRK_CNT = 0
+    for worker in threads:
+        WRK_CNT += 1
+        logger.info("Starting discord bot: Joining thread %s", WRK_CNT)
+        worker.join()

watch_script_params.py

@@ -1,63 +0,0 @@
-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()