starbash 0.2.5__tar.gz → 0.2.7__tar.gz

{starbash-0.2.5 → starbash-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: starbash
-Version: 0.2.5
+Version: 0.2.7
 Summary: A tool for automating/standardizing/sharing astrophotography workflows.
 License-File: LICENSE
 Author: Kevin Hester
@@ -13,16 +13,14 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: astropy (>=7.1.1,<8.0.0)
 Requires-Dist: doit (>=0.36.0,<0.37.0)
 Requires-Dist: graxpert[cpuonly] (>=3.2.0a2,<4.0.0)
-Requires-Dist: multidict (>=6.7.0,<7.0.0)
 Requires-Dist: numpy (==2.2.6)
 Requires-Dist: platformdirs (>=4.5.0,<5.0.0)
 Requires-Dist: pyqt6 (>=6.10.1,<7.0.0)
-Requires-Dist: requests-cache (>=1.2.1,<2.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: textual (>=6.8.0,<7.0.0)
-Requires-Dist: tomlkit (>=0.13.3,<0.14.0)
+Requires-Dist: toml-repo (>=0.1.6,<0.2.0)
 Requires-Dist: typer (>=0.20.0,<0.21.0)
 Requires-Dist: update-checker (>=0.18.0,<0.19.0)
 Project-URL: Documentation, https://github.com/geeksville/starbash/blob/main/README.md

{starbash-0.2.5 → starbash-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "starbash"
-version = "0.2.5"
+version = "0.2.7"
 description = "A tool for automating/standardizing/sharing astrophotography workflows."
 authors = ["Kevin Hester <kevinh@geeksville.com>"]
 readme = "README.md"
@@ -9,13 +9,13 @@ repository = "https://github.com/geeksville/starbash"
 documentation = "https://github.com/geeksville/starbash/blob/main/README.md" # FIXME provide something better
 packages = [
     { include = "starbash", from = "src" },
-    { include = "repo", from = "src" },
 ]
 
 [tool.poetry.dependencies]
 python = ">=3.12,<3.15"         # RestrictedPython doesn't yet work on 3.15
-tomlkit = ">=0.13.3,<0.14.0"
-multidict = ">=6.7.0,<7.0.0"
+
+# Note: to use toml-repo from the local submodule rather than pypi use:
+# toml-repo = {path = "toml-repo", develop = true}
 rich = ">=14.2.0,<15.0.0"
 restrictedpython = ">=8.1,<9.0"
 astropy = ">=7.1.1,<8.0.0"
@@ -23,7 +23,6 @@ platformdirs = ">=4.5.0,<5.0.0"
 typer = "^0.20.0"
 sentry-sdk = "^2.42.1"
 update-checker = "^0.18.0"
-requests-cache = "^1.2.1"
 doit = "^0.36.0"
 textual = "^6.8.0"
 
@@ -35,9 +34,10 @@ graxpert = {version = "^3.2.0a2", extras = ["cpuonly"]}
 # experimenting with siril-scripts/processing/VeraLux_HyperMetric_Stretch.py
 numpy = "2.2.6"
 pyqt6 = "^6.10.1"
+toml-repo = "^0.1.6"
 
 [tool.poetry.group.dev.dependencies]
-pytest = ">=8.4.2,<9.0.0"
+pytest = ">=8.4.2,<10.0.0"
 pytest-cov = "^6.0.0"
 pytest-xdist = "^3.8.0"
 pre-commit = "^4.3.0"
@@ -117,19 +117,22 @@ exclude = [
 [tool.ruff.lint]
 # Enable these rule sets
 select = [
-    "E",  # pycodestyle errors
-    "F",  # pyflakes
-    "I",  # isort (import sorting)
-    "W",  # pycodestyle warnings
-    "UP", # pyupgrade
-    "B",  # flake8-bugbear
+    "E",   # pycodestyle errors
+    "F",   # pyflakes
+    "I",   # isort (import sorting)
+    "W",   # pycodestyle warnings
+    "UP",  # pyupgrade
+    "B",   # flake8-bugbear
+    "ANN", # flake8-annotations (type annotation enforcement)
 ]
 
 # Ignore specific rules that are too noisy for this codebase
 ignore = [
-    "E501", # Line too long (handled by formatter)
-    "B904", # Within an `except` clause, raise exceptions with `raise ... from err`
-    "B006", # Do not use mutable data structures for argument defaults
+    "E501",   # Line too long (handled by formatter)
+    "B904",   # Within an `except` clause, raise exceptions with `raise ... from err`
+    "B006",   # Do not use mutable data structures for argument defaults
+    "ANN401", # Dynamically typed expressions (Any) are sometimes necessary
+    "ANN204", # Missing return type for __init__ / __new__ / __post_init__
 ]
 
 [tool.ruff.lint.per-file-ignores]
@@ -142,14 +145,15 @@ ignore = [
     "F401",    # Imported but unused
     "F841",    # Local variable assigned but never used
     "PLC0415", # Import should be at top of file
+    "ANN",     # Type annotations not required in tests
 ]
 
 [tool.basedpyright]
 # Enable import validation to catch runtime import errors at analysis time
 include = ["src"]
 exclude = ["**/__pycache__", ".venv", "build", "dist"]
-extraPaths = ["GraXpert"]  # Include local GraXpert package for type checking
-typeCheckingMode = "basic"                             # Catches import errors without being overly strict
+extraPaths = ["GraXpert", "toml-repo"]  # Include local sources for type checking
+typeCheckingMode = "standard"                          # Standard type checking: catches type errors, missing annotations, etc.
 reportMissingImports = true
 reportImportCycles = true
 reportUndefinedVariable = true

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/__init__.py

@@ -5,6 +5,12 @@ from typing import Any
 
 from rich.console import Console
 
+# Configure toml_repo for starbash's conventions before any repo operations
+from toml_repo import set_config_suffix, set_pkg_resource_root
+
+set_config_suffix("starbash.toml")
+set_pkg_resource_root("starbash")
+
 # Common type aliases for clarity
 type StageDict = dict[str, Any]  # a processing stage definition from our toml
 type InputDef = dict[Any, Any]  # an input definition within a stage

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/analytics.py

@@ -1,6 +1,8 @@
 import logging
 import os
 import platform
+import types
+from typing import Any
 
 from sentry_sdk.integrations.excepthook import ExcepthookIntegration
 
@@ -121,17 +123,22 @@ def analytics_exception(exc: BaseException) -> bool:
 class NopAnalytics:
     """Used when users have disabled analytics/crash reporting."""
 
-    def __enter__(self):
+    def __enter__(self) -> "NopAnalytics":
         return self
 
-    def __exit__(self, exc_type, exc_value, traceback):
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: types.TracebackType | None,
+    ) -> bool:
         return False
 
-    def set_data(self, key, value):
+    def set_data(self, key: str, value: Any) -> None:
         pass
 
 
-def analytics_start_span(**kwargs):
+def analytics_start_span(**kwargs: Any) -> Any:
     """Start an analytics/tracing span if analytics is enabled, otherwise return a no-op context manager."""
     if analytics_allowed:
         import sentry_sdk
@@ -141,7 +148,7 @@ def analytics_start_span(**kwargs):
         return NopAnalytics()
 
 
-def analytics_start_transaction(**kwargs):
+def analytics_start_transaction(**kwargs: Any) -> Any:
     """Start an analytics/tracing transaction if analytics is enabled, otherwise return a no-op context manager."""
     if analytics_allowed:
         import sentry_sdk

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/app.py

@@ -1,6 +1,7 @@
 import faulthandler
 import logging
 import sys
+import types
 from importlib.metadata import version
 from pathlib import Path
 from sqlite3 import OperationalError
@@ -12,9 +13,9 @@ import typer
 from astropy.io import fits
 from rich.logging import RichHandler
 from rich.progress import track
+from toml_repo import Repo, RepoManager, get_config_suffix
 
 import starbash
-from repo import Repo, RepoManager, repo_suffix
 from starbash.aliases import (
     Aliases,
     get_aliases,
@@ -52,7 +53,7 @@ critical_keys = [Database.DATE_OBS_KEY, Database.IMAGETYP_KEY]
 force_local_recipes = False  # Set to True to always use local recipes for testing
 
 
-def setup_logging(console: rich.console.Console):
+def setup_logging(console: rich.console.Console) -> None:
     """
     Configures basic logging.
     """
@@ -297,7 +298,7 @@ class Starbash:
     def __enter__(self) -> "Starbash":
         return self
 
-    def __exit__(self, exc_type, exc, tb) -> bool:
+    def __exit__(self, exc_type: type[BaseException] | None, exc: BaseException | None, tb: types.TracebackType | None) -> bool:
         from starbash import _is_test_env
         from starbash.exception import UserHandledError
 
@@ -379,7 +380,7 @@ class Starbash:
         p = Path(path)
         console = starbash.console
 
-        repo_toml = p / repo_suffix  # the starbash.toml file at the root of the repo
+        repo_toml = p / get_config_suffix()  # the starbash.toml file at the root of the repo
         if repo_toml.exists():
             logging.debug("Using existing repository config file: %s", repo_toml)
         else:
@@ -387,7 +388,7 @@ class Starbash:
                 console.print(f"Creating {repo_type} repository: {p}")
                 toml_from_template(
                     f"repo/{repo_type}",
-                    p / repo_suffix,
+                    p / get_config_suffix(),
                     overrides={
                         "REPO_TYPE": repo_type,
                         "REPO_PATH": str(p),
@@ -758,7 +759,7 @@ class Starbash:
             # (otherwise invariants will get messed up)
             self._add_session(headers)
 
-    def reindex_repo(self, repo: Repo, subdir: str | None = None):
+    def reindex_repo(self, repo: Repo, subdir: str | None = None) -> None:
         """Reindex all repositories managed by the RepoManager."""
 
         # make sure this new repo is listed in the repos table
@@ -790,9 +791,9 @@ class Starbash:
                     else:
                         self.add_image_and_session(repo, f, force=starbash.force_regen)
                 except OSError as e:
-                    logging.error(f'Skipping file due to "{f}": {e}')
+                    logging.error(f'Skipping "{f}" due to: [red]{e}[/red]')
 
-    def reindex_repos(self):
+    def reindex_repos(self) -> None:
         """Reindex all repositories managed by the RepoManager."""
         logging.debug("Reindexing all repositories...")
 

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/check_version.py

@@ -11,7 +11,7 @@ __all__ = [
 _is_connected: bool | None = None
 
 
-def is_connected(host="8.8.8.8", port=53, timeout=3) -> bool:
+def is_connected(host: str = "8.8.8.8", port: int = 53, timeout: int = 3) -> bool:
     """
     Host: 1.1.1.1 (Cloudflare DNS) or 8.8.8.8 (Google DNS) (it is important to not use domain names)
     Port: 53/tcp
@@ -37,7 +37,7 @@ def is_connected(host="8.8.8.8", port=53, timeout=3) -> bool:
         socket.setdefaulttimeout(old_timeout)
 
 
-def check_version():
+def check_version() -> None:
     """Check if a newer version of starbash is available on PyPI."""
     try:
         if is_connected():

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/commands/info.py

@@ -62,21 +62,21 @@ def dump_column(sb: Starbash, human_name: str, column_name: str) -> None:
 
 
 @app.command()
-def target():
+def target() -> None:
     """List targets (filtered based on the current selection)."""
     with Starbash("info.target") as sb:
         dump_column(sb, "Target", Database.OBJECT_KEY)
 
 
 @app.command()
-def telescope():
+def telescope() -> None:
     """List telescopes/instruments (filtered based on the current selection)."""
     with Starbash("info.telescope") as sb:
         dump_column(sb, "Telescope", Database.TELESCOP_KEY)
 
 
 @app.command()
-def filter():
+def filter() -> None:
     """List all filters (filtered based on the current selection)."""
     with Starbash("info.filter") as sb:
         dump_column(sb, "Filter", Database.FILTER_KEY)
@@ -93,7 +93,7 @@ def master(
         str | None,
         kind_arg,
     ] = None,
-):
+) -> None:
     """List all precalculated master images (darks, biases, flats)."""
     with Starbash("info.master") as sb:
         from starbash import console
@@ -146,13 +146,13 @@ def masters(
         str | None,
         kind_arg,
     ] = None,
-):
+) -> None:
     """Alias for 'info master' command."""
     master(kind)
 
 
 @app.callback(invoke_without_command=True)
-def main_callback(ctx: typer.Context):
+def main_callback(ctx: typer.Context) -> None:
     """Show user preferences location and other app info.
 
     This is the default command when no subcommand is specified.

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/commands/process.py

@@ -39,7 +39,7 @@ def siril(
             help="Automatically launch Siril GUI after generating directory tree",
         ),
     ] = False,
-):
+) -> None:
     """Generate Siril directory tree and optionally run Siril GUI.
 
     Creates a properly structured directory tree for Siril processing with
@@ -64,7 +64,7 @@ def siril(
 
         # Get images for this session
 
-        def session_to_dir(src_session: SessionRow, subdir_name: str):
+        def session_to_dir(src_session: SessionRow, subdir_name: str) -> None:
             """Copy the images from the specified session to the subdir"""
             img_dir = output_dir / subdir_name
             img_dir.mkdir(parents=True, exist_ok=True)
@@ -196,7 +196,7 @@ def auto(
             help="Don't automatically generated master frames",
         ),
     ] = False,
-):
+) -> None:
     """Automatic processing with sensible defaults.
 
     If session number is specified, processes only that session.
@@ -254,7 +254,7 @@ def auto(
 )
 def doit(
     ctx: typer.Context,
-):
+) -> None:
     """(private) for developer debugging of the underlying 'doit' dependency system.
 
     You probably don't need to use this - unless you are a starbash developer.
@@ -268,7 +268,7 @@ def doit(
 
 
 @app.command()
-def masters():
+def masters() -> None:
     """Generate master flats, darks, and biases from selected raw frames.
 
     Analyzes the current selection to find all available calibration frames
@@ -289,7 +289,7 @@ def masters():
 
 
 @app.callback(invoke_without_command=True)
-def main_callback(ctx: typer.Context):
+def main_callback(ctx: typer.Context) -> None:
     """Process images using automated workflows.
 
     These commands handle calibration, registration, stacking, and

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/commands/repo.py

@@ -1,11 +1,12 @@
 import logging
+from collections.abc import Generator
 from textwrap import dedent
 from typing import Annotated
 
 import typer
+from toml_repo import Repo
 
 import starbash
-from repo import Repo
 from starbash import console
 from starbash.app import Starbash
 from starbash.paths import get_user_documents_dir
@@ -13,7 +14,7 @@ from starbash.paths import get_user_documents_dir
 app = typer.Typer(invoke_without_command=True)
 
 
-def repo_enumeration(sb: Starbash):
+def repo_enumeration(sb: Starbash) -> dict[int, Repo]:
     """return a dict of int (1 based) to Repo instances"""
     verbose = False  # assume not verbose for enum picking
     repos = sb.repo_manager.repos if verbose else sb.repo_manager.regular_repos
@@ -21,7 +22,7 @@ def repo_enumeration(sb: Starbash):
     return {i + 1: repo for i, repo in enumerate(repos)}
 
 
-def complete_repo_by_num(incomplete: str):
+def complete_repo_by_num(incomplete: str) -> Generator[tuple[str, str], None, None]:
     # We need to use stderr_logging to prevent confusing the bash completion parser
     starbash.log_filter_level = logging.ERROR  # avoid showing output while doing completion
     with Starbash("repo.complete.num", stderr_logging=True) as sb:
@@ -30,7 +31,7 @@ def complete_repo_by_num(incomplete: str):
                 yield (str(num), repo.url)
 
 
-def complete_repo_by_url(incomplete: str):
+def complete_repo_by_url(incomplete: str) -> Generator[tuple[str, str], None, None]:
     # We need to use stderr_logging to prevent confusing the bash completion parser
     starbash.log_filter_level = logging.ERROR  # avoid showing output while doing completion
     with Starbash("repo.complete.url", stderr_logging=True) as sb:
@@ -42,7 +43,7 @@ def complete_repo_by_url(incomplete: str):
 
 
 @app.command()
-def list():
+def list() -> None:
     """
     lists all repositories.
     """
@@ -64,7 +65,7 @@ def list():
 @app.callback()
 def main(
     ctx: typer.Context,
-):
+) -> None:
     """
     Manage repositories.
 
@@ -88,7 +89,7 @@ def add(
         "--processed",
         help="Mark this new repository for processed output files.",
     ),
-):
+) -> None:
     """
     Add a repository. path is either a local path or a remote URL.
     """
@@ -155,7 +156,7 @@ def remove(
         str,
         typer.Argument(help="Repository number or URL", autocompletion=complete_repo_by_url),
     ],
-):
+) -> None:
     """
     Remove a repository by number (from list).
     Use 'starbash repo' to see the repository numbers.
@@ -182,7 +183,7 @@ def reindex(
             autocompletion=complete_repo_by_url,
         ),
     ] = None,
-):
+) -> None:
     """
     Reindex a repository by number.
     If no number is given, reindex all repositories.

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/commands/select.py

@@ -2,6 +2,7 @@
 
 import logging
 from collections import Counter
+from collections.abc import Generator
 from pathlib import Path
 from typing import Annotated, Any
 
@@ -35,7 +36,7 @@ def get_column(sb: Starbash, column_name: str) -> Counter:
     return all_counts
 
 
-def complete_date(incomplete: str, column_name: str):
+def complete_date(incomplete: str, column_name: str) -> Generator[tuple[str, str], None, None]:
     """calls get_column() and assumes the returned str->count object has iso datetime strings as the keys
     it merges the counts for all dates that are on the same local timezone day.
     in the returned str->count, just include the date portion (YYYY-MM-DD)."""
@@ -58,7 +59,7 @@ def complete_date(incomplete: str, column_name: str):
                 yield (date, f"{count} sessions")
 
 
-def complete_column(incomplete: str, column_name: str):
+def complete_column(incomplete: str, column_name: str) -> Generator[tuple[str, str], None, None]:
     # We need to use stderr_logging to prevent confusing the bash completion parser
     starbash.log_filter_level = logging.ERROR  # avoid showing output while doing completion
     with Starbash("repo.complete.column", stderr_logging=True) as sb:
@@ -70,7 +71,7 @@ def complete_column(incomplete: str, column_name: str):
 
 
 @app.command(name="any")
-def clear():
+def clear() -> None:
     """Remove any filters on sessions, etc... (select everything)."""
     with Starbash("selection.clear") as sb:
         sb.selection.clear()
@@ -87,7 +88,7 @@ def target(
             autocompletion=lambda incomplete: complete_column(incomplete, Database.OBJECT_KEY),
         ),
     ],
-):
+) -> None:
     """Limit the current selection to only the named target."""
     with Starbash("selection.target") as sb:
         # For now, replace existing targets with this one
@@ -107,7 +108,7 @@ def telescope(
             autocompletion=lambda incomplete: complete_column(incomplete, Database.TELESCOP_KEY),
         ),
     ],
-):
+) -> None:
     """Limit the current selection to only the named telescope."""
     with Starbash("selection.telescope") as sb:
         # For now, replace existing telescopes with this one
@@ -118,7 +119,7 @@ def telescope(
         do_list_sessions(sb, brief=not starbash.verbose_output)
 
 
-def complete_name(incomplete: str, names: list[str]):
+def complete_name(incomplete: str, names: list[str]) -> Generator[str, None, None]:
     """Return typer style autocompletion from a list of string constants."""
     for name in names:
         if name.startswith(incomplete):
@@ -150,7 +151,7 @@ def date(
             autocompletion=lambda incomplete: complete_date(incomplete, Database.START_KEY),
         ),
     ] = None,
-):
+) -> None:
     """Limit to sessions in the specified date range.
 
     Examples:
@@ -184,7 +185,7 @@ def date(
         do_list_sessions(sb, brief=not starbash.verbose_output)
 
 
-def do_list_sessions(sb: Starbash, brief: bool = False):
+def do_list_sessions(sb: Starbash, brief: bool = False) -> None:
     """List sessions (filtered based on the current selection)"""
 
     sessions = sb.search_session()
@@ -308,7 +309,7 @@ def list_sessions(
         "--brief",
         help="If there are many sessions, show only a few.",
     ),
-):
+) -> None:
     """List sessions (filtered based on the current selection)"""
 
     with Starbash("selection.list") as sb:
@@ -351,7 +352,7 @@ def export(
         str,
         typer.Argument(help="Directory path to export to (if it doesn't exist it will be created)"),
     ],
-):
+) -> None:
     """Export the images for the indicated session number.
 
     Uses symbolic links when possible, otherwise copies files.
@@ -377,7 +378,7 @@ def export(
 
 
 @app.callback(invoke_without_command=True)
-def show_selection(ctx: typer.Context):
+def show_selection(ctx: typer.Context) -> None:
     """List information about the current selection.
 
     This is the default command when no subcommand is specified.

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/commands/user.py

@@ -19,7 +19,7 @@ def analytics(
             help="Enable or disable analytics (crash reports and usage data).",
         ),
     ],
-):
+) -> None:
     """
     Enable or disable analytics (crash reports and usage data).
     """
@@ -41,7 +41,7 @@ def name(
             help="Your name for attribution in generated images.",
         ),
     ],
-):
+) -> None:
     """
     Set your name for attribution in generated images.
     """
@@ -61,7 +61,7 @@ def email(
             help="Your email for attribution in generated images.",
         ),
     ],
-):
+) -> None:
     """
     Set your email for attribution in generated images.
     """
@@ -194,7 +194,7 @@ def do_reinit(sb: Starbash) -> None:
 
 
 @app.command()
-def setup():
+def setup() -> None:
     """
     Configure starbash via a brief guided process.
 
@@ -206,7 +206,7 @@ def setup():
 
 
 @app.callback(invoke_without_command=True)
-def main_callback(ctx: typer.Context):
+def main_callback(ctx: typer.Context) -> None:
     """Main callback for the Starbash application."""
     if ctx.invoked_subcommand is None:
         from starbash import console

{starbash-0.2.5 → starbash-0.2.7}/src/starbash/database.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import json
 import sqlite3
+import types
 from dataclasses import dataclass
 from datetime import datetime, timedelta
 from pathlib import Path
@@ -801,5 +802,5 @@ class Database:
     def __enter__(self) -> Database:
         return self
 
-    def __exit__(self, exc_type, exc, tb) -> None:
+    def __exit__(self, exc_type: type[BaseException] | None, exc: BaseException | None, tb: types.TracebackType | None) -> None:
         self.close()