starbash 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

starbash/app.py

@@ -1,7 +1,7 @@
 import logging
 from importlib import resources
 from pathlib import Path
-
+import typer
 import tomlkit
 from tomlkit.toml_file import TOMLFile
 import glob
@@ -10,6 +10,7 @@ from astropy.io import fits
 import itertools
 from rich.progress import track
 from rich.logging import RichHandler
+
 from starbash.database import Database
 from starbash.repo.manager import Repo
 from starbash.tool import Tool
@@ -117,7 +118,8 @@ class Starbash:
 
     def __exit__(self, exc_type, exc, tb) -> bool:
         handled = False
-        if exc:
+        # Don't suppress typer.Exit - it's used for controlled exit codes
+        if exc and not isinstance(exc, typer.Exit):
             handled = analytics_exception(exc)
         self.close()
         return handled
@@ -128,11 +130,12 @@ class Starbash:
         date = header.get(Database.DATE_OBS_KEY)
         if not date or not image_type:
             logging.warning(
-                "Image %s missing critical FITS header, please submit image at https://github.com/geeksville/starbash/issues/new",
+                "Image %s missing either DATE-OBS or IMAGETYP FITS header, skipping...",
                 f,
             )
         else:
             exptime = header.get(Database.EXPTIME_KEY, 0)
+            telescop = header.get(Database.TELESCOP_KEY, "unspecified")
             new = {
                 Database.FILTER_KEY: filter,
                 Database.START_KEY: date,
@@ -142,6 +145,7 @@ class Starbash:
                 Database.NUM_IMAGES_KEY: 1,
                 Database.EXPTIME_TOTAL_KEY: exptime,
                 Database.OBJECT_KEY: header.get(Database.OBJECT_KEY, "unspecified"),
+                Database.TELESCOP_KEY: telescop,
             }
             session = self.db.get_session(new)
             self.db.upsert_session(new, existing=session)
@@ -156,16 +160,86 @@ class Starbash:
             conditions = self.selection.get_query_conditions()
             return self.db.search_session(conditions)
 
+    def get_session_images(self, session_id: int) -> list[dict[str, Any]]:
+        """
+        Get all images belonging to a specific session.
+
+        Sessions are defined by a unique combination of filter, imagetyp (image type),
+        object (target name), telescope, and date range. This method queries the images
+        table for all images matching the session's criteria in a single database query.
+
+        Args:
+            session_id: The database ID of the session
+
+        Returns:
+            List of image records (dictionaries with path, metadata, etc.)
+            Returns empty list if session not found or has no images.
+
+        Raises:
+            ValueError: If session_id is not found in the database
+        """
+        # First get the session details
+        session = self.db.get_session_by_id(session_id)
+        if session is None:
+            raise ValueError(f"Session with id {session_id} not found")
+
+        # Query images that match ALL session criteria including date range
+        conditions = {
+            Database.FILTER_KEY: session[Database.FILTER_KEY],
+            Database.IMAGETYP_KEY: session[Database.IMAGETYP_KEY],
+            Database.OBJECT_KEY: session[Database.OBJECT_KEY],
+            Database.TELESCOP_KEY: session[Database.TELESCOP_KEY],
+            "date_start": session[Database.START_KEY],
+            "date_end": session[Database.END_KEY],
+        }
+
+        # Single query with all conditions
+        images = self.db.search_image(conditions)
+        return images if images else []
+
+    def remove_repo_ref(self, url: str) -> None:
+        """
+        Remove a repository reference from the user configuration.
+
+        Args:
+            url: The repository URL to remove (e.g., 'file:///path/to/repo')
+
+        Raises:
+            ValueError: If the repository URL is not found in user configuration
+        """
+        # Get the repo-ref list from user config
+        repo_refs = self.user_repo.config.get("repo-ref")
+
+        if not repo_refs:
+            raise ValueError(f"No repository references found in user configuration.")
+
+        # Find and remove the matching repo-ref
+        found = False
+        refs_copy = [r for r in repo_refs]  # Make a copy to iterate
+        for ref in refs_copy:
+            ref_dir = ref.get("dir", "")
+            # Match by converting to file:// URL format if needed
+            if ref_dir == url or f"file://{ref_dir}" == url:
+                repo_refs.remove(ref)
+                found = True
+                break
+
+        if not found:
+            raise ValueError(f"Repository '{url}' not found in user configuration.")
+
+        # Write the updated config
+        self.user_repo.write_config()
+
     def reindex_repo(self, repo: Repo, force: bool = False):
         """Reindex all repositories managed by the RepoManager."""
         # FIXME, add a method to get just the repos that contain images
         if repo.is_scheme("file") and repo.kind != "recipe":
             logging.debug("Reindexing %s...", repo.url)
 
+            whitelist = None
             config = self.repo_manager.merged.get("config")
-            if not config:
-                raise ValueError(f"App config not found.")
-            whitelist = config["fits-whitelist"]
+            if config:
+                whitelist = config.get("fits-whitelist", None)
 
             path = repo.get_path()
             if not path:
@@ -191,7 +265,7 @@ class Starbash:
                             items = header.items()
                             headers = {}
                             for key, value in items:
-                                if key in whitelist:
+                                if (not whitelist) or (key in whitelist):
                                     headers[key] = value
                             logging.debug("Headers for %s: %s", f, headers)
                             headers["path"] = str(f)
@@ -207,7 +281,7 @@ class Starbash:
 
     def reindex_repos(self, force: bool = False):
         """Reindex all repositories managed by the RepoManager."""
-        logging.info("Reindexing all repositories...")
+        logging.debug("Reindexing all repositories...")
 
         for repo in track(self.repo_manager.repos, description="Reindexing repos..."):
             self.reindex_repo(repo, force=force)

starbash/commands/repo.py

@@ -4,7 +4,33 @@ from typing_extensions import Annotated
 from starbash.app import Starbash
 from starbash import console
 
-app = typer.Typer()
+app = typer.Typer(invoke_without_command=True)
+
+
+@app.callback()
+def main(
+    ctx: typer.Context,
+    verbose: bool = typer.Option(
+        False, "--verbose", "-v", help="Show all repos including system repos"
+    ),
+):
+    """
+    Manage repositories.
+
+    When called without a subcommand, lists all repositories.
+    Use --verbose to show all repos including system/recipe repos.
+    """
+    # If no subcommand is invoked, run the list behavior
+    if ctx.invoked_subcommand is None:
+        with Starbash("repo-list") as sb:
+            repos = sb.repo_manager.repos if verbose else sb.repo_manager.regular_repos
+            for i, repo in enumerate(repos):
+                if verbose:
+                    # No numbers for verbose mode (system repos can't be removed)
+                    console.print(f"{ repo.url } (kind={ repo.kind})")
+                else:
+                    # Show numbers for user repos (can be removed later)
+                    console.print(f"{ i + 1:2}: { repo.url } (kind={ repo.kind})")
 
 
 @app.command()
@@ -22,46 +48,85 @@ def add(path: str):
 
 
 @app.command()
-def remove(reponame: str):
+def remove(reponum: str):
     """
-    Remove a repository by name or number.
+    Remove a repository by number (from list).
+    Use 'starbash repo' to see the repository numbers.
     """
     with Starbash("repo-remove") as sb:
-        raise NotImplementedError("Removing repositories not yet implemented.")
+        try:
+            # Parse the repo number (1-indexed)
+            repo_index = int(reponum) - 1
 
+            # Get only the regular (user-visible) repos
+            regular_repos = sb.repo_manager.regular_repos
 
-@app.command()
-def list():
-    """
-    List all repositories.  The listed names/numbers can be used with other commands.
-    """
-    with Starbash("repo-list") as sb:
-        for i, repo in enumerate(sb.repo_manager.repos):
-            console.print(f"{ i + 1:2}: { repo.url } (kind={ repo.kind})")
+            if repo_index < 0 or repo_index >= len(regular_repos):
+                console.print(
+                    f"[red]Error: Repository number {reponum} is out of range. Valid range: 1-{len(regular_repos)}[/red]"
+                )
+                raise typer.Exit(code=1)
+
+            # Get the repo to remove
+            repo_to_remove = regular_repos[repo_index]
+            repo_url = repo_to_remove.url
+
+            # Remove the repo reference from user config
+            sb.remove_repo_ref(repo_url)
+            console.print(f"[green]Removed repository: {repo_url}[/green]")
+
+        except ValueError:
+            console.print(
+                f"[red]Error: '{reponum}' is not a valid repository number. Please use a number from 'repo list'.[/red]"
+            )
+            raise typer.Exit(code=1)
 
 
 @app.command()
 def reindex(
-    repo: Annotated[
+    reponum: Annotated[
         str | None,
-        typer.Argument(
-            help="The repository name or number, if not specified reindex all."
-        ),
+        typer.Argument(help="The repository number, if not specified reindex all."),
     ] = None,
     force: bool = typer.Option(
         default=False, help="Reread FITS headers, even if they are already indexed."
     ),
 ):
     """
-    Reindex the named repository.
-    If no name is given, reindex all repositories.
+    Reindex a repository by number.
+    If no number is given, reindex all repositories.
+    Use 'starbash repo' to see the repository numbers.
     """
     with Starbash("repo-reindex") as sb:
-        if repo is None:
-            console.print("Reindexing all repositories...")
+        if reponum is None:
             sb.reindex_repos(force=force)
         else:
-            raise NotImplementedError("Reindexing a single repo not yet implemented.")
+            try:
+                # Parse the repo number (1-indexed)
+                repo_index = int(reponum) - 1
+
+                # Get only the regular (user-visible) repos
+                regular_repos = sb.repo_manager.regular_repos
+
+                if repo_index < 0 or repo_index >= len(regular_repos):
+                    console.print(
+                        f"[red]Error: Repository number {reponum} is out of range. Valid range: 1-{len(regular_repos)}[/red]"
+                    )
+                    raise typer.Exit(code=1)
+
+                # Get the repo to reindex
+                repo_to_reindex = regular_repos[repo_index]
+                console.print(f"Reindexing repository: {repo_to_reindex.url}")
+                sb.reindex_repo(repo_to_reindex, force=force)
+                console.print(
+                    f"[green]Successfully reindexed repository {reponum}[/green]"
+                )
+
+            except ValueError:
+                console.print(
+                    f"[red]Error: '{reponum}' is not a valid repository number. Please use a number from 'starbash repo'.[/red]"
+                )
+                raise typer.Exit(code=1)
 
 
 if __name__ == "__main__":

starbash/commands/selection.py

@@ -31,11 +31,31 @@ def target(
     with Starbash("selection-target") as sb:
         # For now, replace existing targets with this one
         # In the future, we could support adding multiple targets
-        sb.selection.clear()
+        sb.selection.targets = []
         sb.selection.add_target(target_name)
         console.print(f"[green]Selection limited to target: {target_name}[/green]")
 
 
+@app.command()
+def telescope(
+    telescope_name: Annotated[
+        str,
+        typer.Argument(
+            help="Telescope name to add to the selection (e.g., 'Vespera', 'EdgeHD 8')"
+        ),
+    ],
+):
+    """Limit the current selection to only the named telescope."""
+    with Starbash("selection-telescope") as sb:
+        # For now, replace existing telescopes with this one
+        # In the future, we could support adding multiple telescopes
+        sb.selection.telescopes = []
+        sb.selection.add_telescope(telescope_name)
+        console.print(
+            f"[green]Selection limited to telescope: {telescope_name}[/green]"
+        )
+
+
 @app.command()
 def date(
     operation: Annotated[

starbash/database.py

@@ -15,6 +15,9 @@ class Database:
 
     Stores data under the OS-specific user data directory using platformdirs.
     Provides an `images` table for FITS metadata and basic helpers.
+
+    The images table stores DATE-OBS and DATE as indexed SQL columns for
+    efficient date-based queries, while other FITS metadata is stored in JSON.
     """
 
     EXPTIME_KEY = "EXPTIME"
@@ -24,9 +27,11 @@ class Database:
     NUM_IMAGES_KEY = "num-images"
     EXPTIME_TOTAL_KEY = "exptime-total"
     DATE_OBS_KEY = "DATE-OBS"
+    DATE_KEY = "DATE"
     IMAGE_DOC_KEY = "image-doc"
     IMAGETYP_KEY = "IMAGETYP"
     OBJECT_KEY = "OBJECT"
+    TELESCOP_KEY = "TELESCOP"
 
     def __init__(
         self,
@@ -52,12 +57,14 @@ class Database:
         """Create the images and sessions tables if they don't exist."""
         cursor = self._db.cursor()
 
-        # Create images table
+        # Create images table with DATE-OBS and DATE as indexed columns
         cursor.execute(
             """
             CREATE TABLE IF NOT EXISTS images (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
                 path TEXT UNIQUE NOT NULL,
+                date_obs TEXT,
+                date TEXT,
                 metadata TEXT NOT NULL
             )
         """
@@ -70,6 +77,20 @@ class Database:
         """
         )
 
+        # Create index on date_obs for efficient date range queries
+        cursor.execute(
+            """
+            CREATE INDEX IF NOT EXISTS idx_images_date_obs ON images(date_obs)
+        """
+        )
+
+        # Create index on date for queries using DATE field
+        cursor.execute(
+            """
+            CREATE INDEX IF NOT EXISTS idx_images_date ON images(date)
+        """
+        )
+
         # Create sessions table
         cursor.execute(
             """
@@ -80,6 +101,7 @@ class Database:
                 filter TEXT NOT NULL,
                 imagetyp TEXT NOT NULL,
                 object TEXT NOT NULL,
+                telescop TEXT NOT NULL,
                 num_images INTEGER NOT NULL,
                 exptime_total REAL NOT NULL,
                 image_doc_id INTEGER
@@ -91,7 +113,7 @@ class Database:
         cursor.execute(
             """
             CREATE INDEX IF NOT EXISTS idx_sessions_lookup
-            ON sessions(filter, imagetyp, object, start, end)
+            ON sessions(filter, imagetyp, object, telescop, start, end)
         """
         )
 
@@ -102,23 +124,31 @@ class Database:
         """Insert or update an image record by unique path.
 
         The record must include a 'path' key; other keys are arbitrary FITS metadata.
+        DATE-OBS and DATE are extracted and stored as indexed columns for efficient queries.
         Returns the rowid of the inserted/updated record.
         """
         path = record.get("path")
         if not path:
             raise ValueError("record must include 'path'")
 
-        # Separate path from metadata
+        # Extract date fields for column storage
+        date_obs = record.get(self.DATE_OBS_KEY)
+        date = record.get(self.DATE_KEY)
+
+        # Separate path and date fields from metadata
         metadata = {k: v for k, v in record.items() if k != "path"}
         metadata_json = json.dumps(metadata)
 
         cursor = self._db.cursor()
         cursor.execute(
             """
-            INSERT INTO images (path, metadata) VALUES (?, ?)
-            ON CONFLICT(path) DO UPDATE SET metadata = excluded.metadata
+            INSERT INTO images (path, date_obs, date, metadata) VALUES (?, ?, ?, ?)
+            ON CONFLICT(path) DO UPDATE SET
+                date_obs = excluded.date_obs,
+                date = excluded.date,
+                metadata = excluded.metadata
         """,
-            (path, metadata_json),
+            (path, date_obs, date, metadata_json),
         )
 
         self._db.commit()
@@ -134,13 +164,38 @@ class Database:
         """Search for images matching the given conditions.
 
         Args:
-            conditions: Dictionary of metadata key-value pairs to match
+            conditions: Dictionary of metadata key-value pairs to match.
+                       Special keys:
+                       - 'date_start': Filter images with DATE-OBS >= this date
+                       - 'date_end': Filter images with DATE-OBS <= this date
 
         Returns:
             List of matching image records or None if no matches
         """
+        # Extract special date filter keys (make a copy to avoid modifying caller's dict)
+        conditions_copy = dict(conditions)
+        date_start = conditions_copy.pop("date_start", None)
+        date_end = conditions_copy.pop("date_end", None)
+
+        # Build SQL query with WHERE clauses for date filtering
+        where_clauses = []
+        params = []
+
+        if date_start:
+            where_clauses.append("date_obs >= ?")
+            params.append(date_start)
+
+        if date_end:
+            where_clauses.append("date_obs <= ?")
+            params.append(date_end)
+
+        # Build the query
+        query = "SELECT id, path, date_obs, date, metadata FROM images"
+        if where_clauses:
+            query += " WHERE " + " AND ".join(where_clauses)
+
         cursor = self._db.cursor()
-        cursor.execute("SELECT id, path, metadata FROM images")
+        cursor.execute(query, params)
 
         results = []
         for row in cursor.fetchall():
@@ -148,8 +203,15 @@ class Database:
             metadata["path"] = row["path"]
             metadata["id"] = row["id"]
 
-            # Check if all conditions match
-            match = all(metadata.get(k) == v for k, v in conditions.items())
+            # Add date fields back to metadata for compatibility
+            if row["date_obs"]:
+                metadata[self.DATE_OBS_KEY] = row["date_obs"]
+            if row["date"]:
+                metadata[self.DATE_KEY] = row["date"]
+
+            # Check if remaining conditions match (those stored in JSON metadata)
+            match = all(metadata.get(k) == v for k, v in conditions_copy.items())
+
             if match:
                 results.append(metadata)
 
@@ -175,7 +237,7 @@ class Database:
         cursor = self._db.cursor()
         cursor.execute(
             """
-            SELECT id, start, end, filter, imagetyp, object,
+            SELECT id, start, end, filter, imagetyp, object, telescop,
                    num_images, exptime_total, image_doc_id
             FROM sessions
         """
@@ -201,6 +263,7 @@ class Database:
                 self.FILTER_KEY: row["filter"],
                 self.IMAGETYP_KEY: row["imagetyp"],
                 self.OBJECT_KEY: row["object"],
+                self.TELESCOP_KEY: row["telescop"],
                 self.NUM_IMAGES_KEY: row["num_images"],
                 self.EXPTIME_TOTAL_KEY: row["exptime_total"],
                 self.IMAGE_DOC_KEY: row["image_doc_id"],
@@ -233,7 +296,10 @@ class Database:
     def get_image(self, path: str) -> dict[str, Any] | None:
         """Get an image record by path."""
         cursor = self._db.cursor()
-        cursor.execute("SELECT id, path, metadata FROM images WHERE path = ?", (path,))
+        cursor.execute(
+            "SELECT id, path, date_obs, date, metadata FROM images WHERE path = ?",
+            (path,),
+        )
         row = cursor.fetchone()
 
         if row is None:
@@ -242,18 +308,32 @@ class Database:
         metadata = json.loads(row["metadata"])
         metadata["path"] = row["path"]
         metadata["id"] = row["id"]
+
+        # Add date fields back to metadata for compatibility
+        if row["date_obs"]:
+            metadata[self.DATE_OBS_KEY] = row["date_obs"]
+        if row["date"]:
+            metadata[self.DATE_KEY] = row["date"]
+
         return metadata
 
     def all_images(self) -> list[dict[str, Any]]:
         """Return all image records."""
         cursor = self._db.cursor()
-        cursor.execute("SELECT id, path, metadata FROM images")
+        cursor.execute("SELECT id, path, date_obs, date, metadata FROM images")
 
         results = []
         for row in cursor.fetchall():
             metadata = json.loads(row["metadata"])
             metadata["path"] = row["path"]
             metadata["id"] = row["id"]
+
+            # Add date fields back to metadata for compatibility
+            if row["date_obs"]:
+                metadata[self.DATE_OBS_KEY] = row["date_obs"]
+            if row["date"]:
+                metadata[self.DATE_KEY] = row["date"]
+
             results.append(metadata)
 
         return results
@@ -263,7 +343,7 @@ class Database:
         cursor = self._db.cursor()
         cursor.execute(
             """
-            SELECT id, start, end, filter, imagetyp, object,
+            SELECT id, start, end, filter, imagetyp, object, telescop,
                    num_images, exptime_total, image_doc_id
             FROM sessions
         """
@@ -278,6 +358,7 @@ class Database:
                 self.FILTER_KEY: row["filter"],
                 self.IMAGETYP_KEY: row["imagetyp"],
                 self.OBJECT_KEY: row["object"],
+                self.TELESCOP_KEY: row["telescop"],
                 self.NUM_IMAGES_KEY: row["num_images"],
                 self.EXPTIME_TOTAL_KEY: row["exptime_total"],
                 self.IMAGE_DOC_KEY: row["image_doc_id"],
@@ -286,10 +367,47 @@ class Database:
 
         return results
 
+    def get_session_by_id(self, session_id: int) -> dict[str, Any] | None:
+        """Get a session record by its ID.
+
+        Args:
+            session_id: The database ID of the session
+
+        Returns:
+            Session record dictionary or None if not found
+        """
+        cursor = self._db.cursor()
+        cursor.execute(
+            """
+            SELECT id, start, end, filter, imagetyp, object, telescop,
+                   num_images, exptime_total, image_doc_id
+            FROM sessions
+            WHERE id = ?
+        """,
+            (session_id,),
+        )
+
+        row = cursor.fetchone()
+        if row is None:
+            return None
+
+        return {
+            "id": row["id"],
+            self.START_KEY: row["start"],
+            self.END_KEY: row["end"],
+            self.FILTER_KEY: row["filter"],
+            self.IMAGETYP_KEY: row["imagetyp"],
+            self.OBJECT_KEY: row["object"],
+            self.TELESCOP_KEY: row["telescop"],
+            self.NUM_IMAGES_KEY: row["num_images"],
+            self.EXPTIME_TOTAL_KEY: row["exptime_total"],
+            self.IMAGE_DOC_KEY: row["image_doc_id"],
+        }
+
     def get_session(self, to_find: dict[str, str]) -> dict[str, Any] | None:
         """Find a session matching the given criteria.
 
-        Searches for sessions with the same filter, image type, and target
+        Searches for sessions with the same filter, image type, target, and telescope
         whose start time is within +/- 8 hours of the provided date.
         """
         date = to_find.get(Database.START_KEY)
@@ -300,6 +418,7 @@ class Database:
         assert filter
         target = to_find.get(Database.OBJECT_KEY)
         assert target
+        telescop = to_find.get(Database.TELESCOP_KEY, "unspecified")
 
         # Convert the provided ISO8601 date string to a datetime, then
         # search for sessions with the same filter whose start time is
@@ -314,14 +433,14 @@ class Database:
         cursor = self._db.cursor()
         cursor.execute(
             """
-            SELECT id, start, end, filter, imagetyp, object,
+            SELECT id, start, end, filter, imagetyp, object, telescop,
                    num_images, exptime_total, image_doc_id
             FROM sessions
-            WHERE filter = ? AND imagetyp = ? AND object = ?
+            WHERE filter = ? AND imagetyp = ? AND object = ? AND telescop = ?
               AND start >= ? AND start <= ?
             LIMIT 1
         """,
-            (filter, image_type, target, start_min, start_max),
+            (filter, image_type, target, telescop, start_min, start_max),
         )
 
         row = cursor.fetchone()
@@ -335,6 +454,7 @@ class Database:
             self.FILTER_KEY: row["filter"],
             self.IMAGETYP_KEY: row["imagetyp"],
             self.OBJECT_KEY: row["object"],
+            self.TELESCOP_KEY: row["telescop"],
             self.NUM_IMAGES_KEY: row["num_images"],
             self.EXPTIME_TOTAL_KEY: row["exptime_total"],
             self.IMAGE_DOC_KEY: row["image_doc_id"],
@@ -376,8 +496,8 @@ class Database:
             cursor.execute(
                 """
                 INSERT INTO sessions
-                (start, end, filter, imagetyp, object, num_images, exptime_total, image_doc_id)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+                (start, end, filter, imagetyp, object, telescop, num_images, exptime_total, image_doc_id)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
             """,
                 (
                     new[Database.START_KEY],
@@ -385,6 +505,7 @@ class Database:
                     new[Database.FILTER_KEY],
                     new[Database.IMAGETYP_KEY],
                     new[Database.OBJECT_KEY],
+                    new.get(Database.TELESCOP_KEY, "unspecified"),
                     new[Database.NUM_IMAGES_KEY],
                     new[Database.EXPTIME_TOTAL_KEY],
                     new.get(Database.IMAGE_DOC_KEY),

starbash/defaults/starbash.toml

@@ -47,35 +47,3 @@ dir = "/workspaces/starbash/doc/toml/example/recipe-repo"
 # location in the sequence as if they were defined here
 #by-file = "process-osc-dual-duo"
 #by-url = "http:..."
-
-[config]
-
-# What fits fields should we store in our DB cache
-fits-whitelist = [
-    "INSTRUME",
-    "FILTER",
-    "TELESCOP",
-    "IMAGETYP",
-    "DATE-OBS",
-    "DATE-LOC",
-    "DATE",
-    "EXPTIME",  # Use use this instead of EXPOSURE because it seems like not all apps use EXPOSURE (Siril)
-    "FWHEEL",
-    "OBJECT",
-    "RA",       # we ignore the text version OBJCTRA / OBJCTDEC
-    "DEC",
-    "OBJCTROT",
-    "FOCPOS",
-    "SITELAT",
-    "SITELON",
-    "SITEELEV",
-    "NAXIS1",
-    "NAXIS2",
-    "SWCREATE",
-    "XBINNING",
-    "YBINNING",
-    "GAIN",
-    "CCD-TEMP",
-    "SET-TEMP",
-    "AMBTEMP",
-]

starbash/main.py

@@ -59,6 +59,7 @@ def session():
             table.add_column("# images", style="cyan", no_wrap=True)
             table.add_column("Time", style="cyan", no_wrap=True)
             table.add_column("Type/Filter", style="cyan", no_wrap=True)
+            table.add_column("Telescope", style="cyan", no_wrap=True)
             table.add_column(
                 "About", style="cyan", no_wrap=True
             )  # type of frames, filter, target
@@ -80,6 +81,7 @@ def session():
                 object = str(sess.get(Database.OBJECT_KEY, "N/A"))
                 filter = sess.get(Database.FILTER_KEY, "N/A")
                 image_type = str(sess.get(Database.IMAGETYP_KEY, "N/A"))
+                telescop = str(sess.get(Database.TELESCOP_KEY, "N/A"))
 
                 # Format total exposure time as integer seconds
                 exptime_raw = str(sess.get(Database.EXPTIME_TOTAL_KEY, "N/A"))
@@ -100,14 +102,17 @@ def session():
                 type_str = image_type
                 if image_type.upper() == "LIGHT":
                     image_type = filter
-                if image_type.upper() == "FLAT":
+                elif image_type.upper() == "FLAT":
                     image_type = f"{image_type}/{filter}"
+                else:  # either bias or dark
+                    object = ""  # Don't show meaningless target
 
                 table.add_row(
                     date,
                     str(num_images),
                     total_secs,
                     image_type,
+                    telescop,
                     object,
                 )
 
@@ -119,6 +124,7 @@ def session():
                     f"[bold]{format_duration(int(total_seconds))}[/bold]",
                     "",
                     "",
+                    "",
                 )
 
             console.print(table)

starbash/repo/manager.py

@@ -245,6 +245,11 @@ class RepoManager:
         # Most users will just want to read from merged
         self.merged = MultiDict()
 
+    @property
+    def regular_repos(self) -> list[Repo]:
+        "We exclude certain repo types (preferences, recipe) from the list of repos users care about."
+        return [r for r in self.repos if r.kind not in ("preferences", "recipe")]
+
     def add_repo(self, url: str) -> Repo:
         logging.debug(f"Adding repo: {url}")
         r = Repo(self, url)

starbash/selection.py

@@ -17,6 +17,7 @@ class Selection:
     - Date ranges
     - Filters
     - Image types
+    - Telescope names
 
     The selection state is saved to disk and can be used to build database queries.
     """
@@ -33,6 +34,7 @@ class Selection:
         self.date_end: Optional[str] = None
         self.filters: list[str] = []
         self.image_types: list[str] = []
+        self.telescopes: list[str] = []
 
         # Load existing state if it exists
         self._load()
@@ -48,6 +50,7 @@ class Selection:
                     self.date_end = data.get("date_end")
                     self.filters = data.get("filters", [])
                     self.image_types = data.get("image_types", [])
+                    self.telescopes = data.get("telescopes", [])
                 logging.debug(f"Loaded selection state from {self.state_file}")
             except Exception as e:
                 logging.warning(f"Failed to load selection state: {e}")
@@ -64,6 +67,7 @@ class Selection:
                 "date_end": self.date_end,
                 "filters": self.filters,
                 "image_types": self.image_types,
+                "telescopes": self.telescopes,
             }
 
             with open(self.state_file, "w") as f:
@@ -79,6 +83,7 @@ class Selection:
         self.date_end = None
         self.filters = []
         self.image_types = []
+        self.telescopes = []
         self._save()
 
     def add_target(self, target: str) -> None:
@@ -101,6 +106,26 @@ class Selection:
             self.targets.remove(target)
             self._save()
 
+    def add_telescope(self, telescope: str) -> None:
+        """Add a telescope to the selection.
+
+        Args:
+            telescope: Telescope name to add to the selection
+        """
+        if telescope not in self.telescopes:
+            self.telescopes.append(telescope)
+            self._save()
+
+    def remove_telescope(self, telescope: str) -> None:
+        """Remove a telescope from the selection.
+
+        Args:
+            telescope: Telescope name to remove from the selection
+        """
+        if telescope in self.telescopes:
+            self.telescopes.remove(telescope)
+            self._save()
+
     def set_date_range(
         self, start: Optional[str] = None, end: Optional[str] = None
     ) -> None:
@@ -146,6 +171,7 @@ class Selection:
             and self.date_end is None
             and not self.filters
             and not self.image_types
+            and not self.telescopes
         )
 
     def get_query_conditions(self) -> dict[str, Any]:
@@ -173,6 +199,13 @@ class Selection:
             # TODO: Support multiple filters in queries
             conditions["FILTER"] = self.filters[0] if len(self.filters) == 1 else None
 
+        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
+            )
+
         # Add date range conditions
         if self.date_start:
             conditions["date_start"] = self.date_start
@@ -198,6 +231,9 @@ class Selection:
         if self.targets:
             summary["criteria"].append(f"Targets: {', '.join(self.targets)}")
 
+        if self.telescopes:
+            summary["criteria"].append(f"Telescopes: {', '.join(self.telescopes)}")
+
         if self.date_start or self.date_end:
             date_range = []
             if self.date_start:

starbash/templates/userconfig.toml

@@ -17,5 +17,37 @@ kind = "preferences"
 # website = "https://yourwebsite"
 # license = "FIXME eventually applied as the default license for generated images Creative commons etc..."
 
+
+# [config]
+# Filters fits fields should we store in our DB cache.  By default we store all fits headers.
+#fits-whitelist = [
+#    "INSTRUME",
+#    "FILTER",
+#    "TELESCOP",
+#    "IMAGETYP",
+#    "DATE-OBS",
+#    "DATE-LOC",
+#    "DATE",
+#    "EXPTIME",  # Use use this instead of EXPOSURE because it seems like not all apps use EXPOSURE (Siril)
+#    "FWHEEL",
+#    "OBJECT",
+#    "RA",       # we ignore the text version OBJCTRA / OBJCTDEC
+#    "DEC",
+#    "OBJCTROT",
+#    "FOCPOS",
+#    "SITELAT",
+#    "SITELON",
+#    "SITEELEV",
+#    "NAXIS1",
+#    "NAXIS2",
+#    "SWCREATE",
+#    "XBINNING",
+#    "YBINNING",
+#    "GAIN",
+#    "CCD-TEMP",
+#    "SET-TEMP",
+#    "AMBTEMP",
+#]
+
 # DO NOT edit below this line, they are managed automatically via
 # the "sb repo add" etc... commands.

starbash-0.1.3.dist-info/METADATA

@@ -0,0 +1,114 @@
+Metadata-Version: 2.4
+Name: starbash
+Version: 0.1.3
+Summary: 
+License-File: LICENSE
+Author: Kevin Hester
+Author-email: kevinh@geeksville.com
+Requires-Python: >=3.12,<3.15
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: astropy (>=7.1.1,<8.0.0)
+Requires-Dist: multidict (>=6.7.0,<7.0.0)
+Requires-Dist: platformdirs (>=4.5.0,<5.0.0)
+Requires-Dist: restrictedpython (>=8.1,<9.0)
+Requires-Dist: rich (>=14.2.0,<15.0.0)
+Requires-Dist: sentry-sdk (>=2.42.1,<3.0.0)
+Requires-Dist: tomlkit (>=0.13.3,<0.14.0)
+Requires-Dist: typer (>=0.20.0,<0.21.0)
+Description-Content-Type: text/markdown
+
+# Starbash
+
+![PyPI - Version](https://img.shields.io/pypi/v/starbash)
+![GitHub branch check runs](https://img.shields.io/github/check-runs/geeksville/starbash/main)
+
+ ![app icon](https://github.com/geeksville/starbash/blob/main/img/icon.png "Starbash: Astrophotography workflows simplified")
+
+A tool for automating/standardizing/sharing astrophotography workflows.
+
+# Current status
+
+Not quite ready 😊.  But making good progress.
+
+See the current [TODO](TODO.md) file for work items.  I'll be looking for pre-alpha testers/feedback soon.
+
+## Current features
+
+* Automatically recognizes and auto-parses the default NINA, Asiair and Seestar raw file repos (adding support for other layouts is easy)
+* Multisession support by default (including automatic selection of correct flats, biases and dark frames)
+* 'Repos' can contain raw files, generated masters, preprocessed files, or recipes.
+
+## Features coming soon
+
+* Automatically performs **complete** preprocessing on OSC (broadband, narrowband or dual Duo filter), Mono (LRGB, SHO) data.  i.e. give you 'seestar level' auto-preprocessing, so you only need to do the (optional) custom post-processing.
+* Generates a per target report/config file which can be customized if the detected defaults or preprocessing are not what you want
+* 'Recipes' provide repeatable/human-readable/sharable descriptions of all processing steps
+* Repos can be on the local disk or shared via HTTPS/github/etc.  This is particularly useful for recipe repos
+* Uses Siril and Graxpert for its pre-processing operations (support for Pixinsight based recipies will probably be coming at some point...)
+* The target report can be used to auto generate a human friendly 'postable/sharable' report about that image
+* Target reports are sharable so that you can request comments by others and others can rerender with different settings
+
+## Installing
+
+Currently the easiest way to install this command-line based tool is to install is via [pipx](https://pipx.pypa.io/stable/).  If you don't already have pipx and you have python installed, you can auto install it by running "pip install --user pipx."  If you don't have python installed see the pipx link for pipx installers for any OS.
+
+Once pipx is installed just run:
+
+```
+pipx install starbash
+```
+
+## Supported commands
+
+### Setup & Configuration
+- `sb setup` - Configure starbash via a brief guided process
+- `sb info` - Show user preferences location and other app info
+
+### Repository Management
+- `sb repo [--verbose]` - List installed repos (use `-v` for details)
+- `sb repo add <filepath|URL>` - Add a repository
+- `sb repo remove <REPONUM>` - Remove the indicated repo from the repo list
+- `sb repo reindex [--force] [REPONUM]` - Reindex the specified repo (or all repos if none specified)
+
+### User Preferences
+- `sb user name "Your Name"` - Set name for attribution in generated images
+- `sb user email "foo@example.com"` - Set email for attribution in generated images
+- `sb user analytics <on|off>` - Turn analytics collection on/off
+
+### Selection & Filtering
+- `sb selection` - Show information about the current selection
+- `sb selection any` - Remove all filters (select everything)
+- `sb selection target <TARGETNAME>` - Limit selection to the named target
+- `sb selection telescope <TELESCOPENAME>` - Limit selection to the named telescope
+- `sb selection date <after|before|between> <DATE> [DATE]` - Limit to sessions in the specified date range
+
+### Viewing Data
+- `sb session` - List sessions (filtered based on the current selection)
+- `sb target` - List targets (filtered based on the current selection)
+- `sb instrument` - List instruments (filtered based on the current selection)
+- `sb filter` - List all filters found in current selection
+
+### Export & Processing
+- `sb export <dirs|BIAS|LIGHT|DARK|FLAT> [DIRLOC]` - Export data
+- `sb process siril` - Generate Siril directory tree and run Siril GUI
+- `sb process auto` - Automatic processing
+- `sb process masters` - Generate master flats, darks, and biases from available raw frames
+
+## Supported tools (now)
+
+* Siril
+* Graxpert
+* Python (you can add python code to recipies if necessary)
+
+## Supported tools (future?)
+
+* Pixinsight?
+* Autostakkert?
+
+## Developing
+
+We try to make this project useful and friendly.  If you find problems please file a github issue.
+We accept pull-requests and enjoy discussing possible new development directions via github issues.  If you might want to work on this, just describe what your interests are and we can talk about how to get it merged.

starbash-0.1.3.dist-info/RECORD

@@ -0,0 +1,24 @@
+starbash/__init__.py,sha256=co39eIssQlFxWfO3cDhp52reRy6qEyJX5u5K8OsxiDk,138
+starbash/analytics.py,sha256=0TfiZthKRMqW38Jg1VJDjpykZXBrK33tNKuhQibkCK0,3579
+starbash/app.py,sha256=7GdznZHSxpsQ5ZrW0nPgvSEGAwgijfpbw2rINNU1hcU,16228
+starbash/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+starbash/commands/repo.py,sha256=UyfAD6A0fP8DV1uMRJz_NydDkP0UiHbxtceZ25_g7r8,4641
+starbash/commands/selection.py,sha256=gI6LSvs8CW5t2pW0peCLL5O87WqLkS9LDuaK2gI1NeM,4600
+starbash/commands/user.py,sha256=JpwYa9cYxm2gkekcxrj7CsbJO7fgbGwRxmjvpua0BOY,1598
+starbash/database.py,sha256=59u78srp3G4Ya0HOIP2qOokp2osQPFgUQM_8TbfIjPg,17936
+starbash/defaults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+starbash/defaults/starbash.toml,sha256=WWM7igZ-GXk4bM7qSFtjHaVh7beqisCkeVBjs7c2G6I,1774
+starbash/main.py,sha256=8D4Xa0WwM3TDW-HkaQUTo79Uh8hAXgOJYyEEkUgC7HQ,5391
+starbash/paths.py,sha256=BKKnSXt3tOh16o7ljDcQLtWKIiepEmud9JFtzRwDHtg,1317
+starbash/repo/__init__.py,sha256=TqspuLjPSNnO38tvCGa0fJvvasgecHl6fE7m0-Lj8ho,148
+starbash/repo/manager.py,sha256=NRMGmDWt8KV8OdsrgPiuQ91EPi8xlSbVtOWGgSePuOk,10944
+starbash/selection.py,sha256=DPzUlls3n-sBqkwTUns2ZNaPi61PGnh7Z_ZQOC1jXYc,8347
+starbash/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+starbash/templates/userconfig.toml,sha256=eaBMgac4RCdvlGV6cKPqRuVyF_ijfkvEF-c3LJ6_euw,1440
+starbash/tool.py,sha256=S1kOTbeHTrA0meqwftgL0SA4VhJdZWWx2h1Wtwu1Izg,8749
+starbash/url.py,sha256=lorxQJ27jSfzsKCb0QvpcvLiPZG55Dkd_c1JPFbni4I,402
+starbash-0.1.3.dist-info/METADATA,sha256=zdFUMvEJQ8Aq28LTkcQDtvY_uu6G7Efy5w2FTH4IH_E,5295
+starbash-0.1.3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+starbash-0.1.3.dist-info/entry_points.txt,sha256=REQyWs8e5TJsNK7JVVWowKVoytMmKlUwuFHLTmSX4hc,67
+starbash-0.1.3.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
+starbash-0.1.3.dist-info/RECORD,,

starbash-0.1.1.dist-info/METADATA

@@ -1,96 +0,0 @@
-Metadata-Version: 2.4
-Name: starbash
-Version: 0.1.1
-Summary: 
-License-File: LICENSE
-Author: Kevin Hester
-Author-email: kevinh@geeksville.com
-Requires-Python: >=3.12,<3.15
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
-Requires-Dist: astropy (>=7.1.1,<8.0.0)
-Requires-Dist: multidict (>=6.7.0,<7.0.0)
-Requires-Dist: platformdirs (>=4.5.0,<5.0.0)
-Requires-Dist: restrictedpython (>=8.1,<9.0)
-Requires-Dist: rich (>=14.2.0,<15.0.0)
-Requires-Dist: sentry-sdk (>=2.42.1,<3.0.0)
-Requires-Dist: tomlkit (>=0.13.3,<0.14.0)
-Requires-Dist: typer (>=0.20.0,<0.21.0)
-Description-Content-Type: text/markdown
-
-# Starbash
-
-![PyPI - Version](https://img.shields.io/pypi/v/starbash)
-![GitHub branch check runs](https://img.shields.io/github/check-runs/geeksville/starbash/main)
-
- ![app icon](https://github.com/geeksville/starbash/blob/main/img/icon.png "Starbash: Astrophotography workflows simplified")
-
-A tool for automating/standardizing/sharing astrophotography workflows.
-
-# Current status
-
-Not quite ready 😊.  But making good progress.
-
-See my personal [TODO](TODO.md) file.  I'll be looking for pre-alpha testers/feedback soon.
-
-## features
-
-* Automatically recognizes and auto-parses the default NINA, Asiair and Seestar raw file repo layouts (adding support for other layouts is easy)
-* Automatically performs preprocessing on OSC (broadband, narrowband or dual Duo filter), Mono (LRGB, SHO) data
-* Multisession support by default (including auto selection of correct flats, biases and dark frames)
-* Generates a per target report/config file which can be customized if the detected defaults are not what you want
-* 'Recipes' provide repeatable/human-readable/sharable descriptions of all processing steps
-* 'Repos' can contain raw files, generated masters, preprocessed files, or recipes.
-* Repos can be on the local disk or shared via HTTPS/github/etc.  This is particularly useful for recipe repos
-
-## Supported commands
-
-* setup - configure for you via a brief guided process
-* info - show user preferences location and other app info
-
-* repo add file/path|URL
-* repo remove REPONAME|REPONUM
-* repo list
-* repo reindex REPONAME|REPONUM|all
-
-* user analytics on|off - turn analytics collection on/off
-* user name "Your Name" - used for attribution in generated images
-* user email "foo@blah.com" - used for attribution in generated images
-
-* selection any - remove any filters on sessions, etc...
-* selection target TARGETNAME - limit the current selection to only the named targets
-* selection date op DATE - limit to sessions in the specified date range
-* selection - list information about the current selection
-
-* target - list targets (filtered based on the current selection)
-
-* session- list sessions (filtered based on the current selection)
-
-* instrument - list instruments (filtered based on the current selection)
-
-* filter - list all filters found in current selection
-
-* export dirs|BIAS|LIGHT|DARK|FLAT [DIRLOC]
-
-* process auto
-* process masters - generate master flats, darks, biases from any raws that are available
-
-## Supported tools
-
-* Siril
-* Graxpert
-
-# Future status
-
-## Supported tools
-
-* Pixinsight?
-* Autostakkert?
-
-## Features
-
-* The target report can be used to auto generate a human friendly 'postable/sharable' report about that image
-* Target reports are sharable so that you can request comments by others and others can rerender with different settings
-

starbash-0.1.1.dist-info/RECORD

@@ -1,24 +0,0 @@
-starbash/__init__.py,sha256=co39eIssQlFxWfO3cDhp52reRy6qEyJX5u5K8OsxiDk,138
-starbash/analytics.py,sha256=0TfiZthKRMqW38Jg1VJDjpykZXBrK33tNKuhQibkCK0,3579
-starbash/app.py,sha256=sYEgemSDZEX7yih2p_aFlrsCypWjx2zNDsNHJ_DNF0E,13319
-starbash/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-starbash/commands/repo.py,sha256=WuOg15p9LnJ6aIWIXYCKY9guRIUCq3XapyO7oi1v3hQ,1874
-starbash/commands/selection.py,sha256=4bpjYWne9ekg1EIOJS15Ymj2Hyr-jc2Te4N4mXepkpI,3941
-starbash/commands/user.py,sha256=JpwYa9cYxm2gkekcxrj7CsbJO7fgbGwRxmjvpua0BOY,1598
-starbash/database.py,sha256=jQyuZ-sFwbAIv6Wtn4VnPVQChQMP4y1rVjrEgp2iLoA,13513
-starbash/defaults/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-starbash/defaults/starbash.toml,sha256=RVfYikW5xhpZUt83U5k7O2hprswgFvDFykCWkHL37QU,2384
-starbash/main.py,sha256=7N28XCu43IUijIaTrT9ZY_aWxEmJGDdTLWdfhw_omOc,5084
-starbash/paths.py,sha256=BKKnSXt3tOh16o7ljDcQLtWKIiepEmud9JFtzRwDHtg,1317
-starbash/repo/__init__.py,sha256=TqspuLjPSNnO38tvCGa0fJvvasgecHl6fE7m0-Lj8ho,148
-starbash/repo/manager.py,sha256=XBiZXMgVKd7faddwugtWVbeR8XuJF8sZi8yAiDxT6wM,10701
-starbash/selection.py,sha256=4u4h30VeC_e8PWFdtNWA9C7AyYrcAgg3BEagSynaxMM,7111
-starbash/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-starbash/templates/userconfig.toml,sha256=NinuXl8L0xxSvI4FFZD8ye836yv8TaUP0a5VMEc-w1w,757
-starbash/tool.py,sha256=S1kOTbeHTrA0meqwftgL0SA4VhJdZWWx2h1Wtwu1Izg,8749
-starbash/url.py,sha256=lorxQJ27jSfzsKCb0QvpcvLiPZG55Dkd_c1JPFbni4I,402
-starbash-0.1.1.dist-info/METADATA,sha256=EjekS6hjvRkPf-Ka0ZUa0_XhRp50YwABIjOBlStvyH4,3539
-starbash-0.1.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-starbash-0.1.1.dist-info/entry_points.txt,sha256=REQyWs8e5TJsNK7JVVWowKVoytMmKlUwuFHLTmSX4hc,67
-starbash-0.1.1.dist-info/licenses/LICENSE,sha256=ixuiBLtpoK3iv89l7ylKkg9rs2GzF9ukPH7ynZYzK5s,35148
-starbash-0.1.1.dist-info/RECORD,,