microlens-submit 0.16.3__tar.gz → 0.16.5__tar.gz

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/CHANGELOG.md

@@ -5,6 +5,38 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.16.5] - 2026-02-04
+
+### Fixed
+- Dossier assets are now copied into the dossier output and linked with URL-safe relative paths,
+  improving image loading in Roman Research Nexus and similar environments.
+- Event data, plots, and posteriors now resolve reliably when paths include spaces or nested folders.
+
+
+## [0.16.4] - 2026-01-14
+
+### Added
+- Added `remove-event`/`remove-solution` CLI commands and `remove_event`/`remove_solution` API helpers with a `--force` guard for hard deletes.
+- Added `git_dir` metadata plus `set-git-dir` to capture Git info when the repo lives outside the submission directory.
+- Added optional GPU fields in `hardware_info` (`gpu.model`, `gpu.count`, `gpu.memory_gb`) alongside platform/OS capture.
+- Added non-Nexus hardware auto-fill using `psutil` for CPU and memory details.
+- Added conda-forge recipe (`conda/recipe/meta.yaml`) to the version bump script (`scripts/bump_version`).
+- Added sha256 update in `conda/recipe/meta.yaml` to the release workflow.
+- Added a workflow release job to copy the local updated version on the conda-forge recipe to the feedstock fork (`AmberLee2427/microlens-submit-feedstock`) and send a PR, after PyPI release.
+
+
+### Changed
+- Updated tiers to `beginner`/`experienced`; event ID validation now uses inclusive ranges and 3-digit IDs for `2018-test`.
+- CLI numeric parsing now accepts leading decimals like `.001`.
+- Clarified quickstart/tutorial guidance around working directories and hardware info requirements.
+
+
+### Fixed
+- CSV import now skips blank rows to avoid NoneType parsing errors.
+- Validation messaging now highlights missing bands when flux parameters are provided.
+- Improved Windows notes editor fallback for better default editor selection.
+
+
 ## [0.16.3] - 2025-10-28
 
 ### Added

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/CITATION.cff

@@ -1,9 +1,9 @@
 cff-version: 1.2.0
 message: "If you use microlens-submit, please cite it as below."
 title: "microlens-submit"
-version: "0.16.3"
+version: "0.16.5"
 authors:
   - family-names: Malpas
     given-names: Amber
 url: "https://github.com/AmberLee2427/microlens-submit"
-doi: "10.5281/zenodo.17468488"
+doi: "10.5281/zenodo.18246117"

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microlens-submit
-Version: 0.16.3
+Version: 0.16.5
 Summary: A tool for managing and submitting microlensing solutions
 Home-page: https://github.com/AmberLee2427/microlens-submit
 Author: Amber Malpas
@@ -29,6 +29,7 @@ Requires-Dist: typer[all]>=0.9.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: pyyaml>=6.0
 Requires-Dist: markdown>=3.4.0
+Requires-Dist: psutil>=5.9.0
 Requires-Dist: importlib_resources>=1.0.0; python_version < "3.9"
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
@@ -94,18 +95,26 @@ The CLI is the recommended way to interact with your submission project.
 
 You can pass ``--no-color`` to any command if your terminal does not support ANSI colors.
 
+**Windows note:** If ``microlens-submit`` is not found after ``pip install``, your Python Scripts folder is likely missing from PATH.
+Try ``py -m pip install microlens-submit`` and run ``py -m microlens_submit.cli --help``, or add the Scripts path shown by
+``py -m pip show -f microlens-submit`` to PATH.
+
 1. Initialize your project:
 
    ```bash
-   microlens-submit init --team-name "Planet Pounders" --tier "advanced"
-   # if a project directory was provided to `init`, you should now `cd` into that project
+   microlens-submit init --team-name "Planet Pounders" --tier "experienced" ./my_submission
+   cd ./my_submission
    ```
 
-   To pass validation, you need to have provided a `repo_url` and `hardware_info` to the project and have a git project initialized in your sumission-project directory.
+   If you prefer to initialize inside an existing folder, run `microlens-submit init` without a path after `cd` into it.
+
+   To pass validation, you need to have provided a `repo_url` and `hardware_info` to the project and have a git project initialized in your sumission-project directory. On Roman Nexus, you can use `microlens-submit nexus-init` to auto-populate hardware info.
 
    ```bash
    microlens-submit set-repo-url <url> ./
    microlens-submit set-hardware-info --cpu-details "intel i7 xxx" --ram-gb 32 ./
+   # if your git repo lives elsewhere:
+   microlens-submit set-git-dir /path/to/repo ./
    ```
 2. Add a new solution to an event:
 
@@ -152,7 +161,7 @@ import microlens_submit
 # Load or create the project
 sub = microlens_submit.load(project_path="./my_challenge_submission")
 sub.team_name = "Planet Pounders"
-sub.tier = "advanced"
+sub.tier = "experienced"
 
 # Get an event and add a solution
 evt = sub.get_event("ogle-2025-blg-0042")
@@ -201,15 +210,15 @@ import this file directly.
 
 Bibtex:
 ```
-@software{malpas_2025_17468488,
+@software{malpas_2025_18246117,
   author       = {Malpas, Amber},
   title        = {microlens-submit},
   month        = oct,
   year         = 2025,
   publisher    = {Zenodo},
   version      = {v0.16.3},
-  doi          = {10.5281/zenodo.17468488},
-  url          = {https://doi.org/10.5281/zenodo.17468488},
+  doi          = {10.5281/zenodo.18246117},
+  url          = {https://doi.org/10.5281/zenodo.18246117},
 }
 ```
 

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/README.md

@@ -45,18 +45,26 @@ The CLI is the recommended way to interact with your submission project.
 
 You can pass ``--no-color`` to any command if your terminal does not support ANSI colors.
 
+**Windows note:** If ``microlens-submit`` is not found after ``pip install``, your Python Scripts folder is likely missing from PATH.
+Try ``py -m pip install microlens-submit`` and run ``py -m microlens_submit.cli --help``, or add the Scripts path shown by
+``py -m pip show -f microlens-submit`` to PATH.
+
 1. Initialize your project:
 
    ```bash
-   microlens-submit init --team-name "Planet Pounders" --tier "advanced"
-   # if a project directory was provided to `init`, you should now `cd` into that project
+   microlens-submit init --team-name "Planet Pounders" --tier "experienced" ./my_submission
+   cd ./my_submission
    ```
 
-   To pass validation, you need to have provided a `repo_url` and `hardware_info` to the project and have a git project initialized in your sumission-project directory.
+   If you prefer to initialize inside an existing folder, run `microlens-submit init` without a path after `cd` into it.
+
+   To pass validation, you need to have provided a `repo_url` and `hardware_info` to the project and have a git project initialized in your sumission-project directory. On Roman Nexus, you can use `microlens-submit nexus-init` to auto-populate hardware info.
 
    ```bash
    microlens-submit set-repo-url <url> ./
    microlens-submit set-hardware-info --cpu-details "intel i7 xxx" --ram-gb 32 ./
+   # if your git repo lives elsewhere:
+   microlens-submit set-git-dir /path/to/repo ./
    ```
 2. Add a new solution to an event:
 
@@ -103,7 +111,7 @@ import microlens_submit
 # Load or create the project
 sub = microlens_submit.load(project_path="./my_challenge_submission")
 sub.team_name = "Planet Pounders"
-sub.tier = "advanced"
+sub.tier = "experienced"
 
 # Get an event and add a solution
 evt = sub.get_event("ogle-2025-blg-0042")
@@ -152,15 +160,15 @@ import this file directly.
 
 Bibtex:
 ```
-@software{malpas_2025_17468488,
+@software{malpas_2025_18246117,
   author       = {Malpas, Amber},
   title        = {microlens-submit},
   month        = oct,
   year         = 2025,
   publisher    = {Zenodo},
   version      = {v0.16.3},
-  doi          = {10.5281/zenodo.17468488},
-  url          = {https://doi.org/10.5281/zenodo.17468488},
+  doi          = {10.5281/zenodo.18246117},
+  url          = {https://doi.org/10.5281/zenodo.18246117},
 }
 ```
 

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/microlens_submit/__init__.py

@@ -5,7 +5,7 @@ validate, and export a challenge submission using either the Python API or
 the command line interface.
 """
 
-__version__ = "0.16.3"
+__version__ = "0.16.5"
 
 from .models import Event, Solution, Submission
 from .utils import load

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/microlens_submit/cli/commands/export.py

@@ -42,10 +42,13 @@ def export(
 
 def remove_event(
     event_id: str,
-    force: bool = typer.Option(False, "--force", help="Force removal even if event has saved solutions"),
+    force: bool = typer.Option(False, "--force", help="Required to remove an event (prevents accidents)"),
     project_path: Path = typer.Argument(Path("."), help="Project directory"),
 ) -> None:
-    """Remove an entire event and all its solutions from the submission."""
+    """Remove an entire event and all its solutions from the submission.
+
+    This action is destructive and requires --force to proceed.
+    """
     submission = load(str(project_path))
 
     if event_id not in submission.events:
@@ -57,13 +60,11 @@ def remove_event(
 
     if not force:
         typer.echo(
-            f"{symbol('warning')}  This will permanently remove event '{event_id}' and all {solution_count} solutions."
+            f"{symbol('warning')}  Refusing to remove event '{event_id}' without --force "
+            f"({solution_count} solutions)."
         )
-        typer.echo("   This action cannot be undone.")
-        confirm = typer.confirm("Are you sure you want to continue?")
-        if not confirm:
-            typer.echo(f"{symbol('error')} Operation cancelled")
-            raise typer.Exit(0)
+        typer.echo(f"{symbol('hint')} Consider deactivating solutions instead, or re-run with --force to proceed.")
+        raise typer.Exit(0)
 
     try:
         removed = submission.remove_event(event_id, force=force)
@@ -94,11 +95,33 @@ def set_repo_url(
     )
 
 
+def set_git_dir(
+    git_dir: Path = typer.Argument(..., help="Path to the git working tree"),
+    project_path: Path = typer.Argument(Path("."), help="Project directory"),
+) -> None:
+    """Set or update the git working tree path in the submission metadata."""
+    sub = load(str(project_path))
+    git_dir_path = git_dir.expanduser().resolve()
+    if not git_dir_path.exists():
+        raise typer.BadParameter(f"git_dir does not exist: {git_dir_path}")
+    sub.git_dir = str(git_dir_path)
+    sub.save()
+    console.print(
+        Panel(
+            f"Set git_dir to {git_dir_path} in {project_path}/submission.json",
+            style="bold green",
+        )
+    )
+
+
 def set_hardware_info(
     cpu: Optional[str] = typer.Option(None, "--cpu", help="CPU model/description"),
     cpu_details: Optional[str] = typer.Option(None, "--cpu-details", help="Detailed CPU information"),
     memory_gb: Optional[float] = typer.Option(None, "--memory-gb", help="Memory in GB"),
     ram_gb: Optional[float] = typer.Option(None, "--ram-gb", help="RAM in GB (alternative to --memory-gb)"),
+    gpu: Optional[str] = typer.Option(None, "--gpu", help="GPU model/description"),
+    gpu_count: Optional[int] = typer.Option(None, "--gpu-count", help="Number of GPUs"),
+    gpu_memory_gb: Optional[float] = typer.Option(None, "--gpu-memory-gb", help="GPU memory per device in GB"),
     platform: Optional[str] = typer.Option(
         None,
         "--platform",
@@ -153,6 +176,24 @@ def set_hardware_info(
             changes.append(f"Set nexus_image: {nexus_image}")
             sub.hardware_info["nexus_image"] = nexus_image
 
+    if any(value is not None for value in (gpu, gpu_count, gpu_memory_gb)):
+        gpu_info = sub.hardware_info.get("gpu")
+        if not isinstance(gpu_info, dict):
+            gpu_info = {}
+        if gpu is not None:
+            if gpu_info.get("model") != gpu:
+                changes.append(f"Set gpu.model: {gpu}")
+                gpu_info["model"] = gpu
+        if gpu_count is not None:
+            if gpu_info.get("count") != gpu_count:
+                changes.append(f"Set gpu.count: {gpu_count}")
+                gpu_info["count"] = gpu_count
+        if gpu_memory_gb is not None:
+            if gpu_info.get("memory_gb") != gpu_memory_gb:
+                changes.append(f"Set gpu.memory_gb: {gpu_memory_gb}")
+                gpu_info["memory_gb"] = gpu_memory_gb
+        sub.hardware_info["gpu"] = gpu_info
+
     # Show dry run results
     if dry_run:
         if changes:

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/microlens_submit/cli/commands/init.py

@@ -17,6 +17,7 @@ def init(
     team_name: str = typer.Option(..., help="Team name"),
     tier: str = typer.Option(..., help="Challenge tier"),
     project_path: Path = typer.Argument(Path("."), help="Project directory"),
+    show_warnings: bool = True,
 ) -> None:
     """Create a new submission project in the specified directory.
 
@@ -29,7 +30,7 @@ def init(
 
     Args:
         team_name: Name of the participating team (e.g., "Team Alpha").
-        tier: Challenge tier level (e.g., "basic", "advanced").
+        tier: Challenge tier level (e.g., "beginner", "experienced").
         project_path: Directory where the project will be created.
             Defaults to current directory if not specified.
 
@@ -38,10 +39,10 @@ def init(
 
     Example:
         # Create project in current directory
-        microlens-submit init --team-name "Team Alpha" --tier "advanced"
+        microlens-submit init --team-name "Team Alpha" --tier "experienced"
 
         # Create project in specific directory
-        microlens-submit init --team-name "Team Beta" --tier "basic" ./my_submission
+        microlens-submit init --team-name "Team Beta" --tier "beginner" ./my_submission
 
         # Project structure created:
         # ./my_submission/
@@ -100,12 +101,15 @@ def init(
         )
 
     # Run warnings-only validation
-    warnings = sub.run_validation_warnings()
-    if warnings:
-        console.print(f"[yellow]{symbol('warning')}  Project initialized with warnings:[/yellow]")
-        for warning in warnings:
-            console.print(f"   [yellow]• {warning}[/yellow]")
-        console.print(f"[yellow]{symbol('hint')} These warnings will become errors when saving or exporting.[/yellow]")
+    if show_warnings:
+        warnings = sub.run_validation_warnings()
+        if warnings:
+            console.print(f"[yellow]{symbol('warning')}  Project initialized with warnings:[/yellow]")
+            for warning in warnings:
+                console.print(f"   [yellow]• {warning}[/yellow]")
+            console.print(
+                f"[yellow]{symbol('hint')} These warnings will become errors when saving or exporting.[/yellow]"
+            )
 
     # Try to save, but don't fail if there are validation errors
     try:
@@ -134,13 +138,13 @@ def nexus_init(
 
     Args:
         team_name: Name of the participating team (e.g., "Team Alpha").
-        tier: Challenge tier level (e.g., "basic", "advanced").
+        tier: Challenge tier level (e.g., "beginner", "experienced").
         project_path: Directory where the project will be created.
             Defaults to current directory if not specified.
 
     Example:
         # Initialize project with Nexus platform info
-        microlens-submit nexus-init --team-name "Team Alpha" --tier "advanced" ./project
+        microlens-submit nexus-init --team-name "Team Alpha" --tier "experienced" ./project
 
         # This will automatically detect:
         # - CPU model from /proc/cpuinfo
@@ -152,7 +156,7 @@ def nexus_init(
         environment. It will silently skip any environment information that
         cannot be detected (e.g., if running outside of Nexus).
     """
-    init(team_name=team_name, tier=tier, project_path=project_path)
+    init(team_name=team_name, tier=tier, project_path=project_path, show_warnings=False)
     sub = load(str(project_path))
     sub.autofill_nexus_info()
 

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/microlens_submit/cli/commands/solutions.py

@@ -2,8 +2,13 @@
 
 import json
 import os
+import re
+import shlex
+import shutil
+import subprocess
+import sys
 from pathlib import Path
-from typing import Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import typer
 from rich.console import Console
@@ -16,6 +21,38 @@ from microlens_submit.utils import import_solutions_from_csv, load
 console = Console()
 
 
+_NUMERIC_RE = re.compile(r"^[+-]?((\\d+(\\.\\d*)?)|(\\.\\d+))([eE][+-]?\\d+)?$")
+
+
+def _parse_cli_value(value: str) -> Any:
+    """Parse a CLI value using JSON, with a numeric fallback for .001-style input."""
+    try:
+        return json.loads(value)
+    except json.JSONDecodeError:
+        if _NUMERIC_RE.match(value.strip()):
+            try:
+                if re.match(r"^[+-]?\\d+$", value.strip()):
+                    return int(value)
+                return float(value)
+            except ValueError:
+                pass
+        return value
+
+
+def _run_editor(editor_cmd: str, notes_file: Path) -> bool:
+    parts = shlex.split(editor_cmd)
+    if not parts:
+        return False
+    if os.name == "nt" and parts[0].lower() in ("code", "code.exe"):
+        if "--wait" not in parts and "-w" not in parts:
+            parts.append("--wait")
+    try:
+        subprocess.run(parts + [str(notes_file)], check=False)
+        return True
+    except FileNotFoundError:
+        return False
+
+
 def _parse_pairs(pairs: Optional[List[str]]) -> Optional[Dict]:
     """Convert CLI key=value options into a dictionary."""
     if not pairs:
@@ -25,10 +62,7 @@ def _parse_pairs(pairs: Optional[List[str]]) -> Optional[Dict]:
         if "=" not in item:
             raise typer.BadParameter(f"Invalid format: {item}")
         key, value = item.split("=", 1)
-        try:
-            out[key] = json.loads(value)
-        except json.JSONDecodeError:
-            out[key] = value
+        out[key] = _parse_cli_value(value)
     return out
 
 
@@ -219,10 +253,7 @@ def add_solution(
             if "=" not in p:
                 raise typer.BadParameter(f"Invalid parameter format: {p}")
             key, value = p.split("=", 1)
-            try:
-                params[key] = json.loads(value)
-            except json.JSONDecodeError:
-                params[key] = value
+            params[key] = _parse_cli_value(value)
     allowed_model_types = [
         "1S1L",
         "1S2L",
@@ -254,7 +285,7 @@ def add_solution(
     sol.relative_probability = relative_probability
     sol.n_data_points = n_data_points
     if cpu_hours is not None or wall_time_hours is not None:
-        sol.set_compute_info(cpu_hours=cpu_hours, wall_time_hours=wall_time_hours)
+        sol.set_compute_info(cpu_hours=cpu_hours, wall_time_hours=wall_time_hours, git_dir=sub.git_dir)
     sol.lightcurve_plot_path = str(lightcurve_plot_path) if lightcurve_plot_path else None
     sol.lens_plane_plot_path = str(lens_plane_plot_path) if lens_plane_plot_path else None
     # Handle notes file logic
@@ -368,10 +399,13 @@ def activate(
 
 def remove_solution(
     solution_id: str,
-    force: bool = typer.Option(False, "--force", help="Force removal of saved solutions (use with caution)"),
+    force: bool = typer.Option(False, "--force", help="Required to remove a solution (prevents accidents)"),
     project_path: Path = typer.Argument(Path("."), help="Project directory"),
 ) -> None:
-    """Completely remove a solution from the submission."""
+    """Completely remove a solution from the submission.
+
+    This action is destructive and requires --force to proceed.
+    """
     submission = load(project_path)
 
     # Find the solution across all events
@@ -387,6 +421,16 @@ def remove_solution(
         console.print(f"[red]Error: Solution {solution_id} not found[/red]")
         raise typer.Exit(1)
 
+    if not force:
+        console.print(
+            f"[yellow]{symbol('warning')}  Refusing to remove solution {solution_id[:8]}... without --force.[/yellow]"
+        )
+        console.print(
+            f"[blue]{symbol('hint')} Consider using deactivate to keep the solution, "
+            "or re-run with --force to proceed.[/blue]"
+        )
+        raise typer.Exit(0)
+
     try:
         removed = submission.events[event_id].remove_solution(solution_id, force=force)
         if removed:
@@ -561,16 +605,14 @@ def edit_solution(
         target_solution.set_compute_info(
             cpu_hours=cpu_hours if cpu_hours is not None else old_cpu,
             wall_time_hours=(wall_time_hours if wall_time_hours is not None else old_wall),
+            git_dir=sub.git_dir,
         )
     if param:
         for p in param:
             if "=" not in p:
                 raise typer.BadParameter(f"Invalid parameter format: {p}")
             key, value = p.split("=", 1)
-            try:
-                new_value = json.loads(value)
-            except json.JSONDecodeError:
-                new_value = value
+            new_value = _parse_cli_value(value)
             old_value = target_solution.parameters.get(key)
             if old_value != new_value:
                 changes.append(f"Update parameter {key}: {old_value} {arrow} {new_value}")
@@ -582,10 +624,7 @@ def edit_solution(
             if "=" not in p:
                 raise typer.BadParameter(f"Invalid uncertainty format: {p}")
             key, value = p.split("=", 1)
-            try:
-                new_value = json.loads(value)
-            except json.JSONDecodeError:
-                new_value = value
+            new_value = _parse_cli_value(value)
             old_value = target_solution.parameter_uncertainties.get(key)
             if old_value != new_value:
                 changes.append(f"Update uncertainty {key}: {old_value} {arrow} {new_value}")
@@ -636,21 +675,35 @@ def edit_notes(
             notes_file.parent.mkdir(parents=True, exist_ok=True)
             if not notes_file.exists():
                 notes_file.write_text("", encoding="utf-8")
-            editor = os.environ.get("EDITOR", None)
-            if editor:
-                os.system(f'{editor} "{notes_file}"')
+            editor = os.environ.get("EDITOR") or os.environ.get("VISUAL")
+            if editor and _run_editor(editor, notes_file):
+                return
+            fallbacks = ["nano", "vi", "vim", "code"]
+            if os.name == "nt":
+                fallbacks = ["code", "notepad", "notepad.exe"]
+            for fallback in fallbacks:
+                if shutil.which(fallback):
+                    if _run_editor(fallback, notes_file):
+                        return
+            if os.name == "nt":
+                try:
+                    os.startfile(notes_file)  # type: ignore[attr-defined]
+                    return
+                except OSError:
+                    pass
+            elif sys.platform == "darwin":
+                if shutil.which("open"):
+                    subprocess.run(["open", "-W", str(notes_file)], check=False)
+                    return
             else:
-                # Try nano, then vi
-                for fallback in ["nano", "vi"]:
-                    if os.system(f"command -v {fallback} > /dev/null 2>&1") == 0:
-                        os.system(f'{fallback} "{notes_file}"')
-                        break
-                else:
-                    console.print(
-                        f"Could not find an editor to open {notes_file}",
-                        style="bold red",
-                    )
-                    raise typer.Exit(code=1)
+                if shutil.which("xdg-open"):
+                    subprocess.run(["xdg-open", str(notes_file)], check=False)
+                    return
+            console.print(
+                f"Could not find an editor to open {notes_file}",
+                style="bold red",
+            )
+            raise typer.Exit(code=1)
             return
     console.print(f"Solution {solution_id} not found", style="bold red")
     raise typer.Exit(code=1)

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/microlens_submit/cli/main.py

@@ -17,7 +17,7 @@ and scripted usage patterns.
 
 **Example Workflow:**
     # Initialize a new project
-    microlens-submit init --team-name "Team Alpha" --tier "advanced" ./my_project
+    microlens-submit init --team-name "Team Alpha" --tier "experienced" ./my_project
 
     # Add a solution
     microlens-submit add-solution EVENT001 1S1L ./my_project \
@@ -117,4 +117,5 @@ app.command("generate-dossier")(dossier.generate_dossier)
 app.command("export")(export.export)
 app.command("remove-event")(export.remove_event)
 app.command("set-repo-url")(export.set_repo_url)
+app.command("set-git-dir")(export.set_git_dir)
 app.command("set-hardware-info")(export.set_hardware_info)

{microlens_submit-0.16.3 → microlens_submit-0.16.5}/microlens_submit/dossier/event_page.py

@@ -12,6 +12,7 @@ from pathlib import Path
 from .. import __version__
 from ..models import Event, Submission
 from .solution_page import generate_solution_page
+from .utils import resolve_dossier_asset_path
 
 
 def generate_event_page(event: Event, submission: Submission, output_dir: Path) -> None:
@@ -50,7 +51,17 @@ def generate_event_page(event: Event, submission: Submission, output_dir: Path)
         to individual solution pages.
     """
     # Prepare output directory (already created)
-    html = _generate_event_page_content(event, submission)
+    project_root = Path(submission.project_path)
+    event_data_link = ""
+    if hasattr(event, "event_data_path") and event.event_data_path:
+        event_data_link = resolve_dossier_asset_path(
+            event.event_data_path,
+            project_root,
+            output_dir,
+            subdir="event-data",
+            prefix=f"{event.event_id}_event_data",
+        )
+    html = _generate_event_page_content(event, submission, event_data_link=event_data_link)
     with (output_dir / f"{event.event_id}.html").open("w", encoding="utf-8") as f:
         f.write(html)
 
@@ -59,7 +70,12 @@ def generate_event_page(event: Event, submission: Submission, output_dir: Path)
         generate_solution_page(sol, event, submission, output_dir)
 
 
-def _generate_event_page_content(event: Event, submission: Submission) -> str:
+def _generate_event_page_content(
+    event: Event,
+    submission: Submission,
+    *,
+    event_data_link: str = "",
+) -> str:
     """Generate the HTML content for an event dossier page.
 
     Creates the complete HTML content for a single event page, including
@@ -163,10 +179,10 @@ def _generate_event_page_content(event: Event, submission: Submission) -> str:
     )
     # Optional raw data link
     raw_data_html = ""
-    if hasattr(event, "event_data_path") and event.event_data_path:
+    if event_data_link:
         raw_data_html = (
             f'<p class="text-rtd-text">Raw Event Data: '
-            f'<a href="{event.event_data_path}" '
+            f'<a href="{event_data_link}" '
             f'class="text-rtd-accent hover:underline">Download Data</a></p>'
         )
     # HTML content