Use public API for imports

Author: jacob720

src/daq_config_server/client.py

@@ -10,7 +10,7 @@
 from requests.exceptions import HTTPError
 
 from daq_config_server.app import ValidAcceptHeaders
-from daq_config_server.converters.models import ConfigModel
+from daq_config_server.models import ConfigModel
 
 from .constants import ENDPOINTS
 

src/daq_config_server/converters/_file_converter_map.py

@@ -15,7 +15,7 @@
     detector_xy_lut,
     undulator_energy_gap_lut,
 )
-from daq_config_server.converters.models import ConfigModel
+from daq_config_server.models import ConfigModel
 
 FILE_TO_CONVERTER_MAP: dict[str, Callable[[str], ConfigModel | dict[str, Any]]] = {  # type: ignore
     "/tests/test_data/test_good_lut.txt": undulator_energy_gap_lut,  # For system tests # noqa

src/daq_config_server/converters/convert.py

@@ -4,7 +4,7 @@
 
 import daq_config_server.converters._file_converter_map as file_converter_map
 from daq_config_server.converters._converter_utils import ConverterParseError
-from daq_config_server.converters.models import ConfigModel
+from daq_config_server.models import ConfigModel
 
 
 def get_converted_file_contents(file_path: Path) -> dict[str, Any]:

src/daq_config_server/converters/display_config/_converters.py

@@ -1,5 +1,5 @@
 from daq_config_server.converters._converter_utils import parse_value, remove_comments
-from daq_config_server.converters.display_config.models import (
+from daq_config_server.models import (
     DisplayConfig,
     DisplayConfigData,
 )

src/daq_config_server/converters/display_config/models.py

@@ -1,6 +1,6 @@
 from pydantic import model_validator
 
-from daq_config_server.converters.models import ConfigModel
+from daq_config_server.models import ConfigModel
 
 
 class DisplayConfigData(ConfigModel):

src/daq_config_server/converters/lookup_tables/_converters.py

@@ -1,7 +1,7 @@
 from typing import Any
 
 from daq_config_server.converters._converter_utils import parse_value, remove_comments
-from daq_config_server.converters.lookup_tables.models import GenericLookupTable
+from daq_config_server.models import GenericLookupTable
 
 
 def parse_lut(contents: str, *params: tuple[str, type | None]) -> GenericLookupTable:

src/daq_config_server/models/__init__.py

@@ -3,5 +3,6 @@
     DisplayConfigData,
 )
 from daq_config_server.converters.lookup_tables.models import GenericLookupTable
+from daq_config_server.converters.models import ConfigModel
 
-__all__ = ["DisplayConfig", "DisplayConfigData", "GenericLookupTable"]
+__all__ = ["ConfigModel", "DisplayConfig", "DisplayConfigData", "GenericLookupTable"]

tests/conftest.py

@@ -14,7 +14,7 @@
 from daq_config_server.converters.lookup_tables._converters import (
     undulator_energy_gap_lut,
 )
-from daq_config_server.converters.models import ConfigModel
+from daq_config_server.models import ConfigModel
 from tests.constants import ServerFilePaths, TestDataPaths
 
 

tests/system_tests/test_client.py

@@ -9,11 +9,10 @@
 
 import daq_config_server.converters._file_converter_map as file_converter_map
 from daq_config_server.client import ConfigServer
-from daq_config_server.converters.display_config.models import DisplayConfig
-from daq_config_server.converters.lookup_tables.models import GenericLookupTable
 from daq_config_server.converters.models import (
     ConfigModel,
 )
+from daq_config_server.models import DisplayConfig, GenericLookupTable
 from tests.constants import (
     ServerFilePaths,
     TestDataPaths,

tests/unit_tests/converters/test_convert.py

@@ -14,7 +14,7 @@
     beamline_parameters_to_dict,
 )
 from daq_config_server.converters.convert import get_converted_file_contents
-from daq_config_server.converters.lookup_tables.models import GenericLookupTable
+from daq_config_server.models import GenericLookupTable
 
 
 def test_get_converted_file_contents_uses_converter_if_file_in_map(