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

starbash/selection.py

@@ -3,13 +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.
@@ -18,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)
+            search_conditions.append(SearchCondition(key, "=", value))
 
-    # Build the query
-    query = ""
-
-    if where_clauses:
-        query += " WHERE " + " AND ".join(where_clauses)
-
-    return (query, params)
+    return search_conditions
 
 
 class Selection:
@@ -70,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:
@@ -78,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] = []
@@ -194,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:
@@ -242,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 = {}
 
@@ -258,9 +253,7 @@ class Selection:
             # For now, just use the first target
             # TODO: Support multiple targets in queries
             conditions["OBJECT"] = (
-                normalize_target_name(self.targets[0])
-                if len(self.targets) == 1
-                else None
+                normalize_target_name(self.targets[0]) if len(self.targets) == 1 else None
             )
 
         if self.filters:
@@ -271,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:
@@ -281,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

@@ -1,10 +1,15 @@
-# This is a processed repository for (Starbash)[{PROJECT_URL}].
+# 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 --processed {REPO_PATH}".
+# "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)