starbash 0.2.3__tar.gz → 0.2.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: starbash
-Version: 0.2.3
+Version: 0.2.5
 Summary: A tool for automating/standardizing/sharing astrophotography workflows.
 License-File: LICENSE
 Author: Kevin Hester
@@ -12,9 +12,11 @@ Classifier: Programming Language :: Python :: 3.13
 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.0a1,<4.0.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)

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "starbash"
-version = "0.2.3"
+version = "0.2.5"
 description = "A tool for automating/standardizing/sharing astrophotography workflows."
 authors = ["Kevin Hester <kevinh@geeksville.com>"]
 readme = "README.md"
@@ -29,12 +29,12 @@ textual = "^6.8.0"
 
 # Note: to use graxpert from the local tree rather than pypi use:
 # graxpert = {path = "GraXpert", extras = ["cpuonly"], develop = true}
-graxpert = {version = "^3.2.0a1", extras = ["cpuonly"]}
+graxpert = {version = "^3.2.0a2", extras = ["cpuonly"]}
 
-# The following two libs are only needed for the experiment of running siril scripts directly...
+# The following two libs are only needed for the (temporary) experiment of running siril scripts directly...
 # experimenting with siril-scripts/processing/VeraLux_HyperMetric_Stretch.py
-#numpy = "2.2.6"
-#pyqt6 = "^6.10.1"
+numpy = "2.2.6"
+pyqt6 = "^6.10.1"
 
 [tool.poetry.group.dev.dependencies]
 pytest = ">=8.4.2,<9.0.0"
@@ -61,9 +61,9 @@ markers = [
 # By default, exclude slow and integration tests
 # --tb=line shows minimal tracebacks (just one line per failure)
 # --tb=short shows shorter tracebacks
-# -rA shows summary of all test outcomes at end
+# -rfE shows summary of failed and error test outcomes at end (not passed)
 # --ignore excludes third-party test directories
-addopts = "-m 'not slow and not integration' -n auto --tb=short -rA --ignore=GraXpert --ignore=textual --ignore=starbash-recipes"
+addopts = "-m 'not slow and not integration' -n auto --tb=short -rfE --ignore=GraXpert --ignore=textual --ignore=starbash-recipes"
 
 # Note: To limit captured output further, you can:
 # 1. Use --tb=line for minimal tracebacks

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

@@ -44,7 +44,7 @@ from starbash.paths import get_user_config_dir, get_user_config_path
 from starbash.score import ScoredCandidate, score_candidates
 from starbash.selection import Selection, build_search_conditions
 from starbash.toml import toml_from_template
-from starbash.tool import preflight_tools
+from starbash.tool import init_tools
 from starbash.windows import windows_init
 
 critical_keys = [Database.DATE_OBS_KEY, Database.IMAGETYP_KEY]
@@ -129,11 +129,13 @@ def remap_expected_errors(exc: BaseException | None) -> BaseException | None:
         return None
 
     # Some OSErrors definitely don't indicate a code level bug...
-    expected_errors = [ "Read-only file system" ]
+    expected_errors = [ "Read-only file system", "No space left on device" ]
+    # Update: I give up, keep seeing misc reports from field.  I think all OSErrors should be considered
+    # 'not a bug' until proven otherwise.
 
     if isinstance(exc, OperationalError):
         return NonSoftwareError(f"[red]Database IO error:[/red] {exc}")
-    elif isinstance(exc, FileNotFoundError):
+    elif isinstance(exc, OSError): # Was FileNotFoundError
         return NonSoftwareError(f"[red]OS error:[/red] {exc}")
     elif isinstance(exc, OSError):
         exc_str = str(exc)
@@ -197,7 +199,8 @@ class Starbash:
 
         # Initialize selection state (stored in user config repo)
         self.selection = Selection(self.user_repo)
-        preflight_tools()
+        tool_prefs: dict[str, Any] = self.user_repo.get("tool", {})
+        init_tools(tool_prefs)  # Preflight check all known tools to see if they are available
 
     def _install_local_recipes(self) -> bool:
         """Use our local github submodule for recipes during development.
@@ -697,14 +700,16 @@ class Starbash:
 
         # Convert absolute path to relative path within repo
         relative_path = f.relative_to(path)
+        # Use POSIX-style forward slashes for consistency across platforms
+        relative_path_str = relative_path.as_posix()
 
-        found = self.db.get_image(repo.url, str(relative_path))
+        found = self.db.get_image(repo.url, relative_path_str)
 
         # for debugging sometimes we want to limit scanning to a single directory or file
         # debug_target = "masters-raw/2025-09-09/DARK"
         debug_target = None
         if debug_target:
-            if str(relative_path).startswith(debug_target):
+            if relative_path_str.startswith(debug_target):
                 logging.error("Debugging %s...", f)
                 found = False
             else:
@@ -730,8 +735,8 @@ class Starbash:
                 for key, value in extra_metadata.items():
                     headers.setdefault(key, value)
 
-                # Store relative path in database
-                headers["path"] = str(relative_path)
+                # Store relative path in database (use POSIX-style forward slashes for consistency)
+                headers["path"] = relative_path_str
                 if self._extend_image_header(headers, f):
                     image_doc_id = self.db.upsert_image(headers, repo.url)
                     headers[Database.ID_KEY] = image_doc_id
@@ -770,18 +775,22 @@ class Starbash:
                 # used to debug
 
             # Find all FITS files under this repo path
+            all_files = list(path.rglob("*.fit")) + list(path.rglob("*.fits"))
             for f in track(
-                list(path.rglob("*.fit*")),
+                all_files,
                 description=f"Indexing {repo.url}...",
             ):
-                # progress.console.print(f"Indexing {f}...")
-                if repo_kind == "master":
-                    # for master repos we only add to the image table
-                    self.add_image(repo, f, force=True)
-                elif repo_kind == "processed":
-                    pass  # we never add processed images to our db
-                else:
-                    self.add_image_and_session(repo, f, force=starbash.force_regen)
+                try:
+                    # progress.console.print(f"Indexing {f}...")
+                    if repo_kind == "master":
+                        # for master repos we only add to the image table
+                        self.add_image(repo, f, force=True)
+                    elif repo_kind == "processed":
+                        pass  # we never add processed images to our db
+                    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}')
 
     def reindex_repos(self):
         """Reindex all repositories managed by the RepoManager."""

{starbash-0.2.3 → starbash-0.2.5}/src/starbash/doit.py

@@ -181,8 +181,9 @@ def merge_to(base_name: str, fi: FileInfo) -> None:
         # If it's a .seq file, find all FITS files with that prefix
         if path.suffix == ".seq":
             seq_prefix = path.stem
-            pattern = str(base_dir / f"{seq_prefix}*.fit*")
-            matching_files = sorted(glob.glob(pattern))
+            pattern1 = str(base_dir / f"{seq_prefix}*.fit")
+            pattern2 = str(base_dir / f"{seq_prefix}*.fits")
+            matching_files = sorted(glob.glob(pattern1) + glob.glob(pattern2))
             collected_files.extend([Path(f) for f in matching_files])
 
     # Create output directory and remove if it already exists
@@ -248,7 +249,7 @@ class ToolAction(BaseAction):
 
         logging.info(f"Running {self.tool.name} for {self.task.name} {desc}")
         try:
-            with open(logfile_path, "a") as logfile:
+            with open(logfile_path, "a", encoding="utf-8") as logfile:
                 self.result = self.tool.run(
                     self.commands, context=context, cwd=self.cwd, log_out=logfile, **self.parameters
                 )

{starbash-0.2.3 → starbash-0.2.5}/src/starbash/dwarf3.py

@@ -10,6 +10,7 @@ from starbash.database import Database
 
 __all__ = [
     "extend_dwarf3_headers",
+    "_reset_monotonic_datetime",
 ]
 
 
@@ -49,6 +50,12 @@ def _make_monotonic_datetime() -> str:
     return current.strftime("%Y-%m-%dT%H:%M:%S.000")
 
 
+def _reset_monotonic_datetime() -> None:
+    """Reset the monotonic datetime counter. Used for testing."""
+    if hasattr(_make_monotonic_datetime, "counter"):
+        _make_monotonic_datetime.counter = 0
+
+
 def extend_dwarf3_headers(headers: dict[str, Any], full_image_path: Path) -> bool:
     """Given a FITS header dictionary, if it was from a Dwarf3 extend it with additional computed fields.
 

{starbash-0.2.3 → starbash-0.2.5}/src/starbash/templates/userconfig.toml

@@ -6,6 +6,11 @@
 [repo]
 kind = "preferences"
 
+[tool]
+# Starbash normally finds tools automatically via your PATH.  But if necessary you can define overrides here.  
+# siril.path = "siril"
+# siril.path = "flatpak run --command=siril-cli org.siril.Siril" # To use the flatpak version of siril
+
 #[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.

{starbash-0.2.3 → starbash-0.2.5}/src/starbash/tool/__init__.py

@@ -1,5 +1,7 @@
 """Tool management and execution for starbash processing stages."""
 
+from typing import Any
+
 from starbash.tool.base import ExternalTool, MissingToolError, Tool, ToolError, tool_run
 from starbash.tool.context import (
     _SafeFormatter,
@@ -31,12 +33,14 @@ __all__ = [
     "PythonTool",
     "PythonScriptError",
     "tools",
-    "preflight_tools",
+    "init_tools",
 ]
 
 
-def preflight_tools() -> None:
+def init_tools(tool_prefs: dict[str, Any]) -> None:
     """Preflight check all known tools to see if they are available"""
+    Tool.Preferences = tool_prefs
+
     for tool in tools.values():
         if isinstance(tool, ExternalTool):
             tool.preflight()

{starbash-0.2.3 → starbash-0.2.5}/src/starbash/tool/base.py

@@ -26,6 +26,10 @@ __all__ = [
     "tool_run",
 ]
 
+# If we want to ensure that child tools don't accidentally try to open GUI windows, we can set this flag.
+# This is especially useful to ensure that the tools will work in a headless environment (such as) github CI runners.
+force_no_gui = False
+
 
 class ToolError(UserHandledError):
     """Exception raised when a tool fails to execute properly."""
@@ -133,6 +137,13 @@ def tool_run(
 
     logger.debug(f"Running {cmd} in {cwd}: stdin={commands}")
 
+    # Remove DISPLAY from environment if force_no_gui is set to prevent GUI windows
+    env = os.environ.copy()
+    if force_no_gui and "DISPLAY" in os.environ:
+        #env.pop("DISPLAY", None)
+        #logger.debug("Removed DISPLAY from environment to prevent GUI windows")
+        pass
+
     # Start the process with pipes for streaming
     process = subprocess.Popen(
         cmd,
@@ -142,6 +153,7 @@ def tool_run(
         shell=True,
         text=True,
         cwd=cwd,
+        env=env,
     )
 
     # Wait for process to complete with timeout
@@ -198,6 +210,10 @@ def tool_run(
 class Tool:
     """A tool for stage execution"""
 
+    # A hierarchical dictionary of user preferences for this tool.  Typical node path would be: "siril.path"
+    # Normally set by the app constructor based on user configuration toml.
+    Preferences: dict[str, Any] = {}
+
     # Tools and recursively invoke other tools.  So it is important that if we've set a log file destination at the top
     # of our call tree, that variables get passed down to all sub-tools.
     _default_log_out: io.TextIOWrapper | None = None
@@ -332,6 +348,11 @@ class ExternalTool(Tool):
     def executable_path(self) -> str:
         """Find the correct executable path to run for the given tool"""
 
+        # Did the user manually specify a path
+        pref_path = Tool.Preferences.get(self.name.lower(), {}).get("path")
+        if pref_path:
+            return pref_path
+
         paths: list[None | str] = [None]  # None means use system PATH
 
         if self.extra_dirs:

{starbash-0.2.3 → starbash-0.2.5}/src/starbash/tool/siril.py

@@ -43,9 +43,9 @@ class SirilTool(ExternalTool):
         # siril_path = "/home/kevinh/packages/Siril-1.4.0~beta3-x86_64.AppImage"
         # Possible siril commands, with preferred option first
         commands: list[str] = [
-            "siril-cli",
-            "siril",
+            "siril-cli", # We prefer the top two options because they work even without a Gtk accessible GUI
             "org.siril.Siril",
+            "siril",
             "Siril",
         ]
 
@@ -66,7 +66,7 @@ class SirilTool(ExternalTool):
 
         siril_path = self.executable_path
         if siril_path == "org.siril.Siril":
-            siril_path = "flatpak run org.siril.Siril"
+            siril_path = "flatpak run --command=siril-cli org.siril.Siril"
 
         link_or_copy_to_dir(input_files, temp_dir)