Model splitting goes on... : common/models.py, routine_manager/models.py, devices/models.py

Etienne Pallier
1 parent 627f618c
Showing 21 changed files with 1327 additions and 439 deletions Show diff stats
privatedev/plugin/agent/AgentImagesCalibrator.py
privatedev/plugin/agent/AgentImagesProcessor.py
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/agent/AgentDevice.py
src/core/pyros_django/api/serializers.py
src/core/pyros_django/api/views.py
src/core/pyros_django/common/admin.py
src/core/pyros_django/common/models.py
src/core/pyros_django/devices/models.py
src/core/pyros_django/pyros/urls.py
src/core/pyros_django/routine_manager/forms.py
src/core/pyros_django/routine_manager/functions.py
src/core/pyros_django/routine_manager/models.py
src/core/pyros_django/routine_manager/urls.py
src/core/pyros_django/routine_manager/validators.py
src/core/pyros_django/routine_manager/views.py
src/core/pyros_django/scheduler/Interval.py
src/core/pyros_django/scheduler/Scheduler.py
src/core/pyros_django/scheduler/UserManager.py
src/core/pyros_django/scheduler/views.py
@@ -0,0 +1,338 @@
+#!/usr/bin/env python3
+#
+# To launch this agent from the root of Pyros:
+# cd /srv/develop/pyros
+# .\PYROS -t start AgentImagesCalibrator -o tnc -fg
+#
+# Edit the file pyros/pyros.py,
+# Add a new entry in the dict AGENT:
+#     "AgentImagesCalibrator": "observation_manager",
+# ---------------------------------------------------
+
+import sys
+import time
+
+import os
+pwd = os.environ['PROJECT_ROOT_PATH']
+if pwd not in sys.path:
+    sys.path.append(pwd)
+
+short_paths = ['src', 'src/core/pyros_django']
+for short_path in short_paths:
+    path = os.path.join(pwd, short_path)
+    if path not in sys.path:
+        sys.path.insert(0, path)
+
+from src.core.pyros_django.agent.Agent import Agent, build_agent, log
+
+# = Specials
+import glob
+import shutil
+import guitastro
+
+class AgentImagesCalibrator(Agent):
+
+    # - All possible running states
+    RUNNING_NOTHING = 0
+    RUNNING_ONE_IMAGE_PROCESSING = 1
+    RUNNING_COMPUTE_RON_GAIN = 2
+
+    # TODO: Redefine valid timeout
+    _AGENT_SPECIFIC_COMMANDS = {
+        # Format : “cmd_name” : (timeout, exec_mode)
+        
+        "do_create_test_images_1" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
+        "do_create_test_images_2" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
+        "do_stop_current_processing" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
+    }
+
+
+    
+
+    # Scenario to be executed
+    # "self do_stop_current_processing"
+    # AgentCmd.CMD_STATUS_CODE.CMD_EXECUTED
+    _TEST_COMMANDS_LIST = [
+        # Format : ("self cmd_name cmd_args", timeout, "expected_result", expected_status),
+        (True, "self do_create_test_images_1", 200, '', Agent.CMD_STATUS.CMD_EXECUTED),
+        (True, "self do_exit", 500, "STOPPING", Agent.CMD_STATUS.CMD_EXECUTED),
+    ]
+
+    """
+    =================================================================
+        Methods running inside main thread
+    =================================================================
+    """
+
+    def __init__(self, name:str=None):
+        if name is None:
+            name = self.__class__.__name__
+        super().__init__()
+
+    def _init(self):
+        super()._init()
+        log.debug("end super init()")
+        log.info(f"self.TEST_MODE = {self.TEST_MODE}")
+
+        # === Get config infos
+        agent_alias = self.name
+        log.info(f"agent_alias = {agent_alias}")
+        # === Get the config object
+        self.config = self._oc['config']
+        # === Get self._path_data_root
+        self._path_data_root = self.config.get_agent_path_data_root(agent_alias)
+        # === Get self._home of current unit
+        self._home = self.config.getHome()
+        # === Get self._paths the directories for all data (images). See obsconfig_class.py to know keys
+        self._paths = self.config.get_agent_path_data_tree(agent_alias, True)
+        # === Get bias strategies
+        unit_name = "TNC"
+        channel_name = "OpticalChannel_up1"
+        category = "BI"
+        self_strategy_bias = self.config.get_image_calibrations(unit_name, channel_name, category)
+        log.debug(f"self_strategy_bias={self_strategy_bias}")
+
+        # === Instanciate an object Ima to make image processing
+        self._ima = guitastro.Ima()
+        home = guitastro.Home(self._home)
+
+        # === Instanciate an object Filenames to manage file names
+        self._filename_manager = guitastro.Filenames()
+        self._filename_manager.naming("PyROS.1")
+
+        # === Set longitude to ima object to generate the night yyyymmdd and subdirectories yyyy/mm/dd
+        longitude = home.longitude
+        log.info(f"Longitude={longitude}")
+        self._ima.longitude(longitude)
+        log.info("Init done with success")
+
+        # === Status of routine processing
+        self._routine_running = self.RUNNING_NOTHING
+        log.debug("end init()")
+
+    # Note : called by _routine_process() in Agent
+    # @override
+    def _routine_process_iter_start_body(self):
+        log.debug("in routine_process_before_body()")
+
+    # Note : called by _routine_process() in Agent
+    # @override
+    def _routine_process_iter_end_body(self):
+        log.debug("in routine_process_after_body()")
+        if self._routine_running == self.RUNNING_NOTHING:
+            # Get files to process
+            fitsfiles = self.glob_images_to_process()
+            n = len(fitsfiles)
+            log.info(f"There are {n} image{self._plural(n)} to process")
+            if n > 0:
+                # - We select the oldest image
+                fitsfile = fitsfiles[0]
+                log.info(f"Process the file {fitsfile}")
+                # - Thread TODO
+                self._routine_running = self.RUNNING_ONE_IMAGE_PROCESSING
+                self.process_one_image(fitsfile)
+
+    """
+    =================================================================
+        Methods of specific commands
+    =================================================================
+    """
+
+    def do_stop_current_processing(self):
+        pass
+
+    def do_create_test_images_1(self):
+        self._create_test_images_1()
+
+    def do_create_test_images_2(self):
+        self._create_test_images_2()
+
+    """
+    =================================================================
+        Methods called by commands or routine. Overload these methods
+    =================================================================
+    """
+
+    def glob_images_to_process(self):
+
+        # - glob the incoming directory:
+        fitsfiles = glob.glob(f"{self._paths['ima_incoming']}/BI_*.fit")
+        # - Please sort list of files in increasing dates (TODO)
+        return fitsfiles
+
+    def bias_correction(self):
+
+        # - Search the bias
+        path_bias = os.path.join( self._paths['ima_bias'], self._date_night )
+        fitsbiasfiles = glob.glob(f"{path_bias}/*.fit")
+        log.info(f"fitsbiasfiles = {fitsbiasfiles}")
+        if len(fitsbiasfiles) > 0:
+
+            # - Select the bias
+            pass
+
+    def dark_correction(self):
+
+        # - Search the dark
+        path_darks = os.path.join( self._paths['ima_darks'], self._date_night )
+        fitsdarkfiles = glob.glob(f"{path_darks}/*.fit")
+        log.info(f"fitsdarkfiles = {fitsdarkfiles}")
+        if len(fitsdarkfiles) > 0:
+
+            # - Select two darks and compute the therm using exposure
+            # - Correction of dark
+            pass
+
+    def flat_correction(self):
+
+        # - Search the flat
+        path_flats = os.path.join( self._paths['ima_flats'], self._date_night )
+        fitsflatfiles = glob.glob(f"{path_flats}/*.fit")
+        log.info(f"fitsflatfiles = {fitsflatfiles}")
+        if len(fitsflatfiles) > 0:
+
+            # - Select the flat (with the filter)
+            # - Correction of flat
+            pass
+
+    def inversion_correction(self):
+        pass
+
+    def cosmetic_correction(self):
+        pass
+
+    def wcs_calibration(self):
+        return 0
+
+    def process_one_image(self, fitsfile: str):
+        """This is the general algorithm of processing
+
+        The processing consists to make corrections of dark, flat, inversions, cosmetic
+        and perform WCS calibration.
+
+        Args:
+            fitsfile: The file of the FITS file to process.
+
+        """
+
+        # - Load file in memory
+        log.info("Load the file in memory")
+        #self.set_infos("Load the file in memory")
+        f = self._ima.genename(self._ima.load(fitsfile))
+        # log.info(f"f={f}")
+
+        # - Save as tmp
+        self._ima.path(self._paths['ima_tmp'])
+        log.info("Save the temporary file as tmp name")
+        self._ima.save("tmp")
+
+        # - Load tmp and get infos
+        self._ima.load("tmp")
+        date_obs = self._ima.getkwd("DATE-OBS")
+        self._date_night = self._ima.get_night(date_obs)
+        log.info(f"Date_obs = {date_obs}")
+        log.info(f"Night = {self._date_night}")
+        exposure = self._ima.getkwd("EXPOSURE")
+        log.info(f"Exposure = {exposure}")
+
+        # - Bias correction
+        self.bias_correction()
+
+        # - Dark correction
+        self.dark_correction()
+
+        # - Flat correction
+        self.flat_correction()
+
+        # - Save tmp corrected by dark and flat
+        self._ima.path(self._paths['ima_tmp'])
+        self._ima.save("tmp")
+
+        # - Inversion of mirrors or mirorxy
+        self.inversion_correction()
+
+        # - Cosmetic correction
+        self.cosmetic_correction()
+
+        # - WCS calibration
+        nmatched = self.wcs_calibration()
+
+        # - Prepare the output file name
+        log.info("Decode the filename")
+        fgen_in = f['genename'] + f['sep'] + f['indexes'][0] + f['suffix']
+        fext_in = f['file_extension']
+        fext_out = ".fits"
+
+        # - Save in processed
+        yyyy = self._date_night[0:4]
+        mm = self._date_night[4:6]
+        dd = self._date_night[6:8]
+        path_processed = os.path.join( self._paths['ima_processed'], yyyy, mm, dd )
+        self._ima.path(path_processed)
+        fname_out = fgen_in + fext_out
+        fname = self._ima.save(fname_out)
+        log.info(f"Save the processed image {fname}")
+
+        # - Delete the file in incoming directory
+        os.remove(fitsfile)
+        log.info(f"Delete the raw image {fitsfile}")
+
+        # - Update the running state
+        self._routine_running = self.RUNNING_NOTHING
+
+        time.sleep(5)
+        print("\n ...End of image calibration\n")
+
+    """
+    =================================================================
+        Internal methods
+    =================================================================
+    """
+
+    def _create_test_images_1(self):
+        try:
+            # === Define an image to test the processing and copy it in incoming directory
+            self._file_ima_test = os.path.join(self._path_data_root,"vendor/guitastro/tests/data/m57.fit")
+            file_in = self._file_ima_test
+            file_out = f"{self._paths['ima_incoming']}/m57.fit"
+            shutil.copyfile(file_in, file_out)
+            self._filename_manager.naming("")
+        except:
+            raise
+
+    def _create_test_images_2(self):
+        try:
+            self._ima.etc.camera("Kepler 4040")
+            self._ima.etc.optics("Takahashi_180ED")
+            self._ima.etc.params("msky",18)
+            ra = 132.84583
+            dec = 11.81333
+            at = self._ima.simulation("GAIA", "PHOTOM", shutter_mode="closed", t=50)
+            file_out = os.path.join(self._paths['ima_tmp'], "m67.ecsv")
+            print(f"STEP TOTO 1 = {at}")
+            at.t.write(file_out, format='astrotable', overwrite=True)
+            print(f"STEP TOTO 2")
+            date_obs = self.getkwd("DATE-OBS")
+        except:
+            raise
+
+    def _plural(self, n: int) -> str:
+        """Return "s" if n>1 for plurals.
+
+        Args:
+            n: Number of entities
+
+        Returns:
+            The string "s" or ""
+        """
+        if n > 1:
+            s = "s"
+        else:
+            s = ""
+        return s
+
+if __name__ == "__main__":
+
+    agent = build_agent(AgentImagesCalibrator)
+    print(agent)
+    agent.run()
@@ -0,0 +1,328 @@
+#!/usr/bin/env python3
+#
+# To launch this agent from the root of Pyros:
+# cd /srv/develop/pyros
+# .\PYROS -t start AgentImagesProcessor -o tnc -fg
+#
+# ---------------------------------------------------
+
+import sys
+import time
+
+import os
+pwd = os.environ['PROJECT_ROOT_PATH']
+if pwd not in sys.path:
+    sys.path.append(pwd)
+
+short_paths = ['src', 'src/core/pyros_django']
+for short_path in short_paths:
+    path = os.path.join(pwd, short_path)
+    if path not in sys.path:
+        sys.path.insert(0, path)
+
+from src.core.pyros_django.agent.Agent import Agent, build_agent, log
+
+# = Specials
+import glob
+import shutil
+import guitastro
+
+class AgentImagesProcessor(Agent):
+
+    # - All possible running states
+    RUNNING_NOTHING = 0
+    RUNNING_ONE_IMAGE_PROCESSING = 1
+    RUNNING_COMPUTE_RON_GAIN = 2
+
+    # TODO: Redefine valid timeout
+    _AGENT_SPECIFIC_COMMANDS = {
+        # Format : “cmd_name” : (timeout, exec_mode)
+        
+        "do_create_test_images_1" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
+        "do_create_test_images_2" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
+        "do_stop_current_processing" : (60, Agent.EXEC_MODE.SEQUENTIAL, ''),
+    }    
+
+    # Scenario to be executed
+    # "self do_stop_current_processing"
+    # AgentCmd.CMD_STATUS_CODE.CMD_EXECUTED
+    _TEST_COMMANDS_LIST = [
+        # Format : ("self cmd_name cmd_args", timeout, "expected_result", expected_status),
+        (True, "self do_create_test_images_1", 200, '', Agent.CMD_STATUS.CMD_EXECUTED),
+        (True, "self do_stop asap", 500, "STOPPING", Agent.CMD_STATUS.CMD_EXECUTED),
+    ]
+
+    """
+    =================================================================
+        Methods running inside main thread
+    =================================================================
+    """
+
+    def __init__(self, name:str=None,simulated_computer=None):
+        if name is None:
+            name = self.__class__.__name__
+        super().__init__(simulated_computer=simulated_computer)
+
+    def _init(self):
+        super()._init()
+        log.debug("end super init()")
+        log.info(f"self.TEST_MODE = {self.TEST_MODE}")
+
+        # === Get config infos
+        agent_alias = self.name
+        log.info(f"agent_alias = {agent_alias}")
+        # === Get the config object
+        self.config = self._oc['config']
+        # === Get self._path_data_root
+        self._path_data_root = self.config.get_agent_path_data_root(agent_alias)
+        # === Get self._home of current unit
+        self._home = self.config.getHome()
+        # === Get self._paths the directories for all data (images). See obsconfig_class.py to know keys
+        self._paths = self.config.get_agent_path_data_tree(agent_alias, True)
+
+        # === Instanciate an object Ima to make image processing
+        self._ima = guitastro.Ima()
+        home = guitastro.Home(self._home)
+
+        # === Instanciate an object Filenames to manage file names
+        self._filename_manager = guitastro.Filenames()
+        self._filename_manager.naming("PyROS.1")
+
+        # === Set longitude to ima object to generate the night yyyymmdd and subdirectories yyyy/mm/dd
+        longitude = home.longitude
+        log.info(f"Longitude={longitude}")
+        self._ima.longitude(longitude)
+        log.info("Init done with success")
+
+        # === Status of routine processing
+        self._routine_running = self.RUNNING_NOTHING
+        log.debug("end init()")
+
+    # Note : called by _routine_process() in Agent
+    # @override
+    def _routine_process_iter_start_body(self):
+        log.debug("in routine_process_before_body()")
+
+    # Note : called by _routine_process() in Agent
+    # @override
+    def _routine_process_iter_end_body(self):
+        log.debug("in routine_process_after_body()")
+        if self._routine_running == self.RUNNING_NOTHING:
+            # Get files to process
+            fitsfiles = self.glob_images_to_process()
+            n = len(fitsfiles)
+            log.info(f"There are {n} image{self._plural(n)} to process")
+            if n > 0:
+                # - We select the oldest image
+                fitsfile = fitsfiles[0]
+                log.info(f"Process the file {fitsfile}")
+                # - Thread TODO
+                self._routine_running = self.RUNNING_ONE_IMAGE_PROCESSING
+                self.process_one_image(fitsfile)
+
+    """
+    =================================================================
+        Methods of specific commands
+    =================================================================
+    """
+
+    def do_stop_current_processing(self):
+        pass
+
+    def do_create_test_images_1(self):
+        self._create_test_images_1()
+
+    def do_create_test_images_2(self):
+        self._create_test_images_2()
+
+    """
+    =================================================================
+        Methods called by commands or routine. Overload these methods
+    =================================================================
+    """
+
+    def glob_images_to_process(self):
+
+        # - glob the incoming directory:
+        fitsfiles = glob.glob(f"{self._paths['ima_incoming']}/*.fit")
+        # - Please sort list of files in increasing dates (TODO)
+        return fitsfiles
+
+    def bias_correction(self):
+
+        # - Search the bias
+        path_bias = os.path.join( self._paths['ima_bias'], self._date_night )
+        fitsbiasfiles = glob.glob(f"{path_bias}/*.fit")
+        log.info(f"fitsbiasfiles = {fitsbiasfiles}")
+        if len(fitsbiasfiles) > 0:
+
+            # - Select the bias
+            pass
+
+    def dark_correction(self):
+
+        # - Search the dark
+        path_darks = os.path.join( self._paths['ima_darks'], self._date_night )
+        fitsdarkfiles = glob.glob(f"{path_darks}/*.fit")
+        log.info(f"fitsdarkfiles = {fitsdarkfiles}")
+        if len(fitsdarkfiles) > 0:
+
+            # - Select two darks and compute the therm using exposure
+            # - Correction of dark
+            pass
+
+    def flat_correction(self):
+
+        # - Search the flat
+        path_flats = os.path.join( self._paths['ima_flats'], self._date_night )
+        fitsflatfiles = glob.glob(f"{path_flats}/*.fit")
+        log.info(f"fitsflatfiles = {fitsflatfiles}")
+        if len(fitsflatfiles) > 0:
+
+            # - Select the flat (with the filter)
+            # - Correction of flat
+            pass
+
+    def inversion_correction(self):
+        pass
+
+    def cosmetic_correction(self):
+        pass
+
+    def wcs_calibration(self):
+        return 0
+
+    def process_one_image(self, fitsfile: str):
+        """This is the general algorithm of processing
+
+        The processing consists to make corrections of dark, flat, inversions, cosmetic
+        and perform WCS calibration.
+
+        Args:
+            fitsfile: The file of the FITS file to process.
+
+        """
+
+        # - Load file in memory
+        log.info("Load the file in memory")
+        #self.set_infos("Load the file in memory")
+        f = self._ima.genename(self._ima.load(fitsfile))
+        # log.info(f"f={f}")
+
+        # - Save as tmp
+        self._ima.path(self._paths['ima_tmp'])
+        log.info("Save the temporary file as tmp name")
+        self._ima.save("tmp")
+
+        # - Load tmp and get infos
+        self._ima.load("tmp")
+        date_obs = self._ima.getkwd("DATE-OBS")
+        self._date_night = self._ima.get_night(date_obs)
+        log.info(f"Date_obs = {date_obs}")
+        log.info(f"Night = {self._date_night}")
+        exposure = self._ima.getkwd("EXPOSURE")
+        log.info(f"Exposure = {exposure}")
+
+        # - Bias correction
+        self.bias_correction()
+
+        # - Dark correction
+        self.dark_correction()
+
+        # - Flat correction
+        self.flat_correction()
+
+        # - Save tmp corrected by dark and flat
+        self._ima.path(self._paths['ima_tmp'])
+        self._ima.save("tmp")
+
+        # - Inversion of mirrors or mirorxy
+        self.inversion_correction()
+
+        # - Cosmetic correction
+        self.cosmetic_correction()
+
+        # - WCS calibration
+        nmatched = self.wcs_calibration()
+
+        # - Prepare the output file name
+        log.info("Decode the filename")
+        fgen_in = f['genename'] + f['sep'] + f['indexes'][0] + f['suffix']
+        fext_in = f['file_extension']
+        fext_out = ".fits"
+
+        # - Save in processed
+        yyyy = self._date_night[0:4]
+        mm = self._date_night[4:6]
+        dd = self._date_night[6:8]
+        path_processed = os.path.join( self._paths['ima_processed'], yyyy, mm, dd )
+        self._ima.path(path_processed)
+        fname_out = fgen_in + fext_out
+        fname = self._ima.save(fname_out)
+        log.info(f"Save the processed image {fname}")
+
+        # - Delete the file in incoming directory
+        os.remove(fitsfile)
+        log.info(f"Delete the raw image {fitsfile}")
+
+        # - Update the running state
+        self._routine_running = self.RUNNING_NOTHING
+
+        time.sleep(5)
+        print("\n ...End of image calibration\n")
+
+    """
+    =================================================================
+        Internal methods
+    =================================================================
+    """
+
+    def _create_test_images_1(self):
+        try:
+            # === Define an image to test the processing and copy it in incoming directory
+            self._file_ima_test = os.path.join(self._path_data_root,"vendor/guitastro/tests/data/m57.fit")
+            file_in = self._file_ima_test
+            file_out = f"{self._paths['ima_incoming']}/m57.fit"
+            shutil.copyfile(file_in, file_out)
+            self._filename_manager.naming("")
+        except:
+            raise
+
+    def _create_test_images_2(self):
+        try:
+            self._ima.etc.camera("Kepler 4040")
+            self._ima.etc.optics("Takahashi_180ED")
+            self._ima.etc.params("msky",18)
+            ra = 132.84583
+            dec = 11.81333
+            at = self._ima.simulation("GAIA", "PHOTOM", shutter_mode="closed", t=50, ra=ra, dec=dec)
+            file_out = os.path.join(self._paths['ima_tmp'], "m67.ecsv")
+            print(f"STEP TOTO 1 = {at}")
+            at.t.write(file_out, format='astrotable', overwrite=True)
+            print(f"STEP TOTO 2")
+            date_obs = self.getkwd("DATE-OBS")
+        except:
+            raise
+
+    def _plural(self, n: int) -> str:
+        """Return "s" if n>1 for plurals.
+
+        Args:
+            n: Number of entities
+
+        Returns:
+            The string "s" or ""
+        """
+        if n > 1:
+            s = "s"
+        else:
+            s = ""
+        return s
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='Start the agent.')
+    parser.add_argument("--computer",dest="computer",help='Launch agent with simulated computer hostname',action="store")
+    args = vars(parser.parse_args())
+    agent = build_agent(AgentImagesProcessor,param_constr=args)
+    print(agent)
+    agent.run()
@@ -384,8 +384,9 @@ class Agent:
     #
     #_TEST_COMMANDS_LIST: List[ Tuple[ bool, str, int, Union[str,None], Union[int,None] ] ] = [
     ##_TEST_COMMANDS_LIST: List[ Tuple[ bool, str, int, Optional[str], AgentCmd.CMD_STATUS_CODES ] ] = [
+    
+    # Alias type for _TEST_COMMANDS_LIST (for more readability)
     TestCommand = Tuple[ bool, str, Optional[int], Optional[str], Optional[int]]
-    #_TEST_COMMANDS_LIST: List[ Tuple[ bool, str, Optional[int], Optional[str], Optional[int]] ] = [
     _TEST_COMMANDS_LIST: List[ TestCommand ] = [
         # Format : (DO_IT, "self cmd_name cmd_args", validity, "expected_result", expected_status),
  
@@ -29,33 +29,6 @@ from device_controller.abstract_component.device_controller import (
  
  
  
-"""
-=================================================================
-    class StoppableThread
-=================================================================
-"""
-class StoppableThreadEvenWhenSleeping(threading.Thread):
-    # Thread class with a stop() method. The thread itself has to check
-    # regularly for the stopped() condition.
-    # It stops even if sleeping
-    # See https://python.developpez.com/faq/?page=Thread#ThreadKill
-    # See also https://www.oreilly.com/library/view/python-cookbook/0596001673/ch06s03.html
-
-    def __init__(self, *args, **kwargs):
-        #super(StoppableThreadSimple, self).__init__(*args, **kwargs)
-        super().__init__(*args, **kwargs)
-        self._stop_event = threading.Event()
-
-    #def stop(self):
-    def terminate(self):
-        self._stop_event.set()
-
-    def stopped(self):
-        return self._stop_event.is_set()
-
-    def wait(self, nbsec:float=2.0):
-        self._stop_event.wait(nbsec)
-
  
  
 class AgentDevice(Agent):
-from common.models import AgentSurvey, Institute, Period, PyrosUser, SP_Period, ScienceTheme, ScientificProgram, Sequence, Plan, Album, AgentCmd
+from common.models import AgentSurvey, Institute, Period, PyrosUser, SP_Period, ScienceTheme, ScientificProgram, AgentCmd
+from routine_manager.models import Sequence, Plan, Album
 from rest_framework import serializers
 import datetime
 from datetime import timezone
@@ -7,7 +7,10 @@ from rest_framework.decorators import api_view, permission_classes, action
 from django.core.validators import ValidationError
 from src.core.pyros_django.user_manager import views as user_views
 from api.serializers import AgentSurveySerializer, AlbumSerializer, FullSequenceSerializer, PlanSerializer, SPPeriodSerializer, ScientificProgramSerializer, SequenceSerializer, UserSerializer, AgentCmdSerializer
-from common.models import PyrosUser, SP_Period, ScientificProgram, Sequence, Album, Plan, UserLevel, SP_Period_User, AgentSurvey, AgentCmd
+
+from common.models import PyrosUser, SP_Period, ScientificProgram, UserLevel, SP_Period_User, AgentSurvey, AgentCmd
+from routine_manager.models import Sequence, Album, Plan
+
 from routine_manager.functions import check_sequence_file_validity
 from rest_framework.request import Request
 from django.db.models import Q
@@ -5,10 +5,12 @@ from django.contrib.auth.models import User
 # EP
 from django.conf import settings
  
+from common.models import ScientificProgram
 from common.models import *
  
-# Necessary since new device/models.py file
+# Other app*/models.py files
 from devices.models import Detector, Filter, AgentDeviceStatus, FilterWheel, Telescope, PlcDevice, PlcDeviceStatus
+from routine_manager.models import Image, StrategyObs, Schedule, Request, Alert, Sequence, Album, Plan, NrtAnalysis, ScheduleHasSequences
  
  
 # EP added
@@ -172,9 +172,11 @@ def printd(*args, **kwargs):
     if os.environ.get('PYROS_DEBUG', '0') == '1':
         print('(MODEL)', *args, **kwargs)
  
+'''
 def get_or_create_unique_row_from_model(model: models.Model):
     # return model.objects.get(id=1) if model.objects.exists() else model.objects.create(id=1)
     return model.objects.first() if model.objects.exists() else model.objects.create(id=1)
+'''
  
  
  
@@ -186,85 +188,12 @@ def get_or_create_unique_row_from_model(model: models.Model):
 ------------------------
 """
  
-class Request(models.Model):
-    pyros_user = models.ForeignKey(
-        'PyrosUser', on_delete=models.DO_NOTHING, related_name="requests")
-    scientific_program = models.ForeignKey(
-        'ScientificProgram', on_delete=models.DO_NOTHING, related_name="requests", 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, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-    is_alert = models.BooleanField(default=False)
-    target_type = models.CharField(max_length=8, blank=True, null=True)
-    status = models.CharField(max_length=10, blank=True, null=True)
-    autodeposit = models.BooleanField(default=False)
-    checkpoint = models.CharField(max_length=45, blank=True, null=True)
-    flag = models.CharField(max_length=45, blank=True, null=True)
-    complete = models.BooleanField(default=False)
-    submitted = models.BooleanField(default=False)
-
-    class Meta:
-        managed = True
-        db_table = 'request'
-
-    def __str__(self):
-        return (str(self.name))
-
-
 """
 ------------------------
    OTHER MODEL CLASSES
 ------------------------
 """
  
-
-
-# TODO: A mettre dans device/models.py ?
-class Image(models.Model):
-    plan = models.ForeignKey(
-        'Plan', on_delete=models.CASCADE, related_name="images")
-    nrtanalysis = models.ForeignKey(
-        'NrtAnalysis', models.DO_NOTHING, blank=True, null=True, related_name="images")
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=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 = True
-        db_table = 'image'
-
-    def __str__(self):
-        return (str(self.name))
-
-
-
-
-
-
-
-
-
-
-
 class AgentLogs(models.Model):
     created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
     name = models.CharField(max_length=50)
@@ -352,61 +281,6 @@ class AgentSurvey(models.Model):
     def is_stopping_or_restarting(self): return self.is_stopping() or self.is_restarting()
  
  
-class Album(models.Model):
-    sequence = models.ForeignKey(
-        'Sequence', on_delete=models.CASCADE, related_name="albums")
-    # detector = models.ForeignKey(
-    #     'Detector', models.DO_NOTHING, related_name="albums", blank=True, null=True)
-    #name_of_channel = models.CharField(blank=True,null=True,max_length=150)
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-    complete = models.BooleanField(default=False)
-
-    class Meta:
-        managed = True
-        db_table = 'album'
-        #verbose_name_plural = "Albums"
-
-    def __str__(self):
-        return (str(self.name))
-
-
-class Alert(Request):
-    request = models.OneToOneField(
-        'Request', on_delete=models.CASCADE, default='', parent_link=True)
-    strategyobs = models.ForeignKey(
-        'StrategyObs', models.DO_NOTHING, related_name="alerts", blank=True, null=True)
-    voevent_file = models.CharField(max_length=45, blank=True, null=True)
-    author = models.CharField(max_length=45, blank=True, null=True)
-    burst_jd = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    burst_ra = models.FloatField(max_length=45, blank=True, null=True)
-    burst_dec = models.FloatField(max_length=45, blank=True, null=True)
-    astro_coord_system = models.CharField(max_length=45, blank=True, null=True)
-    jd_send = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    jd_received = models.DecimalField(
-        max_digits=15, decimal_places=8, blank=True, null=True)
-    trig_id = models.IntegerField(blank=True, null=True)
-    error_radius = models.FloatField(max_length=45, blank=True, null=True)
-    defly_not_grb = models.BooleanField(default=False)
-    editor = models.CharField(max_length=45, blank=True, null=True)
-    soln_status = models.CharField(max_length=45, blank=True, null=True)
-    pkt_ser_num = models.IntegerField(blank=True, null=True)
-
-    class Meta:
-        managed = True
-        db_table = 'alert'
-
-    def __str__(self):
-        return str(self.trig_id)
-
-    def request_name(self):
-        return self.__str__()
-
-    request_name.short_description = "Name"
  
  
 class AgentCmd(models.Model):
@@ -1352,63 +1226,6 @@ class Log(models.Model):
         return (str(self.agent))
  
  
-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, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-    analysis = models.TextField(blank=True, null=True)
-
-    class Meta:
-        managed = True
-        db_table = 'nrtanalysis'
-        verbose_name_plural = "Nrt analyzes"
-
-    def __str__(self):
-        return (str(self.name))
-
-
-"""
-class Plan(models.Model):
-    album = models.ForeignKey(Album, on_delete=models.CASCADE, related_name="plans")
-    filter = models.ForeignKey(Filter, models.DO_NOTHING, related_name="plans", blank=True, null=True)
-    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, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-    duration = models.FloatField(default=0, 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.BooleanField(default=False)
-    complete = models.BooleanField(default=False)
-
-    class Meta:
-        managed = True
-        db_table = 'plan'
-
-    def __str__(self):
-        return (str(self.name))
-"""
-
-
-class Plan(models.Model):
-    album = models.ForeignKey(
-        Album, on_delete=models.CASCADE, related_name="plans")
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-    duration = models.FloatField(default=0, blank=True, null=True)
-    nb_images = models.PositiveIntegerField(
-        blank=True, null=True, validators=[MinValueValidator(1)])
-    config_attributes = models.JSONField(blank=True, null=True)
-    complete = models.BooleanField(default=False)
-
-    class Meta:
-        db_table = "plan"
-
-    def __str__(self) -> str:
-        return f"Plan of Album {self.album.name} has {self.nb_images} image(s)"
-
  
 # class Plc(Device):
  #   last_update_status = models.DateTimeField(blank=True, null=True)
@@ -1448,6 +1265,44 @@ class PyrosUserManager(UserManager):
         return PyrosUser.objects.filter(Q(user_level__name="Unit-PI") | Q(user_level__name="Unit-board"))
  
  
+
+
+class ScientificProgramManager(models.Manager):
+    def observable_programs(self):
+        exploitable_sp = []
+
+        for sp_period in SP_Period.objects.all():
+            if sp_period.can_submit_sequence():
+                exploitable_sp.append(sp_period.scientific_program.id)
+        return ScientificProgram.objects.filter(id__in=exploitable_sp)
+
+class ScientificProgram(models.Model):
+
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    name = models.CharField(max_length=30, blank=False,
+                            null=False, default="", unique=True)
+    description_short = models.TextField(default="", max_length=320)
+    description_long = models.TextField(default="")
+    institute = models.ForeignKey(
+        Institute, on_delete=models.DO_NOTHING, related_name="scientific_programs")
+    sp_pi = models.ForeignKey(
+        "PyrosUser", on_delete=models.DO_NOTHING, related_name="Scientific_Program_Users")
+    science_theme = models.ForeignKey(
+        #"ScienceTheme", on_delete=models.DO_NOTHING, related_name="scientific_program_theme", default=1)
+        ScienceTheme, on_delete=models.DO_NOTHING, related_name="scientific_program_theme", default=1)
+    is_auto_validated = models.BooleanField(default=False)
+    objects = ScientificProgramManager()
+
+    class Meta:
+        managed = True
+        db_table = 'scientific_program'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+
 class PyrosUser(AbstractUser):
     username = models.CharField(
         max_length=255, blank=False, null=False, unique=True)
@@ -1483,7 +1338,8 @@ class PyrosUser(AbstractUser):
     validator = models.ForeignKey(
         "PyrosUser", on_delete=models.DO_NOTHING, null=True, related_name="pyros_users")
     referee_themes = models.ManyToManyField(
-        "ScienceTheme", related_name="referee_themes", blank=True)
+        #"ScienceTheme", related_name="referee_themes", blank=True)
+        ScienceTheme, related_name="referee_themes", blank=True)
  
     objects = PyrosUserManager()
  
@@ -1577,42 +1433,6 @@ class PyrosUser(AbstractUser):
             sp_pi=self.id)
         return sp_where_user_is_sp_pi
  
-# class Schedule(models.Model):
-#     created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-#     plan_start = models.DecimalField(
-#         default=0.0, max_digits=15, decimal_places=8)
-#     plan_end = models.DecimalField(
-#         default=0.0, max_digits=15, decimal_places=8)
-#     flag = models.CharField(max_length=45, blank=True, null=True)
-#
-#     class Meta:
-#         managed = True
-#         db_table = 'schedule'
-#
-#     def __str__(self):
-#         return (str(self.created))
-
-
-class Schedule(models.Model):
-    sequences = models.ManyToManyField(
-        'Sequence', through='ScheduleHasSequences', related_name='schedules')
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    plan_night_start = models.DecimalField(
-        default=0.0, max_digits=15, decimal_places=8)
-    plan_end = models.DecimalField(
-        default=0.0, max_digits=15, decimal_places=8)
-    plan_start = models.DecimalField(
-        default=0.0, max_digits=15, decimal_places=8)
-    flag = models.CharField(max_length=45, blank=True, null=True)
-
-    class Meta:
-        managed = True
-        db_table = 'schedule'
-        verbose_name_plural = "Schedules"
-
-    def __str__(self):
-        return (str(self.created))
-
  
 class PeriodManager(models.Manager):
     # to get the currently active period, use exploitation_period()
@@ -1785,39 +1605,7 @@ class Period(models.Model):
         db_table = "period"
  
  
-class ScientificProgramManager(models.Manager):
-    def observable_programs(self):
-        exploitable_sp = []
-
-        for sp_period in SP_Period.objects.all():
-            if sp_period.can_submit_sequence():
-                exploitable_sp.append(sp_period.scientific_program.id)
-        return ScientificProgram.objects.filter(id__in=exploitable_sp)
-
-
-class ScientificProgram(models.Model):
-
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-    name = models.CharField(max_length=30, blank=False,
-                            null=False, default="", unique=True)
-    description_short = models.TextField(default="", max_length=320)
-    description_long = models.TextField(default="")
-    institute = models.ForeignKey(
-        Institute, on_delete=models.DO_NOTHING, related_name="scientific_programs")
-    sp_pi = models.ForeignKey(
-        "PyrosUser", on_delete=models.DO_NOTHING, related_name="Scientific_Program_Users")
-    science_theme = models.ForeignKey(
-        "ScienceTheme", on_delete=models.DO_NOTHING, related_name="scientific_program_theme", default=1)
-    is_auto_validated = models.BooleanField(default=False)
-    objects = ScientificProgramManager()
-
-    class Meta:
-        managed = True
-        db_table = 'scientific_program'
  
-    def __str__(self):
-        return (str(self.name))
  
  
 class SP_Period(models.Model):
@@ -1934,135 +1722,6 @@ class SP_PeriodWorkflow(models.Model):
     class Meta:
         db_table = "sp_period_workflow"
  
-class Sequence(models.Model):
-
-    """ Definition of Status enum values """
-    INVALID = "INVL"
-    DRAFT = "DRAFT"
-
-    # INCOMPLETE = "INCPL"
-    # COMPLETE = "CPL"
-    TOBEPLANNED = "TBP"
-    PLANNED = "PLND"
-    UNPLANNABLE = "UNPLN"
-    REJECTED = "RJTD"
-    REC_RUNNING = "RUN"
-    REC_FINISHED = "EXD"
-    REC_CANCELED = "CNCLD"
-    PROC_RUNNING = "PROC_RUN"
-    PROC_CANCELED = "PROC_CNCLD"
-    PROC_FINISHED = "PROC_EXD"
-    # PENDING = "PNDG"
-    # EXECUTING = "EXING"
-    # EXECUTED = "EXD"
-    CANCELLED = "CNCLD"
-    STATUS_CHOICES = (
-        (INVALID, "Invalid"),
-        (DRAFT, "DRAFT"),
-        (TOBEPLANNED, "To be planned"),
-        (PLANNED, "Planned"),
-        (UNPLANNABLE, "Unplannable"),
-        (REJECTED, "Rejected"),
-        (REC_RUNNING, "Recording running"),
-        (REC_FINISHED, "Recording finished"),
-        (REC_CANCELED, "Recording canceled"),
-        (PROC_RUNNING, "Processing running"),
-        (PROC_FINISHED, "Processing finished"),
-        (PROC_CANCELED, "Processing canceled"),
-        (CANCELLED, "Cancelled"),
-    )
-    START_EXPO_PREF_CHOICES = (
-        ('IMMEDIATE', 'IMMEDIATE'),
-        ('BEST_ELEVATION', 'BEST_ELEVATION'),
-        ('NO_CONSTRAINT', 'NO_CONSTRAINT'),
-    )
-
-    start_expo_pref = models.CharField(max_length=50, blank=False, null=True,
-                                       choices=START_EXPO_PREF_CHOICES, default=START_EXPO_PREF_CHOICES[0])
-    # request = models.ForeignKey(
-    #    Request, on_delete=models.CASCADE, related_name="sequences")
-    pyros_user = models.ForeignKey(
-        'PyrosUser', on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
-    scientific_program = models.ForeignKey(
-        'ScientificProgram', on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
-    name = models.CharField(max_length=45, blank=True, null=True, unique=True)
-    desc = models.TextField(blank=True, null=True)
-    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
-    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
-    last_modified_by =  models.ForeignKey(
-        'PyrosUser', on_delete=models.DO_NOTHING, related_name="+", blank=True, null=True)
-    is_alert = models.BooleanField(default=False)
-    status = models.CharField(
-        max_length=11, blank=True, null=True, choices=STATUS_CHOICES)
-    target_coords = models.CharField(max_length=100, blank=True, null=True)
-    with_drift = models.BooleanField(default=False)
-    priority = models.IntegerField(blank=True, null=True)
-    analysis_method = models.CharField(max_length=45, 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.BooleanField(default=False)
-    obsolete = models.BooleanField(default=False)
-    processing = models.BooleanField(default=False)
-    flag = models.CharField(max_length=45, blank=True, null=True)
-    period = models.ForeignKey(
-        "Period", on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
-
-    start_date = models.DateTimeField(
-        blank=True, null=True, default=timezone.now, editable=True)
-    end_date = models.DateTimeField(
-        blank=True, null=True, default=timezone.now, editable=True)
-    # jd1 et jd2 = julian day start / end
-    jd1 = models.DecimalField(default=0.0, max_digits=15, decimal_places=8)
-    jd2 = models.DecimalField(default=0.0, max_digits=15, decimal_places=8)
-    tolerance_before = models.CharField(
-        max_length=50, default="1s", blank=True, null=True)
-    tolerance_after = models.CharField(
-        max_length=50, default="1min", blank=True, null=True)
-
-    #t_prefered = models.DecimalField(default=-1.0, max_digits=15, decimal_places=8)
-    duration = models.DecimalField(
-        default=-1.0, max_digits=15, decimal_places=8)
-    # décomposer duration en duration pointing + duration album
-    overhead = models.DecimalField(default=0, max_digits=15, decimal_places=8)
-    submitted = models.BooleanField(default=False)
-    config_attributes = models.JSONField(blank=True, null=True)
-
-    ra = models.FloatField(blank=True, null=True)
-    dec = models.FloatField(blank=True, null=True)
-    complete = models.BooleanField(default=False, null=True, blank=True)
-
-    class Meta:
-        managed = True
-        db_table = 'sequence'
-
-    def __str__(self):
-        return (str(self.name))
-
-
-class ScheduleHasSequences(models.Model):
-    # (EP) TODO: C'est pas un pb d'utiliser 2 fois le meme nom "shs" pour 2 choses differentes ???!!!
-    schedule = models.ForeignKey(
-        'Schedule', on_delete=models.CASCADE, related_name="shs")
-    sequence = models.ForeignKey(
-        'Sequence', on_delete=models.CASCADE, related_name="shs")
-
-    status = models.CharField(
-        max_length=11, blank=True, null=True, choices=Sequence.STATUS_CHOICES)
-    desc = models.CharField(max_length=45, blank=True, null=True)
-    tsp = models.DecimalField(default=-1.0, max_digits=15, decimal_places=8)
-    tep = models.DecimalField(default=-1.0, max_digits=15, decimal_places=8)
-    deltaTL = models.DecimalField(
-        default=-1.0, max_digits=15, decimal_places=8)
-    deltaTR = models.DecimalField(
-        default=-1.0, max_digits=15, decimal_places=8)
-
-    class Meta:
-        managed = True
-        db_table = 'schedule_has_sequences'
-
  
 class SiteWatch(models.Model):
     OPEN = "OPEN"
@@ -2131,21 +1790,6 @@ class SiteWatchHistory(models.Model):
         verbose_name_plural = "Site watch histories"
  
  
-class StrategyObs(models.Model):
-    name = models.CharField(max_length=45, blank=True, null=True)
-    desc = models.TextField(blank=True, null=True)
-    xml_file = models.CharField(max_length=45, blank=True, null=True)
-    is_default = models.BooleanField(default=False)
-
-    class Meta:
-        managed = True
-        db_table = 'strategyobs'
-        verbose_name_plural = "Strategy obs"
-
-    def __str__(self):
-        return (str(self.name))
-
-
 # TODO: à virer car utilisé pour Celery (ou bien à utiliser pour les agents)
 class TaskId(models.Model):
     task = models.CharField(max_length=45, blank=True, null=True)
@@ -180,19 +180,19 @@ class Company(models.Model):
 """
  
  
-'''
 # ---
 # --- Utility functions
 # ---
  
+'''
 def printd(*args, **kwargs):
     if os.environ.get('PYROS_DEBUG', '0') == '1':
         print('(MODEL)', *args, **kwargs)
+'''
  
 def get_or_create_unique_row_from_model(model: models.Model):
     # return model.objects.get(id=1) if model.objects.exists() else model.objects.create(id=1)
     return model.objects.first() if model.objects.exists() else model.objects.create(id=1)
-'''
  
  
 """
@@ -37,9 +37,11 @@ urlpatterns = [
     path('majordome/', include('majordome.urls')),
     path('monitoring/', include('monitoring.urls')),
     path('observation_manager/', include('observation_manager.urls')),
+
+    path('scientific_program/', include('scientific_program.urls')),
     path('routine_manager/', include('routine_manager.urls')),
+
     path('user_manager/', include('user_manager.urls')),
-    path('scientific_program/', include('scientific_program.urls')),
     path('obs_config/', include('obsconfig.urls')),
     path('api/', include('api.urls')),
     path('', dashboard.views.index)
 from django.conf import settings
 from django import forms
-from django.db.models.fields import PositiveIntegerField
 from django.forms.widgets import RadioSelect
+
+from django.db.models.fields import PositiveIntegerField
+
 from common.models import *
+from routine_manager.models import Sequence, Album, Plan #, Request
+
 from routine_manager.validators import check_album_validity
  
 import logging,ast
  
 from src.core.pyros_django.routine_manager.widgets import LinkedSelectWidget
+
 log = logging.getLogger("routine_manager-views")
  
+
+'''
 class RequestForm(forms.ModelForm):
     """
         Form for Request edition
@@ -28,6 +35,7 @@ class RequestForm(forms.ModelForm):
                 field.widget.attrs['readonly'] = True
             field.widget.attrs['class'] = 'form-control'
             field.required = True
+'''
  
  
 class SequenceForm(forms.ModelForm):
 import ast
 from src.core.pyros_django.obsconfig.obsconfig_class import OBSConfig
 from .forms import SequenceForm, AlbumForm, PlanForm
-from common.models import PyrosUser, ScientificProgram, Sequence, Album, Plan, Period
+from common.models import PyrosUser, ScientificProgram, Period
+from routine_manager.models import Sequence, Album, Plan
 import datetime
 import os, yaml
  
+# models_D3_Seq_submit_and_planning
+
+#from django.db import models
+
+##from __future__ import unicode_literals
+
+# (EP 21/9/22) To allow autoreferencing (ex: AgentCmd.create() returns a AgentCmd)
+from __future__ import annotations
+
+# Stdlib imports
+from numpy import False_
+from src.device_controller.abstract_component.device_controller import DeviceCmd
+from enum import Enum
+from datetime import datetime, timedelta, date
+from dateutil.relativedelta import relativedelta
+import os
+import sys
+from typing import Any, List, Tuple, Optional
+import re
+
+# DJANGO imports
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.contrib.auth.models import AbstractUser, UserManager
 from django.db import models
+from django.db.models import Q, Max
+from django.core.validators import MaxValueValidator, MinValueValidator
+from django.db.models.deletion import DO_NOTHING
+from django.db.models.expressions import F
+from django.db.models.query import QuerySet
+from model_utils import Choices
+from django.utils import timezone
+
+# Project imports
+from common.models import PyrosUser, ScientificProgram, Period
+# DeviceCommand is used by class Command
+sys.path.append("../../..")
+
+''' 
+NOT USED - to be removed
+class PyrosState(Enum):
+    START = 'Starting'
+    PA = 'Passive'
+    INI = "INIT"
+    STAND = "Standby"
+    SCHED_START = 'Scheduler startup'
+    SCHED = 'Scheduler'
+    SCHED_CLOSE = 'Scheduler closing'
+'''
+
+
+"""
+STYLE RULES
+===========
+https://simpleisbetterthancomplex.com/tips/2018/02/10/django-tip-22-designing-better-models.html
+https://steelkiwi.com/blog/best-practices-working-django-models-python/
+
+- Model name => singular
+    Call it Company instead of Companies. 
+    A model definition is the representation of a single object (the object in this example is a company), 
+    and not a collection of companies
+    The model definition is a class, so always use CapWords convention (no underscores)
+    E.g. User, Permission, ContentType, etc.
+
+- For the model’s attributes use snake_case.
+    E.g. first_name, last_name, etc
+
+- Blank and Null Fields (https://simpleisbetterthancomplex.com/tips/2016/07/25/django-tip-8-blank-or-null.html)
+    - Null: It is database-related. Defines if a given database column will accept null values or not.
+    - Blank: It is validation-related. It will be used during forms validation, when calling form.is_valid().
+    Do not use null=True for text-based fields that are optional.
+    Otherwise, you will end up having two possible values for “no data”, that is: None and an empty string.
+    Having two possible values for “no data” is redundant.
+    The Django convention is to use the empty string, not NULL.
+    Example:
+        # The default values of `null` and `blank` are `False`.
+        class Person(models.Model):
+            name = models.CharField(max_length=255)  # Mandatory
+            bio = models.TextField(max_length=500, blank=True)  # Optional (don't put null=True)
+            birth_date = models.DateField(null=True, blank=True) # Optional (here you may add null=True)
+    The default values of null and blank are False.
+    Special case, when you need to accept NULL values for a BooleanField, use NullBooleanField instead.
+
+- Choices : you can use Choices from the model_utils library. Take model Article, for instance:
+    from model_utils import Choices
+    class Article(models.Model):
+        STATUSES = Choices(
+            (0, 'draft', _('draft')),
+            (1, 'published', _('published'))   )
+        status = models.IntegerField(choices=STATUSES, default=STATUSES.draft)
+
+- Reverse Relationships
+
+    - related_name :
+    Rule of thumb: if you are not sure what would be the related_name, 
+    use the plural of the model holding the ForeignKey.
+    ex:
+        class Company:
+            name = models.CharField(max_length=30)
+        class Employee:
+            first_name = models.CharField(max_length=30)
+            last_name = models.CharField(max_length=30)
+            company = models.ForeignKey(Company, on_delete=models.CASCADE, related_name='employees')
+    usage:
+        google = Company.objects.get(name='Google')
+        google.employees.all()
+        You can also use the reverse relationship to modify the company field on the Employee instances:
+        vitor = Employee.objects.get(first_name='Vitor')
+        google = Company.objects.get(name='Google')
+        google.employees.add(vitor)
+
+    - related_query_name :
+        This kind of relationship also applies to query filters. 
+        For example, if I wanted to list all companies that employs people named ‘Vitor’, I could do the following:
+        companies = Company.objects.filter(employee__first_name='Vitor')
+        If you want to customize the name of this relationship, here is how we do it:
+            class Employee:
+                first_name = models.CharField(max_length=30)
+                last_name = models.CharField(max_length=30)
+                company = models.ForeignKey(
+                    Company,
+                    on_delete=models.CASCADE,
+                    related_name='employees',
+                    related_query_name='person'
+                )
+        Then the usage would be:
+        companies = Company.objects.filter(person__first_name='Vitor')
+
+    To use it consistently, related_name goes as plural and related_query_name goes as singular.
+
+
+GENERAL EXAMPLE
+=======
+
+from django.db import models
+from django.urls import reverse
+
+class Company(models.Model):
+    # CHOICES
+    PUBLIC_LIMITED_COMPANY = 'PLC'
+    PRIVATE_COMPANY_LIMITED = 'LTD'
+    LIMITED_LIABILITY_PARTNERSHIP = 'LLP'
+    COMPANY_TYPE_CHOICES = (
+        (PUBLIC_LIMITED_COMPANY, 'Public limited company'),
+        (PRIVATE_COMPANY_LIMITED, 'Private company limited by shares'),
+        (LIMITED_LIABILITY_PARTNERSHIP, 'Limited liability partnership'),
+    )
+
+    # DATABASE FIELDS
+    name = models.CharField('name', max_length=30)
+    vat_identification_number = models.CharField('VAT', max_length=20)
+    company_type = models.CharField('type', max_length=3, choices=COMPANY_TYPE_CHOICES)
+
+    # MANAGERS
+    objects = models.Manager()
+    limited_companies = LimitedCompanyManager()
+
+    # META CLASS
+    class Meta:
+        verbose_name = 'company'
+        verbose_name_plural = 'companies'
+
+    # TO STRING METHOD
+    def __str__(self):
+        return self.name
+
+    # SAVE METHOD
+    def save(self, *args, **kwargs):
+        do_something()
+        super().save(*args, **kwargs)  # Call the "real" save() method.
+        do_something_else()
+
+    # ABSOLUTE URL METHOD
+    def get_absolute_url(self):
+        return reverse('company_details', kwargs={'pk': self.id})
+
+    # OTHER METHODS
+    def process_invoices(self):
+        do_something()
+
+"""
+
+
+
+
+# ---
+# --- Utility functions
+# ---
+
+'''
+def printd(*args, **kwargs):
+    if os.environ.get('PYROS_DEBUG', '0') == '1':
+        print('(MODEL)', *args, **kwargs)
+
+def get_or_create_unique_row_from_model(model: models.Model):
+    # return model.objects.get(id=1) if model.objects.exists() else model.objects.create(id=1)
+    return model.objects.first() if model.objects.exists() else model.objects.create(id=1)
+'''
+
+
+"""
+------------------------
+   BASE MODEL CLASSES
+------------------------
+"""
+
+class Request(models.Model):
+    pyros_user = models.ForeignKey(PyrosUser, on_delete=models.DO_NOTHING, related_name="requests")
+    #pyros_user = models.ForeignKey('PyrosUser', on_delete=models.DO_NOTHING, related_name="requests")
+    scientific_program = models.ForeignKey(ScientificProgram, on_delete=models.DO_NOTHING, related_name="requests", blank=True, null=True)
+    #scientific_program = models.ForeignKey('ScientificProgram', on_delete=models.DO_NOTHING, related_name="requests", 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, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    is_alert = models.BooleanField(default=False)
+    target_type = models.CharField(max_length=8, blank=True, null=True)
+    status = models.CharField(max_length=10, blank=True, null=True)
+    autodeposit = models.BooleanField(default=False)
+    checkpoint = models.CharField(max_length=45, blank=True, null=True)
+    flag = models.CharField(max_length=45, blank=True, null=True)
+    complete = models.BooleanField(default=False)
+    submitted = models.BooleanField(default=False)
+
+    class Meta:
+        managed = True
+        db_table = 'request'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+"""
+------------------------
+   OTHER MODEL CLASSES
+------------------------
+"""
+
+
+class Album(models.Model):
+    sequence = models.ForeignKey('Sequence', on_delete=models.CASCADE, related_name="albums")
+    # detector = models.ForeignKey(
+    #     'Detector', models.DO_NOTHING, related_name="albums", blank=True, null=True)
+    #name_of_channel = models.CharField(blank=True,null=True,max_length=150)
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    complete = models.BooleanField(default=False)
+
+    class Meta:
+        managed = True
+        db_table = 'album'
+        #verbose_name_plural = "Albums"
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class Alert(Request):
+    request = models.OneToOneField(Request, on_delete=models.CASCADE, default='', parent_link=True)
+    strategyobs = models.ForeignKey('StrategyObs', models.DO_NOTHING, related_name="alerts", blank=True, null=True)
+    voevent_file = models.CharField(max_length=45, blank=True, null=True)
+    author = models.CharField(max_length=45, blank=True, null=True)
+    burst_jd = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    burst_ra = models.FloatField(max_length=45, blank=True, null=True)
+    burst_dec = models.FloatField(max_length=45, blank=True, null=True)
+    astro_coord_system = models.CharField(max_length=45, blank=True, null=True)
+    jd_send = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    jd_received = models.DecimalField(
+        max_digits=15, decimal_places=8, blank=True, null=True)
+    trig_id = models.IntegerField(blank=True, null=True)
+    error_radius = models.FloatField(max_length=45, blank=True, null=True)
+    defly_not_grb = models.BooleanField(default=False)
+    editor = models.CharField(max_length=45, blank=True, null=True)
+    soln_status = models.CharField(max_length=45, blank=True, null=True)
+    pkt_ser_num = models.IntegerField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'alert'
+
+    def __str__(self):
+        return str(self.trig_id)
+
+    def request_name(self):
+        return self.__str__()
+
+    request_name.short_description = "Name"
+
+
+
+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, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    analysis = models.TextField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'nrtanalysis'
+        verbose_name_plural = "Nrt analyzes"
+
+    def __str__(self):
+        return (str(self.name))
+
+
+"""
+class Plan(models.Model):
+    album = models.ForeignKey(Album, on_delete=models.CASCADE, related_name="plans")
+    filter = models.ForeignKey(Filter, models.DO_NOTHING, related_name="plans", blank=True, null=True)
+    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, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    duration = models.FloatField(default=0, 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.BooleanField(default=False)
+    complete = models.BooleanField(default=False)
+
+    class Meta:
+        managed = True
+        db_table = 'plan'
+
+    def __str__(self):
+        return (str(self.name))
+"""
+
+
+class Plan(models.Model):
+    album = models.ForeignKey(
+        Album, on_delete=models.CASCADE, related_name="plans")
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    duration = models.FloatField(default=0, blank=True, null=True)
+    nb_images = models.PositiveIntegerField(
+        blank=True, null=True, validators=[MinValueValidator(1)])
+    config_attributes = models.JSONField(blank=True, null=True)
+    complete = models.BooleanField(default=False)
+
+    class Meta:
+        db_table = "plan"
+
+    def __str__(self) -> str:
+        return f"Plan of Album {self.album.name} has {self.nb_images} image(s)"
+
+
+
+class Image(models.Model):
+    plan = models.ForeignKey(
+        'Plan', on_delete=models.CASCADE, related_name="images")
+    nrtanalysis = models.ForeignKey(
+        'NrtAnalysis', models.DO_NOTHING, blank=True, null=True, related_name="images")
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=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 = True
+        db_table = 'image'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+
+
+# class Schedule(models.Model):
+#     created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+#     plan_start = models.DecimalField(
+#         default=0.0, max_digits=15, decimal_places=8)
+#     plan_end = models.DecimalField(
+#         default=0.0, max_digits=15, decimal_places=8)
+#     flag = models.CharField(max_length=45, blank=True, null=True)
+#
+#     class Meta:
+#         managed = True
+#         db_table = 'schedule'
+#
+#     def __str__(self):
+#         return (str(self.created))
+
+class Schedule(models.Model):
+    sequences = models.ManyToManyField(
+        'Sequence', through='ScheduleHasSequences', related_name='schedules')
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    plan_night_start = models.DecimalField(
+        default=0.0, max_digits=15, decimal_places=8)
+    plan_end = models.DecimalField(
+        default=0.0, max_digits=15, decimal_places=8)
+    plan_start = models.DecimalField(
+        default=0.0, max_digits=15, decimal_places=8)
+    flag = models.CharField(max_length=45, blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = 'schedule'
+        verbose_name_plural = "Schedules"
+
+    def __str__(self):
+        return (str(self.created))
+
+
+class Sequence(models.Model):
+
+    """ Definition of Status enum values """
+    INVALID = "INVL"
+    DRAFT = "DRAFT"
+
+    # INCOMPLETE = "INCPL"
+    # COMPLETE = "CPL"
+    TOBEPLANNED = "TBP"
+    PLANNED = "PLND"
+    UNPLANNABLE = "UNPLN"
+    REJECTED = "RJTD"
+    REC_RUNNING = "RUN"
+    REC_FINISHED = "EXD"
+    REC_CANCELED = "CNCLD"
+    PROC_RUNNING = "PROC_RUN"
+    PROC_CANCELED = "PROC_CNCLD"
+    PROC_FINISHED = "PROC_EXD"
+    # PENDING = "PNDG"
+    # EXECUTING = "EXING"
+    # EXECUTED = "EXD"
+    CANCELLED = "CNCLD"
+    STATUS_CHOICES = (
+        (INVALID, "Invalid"),
+        (DRAFT, "DRAFT"),
+        (TOBEPLANNED, "To be planned"),
+        (PLANNED, "Planned"),
+        (UNPLANNABLE, "Unplannable"),
+        (REJECTED, "Rejected"),
+        (REC_RUNNING, "Recording running"),
+        (REC_FINISHED, "Recording finished"),
+        (REC_CANCELED, "Recording canceled"),
+        (PROC_RUNNING, "Processing running"),
+        (PROC_FINISHED, "Processing finished"),
+        (PROC_CANCELED, "Processing canceled"),
+        (CANCELLED, "Cancelled"),
+    )
+    START_EXPO_PREF_CHOICES = (
+        ('IMMEDIATE', 'IMMEDIATE'),
+        ('BEST_ELEVATION', 'BEST_ELEVATION'),
+        ('NO_CONSTRAINT', 'NO_CONSTRAINT'),
+    )
+
+    start_expo_pref = models.CharField(max_length=50, blank=False, null=True,
+                                       choices=START_EXPO_PREF_CHOICES, default=START_EXPO_PREF_CHOICES[0])
+    # request = models.ForeignKey(
+    #    Request, on_delete=models.CASCADE, related_name="sequences")
+    pyros_user = models.ForeignKey(PyrosUser, on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
+    #pyros_user = models.ForeignKey('PyrosUser', on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
+    #scientific_program = models.ForeignKey('ScientificProgram', on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
+    scientific_program = models.ForeignKey(ScientificProgram, on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
+    name = models.CharField(max_length=45, blank=True, null=True, unique=True)
+    desc = models.TextField(blank=True, null=True)
+    created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
+    updated = models.DateTimeField(blank=True, null=True, auto_now=True)
+    #last_modified_by =  models.ForeignKey('PyrosUser', on_delete=models.DO_NOTHING, related_name="+", blank=True, null=True)
+    last_modified_by =  models.ForeignKey(PyrosUser, on_delete=models.DO_NOTHING, related_name="+", blank=True, null=True)
+    is_alert = models.BooleanField(default=False)
+    status = models.CharField(
+        max_length=11, blank=True, null=True, choices=STATUS_CHOICES)
+    target_coords = models.CharField(max_length=100, blank=True, null=True)
+    with_drift = models.BooleanField(default=False)
+    priority = models.IntegerField(blank=True, null=True)
+    analysis_method = models.CharField(max_length=45, 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.BooleanField(default=False)
+    obsolete = models.BooleanField(default=False)
+    processing = models.BooleanField(default=False)
+    flag = models.CharField(max_length=45, blank=True, null=True)
+    period = models.ForeignKey(Period, on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
+    #period = models.ForeignKey("Period", on_delete=models.DO_NOTHING, related_name="sequences", blank=True, null=True)
+
+    start_date = models.DateTimeField(
+        blank=True, null=True, default=timezone.now, editable=True)
+    end_date = models.DateTimeField(
+        blank=True, null=True, default=timezone.now, editable=True)
+    # jd1 et jd2 = julian day start / end
+    jd1 = models.DecimalField(default=0.0, max_digits=15, decimal_places=8)
+    jd2 = models.DecimalField(default=0.0, max_digits=15, decimal_places=8)
+    tolerance_before = models.CharField(
+        max_length=50, default="1s", blank=True, null=True)
+    tolerance_after = models.CharField(
+        max_length=50, default="1min", blank=True, null=True)
+
+    #t_prefered = models.DecimalField(default=-1.0, max_digits=15, decimal_places=8)
+    duration = models.DecimalField(
+        default=-1.0, max_digits=15, decimal_places=8)
+    # décomposer duration en duration pointing + duration album
+    overhead = models.DecimalField(default=0, max_digits=15, decimal_places=8)
+    submitted = models.BooleanField(default=False)
+    config_attributes = models.JSONField(blank=True, null=True)
+
+    ra = models.FloatField(blank=True, null=True)
+    dec = models.FloatField(blank=True, null=True)
+    complete = models.BooleanField(default=False, null=True, blank=True)
+
+    class Meta:
+        managed = True
+        db_table = 'sequence'
+
+    def __str__(self):
+        return (str(self.name))
+
+
+class ScheduleHasSequences(models.Model):
+    # (EP) TODO: C'est pas un pb d'utiliser 2 fois le meme nom "shs" pour 2 choses differentes ???!!!
+    schedule = models.ForeignKey(
+        'Schedule', on_delete=models.CASCADE, related_name="shs")
+    sequence = models.ForeignKey(
+        'Sequence', on_delete=models.CASCADE, related_name="shs")
+
+    status = models.CharField(
+        max_length=11, blank=True, null=True, choices=Sequence.STATUS_CHOICES)
+    desc = models.CharField(max_length=45, blank=True, null=True)
+    tsp = models.DecimalField(default=-1.0, max_digits=15, decimal_places=8)
+    tep = models.DecimalField(default=-1.0, max_digits=15, decimal_places=8)
+    deltaTL = models.DecimalField(
+        default=-1.0, max_digits=15, decimal_places=8)
+    deltaTR = models.DecimalField(
+        default=-1.0, max_digits=15, decimal_places=8)
+
+    class Meta:
+        managed = True
+        db_table = 'schedule_has_sequences'
+
+
+class StrategyObs(models.Model):
+    name = models.CharField(max_length=45, blank=True, null=True)
+    desc = models.TextField(blank=True, null=True)
+    xml_file = models.CharField(max_length=45, blank=True, null=True)
+    is_default = models.BooleanField(default=False)
+
+    class Meta:
+        managed = True
+        db_table = 'strategyobs'
+        verbose_name_plural = "Strategy obs"
+
+    def __str__(self):
+        return (str(self.name))
+
+
  
-# Create your models here.
 from django.urls import re_path
 from django.urls import path
+
+#from common.models import ScientificProgram
+
 from . import views
  
 urlpatterns = [
-from common.models import Sequence, Album, Plan
+from routine_manager.models import Sequence, Album, Plan
 from django.conf import settings
  
 def check_plan_validity(plan):
@@ -10,8 +10,11 @@ from collections import OrderedDict
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.shortcuts import get_object_or_404, render, redirect
+
 from common.models import *
+from routine_manager.models import *
 from django.db.models import Q
+
 from django.contrib.auth.decorators import login_required
 from src.core.pyros_django.dashboard.decorator import level_required
 import ast
@@ -20,7 +23,10 @@ import datetime
  
 from django.forms.models import model_to_dict
 from src.core.pyros_django.obsconfig.obsconfig_class import OBSConfig
-from .forms import RequestForm, SequenceForm, AlbumForm, PlanForm, uneditablePlanForm
+
+from .forms import SequenceForm, AlbumForm, PlanForm, uneditablePlanForm
+#from .forms import RequestForm, SequenceForm, AlbumForm, PlanForm, uneditablePlanForm
+
 from .validators import check_plan_validity, check_album_validity, check_sequence_validity, check_request_validity
 from .functions import check_sequence_file_validity
 from .RequestSerializer import RequestSerializer
 from common.models import *
+from routine_manager.models import Sequence, ScheduleHasSequences
 # from decimal import Decimal
 from utils.Logger import Logger
 from utils.JDManipulator import *
@@ -5,6 +5,8 @@ from .UserManager import UserQuotaManager
 from .Interval import *
 from django.db.models import Q
  
+from routine_manager.models import Sequence, Schedule
+
 SIMULATION = False
 DEBUG_FILE = False
  
 from common.models import *
+from routine_manager.models import Sequence
+
 from utils.Logger import *
 from decimal import *
  
 from django.shortcuts import render
-from common.models import Sequence, Schedule
+#from common.models import Sequence, Schedule
+from routine_manager.models import Sequence, Schedule
+
 from django.contrib.auth.decorators import login_required
 from scheduler.simulator import Simulator
 from operator import attrgetter
@@ -5,7 +5,10 @@ from django.contrib.auth import authenticate, login
 from django.contrib.auth.decorators import login_required
 from .forms import PeriodForm, ScienceThemeForm, ScientificProgramForm, InstituteForm, SP_PeriodForm,TACAssociationForm
 from src.core.pyros_django.dashboard.decorator import level_required
-from common.models import ScientificProgram, Institute, Period, SP_Period_User, SP_Period, PyrosUser, UserLevel, SP_Period_Guest, ScienceTheme, Sequence
+
+from common.models import ScientificProgram, Institute, Period, SP_Period_User, SP_Period, PyrosUser, UserLevel, SP_Period_Guest, ScienceTheme
+from routine_manager.models import Sequence
+
 from django.http import HttpResponseRedirect
 from datetime import date, datetime
 from django.conf import settings