From 4c1a04c736a5e85809f4f2f8ccdc6711edb73e53 Mon Sep 17 00:00:00 2001 From: cbizon Date: Thu, 13 Jul 2023 12:23:33 -0400 Subject: [PATCH] removed dumps --- openapi-config.yaml | 2 +- src/service_aggregator.py | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/openapi-config.yaml b/openapi-config.yaml index 71c0332..9d7ad19 100644 --- a/openapi-config.yaml +++ b/openapi-config.yaml @@ -11,7 +11,7 @@ servers: # url: http://127.0.0.1:5000 termsOfService: http://robokop.renci.org:7055/tos?service_long=ARAGORN&provider_long=RENCI title: ARAGORN -version: 2.4.13 +version: 2.4.14 tags: - name: translator - name: ARA diff --git a/src/service_aggregator.py b/src/service_aggregator.py index a243c63..d869b08 100644 --- a/src/service_aggregator.py +++ b/src/service_aggregator.py @@ -337,8 +337,8 @@ async def check_for_messages(guid, num_queries, num_previously_received=0): num_responses += 1 logger.info(f"{guid}: Strider returned {num_responses} out of {num_queries}.") jr = process_message(message) - with open(f"{guid}_{num_responses}.json","w") as outf: - json.dump(jr,outf,indent=2) + #with open(f"{guid}_{num_responses}.json","w") as outf: + # json.dump(jr,outf,indent=2) if is_end_message(jr): logger.info(f"{guid}: Received complete message from multistrider") complete = True @@ -914,10 +914,10 @@ async def robokop_infer(input_message, guid, question_qnode, answer_qnode): max_conns = os.environ.get("MAX_CONNECTIONS", 5) nrules = int(os.environ.get("MAXIMUM_ROBOKOPKG_RULES", 101)) messages = expand_query(input_message, {}, guid) - with open('robokop_infer.txt', 'w') as logfile: - json.dump(input_message, logfile, indent=2) - logfile.write("------\n") - json.dump(messages, logfile, indent=2) + #with open('robokop_infer.txt', 'w') as logfile: + # json.dump(input_message, logfile, indent=2) + # logfile.write("------\n") + # json.dump(messages, logfile, indent=2) lookup_query_graph = messages[0]["message"]["query_graph"] logger.info(f"{guid}: {len(messages)} to send to {automat_url}") result_messages = [] @@ -940,9 +940,9 @@ async def robokop_infer(input_message, guid, question_qnode, answer_qnode): num_results = len(rmessage["message"].get("results",[])) logger.info(f"Returned {num_results} results") if num_results > 0 and num_results < 10000: #more than this number of results and you're into noise. - with (open(f"{guid}_r_{nr}.json", 'w')) as outf: - json.dump(rmessage, outf, indent=2) - nr += 1 + #with (open(f"{guid}_r_{nr}.json", 'w')) as outf: + # json.dump(rmessage, outf, indent=2) + # nr += 1 result_messages.append(rmessage) else: logger.error(f"{guid}: {response.status_code} returned.") @@ -1041,9 +1041,6 @@ async def omnicorp(message, params, guid) -> (dict, int): """ url = f'{os.environ.get("RANKER_URL", "https://aragorn-ranker.renci.org/1.4/")}omnicorp_overlay' - with open("to_corp.json","w") as f: - f.write(json.dumps(message,indent=2)) - rval, omni_status = await subservice_post("omnicorp", url, message, guid) # Omnicorp is not strictly necessary. When we get something other than a 200, @@ -1060,8 +1057,6 @@ async def score(message, params, guid) -> (dict, int): :param guid: :return: """ - with open("to_score.json","w") as f: - f.write(json.dumps(message,indent=2)) ranker_url = os.environ.get("RANKER_URL", "https://aragorn-ranker.renci.org/1.4/")