From 29f40338e6fb09b78be25ec0849a6d74690781fb Mon Sep 17 00:00:00 2001 From: Robert Ernst Date: Tue, 2 Jul 2024 09:07:12 +0200 Subject: [PATCH 1/4] Add connection check --- clarity_epp.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/clarity_epp.py b/clarity_epp.py index 917124c..45f0bad 100755 --- a/clarity_epp.py +++ b/clarity_epp.py @@ -5,6 +5,7 @@ import argparse import genologics.lims +from tenacity import Retrying, RetryError, stop_after_attempt import clarity_epp.upload import clarity_epp.export @@ -13,10 +14,17 @@ import config -# Setup lims connection +# Setup lims connection and try connection twice lims = genologics.lims.Lims(config.baseuri, config.username, config.password) genologics.lims.TIMEOUT = config.api_timeout +try: + for lims_connection_attempt in Retrying(stop=stop_after_attempt(2)): + with lims_connection_attempt: + lims.check_version() +except RetryError: + raise Exception('Could not connect to Clarity LIMS.') + # Export Functions def export_bioanalyzer(args): From 9b3c90f01472d5c8c447dd146c2116ac99607c48 Mon Sep 17 00:00:00 2001 From: Robert Ernst Date: Tue, 2 Jul 2024 09:16:48 +0200 Subject: [PATCH 2/4] Add tenacity --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index bde4499..515f6b5 100755 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ argparse==1.4.0 xmltodict==0.12.0 pytest==7.0.1 pytest-mock==3.6.1 +tenacity==8.4.2 From f9401482ff617f19deae61403edf9cdd61529bb1 Mon Sep 17 00:00:00 2001 From: Robert Ernst Date: Tue, 2 Jul 2024 09:49:16 +0200 Subject: [PATCH 3/4] Wait 1 sec for retry --- clarity_epp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clarity_epp.py b/clarity_epp.py index 45f0bad..086ee79 100755 --- a/clarity_epp.py +++ b/clarity_epp.py @@ -5,7 +5,7 @@ import argparse import genologics.lims -from tenacity import Retrying, RetryError, stop_after_attempt +from tenacity import Retrying, RetryError, stop_after_attempt, wait_fixed import clarity_epp.upload import clarity_epp.export @@ -19,7 +19,7 @@ genologics.lims.TIMEOUT = config.api_timeout try: - for lims_connection_attempt in Retrying(stop=stop_after_attempt(2)): + for lims_connection_attempt in Retrying(stop=stop_after_attempt(2), wait=wait_fixed(1)): with lims_connection_attempt: lims.check_version() except RetryError: From ce8e355d5a2cb31ecebcd8d86beefda14d1a2f37 Mon Sep 17 00:00:00 2001 From: Robert Ernst Date: Tue, 2 Jul 2024 10:42:45 +0200 Subject: [PATCH 4/4] Fix tenacity for 3.6 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 515f6b5..8478adb 100755 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ argparse==1.4.0 xmltodict==0.12.0 pytest==7.0.1 pytest-mock==3.6.1 -tenacity==8.4.2 +tenacity==8.2.2