starbash 0.1.9__py3-none-any.whl → 0.1.15__py3-none-any.whl

starbash/recipes/osc_single_duo/starbash.toml

@@ -2,30 +2,43 @@
 [repo]
 kind = "recipe"
 
+[recipe]
+
+# Lower priority recipes are tried to match first
+# - we want this to match after the osc_dual_duo has a chance
+priority = 20
+
+author.name = "FIXMEsirilsomeone"
+author.email = "FIXMEsirilsomeone"
+
+# for single duo look for this
+auto.require.filter = ["HaOiii"]
+auto.require.color = true
+
 # all sb.toml files can optionally contain a version section.  if version of the running starbash app is out of bounds a warning message will be printed
 # to the user and the file will be ignored for future processing.
 [recipe.require.version]
 min="0.1.0"
 max="4.5.8"
 
-[recipe]
-author.name = "Kevin Hester"
-author.email = "kevinh@geeksville.com"
+[recipe.stage.light]
 
-[[stage]]
+description = "Extract OSC dual duo filter Ha, Oiii and Sii channels"
+# disabled = true # FIXME, debugging later stuff
 
-description = "Process OSC single duo filter data, extracting Ha and Oiii"
+tool.name = "siril"
 
-disabled = true # FIXME, we don't yet have auto selection based on filter types
+# Auto find input light frames for the current session
+# Look for files in input repos, finding them by using the "relative" tag they contain
+input.source = "repo"
+input.required = 2    # siril needs at least 2 frames to stack
+input.type = "light" # look in all raw repos, but look only for light files
 
-# Restrict processing of this stage to only if detected hardware was found for this session
-# for single duo look for this
-auto.for-filter = ["HaOiii"]
-auto.for-camera = ["OSC"]
+# Auto find suitable masters of the following type
+input.masters = ["bias", "flat"]
 
-tool = "siril"
-when = "session-light" # run once per session-config
-output = "FIXME"
+# the base name for our light files
+context.light_base = '''light_s{session["id"]}'''
 
 script = '''
     # Create a sequence from the raw light frames, seq file goes to process_dir
@@ -33,35 +46,41 @@ script = '''
     cd {process_dir}
 
     # Calibrate the light frames using master bias and flat
-    calibrate {light_base} -bias={bias} -flat={flat} -cfa -equalize_cfa
+    calibrate {light_base} -bias={master["bias"]} -flat={master["flat"]} -cfa -equalize_cfa
 
-    # Remove background gradient on a per-frame basis (generates bkg_pp_{light_base}.seq)
+    # Remove background gradient on a per-frame basis (generates bkg_pp_light.seq)
     seqsubsky pp_{light_base} 1
+
+    # FIXME only do this step for duo filters (refactor to share common light processing function)
+    seqextract_HaOIII bkg_pp_{light_base} -resample=ha
     '''
 
-temporaries = ["FIXME"]
+# temporaries = ["FIXME"]
 
-[[stage]]
+[recipe.stage.stack]
 
-disabled = true # FIXME, we don't yet have auto selection based on filter types
+# this stage is only be considered if the previous stage in this same array
+# was run.  It must be run inside the same tempdir (so that files from previous stage are available)
 
-tool = "python"
-when = "session-stack" # run once after all session/session-config processing was done
+description = "Stack OSC single duo filter data: with Ha, Oiii extraction"
 
-script-file = "script.py"
+input.source = "recipe" # we will use output files from previous stages in this same recipe as our input
 
-# or inline python code instead of that function?
-script = '''
-    # green output channel - from the HaOiii filter Ha is on the 656nm red channel
-    make_stacked("HaOiii", "Ha", f"results_00001")
+tool.name = "python"
 
-    # blue output channel - both filters have Oiii on the 500nm blue channel.  Note the case here is uppercase to match siril output
-    make_stacked("*", "OIII", f"results_00002")
+# Based on the following definitions in the stage toml file...
+# FIXME, we should inherit this - most recipes shouldn't have to declare it
+output.dest = "repo" # write to a particular repo
+output.type = "processed" # write output to the special processed repo
 
-    # There might be an old/state autogenerated .seq file, delete it so it doesn't confuse renormalize
-    results_seq_path = f"{process_dir}/results_.seq"
-    if os.path.exists(results_seq_path):
-        os.remove(results_seq_path)
+# if not specified starbash.py used
+# script-file = "script.py"
 
-    make_renormalize()
+# or inline python code can be provided here.  In this case I'm using some python
+# code I'm temporarily sharing from the main project...
+script = '''
+    from starbash.recipes import osc
+    osc.logger = logger
+    osc.context = context
+    osc.osc_process(has_ha_oiii=True, has_sii_oiii=False)
     '''

starbash/recipes/seestar/starbash.toml

@@ -0,0 +1,82 @@
+
+[repo]
+kind = "recipe"
+
+[recipe]
+
+# Lower priority recipes are tried to match first
+# - we want to match this before all other color cameras (because we need special processing)
+priority = 5
+
+author.name = "FIXMEsirilsomeone"
+author.email = "FIXMEsirilsomeone"
+
+# no filter requirements - will work for any osc session
+auto.require.camera = ["Seestar"]
+auto.require.color = true
+
+# all sb.toml files can optionally contain a version section.  if version of the running starbash app is out of bounds a warning message will be printed
+# to the user and the file will be ignored for future processing.
+[recipe.require.version]
+min="0.1.0"
+max="4.5.8"
+
+[recipe.stage.light]
+
+description = "Fix background gradient on Seestar frames"
+# disabled = true # FIXME, debugging later stuff
+
+tool.name = "siril"
+
+# Auto find input light frames for the current session
+# Look for files in input repos, finding them by using the "relative" tag they contain
+input.source = "repo"
+input.required = 2    # siril needs at least 2 frames to stack
+input.type = "light" # look in all raw repos, but look only for light files
+
+# We don't require any masters for seestar processing
+input.masters = []
+
+# the base name for our light files
+context.light_base = '''light_s{session["id"]}'''
+
+script = '''
+    # Create a sequence from the raw light frames, seq file goes to process_dir
+    link pp_{light_base} -out={process_dir}
+    cd {process_dir}
+
+    # No calibration needed for seestar frames - it was done in camera
+
+    # Remove background gradient on a per-frame basis (generates bkg_pp_light.seq)
+    seqsubsky pp_{light_base} 1
+    '''
+
+# temporaries = ["FIXME"]
+
+[recipe.stage.stack]
+
+# this stage is only be considered if the previous stage in this same array
+# was run.  It must be run inside the same tempdir (so that files from previous stage are available)
+
+description = "Stack OSC simple (non duo filter) images"
+
+input.source = "recipe" # we will use output files from previous stages in this same recipe as our input
+
+tool.name = "python"
+
+# Based on the following definitions in the stage toml file...
+# FIXME, we should inherit this - most recipes shouldn't have to declare it
+output.dest = "repo" # write to a particular repo
+output.type = "processed" # write output to the special processed repo
+
+# if not specified starbash.py used
+# script-file = "script.py"
+
+# or inline python code can be provided here.  In this case I'm using some python
+# code I'm temporarily sharing from the main project...
+script = '''
+    from starbash.recipes import osc
+    osc.logger = logger
+    osc.context = context
+    osc.osc_process(has_ha_oiii=False, has_sii_oiii=False)
+    '''

starbash/recipes/starbash.toml

@@ -5,6 +5,8 @@ kind = "repo"
 [[repo-ref]]
 dir = "master_bias"
 [[repo-ref]]
+dir = "master_dark"
+[[repo-ref]]
 dir = "master_flat"
 
 # Note: For automated recipe finding, it is important to list more demanding recipes first.  For instance:
@@ -19,21 +21,40 @@ dir = "osc_dual_duo"
 [[repo-ref]]
 dir = "osc_single_duo"
 
-# processing stages, currently all declared here, but possibly in the future they could be added by user/other toml files
+[[repo-ref]]
+dir = "osc_simple"
 
-# Not included in standard list - for now we run manually
-#[[stages]]
-#name = "setup-masters" # for flat processing, master generation etc
-#priority = 5
+[[repo-ref]]
+dir = "seestar"
 
-[[stages]]
-name = "session-config" # for flat processing, master generation etc
+#
+# master specific stages
+#
+[[master-stages]]
+name = "master-bias" # generate master bias frames
 priority = 10
+input = "bias"       # only used for frames of this type
+
+[[master-stages]]
+name = "master-dark" # generate master dark frames
+priority = 10
+input = "dark"
+
+[[master-stages]]
+name = "master-flat" # generate master flat frames
+priority = 20
+input = "flat"
+
+#
+# session specific processing stages
+# FIXME - we are not using this yet, for now we just hardcode in app.py
 
 [[stages]]
-name = "session-light" # generate light frames from lights and with reference to flats/bias
+name = "light" # generate light frames from lights and with reference to flats/bias
 priority = 20
+input = "light" # only used for frames of this type
 
 [[stages]]
-name = "session-stack" # stack frames
+name = "stack" # stack frames
 priority = 30
+input = "recipe" # use output from previous stages in the same recipe

starbash/selection.py

@@ -3,12 +3,19 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from starbash.database import SearchCondition
+
 from repo import Repo
+from starbash.aliases import normalize_target_name
 
 
-def where_tuple(conditions: dict[str, Any] | None) -> tuple[str, list[Any]]:
-    """Search for sessions matching the given conditions.
+def build_search_conditions(
+    conditions: dict[str, Any] | None,
+) -> list[SearchCondition]:
+    """Build a list of SearchCondition objects from a conditions dictionary.
 
     Args:
         conditions: Dictionary of session key-value pairs to match, or None for all.
@@ -17,42 +24,33 @@ def where_tuple(conditions: dict[str, Any] | None) -> tuple[str, list[Any]]:
                     - 'date_end': Filter sessions starting on or before this date
 
     Returns:
-        Tuple of (WHERE clause string, list of parameters)
+        List of SearchCondition tuples for database queries
     """
+    # Import here to avoid circular dependency
+    from starbash.database import SearchCondition
+
     if conditions is None:
         conditions = {}
 
-    # Build WHERE clause dynamically based on conditions
-    where_clauses = []
-    params = []
+    search_conditions = []
 
     # Extract date range conditions
     date_start = conditions.get("date_start")
     date_end = conditions.get("date_end")
 
-    # Add date range filters to WHERE clause
+    # Add date range filters as SearchConditions
     if date_start:
-        where_clauses.append("start >= ?")
-        params.append(date_start)
+        search_conditions.append(SearchCondition("start", ">=", date_start))
 
     if date_end:
-        where_clauses.append("start <= ?")
-        params.append(date_end)
+        search_conditions.append(SearchCondition("start", "<=", date_end))
 
-    # Add standard conditions to WHERE clause
+    # Add standard conditions as SearchConditions
     for key, value in conditions.items():
         if key not in ("date_start", "date_end") and value is not None:
-            column_name = key
-            where_clauses.append(f"{column_name} = ?")
-            params.append(value)
-
-    # Build the query
-    query = ""
+            search_conditions.append(SearchCondition(key, "=", value))
 
-    if where_clauses:
-        query += " WHERE " + " AND ".join(where_clauses)
-
-    return (query, params)
+    return search_conditions
 
 
 class Selection:
@@ -69,7 +67,7 @@ class Selection:
     used to build database queries.
     """
 
-    def __init__(self, user_repo: "Repo"):
+    def __init__(self, user_repo: Repo):
         """Initialize the Selection with the user config repository.
 
         Args:
@@ -77,8 +75,8 @@ class Selection:
         """
         self.user_repo = user_repo
         self.targets: list[str] = []
-        self.date_start: Optional[str] = None
-        self.date_end: Optional[str] = None
+        self.date_start: str | None = None
+        self.date_end: str | None = None
         self.filters: list[str] = []
         self.image_types: list[str] = []
         self.telescopes: list[str] = []
@@ -193,9 +191,7 @@ class Selection:
             self.telescopes.remove(telescope)
             self._save()
 
-    def set_date_range(
-        self, start: Optional[str] = None, end: Optional[str] = None
-    ) -> None:
+    def set_date_range(self, start: str | None = None, end: str | None = None) -> None:
         """Set the date range for the selection.
 
         Args:
@@ -241,11 +237,11 @@ class Selection:
             and not self.telescopes
         )
 
-    def get_query_conditions(self) -> tuple[str, list[Any]]:
+    def get_query_conditions(self) -> list[SearchCondition]:
         """Build query conditions based on the current selection.
 
         Returns:
-            A tuple of SQL (WHERE clause string, list of parameters)
+            A list of SearchCondition objects for database queries
         """
         conditions = {}
 
@@ -256,7 +252,9 @@ class Selection:
         if self.targets:
             # For now, just use the first target
             # TODO: Support multiple targets in queries
-            conditions["OBJECT"] = self.targets[0] if len(self.targets) == 1 else None
+            conditions["OBJECT"] = (
+                normalize_target_name(self.targets[0]) if len(self.targets) == 1 else None
+            )
 
         if self.filters:
             # For now, just use the first filter
@@ -266,9 +264,7 @@ class Selection:
         if self.telescopes:
             # For now, just use the first telescope
             # TODO: Support multiple telescopes in queries
-            conditions["TELESCOP"] = (
-                self.telescopes[0] if len(self.telescopes) == 1 else None
-            )
+            conditions["TELESCOP"] = self.telescopes[0] if len(self.telescopes) == 1 else None
 
         # Add date range conditions
         if self.date_start:
@@ -276,7 +272,7 @@ class Selection:
         if self.date_end:
             conditions["date_end"] = self.date_end
 
-        return where_tuple(conditions)
+        return build_search_conditions(conditions)
 
     def summary(self) -> dict[str, Any]:
         """Get a summary of the current selection state.

starbash/templates/repo/master.toml

@@ -1,13 +1,17 @@
-# This is a master repository for (Starbash)[{PROJECT_URL}].
+# This is a master repository for (Starbash)[$PROJECT_URL].
 #
 # This file marks the root directory of a set of auto matinained astrophotography
 # 'master' files, such as master darks, flats or biases.
 #
 # You generally don't need to edit this file directly - it was auto generated when you ran
-# "sb repo add --master {REPO_PATH}".
+# "sb repo add --$REPO_TYPE $REPO_PATH".
 #
 
 [repo]
 kind = "master"
 
-relative = "{DEFAULT_RELATIVE}"
+# Given a particular 'kind' of master, we can use different relative paths
+relative.flat = "{instrument}/{date}/{imagetyp}/master_{session_config}.fit"
+
+# For any other kind we use the default path (i.e. bias, dark, etc)
+relative.default = "{camera_id}/{date}/{imagetyp}/master_{session_config}.fit"

starbash/templates/repo/processed.toml

@@ -0,0 +1,15 @@
+# This is a processed repository for (Starbash)[$PROJECT_URL].
+#
+# This file marks the root directory of a set of generated/processed starbash output files.
+#
+# You generally don't need to edit this file directly - it was auto generated when you ran
+# "sb repo add --$REPO_TYPE $REPO_PATH".
+#
+
+[repo]
+kind = "processed"
+
+# This path should at least point to a FITS file - so that 'is output file generated' test can work.
+# if this expression includes a * at the end we assume multiple files might be generated and they are all
+# placed in the indicated directory.
+relative.default = "{target}/*"

starbash/templates/userconfig.toml

@@ -6,6 +6,15 @@
 [repo]
 kind = "preferences"
 
+#[aliases]
+# aliases can be used to map non standard (or non english) frame names to standard terms
+# This is also used to map filters based on common misspellings or variations.
+# We assume the first listed option in the list is the 'canonical' name used for printing etc...
+
+# frame types
+# dark = ["dark", "darks"]
+# etc...
+
 [analytics]
 # enabled = true # default is true - change to false if you don't want any analytics/crash-reports
 # include_user = false # default is false - change to true if you'd like your email added to crash reports/analytics

starbash/toml.py

@@ -1,28 +1,28 @@
-import tomlkit
-from tomlkit.toml_file import TOMLFile
-from pathlib import Path
 from importlib import resources
+from pathlib import Path
+from string import Template
 from typing import Any
 
+import tomlkit
+from tomlkit.toml_file import TOMLFile
+
 from starbash import url
 
-def toml_from_template(template_name: str, dest_path: Path, overrides: dict[str, Any] = {}) -> tomlkit.TOMLDocument:
+
+def toml_from_template(
+    template_name: str, dest_path: Path, overrides: dict[str, Any] = {}
+) -> tomlkit.TOMLDocument:
     """Load a TOML document from a template file.
     expand {vars} in the template using the `overrides` dictionary.
     """
 
-    tomlstr = (
-        resources.files("starbash")
-        .joinpath(f"templates/{template_name}.toml")
-        .read_text()
-    )
+    tomlstr = resources.files("starbash").joinpath(f"templates/{template_name}.toml").read_text()
 
     # add default vars always available
-    vars = {
-        "PROJECT_URL": url.project
-    }
+    vars = {"PROJECT_URL": url.project}
     vars.update(overrides)
-    tomlstr = tomlstr.format(**vars)
+    t = Template(tomlstr)
+    tomlstr = t.substitute(vars)
 
     toml = tomlkit.parse(tomlstr)
     TOMLFile(dest_path).write(toml)