From 019e02a186bab64e1a77a0e4089e6ecde44750af Mon Sep 17 00:00:00 2001 From: Migatu Date: Wed, 10 Apr 2024 16:16:31 +0200 Subject: [PATCH] Work on communication Testing only FIx test --- bot.py | 8 ++++++-- communication_subroutine.py | 9 ++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bot.py b/bot.py index 859f03c..739a1e3 100644 --- a/bot.py +++ b/bot.py @@ -685,7 +685,8 @@ async def check_data_q(): channel = client.get_channel(1062047367337095268) try: data = IN_COMM_Q.get(block=False) - await channel.send(f"O. A tak będzie wyglądało coś ciekawego w przyszłości: {data}") + if data.finished: + await channel.send(f"O. A tak będzie wyglądało coś ciekawego w przyszłości: {data}") except Empty: pass @@ -2110,7 +2111,10 @@ class DoSearchView(discord.ui.View): ) async def wyszukaj_linki_do_dokumentow(ctx): query = ctx.message.content - query_uuid = uuid.uuid4() + #TODO: TESTING ONLY!! + #query_uuid = uuid.uuid4() + query_uuid = uuid.UUID('{12345678-1234-5678-1234-567812345678}') + # query_uuid = "test" # 3 wyslij Librariana json_query = {"UUID": str(query_uuid), "query": str(query)[30:], "page": 1} diff --git a/communication_subroutine.py b/communication_subroutine.py index 7e24705..cfeddca 100644 --- a/communication_subroutine.py +++ b/communication_subroutine.py @@ -14,18 +14,18 @@ app = Flask(__name__) @app.route("/conjurer", methods=["POST"]) def answer_external_command(): + app.logger.info(request) record = json.loads(request.data) app.logger.info(record) app.logger.info("DATA RECEIVED") - - while True: try: q_data = internal_q.get(block=False) except Empty: break - if q_data.uuid in record: - pass + if q_data.uuid in record: + q_data.stop = True + IN_COMM_Q.put(q_data) return jsonify("SUCCESS") @@ -56,7 +56,6 @@ def scan_queue(_logger): data = OUT_COMM_Q.get() _logger.info(data) internal_q.put(data) - query_list.append(data) def comm_subroutine(logger): #logger.setLevel(logging.DEBUG)