adding mwmvisit to file return path

sdss · Dec 5, 2024 · 1358995 · 1358995
1 parent 60e9a3f
commit 1358995
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/python/valis/db/models.py b/python/valis/db/models.py
@@ -248,7 +248,7 @@ class PipeFiles(BaseModel):
     """ Pydantic model for lists of files """
     boss: Optional[str] = None
     apogee: Optional[str] = None
-    astra: Optional[str] = None
+    astra: Optional[list[str]] = None
 
 
 class PipesModel(PeeweeBase):

diff --git a/python/valis/db/queries.py b/python/valis/db/queries.py
@@ -508,7 +508,8 @@ def get_pipe_meta(sdss_id: int, release: str, pipeline: str) -> dict:
     # get astra pipeline target
     elif pipeline == 'astra' and (qq := get_astra_target(sdss_id, release)):
         res = qq.dicts().first()
-        return {pipeline: res, 'files': {pipeline: build_astra_path(res, release)}}
+        return {pipeline: res, 'files': {pipeline: [build_astra_path(res, release),
+                                                    build_astra_path(res, release, name='mwmVisit')]}}
 
 
 def get_target_pipeline(sdss_id: int, release: str, pipeline: str = 'all') -> dict:

diff --git a/python/valis/utils/paths.py b/python/valis/utils/paths.py
@@ -156,7 +156,8 @@ def build_apogee_path(values: dict, release: str, ignore_existence: bool = False
                            ignore_existence=ignore_existence)
 
 
-def build_astra_path(values: dict, release: str, ignore_existence: bool = False) -> str:
+def build_astra_path(values: dict, release: str, name: str = 'mwmStar',
+                     ignore_existence: bool = False) -> str:
     """ Build an Astra mwmStar file path
 
     Builds an Astra file path to the mwmStar file.  It sets a default
@@ -168,6 +169,8 @@ def build_astra_path(values: dict, release: str, ignore_existence: bool = False)
         the input data values to give to the path template
     release : str
         the data release
+    name : str
+        the name of the file product
     ignore_existence : bool, optional
         flag to ignore file existence and return path, by default False
 
@@ -176,5 +179,5 @@ def build_astra_path(values: dict, release: str, ignore_existence: bool = False)
     str
         the output file path
     """
-    return build_file_path(values, 'mwmStar', release, defaults={'component': ''},
+    return build_file_path(values, name, release, defaults={'component': ''},
                            ignore_existence=ignore_existence)