diff --git a/clarity_epp.py b/clarity_epp.py index 5427656..e0ffd81 100755 --- a/clarity_epp.py +++ b/clarity_epp.py @@ -4,8 +4,7 @@ import sys import argparse -from genologics.lims import Lims - +import genologics.lims import clarity_epp.upload import clarity_epp.export @@ -15,7 +14,8 @@ import config # Setup lims connection -lims = Lims(config.baseuri, config.username, config.password) +lims = genologics.lims.Lims(config.baseuri, config.username, config.password) +genologics.lims.TIMEOUT = config.api_timeout # Export Functions @@ -298,8 +298,8 @@ def placement_pipetting(args): parser_export_labels = subparser_export.add_parser('labels', help='Export container labels', parents=[output_parser]) parser_export_labels.add_argument( - 'type', - choices=['container', 'container_sample', 'storage_location', 'nunc_mix_sample'], + 'type', + choices=['container', 'container_sample', 'storage_location', 'nunc_mix_sample'], help='Label type') parser_export_labels.add_argument('process_id', help='Clarity lims process id') parser_export_labels.add_argument('-d', '--description', nargs='?', help='Container name description') diff --git a/config.py b/config.py index 55d4581..c002932 100755 --- a/config.py +++ b/config.py @@ -4,6 +4,7 @@ baseuri = 'https://change_this_lims.uri' username = 'change_this' password = 'change_this' +api_timeout = 60 # Email settings email = {