renommé base.py en device_controller.py (plus clair)

Etienne Pallier
1 parent ee42fd67
Showing 15 changed files with 22 additions and 447 deletions Show diff stats
src/core/pyros_django/agent/AgentDevice.py
src/core/pyros_django/common/models.py
src/core/pyros_django/common/models_ORIG.py
src/core/pyros_django/majordome/doc/AgentMajordome_object_diag.pu
src/device_controller/abstract_component/detector_sensor.py
src/device_controller/abstract_component/detector_shutter.py
src/device_controller/abstract_component/base.py -> src/device_controller/abstract_component/device_controller.py
src/device_controller/abstract_component/filter_selector.py
src/device_controller/abstract_component/telescope.py
src/device_controller/concrete_component/gemini/client_telescope_gemini_controller_run.py
src/device_controller/concrete_component/gemini/gemini_telescope_controller.py
src/device_controller/concrete_component/sbig/sbig_controller.py
src/device_controller/concrete_component/sbig/sbig_detector_sensor_controller.py
src/device_controller/concrete_component/sbig/sbig_detector_shutter_controller.py
src/device_controller/concrete_component/sbig/sbig_filter_selector_controller.py
@@ -13,7 +13,7 @@ from common.models import AgentDeviceStatus, Command, get_or_create_unique_row_f
  
  
 sys.path.append("../../..")
-from device_controller.abstract_component.base import DeviceControllerAbstract
+from device_controller.abstract_component.device_controller import DeviceControllerAbstract
  
 ##log = L.setupLogger("AgentXTaskLogger", "AgentX")
  
@@ -13,7 +13,7 @@ from model_utils import Choices
 # DeviceCommand is used by class Command
 import sys
 sys.path.append("../../..")
-from src.device_controller.abstract_component.base import DeviceCommand
+from src.device_controller.abstract_component.device_controller import DeviceCommand
  
 ''' 
 NOT USED - to be removed
@@ -1,425 +0,0 @@
-# This is an auto-generated Django model module.
-# You'll have to do the following manually to clean this up:
-#   * Rearrange models' order
-#   * Make sure each model has one field with primary_key=True
-#   * Make sure each ForeignKey has `on_delete` set to the desired behavior.
-#   * Remove `managed = False` lines if you wish to allow Django to create, modify, and delete the table
-# Feel free to rename the models, but don't rename db_table values or
-# field names.
-from __future__ import unicode_literals
-
-from django.db import models
-
-
-class Album(models.Model):
-    sequence = models.ForeignKey('Sequence', models.DO_NOTHING)
-    detector = models.ForeignKey('Detector', models.DO_NOTHING)
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True)
-    updated = models.DateTimeField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'album'
-
-
-class Alert(models.Model):
-    request = models.ForeignKey('Request', models.DO_NOTHING)
-    strategyobs = models.ForeignKey('Strategyobs', models.DO_NOTHING)
-    voevent_xml = models.TextField(blank=True, null=True)
-    type = models.CharField(max_length=45, blank=True, null=True)
-    client = models.CharField(max_length=45, blank=True, null=True)
-    burst_jd = models.CharField(max_length=45, blank=True, null=True)
-    burst_ra = models.CharField(max_length=45, blank=True, null=True)
-    burst_dec = models.CharField(max_length=45, blank=True, null=True)
-    equinox = models.CharField(max_length=45, blank=True, null=True)
-    jd_pkt = models.IntegerField(blank=True, null=True)
-    jd_send = models.IntegerField(blank=True, null=True)
-    jd_received = models.IntegerField(blank=True, null=True)
-    trigger_instrum = models.CharField(max_length=45, blank=True, null=True)
-    trigger_num = models.CharField(max_length=45, blank=True, null=True)
-    grb_error = models.CharField(max_length=45, blank=True, null=True)
-    def_not_grb = models.IntegerField(blank=True, null=True)
-    editor = models.CharField(max_length=45, blank=True, null=True)
-    flag = models.CharField(max_length=45, blank=True, null=True)
-    idgcn_notice = models.IntegerField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'alert'
-
-
-class Country(models.Model):
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    quota = models.FloatField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'country'
-
-
-class Detector(models.Model):
-    device = models.ForeignKey('Device', models.DO_NOTHING)
-    telescope = models.ForeignKey('Telescope', models.DO_NOTHING)
-    status = models.CharField(max_length=7, blank=True, null=True)
-    nb_photo_x = models.IntegerField(blank=True, null=True)
-    nb_photo_y = models.IntegerField(blank=True, null=True)
-    photo_size_x = models.IntegerField(blank=True, null=True)
-    photo_size_y = models.IntegerField(blank=True, null=True)
-    has_shutter = models.IntegerField(blank=True, null=True)
-    equivalent_foc_len = models.CharField(max_length=45, blank=True, null=True)
-    acq_start = models.DateTimeField(blank=True, null=True)
-    acq_stop = models.DateTimeField(blank=True, null=True)
-    check_temp = models.FloatField(blank=True, null=True)
-    gain = models.FloatField(blank=True, null=True)
-    readout_noise = models.FloatField(blank=True, null=True)
-    readout_time = models.FloatField(blank=True, null=True)
-    idcam_readout_mode = models.IntegerField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'detector'
-
-
-class Device(models.Model):
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True)
-    updated = models.DateTimeField(blank=True, null=True)
-    is_online = models.IntegerField(blank=True, null=True)
-    status = models.CharField(max_length=11, blank=True, null=True)
-    maintenance_date = models.DateTimeField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'device'
-
-
-class Filter(models.Model):
-    device = models.ForeignKey(Device, models.DO_NOTHING)
-    detector = models.ForeignKey(Detector, models.DO_NOTHING)
-    category = models.CharField(max_length=1, blank=True, null=True)
-    transmission_curve_doc = models.CharField(
-        max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'filter'
-
-
-class Image(models.Model):
-    plan = models.ForeignKey('Plan', models.DO_NOTHING)
-    nrtanalysis = models.ForeignKey(
-        'Nrtanalysis', models.DO_NOTHING, blank=True, null=True)
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True)
-    updated = models.DateTimeField(blank=True, null=True)
-    date_from_gps = models.CharField(max_length=45, blank=True, null=True)
-    level = models.IntegerField(blank=True, null=True)
-    type = models.CharField(max_length=5, blank=True, null=True)
-    quality = models.CharField(max_length=45, blank=True, null=True)
-    flaggps = models.CharField(max_length=45, blank=True, null=True)
-    exposure = models.CharField(max_length=45, blank=True, null=True)
-    tempext = models.CharField(max_length=45, blank=True, null=True)
-    pressure = models.CharField(max_length=45, blank=True, null=True)
-    humidext = models.CharField(max_length=45, blank=True, null=True)
-    wind = models.CharField(max_length=45, blank=True, null=True)
-    wind_dir = models.CharField(max_length=45, blank=True, null=True)
-    dwnimg = models.CharField(max_length=45, blank=True, null=True)
-    dwncata = models.CharField(max_length=45, blank=True, null=True)
-    dwn = models.CharField(max_length=45, blank=True, null=True)
-    level0_fits_name = models.CharField(max_length=45, blank=True, null=True)
-    level1a_fits_name = models.CharField(max_length=45, blank=True, null=True)
-    level1b_fits_name = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'image'
-
-
-class Nrtanalysis(models.Model):
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True)
-    updated = models.DateTimeField(blank=True, null=True)
-    analysis = models.TextField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'nrtanalysis'
-
-
-class Plan(models.Model):
-    album = models.ForeignKey(Album, models.DO_NOTHING)
-    filter = models.ForeignKey(Filter, models.DO_NOTHING)
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.CharField(max_length=45, blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True)
-    updated = models.DateTimeField(blank=True, null=True)
-    duration = models.FloatField(blank=True, null=True)
-    position = models.CharField(max_length=45, blank=True, null=True)
-    exposure_time = models.FloatField(blank=True, null=True)
-    nb_images = models.IntegerField(blank=True, null=True)
-    dithering = models.IntegerField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'plan'
-
-
-class Request(models.Model):
-    user = models.ForeignKey('User', models.DO_NOTHING)
-    scientificprogram = models.ForeignKey(
-        'Scientificprogram', models.DO_NOTHING)
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True)
-    updated = models.DateTimeField(blank=True, null=True)
-    is_alert = models.IntegerField(blank=True, null=True)
-    type = models.CharField(max_length=8, blank=True, null=True)
-    status = models.CharField(max_length=10, blank=True, null=True)
-    target_or_theme = models.CharField(max_length=45, blank=True, null=True)
-    priority = models.IntegerField(blank=True, null=True)
-    autodeposit = models.IntegerField(blank=True, null=True)
-    checkpoint = models.CharField(max_length=45, blank=True, null=True)
-    flag = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'request'
-
-
-class Schedule(models.Model):
-    created = models.DateTimeField(blank=True, null=True)
-    day_start = models.DateTimeField(blank=True, null=True)
-    day_stop = models.DateTimeField(blank=True, null=True)
-    flag = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'schedule'
-
-
-class ScheduleHasSequences(models.Model):
-    schedulehistory = models.ForeignKey('Schedulehistory', models.DO_NOTHING)
-    sequence = models.ForeignKey('Sequence', models.DO_NOTHING)
-
-    class Meta:
-        managed = False
-        db_table = 'schedule_has_sequences'
-        unique_together = (('schedulehistory', 'sequence'),)
-
-
-class Schedulehistory(models.Model):
-    created = models.DateTimeField(blank=True, null=True)
-    day_start = models.DateTimeField(blank=True, null=True)
-    day_stop = models.DateTimeField(blank=True, null=True)
-    flag = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'schedulehistory'
-
-
-class Scientificprogram(models.Model):
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    quota = models.FloatField(blank=True, null=True)
-    priority = models.IntegerField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'scientificprogram'
-
-
-class Sequence(models.Model):
-    request = models.ForeignKey(Request, models.DO_NOTHING)
-    sequencetype = models.ForeignKey('Sequencetype', models.DO_NOTHING)
-    schedule = models.ForeignKey(Schedule, models.DO_NOTHING)
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True)
-    updated = models.DateTimeField(blank=True, null=True)
-    is_alert = models.IntegerField(blank=True, null=True)
-    status = models.CharField(max_length=11, blank=True, null=True)
-    duration = models.FloatField(blank=True, null=True)
-    pointing = models.CharField(max_length=45, blank=True, null=True)
-    with_drift = models.IntegerField(blank=True, null=True)
-    priority = models.IntegerField(blank=True, null=True)
-    analysis_method = models.CharField(max_length=45, blank=True, null=True)
-    exec_start = models.DateTimeField()
-    exec_stop = models.DateTimeField(blank=True, null=True)
-    moon_min = models.IntegerField(blank=True, null=True)
-    alt_min = models.IntegerField(blank=True, null=True)
-    type = models.CharField(max_length=6, blank=True, null=True)
-    img_current = models.CharField(max_length=45, blank=True, null=True)
-    img_total = models.CharField(max_length=45, blank=True, null=True)
-    not_obs = models.IntegerField(blank=True, null=True)
-    obsolete = models.IntegerField(blank=True, null=True)
-    processing = models.IntegerField(blank=True, null=True)
-    flag = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'sequence'
-
-
-class Sequencetype(models.Model):
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    priority = models.IntegerField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'sequencetype'
-
-
-class Sitewatch(models.Model):
-    updated = models.DateTimeField(blank=True, null=True)
-    lights = models.CharField(max_length=45, blank=True, null=True)
-    dome = models.CharField(max_length=45, blank=True, null=True)
-    doors = models.CharField(max_length=45, blank=True, null=True)
-    temperature = models.FloatField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'sitewatch'
-
-
-class Sitewatchhistory(models.Model):
-    id = models.IntegerField(primary_key=True)
-
-    class Meta:
-        managed = False
-        db_table = 'sitewatchhistory'
-
-
-class Strategyobs(models.Model):
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    json_file = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'strategyobs'
-
-
-class Telescope(models.Model):
-    device = models.ForeignKey(Device, models.DO_NOTHING)
-    mount_type = models.CharField(max_length=9, blank=True, null=True)
-    diameter = models.FloatField(blank=True, null=True)
-    status = models.CharField(max_length=45, blank=True, null=True)
-    latitude = models.FloatField(blank=True, null=True)
-    longitude = models.FloatField(blank=True, null=True)
-    sens = models.CharField(max_length=1, blank=True, null=True)
-    altitude = models.FloatField(blank=True, null=True)
-    readout_time = models.IntegerField(blank=True, null=True)
-    slew_time = models.IntegerField(blank=True, null=True)
-    slew_dead = models.IntegerField(blank=True, null=True)
-    slew_rate_max = models.FloatField(blank=True, null=True)
-    horizon_type = models.CharField(max_length=45, blank=True, null=True)
-    horizon_def = models.FloatField(blank=True, null=True)
-    lim_dec_max = models.FloatField(blank=True, null=True)
-    lim_dec_min = models.FloatField(blank=True, null=True)
-    lim_ha_rise = models.FloatField(blank=True, null=True)
-    lim_ha_set = models.FloatField(blank=True, null=True)
-    address = models.CharField(max_length=45, blank=True, null=True)
-    night_elev_sun = models.FloatField(blank=True, null=True)
-    mpc_code = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'telescope'
-
-
-class User(models.Model):
-    country = models.ForeignKey(Country, models.DO_NOTHING)
-    userlevel = models.ForeignKey('Userlevel', models.DO_NOTHING)
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True)
-    updated = models.DateTimeField(blank=True, null=True)
-    firstname = models.CharField(max_length=45, blank=True, null=True)
-    email = models.CharField(max_length=45, blank=True, null=True)
-    url = models.CharField(max_length=45, blank=True, null=True)
-    tel1 = models.CharField(max_length=45, blank=True, null=True)
-    tel2 = models.CharField(max_length=45, blank=True, null=True)
-    address = models.CharField(max_length=45, blank=True, null=True)
-    login = models.CharField(max_length=15, blank=True, null=True)
-    # Field renamed because it was a Python reserved word.
-    pass_field = models.CharField(
-        db_column='pass', max_length=45, blank=True, null=True)
-    last_connect = models.DateTimeField(blank=True, null=True)
-    cur_connect = models.DateTimeField(blank=True, null=True)
-    putvalid_beg = models.DateTimeField(blank=True, null=True)
-    putvalid_end = models.DateTimeField(blank=True, null=True)
-    acqvalid_beg = models.CharField(max_length=45, blank=True, null=True)
-    acqvalid_end = models.CharField(max_length=45, blank=True, null=True)
-    quota = models.FloatField(blank=True, null=True)
-    quota_rea = models.FloatField(blank=True, null=True)
-    u_priority = models.IntegerField(blank=True, null=True)
-    p_priority = models.IntegerField(blank=True, null=True)
-    dir_level = models.IntegerField(blank=True, null=True)
-    can_del_void_req = models.IntegerField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'user'
-
-
-class UserHasScientificprograms(models.Model):
-    user = models.ForeignKey(User, models.DO_NOTHING)
-    scientificprogram = models.ForeignKey(Scientificprogram, models.DO_NOTHING)
-
-    class Meta:
-        managed = False
-        db_table = 'user_has_scientificprograms'
-        unique_together = (('user', 'scientificprogram'),)
-
-
-class Userlevel(models.Model):
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    priority = models.IntegerField(blank=True, null=True)
-    quota = models.FloatField(blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'userlevel'
-
-
-class Weatherwatch(models.Model):
-    updated = models.DateTimeField(blank=True, null=True)
-    humid_int = models.FloatField(blank=True, null=True)
-    humid_ext = models.FloatField(blank=True, null=True)
-    wind = models.FloatField(blank=True, null=True)
-    wind_dir = models.CharField(max_length=1, blank=True, null=True)
-    temp_int = models.FloatField(blank=True, null=True)
-    temp_ext = models.FloatField(blank=True, null=True)
-    pressure = models.FloatField(blank=True, null=True)
-    rain = models.FloatField(blank=True, null=True)
-    dwn = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'weatherwatch'
-
-
-class Weatherwatchhistory(models.Model):
-    datetime = models.DateTimeField(blank=True, null=True)
-    humid_int = models.CharField(max_length=45, blank=True, null=True)
-    humid_ext = models.CharField(max_length=45, blank=True, null=True)
-    wind = models.CharField(max_length=45, blank=True, null=True)
-    wind_dir = models.CharField(max_length=45, blank=True, null=True)
-    temp_int = models.CharField(max_length=45, blank=True, null=True)
-    temp_ext = models.CharField(max_length=45, blank=True, null=True)
-    pressure = models.CharField(max_length=45, blank=True, null=True)
-    rain = models.CharField(max_length=45, blank=True, null=True)
-    dwn = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = False
-        db_table = 'weatherwatchhistory'
@@ -89,18 +89,18 @@ ClientChannel &lt;|-- ClientChannelUSB
  
 /' ======= GEMINI controllers (& sim) ======= '/
  
-class AD_TelescopeGemini #lightblue
-AD_TelescopeGemini -u--|> AgentDevice
+class AgentDeviceTelescopeGemini #lightblue
+AgentDeviceTelescopeGemini -u--|> AgentDevice
  
 /' Components (only 1) '/
-AD_Telescope1 -d-> AD_TelescopeGemini :alias of
+AD_Telescope1 -d-> AgentDeviceTelescopeGemini :alias of
  
 class DC_Gemini <<Singleton>> #lightblue
 class DC_MountGemini #lightblue
 class DS_Gemini #lightblue
 /'DC_Mount o-left- DS_Mount'/
  
-AD_TelescopeGemini --> DC_Gemini :use
+AgentDeviceTelescopeGemini --> DC_Gemini :use
 /'DC_Gemini o-left- DS_Gemini'/
  
 /' Controllers '/
@@ -120,13 +120,13 @@ DS_Mount --|&gt; DeviceSimulator
  
 /' ======= SBIG controllers (& sim) ======= '/ 
  
-class AD_SBIG <<Singleton>> #lightgreen
-AD_SBIG -u--|> AgentDevice 
+class AgentDeviceSBIG <<Singleton>> #lightgreen
+AgentDeviceSBIG -u--|> AgentDevice 
  
 /' Components (3) '/
-AD_FilterSelector1 --> AD_SBIG :alias of
-AD_Shutter1 --> AD_SBIG :alias of
-AD_Sensor1 --> AD_SBIG :alias of
+AD_FilterSelector1 --> AgentDeviceSBIG :alias of
+AD_Shutter1 --> AgentDeviceSBIG :alias of
+AD_Sensor1 --> AgentDeviceSBIG :alias of
  
 class DC_SBIG <<Singleton>> #lightgreen
 class DC_DetectorSensorSBIG #lightgreen
@@ -134,7 +134,7 @@ class DC_DetectorShutterSBIG #lightgreen
 class DC_FilterSelectorSBIG #lightgreen
 class DS_SBIG #lightgreen
  
-AD_SBIG -d-> DC_SBIG :use
+AgentDeviceSBIG -d-> DC_SBIG :use
 /'DC_SBIG o- DS_SBIG'/
  
 /' Controllers '/
@@ -22,7 +22,7 @@ import src.core.celme as celme
 #from device_controller.abstract_component.base import *
 sys.path.append("../..")
 #from device_controller.abstract_component.base import *
-from device_controller.abstract_component.base import DeviceControllerAbstract
+from device_controller.abstract_component.device_controller import DeviceControllerAbstract
  
  
 # Default timeouts
@@ -22,7 +22,7 @@ import src.core.celme as celme
 #from device_controller.abstract_component.base import *
 sys.path.append("../..")
 #from device_controller.abstract_component.base import *
-from device_controller.abstract_component.base import DeviceControllerAbstract
+from device_controller.abstract_component.device_controller import DeviceControllerAbstract
  
  
  
@@ -22,7 +22,7 @@ import src.core.celme as celme
 #from device_controller.abstract_component.base import *
 sys.path.append("../..")
 #from device_controller.abstract_component.base import *
-from device_controller.abstract_component.base import DeviceControllerAbstract
+from device_controller.abstract_component.device_controller import DeviceControllerAbstract
  
  
 # Default timeouts
@@ -28,7 +28,7 @@ import src.core.celme as celme
 #sys.path.append('../..')
 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract
 ##from src_socket.client.socket_client_abstract import *
-from device_controller.abstract_component.base import *
+from device_controller.abstract_component.device_controller import *
  
  
  
@@ -17,7 +17,7 @@ ou (3)
  
  
 sys.path.append("../../..")
-from device_controller.abstract_component.base import DeviceCommand
+from device_controller.abstract_component.device_controller import DeviceCommand
 #from gemini_telescope_controller import DeviceControllerTelescopeGemini
 from device_controller.concrete_component.gemini.gemini_telescope_controller import DeviceControllerTelescopeGemini
  
@@ -15,7 +15,7 @@ import time
  
 # Local application imports
 sys.path.append('../../..')
-from device_controller.abstract_component.base import UnknownCommandException
+from device_controller.abstract_component.device_controller import UnknownCommandException
 #from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, TimeoutException, SocketClientTelescopeAbstract
 ##from src_socket.client.socket_client_telescope_abstract import *
 #from device_controller.abstract_component.telescope_controller_abstract import *
@@ -15,7 +15,7 @@ import time
  
 # Local application imports
 sys.path.append('../../..')
-from device_controller.abstract_component.base import DeviceControllerAbstract, UnknownCommandException
+from device_controller.abstract_component.device_controller import DeviceControllerAbstract, UnknownCommandException
 '''
 from device_controller.abstract_component.detector_sensor import DeviceControllerDetectorSensor
 from device_controller.abstract_component.filter_selector import DeviceControllerFilterSelector
@@ -17,7 +17,7 @@ import time
 sys.path.append('../../..')
 from device_controller.abstract_component.detector_sensor import DeviceControllerDetectorSensor
 # TODO: AVIRER
-from device_controller.abstract_component.base import UnknownCommandException
+from device_controller.abstract_component.device_controller import UnknownCommandException
  
 # Default timeouts
 TIMEOUT_SEND = 10
@@ -17,7 +17,7 @@ import time
 sys.path.append('../../..')
 from device_controller.abstract_component.detector_shutter import DeviceControllerDetectorShutter
 # TODO: AVIRER
-from device_controller.abstract_component.base import UnknownCommandException
+from device_controller.abstract_component.device_controller import UnknownCommandException
  
 # Default timeouts
 TIMEOUT_SEND = 10
@@ -17,7 +17,7 @@ import time
 sys.path.append('../../..')
 from device_controller.abstract_component.filter_selector import DeviceControllerFilterSelector
 # TODO: AVIRER
-from device_controller.abstract_component.base import UnknownCommandException
+from device_controller.abstract_component.device_controller import UnknownCommandException
  
 # Default timeouts
 TIMEOUT_SEND = 10