From 1ef75678a153e29567b0457572b41ed7ad97d3b7 Mon Sep 17 00:00:00 2001 From: Polish Hammer Date: Thu, 30 Oct 2025 16:59:23 +0100 Subject: [PATCH] Tag: 1.28 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Intermediate commits (oldest → newest): - Partial + reformatting - upgrade to latest OpenAI API usage and logging improvements - refix - Vibe coding :P - Merge branch 'main' of https://github.com/migatu/conjurer - fx - fx - ffx - testing - ttt - fix - aaa - FX - aaa - sa --- ai_functions.py | 294 ++-- bot.py | 2579 ----------------------------- conjurer_musician/script.params | 30 +- constants.py | 4 +- dj_debug_fonts.sh | 40 - dj_fonts_system_install.sh | 141 ++ dj_oneclick_fix.sh | 40 - fontget.sh | 98 ++ fonts/CinzelDecorative-Black.ttf | Bin 0 -> 62692 bytes fonts/EBGaramond-Initials.ttf | 0 fonts/IMFellEnglishSC-Regular.ttf | 0 gpt_interface/app.py | 14 + gpt_interface/file_serv.py | 155 ++ gpt_interface/ingest.py | 52 + gpt_interface/reinit_server.sh | 2 + latex_commands.py | 254 ++- latex_functions.py | 296 ++-- 17 files changed, 943 insertions(+), 3056 deletions(-) delete mode 100644 bot.py delete mode 100644 dj_debug_fonts.sh create mode 100755 dj_fonts_system_install.sh delete mode 100644 dj_oneclick_fix.sh create mode 100644 fontget.sh create mode 100644 fonts/CinzelDecorative-Black.ttf create mode 100644 fonts/EBGaramond-Initials.ttf create mode 100644 fonts/IMFellEnglishSC-Regular.ttf create mode 100644 gpt_interface/app.py create mode 100644 gpt_interface/file_serv.py create mode 100644 gpt_interface/ingest.py create mode 100755 gpt_interface/reinit_server.sh diff --git a/ai_functions.py b/ai_functions.py index 633f2ba..ef48fb7 100644 --- a/ai_functions.py +++ b/ai_functions.py @@ -19,13 +19,26 @@ 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): +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. @@ -47,23 +60,26 @@ async def _openai_call(messages, model, temperature=0.2): else: logger.info("4.0+") - # Responses API (zalecane dla 4o/4.1*) + # 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) + 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): @@ -71,15 +87,14 @@ 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. @@ -91,10 +106,11 @@ 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 @@ -103,8 +119,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]}}, ) @@ -133,7 +149,15 @@ def num_tokens_from_string(message, model): async def handle_response( - prompt, vykidailo, bartender, history, username, request_type, algorithm="gpt-4o", none_request="" + prompt, + vykidailo, + bartender, + history, + username, + request_type, + algorithm="gpt-4o", + none_request="", + internal_retry: bool = False ): """ Handle responses by appending them to a history, use OpenAI to @@ -157,104 +181,83 @@ async def handle_response( """ 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ł") - 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) - elif request_type == "GENERAL": - 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 = [] - if request_type != "NONE": - history.append(GPT_SETTINGS[0]) - chat_gpt_config_request_size = num_tokens_from_string(GPT_SETTINGS[0], "gpt-4") + 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 = ( - "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) + 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) - final_prompt = username + ":" + prompt - logger.debug( - "Rozmiar zapytania przed dodaniem historii %s", chat_gpt_config_request_size - ) + # 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 == "RANDOM": - table = MESSAGE_TABLE - token_amount = 10700 - elif request_type == "GENERAL": + 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 - 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) else: - history = none_request - logger.info("Rozmiar zapytania po wyslaniu %s", chat_gpt_config_request_size) + # --- 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}"}] + + logger.info("Rozmiar zapytania (tok): %s", "n/a") # tokeny już policzone wyżej + 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, model=algorithm), - timeout=max(0.1, deadline - time.time()) + openai_call(messages=history_msgs, model=model_to_use), + timeout=max(0.1, deadline - time.time()), ) except openai.APITimeoutError as e: @@ -264,26 +267,33 @@ async def handle_response( 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}" except openai.BadRequestError as e: # Handle invalid request error, e.g. validate parameters or log - 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}" + 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}" except openai.APIResponseValidationError as e: # Handle invalid request error, e.g. validate parameters or log - 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}" + 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}" 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}" @@ -299,43 +309,31 @@ async def handle_response( response = 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:") - logger.info(history) - await asyncio.sleep(15) - temp = {"role": "assistant", "content": response} - history.append(temp) + temp_assistant = {"role": "assistant", "content": response} + logger.info(temp_assistant) 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) + # 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 == "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) + + 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 - elif request_type == "GENERAL": - 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 response, MESSAGE_TABLE - else: + + else: # NONE return response, [] + async def get_random_cyclic_message(client): """ The function `get_random_cyclic_message` returns a random cyclic message from a list of cyclic @@ -438,7 +436,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") diff --git a/bot.py b/bot.py deleted file mode 100644 index 92afdb4..0000000 --- a/bot.py +++ /dev/null @@ -1,2579 +0,0 @@ -# This Python file uses the following encoding: utf-8 -# trunk-ignore-all(bandit/B311) -# pylint: disable=line-too-long -# pylint: disable=too-many-lines -""" -Module of a python bot named Conjurer - used to work on BDSM discord servers. -""" -import asyncio -import io -import json -import logging -import netrc - -# *=========================================== Standard Library Imports -import os -import random -import re -import shutil -import subprocess -import sys -import threading -import uuid -from datetime import datetime -from logging import handlers -from pathlib import Path, PurePath -from platform import uname -from queue import Empty -from sys import platform -from typing import List, Optional, TypedDict - -# *==============Imported libraries -import discord -import eyed3 -import numpy as np -import openai -import pdf2image -import PyPDF2 -import requests -import spotipy -import tiktoken -from discord.ext import commands, tasks -from spotipy.oauth2 import SpotifyClientCredentials - -import yt_dlp -from communication_subroutine import ( - IN_COMM_Q, - OUT_COMM_Q, - QueryControl, - comm_subroutine, - PREPPED_TRACKS, -) -from spotify_dl import spotify -from spotify_dl import youtube as youtube_download - -# *=========================== Classes definition - -# The above code is defining a TypedDict called `Music_Config` in Python. This TypedDict has three -# keys: "ctx" which is an optional string, "queue" which is a list of strings, and "requester" which -# is a list of strings. This TypedDict is used to define the structure of a dictionary that should -# have these specific keys and value types. -Music_Config = TypedDict( - "Music_Config", - { - "ctx": Optional[str], - "queue": List[str], - "requester": List[str], - }, -) - - -class MusicFileList(object): - """ - The `MusicFileList` class manages a list of music files, with the ability to refresh the list from a - file service or local directory and update the list with new items. - """ - - def __init__(self, uplogger) -> None: - self.music_file_list = [] - self.file_service_active = False - self.logger = uplogger - self.logger.info("Created Playlist organizer class") - - def refresh_file_list(self): - """ - The `refresh_file_list` function attempts to connect to a file service to retrieve a list of music - files, and if unsuccessful, it populates the list by scanning a local directory for .mp3 files. - """ - try: - self.logger.info("Attempt to connect to file service") - 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 Path.glob(Path(MUSIC_FOLDER), "**/*.mp3"): - temp_music_file = mp3_item.as_posix() - if platform == "win32": - temp_music_file = temp_music_file.replace("/", "\\") - self.music_file_list.append(temp_music_file) - self.file_service_active = False - self.logger.error(e.strerror) - self.logger.error("Service Unavailable") - - def get_file_list(self): - """ - The `get_file_list` function returns the list of music files stored in the object. - :return: The `music_file_list` attribute is being returned. - """ - return self.music_file_list - - def update_file_list(self, item): - """ - The `update_file_list` function appends an item to a music file list and sends a POST request with - the item data to a file service address. - - :param item: The `item` parameter in the `update_file_list` method is the file that you want to add - to the `music_file_list` attribute of the class instance. It is then sent as a JSON payload in a - POST request to a file service address along with the endpoint `SEND_MP3` - """ - self.music_file_list.append(item) - post_data = {"item": str(item)} - requests.post(f"{FILE_SERVICE_ADDRESS}{SEND_MP3}", json=post_data, timeout=360) - - -# *=========================================== Predefines -MASTER_TIMEOUT = datetime.now() -INITIAL_TIME_WAIT = 500 -MUZYKA: Music_Config = {"ctx": None, "queue": [], "requester": []} - -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 = "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" -GET_PLAYLIST = "/get_music" -ADD_TO_PRIO_PLAYLIST = "/add_to_priority" -CREATE_PRIO_PLAYLIST = "/create_priority_playlist" - -REQUEST_MUSIC = "/request_radio_file" -CLEAR_PRIO = "/clear_pr_pls" -LIBRARIAN_SERVICE_ADDRESS = "http://192.168.1.192:5001" -SEND_QUERY = "/query" -TIME_BETWEEN_CALLS = 100000 -LAST_SPONTANEOUS_CALL = datetime.now() -HOST_ADDRESS = "192.168.1.191" -PORT_ADDRESS = 5000 - -# *=========================================== Platform Specific Predefines - -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" - - else: - 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/" - - -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 = "\\" - - -# *=========================================== Keys -netrc_mod = netrc.netrc(NETRC_FILE) -REMOTE_HOST_NAME = "discord" -authTokens = netrc_mod.authenticators(REMOTE_HOST_NAME) -TOKEN = authTokens[2] - -REMOTE_HOST_NAME = "openai" -authTokens = netrc_mod.authenticators(REMOTE_HOST_NAME) -openai.api_key = authTokens[2] -openAIClient = openai.AsyncOpenAI(api_key=openai.api_key) -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], - ) -) - -# *=========================================== Initializations -intents = discord.Intents.default() -intents.message_content = True -intents.typing = True -intents.presences = True -intents.members = True -intents.messages = True -intents.voice_states = True -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() -logger.debug(platform) -logger.info("Playlist generation") - -# *=========================================== Load Data files - -music_file_list = [] -music_file_list = MusicFileList(logger) -music_file_list.refresh_file_list() -logger.info("Playlist generation done") - -logger.info("Loading GPT settings") -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) -logger.info("Done") - -logger.info("Loading memory file") -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) -logger.info("Done") - -logger.info("Loading music memory 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) -logger.info("Done") - -logger.info("Loading settings file") -with open(SETTINGS_FILE, "r", encoding=ENCODING) as f_settings_file: - data = json.load(f_settings_file) -logger.info("Done") - -logger.info("Loading reactions") -word_reactions = data["word_reactions"] -cyclic_words = data["cyclic_words"] -historia_fabryczki = data["fabryczka"] -for key in word_reactions: - word_reactions[key][2] = datetime.now() -logger.info("Done") - - -# *=========================================== Create Client -logger.info("Creating discord bot") -client = commands.Bot(intents=intents, command_prefix="$") -logger.info("Done") -logger.info("Creating flask app") -logger.info("Done") - - -# *=========================================== Define Events -@client.event -async def on_ready(): - """Metoda wywoływana przy połączeniu do serwera.""" - logger.debug("%s has connected to Discord!", client.user) - #TODO: load vs reload - #try: - await client.load_extension("voice_recognition_commands") - logger.info(client.cogs) - await client.change_presence(activity=discord.Game(name="Axe Throwing Darts")) - await client.tree.sync() - for com in client.commands: - logger.info("Command %s is awejleble", com.qualified_name) - check_self.start() - check_data_q.start() - - -@client.event -async def on_message(message): - """ - Handle incoming messages in a Discord server, perform various - checks and actions based on the content and context of the message, and respond accordingly. - - :param message: The message object that is received when a user sends a message in a Discord server - or DM. The code is checking various conditions and performing actions based on the content of the - message and the context in which it was sent. It also includes TODOs for future improvements - :return: The function `on_message` is being returned. - """ - vykidailo = False - channel = None - if message.author == client.user: - return - if isinstance(message.author, discord.Member): - for role in message.author.roles: - if role.name == "Vykidailo": - vykidailo = True - - if ("Conjurer Śpij Słodko Aniołku" in message.content) and vykidailo: - sys.exit() - # kanal bez bota - if message.channel.id == 1095985579147141202: - return - # wentylacja - if message.channel.id == 1083804024173764739: - return - # legendy - if message.channel.id == 1084448332841230388: - return - # interrogation booth - if message.channel.id == 1111625221171052595: - return - if isinstance(message.channel, discord.DMChannel): - if message.author.id == 346956223645614080: - await message.reply("Witam witam") - return - else: - channel = client.get_channel(1064888712565100614) - await channel.send("Słyszałem ja żem że: " + message.content) - return - channel = message.channel - await client.process_commands(message) - - message.content = message.content.lower() - - tdelta = datetime.now() - MASTER_TIMEOUT - tdelta = tdelta.total_seconds() - if "opowiedz o fabryczce" in message.content: - await message.reply(historia_fabryczki) - if "opowiedz mi o fabryczce" in message.content: - await message.reply(historia_fabryczki) - - if tdelta > INITIAL_TIME_WAIT: - for word in word_reactions: - if re.search(r"\b" + word + r"\b", message.content): - tdelta = datetime.now() - word_reactions[word][2] - tdelta = tdelta.total_seconds() - security_clearance = word_reactions[word][4] - reaction = word_reactions[word][3] - if tdelta > word_reactions[word][1]: - # TODO: to zrobic reactiony - logger.info("Ping z procedury reakcji") - if reaction: - emoji = client.get_emoji(word_reactions[word][0]) - await message.add_reaction(emoji) - elif security_clearance and vykidailo: - await message.reply(word_reactions[word][0]) - elif not security_clearance: - await message.reply(word_reactions[word][0]) - word_reactions[word][2] = datetime.now() - - # TODO: drobne literówki, mentiony, spacja przed dwukropkiem. napraw. - kondziu_mentioned = False - for mention in message.mentions: - if mention == client.user: - kondziu_mentioned = True - - if kondziu_mentioned or "conjurer:" in message.content: - async with channel.typing(): - logger.debug("Procedura chatu") - - message.content = message.content.replace("conjurer: ", "") - if message.author.nick: - username = message.author.nick - else: - username = message.author.name - vykidailo = False - bartender = False - if kondziu_mentioned: - prompt = message.clean_content - else: - prompt = message.content - for role in message.author.roles: - if role.name == "Vykidailo": - vykidailo = True - if role.name == "Bartender": - bartender = True - global MESSAGE_TABLE # pylint: disable=global-statement - - result, MESSAGE_TABLE = await handle_response( - prompt, vykidailo, bartender, MESSAGE_TABLE, username, "CONVERSATION" - ) - - if len(result) < 1500: - await message.reply(result) - else: - while len(result) > 1500: - await message.reply(result[:1500]) - result = result[1500:] - if "imaginuje sobie:" in message.content: - async with channel.typing(): - logger.info("Poczatek procedury obrazkowej") - message.content = message.content.replace("imaginuje sobie: ", "") - logger.debug("Wywolanie obrazka: %s", message.content) - try: - response = await openAIClient.images.generate( - model="dall-e-3", - prompt=message.content, - size="1024x1024", - quality="standard", - n=1, - ) - except openai.APITimeoutError as e: - # Handle timeout error, e.g. retry or log - await message.reply( - 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: - await message.reply( - 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 message.author.nick: - username = message.author.nick - else: - username = message.author.name - 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 '{message.content}'", - True, - True, - MESSAGE_TABLE, - username, - "RANDOM", - ) - await message.reply( - 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 - await message.reply( - 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 - await message.reply( - ( - 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: - await message.reply( - f"*Kondziu patrzy na terminal* Wołaj szefa. Zapłacić rachunki za AI trzeba. Jak chcesz to się na #zebranie dorzuć. {e}" - ) - except openai.APIError as e: - # Handle API error, e.g. retry or log - await message.reply( - f"*Kondziu nurkuje za bar, terminal wybucha. Przed tobą ląduje pergamin zapisany pięknym gotykiem a na nim*: {e}" - ) - if response: - logger.info(response) - image_url = response.data[0].url - image_desc = response.data[0].revised_prompt - 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" - - with open(temp_file_name, "wb") as dalle_file: - dalle_file.write(response.content) - logger.info("Koniec procedury obrazkowej.") - fnord = discord.File( - temp_file_name, spoiler=False, description=message.content - ) - await message.reply(f"{image_desc}", file=fnord) - - -# *=========================================== Define Functions - - -def num_tokens_from_string(message, model): - """ - The function takes a string message and a model as input and returns the number of tokens in the - message according to the given model. - - :param message: A string containing the message or text from which you want to count the number of - tokens - :param model: The model parameter refers to a language model or tokenizer that can be used to - tokenize the input string. It could be a pre-trained model or a custom tokenizer - """ - tokens_per_message = 3 - tokens_per_name = 1 - chat_gpt_encoding = tiktoken.encoding_for_model(model) - - num_tokens = 0 - num_tokens += tokens_per_message - for keys, values in message.items(): - num_tokens += len(chat_gpt_encoding.encode(values)) - if keys == "role": - num_tokens += tokens_per_name - num_tokens += 3 # every reply is primed with <|start|>assistant<|message|> - return num_tokens - - -async def connect(ctx, arg=None): - """ - Connect the bot to a voice channel if it is not already connected. - - :param ctx: ctx is short for context and refers to the context in which the command was invoked. It - contains information about the message, the channel, the server, and the user who invoked the - command - :param arg: The `arg` parameter is an optional argument that can be passed to the `connect` - function. It is not used in the code snippet provided, but it could potentially be used to specify a - specific voice channel to connect to - :return: If the voice client is already connected, the function will return without doing anything. - If the function successfully connects to the voice channel, it will return a voice channel - connection object. If it is not possible to connect to the voice channel, the function will log an - error message and return nothing. - """ - if ctx and arg: - logger.info("Ctx and arg defined for connect") - - if client.voice_clients: - logger.info("Already connected with other client") - else: - vc = None - if ctx.author.voice.channel: - vc = await ctx.author.voice.channel.connect() - else: - voice_channel = client.get_channel(1060349757349974066) - vc = await voice_channel.connect() - if not vc: - logger.error("Not possible to connect to voice") - return - logger.info("Connected to voice") - - -async def disconnect(ctx): - """ - Asynchronous Python function that disconnects the voice client if it is connected and - logs a message if the context is defined. - - :param ctx: ctx is short for context and refers to the context in which a command is being executed. - It contains information about the message, the user who sent the message, the channel the message - was sent in, and more. In this case, the `disconnect` function is likely being called as a command - in - """ - if ctx: - logger.info("Ctx defined for disconnect") - if client.voice_clients: - voice_client = client.voice_clients[0] - if voice_client.is_connected(): - await voice_client.disconnect() - - -async def play(ctx, zamawial=None, arg=None): - """ - Play a music file, retrieve metadata about the file, and send a - message to a Discord channel with information about the song being played. - - :param ctx: The "ctx" parameter is a context object that contains information about the current - Discord command invocation, such as the message, the channel, and the user who invoked the command. - It is passed to the function automatically by the Discord.py library - :param zamawial: The parameter `zamawial` is a variable that stores the user who requested the song - to be played. It is an optional parameter and can be None if no user requested the song - :param arg: The `arg` parameter is an optional argument that can be passed to the `play` function. - It is not used in the code provided, so its purpose is unclear without additional context - """ - # TODO: Uzupełnianie metadanych. Jeśli ich nie ma sprawdzamy nazwę (w sposób inteligentny - czyli jeśli składa się z samych cyfr i/lub słowa track to sprawdzić album w sensie folder) - # TODO: Jeśli w metadanych jest tylko "audiotrack" i "album" też po - # folderze. Jeśli są niekompletne uzupełnić dalej. - logger.info("Play procedure") - if arg: - logger.info("Arg defined for play") - - file_to_play = None - voice_client = client.voice_clients[0] - if not client.voice_clients: - voice_client = client.voice_clients[0] - await connect(ctx) - if MUZYKA["queue"]: - file_to_play = MUZYKA["queue"].pop() - zamawial = MUZYKA["requester"].pop() - logger.info("Muzyka z listy zamówień") - else: - index = random.randint(0, len(music_file_list.get_file_list()) - 1) - file_to_play = music_file_list.get_file_list()[index] - logger.info("Muzyka losowo") - - logger.info(file_to_play) - metadata = eyed3.load(file_to_play) - query = None - temp = file_to_play.split(SEPARATOR_FILE_PATH)[-1] - kawalek = f"Zagram teraz kawalek {temp} z prywatnej kolekcji Hammera." - if metadata: - if metadata.tag: - if metadata.tag.title: - query = f"Opowiedz mi o kawałku {metadata.tag.title}" - kawalek = f"Zagram teraz kawalek {metadata.tag.title}" - if metadata.tag.artist: - query += f" wykonawcy {metadata.tag.artist}" - kawalek += f" wykonawcy {metadata.tag.artist}" - if metadata.tag.album: - query += f" z albumu {metadata.tag.album}" - kawalek += f" z albumu {metadata.tag.album}" - kawalek += " z prywatnej kolekcji Hammera." - if zamawial: - kawalek += f"Na specjalne życzenie <@{zamawial.id}>." - await ctx.send(kawalek) - - voice_client.play( - discord.PCMVolumeTransformer( - discord.FFmpegPCMAudio(source=file_to_play), volume=0.3 - ) - ) # NIE DOTYKAC POKRĘTŁA GŁOŚNOŚCI!!!! - if query: - logger.debug("Zapytanie do openai") - logger.debug(query) - vykidailo = False - bartender = False - for role in ctx.message.author.roles: - if role.name == "Vykidailo": - vykidailo = True - if role.name == "Bartender": - bartender = True - if ctx.message.author.nick: - username = ctx.message.author.nick - else: - username = ctx.message.author.name - global MESSAGE_TABLE # pylint: disable=global-statement - result, MESSAGE_TABLE = await handle_response( - query, vykidailo, bartender, message_table_muzyka, username, "MUSIC" - ) - logger.debug("Obecna historia czatu: %s", message_table_muzyka) - if len(result) < 1500: - await ctx.send(result) - else: - while len(result) > 1500: - await ctx.send(result[:1500]) - result = result[1500:] - - -async def archive_channel(channel_no): - """ - The function `archive_channel` retrieves messages from a specified channel, processes them, and - saves the data in a JSON file with a timestamp in the filename. - - :param channel_no: The `archive_channel` function you provided seems to be incomplete. It looks like - you are trying to archive messages from a Discord channel into a JSON file - """ - channel = client.get_channel(channel_no) - messages = [message async for message in channel.history(limit=None)] - path_newfile = f"{LOGSTORE}channeldump_{channel_no}_{datetime.now()}.json" - new_data = [] - for message in messages: - new_data.append(message) - with open(path_newfile, "x", encoding=ENCODING) as new_file: - new_file.seek(0) - json.dump(new_data, new_file, indent=4) - - -@tasks.loop(seconds=1) -async def check_music(): - """ - This Python function continuously checks for music playback in a voice client and plays music if - conditions are met. - """ - if client.voice_clients: - voice_client = client.voice_clients[0] - if ( - voice_client - and voice_client.is_connected() - and not voice_client.is_playing() - and not voice_client.is_paused() - ): - await play(MUZYKA["ctx"], MUZYKA["requester"]) - await asyncio.sleep(2) - - -@tasks.loop(seconds=3) -async def check_data_q(): - """ - This function checks the data queue for any new entries and processes them accordingly. - """ - try: - fresh_data = IN_COMM_Q.get(block=False) - entries = [] - if fresh_data.stop: - searcher = fresh_data.author - query = fresh_data.content - l_p = 1 - for doi in fresh_data.entries: - logger.info(doi) - desc = fresh_data.entries[doi] - title = desc["Title"][0] - entries.append( - f"{l_p}. {title} pod linkiem https://www.sci-hub.se/{doi} i jest to {desc['type']}\n" - ) - l_p += 1 - message = "*Z podłogi wysuwa się winda na książki*" - if fresh_data.ctx is not None: - ctx = fresh_data.ctx - message += f" Dzielny poszukiwaczu @{searcher} w odpowiedzi na twoje zapytanie {query} nr {fresh_data.uuid}" - else: - ctx = client.get_channel(1062047571557744721) - message += f" Mam wynik dla zapytania {fresh_data.uuid} ale że Hammer coś grzebał nie pamiętam kto to chciał i co chciał" - - message += "nasza biblioteka służy Ci odpowiedzią. Przy dźwięku fanfar winda się otwiera a w środku " - if len(entries) < 1: - message += "niestety nie ma nic" - await ctx.send(message) - elif len(entries) >= 1 and len(entries) < 5: - message += " znajduje się coś:\n" - for item in entries: - message += item - await ctx.send(message) - else: - message += " znajduje się cholernie dużo:\n" - for item in entries: - message += item - if len(message) > 1500: - await ctx.send(message) - message = "" - - # Kept for sentimental reasons - # await ctx.send(f"O. A tak będzie wyglądało coś ciekawego w przyszłości: {data}") - except Empty: - pass - - -@tasks.loop(seconds=120) -async def check_self(): - """ - The function `check_data` periodically checks for conditions to send messages and manage log files - in a Discord channel. - """ - # logger.info("Heartbeat of cleanup proc") - channel = client.get_channel(1062047367337095268) - messages = [message async for message in channel.history(limit=1)] - for mess in messages: - channel = mess.channel - if os.path.getsize(LOGFILE) > 60000000: - await channel.send( - "*Conjurer porządkuje bar, wypala szklanki do czysta miotaczem płomieni ze swojej zbroi i ogólnie wygląda na zajętego....*" - ) - async with channel.typing(): - shutil.copyfile(LOGFILE, f"{LOGSTORE}discord{datetime.now()}") - logger.info("Log rollover") - handler.doRollover() - await channel.send( - "*Przeciąga się za barem* No dobra - porobione to można dalej pi... *Zauważa spojrzenie Hammera* ...sać powieści o naszym wspaniałym barze SZEFIE!" - ) - - if os.path.getsize(MEMORY_FIVE_MUZYKA) > 3000000: - await channel.send( - "*Conjurer porządkuje bar, wypala szklanki do czysta miotaczem płomieni ze swojej zbroi i ogólnie wygląda na zajętego....*" - ) - async with channel.typing(): - path_newfile = f"{LOGSTORE}pamiec_muzyki{datetime.now()}.json" - logger.info(path_newfile) - with open(MEMORY_FIVE_MUZYKA, "r+", encoding=ENCODING) as file_music_memory: - with open(path_newfile, "x", encoding=ENCODING) as new_file: - # First we load existing data into a dict. - file_data = json.load(file_music_memory) - new_data = [] - new_data.append(file_data[0]) - new_data.extend(file_data[:-20]) - file_music_memory.truncate(0) - file_music_memory.seek(0) - # convert back to json. - new_file.seek(0) - json.dump(new_data, file_music_memory, indent=4) - json.dump(file_data, new_file, indent=4) - await channel.send( - "*Przeciąga się za barem* No dobra - porobione to można dalej pi... *Zauważa spojrzenie Hammera* ...sać powieści o naszym wspaniałym barze SZEFIE!" - ) - if os.path.getsize(MEMORY_FIVE_SIARA) > 3000000: - path_newfile = f"{LOGSTORE}pamiec_rozmow{datetime.now()}.json" - logger.info(path_newfile) - await channel.send( - "*Conjurer porządkuje bar, ścina lekkim laserem pulsacyjnym powierzchnie baru o grubości kilku mikronów i ogólnie wygląda na zajętego....*" - ) - with open(MEMORY_FIVE_SIARA, "r+", encoding=ENCODING) as file: - with open(path_newfile, "x", encoding=ENCODING) as new_file: - # First we load existing data into a dict. - file_data = json.load(file) - new_data = [] - new_data.append(file_data[0]) - new_data.extend(file_data[-20]) - file.truncate(0) - file.seek(0) - new_file.seek(0) - # convert back to json. - json.dump(new_data, file, indent=4) - json.dump(file_data, new_file, indent=4) - await channel.send( - "*Przeciąga się za barem* No dobra - porobione to można dalej pi... *Zauważa spojrzenie Hammera* eprzyć o głupotach z klientami... Szefie... *Bierze 'ukradkowy' łyk z piersiówki*" - ) - global LAST_SPONTANEOUS_CALL - global TIME_BETWEEN_CALLS - tdelta = datetime.now() - LAST_SPONTANEOUS_CALL - tdelta = tdelta.total_seconds() - if tdelta > TIME_BETWEEN_CALLS: - logger.info("Spontaneous call") - TIME_BETWEEN_CALLS = random.randint( - 10200, 272800 - ) # temp random, set after each call - logger.debug(TIME_BETWEEN_CALLS) - LAST_SPONTANEOUS_CALL = datetime.now() - async with channel.typing(): - message = await get_random_cyclic_message() - logger.info("Odpowiedz") - logger.info(message) - await channel.send(message) - - -async def get_random_cyclic_message(): - """ - The function `get_random_cyclic_message` returns a random cyclic message from a list of cyclic - words. - :return: a random cyclic message from the list `cyclic_words`. - """ - channel_id = 1062047367337095268 - channel = client.get_channel(channel_id) - ai_check = random.randint(0, 10) - logger.info("Losowa wypowiedź") - if ai_check < 2: - logger.info("Predefiniowana") - messnum = random.randint(0, len(cyclic_words)) - logger.debug(messnum) - logger.debug(len(cyclic_words)) - mess_key = list(cyclic_words.keys())[messnum] - return cyclic_words[mess_key][0] - ai_check2 = random.randint(0, 10) - global MESSAGE_TABLE - if ai_check2 < 6: - logger.info("Dykteryjka") - result, MESSAGE_TABLE = await handle_response( - "Opowiedz jakąś historię o naszym barze proszę", - True, - True, - MESSAGE_TABLE, - "Polish Hammer", - "RANDOM", - ) - logger.info(result) - else: - logger.info("Wtracenie w dyskusje") - messages = [message async for message in channel.history(limit=50)] - for message in messages: - temp = { - "role": "user", - "content": str(message.author) + ":" + str(message.content), - } - MESSAGE_TABLE.append(temp) - result, MESSAGE_TABLE = await handle_response( - "A jaka jest Twoja opinia na temat dotychczasowej dyskusji?", - True, - True, - MESSAGE_TABLE, - "Polish Hammer", - "RANDOM", - ) - logger.info(result) - return result - - -async def handle_response( - prompt, vykidailo, bartender, history, username, request_type -): - """ - Handle responses by appending them to a history, use OpenAI to - generate a response, and then append the generated response to the history. - - :param prompt: The prompt for the OpenAI chatbot to generate a response to - :param vykidailo: It is a boolean variable that indicates whether the user invoking the function is - an administrator or not - :param bartender: The bartender parameter is a boolean value indicating whether the user making the - request is a bartender or not - :param history: A list containing the conversation history between the user and the assistant - :param username: The username of the user who initiated the conversation - :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 - :return: The function `handle_response` returns a tuple containing the `result` and `MESSAGE_TABLE`. - """ - # TODO: Wykrywać "Pracuję nad odpowiedzią i tego typu rzeczy" - logger.info("Wywolanie procedury openai z promptem: %s", prompt) - temp = {"role": "user", "content": username + ":" + prompt} - if vykidailo or bartender: - logger.info("Administrator coś chciał") - 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: - 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") - - 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) - - 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 - 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: - 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 - 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 - 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 - 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 - 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: - 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: - 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 - 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:") - 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": - 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_file(ctx, source, link): - """ - Take in three parameters: "ctx" (context), - "source" (a string representing the source of the file), and "link" (a string representing the link - to the file). Execute it in asynchronouse way. And get file from spotify or youtube. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which a command is being executed, including information such as the - message, the channel, the server, and the user who invoked the command - :param source: The source parameter is likely a string that represents the source of the file that - the user wants to retrieve. This could be a website, a cloud storage service, or any other location - where the file is stored - :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 - """ - item_id = None - item_type = None - file_list = [] - if source == "Spotify": - dir_path = None - item_type, item_id = spotify.parse_spotify_url(link) - if item_type in ["album", "track", "playlist"] and item_id: - logger.info(item_type) - logger.info(item_id) - logger.info("Spotify link provided") - file_list = await asyncio.to_thread( - spotify.fetch_tracks, spotify_ctrl, item_type, link - ) - logger.info(file_list) - directory_name = await asyncio.to_thread( - spotify.get_item_name, spotify_ctrl, item_type, item_id - ) - logger.info(directory_name) - logger.info("Spotify scrape done") - url_data = {"urls": []} - url_dict = {} - url_dict["save_path"] = Path( - PurePath.joinpath(Path(MUSIC_FOLDER), Path(directory_name)) - ) - url_dict["save_path"].mkdir(parents=True, exist_ok=True) - url_dict["songs"] = file_list - url_data["urls"].append(url_dict.copy()) - file_name_f = youtube_download.default_filename - logger.info("YT-DL") - coro = asyncio.to_thread( - youtube_download.download_songs, - songs=url_data, - output_dir=MUSIC_FOLDER, - format_str="bestaudio/best", - skip_mp3=False, - keep_playlist_order=False, - no_overwrites=True, - remove_trailing_tracks="no", - use_sponsorblock="yes", - file_name_f=file_name_f, - multi_core=0, - proxy="", - ) - _ = await coro - logger.info("YT-DL done") - dir_path = (url_dict["save_path"].resolve()).as_posix() - if platform == "win32": - dir_path = dir_path.replace("/", "\\") - return dir_path, file_list - - await ctx.send( - "No se jaja chyba robisz, Ty byś spotifaja nie poznawszy jakby z krzaków wyskoczył i w dupę kopnął. Plejlista, kawałek albo album prosze." - ) - logger.error("Wrong link provided spotify: %s", link) - elif source == "Youtube": - link_ok = False - pat = r"^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*)$" - if re.match(pat, link) and re.match(".*youtube.*", link): - link_ok = True - - if link_ok: - dir_path = "" - file_list = [] - query = link - sponsorblock_postprocessor = [ - { - "key": "SponsorBlock", - "categories": ["skip_non_music_sections"], - }, - { - "key": "ModifyChapters", - "remove_sponsor_segments": ["music_offtopic"], - "force_keyframes": True, - }, - ] - # TODO: Make sponsorblock work - sponsorblock_postprocessor = [] - if platform == "win32": - dir_path = "G:\\Muzyka\\Youtube" - else: - dir_path = "/home/pi/RetroPie/mp3/Youtube" - ydl_opts = { - "proxy": "", - "default_search": "ytsearch", - "format": "bestaudio/best", - "postprocessors": sponsorblock_postprocessor, - "noplaylist": True, - "no_color": False, - "paths": {"home": dir_path}, - } - mp3_postprocess_opts = { - "key": "FFmpegExtractAudio", - "preferredcodec": "mp3", - "preferredquality": "192", - } - ydl_opts["postprocessors"].append(mp3_postprocess_opts.copy()) - with yt_dlp.YoutubeDL(ydl_opts) as ydl: - try: - coro = asyncio.to_thread(ydl.download, [query]) - _ = await coro - except Exception as exce: # pylint: disable=broad-exception-caught - logger.error(exce) - logger.info( - "Failed to download %s, make sure yt_dlp is up to date", link - ) - extract = re.search("v=(...........)[&,$]*", link) - ident = extract.group(1) - for item in Path.glob(Path(dir_path), "**/*.mp3"): - file = item.as_posix() - if platform == "win32": - file = file.replace("/", "\\") - if re.match(".*" + ident + ".*", file): - file_list.append(file) - return dir_path, file_list - await ctx.send( - "No se jaja chyba robisz, Ty byś jutuba nie poznawszy jakby z krzaków wyskoczył i w dupę kopnął. Jutuba to nie tuba którą sobie można gdzieś wsadzić." - ) - logger.error("Wrong link provided youtube: %s", link) - return "", None - elif source == "Pornol": - - dir_path = "" - file_list = [] - query = link - sponsorblock_postprocessor = [ - { - "key": "SponsorBlock", - "categories": ["skip_non_music_sections"], - }, - { - "key": "ModifyChapters", - "remove_sponsor_segments": ["music_offtopic"], - "force_keyframes": True, - }, - ] - # TODO: Make sponsorblock work - sponsorblock_postprocessor = [] - dir_path = "/home/pi/RetroPie/movies/porn" - ydl_opts = { - "postprocessors": sponsorblock_postprocessor, - "paths": {"home": dir_path}, - } - with yt_dlp.YoutubeDL(ydl_opts) as ydl: - try: - coro = asyncio.to_thread(ydl.download, [query]) - _ = await coro - except Exception as exce: # pylint: disable=broad-exception-caught - logger.error(exce) - logger.info( - "Failed to download %s, make sure yt_dlp is up to date", link - ) - file_list.append("wiadomo co wiadomo gdzie") - return dir_path, file_list - - -# define an asynchronous generator -async def async_iterator_generator(range_of_iterable): - """ - Generate asynchronouse iterator. - This is an incomplete function definition for an asynchronous iterator generator that takes a range - of iterable as input. - - :param range_of_iterable: The parameter `range_of_iterable` is likely a range or iterable object - that the async iterator generator will iterate over asynchronously. It could be a list, tuple, set, - or any other iterable object. The generator will yield each item in the iterable object - asynchronously, allowing other code to run in between - """ - # normal loop - for i in range_of_iterable: - # pylint: disable=pointless-string-statement - # yield the result - yield i - """ - Alternatywna wersja przerobienia fora na asynchroniczny. - # traverse the iterable of awaitables - for item in coros: - # await and get the result from the awaitable - result = await item - # report the results - print(result) - """ - - -async def get_stats(ctx, history_limit): - """ - The `get_stats` function retrieves the message history of a specific channel and counts the - frequency of each word in the messages. - - :param ctx: The `ctx` parameter is an object that represents the context of the command being - executed. It contains information such as the message, the author, the server, and other relevant - details - :param history_limit: The `history_limit` parameter is the maximum number of messages to retrieve - from the channel history. It determines how far back in time the statistics will be calculated - :return: The function `get_stats` returns a dictionary `stats` that contains the frequency count of - words found in the messages from the specified channel. - """ - channel_id = 1062047367337095268 - async with ctx.typing(): - stats = {} - channel = client.get_channel(channel_id) - messages = [message async for message in channel.history(limit=history_limit)] - # traverse the iterable of awaitables - for message in messages: - # await and get the result from the awaitable - result = message.content - words = result.split() - for word in words: - if word in stats: - stats[word] += 1 - else: - stats[word] = 1 - for name, how_many in stats.items(): - yield name, how_many - - -async def wyszukaj(ctx, how_many=0, slowa_kluczowe=None): - """ - Take in a context object and an optional integer parameter "how_many" and perform search - operation on music library. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command - :param how_many: how_many is a parameter that specifies the number of search results to be returned. - It is an optional parameter with a default value of 0, which means that if no value is provided for - 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. - if slowa_kluczowe: - word_list = slowa_kluczowe - else: - word_list = ctx.message.content.split() - logger.info("Wyszukuje") - jrequest = { - "lista_slow": word_list, - "dlugosc_plejlisty": how_many, - "UUID": str(uuid.uuid4()), - } - coroutine = asyncio.to_thread( - requests.post, - f"{FILE_SERVICE_ADDRESS}{GET_PLAYLIST}", - json=jrequest, - timeout=360, - ) - - return_data = await coroutine - if not return_data.status_code == 200: - await ctx.send("Wołaj szefa - coś się wyjebało") - return - logger.info(return_data.json()["data"]) - return return_data.json()["data"] - - -async def remove_characters(string, character): - """ - The `remove_characters` function removes all occurrences of a specified character from a given - string. - - :param string: The string parameter is the input string from which characters will be removed - :param character: The character parameter is the character that you want to remove from the string - :return: a new string where all occurrences of the specified character have been removed. - """ - return string.replace(character, "") - - -async def max_weight(lista): - """ - Take a list of weights and return the maximum weight. - - :param lista: It seems like the parameter `lista` is a list of items, possibly representing weights. - The function name `max_weight` suggests that the function is intended to find the maximum weight - from the list. However, without more context or information about the problem, it's difficult to say - for sure what the - """ - maximum_weight = 0 - for iterator in lista: - if iterator[0] > maximum_weight: - maximum_weight = iterator[0] - return maximum_weight - - -# *=========================================== Define Commands - - -@client.hybrid_command( - name="skip_track", - description="Przeskocz kawałek w radiu", - guild=discord.Object(id=664789470779932693), -) -async def skip_track(ctx): - async with ctx.typing(): - allowed = False - for role in ctx.author.roles: - if role.name in ("Thane", "Jarl"): - allowed = True - if not allowed: - await ctx.send("Łapy precz od radia") - else: - coroutine = asyncio.to_thread( - requests.get, - f"{RADIO_HARBOR_ADDRESS}{SKIP_TRACK}", - timeout=360, - ) - result = await coroutine - logger.info("Done %s", result) - await ctx.send("Zrobione szefie!") - - -@client.hybrid_command( - name="zrestartuj_radio", - description="Komenda ktora uruchamia radio ponownie jakby się zawiesiło", - guild=discord.Object(id=664789470779932693), -) -async def zrestartuj_radio(ctx): - async with ctx.typing(): - allowed = False - for role in ctx.author.roles: - if role.name in ("Thane", "Jarl"): - allowed = True - if not allowed: - await ctx.send("Łapy precz od radia") - else: - retcode = subprocess.run( - "/home/pi/Conjurer/restart_radio.sh", - shell=False, - check=False, - capture_output=True, - ) - logger.info("Wynik: %s", retcode) - - -@client.hybrid_command( - name="dej_co_ze_spotifaja", - description="Podaj link do spotify - sciagnie i doda muzyke", - guild=discord.Object(id=664789470779932693), -) -async def dej_co_ze_spotifaja(ctx): - """ - Get a playlist or a music number from Spotify. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - logger.info("Spotifaj") - await ctx.send("Dej mnie chwilkę") - async with ctx.typing(): - # wyciagnij linka z kontekstu - content = ctx.message.content.split() - for item in content: - if re.match("http.*", item): - dir_path, files = await get_file(ctx, "Spotify", item) - if platform == "win32": - separator = "\\" - else: - separator = "/" - for file in files: - file_path = ( - dir_path - + separator - + file["artist"] - + " - " - + file["name"] - + ".mp3" - ) - global MUZYKA # pylint: disable=global-variable-not-assigned - MUZYKA["queue"].insert( - 0, - dir_path - + separator - + file["artist"] - + " - " - + file["name"] - + ".mp3", - ) - MUZYKA["requester"].insert(0, ctx.author) - music_file_list.update_file_list(file_path) - await ctx.send( - f"Dodałem do listy {dir_path}{file['artist']} - + {file['name']}.mp3" - ) - logger.info("Spotifaj udany") - - -@client.hybrid_command( - name="dej_co_z_jutuba", - description="Podaj link do youtube - sciagnie i doda muzyke", - guild=discord.Object(id=664789470779932693), -) -async def dej_co_z_jutuba(ctx): - """ - Download a music number from youtube. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. It allows the command to interact - with the Discord API and - """ - await ctx.send("Dej mnie chwilkę") - logger.info("Jutub") - async with ctx.typing(): - # wyciagnij linka z kontekstu - content = ctx.message.content.split() - for item_yt in content: - if re.match("http.*", item_yt): - _, files = await get_file(ctx, "Youtube", item_yt) - if files: - for file_iter in files: - global MUZYKA # pylint: disable=global-variable-not-assigned - MUZYKA["queue"].insert(0, file_iter) - music_file_list.update_file_list(file_iter) - MUZYKA["requester"].insert(0, ctx.author) - await ctx.send(f"Dodałem do listy {file_iter}") - logger.info("Jutub udany") - - -@client.hybrid_command( - name="update_banlist", - description="Jeśli nie wiesz jak użyć tej komendy to nawet nie próbuj", - guild=discord.Object(id=664789470779932693), -) -async def update_banlist(ctx): - """ - Update a banlist in a Discord guild from preprovided list in channel. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - contains information about the context in which the command was invoked, such as the message, the - channel, the server, and the user who invoked the command. This information can be used to perform - various actions, such - """ - async with ctx.channel.typing(): - allowed = False - for role in ctx.author.roles: - if role.name == "Jarl": - allowed = True - - if ctx.channel.id != 1102190666827702342: - # trunk-ignore(codespell/misspelled) - await ctx.send("Nie wydaje mnie sie") - elif not allowed: - await ctx.send("Idź bo Cię zdziele") - else: - tobancunter = 0 - async with ctx.typing(): - # 1. get list of users posted on channel for banning - channel = ctx.channel - messages = [message async for message in channel.history(limit=None)] - ids_to_ban = [] - for message in messages: - lines = message.content.split("\n") - for line in lines: - match = re.search( - "\\d{18}", - line, - # trunk-ignore(codespell/misspelled) - ) # poprawilem backslash na podwojny bo linter sie czepial - if match: - ids_to_ban.append(match.group()) - tobancunter += 1 - # 2. get list of already banned users for all servers Conjurer - # has rights to - for guild in client.guilds: - bancunter = 0 - # trunk-ignore(codespell/misspelled) - logger.info("Serwer: %s", guild) - current_banlist = [] - permission = True - try: - async for entry in guild.bans(limit=None): - current_banlist.append(entry.user.id) - bancunter += 1 - except BaseException: # pylint: disable=broad-exception-caught - permission = False - if permission: - # 3. compare lists ban only users on list 2 and not on - # list 1 - cunter_counter = 0 - bad_id_cunter_counter = 0 - ban_list = np.setdiff1d(ids_to_ban, current_banlist) - for ident in ban_list: - try: - tmp_user = await client.fetch_user(int(ident)) - await guild.ban( - tmp_user, - reason="Automatyczna lista banów", - delete_message_seconds=0, - ) - cunter_counter += 1 - except discord.NotFound: - logger.info( - "Znaleziono uzyszkodnika ktory juz nie ma konta" - ) - bad_id_cunter_counter += 1 - # 4. return message success/failure - how many banned - await ctx.send( - "Obecnie na serwerze {guild} jest {bancunter} zbanowanych użytkowników. Znaleziono na tym kanale {tobancunter} id użytkowników do zbanowania. Zbanowano {cunter_counter} użytkowników. Na liście jest {bad_id_cunter_counter} użytkowników którzy skasowali już konto" - ) - else: - await ctx.send( - f"Nie mam na serwerze {guild} uprawnień do banowania. :()" - ) - await ctx.send("Zrobione tak czy inaczej") - - -@client.hybrid_command( - nsfw=True, - name="get_image_sadox", - description="Wyświetla losową stronę z losowego komiksu FanSadox. Bardzo NSFW.", - guild=discord.Object(id=664789470779932693), -) -async def get_image_sadox(ctx): - """ - Take in a context parameter and retrieve an image related from fansadox collection. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. In this case, it is likely being used - to determine - """ - logger.info("Get sadox") - channel = ctx.message.channel - async with channel.typing(): - # select random file - res = [] - # Iterate directory - for path in os.listdir(DIR_PATH_SADOX): - # check if current path is a file - if os.path.isfile(os.path.join(DIR_PATH_SADOX, path)): - res.append(path) - filename = res[random.randrange(0, len(res) - 1)] - # select random page - file = open(DIR_PATH_SADOX + filename, "rb") - readpdf = PyPDF2.PdfReader(file) - totalpages = len(readpdf.pages) - 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) - logger.info("Get sadox completed") - - -@client.hybrid_command( - name="graj_muzyko", - description="Włącza muzykę na kanale #nocna-zmiana.", - guild=discord.Object(id=664789470779932693), -) -async def graj_muzyko(ctx): - """ - Async function named "graj_muzyko" starts music playback on channel "Nocna Zmiana". - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - - logger.info("Press play on tape") - async with ctx.typing(): - global MUZYKA # pylint: disable=global-variable-not-assigned - MUZYKA["ctx"] = ctx - await connect(ctx=ctx) - await play(ctx=ctx) - logger.info("Press play on tape completed") - check_music.start() - - -@client.hybrid_command( - name="radio_hardkor", - description="Włącza radio Conjurer na kanale #nocna-zmiana.", - guild=discord.Object(id=664789470779932693), -) -async def radio_hardkor(ctx): - """ - Plays the radio hardkor stream in the voice channel. - - Args: - ctx: The context object representing the invocation context. - - Returns: - None - """ - logger.info("Press play on radio hardkor") - async with ctx.typing(): - global MUZYKA # pylint: disable=global-variable-not-assigned - MUZYKA["ctx"] = ctx - if not client.voice_clients: - await connect(ctx=ctx) - voice_client = client.voice_clients[0] - voice_client.play( - discord.PCMVolumeTransformer( - discord.FFmpegPCMAudio("http://95.175.16.246:666/mp3-stream"), - volume=0.3, - ) - ) - logger.info("Press play on radio completed") - else: - logger.error("Already playing") - await asyncio.sleep(12) - check_music.start() - - -@client.hybrid_command( - name="cisza", - description="Wyłącza muzykę i czyści plejliste.", - guild=discord.Object(id=664789470779932693), -) -async def cisza(ctx): - """ - Stop playback of the music and clear the queue. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - logger.info("Stop") - global MUZYKA # pylint: disable=global-variable-not-assigned - MUZYKA["ctx"] = None - voice_client = client.voice_clients[0] - check_music.stop() - if voice_client.is_connected(): - await disconnect(ctx=ctx) - while MUZYKA["queue"]: - MUZYKA["queue"].pop() - MUZYKA["requester"].pop() - logger.info("Stop completed") - - -@client.hybrid_command( - name="dalej", - description="Przerzuca na następny kawałek", - guild=discord.Object(id=664789470779932693), -) -async def dalej(ctx): - """ - Play next track in queue. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which a command is being executed, including information such as the - message, the channel, the server, and the user who invoked the command. The context object is used - to access and manipulate this - """ - if ctx: - logger.info("Ctx defined for dalej") - logger.info("Next") - voice_client = client.voice_clients[0] - if voice_client.is_connected(): - voice_client.stop() - logger.info("Next completed") - - -@client.hybrid_command( - name="daj_mi_chwile", - description="Pauzuje", - guild=discord.Object(id=664789470779932693), -) -async def daj_mi_chwile(ctx): - """ - Pause music playback. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in most - Discord.py commands and is - """ - if ctx: - logger.info("Ctx defined for pause") - - logger.info("Pause") - voice_client = client.voice_clients[0] - if voice_client.is_connected(): - voice_client.pause() - logger.info("Pause completed") - - -@client.hybrid_command( - name="graj_dalej", - description="Odpauzowuje", - guild=discord.Object(id=664789470779932693), -) -async def graj_dalej(ctx): - """ - Unpause music and continue playback. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - if ctx: - logger.info("Ctx defined for graj_dalej") - logger.info("Unpause") - voice_client = client.voice_clients[0] - if voice_client.is_paused(): - voice_client.resume() - logger.info("Unpause completed") - - -@client.hybrid_command( - name="zagraj_mi_kawalek", - description="Wyszukuje w bibliotece muzycznej Hammera kawałek który ma zostać zagrany", - guild=discord.Object(id=664789470779932693), -) -async def zagraj_mi_kawalek(ctx): - """ - Play a song or music piece in response to a command - triggered by a user in a Discord chat context. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - contains information about the context in which the command was invoked, such as the message, the - channel, the server, and the user who invoked the command. This information can be used to perform - various actions, such - """ - async with ctx.typing(): - search_time_glob = datetime.now() - logger.info("Zaczynam szukać timestamp %s", datetime.now()) - file = await wyszukaj(ctx=ctx) - logger.info( - "Koniec szukania(timestamp %s zajęło %s", - datetime.now(), - datetime.now() - search_time_glob, - ) - - if file: - for plik in file: - global MUZYKA # pylint: disable=global-variable-not-assigned - MUZYKA["queue"].insert(0, plik[1]) - MUZYKA["requester"].insert(0, ctx.author) - metadata = eyed3.load(plik[1]) - reply = "Dodałem do playlisty {plik[1]} z prywatnej kolekcji Hammera." - if metadata.tag.title: - reply = f"Dodałem do playlisty kawalek {metadata.tag.title}" - if metadata.tag.artist: - reply += f" wykonawcy {metadata.tag.artist}" - if metadata.tag.album: - reply += f" z albumu {metadata.tag.album}" - reply += " z prywatnej kolekcji Hammera i na Twoją specjalną rpośbę." - await ctx.send(reply) - else: - await ctx.send( - "Obawiam się że nie mogę nic znaleźć u siebie. Spróbuj komendy '$dej_co_ze_spotifaja' jeśli masz link" - ) - - -@client.hybrid_command( - name="dodaj_do_ulubionych", - description="Dodaje do listy ulubionych w radiu", - guild=discord.Object(id=664789470779932693), -) -async def dodaj_do_ulubionych(ctx): - """ - Generate a playlist in queue. First word in this command shall be int defining length of the playlist. - Rest of the line are search terms. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - async with ctx.typing(): - logger.info("Zaczynam szukać timestamp %s", datetime.now()) - - dlugosc_playlisty = ctx.message.content.split()[1] - word_list = ctx.message.content.split() - jrequest = { - "lista_slow": word_list, - "dlugosc_plejlisty": dlugosc_playlisty, - "UUID": str(uuid.uuid4()), - } - coroutine = asyncio.to_thread( - requests.post, - f"{FILE_SERVICE_ADDRESS}{ADD_TO_PRIO_PLAYLIST}", - json=jrequest, - timeout=360, - ) - result = await coroutine - logger.info("Done %s", result) - await ctx.send("Zrobione szefie!") - - -@client.hybrid_command( - name="ja_chciol", - description="Dodaje do listy ulubionych w radiu", - guild=discord.Object(id=664789470779932693), -) -async def request_radio(ctx): - """ - Generate a playlist in queue. First word in this command shall be int defining length of the playlist. - Rest of the line are search terms. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - async with ctx.typing(): - logger.info("Zaczynam szukać timestamp %s", datetime.now()) - - word_list = ctx.message.content.split() - jrequest = { - "lista_slow": word_list, - "UUID": str(uuid.uuid4()), - } - coroutine = asyncio.to_thread( - requests.post, - f"{FILE_SERVICE_ADDRESS}{REQUEST_MUSIC}", - json=jrequest, - timeout=360, - ) - result = await coroutine - logger.info("Done %s", result) - await ctx.send("Zrobione szefie!") - - -@client.hybrid_command( - name="stworz_audycje", - description="Dodaje do listy ulubionych w radiu", - guild=discord.Object(id=664789470779932693), -) -async def stworz_audycje(ctx): - """ - Generate a playlist in queue. First word in this command shall be int defining length of the playlist. - Rest of the line are search terms. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - async with ctx.typing(): - logger.info("Zaczynam szukać timestamp %s", datetime.now()) - - dlugosc_playlisty = ctx.message.content.split()[1] - word_list = ctx.message.content.split() - jrequest = { - "lista_slow": word_list, - "dlugosc_plejlisty": dlugosc_playlisty, - "UUID": str(uuid.uuid4()), - } - coroutine = asyncio.to_thread( - requests.post, - f"{FILE_SERVICE_ADDRESS}{CREATE_PRIO_PLAYLIST}", - json=jrequest, - timeout=360, - ) - result = await coroutine - logger.info("Done %s", result) - await ctx.send("Zrobione szefie!") - - -@client.hybrid_command( - name="wyczysc_ulubione", - description="Czysci liste ulubionych w radiu", - guild=discord.Object(id=664789470779932693), -) -async def wyczysc_ulubione(ctx): - """ - Generate a playlist in queue. First word in this command shall be int defining length of the playlist. - Rest of the line are search terms. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - async with ctx.typing(): - coroutine = asyncio.to_thread( - requests.get, - f"{FILE_SERVICE_ADDRESS}{CLEAR_PRIO}", - timeout=360, - ) - result = await coroutine - logger.info("Done %s", result) - await ctx.send("Zrobione szefie!") - - -@client.hybrid_command( - name="zrob_mi_plejliste", - description="Generuje playliste - param1 - dlugosc, potem slowa wyszukiwania", - guild=discord.Object(id=664789470779932693), -) -async def zrob_mi_plejliste(ctx): - """ - Generate a playlist in queue. First word in this command shall be int defining length of the playlist. - Rest of the line are search terms. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - reply = "Wygenerowana plejlista:\n" - async with ctx.typing(): - logger.info("Zaczynam szukać timestamp %s", datetime.now()) - search_time_glob = datetime.now() - - dlugosc_playlisty = ctx.message.content.split()[1] - file = await wyszukaj(ctx=ctx, how_many=dlugosc_playlisty) - logger.info( - "Koniec szukania(timestamp %s zajęło %s", - datetime.now(), - datetime.now() - search_time_glob, - ) - index = 1 - if file: - for plik in file: - if plik[1]: - logger.info(plik) - global MUZYKA # pylint: disable=global-variable-not-assigned - MUZYKA["queue"].insert(0, plik[1]) - MUZYKA["requester"].insert(0, ctx.author) - metadata = eyed3.load(plik[1]) - if metadata and metadata.tag: - if metadata.tag.title: - reply += f"{index} {metadata.tag.title}" - else: - reply += f"{index}. {plik[1]} z prywatnej kolekcji Hammera." - - if metadata.tag.artist: - reply += f" wykonawcy {metadata.tag.artist}" - if metadata.tag.album: - reply += f" z albumu {metadata.tag.album}" - if metadata.tag.title: - reply += " z prywatnej kolekcji Hammera i na Twoją specjalną rpośbę.\n" - else: - reply += f"{index}. {plik[1]} z prywatnej kolekcji Hammera.\n" - - index += 1 - if len(reply) > 1800: - await ctx.send(reply) - reply = "" - else: - await ctx.send( - "Obawiam się że nie mogę nic znaleźć u siebie. Spróbuj komendy '$dej_co_ze_spotifaja' jeśli masz link" - ) - await ctx.send(reply) - logger.info("Plejlista zrobiona") - - -@client.hybrid_command( - name="przytul", description="Przytul kogoś - daj mention po komendzie :)" -) -async def przytul(ctx, arg: Optional[discord.Member] = None): - """ - Generate a text about hugging mentioned user. - - :param ctx: ctx stands for "context" and is a required parameter in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command - :param arg: arg is a parameter of the function "przytul" that expects a Discord member object. The - parameter is optional, meaning that if no member object is provided, it will default to None - :type arg: Optional[discord.Member] - """ - async with ctx.typing(): - nieprzytulac = False - for mention in ctx.message.mentions: - for role in mention.roles: - if role.name == "NIEPRZYTULAĆ!": - nieprzytulac = True - - if arg and nieprzytulac: - await ctx.send( - f"Żebym ja Ciebie nie przytulił {ctx.message.author.mention}" - ) - elif arg: - await ctx.send( - # trunk-ignore(codespell/misspelled) - f"Już dobrze.... Już dobrze... Ojej.. Biedactwo... :( *W ułamku sekundy {arg.mention} znajduje sie w duszącym uścisku. Żebra trzeszczą - kilka pęka. Pacnięcia po plecach grożą odbiciem nerek, a głaskanie po głowie powoduje wstrząs mózgu*" - ) - else: - await ctx.send( - "Kogo mam przytulić? *Wyłamuje kostki i przeciąga się - jego 200 kilowa sylwetka złożona z samych mięśni świadczy o tym że jest gotowy*" - ) - - -@client.hybrid_command(name="fabryczka", description="Historia fabryczki") -async def fabryczka(ctx): - """ - Send a general description of "fabryczkagate" to channel. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. The context object provides a way to - interact with the Discord - """ - await ctx.send(historia_fabryczki) - - -@client.hybrid_command( - name="chata_hammera", - description="Czas od ostatniego incydentu w AbsinthHammerTimeSpaceContinuum", -) -async def chata_hammera(ctx): - """ - Send measured time from last incident in Hammer Fortress to the chat. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - contains information about the context in which the command was invoked, such as the message, the - channel, the server, and the user who invoked the command. This information can be used to perform - various actions, such - """ - with open(ACCIDENT_LOG, "r+", encoding=ENCODING) as new_file: - # First we load existing data into a dict. - file_data = json.load(new_file) - opis = file_data[-1][0] - czas = datetime.strptime(file_data[-1][1], "%Y-%m-%d %H:%M:%S.%f") - await ctx.send( - f"Komenda mierząca incydenty w Eldritch AbsinthHammerTimeSpaceContinuum.\n Od ostatniego incydentu w chacie Hammera minęło {datetime.now() - czas}. Incydent to: {opis}" - ) - - -@client.hybrid_command( - name="historia_incydentow_u_hammera", - description="Wyswietla liste incydentów które miały miejsce w AbsinthHammerTimeSpaceContinuum.", -) -async def historia_incydentow_u_hammera(ctx): - """ - Send a list of incidents in Hammer Fortress to the chat. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - contains information about the context in which the command was invoked, such as the message, the - channel, the server, and the user who invoked the command. This information can be used to perform - various actions, such - """ - with open(ACCIDENT_LOG, "r+", encoding=ENCODING) as new_file_accidents: - # First we load existing data into a dict. - file_data = json.load(new_file_accidents) - return_data = "Komenda mierząca incydenty w Eldritch AbsinthHammerTimeSpaceContinuum.\n Historia zarejestrownych incydentów u Hammera:\n" - index = 1 - for iter_data in file_data: - opis = iter_data[0] - czas = datetime.strptime(iter_data[1], "%Y-%m-%d %H:%M:%S.%f") - add_data = f"{index}. Opis: {opis} Data: {czas}" - return_data = return_data + add_data + "\n" - index += 1 - await ctx.send(return_data) - - -@client.hybrid_command( - name="reset_the_clock", - description="Resetowanie zegara - dostępne wyłącznie dla Hammera", - guild=discord.Object(id=664789470779932693), -) -async def reset_the_clock(ctx): - """ - Reset the clock on "accidents" in Hammer Fortress adding a new one. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. This parameter is required in all - Discord.py commands - """ - hammer = False - for role in ctx.message.author.roles: - if role.name == "Bartender": - hammer = True - if hammer: - with open(ACCIDENT_LOG, "r+", encoding=ENCODING) as new_file_accidents: - # First we load existing data into a dict. - file_data = json.load(new_file_accidents) - czas = datetime.strptime(file_data[-1][1], "%Y-%m-%d %H:%M:%S.%f") - opis = ctx.message.content[16:] - accident = accident = [opis, f"{datetime.now()}"] - file_data.append(accident) - new_file_accidents.seek(0) - # convert back to json. - json.dump(file_data, new_file_accidents, indent=4) - await ctx.send( - f"Komenda mierząca incydenty w Eldritch AbsinthHammerTimeSpaceContinuum.\n RESET THE CLOCK. Od ostatniego incydentu w chacie Hammera minęło {czas}. No ale teraz się odpierdoliło: {opis}" - ) - else: - await ctx.send( - f"Komenda mierząca incydenty w Eldritch AbsinthHammerTimeSpaceContinuum.\n Gdzie z łapami do zegara? {client.get_user(346956223645614080).mention} coś albo się komuś stało albo zaraz się stanie jak będzie zegar tykał...." - ) - - -# @client.hybrid_command() -async def get_image_stable_diffusion(ctx): - """ - Connect to remote stable diffusion and generate an image. Retrieve the image. - - :param ctx: ctx is short for context and is typically used in Discord.py to represent the context in - which a command is being executed. It contains information such as the message, the channel, the - author, and other relevant data that can be used to perform actions or respond to the user. In this - case, it - """ - if ctx: - pass - - -@client.hybrid_command( - name="zagraj_muzyke_mego_ludu", - description="Gra muzyke wyszukana na bazie tematow konwersacji na kanale NZ", - guild=discord.Object(id=664789470779932693), -) -async def zagraj_muzyke_mego_ludu(ctx): - """ - Play completeley random playlist based on messaging history. - - :param ctx: ctx stands for "context" and is typically used in Discord.py commands to represent the - context in which the command was invoked. This includes information such as the message, the - channel, the author, and other relevant details. In this case, it is being passed as a parameter to - the `get_image - """ - stats = {} - if ctx: - logger.info("Zagraj muzyke mego ludu: wywolane") - stat_iter = get_stats(ctx, MUZYKA_MOJEGO_LUDU_HISTORIA) - async for name, how_many in stat_iter: - if len(name) > 3: - stats[name] = how_many - - sorted_stats = sorted(stats.items(), key=lambda x: x[1]) - logger.info("Zagraj muzyke mego ludu:zebrano statystyki") - key_words = [] - for stat in sorted_stats: - key_words.append(stat[0]) - logger.info(sorted_stats[:MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE]) - logger.info(key_words[:MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE]) - logger.info(sorted_stats[-MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE:]) - logger.info(key_words[-MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE:]) - - final_key_words = key_words[:MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE] - final_key_words.extend(key_words[-MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE:]) - reply = "Wygenerowana plejlista:\n" - async with ctx.typing(): - logger.info( - "Zagraj muzyke mego ludu:Zaczynam szukać timestamp %s", datetime.now() - ) - search_time_glob = datetime.now() - file = await wyszukaj( - ctx=ctx, - how_many=MUZYKA_MOJEGO_LUDU_PLAJLISTA, - slowa_kluczowe=final_key_words, - ) - logger.info("Zagraj muzyke mego ludu:wygenerowano plejliste") - logger.info(file) - logger.info( - "Zagraj muzyke mego ludu: Koniec szukania(timestamp %s zajęło %s", - datetime.now(), - datetime.now() - search_time_glob, - ) - index = 1 - if file: - for plik in file: - global MUZYKA # pylint: disable=global-variable-not-assigned - MUZYKA["queue"].insert(0, plik[1]) - MUZYKA["requester"].insert(0, ctx.author) - metadata = eyed3.load(plik[1]) - if metadata and metadata.tag: - if metadata.tag.title: - reply += f"{index} {metadata.tag.title}" - else: - reply += f"{index}. {plik[1]} z prywatnej kolekcji Hammera." - - if metadata.tag.artist: - reply += f" wykonawcy {metadata.tag.artist}" - if metadata.tag.album: - reply += f" z albumu {metadata.tag.album}" - if metadata.tag.title: - reply += " z prywatnej kolekcji Hammera i na Twoją specjalną rpośbę.\n" - else: - reply += f"{index}. {plik[1]} z prywatnej kolekcji Hammera.\n" - - index += 1 - if len(reply) > 1800: - await ctx.send(reply) - reply = "" - else: - await ctx.send( - "Obawiam się że nie mogę nic znaleźć u siebie. Spróbuj komendy '$dej_co_ze_spotifaja' jeśli masz link" - ) - await ctx.send(reply) - logger.info("Plejlista zrobiona") - - -@client.hybrid_command( - name="parametry_muzyki_mego_ludu", - description="Konfiguruje komende zagraj muzyke mojego ludu", - guild=discord.Object(id=664789470779932693), -) -async def parametry_muzyki_mego_ludu( - ctx, ile_historii=1500, ile_slow_kluczowych=15, jak_dluga_plejlista=30 -): - """ - The function `parametry_muzyki_mego_ludu` sets global variables for the number of history entries, - number of keywords, and length of playlist for a music application. - - :param ctx: The `ctx` parameter is typically used in Discord.py, a Python library for creating - Discord bots. It represents the context of the command being executed, including information about - the message, the server, and the user who invoked the command - :param ile_historii: The parameter "ile_historii" represents the number of history items for the - music playlist, defaults to 1500 (optional) - :param ile_slow_kluczowych: The parameter "ile_slow_kluczowych" represents the number of keywords or - key phrases related to music that you want to include in your analysis or search, defaults to 30 - (optional) - :param jak_dluga_plejlista: The parameter "jak_dluga_plejlista" determines the length of the - playlist. It specifies how many songs should be included in the playlist, defaults to 30 (optional) - """ - - if ctx: - async with ctx.typing(): - # if ':' in ile_historii: - # _, _, ile_historii = ile_historii.partition(':') - # if ':' in ile_slow_kluczowych: - # _, _, ile_slow_kluczowych = ile_slow_kluczowych.partition(':') - # if ':' in jak_dluga_plejlista: - # _, _, jak_dluga_plejlista = jak_dluga_plejlista.partition(':') - try: - global MUZYKA_MOJEGO_LUDU_HISTORIA # pylint: disable=global-statement - global MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE # pylint: disable=global-statement - global MUZYKA_MOJEGO_LUDU_PLAJLISTA # pylint: disable=global-statement - logger.info( - "Długość historii wyszukiwania: %s\n Ilość słów kluczowych: %s\n Długość plejlisty do wygenerowanie: %s", - MUZYKA_MOJEGO_LUDU_HISTORIA, - MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE, - MUZYKA_MOJEGO_LUDU_PLAJLISTA, - ) - ctx.send( - f"Dotychczasowe wartośći:\n Długość historii wyszukiwania: {MUZYKA_MOJEGO_LUDU_HISTORIA}\n Ilość słów kluczowych: {MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE}\n Długość plejlisty do wygenerowanie:{MUZYKA_MOJEGO_LUDU_PLAJLISTA}" - ) - MUZYKA_MOJEGO_LUDU_HISTORIA = ile_historii - MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE = ile_slow_kluczowych - MUZYKA_MOJEGO_LUDU_PLAJLISTA = jak_dluga_plejlista - logger.info( - "Długość historii wyszukiwania: %s\n Ilość słów kluczowych: %s\n Długość plejlisty do wygenerowanie: %s", - MUZYKA_MOJEGO_LUDU_HISTORIA, - MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE, - MUZYKA_MOJEGO_LUDU_PLAJLISTA, - ) - ctx.send( - f"Zmienione wartośći:\n Długość historii wyszukiwania: {MUZYKA_MOJEGO_LUDU_HISTORIA}\n Ilość słów kluczowych: {MUZYKA_MOJEGO_LUDU_SLOWA_KLUCZOWE}\n Długość plejlisty do wygenerowanie:{MUZYKA_MOJEGO_LUDU_PLAJLISTA}" - ) - except discord.ext.commands.errors.BadArgument as exce: - ctx.send("Spierdalaj") - logger.info(exce) - - -@client.hybrid_command( - name="wyszukaj_linki_do_dokumentow", - description="Szuka linkow doi w bazie crossref i podaje linki do scihuba", - guild=discord.Object(id=664789470779932693), -) -async def wyszukaj_linki_do_dokumentow(ctx): - """ - The function `wyszukaj_linki_do_dokumentow` searches for links to documents in a crossref database and provides links to scihub. - - :param ctx: The `ctx` parameter is typically used in Discord.py, a Python library for creating Discord bots. - It represents the context of the command being executed, including information about the message, the server, - and the user who invoked the command. - """ - query = ctx.message.content - query_uuid = uuid.uuid4() - # TODO: TESTING ONLY!! - # query_uuid = uuid.UUID('{12345678-1234-5678-1234-567812345678}') - ctx.message.content = ctx.message.content.replace( - "$wyszukaj_linki_do_dokumentow", "" - ) - - json_query = { - "UUID": str(query_uuid), - "query": str(query), - "page": 1, - "deep_search": False, - } - coroutine = asyncio.to_thread( - requests.post, - f"{LIBRARIAN_SERVICE_ADDRESS}{SEND_QUERY}", - json=json_query, - timeout=360, - ) - await ctx.send( - "*Conjurer powoli notuje podane przez Ciebie. Podchodzi do sprytnie ukrytej przy barze rury od poczty pneumatycznej i" - + " wrzuca twój liścik do środka* To teraz trza poczekać kilka godzin. Biblioteka to 3/4 stacji." - + " A przecież pół stacji to browar, motelik dla zabaw cielesnych i ten Bar. Więc 12/8 stacji teraz będzie ciężko pracować" - ) - query_response = await coroutine - if not query_response.status_code == 200: - await ctx.send( - "*Z rury wydobywa się dym. Conjurer łapie pierwszą ciecz pod ręką i pryska na rurę. Następuje drobna eksplozja i wszystko zaczyna się palić." - + " Conjurer jest skonfundowany..* Wołaj szefa - mam nieodparte wrażenie że się coś wyjebało" - ) - return - - query, query_uuid, queue_size = ( - query_response.json()["data"][0], - query_response.json()["data"][1], - query_response.json()["data"][2], - ) - if ctx.message.author.nick: - username = ctx.message.author.nick - else: - username = ctx.message.author.name - query_object = QueryControl(username, query_uuid, query, ctx) - OUT_COMM_Q.put(query_object) - await ctx.send( - f"No dobra poszło. Zapamiętaj proszę {query_uuid} - to identyfikator twojego zapytania. Jesteś {queue_size} w kolejce." - + " Zapytania obsługuje algorytm zasilany czterema chomikami zapierdalającymi w kołowrotku - więc wyniki najwcześniej za kilka godzi - ale mogą być też dni." - ) - - -@client.hybrid_command( - name="glebokie_gardlo", - description="Przygotowuje drinka o nazwie głębokie gardło", - guild=discord.Object(id=664789470779932693), -) -async def wyszukaj_linki_do_dokumentow_deep(ctx): - """ - The function `wyszukaj_linki_do_dokumentow_deep` performs a deep search for links to documents in - a crossref database and provides links to scihub. - - :param ctx: The `ctx` parameter is typically used in Discord.py, a Python library for creating Discord bots. - It represents the context of the command being executed, including information about the message, the server, - and the user who invoked the command. - """ - # TODO: Implement deep search logic here - query = ctx.message.content.replace("$glebokie_gardlo", "") - allowed = False - for role in ctx.message.author.roles: - if role.name == "Bartender": - allowed = True - if role.name == "Scribe": - allowed = True - if role.name == "Thane": - allowed = True - if not allowed: - if ctx.message.author.nick: - username = ctx.message.author.nick - else: - username = ctx.message.author.name - vykidailo = False - bartender = False - prompt = "Przygotuj mi drinka o nazwie Głębokie Gardło, inspirowanego tym sławnym filmem oraz skandalem Watergate" - for role in ctx.message.author.roles: - if role.name == "Vykidailo": - vykidailo = True - if role.name == "Bartender": - bartender = True - global MESSAGE_TABLE # pylint: disable=global-statement - - result, MESSAGE_TABLE = await handle_response( - prompt, vykidailo, bartender, MESSAGE_TABLE, username, "CONVERSATION" - ) - if len(result) < 1500: - await ctx.send(result) - else: - while len(result) > 1500: - await ctx.send(result[:1500]) - result = result[1500:] - return - - query_uuid = uuid.uuid4() - # TODO: TESTING ONLY!! - # query_uuid = uuid.UUID('{12345678-1234-5678-1234-567812345678}') - json_query = { - "UUID": str(query_uuid), - "query": str(query), - "page": 1, - "deep_search": True, - } - coroutine = asyncio.to_thread( - requests.post, - f"{LIBRARIAN_SERVICE_ADDRESS}{SEND_QUERY}", - json=json_query, - timeout=360, - ) - await ctx.send( - "*Conjurer mruga okiem i zamiast drinka wyjmuje dysk usb z terminala. Podchodzi do sprytnie ukrytej przy barze rury od poczty pneumatycznej i" - + " wrzuca ten dysk do środk* To teraz trza poczekać kilka godzin. TO będzie głębokie wyszukanie" - + " Rozgląda się dookoła i stawia przed tobą mętnego drinka o zapachu mięty, gwiezdnego pyłu i oleju silnikowego" - ) - query_response = await coroutine - if not query_response.status_code == 200: - await ctx.send( - "*Z rury wydobywa się dym. Conjurer łapie pierwszą ciecz pod ręką i pryska na rurę. Następuje drobna eksplozja i wszystko zaczyna się palić." - + " Conjurer jest skonfundowany..* Wołaj szefa - mam nieodparte wrażenie że się coś wyjebało" - ) - return - - query, query_uuid, queue_size = ( - query_response.json()["data"][0], - query_response.json()["data"][1], - query_response.json()["data"][2], - ) - if ctx.message.author.nick: - username = ctx.message.author.nick - else: - username = ctx.message.author.name - query_object = QueryControl(username, query_uuid, query, ctx) - OUT_COMM_Q.put(query_object) - await ctx.send( - f"Wypij wypi {query_uuid} - to identyfikator twojego zapytania. Jesteś {queue_size} w kolejce niestety kolejka obowiazuje zawsze." - + " Zapytania obsługuje algorytm zasilany czterema chomikami zapierdalającymi w kołowrotku - więc wyniki najwcześniej za kilka godzin - ale mogą być też dni. Głębokie zabawy trwają dłużej. *Znowu mruga*" - ) - - -@client.hybrid_command( - name="krecimy_pornola", - description="Wiadomo co, dla kogo i po co", - guild=discord.Object(id=664789470779932693), -) -async def krecimy_pornola(ctx): - """ - Download a music number from youtube. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. It allows the command to interact - with the Discord API and - """ - await ctx.send("Dej mnie chwilkę") - allowed = False - for role in ctx.author.roles: - if role.name == "Bartender": - allowed = True - if allowed: - logger.info("Pornol") - async with ctx.typing(): - # wyciagnij linka z kontekstu - content = ctx.message.content.split() - for item_yt in content: - if re.match("http.*", item_yt): - sciezka, files = await get_file(ctx, "Pornol", item_yt) - if files: - logger.info("Pornol udany") - await ctx.send(f"Jest w tajnym archiwum pod adresem{sciezka})") - else: - await ctx.reply("Jak ładnie szefa poprosisz.") - -@client.hybrid_command( - name="co_na_plejliscie_wariacie", - description="Wyswietl kawalki ktore sa na pocztku list radia", - guild=discord.Object(id=664789470779932693), -) -async def co_na_plejliscie_wariacie(ctx): - """ - Download a music number from youtube. - - :param ctx: ctx stands for "context" and is a parameter commonly used in Discord.py commands. It - represents the context in which the command was invoked, including information such as the message, - the channel, the server, and the user who invoked the command. It allows the command to interact - with the Discord API and - """ - await ctx.send("Dej mnie chwilkę") - async with ctx.typing(): - logger.info("plejlista") - logger.info(PREPPED_TRACKS) - await ctx.send(f"Didżej Hammer i jego sztuczna inteligencja (||he he||) prezentują: \n- obecnie grany jest {(PREPPED_TRACKS['now_playing']).rstrip()} (wg metadanych: {PREPPED_TRACKS['meta']}) \n- następny będzie{(PREPPED_TRACKS['next']).rstrip()} \n- na liście priorytetowej {(PREPPED_TRACKS['priority']).rstrip()} \n- na liście hitów obecnie czeka kawałek {(PREPPED_TRACKS['hit']).rstrip()} \n- na liście wszystkich kawałków {(PREPPED_TRACKS['all']).rstrip()} \n- najświeższym zamówieniem od słuchaczy jest {(PREPPED_TRACKS['requests']).rstrip()} \nZ kolei jingiel to: {(PREPPED_TRACKS['jingles']).rstrip()}") - -# *================================== Run -if __name__ == "__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() diff --git a/conjurer_musician/script.params b/conjurer_musician/script.params index f8837f0..5b09f6b 100644 --- a/conjurer_musician/script.params +++ b/conjurer_musician/script.params @@ -45,7 +45,7 @@ ], [ "compress_release5", - 170.0 + 120.0 ], [ "compress_attack5", @@ -69,7 +69,7 @@ ], [ "compress_release4", - 180.0 + 130.0 ], [ "compress_attack4", @@ -81,7 +81,7 @@ ], [ "compress_gain3", - 8.2 + 5.5 ], [ "compress_ratio3", @@ -93,7 +93,7 @@ ], [ "compress_release3", - 180.0 + 140.0 ], [ "compress_attack3", @@ -105,7 +105,7 @@ ], [ "compress_gain2", - 7.4 + 3.3 ], [ "compress_ratio2", @@ -117,7 +117,7 @@ ], [ "compress_release2", - 190.0 + 120.0 ], [ "compress_attack2", @@ -129,7 +129,7 @@ ], [ "compress_gain1", - 11.1 + 5.6 ], [ "compress_ratio1", @@ -137,11 +137,11 @@ ], [ "compress_threshold1", - -12.7 + -12.2 ], [ "compress_release1", - 170.0 + 120.0 ], [ "compress_attack1", @@ -153,7 +153,7 @@ ], [ "compress_gain0", - 16.0 + 7.5 ], [ "compress_ratio0", @@ -161,15 +161,15 @@ ], [ "compress_threshold0", - -15.3 + -13.1 ], [ "compress_release0", - 200.0 + 110.0 ], [ "compress_attack0", - 90.0 + 140.0 ], [ "compress_frequency0", @@ -185,11 +185,11 @@ ], [ "g", - 9.5 + 1.0 ], [ "f", - 64.2 + 106.4 ] ] } \ No newline at end of file diff --git a/constants.py b/constants.py index f120878..2185187 100644 --- a/constants.py +++ b/constants.py @@ -150,4 +150,6 @@ LATEX_MAX_ZIP_MB = 25 OPENAI_MODEL = "gpt-4o-mini" ALLOWED_ROLES = ["Nocna Zmiana", "Jarl", "Thane", "Bartender"] -GUILD_ID = 664789470779932693 \ No newline at end of file +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) diff --git a/dj_debug_fonts.sh b/dj_debug_fonts.sh deleted file mode 100644 index f3557a4..0000000 --- a/dj_debug_fonts.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -exists() { command -v "$1" >/dev/null 2>&1; } - -echo "[i] Checking environment..." -for c in fc-list pdffonts tectonic; do - if ! exists "$c"; then - echo " - $c: NOT FOUND (optional but recommended: sudo apt install -y fontconfig poppler-utils tectonic)" - else - echo " - $c: OK" - fi -done - -echo "[i] Listing local ./fonts content:" -ls -l ./fonts 2>/dev/null || echo " (no ./fonts directory)" - -if exists fc-list; then - echo "[i] System fonts (grep Garamond|Cinzel|FELL):" - fc-list | grep -Ei "Garamond|Cinzel|Fell" || echo " (none found in system)" -fi - -pdfs=(dj_cheat_sheet_transitions.pdf dj_tracklist.pdf dj_mini_sheet.pdf dj_notes.pdf dj_setup_mapping.pdf dj_one_laptop_fallback.pdf dj_rider.pdf dj_podrecznik.pdf) -if exists pdffonts; then - for p in "${pdfs[@]}"; do - [ -f "$p" ] || continue - echo "[i] Fonts embedded in $p:" - pdffonts "$p" || true - done -else - echo "[!] pdffonts not installed; cannot list embedded fonts." -fi - -echo "[i] Grepping last Tectonic log (if any .log files exist)..." -logs=$(ls -1 *.log 2>/dev/null || true) -if [ -n "$logs" ]; then - grep -Ei "fontspec|warning|not found" *.log || echo " (no relevant warnings)" -else - echo " (no .log files)" -fi diff --git a/dj_fonts_system_install.sh b/dj_fonts_system_install.sh new file mode 100755 index 0000000..aa59423 --- /dev/null +++ b/dj_fonts_system_install.sh @@ -0,0 +1,141 @@ +#!/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.)" diff --git a/dj_oneclick_fix.sh b/dj_oneclick_fix.sh deleted file mode 100644 index 2f025d8..0000000 --- a/dj_oneclick_fix.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -need() { command -v "$1" >/dev/null 2>&1 || { echo "Missing: $1" >&2; exit 1; }; } - -echo "[+] Checking tools..." -need wget -need unzip -need tectonic || { echo "Install tectonic first (e.g. sudo apt install tectonic)"; exit 1; } - -mkdir -p fonts - -echo "[+] Downloading EB Garamond (Initials) to ./fonts ..." -tmpzip="/tmp/ebgaramond.zip" -wget -q -O "$tmpzip" https://github.com/octaviopardo/EBGaramond/releases/download/v0.016/EBGaramond-ttf.zip -unzip -jq "$tmpzip" "*Initials*.ttf" -d fonts -ls -1 fonts | grep -i initials || echo "WARN: EBGaramond Initials not found in zip?" - -echo "[+] Downloading Cinzel Decorative (Black) to ./fonts ..." -tmpzip="/tmp/cinzel.zip" -wget -q -O "$tmpzip" "https://fonts.google.com/download?family=Cinzel%20Decorative" || true -unzip -jq "$tmpzip" "*Decorative-Black*.ttf" -d fonts || echo "WARN: Cinzel Decorative Black not found; continuing." - -echo "[+] (Optional) Downloading IM FELL English SC to ./fonts ..." -tmpzip="/tmp/imfell.zip" -wget -q -O "$tmpzip" "https://fonts.google.com/download?family=IM%20Fell%20English%20SC" || true -unzip -jq "$tmpzip" "*.ttf" -d fonts || echo "INFO: IM FELL SC optional; skip if not needed." - -echo "[+] Building PDFs with Tectonic..." -for f in dj_cheat_sheet_transitions.tex dj_tracklist.tex dj_mini_sheet.tex dj_notes.tex dj_setup_mapping.tex dj_one_laptop_fallback.tex dj_rider.tex dj_podrecznik.tex; do - if [ -f "$f" ]; then - echo " -> $f" - tectonic "$f" >/dev/null - else - echo "SKIP: $f not found" - fi -done - -echo "[+] Done. Generated PDFs:" -ls -1 *.pdf 2>/dev/null || true diff --git a/fontget.sh b/fontget.sh new file mode 100644 index 0000000..ae915d1 --- /dev/null +++ b/fontget.sh @@ -0,0 +1,98 @@ +#!/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/ + 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 - < [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." diff --git a/fonts/CinzelDecorative-Black.ttf b/fonts/CinzelDecorative-Black.ttf new file mode 100644 index 0000000000000000000000000000000000000000..e5294b9ec9c5914fc9b775dc401e6a737d059272 GIT binary patch literal 62692 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

%}#f- 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 literal 0 HcmV?d00001 diff --git a/fonts/EBGaramond-Initials.ttf b/fonts/EBGaramond-Initials.ttf new file mode 100644 index 0000000..e69de29 diff --git a/fonts/IMFellEnglishSC-Regular.ttf b/fonts/IMFellEnglishSC-Regular.ttf new file mode 100644 index 0000000..e69de29 diff --git a/gpt_interface/app.py b/gpt_interface/app.py new file mode 100644 index 0000000..e789c52 --- /dev/null +++ b/gpt_interface/app.py @@ -0,0 +1,14 @@ +from flask import Flask +from file_serv import bp as uploader_bp +from ingest import bp as ingest_bp +from waitress import serve + +app = Flask(__name__) +HOST_ADDRESS = "127.0.0.1" +PORT_ADDRESS = 49151 + +if __name__ == "__main__": + app.register_blueprint(uploader_bp, url_prefix="/api") + app.register_blueprint(ingest_bp, url_prefix="/api") + + serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS) diff --git a/gpt_interface/file_serv.py b/gpt_interface/file_serv.py new file mode 100644 index 0000000..ee58fee --- /dev/null +++ b/gpt_interface/file_serv.py @@ -0,0 +1,155 @@ +# -*- coding: utf-8 -*- +from __future__ import annotations +import os +from pathlib import Path +from typing import List, Dict, Any, Optional + +from flask import Blueprint, request, jsonify, send_file, abort, current_app +from werkzeug.utils import secure_filename + +# ===== Konfiguracja przez ENV ===== + +if API_KEY := os.getenv("API_KEY") is None: + with open("/home/pi/gpt_cont_api_key", "r") as f: + API_KEY = f.read().strip() +else: + API_KEY = os.getenv("API_KEY", "") # np. openssl rand -hex 32 + +UPLOAD_DIR = Path(os.getenv("UPLOAD_DIR", "/home/pi/tmp_git/")) # katalog na dysku +MAX_CONTENT_MB = int(os.getenv("MAX_CONTENT_MB", "200")) + +# Google Drive (opcjonalnie) +GDRIVE_ENABLE = os.getenv("GDRIVE_ENABLE", "0") == "1" +GDRIVE_SA_JSON = os.getenv("GDRIVE_SA_JSON", "") # ścieżka do pliku .json konta serwisowego +GDRIVE_FOLDER_ID = os.getenv("GDRIVE_FOLDER_ID", "") # ID folderu na Drive + +bp = Blueprint("uploader", __name__) + +# Inicjalizacja katalogu +UPLOAD_DIR.mkdir(parents=True, exist_ok=True) + +def _check_auth() -> bool: + """Proste Bearer auth. Jeśli API_KEY puste -> bez auth (niezalecane).""" + if not API_KEY: + return True + auth = request.headers.get("Authorization", "") + if auth.startswith("Bearer "): + token = auth[7:].strip() + return token == API_KEY + return False + +def _safe_join(base: Path, *parts: str) -> Path: + """Zapobiega ../ — wymusza pozostanie w katalogu bazowym.""" + p = (base.joinpath(*parts)).resolve() + if not str(p).startswith(str(base.resolve())): + abort(400, description="Invalid path") + return p + +# ===== Google Drive helper ===== +_drive_client_cached = None + +def _get_drive(): + global _drive_client_cached + if _drive_client_cached is not None: + return _drive_client_cached + + if not (GDRIVE_ENABLE and GDRIVE_SA_JSON and os.path.exists(GDRIVE_SA_JSON)): + return None + + from google.oauth2 import service_account + from googleapiclient.discovery import build + + scopes = ["https://www.googleapis.com/auth/drive.file"] + creds = service_account.Credentials.from_service_account_file(GDRIVE_SA_JSON, scopes=scopes) + _drive_client_cached = build("drive", "v3", credentials=creds, cache_discovery=False) + return _drive_client_cached + +def upload_to_drive(local_path: Path, filename: str) -> Optional[Dict[str, Any]]: + drv = _get_drive() + if drv is None: + return None + from googleapiclient.http import MediaFileUpload + file_metadata = {"name": filename} + if GDRIVE_FOLDER_ID: + file_metadata["parents"] = [GDRIVE_FOLDER_ID] + media = MediaFileUpload(str(local_path), resumable=False) + created = drv.files().create(body=file_metadata, media_body=media, fields="id,webViewLink,webContentLink").execute() + file_id = created.get("id") + # Przydatne linki: + return { + "file_id": file_id, + "webViewLink": created.get("webViewLink"), + "webContentLink": created.get("webContentLink"), + "direct_view": f"https://drive.google.com/file/d/{file_id}/view", + "direct_download": f"https://drive.google.com/uc?export=download&id={file_id}", + } + +@bp.get("/health") +def health(): + return jsonify(ok=True, info="Okidokie") + +@bp.post("/upload") +def upload(): + """Przyjmuje: + - multipart/form-data z jednym plikiem ('file') lub wieloma ('files') + - opcjonalnie: form 'subdir' (podkatalog), 'drive' (1/0) żeby wymusić wysyłkę na Drive + """ + if not _check_auth(): + return jsonify(error="Unauthorized"), 401 + + # Limit ciała żądania po stronie Flaska: + request.max_content_length = MAX_CONTENT_MB * 1024 * 1024 + + files = [] + if "file" in request.files: + files = [request.files["file"]] + elif "files" in request.files: + files = request.files.getlist("files") + else: + return jsonify(error="No file provided (use 'file' or 'files')"), 400 + + subdir = (request.form.get("subdir") or "").strip() + target_dir = _safe_join(UPLOAD_DIR, subdir) if subdir else UPLOAD_DIR + target_dir.mkdir(parents=True, exist_ok=True) + + want_drive = (request.form.get("drive") == "1") or (request.args.get("drive") == "1") + saved: List[Dict[str, Any]] = [] + + for f in files: + if not f or not f.filename: + continue + fname = secure_filename(f.filename) + dest = _safe_join(target_dir, fname) + f.save(dest) + + item = { + "filename": fname, + "size": dest.stat().st_size, + "path": str(dest.relative_to(UPLOAD_DIR)), + "url_hint": f"/api/files/{dest.relative_to(UPLOAD_DIR)}", + } + + if want_drive and GDRIVE_ENABLE: + try: + gd = upload_to_drive(dest, fname) + if gd: + item["gdrive"] = gd + except Exception as e: + # log i idziemy dalej + current_app.logger.exception("Drive upload failed: %s", e) + item["gdrive_error"] = str(e) + + saved.append(item) + + if not saved: + return jsonify(error="No valid files"), 400 + return jsonify(ok=True, saved=saved) + +@bp.get("/files/") +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) diff --git a/gpt_interface/ingest.py b/gpt_interface/ingest.py new file mode 100644 index 0000000..161a6e6 --- /dev/null +++ b/gpt_interface/ingest.py @@ -0,0 +1,52 @@ +# ingest_text.py +import os +import urllib.parse +from pathlib import Path + +from flask import Blueprint, abort, jsonify, request + +bp = Blueprint("ingest_text", __name__) +BASE = Path(os.getenv("INGEST_DIR", "/home/pi/tmp_git")).resolve() +BASE.mkdir(parents=True, exist_ok=True) +TOKEN = None +with open("/home/pi/gpt_cont_api_key", "r") as f: + TOKEN = f.read().strip() + + +# prosty bufor kawałków w RAM (na 1 proces) +chunks = {} + + +@bp.get("/api/ingest-text") +def ingest_text(): + if request.args.get("key") != TOKEN: + return jsonify(error="unauthorized"), 401 + + name = request.args.get("name", "").strip() + index = int(request.args.get("index", "1")) + total = int(request.args.get("total", "1")) + chunk = request.args.get("chunk", "") + + if not name or "/" in name or ".." in name: + return jsonify(error="bad name"), 400 + if not (1 <= index <= total <= 9999): + return jsonify(error="bad indexing"), 400 + + # gromadzimy w pamięci (możesz podmienić na Redis) + key = f"{name}:{total}" + entry = chunks.setdefault(key, {}) + entry[index] = urllib.parse.unquote_plus(chunk) + + if TOKEN is None: + exit("No API token set!") + if len(entry) == total: + # składamy i zapisujemy + data = "".join(entry[i] for i in range(1, total + 1)) + out = (BASE / name).resolve() + if not str(out).startswith(str(BASE)): + return jsonify(error="bad path"), 400 + out.write_text(data, encoding="utf-8") + del chunks[key] + return jsonify(ok=True, saved=str(out), bytes=len(data.encode("utf-8"))) + else: + return jsonify(pending=True, got=len(entry), total=total) diff --git a/gpt_interface/reinit_server.sh b/gpt_interface/reinit_server.sh new file mode 100755 index 0000000..340e570 --- /dev/null +++ b/gpt_interface/reinit_server.sh @@ -0,0 +1,2 @@ +#!/bin/bash +cd ../conjurer/ && git pull && cp ./gpt_interface/* ../gpt_interf_serv/ && cd - diff --git a/latex_commands.py b/latex_commands.py index 25a9303..012277a 100644 --- a/latex_commands.py +++ b/latex_commands.py @@ -1,22 +1,47 @@ # latex_commands.py # -*- coding: utf-8 -*- from __future__ import annotations + import io -from typing import Optional, List import logging +from typing import Optional import discord from discord import app_commands from discord.ext import commands from constants import ( - LATEX_TEX_ENGINE, LATEX_MAX_COMPILE_SECONDS, LATEX_MAX_ATTACH_MB, LATEX_MAX_ZIP_MB, - OPENAI_MODEL, ALLOWED_ROLES, GUILD_ID + 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 ( - is_tex_attachment, compile_single_tex_bytes, compile_zip_to_zip, ask_openai_diagnosis + 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 @@ -31,47 +56,94 @@ class LatexModule(commands.Cog): 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): + 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(): - atts = [a for a in (ctx.message.attachments or []) if is_tex_attachment(a, LATEX_MAX_ATTACH_MB)] - if not atts: - return await ctx.reply(f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False) - self.logger.debug("LaTeX attachments: %s", ", ".join(a.filename for a in atts)) - files: List[discord.File] = [] - parts: List[str] = [] - for att in atts: + 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: - data = await att.read() - self.logger.info("LaTeX read %s bytes from %s", len(data), att.filename) - res = await compile_single_tex_bytes(data, att.filename, LATEX_TEX_ENGINE, LATEX_MAX_COMPILE_SECONDS, logger=self.logger_name) - self.logger.info("LaTeX result for %s: %s", att.filename, res) - self.logger.info("LaTeX log (%s)\n%s", att.filename, (res["log_text"] or "")[-2000:]) + 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.append(discord.File(b, filename=res["pdf_name"])) - parts.append(f"✅ `{att.filename}` → `{res['pdf_name']}`") + files_to_send.append(discord.File(b, filename=res["pdf_name"])) + parts.append(f"✅ `{tex_name}` → `{res['pdf_name']}`") else: - self.logger.info("LaTeX compile failed for %s", att.filename) - excerpt = "" - if include_source_excerpt: - try: - excerpt = data.decode("utf-8", errors="ignore")[:4000] - except Exception: - excerpt = "" - advice = await ask_openai_diagnosis(res["log_text"] or "", excerpt, OPENAI_MODEL, logger=self.logger_name) - parts.append(f"❌ `{att.filename}` — błąd kompilacji.\nDiagnoza:\n{advice}") - raise - except Exception as e: - self.logger.info("Exception %s: %s", att.filename, e) - parts.append(f"⚠️ `{att.filename}` — wyjątek (szczegóły w logu).") + 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(atts)} plik(ów). Model: `{OPENAI_MODEL}`\n\n" + "\n\n".join(parts) - await ctx.reply(content if len(content)<1900 else content[:1900]+"…", files=files, mention_author=False) + 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( @@ -84,57 +156,123 @@ class LatexModule(commands.Cog): async def latexclean(self, ctx: commands.Context): ch = ctx.message.channel async with ch.typing(): - atts = [a for a in (ctx.message.attachments or []) if is_tex_attachment(a, LATEX_MAX_ATTACH_MB)] - if not atts: - return await ctx.reply(f"Dołącz .tex (≤{LATEX_MAX_ATTACH_MB} MiB).", mention_author=False) + 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 + ) - files: List[discord.File] = [] - parts: List[str] = [] - for att in atts: + # 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: - data = await att.read() - res = await compile_single_tex_bytes(data, att.filename, LATEX_TEX_ENGINE, LATEX_MAX_COMPILE_SECONDS, logger=self.logger_name) - self.logger.debug("LaTeX CLEAN (%s)\n%s", att.filename, (res["log_text"] or "")[-2000:]) + 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.append(discord.File(b, filename=res["pdf_name"])) - parts.append(f"✅ `{att.filename}`") + files_to_send.append(discord.File(b, filename=res["pdf_name"])) + parts.append(f"✅ `{tex_name}` → `{res['pdf_name']}`") else: - parts.append(f"❌ `{att.filename}` — błąd (log w debug).") - except Exception as e: - self.logger.debug("CLEAN exception %s: %s", att.filename, e) - parts.append(f"⚠️ `{att.filename}` — wyjątek (log w debug).") + 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, mention_author=False) + 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)." + 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): + 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) + 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) + 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) + 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) + 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)]) + 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") diff --git a/latex_functions.py b/latex_functions.py index 295b0eb..6a26694 100644 --- a/latex_functions.py +++ b/latex_functions.py @@ -1,149 +1,121 @@ -# latex_functions.py -# -*- coding: utf-8 -*- -from __future__ import annotations - import asyncio import logging import re +import shutil import tempfile import zipfile from pathlib import Path -from typing import Dict, List, Optional, Tuple - -from ai_functions import handle_response +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 "")) and name.lower().endswith(".tex") + return bool(SAFE_TEX_NAME.match(name or "")) +def is_safe_asset_name(name: str) -> bool: + return bool(SAFE_ASSET_NAME.match(name or "")) -def is_tex_attachment(att, max_mb: int) -> bool: - """Filtruje discord.Attachment: tylko .tex + limit MB + nazwa bezpieczna.""" - return bool( - getattr(att, "filename", "") - and is_safe_tex_name(att.filename) - and getattr(att, "size", 0) <= max_mb * 1024 * 1024 +# ===== 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(engine: str, tex_filename: str) -> list[str]: - base = (engine or "").strip().lower() - if base in ("pdflatex", "xelatex", "lualatex"): - return [ - base, - "-interaction=nonstopmode", - "-halt-on-error", - "-file-line-error", - "-no-shell-escape", - tex_filename, - ] - if base == "latexmk": - return [ - "latexmk", - "-pdf", - "-interaction=nonstopmode", - "-halt-on-error", - "-file-line-error", - tex_filename, - ] - if base == "tectonic": - return [ - "tectonic", - "-X", - "compile", - "--keep-logs", - "--outdir", - ".", - tex_filename, - ] - return [ - "pdflatex", - "-interaction=nonstopmode", - "-halt-on-error", - "-file-line-error", - "-no-shell-escape", - tex_filename, - ] - +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: str = None, -): - logger = logging.getLogger(logger) if logger else None - - async def run_once(cmd: list[str]) -> tuple[int, str]: - proc = await asyncio.create_subprocess_exec( - *cmd, - cwd=str(workdir), - stdout=asyncio.subprocess.PIPE, - stderr=asyncio.subprocess.STDOUT, - ) - try: - out_b, _ = await asyncio.wait_for(proc.communicate(), timeout=timeout_sec) - return (proc.returncode or 0), (out_b or b"").decode( - "utf-8", errors="replace" - ) - except asyncio.TimeoutError: - try: - proc.kill() - except Exception: - raise - return 124, f"[Timeout] Compilation exceeded {timeout_sec}s.\n" - - logs = [] - cmd = _build_cmd(tex_engine, tex_filename) - if logger: - logger.debug("LaTeX cmd: %s (cwd=%s)", " ".join(cmd), workdir) - - rc1, out1 = await run_once(cmd) - logs.append(out1) - second_pass = not ((tex_engine or "").strip().lower() == "tectonic") + 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: - log_text = "".join(logs) - pdf = workdir / (Path(tex_filename).stem + ".pdf") - return False, log_text, pdf + return False, "".join(logs), pdf_path - if second_pass: - rc2, out2 = await run_once(cmd) - logs.append(out2) - ok = rc2 == 0 - else: - ok = rc1 == 0 - - log_text = "".join(logs) - pdf = workdir / (Path(tex_filename).stem + ".pdf") - ok = ok and pdf.exists() - return ok, log_text, pdf + # 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: str = None, + 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, - } + 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) - tex_path = wd / filename - tex_path.write_bytes(tex_bytes) - ok, log_text, pdf_path = await run_latex_two_passes( - filename, wd, tex_engine, timeout_sec, logger=logger - ) + (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, @@ -151,83 +123,57 @@ async def compile_single_tex_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, - } - + 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: str = None + 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) - in_zip = td_path / "in.zip" - in_zip.write_bytes(zip_bytes) - extract_dir = td_path / "in" - extract_dir.mkdir(parents=True, exist_ok=True) - with zipfile.ZipFile(in_zip, "r") as zf: - zf.extractall(extract_dir) + src_root = td_path / "src" + src_root.mkdir(parents=True, exist_ok=True) - tex_files = [p for p in extract_dir.rglob("*.tex") if is_safe_tex_name(p.name)] + # 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."] - for tex in tex_files: + # 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: - work = td_path / f"build_{tex.stem}" - work.mkdir(parents=True, exist_ok=True) - target_tex = work / tex.name - target_tex.write_bytes(tex.read_bytes()) - ok, log_text, pdf_path = await run_latex_two_passes( - target_tex.name, work, tex_engine, timeout_sec, logger=logger - ) - if ok and pdf_path.exists(): - out_pdf_paths.append(pdf_path) + 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(tex.name) - if logger: - logger.debug("BATCH FAIL %s\n%s", tex.name, log_text[-1500:]) - except Exception as e: - failed.append(f"{tex.name} (exception: {e})") - if logger: - logger.debug("BATCH EXC %s: %s", tex.name, e) + 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 - - -async def ask_openai_diagnosis( - log_text: str, tex_excerpt: str, model: str, logger: str = None -) -> str: - logger = logging.getLogger(logger) if logger else None - sys = ( - "You are a LaTeX build diagnostician. Analyze pdflatex log and return:\n" - "1) Root causes (bullets)\n2) Minimal working fix (code block)\n3) Alternative fix" - ) - logger.debug("LaTeX DIAG (%s)\n%s", model, log_text[-9000:]) - usr = f"---LOG---\n{log_text[-9000:]}\n---END LOG---" - if tex_excerpt: - usr += f"\n---TEX EXCERPT---\n{tex_excerpt[:4000]}\n---END EXCERPT---" - prompt = [{"role": sys, "content": "none"}, {"role": "user", "content": usr}] - - response, _ = await handle_response( - prompt, - None, - None, - prompt, - "latex_diagnosis", - "NONE", - algorithm=model, - none_request=prompt, - ) - return response