diff --git a/src/xchembku_api/crystal_plate_objects/constants.py b/src/xchembku_api/crystal_plate_objects/constants.py index 89abb43..8616207 100644 --- a/src/xchembku_api/crystal_plate_objects/constants.py +++ b/src/xchembku_api/crystal_plate_objects/constants.py @@ -6,9 +6,11 @@ class ThingTypes: # Names that appear in the Formulatrix database, and how they map to our class types. TREENODE_NAMES_TO_THING_TYPES = { - "SWISSci_2drop": ThingTypes.SWISS2, "SWISSci_3Drop": ThingTypes.SWISS3, "SWISSci_3drop": ThingTypes.SWISS3, - "Mitegen_insitu1": ThingTypes.MITEGEN, - "MiTInSitu": ThingTypes.MITEGEN, + # When adding these plate types, need to add corresponding entries to factory in crystal_plate_objects.py. + # TODO: Add 2drop and mitegen plate types. + # "SWISSci_2drop": ThingTypes.SWISS2, + # "Mitegen_insitu1": ThingTypes.MITEGEN, + # "MiTInSitu": ThingTypes.MITEGEN, } diff --git a/src/xchembku_lib/crystal_plate_objects/swiss3.py b/src/xchembku_lib/crystal_plate_objects/swiss3.py index 7a7344b..56dfe72 100644 --- a/src/xchembku_lib/crystal_plate_objects/swiss3.py +++ b/src/xchembku_lib/crystal_plate_objects/swiss3.py @@ -1,7 +1,5 @@ import logging -from typing import Dict, Tuple - -from dls_utilpack.callsign import callsign +from typing import Tuple # Base class for generic things. from dls_utilpack.thing import Thing diff --git a/src/xchembku_lib/datafaces/direct_crystal_wells.py b/src/xchembku_lib/datafaces/direct_crystal_wells.py index 3bdf117..147e01c 100644 --- a/src/xchembku_lib/datafaces/direct_crystal_wells.py +++ b/src/xchembku_lib/datafaces/direct_crystal_wells.py @@ -3,7 +3,6 @@ from typing import Any, Dict, List from dls_normsql.constants import CommonFieldnames -from dls_utilpack.describe import describe from xchembku_api.models.crystal_well_filter_model import CrystalWellFilterModel from xchembku_api.models.crystal_well_model import CrystalWellModel