fx

aa

aa

aaa

aa

Chyba fix

aa

aa

aa

tst

test

FX

Maybe this ?

Fix

last fix ?

dix

conjurer_librarian/conjurer_librarian.py

@@ -12,8 +12,9 @@ from habanero import Crossref
 from waitress import serve
 from queue import Queue
 import search_bot
-import scrape_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"
@@ -21,7 +22,7 @@ PORT_ADDRESS = 5001
 MAIN_BOT_ADDRESS = "http://192.168.1.191:5000"
 SEND_RESULTS = "/conjurer"
 BDSM_UUID_TEST = '96b7f85a-1142-4908-8986-62a2ea25a147'
-MAX_CR_RESULTS = 150000
+
 ENCODING = "utf-8"
 app = Flask(__name__)
 
@@ -36,15 +37,13 @@ class Librarian(object):
         self.cr = Crossref(mailto=authTokens[0])
         self.query = query
         self.uuid = str(uuid)
-        self.limit = MAX_CR_RESULTS
+        self.limit = 3000
         self.fetched = 0
         self.hit = 0
         self.total = 0
         self.app = app
         self.logger = app.logger
         self.live_results = []
-        self.final_result = []
-        self.not_in_db = []
         self.search_result_from_cr = {}
         self.done = False
 
@@ -63,7 +62,8 @@ class Librarian(object):
             self.fetched += len(result['message']['items'])
             self.logger.info (self.total)
             self.logger.info(self.fetched)
-            time.sleep(0.1)
+
+            time.sleep(1)
         self.app.logger.info("CROSSREF DONE")
         #TODO: add to sql with UUID
         #sql row - title, doi, author, uuid, last retrieved, is_available
@@ -142,20 +142,20 @@ class Librarian(object):
             temp.append([item["DOI"], item])
 
         refined_result = await self.check_if_exists(temp)
-
+        temp = []
         for item in refined_result:
             if item["exists"]:
-                self.final_result.append(item["data"])
+                temp.append(item["data"])
-            else:
+        refined_result = temp
-                self.not_in_db.append(item["data"])
+        self.hit = len(refined_result)
-        self.hit = len(self.final_result)
+        return refined_result
-        return self.final_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
         #Search sql for UUID
         #SQL SELECT * FROM RESULTS WHERE UUID = uuid
         self.logger.info(f"Search started {self.uuid}")
+        uuid_found = False
         database = None
         query = self.query
         with open("cr_results.json", "r+", encoding="utf-8") as cr_file:
@@ -165,19 +165,11 @@ class Librarian(object):
                 database =  json.load(cr_file)
             except JSONDecodeError:
                 pass
-            #TODO: Zwracać i final_result i not_in_db. Not in db_do pliku - i do ręcznego przeglądania potem.
+
             if database:
                 for item in database.keys():
                     if item in self.uuid:
                         self.result = await self.refine_query(database)
-                        temp = {}
-                        for item in self.result:
-                            temp[item['DOI']] = {"Title" : item['title'], "type": item['type']}
-                        self.result = temp
-                        temp2 = {}
-                        for item in self.not_in_db:
-                            temp2[item['DOI']] = {"Title" : item['title'], "type": item['type']}
-                        self.not_in_db = temp2
                         return self.result
                 answer = await self.search_crossref(query=query)
                 database.update(answer)
@@ -185,6 +177,7 @@ class Librarian(object):
                 cr_file.seek(0)
                 json.dump(database,cr_file)
                 self.result = await self.refine_query(answer)
+                return self.result
             else:
                 answer = await self.search_crossref(query=query)
                 database = answer
@@ -194,14 +187,6 @@ class Librarian(object):
                 self.result = await self.refine_query(answer)
                 self.app.logger.info("Refined")
                 self.done = True
-            temp = {}
-            for item in self.result:
-                temp[item['DOI']] = {"Title" : item['title'], "type": item['type']}
-            self.result = temp
-            temp2 = {}
-            for item in self.not_in_db:
-                temp2[item['DOI']] = {"Title" : item['title'], "type": item['type']}
-                self.not_in_db = temp2
                 return self.result
 
 #============================= FLASK INTERNALS===============================
@@ -229,34 +214,18 @@ class BackgroundTaskSearch(threading.Thread):
     async def _run(self):
         while True:
             database = None
-            ndb_database = None
             librarian = librarian_queue.get()
             self.app.logger.info("STARTED")
             result = await librarian.answer_query()
             result = {librarian.uuid: result}
             self.app.logger.info("Saving to file")
-            with open("not_in_db.json", "r+", encoding="utf-8") as ndb_file:
-                try:
-                    ndb_database =  json.load(ndb_file)
-                except JSONDecodeError:
-                    pass
-                if ndb_database:
-                    ndb_database.update(librarian.not_in_db)
-                else:
-                    ndb_database = librarian.not_in_db
-                ndb_file.truncate(0)
-                ndb_file.seek(0)
-                json.dump(ndb_database, ndb_file)
-
             with open("s_results.json", "r+", encoding="utf-8") as s_file:
                 try:
                     database =  json.load(s_file)
                 except JSONDecodeError:
                     pass
                 if database:
-                    self.app.logger.info(database)
+                    database.extend(result)
-                    self.app.logger.info(result)
-                    database.update(result)
                 else:
                     database = result
                 self.app.logger.info("DUMPING DATA")
@@ -273,8 +242,7 @@ class BackgroundTaskSearch(threading.Thread):
             timeout=360,
     )       
             self.app.logger.info("SENT")
-            result = await coroutine
+            _ = await coroutine
-            self.app.logger.info(result.status_code)
             self.app.logger.info("SEND CONFIRMED")
             time.sleep(1)
             
@@ -286,6 +254,9 @@ async def query_database():
     app.logger.info(record["query"])
     app.logger.info(record["UUID"])
     uuid = record["UUID"]
+    #TODO: TESTING ONLY======================
+    uuid = UUID('{12345678-1234-5678-1234-567812345678}')
+
     cl = Librarian(app, record["query"], uuid)
     librarian_queue.put(cl)
     librarian_list.append(cl)
@@ -313,15 +284,14 @@ async def get_partial():
 
 #=======================================MAIN===================================================
 if __name__ == "__main__":
-    logger = app.logger
+    logger = logging.getLogger('conjurer_musician')
     logger.setLevel(logging.DEBUG)
     threads = []
-    threads.append(threading.Thread(target=waitress_run))
+    #threads.append(threading.Thread(target=waitress_run))
-    #threads.append(threading.Thread(target=flask_debug))
+    threads.append(threading.Thread(target=flask_debug))
     bgtask = BackgroundTaskSearch()
     bgtask.app = app
     threads.append(bgtask)
-    threads.append(threading.Thread(target = scrape_bot.scraper, args=(logger,)))
     i = 0
     for worker in threads:
         try:

conjurer_librarian/run_server.bat

@@ -1 +0,0 @@
-c:\conjurer\env\Scripts\activate.bat && c:\conjurer\conjurer_librarian\conjurer_librarian.py

conjurer_librarian/scrape_bot.py

@@ -1,93 +0,0 @@
-import json
-from json.decoder import JSONDecodeError
-from urllib.request import urlopen
-from requests import Timeout,ConnectTimeout, ConnectionError
-from queue import Queue
-import re
-import time
-import random
-import logging
-from threading import Thread
-SCR_DATABASE_PATH = r'C:\\Database\\chunks\\'
-SCR_FILENAME = "40_chunk.txt"
-SCR_ENCODING = "utf-8"
-
-WORK_Q = Queue()
-random.seed()
-def load_ndb_to_q(logger):
-    logger.info("Loader started")
-    while True:    
-        with open("not_in_db.json", "r+", encoding="utf-8") as ndb_file:
-            try:
-                ndb_database =  json.load(ndb_file)
-                for item in ndb_database.keys():
-                    logger.info(item)
-                    url = f"https://sci-hub.se/{item}"
-                    WORK_Q.put([item, url, False])
-                ndb_file.truncate(0)
-            except JSONDecodeError:
-                time.sleep(60*60*2)
-                pass
-        time.sleep(180)
-
-def check_if_exists_brute_force(logger):
-    while True:
-        logger.info("Scraper tick")
-        item = WORK_Q.get()
-        page_url =item[1] 
-        logger.error("REFINE: Brute force search!")
-        if not page_url.startswith(("http:", "https:")):
-            raise ValueError("URL must start with 'http:' or 'https:'")
-        blocked = True
-        try:
-        # trunk-ignore(bandit/B310)
-            with urlopen(page_url) as response:
-                data = response.read()
-                text = data.decode("utf-8")
-                if item[2]:
-                    logger.info("Already found")
-                    time.sleep(180)
-                    blocked = False
-                else:
-                    for line in text.splitlines():
-                        if re.match(r".*Unfortunately, Sci-Hub doesn't have the requested document.*", line):
-                            blocked = False
-                            logger.info("Not found")
-                            item[2] = False
-                        if m := re.match(r".*<embed type=\"application.pdf\"\s*src=\"(.*\.pdf)",line):
-                            blocked = False
-                            direct_download_link = "https:" + str(m.group(1))
-                            logger.info (direct_download_link)
-                            with open(SCR_DATABASE_PATH + SCR_FILENAME, "a", encoding=SCR_ENCODING) as operated_file:
-                                operated_file.write("\n")
-                                operated_file.write(item[0])
-                                item[2] = True
-        except (Timeout,ConnectTimeout, ConnectionRefusedError, ConnectionError):
-            pass
-        if blocked:
-            logger.info(item)
-            logger.info(text)
-            logger.error("Got blocked. Fuck.")
-            time.sleep(60*60*72)
-        # trunk-ignore(bandit/B311)
-        rand = random.randint(1,100)
-        logger.info(f"Sleeping for {3*rand} minutes")
-        time.sleep(180*rand)
-
-def scraper(logger = None):
-    if not logger:
-        logger = logging.getLogger()
-        logger.setLevel("DEBUG")
-        h1 = logging.StreamHandler()
-        logger.addHandler(h1)
-        logger.info("No logger set. Test run")
-  
-    loader = Thread(target = load_ndb_to_q, args = (logger,))
-    scraper = Thread(target = check_if_exists_brute_force, args = (logger,))
-    loader.start()
-    scraper.start()
-    loader.join()
-    scraper.join()
-
-if __name__ == "__main__":
-    scraper()

conjurer_librarian/search_bot.py

@@ -1,30 +1,25 @@
-#TODO: Wpiemdolić to wszystko w klasę z loggerem przysłanym z góry
-
 from queue import Queue, Empty
 from threading import Thread
 q = Queue()
 
-#TODO: DATA FOR TEST ONLY
+#TODO: TO w klasie jako parametry wybierane czy robimy pelen run czy testowy
-#MAXTHREADS = 5
+#MAXTHREADS = 3
-#DATABASE_PATH = r'C:\\Database\\chunks_1\\'
+MAXTHREADS = 1
 
-#TODO: DEPLOYMENT DATA
+#DATABASE_PATH = r'C:\\Database\\chunks_1\\'
-MAXTHREADS = 41
 DATABASE_PATH = r'C:\\Database\\chunks\\'
 
 ENCODING = "utf-8"
 CHUNk = "_chunk.txt"
 _sentinel = object()
 result_list = []
-WORK_Q_SIZE = 15500000
 
-def producer(out_q, control_q, filename, logger):
+#TODO: Wpiemdolić to wszystko w klasę z loggerem przysłanym z góry
+
+def producer(out_q, control_q, filename):
     with open(DATABASE_PATH + filename, "r+", encoding=ENCODING) as operated_file:
-        logger.info(f"Worker {filename} ")
+        lines = operated_file.readlines()
-        while True:
+        for line in lines:
-            line = operated_file.readline()
-            if not line:
-                break
             out_q.put(line)
             try:
                 check = control_q.get(block=False)
@@ -32,10 +27,10 @@ def producer(out_q, control_q, filename, logger):
                 check = False
                 pass
             if check is _sentinel:
-                logger.info("TERM signal received")
+                print("TERM signal received")
                 control_q.put(check)
                 break
-        logger.info(f"Worker finished: {filename}")
+    print(f"Worker finished: {filename}")
     out_q.put(_sentinel)
  
 #IMPORTANT!!! ONLY ONE CONSUMER THREAD AS WE ARE NOT PUTTING SENTINELS BACK
@@ -45,6 +40,10 @@ def consumer(in_q, control_q, doi, live_results, logger):
     for item in doi:
         result_list.append({"DOI" : item[0], "exists" : False, "data" : item[1]})
     while True:
+        #if in_q.empty():
+        #    print("Queue empty!")
+        #if in_q.full():
+        #    print("Queue full!")
         done_check = True
         data = in_q.get()
         if data is _sentinel:
@@ -52,7 +51,7 @@ def consumer(in_q, control_q, doi, live_results, logger):
             sentinels += 1
         else:
             for item in result_list:
-                if item["DOI"] in data and not item["exists"]:
+                if item["DOI"] in data:
                     logger.info(data)
                     logger.info("HIT")
                     item["exists"] = True
@@ -67,24 +66,25 @@ def consumer(in_q, control_q, doi, live_results, logger):
 
 def search_for_doi(doi, live_results, logger):
     threads = []
-    work_q = Queue(maxsize=WORK_Q_SIZE)
+    work_q = Queue(maxsize=200000)
     control_q = Queue()
     t_cons = Thread(target = consumer, args = (work_q, control_q, doi, live_results, logger))
     logger.info("Consumer thread created")
     threads.append(t_cons)
     for i in range(0,MAXTHREADS):
-        #TODO: TEST DATA
         #filename = "test" + str(i) + CHUNk
-        #TODO: DEPLOYMENT DATA
+        filename = "40" + CHUNk
-        filename = str(i) + CHUNk
+        #filename = str(i) + CHUNk
         logger.info(f"Creating worker thread no: {i}")
-        threads.append(Thread(target = producer, args = (work_q, control_q, filename,logger)))
+        threads.append(Thread(target = producer, args = (work_q, control_q, filename)))
     for worker in threads:
         worker.start()
     for worker in threads:
         worker.join()
     return result_list
 
+
+
 if __name__ == "__main__":
     import logging
     logger = logging.getLogger()

file_webservice/conjurer_musician.py

@@ -14,7 +14,6 @@ from sys import platform
 import logging
 from flask import Flask, jsonify, request
 from waitress import serve
-from logging import handlers
 
 
 HOST_ADDRESS = "192.168.1.15"
@@ -27,15 +26,21 @@ if platform in ("linux", "linux2"):
         NETRC_FILE = "/home/mtuszowski/.netrc"
         LOGSTORE = "/home/mtuszowski/conjurer/logs/"
         ENCODING = "utf-8"
-
+        GRAPHICS_PATH = "/home/mtuszowski/conjurer/Conjurer_graphics/"
 
     else:
         LOGFILE = "/home/pi/Conjurer/discord_mus_service.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"
-        MUSIC_FOLDER = "/home/pi/RetroPie/mp3/"
+        GRAPHICS_PATH = "/home/pi/RetroPie/Conjurer_graphics/"
-
+        DIR_PATH_SADOX = "/home/pi/RetroPie/Fansadox/"
 
 
 music_file_list = []
@@ -183,22 +188,6 @@ def remove_characters(string, character):
     return string.replace(character, "")
 
 
-@app.route("/stream", methods=["GET"])
-async def stream_music():
-    """
-    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`.
-    """
-    try:
-        m3u8 = Path("/tmp/hls/stream.m3u8")
-        r = Response(m3u8)
-        r.headers["Content-Type"] = "application/mpegURL"
-        return r, 200
-    except FileNotFoundError:
-        return jsonify({"error": "No stream available"}), 404
-
-
 @app.route("/mp3", methods=["GET"])
 def get_music_list():
     """
@@ -272,17 +261,6 @@ def waitress_run():
 if __name__ == "__main__":
     logger = logging.getLogger('conjurer_musician')
     logger.setLevel(logging.DEBUG)
-    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-    handler = handlers.RotatingFileHandler(
-    filename=LOGFILE,
-    encoding=ENCODING,
-    mode="a",
-    maxBytes=6 * 1024 * 1024,
-    backupCount=6,
-    )
-    handler.setFormatter(formatter)
-    logger.addHandler(handler)
-
     rescan()
     logger.info("Started")
     threads = []
@@ -294,3 +272,5 @@ if __name__ == "__main__":
 
     for worker in threads:
         worker.join()
+
+#TODO: Inne pliki - sadox, dokumenty naukowe itp.

file_webservice/conjurer_musician.service

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

s_results.json

@@ -0,0 +1 @@
+{"12345678-1234-5678-1234-567812345678": [{"DOI": "10.1057/9781137435026", "title": ["Queer BDSM Intimacies"], "type": "book", "container": "NO"}]}