Add Filenames to ConfigPyros & add fn_contexts in config_pyros.yml

Alexis Koralewski
1 parent df5f741b
Showing 6 changed files with 119 additions and 3 deletions Show diff stats
CHANGELOG
config/pyros/config_pyros.py
config/pyros/config_pyros.yml
config/pyros/schema_pyros_config.yml
privatedev/config/pyros/config_pyros.yml
src/core/pyros_django/obsconfig/obsconfig_class.py
 25-04-2023 (AKo): v0.6.22.0
 	- Add ephem to pickle seq & add pickle creation when submitting seq via api
-
+	- Add Filenames to ConfigPyros & add fn_contexts in config_pyros.yml
+	
 06-04-2023 (AKo): v0.6.21.1
 	- Try to fix error when submitting seq simplified (no start_date)
  
 import yaml
 import os
+import sys
 import time
 import pykwalify.core
 from pykwalify.errors import SchemaError
-
-
+sys.path.append("../../")
+from vendor.guitastro.src.guitastro import FileNames
 class ConfigPyros:
+
     def check_and_return_config(self, yaml_file: str, schema_file: str) -> dict:
         """
         Check if yaml_file is valid for the schema_file and return an dictionary of the config file
@@ -81,3 +83,34 @@ class ConfigPyros:
         self.config_path = os.path.abspath(os.path.join(
             os.environ.get("DJANGO_PATH"), "../../../config/pyros//"))
         self.pyros_config = self.read_and_check_config_file(pyros_config_file)
+        fn = FileNames()
+        contexts = self.pyros_config["general"]["fn_contexts"]
+        for context, values in contexts.items():
+            fn.fcontext_create(context, values["description"])
+            fn.fcontext = context
+            if values.get("naming"):
+                fn.naming(values["naming"])
+            elif values.get("pathnaming"):
+                fn.pathnaming(values["pathnaming"])
+            root_project_path = os.environ.get("PROJECT_ROOT_PATH")
+            fn.rootdir = os.path.join(root_project_path, values["root_dir"])
+            fn.extension = values["extension"]
+        self.fn = fn
+def main():
+    os.environ["DJANGO_PATH"] = "../../src/core/pyros_django"
+    cp = ConfigPyros("config_pyros.yml")
+    cp.fn.fcontext = "pyros_seq"
+    print(cp.fn)
+    file_fullname = "../../data/sequences_pickle/P1/20230319/16.p"
+    param = cp.fn.naming_get(file_fullname)
+    print(param)
+    cp.fn.fname = cp.fn.naming_set(param)
+    print(cp.fn.fname)
+    #cp.fn.subdir = cp.fn.subdir_from_filename(file_fullname)
+    print(type(cp.fn.fname))
+    out_fullname = cp.fn.join()
+    print(os.getcwd())
+    print(out_fullname)
+if __name__ == "__main__":
+
+    main()
 \ No newline at end of file
@@ -3,6 +3,23 @@ general:
   logo: logo_pyros.png
   color_theme: sienna
   nb_element_per_page: 20
+  fn_contexts:
+    pyros_img_L0:
+      root_dir: "data/images/"
+      description: "pyros_img_L0"
+      extension: ".fit"
+      naming: "PyROS.img.1"
+    pyros_img_L1:
+      root_dir: "data/images/"
+      description: "pyros_img_L1"
+      extension: ".fits"
+      pathnaming: "PyROS.img.1"
+
+    pyros_seq:
+      root_dir: "data/sequence/"
+      description: "pyros_seq"
+      extension: ".p"
+      pathnaming: "PyROS.seq.1"
 USR: 
   nb_element_per_page: 10
 SCP: ~
@@ -16,6 +16,52 @@ mapping:
       nb_element_per_page:
         type: int
         required: True
+      fn_contexts:
+        type: map
+        required: True
+        mapping: 
+          pyros_img_L0:
+            type: map 
+            required: True
+            mapping:
+              root_dir:
+                type: str
+              description:
+                type: str
+              extension:
+                type: str 
+              naming: 
+                type: str
+              pathnaming:
+                type: str 
+          pyros_img_L1:
+            type: map 
+            required: True
+            mapping:
+              root_dir:
+                type: str
+              description:
+                type: str
+              extension:
+                type: str 
+              naming: 
+                type: str
+              pathnaming:
+                type: str
+          pyros_seq:
+            type: map 
+            required: True
+            mapping:
+              root_dir:
+                type: str
+              description:
+                type: str
+              extension:
+                type: str   
+              naming: 
+                type: str
+              pathnaming:
+                type: str
   USR:
     type: any
   SCP:
@@ -3,6 +3,23 @@ general:
   logo: logo_pyros.png
   color_theme: sienna
   nb_element_per_page: 20
+  fn_contexts:
+    pyros_img_L0:
+      root_dir: "data/images/"
+      description: "pyros_img_L0"
+      extension: ".fit"
+      naming: "PyROS.img.1"
+    pyros_img_L1:
+      root_dir: "data/images/"
+      description: "pyros_img_L1"
+      extension: ".fits"
+      pathnaming: "PyROS.img.1"
+
+    pyros_seq:
+      root_dir: "data/sequence/"
+      description: "pyros_seq"
+      extension: ".p"
+      pathnaming: "PyROS.seq.1"
 USR: 
   nb_element_per_page: 10
 SCP: ~
@@ -384,6 +384,8 @@ class OBSConfig:
         Read the device config file, inherit generic device config if "generic" key is present in "DEVICE".
         Associate capabilities of attached_devices if this device has attached_devices.
         Inherit capabilities from generic component and overwritte attributes defined in the device config
+
+        This function is recursive (called when there is an attached device and/or when the device is generic)
         Args:
             config_file_name (str): file name to be read
             is_generic (bool, optional): tells if we're reading a generic configuration (is_generic =True) or not (is_generic = False). Defaults to False.