Change directory/package structure

src/aare/common/face_detection.py

@@ -1,12 +1,11 @@
 import json
 import time
-from typing import Tuple, Dict, List, Iterable, Optional
+from typing import Tuple, Dict, List, Optional
 import numpy as np
 from scipy.optimize import curve_fit
 import statistics
 import math
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import MLBoxModel, MLOutputModel
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareDAQ")
 

src/aare/common/find_xtal.py

@@ -3,10 +3,9 @@ from typing import List, Optional, Callable
 import numpy as np
 from scipy import ndimage
 
-from aaredaqlib.coordinate import Coordinate
-from aaredaqlib.models import CrystalSize
-from aaredaqlib.raster_grid import RasterGridRequest, CenterOfMassModel
-from aaredaqlib.logger_config import setup_logger
+from aare.common.models import CrystalSize
+from aare.common.raster_grid import RasterGridRequest, CenterOfMassModel
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger('aareDAQ')
 

src/aare/common/models.py

@@ -3,16 +3,14 @@ import re
 from enum import Enum
 from typing import Annotated, Literal, Tuple, List, Optional
 
-import numpy as np
-
 from pydantic import BaseModel, Field, field_validator, AfterValidator
 
-from aaredaqlib.coordinate import Coordinate, positive_coords
-from aaredaqlib.diffraction_geometry import DiffractionGeometry
-from aaredaqlib.sample_geometry import SampleGeometryModel
+from aare.common.coordinate import Coordinate, positive_coords
+from aare.common.diffraction_geometry import DiffractionGeometry
+from aare.common.sample_geometry import SampleGeometryModel
 from jfjoch_client.models.scan_result import ScanResult
 
-from aaredaqlib.beamline import MXBeamline
+from aare.common.beamline import MXBeamline
 
 class StagePositionEnum(Enum):
     MEASURE = 0

src/aare/common/raster_grid.py

@@ -5,8 +5,8 @@ import numpy as np
 from jfjoch_client.models.scan_result import ScanResult
 from pydantic import Field, AfterValidator, BaseModel
 
-from aaredaqlib.coordinate import Coordinate, positive_coords, SmargonCoordinate
-from aaredaqlib.sample_geometry import SampleGeometryModel
+from aare.common.coordinate import Coordinate, positive_coords, SmargonCoordinate
+from aare.common.sample_geometry import SampleGeometryModel
 
 
 class RasterGridRequest(BaseModel):

src/aare/common/rotation_scan.py

@@ -1,7 +1,7 @@
 from jfjoch_client.models.scan_result import ScanResult
 from pydantic import BaseModel
 
-from aaredaqlib.coordinate import SmargonCoordinate
+from aare.common.coordinate import SmargonCoordinate
 
 
 class RotationScanRequest(BaseModel):

src/aare/common/sample_geometry.py

@@ -3,7 +3,7 @@ from typing import Annotated
 import numpy as np
 from pydantic import BaseModel, Field, AfterValidator
 
-from aaredaqlib.coordinate import Coordinate, SmargonCoordinate, positive_coords
+from aare.common.coordinate import Coordinate, SmargonCoordinate, positive_coords
 
 
 class SampleGeometryModel(BaseModel):

src/aare/daq/aaredb.py

@@ -21,21 +21,18 @@ from aareDBclient import (
     BeamlineParametersInput,
     ExperimentParametersCreate)
 
-from aaredaqlib.coordinate import Coordinate
-from aaredaqlib.diffraction_geometry import DiffractionGeometry
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import (
+from aare.common.coordinate import Coordinate
+from aare.common.logger_config import setup_logger
+from aare.common.models import (
     SampleShortInfo,
     PuckLoadedInfo,
-    DewarAddress,
-    SampleShortInfoList,
-    DAQStatusModel, SessionStatus, ScanResultPayloadModel,
+    DAQStatusModel, ScanResultPayloadModel,
 )
 
-from aaredaqlib.beamline import MXBeamline
-from aaredaqlib.raster_grid import RasterGridRequest, RasterPayloadModel, CenterOfMassModel
-from aaredaqlib.rotation_scan import RotationScanRequest
-from aaredaqlib.sample_geometry import SampleGeometryModel
+from aare.common.beamline import MXBeamline
+from aare.common.raster_grid import RasterGridRequest, RasterPayloadModel, CenterOfMassModel
+from aare.common.rotation_scan import RotationScanRequest
+from aare.common.sample_geometry import SampleGeometryModel
 
 from jfjoch_client.models import ScanResult
 

src/aare/daq/auth.py

@@ -9,7 +9,7 @@ from fastapi import HTTPException, status
 from fastapi.security import OAuth2PasswordRequestForm
 from pydantic import BaseModel
 
-from aaredaq.config import BeamlineConfig
+from aare.aaredaq.config import BeamlineConfig
 
 if os.environ.get("JWT_AAREDAQ_KEY") is None:
     raise Exception("JWT_AAREDAQ_KEY environment variable not set, cannot guarantee safe authentication.")

src/aare/daq/config.py

@@ -6,8 +6,8 @@ from typing import Tuple, List
 import numpy as np
 import redis
 import redis_lock
-from aaredaqlib.coordinate import Coordinate
-from aaredaqlib.models import (
+from aare.common.coordinate import Coordinate
+from aare.common.models import (
     BeamlineSettingsModel,
     BeamMarkCoeffModel,
     ZoomModeEnum,
@@ -18,8 +18,8 @@ from aaredaqlib.models import (
     FluorescenceSpectrumOutputModel, CrystalSize, SimpleStrategyInputModel, SimpleScanParameters
 )
 
-from aaredaqlib.beamline import MXBeamline
-from aaredaqlib.logger_config import setup_logger
+from aare.common.beamline import MXBeamline
+from aare.common.logger_config import setup_logger
 
 ABR_POS_ALIGN_DEF = Coordinate(x=-18, y=-0.266, z=0)
 ABR_POS_MOUNT = Coordinate(x=-18, y=0, z=0)

src/aare/daq/daq.py

@@ -9,31 +9,31 @@ import cv2
 import numpy as np
 import redis
 
-import aaredaqlib.face_detection as fd
-from aaredaq import workflows
-from aaredaq.aaredb import AareWrapper
-from aaredaq.autofocus import calculate_focus_measure
-from aaredaq.config import BeamlineConfig, ABR_POS_MOUNT
-from aaredaq.config import BeamlineStateEnum
-from aaredaq.devices import BeamlineDevices
-from aaredaq.mlbox import MlBox
-from aaredaqlib.beamline import MXBeamline
-from aaredaqlib.coordinate import Coordinate, SmargonCoordinate
-from aaredaqlib.diffraction_geometry import DiffractionGeometry
-from aaredaqlib.find_xtal import raster_centre_of_mass, create_quality_filtered_array, identify_crystal_raster, \
+import aare.common.face_detection as fd
+from aare.aaredaq import workflows
+from aare.aaredaq.aaredb import AareWrapper
+from aare.aaredaq.autofocus import calculate_focus_measure
+from aare.aaredaq.config import BeamlineConfig, ABR_POS_MOUNT
+from aare.aaredaq.config import BeamlineStateEnum
+from aare.aaredaq.devices import BeamlineDevices
+from aare.aaredaq.mlbox import MlBox
+from aare.common.beamline import MXBeamline
+from aare.common.coordinate import Coordinate, SmargonCoordinate
+from aare.common.diffraction_geometry import DiffractionGeometry
+from aare.common.find_xtal import raster_centre_of_mass, create_quality_filtered_array, identify_crystal_raster, \
     get_result_list_from_com, get_best_b_factor, get_best_res, get_xtal_size
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import (
+from aare.common.logger_config import setup_logger
+from aare.common.models import (
     SampleShortInfo,
     PuckLoadedInfo,
     SampleShortInfoList,
     DAQStatusModel, BeamlineStatus, SessionStatus, SampleCameraSettings, AutofocusSettings, ZoomModeEnum, CrystalSize,
     SimpleScanParameters, MLBoxModel, FluorescenceSpectrumParameterModel,
     FluorescenceSpectrumOutputModel)
-from aaredaqlib.raster_grid import RasterGridRequest, CompletedRasterGrid, CompletedRasterGridElem
-from aaredaqlib.rotation_scan import RotationScanRequest, CompletedRotationScan
-from aaredaqlib.sample_geometry import SampleGeometryModel
-from aaredevices.jfjoch import JFJochWrapper
+from aare.common.raster_grid import RasterGridRequest, CompletedRasterGrid, CompletedRasterGridElem
+from aare.common.rotation_scan import RotationScanRequest, CompletedRotationScan
+from aare.common.sample_geometry import SampleGeometryModel
+from aare.devices.jfjoch import JFJochWrapper
 
 logger = setup_logger("aareDAQ")
 

src/aare/daq/devices.py

@@ -2,19 +2,19 @@ import time
 
 from epics import PV
 
-from aaredaqlib.beamline import MXBeamline
-from aaredaqlib.coordinate import Coordinate
-from aaredaqlib.models import SampleCameraSettings, StagePositionEnum
-from aaredevices import aerotech, smargon
-from aaredevices.area_detector import epicsAD
-from aaredevices.enum_pv import EnumPv
-from aaredevices.filter_transmission import FilterTransmission
-from aaredevices.fluorimeter import Fluorimeter
-from aaredevices.experimental_hutch_shutter import ExperimentalHutchShutter
-from aaredevices.my_motor import MyMotor
-from aaredevices.non_standard import NonStandard
-from aaredevices.tell_client import TellClient
-from aaredevices.workflow_tools import wait_position
+from aare.common.beamline import MXBeamline
+from aare.common.coordinate import Coordinate
+from aare.common.models import SampleCameraSettings, StagePositionEnum
+from aare.devices import smargon, aerotech
+from aare.devices.area_detector import epicsAD
+from aare.devices.enum_pv import EnumPv
+from aare.devices.filter_transmission import FilterTransmission
+from aare.devices.fluorimeter import Fluorimeter
+from aare.devices.experimental_hutch_shutter import ExperimentalHutchShutter
+from aare.devices.my_motor import MyMotor
+from aare.devices.non_standard import NonStandard
+from aare.devices.tell_client import TellClient
+from aare.devices.workflow_tools import wait_position
 
 class BeamlineDevices:
     def __init__(self, beamline: MXBeamline):

src/aare/daq/mlbox.py

@@ -1,11 +1,11 @@
 
-from typing import Tuple, Optional, Iterable
+from typing import Optional, Iterable
 
 import cv2
 import requests
 
-from aaredaqlib.models import MLBoxModel, MLOutputModel, MLBoxType, BoundingBoxModel
-from aaredaqlib.logger_config import setup_logger
+from aare.common.models import MLBoxModel, MLOutputModel, MLBoxType, BoundingBoxModel
+from aare.common.logger_config import setup_logger
 
 logger=setup_logger("aareDAQ")
 

src/aare/daq/server.py

@@ -6,26 +6,26 @@ import json
 import cv2
 import urllib3
 import uvicorn
-from aaredaqlib.coordinate import SmargonCoordinate, Coordinate
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import SampleShortInfo, DAQStatusModel, BeamlineStateEnum, BeamlineSettingsModel, \
+from aare.common.coordinate import SmargonCoordinate, Coordinate
+from aare.common.logger_config import setup_logger
+from aare.common.models import SampleShortInfo, DAQStatusModel, BeamlineStateEnum, BeamlineSettingsModel, \
     SampleShortInfoList, SessionStatus, SampleCameraSettings, AutofocusSettings, TokenData, \
     CryojetSettingsModel, SimpleScanParameters, CrystalSize, FluorescenceSpectrumParameterModel, \
     FluorescenceSpectrumOutputModel
-from aaredaqlib.raster_grid import RasterGridRequest, CompletedRasterGrid
-from aaredaqlib.rotation_scan import RotationScanRequest, CompletedRotationScan
-from aaredaqlib.sample_geometry import SampleGeometryModel
+from aare.common.raster_grid import RasterGridRequest, CompletedRasterGrid
+from aare.common.rotation_scan import RotationScanRequest, CompletedRotationScan
+from aare.common.sample_geometry import SampleGeometryModel
 from fastapi import FastAPI, Depends
 from fastapi import HTTPException
 from fastapi import status as api_status
 from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from starlette.responses import StreamingResponse
 
-from aaredaq import auth
-from aaredaqlib.beamline import mx_beamline
-from aaredaq.config import BeamlineConfig
-from aaredaq.daq import (AareDAQ, LoopCenteringFailed, TransformationInvalidException,
-                         MountingFailed, WarningTellException, CriticalTellException)
+from aare.aaredaq import auth
+from aare.common.beamline import mx_beamline
+from aare.aaredaq.config import BeamlineConfig
+from aare.aaredaq.daq import (AareDAQ, LoopCenteringFailed, TransformationInvalidException,
+                              MountingFailed, WarningTellException, CriticalTellException)
 
 app = FastAPI()
 
@@ -713,7 +713,7 @@ def main():
     urllib3.disable_warnings()
 
     # Run the application using uvicorn
-    uvicorn.run("aaredaq.server:app", host="0.0.0.0", port=5210, workers=4, log_config=LOGGING_CONFIG)
+    uvicorn.run("aare.daq.server:app", host="0.0.0.0", port=5210, workers=4, log_config=LOGGING_CONFIG)
 
 
 if __name__ == "__main__":

src/aare/daq/spreadsheetupdater.py

@@ -2,11 +2,10 @@ import os
 import json
 import websocket
 import time
-import signal
-from aareDBclient.models import PuckWithTellPosition, DataCollectionParameters
-from aaredaqlib.models import SampleShortInfoList, SampleShortInfo, DewarAddress
+from aareDBclient.models import PuckWithTellPosition
+from aare.common.models import SampleShortInfoList, SampleShortInfo, DewarAddress
 from config import BeamlineConfig
-from aaredaqlib.beamline import MXBeamline
+from aare.common.beamline import MXBeamline
 
 SLOT_IDENTIFIER = "X06DA"
 WS_URL = f"wss://mx-db-01.psi.ch/dispatcher/protected_router/tell_runner/ws/samples-spreadsheet/{SLOT_IDENTIFIER}"

src/aare/daq/tellupdater.py

@@ -6,9 +6,9 @@ import requests
 import threading
 import time
 from aareDBclient.models import PuckWithTellPosition
-from aaredevices.tell_client import TellClient
+from aare.devices.tell_client import TellClient
 from aaredb import AareWrapper  # Make sure the import path fits your project
-from aaredaqlib.beamline import MXBeamline
+from aare.common.beamline import MXBeamline
 
 # Configuration
 SLOT_IDENTIFIER = "X06DA"

src/aare/daq/workflows.py

@@ -2,13 +2,13 @@ import time
 
 from epics import poll
 
-from aaredaq.config import ABR_POS_MOUNT, ABR_OMEGA_MOUNT
-from aaredaq.devices import BeamlineDevices
-from aaredaq.config import BeamlineConfig
-from aaredaqlib.coordinate import Coordinate
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import StagePositionEnum, SampleCameraSettings, ZoomModeEnum
-from aaredevices.mx_lib import pv_wait
+from aare.aaredaq.config import ABR_POS_MOUNT, ABR_OMEGA_MOUNT
+from aare.aaredaq.devices import BeamlineDevices
+from aare.aaredaq.config import BeamlineConfig
+from aare.common.coordinate import Coordinate
+from aare.common.logger_config import setup_logger
+from aare.common.models import StagePositionEnum, ZoomModeEnum
+from aare.devices.mx_lib import pv_wait
 
 logger = setup_logger("aareDAQ")
 

src/aare/devices/aerotech.py

@@ -108,7 +108,7 @@ import time
 from epics import PV, poll
 from epics.ca import pend_io
 
-from aaredaqlib.beamline import MXBeamline
+from aare.common.beamline import MXBeamline
 
 ABR_DONE = 0
 ABR_READY = 1

src/aare/devices/experimental_hutch_shutter.py

@@ -1,4 +1,4 @@
-from aaredaqlib.beamline import MXBeamline
+from aare.common.beamline import MXBeamline
 from epics import PV
 
 class ExperimentalHutchShutter:

src/aare/devices/filter_transmission.py

@@ -2,7 +2,7 @@ import time
 
 from epics import PV, poll
 
-from aaredaqlib.beamline import MXBeamline
+from aare.common.beamline import MXBeamline
 
 
 class FilterTransmission:

src/aare/devices/fluorimeter.py

@@ -1,12 +1,10 @@
 import time
-from typing import Callable, cast
 
 from epics import PV, poll
-from epics.ca import pend_io
 
-from aaredaqlib.beamline import MXBeamline
+from aare.common.beamline import MXBeamline
 
-from aaredaqlib.logger_config import setup_logger
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareaDAQ")
 

src/aare/devices/jfjoch.py

@@ -2,11 +2,10 @@ import math
 
 import jfjoch_client
 
-from aaredaqlib.beamline import MXBeamline
-from aaredaqlib.diffraction_geometry import DiffractionGeometry
-from aaredaqlib.models import SampleShortInfo, DAQStatusModel, FluorescenceSpectrumOutputModel
-from aaredaqlib.raster_grid import RasterGridRequest
-from aaredaqlib.rotation_scan import RotationScanRequest
+from aare.common.beamline import MXBeamline
+from aare.common.models import DAQStatusModel, FluorescenceSpectrumOutputModel
+from aare.common.raster_grid import RasterGridRequest
+from aare.common.rotation_scan import RotationScanRequest
 
 
 class JFJochWrapper:

src/aare/devices/smargon.py

@@ -3,8 +3,8 @@ from time import sleep, time
 
 import requests
 
-from aaredaqlib.beamline import MXBeamline
-from aaredaqlib.coordinate import SmargonCoordinate, Coordinate
+from aare.common.beamline import MXBeamline
+from aare.common.coordinate import SmargonCoordinate, Coordinate
 
 
 class SmargonMode(Enum):

src/aare/devices/tell_client.py

@@ -1,5 +1,4 @@
 import json
-import logging
 import random
 import re
 import time
@@ -8,8 +7,8 @@ from urllib.parse import urlparse
 
 import requests
 
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import (
+from aare.common.logger_config import setup_logger
+from aare.common.models import (
     PuckLoadedInfo,
     SampleShortInfo,
     DewarAddress,
@@ -19,8 +18,8 @@ from aaredaqlib.models import (
 from aareDBclient import (
     PuckWithTellPosition,
 )
-from aaredaqlib.beamline import MXBeamline  # noqa: F401
-from aaredevices.pshell_client import PShellClient
+from aare.common.beamline import MXBeamline  # noqa: F401
+from aare.devices.pshell_client import PShellClient
 
 logger = setup_logger("aareDAQ")
 

src/aare/gui/auth.py

@@ -2,9 +2,9 @@ import os
 import jwt
 import requests
 
-from aaredaqlib.models import TokenData
+from aare.common.models import TokenData
 
-from aaredaqlib.logger_config import setup_logger
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger('aareGUI')
 

src/aare/gui/gui.py

@@ -5,11 +5,11 @@ from PySide6.QtCore import QCommandLineParser, QCommandLineOption
 from PySide6.QtWidgets import QApplication, QMessageBox
 
 
-from aaredaqlib.logger_config import setup_logger
-from aaregui.main_window import MainWindow
+from aare.common.logger_config import setup_logger
+from aare.gui.main_window import MainWindow
 #from aaregui.widgets.login import LoginDialog
-from aaredaqlib.beamline import MXBeamline, mx_beamline
-from aaregui.auth import auth
+from aare.common.beamline import MXBeamline, mx_beamline
+from aare.gui.auth import auth
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/main_window.py

@@ -4,39 +4,38 @@ from PySide6.QtGui import QAction
 from PySide6.QtWidgets import (
     QMainWindow,
     QWidget,
-    QSplitter,
     QHBoxLayout,
     QVBoxLayout,
     QMessageBox,
     QApplication,
     QDockWidget, QTabWidget)
 
-from aaredaqlib.coordinate import Coordinate, SmargonCoordinate
-from aaredaqlib.diffraction_geometry import DiffractionGeometry
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import SampleShortInfoList, TokenData, DAQStatusModel, BeamlineStateEnum
-from aaredaqlib.sample_geometry import SampleGeometryModel
-from aaregui.panels.LogPanel import LogDock
+from aare.common.coordinate import Coordinate, SmargonCoordinate
+from aare.common.diffraction_geometry import DiffractionGeometry
+from aare.common.logger_config import setup_logger
+from aare.common.models import SampleShortInfoList, TokenData, DAQStatusModel, BeamlineStateEnum
+from aare.common.sample_geometry import SampleGeometryModel
+from aare.gui.panels.LogPanel import LogDock
 
-from aaregui.panels.beamline_controls import BeamlineControls
-from aaregui.panels.data_collection_settings import DataCollectionSettings
-from aaregui.panels.manual_sample_panel import ManualSamplePanel
-from aaregui.panels.reference_tools_panel import ReferenceToolsPanel
-from aaregui.panels.sample_queue_panel import SampleQueuePanel
-from aaregui.panels.tell_sample_panel import TellSamplePanel
-from aaregui.panels.face_detection_panel import FaceDetectionPanel
-from aaregui.scan_logic.raster_grid_manager import RasterGridManager
-from aaregui.scan_logic.rotation_scan_manager import RotationScanManager
-from aaregui.scan_logic.sample_mount_logic import SampleMountLogic
-from aaregui.threads.axis_video_thread import VideoThread
-from aaregui.threads.camera_thread import SampleCameraThread, PredictionSubscriber
-from aaregui.threads.daq_worker import DAQWorker
-from aaregui.threads.jfjoch_viewer import JFJochDBusClient
-from aaregui.widgets.camera_image import SampleCameraImageLabel
-from aaregui.widgets.no_wheel_scroll_area import NoWheelScrollArea
-from aaregui.widgets.status_bar import StatusBar
-from aaregui.widgets.video_image import VideoGraphicsView
-from aaregui.panels.fluorescence_panel import FluorescencePanel
+from aare.gui.panels import BeamlineControls
+from aare.gui.panels import DataCollectionSettings
+from aare.gui.panels.manual_sample_panel import ManualSamplePanel
+from aare.gui.panels.reference_tools_panel import ReferenceToolsPanel
+from aare.gui.panels import SampleQueuePanel
+from aare.gui.panels.tell_sample_panel import TellSamplePanel
+from aare.gui.panels.face_detection_panel import FaceDetectionPanel
+from aare.gui.scan_logic import RasterGridManager
+from aare.gui.scan_logic import RotationScanManager
+from aare.gui.scan_logic import SampleMountLogic
+from aare.gui.threads.axis_video_thread import VideoThread
+from aare.gui.threads import SampleCameraThread, PredictionSubscriber
+from aare.gui.threads import DAQWorker
+from aare.gui.threads import JFJochDBusClient
+from aare.gui.widgets.camera_image import SampleCameraImageLabel
+from aare.gui.widgets.no_wheel_scroll_area import NoWheelScrollArea
+from aare.gui.widgets.status_bar import StatusBar
+from aare.gui.widgets import VideoGraphicsView
+from aare.gui.panels.fluorescence_panel import FluorescencePanel
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/models/bookmark.py

@@ -2,7 +2,7 @@ from typing import Literal
 
 from PySide6.QtGui import QColor
 
-from aaredaqlib.coordinate import SmargonCoordinate
+from aare.common.coordinate import SmargonCoordinate
 
 
 class SmargonBookmark:

src/aare/gui/models/sample_queue_model.py

@@ -1,7 +1,7 @@
-from PySide6.QtCore import QAbstractTableModel, Qt, Slot
+from PySide6.QtCore import QAbstractTableModel, Qt
 from PySide6.QtGui import QBrush, QColor
 
-from aaredaqlib.models import SampleShortInfo, SampleShortInfoList
+from aare.common.models import SampleShortInfo, SampleShortInfoList
 
 
 def get_entry(sample: SampleShortInfo, column: int):

src/aare/gui/models/user_sample_model.py

@@ -3,7 +3,7 @@ import re
 from PySide6.QtCore import QAbstractTableModel, Qt, QMimeData
 from PySide6.QtGui import QBrush, QColor
 
-from aaredaqlib.models import SampleShortInfo, SampleShortInfoList
+from aare.common.models import SampleShortInfo, SampleShortInfoList
 
 
 def get_entry(sample: SampleShortInfo, column: int):

src/aare/gui/panels/LogPanel.py

@@ -1,9 +1,9 @@
 # Python
 
-from PySide6.QtCore import Qt, Signal, QObject
+from PySide6.QtCore import Qt
 from PySide6.QtWidgets import QDockWidget, QPlainTextEdit
 
-from aaredaqlib.logger_config import QtLogEmitter, QtLogHandler, find_existing_formatter, attach_to_logger
+from aare.common.logger_config import QtLogEmitter, QtLogHandler, find_existing_formatter, attach_to_logger
 
 
 class LogDock(QDockWidget):

src/aare/gui/panels/abr_tweak_panel.py

@@ -1,12 +1,12 @@
 from PySide6.QtCore import Signal, Slot
 from PySide6.QtGui import Qt
 from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton
-from aaredaqlib.coordinate import Coordinate
-from aaredaqlib.models import DAQStatusModel
+from aare.common.coordinate import Coordinate
+from aare.common.models import DAQStatusModel
 
-from aaregui.widgets.button_with_payload import ButtonWithPayload
-from aaregui.widgets.number_line_edit import NumberLineEdit
-from aaregui.widgets.title_label import TitleLabel
+from aare.gui.widgets import ButtonWithPayload
+from aare.gui.widgets import NumberLineEdit
+from aare.gui.widgets.title_label import TitleLabel
 
 DEFAULT_ABR_STEP_UM = 5
 

src/aare/gui/panels/beam_center_panel.py

@@ -1,9 +1,9 @@
 from PySide6.QtCore import Signal, Slot
 from PySide6.QtWidgets import QWidget, QGridLayout, QLabel
 
-from aaredaqlib.models import DAQStatusModel
-from aaregui.widgets.number_line_edit import NumberLineEdit
-from aaregui.widgets.title_label import TitleLabel
+from aare.common.models import DAQStatusModel
+from aare.gui.widgets import NumberLineEdit
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class BeamCenterWidget(QWidget):

src/aare/gui/panels/beam_mark_panel.py

@@ -1,8 +1,8 @@
 from PySide6.QtCore import Signal, Slot
 from PySide6.QtWidgets import QWidget, QGridLayout, QPushButton, QLabel
 
-from aaredaqlib.models import DAQStatusModel
-from aaregui.widgets.title_label import TitleLabel
+from aare.common.models import DAQStatusModel
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class BeamMarkWidget(QWidget):

src/aare/gui/panels/beam_size_panel.py

@@ -1,9 +1,9 @@
 from PySide6.QtCore import Signal, Slot
 from PySide6.QtWidgets import QWidget, QGridLayout, QLabel
 
-from aaredaqlib.models import DAQStatusModel
-from aaregui.widgets.number_line_edit import NumberLineEdit
-from aaregui.widgets.title_label import TitleLabel
+from aare.common.models import DAQStatusModel
+from aare.gui.widgets import NumberLineEdit
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class BeamSizeWidget(QWidget):

src/aare/gui/panels/beamline_controls.py

@@ -1,16 +1,15 @@
 from PySide6.QtWidgets import QFrame, QVBoxLayout
 
-from aaregui.panels.abr_tweak_panel import AbrTweakWidget
-from aaregui.panels.beam_center_panel import BeamCenterWidget
-from aaregui.panels.beam_mark_panel import BeamMarkWidget
-from aaregui.panels.beam_size_panel import BeamSizeWidget
-from aaregui.panels.beamline_state_panel import BeamlineStatePanel
-from aaregui.panels.illumination_panel import IlluminationPanel
-from aaregui.panels.loop_centering_panel import LoopCenteringPanel
-from aaregui.panels.omega_panel import OmegaPanel
-from aaregui.panels.samcam_panel import SamcamPanel
-from aaregui.panels.smargon_panel import SmargonPanel
-from aaregui.panels.zoom_panel import ZoomPanel
+from aare.gui.panels import AbrTweakWidget
+from aare.gui.panels import BeamCenterWidget
+from aare.gui.panels import BeamMarkWidget
+from aare.gui.panels import BeamSizeWidget
+from aare.gui.panels import IlluminationPanel
+from aare.gui.panels.loop_centering_panel import LoopCenteringPanel
+from aare.gui.panels.omega_panel import OmegaPanel
+from aare.gui.panels.samcam_panel import SamcamPanel
+from aare.gui.panels.smargon_panel import SmargonPanel
+from aare.gui.panels.zoom_panel import ZoomPanel
 
 
 class BeamlineControls(QFrame):

src/aare/gui/panels/beamline_state_panel.py

@@ -1,6 +1,6 @@
 from PySide6.QtWidgets import QWidget, QGridLayout, QPushButton
 
-from aaregui.widgets.title_label import TitleLabel
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class BeamlineStatePanel(QWidget):

src/aare/gui/panels/data_collection_settings.py

@@ -3,23 +3,19 @@ from PySide6.QtWidgets import (
     QFrame,
     QVBoxLayout,
     QTabWidget,
-    QGridLayout,
     QPushButton,
-    QWidget,
 )
 
-from aaredaqlib.diffraction_geometry import DiffractionGeometry
-from aaredaqlib.models import DAQStatusModel
-from aaredaqlib.rotation_scan import RotationScanRequest
-from aaredaqlib.sample_geometry import SampleGeometryModel
+from aare.common.diffraction_geometry import DiffractionGeometry
+from aare.common.models import DAQStatusModel
+from aare.common.sample_geometry import SampleGeometryModel
 
-from aaregui.panels.file_path_panel import FilePathPanel
-from aaregui.panels.fluorescence_data_collection import FluorescenceDataCollectionPanel
-from aaregui.panels.raster_data_collection import RasterDataCollectionPanel
-from aaregui.panels.rotation_data_collection import RotationDataCollectionPanel
-from aaregui.panels.smart_rotation_panel import SimpleRotationSettingsPanel
-from aaregui.scan_logic.raster_grid_manager import RasterGridManager
-from aaregui.widgets.title_label import TitleLabel
+from aare.gui.panels.file_path_panel import FilePathPanel
+from aare.gui.panels.fluorescence_data_collection import FluorescenceDataCollectionPanel
+from aare.gui.panels.raster_data_collection import RasterDataCollectionPanel
+from aare.gui.panels.rotation_data_collection import RotationDataCollectionPanel
+from aare.gui.panels import SimpleRotationSettingsPanel
+from aare.gui.scan_logic import RasterGridManager
 
 
 class DataCollectionSettings(QFrame):

src/aare/gui/panels/face_detection_panel.py

@@ -1,15 +1,14 @@
 # Python
-from PySide6.QtCore import Slot, Qt, Signal
-from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QFrame, QPushButton, QSpacerItem, QSizePolicy, QVBoxLayout, \
-    QHBoxLayout
+from PySide6.QtCore import Signal
+from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton, QVBoxLayout
 from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.figure import Figure
 import numpy as np
 
-from aaregui.widgets.number_line_edit import NumberLineEdit
-from aaregui.widgets.title_label import TitleLabel
+from aare.gui.widgets import NumberLineEdit
+from aare.gui.widgets.title_label import TitleLabel
 
-from aaredaqlib.logger_config import setup_logger
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/panels/file_path_panel.py

@@ -1,13 +1,12 @@
-import copy
 import os
 from datetime import datetime
 from pathlib import Path
 
 from PySide6.QtCore import Signal, Slot, Qt
-from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QLineEdit, QSpinBox, QCheckBox, QMessageBox
+from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QLineEdit, QSpinBox, QMessageBox
 
-from aaredaqlib.models import SampleShortInfo, DAQStatusModel
-from aaregui.widgets.title_label import TitleLabel
+from aare.common.models import SampleShortInfo, DAQStatusModel
+from aare.gui.widgets.title_label import TitleLabel
 
 ## Logic for filenames:
 ## 1. For rasters 'raster/' subfolder is added at the top level of the path (managed by DAQ) - e.g. raster/20250101/PX-456/01/dataset

src/aare/gui/panels/fluorescence_data_collection.py

@@ -1,8 +1,8 @@
 from PySide6.QtCore import Signal, Slot
 from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton, QCheckBox
 
-from aaredaqlib.models import FluorescenceSpectrumParameterModel
-from aaregui.widgets.number_line_edit import NumberLineEdit
+from aare.common.models import FluorescenceSpectrumParameterModel
+from aare.gui.widgets import NumberLineEdit
 
 
 class FluorescenceDataCollectionPanel(QWidget):

src/aare/gui/panels/fluorescence_panel.py

@@ -1,11 +1,11 @@
 import numpy as np
 from PySide6.QtCharts import QChart, QChartView, QLineSeries, QValueAxis
-from PySide6.QtCore import QPointF, Qt, Slot, Signal, QEvent
+from PySide6.QtCore import QPointF, Qt, Slot, QEvent
 from PySide6.QtGui import QPainter, QColor, QPen
 from PySide6.QtWidgets import QWidget, QGridLayout, QGraphicsSimpleTextItem, QLabel
 
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import FluorescenceSpectrumOutputModel, DAQStatusModel
+from aare.common.logger_config import setup_logger
+from aare.common.models import FluorescenceSpectrumOutputModel, DAQStatusModel
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/panels/illumination_panel.py

@@ -1,8 +1,8 @@
 from PySide6.QtCore import Qt, Signal, Slot
 from PySide6.QtWidgets import QWidget, QGridLayout, QSlider
-from aaredaqlib.models import DAQStatusModel
+from aare.common.models import DAQStatusModel
 
-from aaregui.widgets.title_label import TitleLabel
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class IlluminationPanel(QWidget):

src/aare/gui/panels/loop_centering_panel.py

@@ -1,6 +1,6 @@
 from PySide6.QtWidgets import QWidget, QGridLayout, QPushButton
 
-from aaregui.widgets.title_label import TitleLabel
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class LoopCenteringPanel(QWidget):

src/aare/gui/panels/manual_sample_panel.py

@@ -1,10 +1,10 @@
 from PySide6.QtCore import Signal, Slot
-from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QTextEdit, QPushButton, QCheckBox, QLineEdit
+from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton, QCheckBox, QLineEdit
 from aareDBclient import DataCollectionParameters
 
-from aaredaqlib.models import SampleShortInfo, DAQStatusModel
-from aaregui.widgets.number_line_edit import NumberLineEdit
-from aaregui.widgets.title_label import TitleLabel
+from aare.common.models import SampleShortInfo, DAQStatusModel
+from aare.gui.widgets import NumberLineEdit
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class ManualSamplePanel(QWidget):

src/aare/gui/panels/omega_panel.py

@@ -1,10 +1,10 @@
 from PySide6.QtCore import Signal, Slot
 from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QHBoxLayout
-from aaredaqlib.models import DAQStatusModel
+from aare.common.models import DAQStatusModel
 
-from aaregui.widgets.button_with_payload import ButtonWithPayload
-from aaregui.widgets.number_line_edit import NumberLineEdit
-from aaregui.widgets.title_label import TitleLabel
+from aare.gui.widgets import ButtonWithPayload
+from aare.gui.widgets import NumberLineEdit
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class OmegaEntryWidget(QWidget):

src/aare/gui/panels/raster_data_collection.py

@@ -1,14 +1,13 @@
 from PySide6.QtCore import Signal, Slot, Qt
-from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QSizePolicy, QSpacerItem, QPushButton, QHBoxLayout, \
-    QComboBox, QSlider, QMessageBox
+from PySide6.QtWidgets import QLabel, QSizePolicy, QSpacerItem, QPushButton, QComboBox, QSlider, QMessageBox
 
-from aaredaqlib.diffraction_geometry import DiffractionGeometry
-from aaredaqlib.models import DAQStatusModel, BeamlineStateEnum
-from aaregui.panels.scan_settings_panel import ScanSettingsPanel
-from aaregui.scan_logic.raster_grid_manager import RasterGridManager, RasterGridMetric
-from aaregui.widgets.number_line_edit import NumberLineEdit, CheckedLineEdit
-from aaregui.widgets.raster_grid_table import RasterGridTable
-from aaredaqlib.logger_config import setup_logger
+from aare.common.diffraction_geometry import DiffractionGeometry
+from aare.common.models import DAQStatusModel, BeamlineStateEnum
+from aare.gui.panels import ScanSettingsPanel
+from aare.gui.scan_logic import RasterGridManager, RasterGridMetric
+from aare.gui.widgets import CheckedLineEdit
+from aare.gui.widgets.raster_grid_table import RasterGridTable
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/panels/reference_tools_panel.py

@@ -1,7 +1,7 @@
 # reference_tools_panel.py
-from typing import Callable, List, Dict, Optional
+from typing import Optional
 
-from PySide6.QtCore import Qt, QAbstractTableModel, QModelIndex, QTimer, Slot, Signal
+from PySide6.QtCore import Qt, QAbstractTableModel, QModelIndex, Slot, Signal
 from PySide6.QtGui import QBrush, QColor
 from PySide6.QtWidgets import (
     QFrame,
@@ -14,9 +14,9 @@ from PySide6.QtWidgets import (
     QAbstractItemView,
 )
 
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import SampleShortInfoList, SampleShortInfo, BeamlineStateEnum, DAQStatusModel
-from aaregui.widgets.title_label import TitleLabel
+from aare.common.logger_config import setup_logger
+from aare.common.models import SampleShortInfoList, SampleShortInfo, DAQStatusModel
+from aare.gui.widgets.title_label import TitleLabel
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/panels/rotation_data_collection.py

@@ -3,12 +3,12 @@ from pathlib import Path
 from PySide6.QtCore import Slot, Signal, Qt
 from PySide6.QtWidgets import QLabel, QComboBox, QPushButton, QMessageBox
 
-from aaredaqlib.diffraction_geometry import DiffractionGeometry
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import DAQStatusModel, BeamlineStateEnum
-from aaredaqlib.rotation_scan import RotationScanRequest
-from aaregui.panels.scan_settings_panel import ScanSettingsPanel
-from aaregui.widgets.number_line_edit import NumberLineEdit, CheckedLineEdit
+from aare.common.diffraction_geometry import DiffractionGeometry
+from aare.common.logger_config import setup_logger
+from aare.common.models import DAQStatusModel, BeamlineStateEnum
+from aare.common.rotation_scan import RotationScanRequest
+from aare.gui.panels import ScanSettingsPanel
+from aare.gui.widgets import NumberLineEdit, CheckedLineEdit
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/panels/samcam_panel.py

@@ -1,8 +1,8 @@
-from PySide6.QtWidgets import QWidget, QSpinBox, QVBoxLayout, QHBoxLayout, QLabel, QDoubleSpinBox, QCheckBox
+from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel, QDoubleSpinBox, QCheckBox
 from PySide6.QtCore import Signal, Slot
 
-from aaredaqlib.models import SampleCameraSettings, DAQStatusModel
-from aaregui.widgets.title_label import TitleLabel
+from aare.common.models import SampleCameraSettings, DAQStatusModel
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class SamcamPanel(QWidget):

src/aare/gui/panels/sample_queue_panel.py

@@ -2,15 +2,15 @@ from PySide6.QtCore import Signal, Slot, Qt, QTimer
 from PySide6.QtWidgets import QFrame, QVBoxLayout, QHBoxLayout, QPushButton, QHeaderView, QSizePolicy, \
     QTableView, QMessageBox
 from PySide6.QtGui import QKeySequence, QShortcut
-from aaredaqlib.models import SampleShortInfoList, SampleShortInfo, BeamlineStateEnum
+from aare.common.models import SampleShortInfoList, SampleShortInfo, BeamlineStateEnum
 
-from aaregui.models.sample_queue_model import SampleQueueSpreadsheet
-from aaregui.widgets.message_box import ring_current_low_check, experiment_hutch_shutter_check, LOW_CURRENT_THRESHOLD, \
+from aare.gui.models import SampleQueueSpreadsheet
+from aare.gui.widgets.message_box import ring_current_low_check, experiment_hutch_shutter_check, LOW_CURRENT_THRESHOLD, \
     ring_current_auto_check
-from aaregui.widgets.title_label import TitleLabel
-from aaredaqlib.models import DAQStatusModel
+from aare.gui.widgets.title_label import TitleLabel
+from aare.common.models import DAQStatusModel
 
-from aaredaqlib.logger_config import setup_logger
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/panels/scan_settings_panel.py

@@ -1,11 +1,11 @@
 from PySide6.QtCore import Slot, Signal
-from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QFrame, QPushButton, QMessageBox
+from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton
 
-from aaredaqlib.diffraction_geometry import DiffractionGeometry
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import DAQStatusModel
-from aaregui.widgets.message_box import ring_current_low_check, experiment_hutch_shutter_check
-from aaregui.widgets.number_line_edit import NumberLineEdit, CheckedLineEdit
+from aare.common.diffraction_geometry import DiffractionGeometry
+from aare.common.logger_config import setup_logger
+from aare.common.models import DAQStatusModel
+from aare.gui.widgets.message_box import ring_current_low_check, experiment_hutch_shutter_check
+from aare.gui.widgets import CheckedLineEdit
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/panels/smargon_panel.py

@@ -1,12 +1,12 @@
 from PySide6.QtCore import Signal, Slot
 from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton
 
-from aaredaqlib.models import DAQStatusModel
-from aaregui.widgets.button_with_payload import ButtonWithPayload
-from aaregui.widgets.number_line_edit import NumberLineEdit
-from aaregui.widgets.title_label import TitleLabel
-from aaredaqlib.coordinate import SmargonCoordinate, Coordinate
-from aaredaqlib.sample_geometry import SampleGeometryModel
+from aare.common.models import DAQStatusModel
+from aare.gui.widgets import ButtonWithPayload
+from aare.gui.widgets import NumberLineEdit
+from aare.gui.widgets.title_label import TitleLabel
+from aare.common.coordinate import SmargonCoordinate, Coordinate
+from aare.common.sample_geometry import SampleGeometryModel
 
 
 class SmargonMoveWidget(QWidget):

src/aare/gui/panels/smart_rotation_panel.py

@@ -1,13 +1,13 @@
 import math
 
 from PySide6.QtCore import Slot, Qt, Signal
-from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QFrame, QPushButton, QSpacerItem, QSizePolicy
+from PySide6.QtWidgets import QWidget, QGridLayout, QLabel, QPushButton, QSpacerItem, QSizePolicy
 
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import DAQStatusModel, SimpleScanParameters, CrystalSize
-from aaredaqlib.rotation_scan import RotationScanRequest
-from aaregui.panels.rotation_data_collection import add_data_to_path
-from aaregui.widgets.number_line_edit import NumberLineEdit
+from aare.common.logger_config import setup_logger
+from aare.common.models import DAQStatusModel, SimpleScanParameters, CrystalSize
+from aare.common.rotation_scan import RotationScanRequest
+from aare.gui.panels.rotation_data_collection import add_data_to_path
+from aare.gui.widgets import NumberLineEdit
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/panels/status_panel.py

@@ -1,11 +1,11 @@
 from PySide6.QtCore import Qt, Slot
 from PySide6.QtGui import QPixmap
 from PySide6.QtWidgets import QFrame, QGridLayout, QLabel, QSpacerItem, QSizePolicy
-from aaredaqlib.models import DAQStatusModel
-from aaredaqlib.sample_geometry import SampleGeometryModel
+from aare.common.models import DAQStatusModel
+from aare.common.sample_geometry import SampleGeometryModel
 
-from aaregui.widgets.status_label import StatusLabel
-from aaregui.widgets.title_label import TitleLabel
+from aare.gui.widgets.status_label import StatusLabel
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class StatusPanel(QFrame):

src/aare/gui/panels/tell_sample_panel.py

@@ -10,11 +10,11 @@ from PySide6.QtWidgets import (
     QAbstractItemView,
 )
 
-from aaredaqlib.logger_config import setup_logger
-from aaredaqlib.models import BeamlineStateEnum, SampleShortInfo, SampleShortInfoList, DAQStatusModel
+from aare.common.logger_config import setup_logger
+from aare.common.models import BeamlineStateEnum, SampleShortInfo, SampleShortInfoList, DAQStatusModel
 
-from aaregui.models.user_sample_model import UserSampleSpreadsheet
-from aaregui.widgets.title_label import TitleLabel
+from aare.gui.models.user_sample_model import UserSampleSpreadsheet
+from aare.gui.widgets.title_label import TitleLabel
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/panels/zoom_panel.py

@@ -1,9 +1,9 @@
 from PySide6.QtCore import Slot, Signal
 from PySide6.QtWidgets import QWidget, QGridLayout
 
-from aaredaqlib.models import DAQStatusModel
-from aaregui.widgets.button_with_payload import ButtonWithPayload
-from aaregui.widgets.title_label import TitleLabel
+from aare.common.models import DAQStatusModel
+from aare.gui.widgets import ButtonWithPayload
+from aare.gui.widgets.title_label import TitleLabel
 
 
 class ZoomPanel(QWidget):

src/aare/gui/scan_logic/raster_grid_manager.py

@@ -1,4 +1,3 @@
-import copy
 import math
 from enum import Enum
 
@@ -7,12 +6,12 @@ from PySide6.QtGui import QPainter, QPen, QColor, QBrush
 from PySide6.QtCore import Qt, QRect
 from typing import List, Tuple
 
-from aaredaqlib.coordinate import Coordinate, SmargonCoordinate
-from aaredaqlib.models import DAQStatusModel
-from aaredaqlib.raster_grid import RasterGridRequest, CompletedRasterGrid, CompletedRasterGridElem
-from aaredaqlib.sample_geometry import SampleGeometryModel
+from aare.common.coordinate import Coordinate, SmargonCoordinate
+from aare.common.models import DAQStatusModel
+from aare.common.raster_grid import RasterGridRequest, CompletedRasterGrid, CompletedRasterGridElem
+from aare.common.sample_geometry import SampleGeometryModel
 
-from aaredaqlib.logger_config import setup_logger
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/scan_logic/rotation_scan_manager.py

@@ -1,6 +1,6 @@
 from PySide6.QtCore import QObject, Signal, Slot
 
-from aaredaqlib.rotation_scan import CompletedRotationScan
+from aare.common.rotation_scan import CompletedRotationScan
 
 
 class RotationScanManager(QObject):

src/aare/gui/scan_logic/sample_mount_logic.py

@@ -1,6 +1,6 @@
 from PySide6.QtCore import QObject, Slot, Signal
 
-from aaredaqlib.models import DAQStatusModel, SampleShortInfo
+from aare.common.models import DAQStatusModel, SampleShortInfo
 
 
 class SampleMountLogic(QObject):

src/aare/gui/threads/daq_worker.py

@@ -7,13 +7,13 @@ from PySide6.QtCore import Signal, QUrl, Slot, QTimer, QObject, QByteArray
 from PySide6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 from jfjoch_client import ScanResult, ScanResultImagesInner
 
-from aaredaqlib.coordinate import SmargonCoordinate, Coordinate
-from aaredaqlib.models import DAQStatusModel, SampleShortInfoList, SampleShortInfo, SampleCameraSettings, \
+from aare.common.coordinate import SmargonCoordinate, Coordinate
+from aare.common.models import DAQStatusModel, SampleShortInfoList, SampleShortInfo, SampleCameraSettings, \
     AutofocusSettings, SimpleScanParameters, FluorescenceSpectrumParameterModel, FluorescenceSpectrumOutputModel
-from aaredaqlib.raster_grid import RasterGridRequest, CompletedRasterGrid
-from aaredaqlib.rotation_scan import RotationScanRequest, CompletedRotationScan
+from aare.common.raster_grid import RasterGridRequest, CompletedRasterGrid
+from aare.common.rotation_scan import RotationScanRequest, CompletedRotationScan
 
-from aaredaqlib.logger_config import setup_logger
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/threads/sse_client.py

@@ -1,7 +1,5 @@
 from PySide6.QtCore import QObject, Signal, Slot
 
-from aaredaqlib.models import SampleShortInfoList
-
 
 class SSEClient(QObject):
     # Signals

src/aare/gui/widgets/camera_image.py

@@ -22,13 +22,13 @@ from PySide6.QtWidgets import (
     QFrame,
 )
 
-from aaredaqlib.models import DAQStatusModel, AutofocusSettings, SampleCameraSettings, BeamlineStateEnum, \
+from aare.common.models import DAQStatusModel, AutofocusSettings, SampleCameraSettings, BeamlineStateEnum, \
     SessionsStateEnum
-from aaregui.models.bookmark import SmargonBookmarkList
-from aaredaqlib.coordinate import Coordinate, SmargonCoordinate
-from aaredaqlib.sample_geometry import SampleGeometryModel
-from aaregui.scan_logic.raster_grid_manager import RasterGridManager
-from aaredaqlib.logger_config import setup_logger
+from aare.gui.models.bookmark import SmargonBookmarkList
+from aare.common.coordinate import Coordinate, SmargonCoordinate
+from aare.common.sample_geometry import SampleGeometryModel
+from aare.gui.scan_logic import RasterGridManager
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/widgets/login.py

@@ -8,7 +8,7 @@ from PySide6.QtWidgets import (
     QDialog, QVBoxLayout, QLineEdit, QPushButton, QLabel, QHBoxLayout
 )
 
-from aaredaqlib.models import TokenData
+from aare.common.models import TokenData
 
 
 class LoginDialog(QDialog):

src/aare/gui/widgets/message_box.py

@@ -1,6 +1,6 @@
 from PySide6.QtCore import QTimer, QEventLoop
 from PySide6.QtWidgets import QMessageBox
-from aaredaqlib.logger_config import setup_logger
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareGUI")
 

src/aare/gui/widgets/raster_grid_table.py

@@ -1,8 +1,7 @@
 from PySide6.QtCore import Signal, Slot
 from PySide6.QtWidgets import QTableWidget, QHeaderView, QTableWidgetItem, QWidget, QHBoxLayout, QPushButton
 
-from aaredaqlib.raster_grid import RasterGridRequest
-from aaregui.scan_logic.raster_grid_manager import RasterGridManager
+from aare.gui.scan_logic import RasterGridManager
 
 
 class RasterGridTable(QTableWidget):

src/aare/gui/widgets/status_bar.py

@@ -1,13 +1,13 @@
 from PySide6.QtCore import Signal, Slot, QPoint, QTimer
 from PySide6.QtGui import QFont
-from PySide6.QtWidgets import QStatusBar, QDialog, QMenu, QLabel, QMessageBox
+from PySide6.QtWidgets import QStatusBar, QDialog, QMenu, QMessageBox
 
-from aaredaqlib.models import TokenData, BeamlineStateEnum, DAQStatusModel, SessionsStateEnum
-from aaregui.widgets.clickable_label import ClickableLabel
-from aaregui.widgets.pgroup_dialog import PGroupDialog
-from aaregui.widgets.value_label import ValueLabel
+from aare.common.models import TokenData, BeamlineStateEnum, DAQStatusModel, SessionsStateEnum
+from aare.gui.widgets.clickable_label import ClickableLabel
+from aare.gui.widgets.pgroup_dialog import PGroupDialog
+from aare.gui.widgets.value_label import ValueLabel
 
-from aaredaqlib.logger_config import setup_logger
+from aare.common.logger_config import setup_logger
 
 logger = setup_logger("aareGUI")