Small fix

.gitignore

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

bot.py

@@ -16,10 +16,10 @@ import os
 import random
 import re
 import shutil
-import subprocess
 import sys
 import threading
 import uuid
+import subprocess
 from datetime import datetime
 from logging import handlers
 from pathlib import Path, PurePath
@@ -42,16 +42,11 @@ 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
 
+from communication_subroutine import comm_subroutine, IN_COMM_Q, OUT_COMM_Q, QueryControl
+
 # *=========================== Classes definition
 
 # The above code is defining a TypedDict called `Music_Config` in Python. This TypedDict has three
@@ -68,6 +63,7 @@ Music_Config = TypedDict(
 )
 
 
+
 class MusicFileList(object):
     """
     The `MusicFileList` class manages a list of music files, with the ability to refresh the list from a
@@ -122,6 +118,7 @@ class MusicFileList(object):
 
 
 # *=========================================== Predefines
+formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 MASTER_TIMEOUT = datetime.now()
 INITIAL_TIME_WAIT = 500
 MUZYKA: Music_Config = {"ctx": None, "queue": [], "requester": []}
@@ -242,7 +239,6 @@ handler = handlers.RotatingFileHandler(
     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()
@@ -288,6 +284,7 @@ for key in word_reactions:
 logger.info("Done")
 
 
+
 # *=========================================== Create Client
 logger.info("Creating discord bot")
 client = commands.Bot(intents=intents, command_prefix="$")
@@ -301,13 +298,8 @@ logger.info("Done")
 async def on_ready():
     """Metoda wywoływana przy połączeniu do serwera."""
     logger.debug("%s has connected to Discord!", client.user)
-    await client.load_extension("voice_recognition")
-    logger.info("Cogs")
-    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(com.qualified_name)
     check_self.start()
     check_data_q.start()
 
@@ -412,13 +404,7 @@ async def on_message(message):
             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:]
+        await message.reply(result)
     if "imaginuje sobie:" in message.content:
         async with channel.typing():
             logger.info("Poczatek procedury obrazkowej")
@@ -542,20 +528,16 @@ async def connect(ctx, arg=None):
     """
     if ctx and arg:
         logger.info("Ctx and arg defined for connect")
+    voice_channel = client.get_channel(1060349757349974066)
 
     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")
+        voice_client = client.voice_clients[0]
+        if voice_client.is_connected():
             return
-        logger.info("Connected to voice")
+    voice_channel_connection = await voice_channel.connect()
+    if not voice_channel_connection:
+        logger.error("Not possible to connect to voice")
+    logger.info("Connecting to voice")
 
 
 async def disconnect(ctx):
@@ -655,12 +637,7 @@ async def play(ctx, zamawial=None, arg=None):
             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:]
+        await ctx.send(result)
 
 
 async def archive_channel(channel_no):
@@ -699,7 +676,6 @@ async def check_music():
             await play(MUZYKA["ctx"], MUZYKA["requester"])
             await asyncio.sleep(2)
 
-
 @tasks.loop(seconds=3)
 async def check_data_q():
     """
@@ -715,42 +691,40 @@ async def check_data_q():
             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*"
+                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}"
+                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 += 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 += '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:
+            elif len(entries)>=1 and len(entries)<5:
                 message += " znajduje się coś:\n"
                 for item in entries:
-                    message += item
+                    message+=item
                 await ctx.send(message)
             else:
-                message += " znajduje się cholernie dużo:\n"
+                message+= " znajduje się cholernie dużo:\n"
                 for item in entries:
-                    message += item
+                    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}")
+            #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():
     """
@@ -1108,13 +1082,9 @@ async def get_file(ctx, source, link):
             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
-            )
+            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
-            )
+            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": []}
@@ -1381,7 +1351,6 @@ async def max_weight(lista):
 
 # *=========================================== Define Commands
 
-
 @client.hybrid_command(
     name="skip_track",
     description="Przeskocz kawałek w radiu",
@@ -1391,15 +1360,15 @@ async def skip_track(ctx):
     async with ctx.typing():
         allowed = False
         for role in ctx.author.roles:
-            if role.name in ("Thane", "Jarl"):
+            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,
+            requests.get,
+            f"{RADIO_HARBOR_ADDRESS}{SKIP_TRACK}",
+            timeout=360,
             )
             result = await coroutine
             logger.info("Done %s", result)
@@ -1415,19 +1384,13 @@ async def zrestartuj_radio(ctx):
     async with ctx.typing():
         allowed = False
         for role in ctx.author.roles:
-            if role.name in ("Thane", "Jarl"):
+            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)
-
+            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",
@@ -1670,7 +1633,6 @@ async def graj_muzyko(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.",
@@ -1695,10 +1657,9 @@ async def radio_hardkor(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,
+                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")
@@ -1706,6 +1667,7 @@ async def radio_hardkor(ctx):
         check_music.start()
 
 
+
 @client.hybrid_command(
     name="cisza",
     description="Wyłącza muzykę i czyści plejliste.",
@@ -1848,7 +1810,6 @@ async def zagraj_mi_kawalek(ctx):
                 "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",
@@ -1883,8 +1844,6 @@ async def dodaj_do_ulubionych(ctx):
         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",
@@ -1918,7 +1877,6 @@ async def request_radio(ctx):
         logger.info("Done %s", result)
         await ctx.send("Zrobione szefie!")
 
-
 @client.hybrid_command(
     name="stworz_audycje",
     description="Dodaje do listy ulubionych w radiu",
@@ -2358,18 +2316,11 @@ async def wyszukaj_linki_do_dokumentow(ctx):
     """
     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", ""
-    )
+    #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,
-    }
+    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}",
@@ -2377,16 +2328,14 @@ async def wyszukaj_linki_do_dokumentow(ctx):
         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ć"
+        "*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"
-        )
+        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 = (
@@ -2398,13 +2347,10 @@ async def wyszukaj_linki_do_dokumentow(ctx):
         username = ctx.message.author.nick
     else:
         username = ctx.message.author.name
-    query_object = QueryControl(username, query_uuid, query, ctx)
+    query_object = QueryControl(username, query_uuid, query, logger, 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."
-    )
-
+    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",
@@ -2448,23 +2394,13 @@ async def wyszukaj_linki_do_dokumentow_deep(ctx):
         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:]
+        await ctx.send(result)
         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,
-    }
+    #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}",
@@ -2472,16 +2408,14 @@ async def wyszukaj_linki_do_dokumentow_deep(ctx):
         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"
+        "*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"
-        )
+        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 = (
@@ -2493,12 +2427,11 @@ async def wyszukaj_linki_do_dokumentow_deep(ctx):
         username = ctx.message.author.nick
     else:
         username = ctx.message.author.name
-    query_object = QueryControl(username, query_uuid, query, ctx)
+    query_object = QueryControl(username, query_uuid, query, logger, 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*"
-    )
+    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(
@@ -2530,29 +2463,11 @@ async def krecimy_pornola(ctx):
                     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})")
+                        ctx.send(f"Jest w tajnym archiwum pod adresem{sciezka})")
     else:
-        await ctx.reply("Jak ładnie szefa poprosisz.")
+        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__":
@@ -2560,16 +2475,16 @@ if __name__ == "__main__":
     threads = []
     logger.info("Starting discord bot: Creating threads")
     threads.append(threading.Thread(target=client.run, args=(TOKEN,)))
-    threads.append(threading.Thread(target=comm_subroutine))
+    threads.append(threading.Thread(target=comm_subroutine, args=(logger,)))
     logger.info("Starting discord bot: Starting threads")
     WRK_CNT = 0
     for worker in threads:
-        WRK_CNT += 1
+        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
+    WRK_CNT=0
     for worker in threads:
-        WRK_CNT += 1
+        WRK_CNT+=1
         logger.info("Starting discord bot: Joining thread %s", WRK_CNT)
         worker.join()

communication_subroutine.py

@@ -2,45 +2,27 @@ import logging
 import threading
 import json
 import time
-import re
-from urllib import request as urequest
-
 from queue import Queue, Empty
 from flask import Flask, jsonify, request
 from waitress import serve
 
 HOST_ADDRESS = "192.168.1.191"
 PORT_ADDRESS = 5000
-ICECAST_ADDRESS = "http://192.168.1.15:8000"
 OUT_COMM_Q = Queue()
 IN_COMM_Q = Queue()
-SRCHTITLE = re.compile(br'StreamTitle=\\*(?P<title>[^;]*);').search
-
 awaiting_q = []
 incoming_q = Queue()
 app = Flask(__name__)
-PREPPED_TRACKS = {
-    "requests" : "",
-    "hit" : "",
-    "all": "",
-    "priority":"",
-    "jingles":"",
-    "now_playing":"",
-    "next": "",
-    "meta" : ""
-}
-logger = logging.getLogger("discord")
-
 class QueryControl:
     """
     This class `QueryControl` is used to manage queries with information about the author, UUID,
     content, logger, context, and replies.
     """
-    def __init__(self, query_author, query_uuid, query_content, ctx) -> None:
+    def __init__(self, query_author, query_uuid, query_content, uplogger, ctx) -> None:
         self.author = query_author
         self.uuid = query_uuid
         self.content = query_content
-        self.logger = logging.getLogger("discord")
+        self.logger = uplogger
         self.stop = False
         self.ctx = ctx
         self.logger.info(
@@ -48,25 +30,6 @@ class QueryControl:
         )
         self.replies = []
 
-@app.route("/prepped_tracks", methods=["POST"])
-def log_radio_tracks():
-    app.logger = logging.getLogger("discord")
-
-    app.logger.info(request)
-    record = json.loads(request.data)
-    app.logger.info(record)
-    if "next" in record[0]:
-        metadata = id3(ICECAST_ADDRESS)
-        PREPPED_TRACKS["now_playing"] = PREPPED_TRACKS["next"]
-        if metadata:
-            PREPPED_TRACKS["meta"] = metadata["name"] + " - " + metadata["title"] + "(" + metadata["genre"] + ")"
-        else:
-            PREPPED_TRACKS["meta"] = "Nie znaju"
-    PREPPED_TRACKS[record[0]] = record[1]
-    app.logger.info("DATA RECEIVED")
-    return jsonify("SUCCESS")
-
-
 @app.route("/conjurer", methods=["POST"])
 def answer_external_command():
     """
@@ -75,11 +38,10 @@ def answer_external_command():
     :return: The function `answer_external_command()` is returning a JSON response with the message
     "SUCCESS".
     """
-    logger = logging.getLogger("discord")
-    logger.info(request)
+    app.logger.info(request)
     record = json.loads(request.data)
-    logger.info(record)
-    logger.info("DATA RECEIVED")
+    app.logger.info(record)
+    app.logger.info("DATA RECEIVED")
     incoming_q.put(record)
     return jsonify("SUCCESS")
 
@@ -94,29 +56,25 @@ def check_alive():
     """
     return jsonify("ALIVE")
 
-def flask_debug():
+def flask_debug(_logger):
     """
     The `flask_debug` function starts a Flask application in debug mode without using the reloader.
     Do not use for production for fucks sake.
     """
-    logger = logging.getLogger("discord")
-
-    logger.info("Attempt debug")
+    _logger.info("Attempt debug")
     # trunk-ignore(bandit/B201)
     app.run(debug=True, use_reloader=False, host=HOST_ADDRESS, port=PORT_ADDRESS)
 
 
-def waitress_run():
+def waitress_run(_logger):
     """
     The `waitress_run` function serves the `app` on host "0.0.0.0"
     and port 5000 using the Waitress WSGI server.
     """
-    logger = logging.getLogger("discord")
-
-    logger.info("Attempt waitress")
+    _logger.info("Attempt waitress")
     serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)
 
-def scan_queue():
+def scan_queue(_logger):
     """
     The function `scan_queue` reads data from a queue, logs it, and appends it to another queue.
 
@@ -125,13 +83,12 @@ def scan_queue():
     and provide information for debugging purposes. In this code snippet, the `_logger` object is used
     to log the
     """
-    logger = logging.getLogger("discord")
     while True:
         data = OUT_COMM_Q.get()
-        logger.info(data)
+        _logger.info(data)
         awaiting_q.append(data)
 
-def scan_incoming():
+def scan_incoming(_logger):
     """
     The `scan_incoming` function continuously checks for incoming data, processes it, and logs when data
     is found.
@@ -141,11 +98,10 @@ def scan_incoming():
     debugging, monitoring, or tracking the flow of the program. In this case, the `_logger` is being
     used
     """
-    logger = logging.getLogger("discord")
     while True:
         try:
             answer = incoming_q.get(block=False)
-            logger.info("DATA FOUND")
+            _logger.info("DATA FOUND")
             record_stored = False
             for record in awaiting_q:
                 if record.uuid in answer.keys():
@@ -155,37 +111,15 @@ def scan_incoming():
                     IN_COMM_Q.put(record)
             if not record_stored:
                 for key in answer.keys():
-                    record = QueryControl("Orphaned", key, "Orphan", None)
+                    record = QueryControl("Orphaned", key, "Orphan", _logger, None)
                     record.stop = True
                     record.entries = answer[record.uuid]
                     IN_COMM_Q.put(record)
         except Empty:
             time.sleep(1)
 
-def get_stream_title(tag:bytes) -> str:
-    title = ''
-    if m := SRCHTITLE(tag):
-        #decode, strip, unescape and remove surrounding quotes (may not even be the same type of quote)
-        title = m.group('title').decode('utf-8').strip().replace('\\', '')[1:-1]
-    return title
 
-def id3(url:str) -> dict:
-    request = urequest.Request(url, headers={'Icy-MetaData': 1})
-
-    with urequest.urlopen(request) as resp:
-        metaint = int(resp.headers.get('icy-metaint', '-1'))
-        if metaint<0:
-            return False
-        resp.read(metaint) #this isn't seekable so, arbitrarily read to the point we want
-        tagdata = dict(
-            site_url = resp.headers.get('icy-url'  )        ,
-            name     = resp.headers.get('icy-name' ).title(),
-            genre    = resp.headers.get('icy-genre').title(),
-            title    = get_stream_title(resp.read(255))     )
-        return tagdata
-
-
-def comm_subroutine():
+def comm_subroutine(logger):
     """
     The `comm_subroutine` function starts multiple threads to run different tasks concurrently.
 
@@ -194,13 +128,12 @@ def comm_subroutine():
     the provided code snippet, the logger is used to log messages at the "info" level
     """
     #logger.setLevel(logging.DEBUG)
-    logger = logging.getLogger("discord")
-    logger.info("Started comms")
+    logger.info("Started")
     threads = []
-    #threads.append(threading.Thread(target=flask_debug))
-    threads.append(threading.Thread(target=waitress_run))
-    threads.append(threading.Thread(target=scan_queue))
-    threads.append(threading.Thread(target=scan_incoming))
+    #threads.append(threading.Thread(target=flask_debug, args=(logger,)))
+    threads.append(threading.Thread(target=waitress_run, args=(logger,)))
+    threads.append(threading.Thread(target=scan_queue,args=(logger,)))
+    threads.append(threading.Thread(target=scan_incoming,args=(logger,)))
 
 
     for worker in threads:
@@ -209,4 +142,5 @@ def comm_subroutine():
         worker.join()
 
 if __name__ == "__main__":
-    comm_subroutine()
+    logging_client = logging.getLogger(__name__)
+    comm_subroutine(logging_client)

conjurer_librarian/conjurer_librarian.py

@@ -39,7 +39,7 @@ MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
 SEND_RESULTS = "/conjurer"
 BDSM_UUID_TEST = "96b7f85a-1142-4908-8986-62a2ea25a147"
 
-MAX_CR_RESULTS = 1000
+MAX_CR_RESULTS = 500
 #TEST PURPOSES ONLY!
 #MAX_CR_RESULTS = 5
 

conjurer_librarian/scrape_bot.py

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

conjurer_musician/conjurer_musician.py

@@ -6,9 +6,7 @@ API endpoints.
 """
 import json
 import logging
-import os
 import re
-import requests
 import threading
 import time
 from datetime import datetime
@@ -19,8 +17,6 @@ from sys import platform
 from flask import Flask, jsonify, redirect, request, send_from_directory, render_template
 from waitress import serve
 
-MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
-MUSIC_TRACKER = "/prepped_tracks"
 HOST_ADDRESS = "192.168.1.15"
 PORT_ADDRESS = 5000
 if platform in ("linux", "linux2"):
@@ -31,8 +27,6 @@ if platform in ("linux", "linux2"):
         NETRC_FILE = "/home/mtuszowski/.netrc"
         LOGSTORE = "/home/mtuszowski/conjurer/logs/"
         ENCODING = "utf-8"
-        RADIOLOG_PATH = '/home/pi/Conjurer/radio_log.log'
-        PERSISTENCE_PATH = '/home/pi/Conjurer/persistence.log'
 
     else:
         LOGFILE = "/home/pi/Conjurer/discord_mus_service.log"
@@ -41,8 +35,6 @@ if platform in ("linux", "linux2"):
         ENCODING = "utf-8"
         MUSIC_FOLDER = "/home/pi/RetroPie/mp3/"
         PRIORITY_FOLDER = "/home/pi/RetroPie/mp3/Magiczne i chuj/"
-        RADIOLOG_PATH = '/home/pi/Conjurer/radio_log.log'
-        PERSISTENCE_PATH = '/home/pi/Conjurer/persistence.log'
 
 
 music_file_list = []
@@ -53,8 +45,7 @@ def rescan():
     The `rescan` function logs a message, scans for mp3 files in a specified folder,
     and adds them to a list of music files.
     """
-    logger = logging.getLogger("conjurer_musician")
-    logger.info("Rescan triggered")
+    logging.info("Rescan triggered")
 
     for mp3_item in Path.glob(Path(MUSIC_FOLDER), "**/*.mp3"):
         temp_music_file = mp3_item.as_posix()
@@ -91,87 +82,13 @@ def thread_rescan():
     The `thread_rescan` function periodically triggers a rescan operation after a specified time
     interval.
     """
-    logger = logging.getLogger("conjurer_musician")
-    logger.info("Starting filesystemupdater")
+    logging.info("Starting filesystemupdater")
     while True:
         time.sleep(60 * 60 * 24)
-        logger.info("Rescan triggered")
+        logging.info("Rescan triggered")
         rescan()
 
 
-def scan_tracks():
-    #Set the filename and open the file
-    logger = logging.getLogger("conjurer_musician")
-
-    file = open(RADIOLOG_PATH,'r')
-    #Find the size of the file and move to the end
-    st_results = os.stat(RADIOLOG_PATH)
-    st_size = st_results[6]
-    file.seek(st_size)
-    st_results1 = os.stat(PERSISTENCE_PATH)
-    prev_st_size1 = st_results[6]
-
-    while 1:
-
-        st_results1 = os.stat(PERSISTENCE_PATH)
-        st_size1 = st_results1[6]
-        if prev_st_size1 != st_size1:
-            while prev_st_size1 != st_size1:
-                prev_st_size1 = st_size1
-                st_results1 = os.stat(PERSISTENCE_PATH)
-                st_size1 = st_results1[6]
-                time.sleep(0.1)
-            file1 = open(PERSISTENCE_PATH, 'r')
-            lines = file1.readlines()
-            result = ["next", lines[2]]
-            file1.close()
-            returned = requests.post(
-                    f"{MAIN_BOT_ADDRESS}{MUSIC_TRACKER}",
-                    json=result,
-                    timeout=360)
-            logger.info("SENT")
-            logger.info(returned.status_code)
-            logger.info("SEND CONFIRMED")
-
-        where = file.tell()
-        line = file.readline()
-        if not line:
-            time.sleep(1)
-            file.seek(where)
-        else:
-            if re.match(".*Prepared.*",line):
-                result = None
-                if re.match(".*jingles.*", line):
-                    logger.info("jingles")
-                    logger.info(line) # already has newline
-                    result = ["jingles", line]
-                elif re.match(".*priority.*", line):
-                    logger.info("priority")
-                    logger.info(line) # already has newline
-                    result = ["priority", line]
-                elif re.match(".*hit.*", line):
-                    logger.info("hit")
-                    logger.info(line) # already has newline
-                    result = ["hit", line]
-                elif re.match(".*all_playlist.*", line):
-                    logger.info("all")
-                    logger.info(line) # already has newline
-                    result = ["all", line]
-                elif re.match(".*request.*", line):
-                    logger.info("requests")
-                    logger.info(line) # already has newline
-                    result = ["requests", line]
-                if result:
-                    returned = requests.post(
-                    f"{MAIN_BOT_ADDRESS}{MUSIC_TRACKER}",
-                    json=result,
-                    timeout=360)
-                    logger.info("SENT")
-                    logger.info(returned.status_code)
-                    logger.info("SEND CONFIRMED")
-        time.sleep(0.1)
-
-
 app = Flask(__name__)
 
 
@@ -572,9 +489,5 @@ if __name__ == "__main__":
     for worker in threads:
         worker.start()
 
-    time.sleep(60)
-    threads.append(threading.Thread(target=scan_tracks))
-    threads[2].start()
-
     for worker in threads:
         worker.join()

conjurer_musician/radio_conjurer.liq

@@ -64,23 +64,21 @@ b = bass_boost(frequency=f, gain=g, s)
 s = add([s, b])
 
 # Set up interactive control for main volume
-a = interactive.float("main_volume", min=0., max=20., 0.4)
+a = interactive.float("main_volume", min=0., max=20., 1.)
 s = compress.multiband.interactive(bands=7, s)
 
-mic_gain = interactive.float("mic_volume", min=0., max=20., 6.)
-# Apply audio processing effects
-tmic = buffer(input.pulseaudio()) # Microphone
-mic = amplify(mic_gain, tmic)
-mic = gate(threshold=-80., range=-120., mic)
-mic = compress(threshold=0., ratio=2.,mic)
-mic = blank.strip(max_blank=10., min_noise=.1, threshold=-20., mic)
-
-s = add([s, mic])
-
 # Apply audio processing effects
 s = nrj(normalize(s))
 s = amplify(a, s)
 
+mic = buffer(input.pulseaudio()) # Microphone
+mic = gate(threshold=-30., range=-80., mic)
+mic = blank.strip(max_blank=10., min_noise=.1, threshold=-20., mic)
+
+s = add([s, mic])
+#w = interactive.float("wetness", min=0., max=1., 1.)
+#s = dry_wet(w,s,s2)
+
 
 # Skip blank sections in the stream
 s = blank.skip(max_blank=10., s)

install_main_bot.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-sudo apt-get install python3-dev
 cd /home/pi
 mdkir Conjurer
 cd Conjurer
@@ -10,11 +9,6 @@ source ./env/bin/activate
 ./env/bin/python3 -m pip install -r requirements_bot.txt
 sed -i -e 's/os.rename/shutil.copy/g' ./env/lib/python3.11/site-packages/spotify_dl/youtube.py
 sed -i '1i\import shutil' ./env/lib/python3.11/site-packages/spotify_dl/youtube.py
-sed -i '1i\import logging' ./env/lib/python3.11/site-packages/spotify_dl/spotify.py
-
-sed -i '21i\         logger = logging.getLogger("discord")' ./env/lib/python3.11/site-packages/spotify_dl/spotify.py
-sed -i '22i\         logger.info("Playlist")' ./env/lib/python3.11/site-packages/spotify_dl/spotify.py
-
 deactivate
 sudo cp ./conjurer.service /etc/systemd/system/
 sudo systemctl daemon-reload

install_music_bot.sh

@@ -32,7 +32,3 @@ sudo cp /home/pi/conjurer/conjurer_musician/radio_service.service /etc/systemd/s
 sudo systemctl daemon-reload
 sudo systemctl start radio_service.service
 sudo systemctl enable radio_service.service
-
-
-sed -i -e 's/os.rename/shutil.copy/g' ./env/lib/python3.11/site-packages/spotify_dl/youtube.py
-sed -i '1i\import shutil' ./env/lib/python3.11/site-packages/spotify_dl/youtube.py

requirements_bot.txt

@@ -13,7 +13,4 @@ tiktoken
 PyNaCl
 flask
 waitress
-clickupython
-assemblyai[extras]
-SpeechRecognition
-git+https://github.com/imayhaveborkedit/discord-ext-voice-recv
+clickupython

sr_example.py

@@ -1,229 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import annotations
-
-import logging
-
-from discord.ext.voice_recv.sinks import AudioSink
-
-log = logging.getLogger(__name__)
-
-__all__ = [
-    'SpeechRecognitionSink',
-]
-
-try:
-    import discord.ext.speech_recognition as sr  # type: ignore
-except ImportError:
-
-    def SpeechRecognitionSink(**kwargs) -> AudioSink:
-        """A stub for when the SpeechRecognition module isn't found."""
-        raise RuntimeError('The SpeechRecognition module is required to use this sink.')
-
-else:
-    import time
-    import array
-    import asyncio
-    import audioop
-
-    from collections import defaultdict
-
-    from discord.ext.voice_recv.sinks  import SilencePacket
-
-    from typing import TYPE_CHECKING, TypedDict
-
-    if TYPE_CHECKING:
-        from concurrent.futures import Future as CFuture
-        from typing import Literal, Callable, Optional, Any, Final, Protocol, Awaitable, TypeVar
-
-        from discord import Member
-
-        from ..opus import VoiceData
-        from ..types import MemberOrUser as User
-
-        T = TypeVar('T')
-
-        SRRecognizerMethod = Literal[
-            'sphinx',
-            'google',
-            'google_cloud',
-            'wit',
-            'azure',
-            'bing',
-            'lex',
-            'houndify',
-            'amazon',
-            'assemblyai',
-            'ibm',
-            'tensorflow',
-            'whisper',
-            'vosk',
-        ]
-
-        class SRStopper(Protocol):
-            def __call__(self, wait: bool = True, /) -> None:
-                ...
-
-        SRProcessDataCB = Callable[[sr.Recognizer, sr.AudioData, User], Optional[str]]
-        SRTextCB = Callable[[User, str], Any]
-
-    class _StreamData(TypedDict):
-        stopper: Optional[SRStopper]
-        recognizer: sr.Recognizer
-        buffer: array.array[int]
-
-    class SpeechRecognitionSink(AudioSink):  # type: ignore
-        def __init__(
-            self,
-            *,
-            process_cb: Optional[SRProcessDataCB] = None,
-            text_cb: Optional[SRTextCB] = None,
-            default_recognizer: SRRecognizerMethod = 'assemblyai',
-            phrase_time_limit: int = 10,
-            ignore_silence_packets: bool = True,
-        ):
-            super().__init__(None)
-            self.process_cb: Optional[SRProcessDataCB] = process_cb
-            self.text_cb: Optional[SRTextCB] = text_cb
-            self.phrase_time_limmit: int = phrase_time_limit
-            self.ignore_silence_packets: bool = ignore_silence_packets
-
-            self.default_recognizer: SRRecognizerMethod = default_recognizer
-            self._stream_data: defaultdict[int, _StreamData] = defaultdict(
-                lambda: _StreamData(stopper=None, recognizer=sr.Recognizer(), buffer=array.array('B'))
-            )
-
-        def _await(self, coro: Awaitable[T]) -> CFuture[T]:
-            assert self.client is not None
-            return asyncio.run_coroutine_threadsafe(coro, self.client.loop)
-
-        def wants_opus(self) -> bool:
-            return False
-
-        def write(self, user: Optional[User], data: VoiceData) -> None:
-            if self.ignore_silence_packets and isinstance(data.packet, SilencePacket):
-                return
-
-            if user is None:
-                return
-
-            sdata = self._stream_data[user.id]
-            sdata['buffer'].extend(data.pcm)
-
-            if not sdata['stopper']:
-                sdata['stopper'] = sdata['recognizer'].listen_in_background(
-                    DiscordSRAudioSource(sdata['buffer']), self.background_listener(user), self.phrase_time_limmit
-                )
-
-        def background_listener(self, user: User):
-            process_cb = self.process_cb or self.get_default_process_callback()
-            text_cb = self.text_cb or self.get_default_text_callback()
-
-            def callback(_recognizer: sr.Recognizer, _audio: sr.AudioData):
-                output = process_cb(_recognizer, _audio, user)
-                if output is not None:
-                    text_cb(user, output)
-
-            return callback
-
-        def get_default_process_callback(self) -> SRProcessDataCB:
-            def cb(recognizer: sr.Recognizer, audio: sr.AudioData, user: Optional[User]) -> Optional[str]:
-                log.debug("Got %s, %s, %s", audio, audio.sample_rate, audio.sample_width)
-                text: Optional[str] = None
-                try:
-                    # they changed recognize_google to be optionally assigned at runtime...
-                    func = getattr(recognizer, 'recognize_' + self.default_recognizer, recognizer.recognize_google) # type: ignore
-                    text = func(audio)  # type: ignore
-                except sr.UnknownValueError:
-                    log.debug("Bad speech chunk")
-                    # self._debug_audio_chunk(audio)
-
-                return text
-
-            return cb
-
-        def get_default_text_callback(self) -> SRTextCB:
-            def cb(user: Optional[User], text: Optional[str]) -> Any:
-                log.info("%s said: %s", user.display_name if user else 'Someone', text)
-
-            return cb
-
-        @AudioSink.listener()
-        def on_voice_member_disconnect(self, member: Member, ssrc: Optional[int]) -> None:
-            self._drop(member.id)
-
-        def cleanup(self) -> None:
-            for user_id in tuple(self._stream_data.keys()):
-                self._drop(user_id)
-
-        def _drop(self, user_id: int) -> None:
-            data = self._stream_data.pop(user_id)
-
-            stopper = data.get('stopper')
-            if stopper:
-                stopper()
-
-            buffer = data.get('buffer')
-            if buffer:
-                # arrays don't have a clear function
-                del buffer[:]
-
-        def _debug_audio_chunk(self, audio: sr.AudioData, filename: str = 'sound.wav') -> None:
-            import io, wave, discord
-
-            with io.BytesIO() as b:
-                with wave.open(b, 'wb') as writer:
-                    writer.setframerate(48000)
-                    writer.setsampwidth(2)
-                    writer.setnchannels(2)
-                    writer.writeframes(audio.get_wav_data())
-
-                b.seek(0)
-                f = discord.File(b, filename)
-                self._await(self.voice_client.channel.send(file=f))  # type: ignore
-
-    class DiscordSRAudioSource(sr.AudioSource):
-        little_endian: Final[bool] = True
-        SAMPLE_RATE: Final[int] = 48_000
-        SAMPLE_WIDTH: Final[int] = 2
-        CHANNELS: Final[int] = 2
-        CHUNK: Final[int] = 960
-
-        def __init__(self, buffer: array.array[int]):
-            self.buffer = buffer
-            self._entered: bool = False
-
-        @property
-        def stream(self):
-            return self
-
-        def __enter__(self):
-            if self._entered:
-                log.warning('Already entered sr audio source')
-            self._entered = True
-            return self
-
-        def __exit__(self, *exc) -> None:
-            self._entered = False
-            if any(exc):
-                log.exception('Error closing sr audio source')
-
-        def read(self, size: int) -> bytes:
-            # TODO: make this timeout configurable
-            for _ in range(10):
-                if len(self.buffer) < size * self.CHANNELS:
-                    time.sleep(0.1)
-                else:
-                    break
-            else:
-                if len(self.buffer) == 0:
-                    return b''
-
-            chunksize = size * self.CHANNELS
-            audiochunk = self.buffer[:chunksize].tobytes()
-            del self.buffer[: min(chunksize, len(audiochunk))]
-            audiochunk = audioop.tomono(audiochunk, 2, 1, 1)
-            return audiochunk
-
-        def close(self) -> None:
-            self.buffer.clear()

stream_test.py

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

test_time.py

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

voice_example.py

@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import discord
-from discord.ext import commands, voice_recv
-
-discord.opus._load_default()
-
-bot = commands.Bot(command_prefix=commands.when_mentioned, intents=discord.Intents.all())
-
-class Testing(commands.Cog):
-    def __init__(self, bot):
-        self.bot = bot
-
-    @commands.command()
-    async def test(self, ctx):
-        def callback(user, data: voice_recv.VoiceData):
-            print(f"Got packet from {user}")
-
-            ## voice power level, how loud the user is speaking
-            # ext_data = packet.extension_data.get(voice_recv.ExtensionID.audio_power)
-            # value = int.from_bytes(ext_data, 'big')
-            # power = 127-(value & 127)
-            # print('#' * int(power * (79/128)))
-            ## instead of 79 you can use shutil.get_terminal_size().columns-1
-
-        vc = await ctx.author.voice.channel.connect(cls=voice_recv.VoiceRecvClient)
-        vc.listen(voice_recv.BasicSink(callback))
-
-    @commands.command()
-    async def stop(self, ctx):
-        await ctx.voice_client.disconnect()
-
-    @commands.command()
-    async def die(self, ctx):
-        ctx.voice_client.stop()
-        await ctx.bot.close()
-
-@bot.event
-async def on_ready():
-    print('Logged in as {0.id}/{0}'.format(bot.user))
-    print('------')
-    await bot.add_cog(Testing(bot))
-
-REMOTE_HOST_NAME = "discord"
-
-
-bot.run("NzUxNDQxODgzNDA2MDA4NDEw.Go--wb.Nr28Oo4eYAP1p2XFVHF5uIQfcPD7s_jO2NfMCQ")

voice_recognition.py

@@ -1,233 +0,0 @@
-import logging
-import wave
-import asyncio
-import assemblyai as aai
-import discord
-from discord.ext import commands, voice_recv, tasks
-from discord.opus import Decoder as OpusDecoder
-import time
-# Replace with your API key
-aai.settings.api_key = "aa9962f0088a449a9c4ab2361e96cc08"
-discord.opus._load_default()
-CHANNELS = OpusDecoder.CHANNELS
-SAMPLE_WIDTH = OpusDecoder.SAMPLE_SIZE // OpusDecoder.CHANNELS
-SAMPLING_RATE = OpusDecoder.SAMPLING_RATE
-
-#rotate file after there is 0.5s between last received pcm for user.
-#delete messsages after user disconnect
-
-logger = logging.getLogger("discord")
-location = "/home/pi/Conjurer/transcripts/"
-
-class CommunicationObject:
-    def __init__(self, msg_type, user, data):
-        self.type = msg_type
-        self.user = user
-        self.data = data
-    def __repr__(self):
-        return f"{self.type} : {self.user} : {self.data}"
-
-class WaveWriter:
-    def __init__(self, user_id, queue):
-        self.queue = queue
-        self.user = user_id
-        self.username = str(user_id.id)
-        #here we can add hashing function to make transcription files not possible to be connected with discord id
-        self.present_file_id = 0
-        self.file_name_past = None
-        self.file_name_present = location + self.username + "_" + str(self.present_file_id) + ".mp3"
-        self.transcript_file_present : wave.Wave_write = wave.open(
-            self.file_name_present, "wb"
-        )
-        self.transcript_file_present.setnchannels(CHANNELS)
-        self.transcript_file_present.setsampwidth(SAMPLE_WIDTH)
-        self.transcript_file_present.setframerate(SAMPLING_RATE)
-        self.file_name_future = location + self.username + "_" + str(self.present_file_id + 1) + ".mp3"
-        self.transcript_file_future : wave.Wave_write = wave.open(
-            self.file_name_future, "wb"
-        )
-        self.transcript_file_future.setnchannels(CHANNELS)
-        self.transcript_file_future.setsampwidth(SAMPLE_WIDTH)
-        self.transcript_file_future.setframerate(SAMPLING_RATE)
-
-    async def rotate(self):
-
-        self.transcript_file_present.close()
-        self.file_name_past = self.file_name_present
-        if self.present_file_id > 10:
-            self.present_file_id = 0
-        else:
-            self.present_file_id += 1
-        self.file_name_present = self.file_name_future
-        self.transcript_file_present = self.transcript_file_future
-        self.file_name_future = location + self.username + "_" + str(self.present_file_id + 1) + ".mp3"
-        self.transcript_file_future : wave.Wave_write = wave.open(
-            self.file_name_future, "wb"
-        )
-        self.transcript_file_future.setnchannels(CHANNELS)
-        self.transcript_file_future.setsampwidth(SAMPLE_WIDTH)
-        self.transcript_file_future.setframerate(SAMPLING_RATE)
-        operation = CommunicationObject(msg_type="send_file",user=self.user,data=[self.file_name_past])
-
-        await self.queue.put(operation)
-
-    def writeframes(self, pcmdata):
-        self.transcript_file_present.writeframes(pcmdata)
-
-    def cleanup(self):
-        logger.info("Cleanup for user %s", self.username)
-        self.transcript_file_present.close()
-        self.transcript_file_future.close()
-
-
-class SRBuffer(voice_recv.AudioSink):
-    """Endpoint AudioSink that generates a wav file.
-    Best used in conjunction with a silence generating sink. (TBD)
-    """
-    # on member join dodajemytypa do listy
-    # on member disconnect - dropujemy go
-    def __init__(self, queue):
-        super().__init__()
-        self.queue = queue
-        self.wavewriter = {}
-
-    def on_user_connect(self, username):
-        self.wavewriter[str(username.id)] = [WaveWriter(username, self.queue), time.time_ns(), time.time_ns(), False, False]
-
-    def on_user_disconnect(self,username):
-        self.wavewriter[str(username.id)].cleanup()
-        self.wavewriter.pop(str(username.id))
-
-    def wants_opus(self) -> bool:
-        return False
-
-    def write(self, user, data) -> None:
-        #logger.info("DAta write")
-        if user:
-            self.wavewriter[str(user.id)][0].writeframes(data.pcm)
-            self.wavewriter[str(user.id)][1] = time.time_ns() #time from last write
-            self.wavewriter[str(user.id)][3] = True #data written in last iter
-            self.wavewriter[str(user.id)][4] = True #data in buff
-            time.sleep(0.001)
-
-    def cleanup(self) -> None:
-        try:
-            logger.info("Cleanup for SRBuffer")
-            for item in self.wavewriter.values():
-                item[0].cleanup()
-        except Exception:
-            logger.warning("WaveSink got error closing file on cleanup", exc_info=True)
-
-
-class Transcriber(commands.Cog):
-    def __init__(self, bot):
-        self.bot = bot
-        self.threads = []
-        self.comm_queue = asyncio.Queue()
-        self.wsink = SRBuffer(self.comm_queue)
-        self.worker = None
-        self.mc = None
-        self.vc = None
-
-    @commands.hybrid_command(name="transcribe")
-    async def test(self, ctx):
-        if self.vc:
-            vc = self.vc #to juz powinien byc voice channel z funkcja conenct
-        else:
-            vc = None
-        self.mc = ctx.message.channel
-        if self.bot.voice_clients:
-            if  isinstance(self.bot.voice_clients[0], voice_recv.VoiceRecvClient):
-                logger.debug("Already transcribing")
-            else:
-                logger.debug("Already connected with other client")
-        else:
-            logger.debug("Connected")
-            vc = await ctx.author.voice.channel.connect(cls=voice_recv.VoiceRecvClient)
-            logger.info(self.bot.voice_clients)
-            self.check_data.start()
-            self.worker = asyncio.create_task(self.transcribe_output_queue())
-            vc.listen(self.wsink)
-
-
-    @tasks.loop(seconds=0.5)
-    async def check_data(self):
-        for item in self.wsink.wavewriter.values():
-            if not item[3]:
-                timediff_rotation = time.time_ns() - item[2]
-                timediff_write = time.time_ns() -item[1]
-                if  timediff_rotation > 13000149433 and timediff_write > 500014943 and item[4]:
-                    logger.info("File rotation time since last write %s %s", timediff_write, timediff_write/1e9)
-                    logger.info("File rotation time since last rotation %s %s",timediff_rotation, timediff_rotation/1e9)
-                    item[2] = time.time_ns()
-                    item[4] = False
-                    await item[0].rotate()
-            item[3] = False
-
-    @commands.Cog.listener()
-    async def on_voice_state_update(self, user, before, after):
-        if user == self.bot.user:
-            logger.debug("Ignoring self")
-            return
-
-        if before.channel is None:
-            logger.info("User %s connected to channel %s", user, after.channel.name)
-            self.wsink.on_user_connect(user)
-        elif after.channel is  None:
-            logger.info("User %s disconnected from channel %s", user, before.channel.name)
-            operation = CommunicationObject(msg_type="user_cleanup", user=user, data=None)
-            await self.comm_queue.put(operation)
-        else:
-            logger.debug("User VC status changed %s", user.id)
-            logger.debug("Before %s", before)
-            logger.debug("After %s", after)
-
-
-    @commands.command(name="stop_transcribe")
-    async def stop(self, ctx):
-        self.check_data.stop()
-        stop_token = CommunicationObject("STOP",None,None)
-
-        await self.comm_queue.put(stop_token)
-        await ctx.voice_client.disconnect()
-
-    async def transcribe_output_queue(self):
-        logger.info("Transcript uploader start")
-        config = aai.TranscriptionConfig(language_code="pl")
-        transcriber = aai.Transcriber()
-        logger.debug("Transcriber queue id: %s",id(self.comm_queue))
-
-        while True:
-            logger.debug("waiting for tasks")
-            item = await self.comm_queue.get()
-            logger.debug("Got %s", item)
-            if "STOP" in item.type:
-                logger.debug("Queue ended")
-                break
-            elif "send_file" in item.type:
-                logger.debug("Sending file for transcription")
-                transcript = None
-                for iter in item.data:
-                    try:
-                        coro = asyncio.to_thread(
-                            transcriber.transcribe,
-                            iter,
-                            config=config
-                        )
-                        transcript = await coro
-                    except Exception as e:
-                        logger.warn("Exceptiom occured %s", e)
-                    await self.mc.send(f"{item.user} : {transcript.text}")
-                    if transcript.error:
-                        logger.error(transcript.error)
-                        raise AssertionError
-            elif "user_cleanup" in item.type:
-                logger.info("User %s disconnected - cleanup action")
-            else:
-                logger.warn("Something went wrong with object %s", item)
-        logger.info("Transcript uploader stoped")
-
-async def setup(bot):
-    logger = logging.getLogger("discord")
-    await bot.add_cog(Transcriber(bot))
-    logger.info("Loading voice transcribed module done")