Fixing the bug in the conjurer_musician.py file.

Fx

Fix

fx

Fix ?

Revert "Fix"

This reverts commit 4e185f7b34dfede04ed36ab9813bd9d1f7fb8b35.

Adding deploy for music bot

conjurer_librarian/conjurer_librarian.py

@@ -1,27 +1,29 @@
-import re
+import asyncio
+import json
 import logging
+import netrc
+import re
 import threading
 import time
-from flask import Flask, jsonify, request
-import netrc
-import json
-import asyncio
 from json.decoder import JSONDecodeError
+from queue import Queue
+from typing import Callable
 from urllib.request import urlopen
+from uuid import UUID
+
+import requests
+import search_bot
+from flask import Flask, jsonify, request
 from habanero import Crossref
 from waitress import serve
-from queue import Queue
-import search_bot
-import requests
-from typing import Callable
-from uuid import UUID
+
 NETRC_FILE = r"C:\Users\Activcom.pl\.netrc"
 
 HOST_ADDRESS = "192.168.1.192"
 PORT_ADDRESS = 5001
 MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
 SEND_RESULTS = "/conjurer"
-BDSM_UUID_TEST = '96b7f85a-1142-4908-8986-62a2ea25a147'
+BDSM_UUID_TEST = "96b7f85a-1142-4908-8986-62a2ea25a147"
 
 ENCODING = "utf-8"
 app = Flask(__name__)
@@ -29,6 +31,7 @@ app = Flask(__name__)
 librarian_queue = Queue()
 librarian_list = []
 
+
 class Librarian(object):
 
     def __init__(self, app, query, uuid) -> None:
@@ -51,15 +54,15 @@ class Librarian(object):
         self.app.logger.info("STARTED SEARCH")
         result = self.cr.works(query=query, limit=1000)
         self.search_result_from_cr.update(result)
-        self.total = result['message']['total-results']
-        self.fetched += len(result['message']['items'])
+        self.total = result["message"]["total-results"]
+        self.fetched += len(result["message"]["items"])
         self.logger.info(self.total)
         self.logger.info(self.fetched)
         while self.total > self.fetched and self.limit > self.fetched:
             result = self.cr.works(query=query, limit=1000)
             self.search_result_from_cr.update(result)
-            self.total = result['message']['total-results']
-            self.fetched += len(result['message']['items'])
+            self.total = result["message"]["total-results"]
+            self.fetched += len(result["message"]["items"])
             self.logger.info(self.total)
             self.logger.info(self.fetched)
 
@@ -76,13 +79,29 @@ class Librarian(object):
                 file_data = {}
             summarized_results = []
             self.app.logger.info("REFINE: Removing all derived works from the list")
-            for item in self.search_result_from_cr['message']['items']:
+            for item in self.search_result_from_cr["message"]["items"]:
                 container = "NO"
                 if "container-title" in item:
                     container = "YES"
                 else:
-                    summarized_results.append({"DOI" : item['DOI'], "title": item['title'] if 'title' in item else None,"type": item['type'] if 'type' in item else None, "container": container})
-            result = {self.uuid : {"total_results": self.search_result_from_cr['message']['total-results'], "on_page" : 1, "summary":summarized_results, "results":self.search_result_from_cr['message']['items']}}
+                    summarized_results.append(
+                        {
+                            "DOI": item["DOI"],
+                            "title": item["title"] if "title" in item else None,
+                            "type": item["type"] if "type" in item else None,
+                            "container": container,
+                        }
+                    )
+            result = {
+                self.uuid: {
+                    "total_results": self.search_result_from_cr["message"][
+                        "total-results"
+                    ],
+                    "on_page": 1,
+                    "summary": summarized_results,
+                    "results": self.search_result_from_cr["message"]["items"],
+                }
+            }
             if file_data:
                 file_data.update(result)
             else:
@@ -96,7 +115,9 @@ class Librarian(object):
 
     async def check_dois_in_local_db(self, doi):
         self.app.logger.info("REFINE: Running search in the backend app")
-        coro = asyncio.to_thread(search_bot.search_for_doi, doi, self.live_results, self.app.logger)
+        coro = asyncio.to_thread(
+            search_bot.search_for_doi, doi, self.live_results, self.app.logger
+        )
         result = await coro
         return result
 
@@ -109,9 +130,14 @@ class Librarian(object):
             data = response.read()
             text = data.decode("utf-8")
             for line in text.splitlines():
-                if re.match(r".*Unfortunately, Sci-Hub doesn't have the requested document.*", line):
+                if re.match(
+                    r".*Unfortunately, Sci-Hub doesn't have the requested document.*",
+                    line,
+                ):
                     return False
-                if m := re.match(r".*<embed type=\"application.pdf\"\s*src=\"(.*\.pdf)",line):
+                if m := re.match(
+                    r".*<embed type=\"application.pdf\"\s*src=\"(.*\.pdf)", line
+                ):
                     direct_download_link = "https:" + str(m.group(1))
                     self.app.logger.info(direct_download_link)
                     return True
@@ -123,7 +149,11 @@ class Librarian(object):
         if brute_force and not result:
             for item in doi:
                 item_link = "https://sci-hub.se/" + item[0]
-                tmp = {"DOI" : item["DOI"], "exists" : await self.check_if_exists_brute_force(item_link), "data": item}
+                tmp = {
+                    "DOI": item["DOI"],
+                    "exists": await self.check_if_exists_brute_force(item_link),
+                    "data": item,
+                }
                 result.update(tmp)
         return result
 
@@ -149,6 +179,7 @@ class Librarian(object):
         refined_result = temp
         self.hit = len(refined_result)
         return refined_result
+
     # TODO: DOłożyć sprawdzenie czy w rafinowanym pliku już nie mamy częściowego wyniku
     async def answer_query(self):
         # TODO: DOłożyć sprawdzenie czy w rafinowanym pliku już nie mamy częściowego wyniku tutaj bo zanim w ogóle otworzymy nierafinowany
@@ -189,6 +220,7 @@ class Librarian(object):
                 self.done = True
                 return self.result
 
+
 # ============================= FLASK INTERNALS===============================
 def flask_debug():
     """
@@ -198,6 +230,7 @@ def flask_debug():
     # trunk-ignore(bandit/B201)
     app.run(debug=True, use_reloader=False, host=HOST_ADDRESS, port=PORT_ADDRESS)
 
+
 def waitress_run():
     """
     The `waitress_run` function serves the `app` on host "0.0.0.0"
@@ -205,6 +238,7 @@ def waitress_run():
     """
     serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)
 
+
 class BackgroundTaskSearch(threading.Thread):
     def run(self):
         loop = asyncio.new_event_loop()  # loop = asyncio.get_event_loop()
@@ -246,6 +280,7 @@ class BackgroundTaskSearch(threading.Thread):
             self.app.logger.info("SEND CONFIRMED")
             time.sleep(1)
 
+
 # ==================================SERVER ROUTES==========================================
 @app.route("/query", methods=["POST"])
 async def query_database():
@@ -255,7 +290,7 @@ async def query_database():
     app.logger.info(record["UUID"])
     uuid = record["UUID"]
     # TODO: TESTING ONLY======================
-    uuid = UUID('{12345678-1234-5678-1234-567812345678}')
+    uuid = UUID("{12345678-1234-5678-1234-567812345678}")
 
     cl = Librarian(app, record["query"], uuid)
     librarian_queue.put(cl)
@@ -267,6 +302,7 @@ async def query_database():
     )
     return return_data
 
+
 @app.route("/get_partial_result", methods=["POST"])
 async def get_partial():
     record = json.loads(request.data)
@@ -282,9 +318,10 @@ async def get_partial():
     )
     return return_data
 
+
 # =======================================MAIN===================================================
 if __name__ == "__main__":
-    logger = logging.getLogger('conjurer_musician')
+    logger = logging.getLogger("conjurer_musician")
     logger.setLevel(logging.DEBUG)
     threads = []
     # threads.append(threading.Thread(target=waitress_run))

deploy_music.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+cd ./conjurer
+git pull
+cd ..
+cp ./conjurer/file_webservice/conjurer_musician.py ./Conjurer
+sudo systemctl restart conjurer_musician.service

file_webservice/conjurer_musician.py

@@ -5,19 +5,18 @@ functions for rescanning the music folder, updating the music list, and serving
 API endpoints.
 """
 import json
+import logging
 import re
-from pathlib import Path
-from platform import uname
 import threading
 import time
 from datetime import datetime
-from sys import platform
-import logging
-from flask import Flask, Response, jsonify, request, send_file
-from waitress import serve
 from logging import handlers
-from json.decoder import JSONDecodeError
+from pathlib import Path
+from platform import uname
+from sys import platform
 
+from flask import Flask, jsonify, redirect, request, send_from_directory
+from waitress import serve
 
 HOST_ADDRESS = "192.168.1.15"
 PORT_ADDRESS = 5000
@@ -30,7 +29,6 @@ if platform in ("linux", "linux2"):
         LOGSTORE = "/home/mtuszowski/conjurer/logs/"
         ENCODING = "utf-8"
 
-
     else:
         LOGFILE = "/home/pi/Conjurer/discord_mus_service.log"
         NETRC_FILE = "/home/pi/.netrc"
@@ -40,17 +38,32 @@ if platform in ("linux", "linux2"):
 
 
 music_file_list = []
+
+
 def create_playlist():
+    """
+    Reads a JSON file containing a playlist and writes the playlist items to a text file.
+
+    The JSON file path is '/home/pi/Conjurer/playlist.json',
+    and the text file path is '/home/pi/Conjurer/all_playlist.txt'.
+
+    Raises:
+        JSONDecodeError: If the JSON file cannot be decoded.
+
+    """
     with open("/home/pi/Conjurer/playlist.json", "r+", encoding="utf-8") as r_file:
-        with open("/home/pi/Conjurer/all_playlist.txt", "w", encoding="utf-8") as w_file:
+        with open(
+            "/home/pi/Conjurer/all_playlist.txt", "w", encoding="utf-8"
+        ) as w_file:
             try:
                 playlist = json.load(r_file)
                 for item in playlist:
                     w_file.write(item)
                     w_file.write("\n")
-            except JSONDecodeError:
+            except json.JSONDecodeError:
                 pass
 
+
 def rescan():
     """
     The `rescan` function logs a message, scans for mp3 files in a specified folder,
@@ -69,8 +82,7 @@ def rescan():
         s_file.seek(0)
         json.dump(database, s_file)
     create_playlist()
-#TODO: Zobaczyc czy losowo, itp. lepiej po stronie pythona czy po stronei liquidsoapa. Tak samo modyfikowanie playlisty itp. itd.
-#TODO: Ale zaczac od odtwarzania playlisty z tego pliku json (moze np. sie format nie zgadzac albo cos)
+
 
 def thread_rescan():
     """
@@ -83,11 +95,27 @@ def thread_rescan():
         logging.info("Rescan triggered")
         rescan()
 
+
 app = Flask(__name__)
-#TODO: Parametry ustalające czy dajemy zwrotkę do bota czy do streamera ? W każdej z funkcji?
+
+
 # TODO: Odpalić wyszukiwarki w wątkach i dopiero po wszystkim zsumować wyszukiwanie.
-def wyszukaj(word_list, how_many):
-    logger = logging.getLogger()
+def wyszukaj(word_list, how_many, _logger=None, return_to_bot=True):
+    """
+    Searches for music files based on a list of keywords and returns a list of matching files.
+
+    Args:
+        word_list (list): A list of keywords to search for.
+        how_many (int): The maximum number of matching files to return.
+
+    Returns:
+        list: A list of matching files, sorted by their search weight.
+
+    """
+    if _logger is None:
+        fun_logger = logging.getLogger()
+    else:
+        fun_logger = _logger
     return_list = []
     search_weight = []
 
@@ -101,7 +129,7 @@ def wyszukaj(word_list, how_many):
         skip_start = 1
     for word in word_list[skip_start:]:
         token_weight = len(word)
-        logger.info("Słowo kluczowe: %s", word)
+        fun_logger.info("Słowo kluczowe: %s", word)
         itr = 0
         for file in music_file_list:
             file = file.split(SEPARATOR_FILE_PATH)
@@ -157,27 +185,41 @@ def wyszukaj(word_list, how_many):
                     matched_times += 1
             itr += 1
 
-    logger.info("Stworzylem tablice wag zajęło mi to %s", datetime.now() - time_start)
+    fun_logger.info(
+        "Stworzylem tablice wag zajęło mi to %s", datetime.now() - time_start
+    )
     time_start = datetime.now()
     item_to_search = max_weight(search_weight)
     itr = 0
     if item_to_search == 0:
-        return None
+        return []
     not_found = True
     return_list = []
     if int(how_many) <= 0:
-        logger.info("Jeden plik do zagrania")
+        fun_logger.info("Jeden plik do zagrania")
         while not_found:
             if search_weight[itr][0] == item_to_search:
                 return_list.append(search_weight[itr])
-                return return_list
+                if not return_to_bot:
+                    with open(
+                        "/home/pi/Conjurer/priority_queue.playlist", "w", encoding="utf-8"
+                    ) as s_file:
+                        s_file.write(search_weight[itr][1])
+                break
             itr += 1
     else:
-        logger.info("Wiele plików do zagrania")
+        fun_logger.info("Wiele plików do zagrania")
         search_weight.sort(key=lambda x: x[0], reverse=True)
         return_list.extend(search_weight[: int(how_many)])
+        if not return_to_bot:
+            for item in return_list:
+                with open(
+                    "/home/pi/Conjurer/priority_queue.playlist", "w", encoding="utf-8"
+                ) as s_file:
+                    s_file.write(item[1])
     return return_list
 
+
 def max_weight(lista):
     """
     Take a list of weights and return the maximum weight.
@@ -205,17 +247,25 @@ def remove_characters(string, character):
     """
     return string.replace(character, "")
 
+
 @app.route("/stream", methods=["GET"])
-def stream_music():
+def stream_music_hls():
     """
     The function `get_music_list` returns a JSON object containing a list of music files.
     :return: A JSON response containing a key "music_file_list" with the value of the variable
     `music_file_list`.
     """
-    m3u8 = Path("/tmp/hls/stream.m3u8")
-    r = Response(m3u8)
-    r.headers["Content-Type"] = "application/mpegURL"
-    return r, 200
+    return send_from_directory("/tmp/hls", "stream.m3u8")
+
+
+@app.route("/stream_mp3", methods=["GET"])
+def stream_music_mp3():
+    """
+    The function `get_music_list` returns a JSON object containing a list of music files.
+    :return: A JSON response containing a key "music_file_list" with the value of the variable
+    `music_file_list`.
+    """
+    return redirect("http://www.example.com", code=302)
 
 
 @app.route("/mp3", methods=["GET"])
@@ -248,6 +298,7 @@ def update_music_list():
     )
     return return_data
 
+
 @app.route("/get_music", methods=["POST"])
 def look_for_playlist():
     """
@@ -264,7 +315,7 @@ def look_for_playlist():
     app.logger.info(record["lista_slow"])
     app.logger.info(record["UUID"])
     app.logger.info(record["dlugosc_plejlisty"])
-    return_data = wyszukaj(record["lista_slow"],record["dlugosc_plejlisty"])
+    return_data = wyszukaj(record["lista_slow"], record["dlugosc_plejlisty"], app.logger)
 
     return_data = (
         jsonify(isError=False, message="Success", statusCode=200, data=return_data),
@@ -281,6 +332,7 @@ def flask_debug():
     # trunk-ignore(bandit/B201)
     app.run(debug=True, use_reloader=False, host=HOST_ADDRESS, port=PORT_ADDRESS)
 
+
 def waitress_run():
     """
     The `waitress_run` function serves the `app` on host "0.0.0.0"
@@ -288,10 +340,13 @@ def waitress_run():
     """
     serve(app, host=HOST_ADDRESS, port=PORT_ADDRESS)
 
+
 if __name__ == "__main__":
-    logger = logging.getLogger('conjurer_musician')
+    logger = logging.getLogger("conjurer_musician")
     logger.setLevel(logging.DEBUG)
-    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+    formatter = logging.Formatter(
+        "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+    )
     handler = handlers.RotatingFileHandler(
         filename=LOGFILE,
         encoding=ENCODING,

file_webservice/conjurer_musician.service

@@ -4,7 +4,7 @@ After=multi-user.target
 
 [Service]
 Type=simple
-ExecStart=/home/pi/Conjurer-service/conjurer/file_webservice/bin/python3 /home/pi/Conjurer-service/conjurer/file_webservice/conjurer_musician.py
+ExecStart=/home/pi/Conjurer/env/bin/python3 /home/pi/Conjurer/conjurer_musician.py
 Restart=on-abort
 
 [Install]

file_webservice/radio_service.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Radio_conjurer
+After=multi-user.target
+
+[Service]
+Type=simple
+ExecStart=/home/pi/Conjurer/ liquidsoap /home/pi/Conjurer/radio_conjurer.liq
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target

install_main_bot.sh

@@ -1,5 +1,9 @@
 #!/bin/bash
+cd /home/pi
+mdkir Conjurer
+cd Conjurer
 python3 -m venv /home/pi/Conjurer/env
+cp /home/pi/conjurer/requirements_bot.txt /home/pi/Conjurer/
 source ./env/bin/activate
 ./env/bin/python3 -m pip install --upgrade pip
 ./env/bin/python3 -m pip install -r requirements_bot.txt
@@ -8,5 +12,5 @@ sed -i '1i\import shutil' ./env/lib/python3.11/site-packages/spotify_dl/youtube.
 deactivate
 sudo cp ./conjurer.service /etc/systemd/system/
 sudo systemctl daemon-reload
-sudo systemctl start conjurer_musician.service
-sudo systemctl enable conjurer_musician.service
+sudo systemctl start conjurer.service
+sudo systemctl enable conjurer.service

install_music_bot.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+cd /home/pi
+mdkir Conjurer
+cd Conjurer
+python3 -m venv /home/pi/Conjurer/env
+source ./env/bin/activate
+cp /home/pi/conjurer/conjurer_musician/requirements_bot.txt /home/pi/Conjurer/
+cp /home/pi/conjurer/conjurer_musician/conjurer_musician.py /home/pi/Conjurer/
+cp /home/pi/conjurer/conjurer_musician/radio_conjurer.liq /home/pi/Conjurer/
+./env/bin/python3 -m pip install --upgrade pip
+./env/bin/python3 -m pip install -r requirements_bot.txt
+deactivate
+sudo cp ./file_webservice/conjurer_musician.service /etc/systemd/system/
+sudo systemctl daemon-reload
+sudo systemctl start conjurer_musician.service
+sudo systemctl enable conjurer_musician.service