microlens-submit 0.16.4__py3-none-any.whl → 0.16.5__py3-none-any.whl

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.4"
+__version__ = "0.16.5"
 
 from .models import Event, Solution, Submission
 from .utils import load

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

microlens_submit/dossier/full_report.py

@@ -15,6 +15,7 @@ from ..models.solution import Solution
 from .dashboard import _generate_dashboard_content
 from .event_page import _generate_event_page_content
 from .solution_page import _generate_solution_page_content
+from .utils import resolve_dossier_asset_path
 
 
 def generate_full_dossier_report_html(submission: Submission, output_dir: Path) -> None:
@@ -63,19 +64,57 @@ def generate_full_dossier_report_html(submission: Submission, output_dir: Path)
     all_html_sections.append('<hr class="my-8 border-t-2 border-rtd-accent">')  # Divider after dashboard
 
     # Events and solutions
+    project_root = Path(submission.project_path)
     for event in submission.events.values():
-        event_html = _generate_event_page_content(event, submission)
+        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",
+            )
+        event_html = _generate_event_page_content(event, submission, event_data_link=event_data_link)
         event_body = extract_main_content_body(event_html, section_type="event", section_id=event.event_id)
         all_html_sections.append(event_body)
         all_html_sections.append('<hr class="my-8 border-t-2 border-rtd-accent">')  # Divider after event
 
         for sol in event.get_active_solutions():
-            sol_html = _generate_solution_page_content(sol, event, submission)
+            lc_plot = resolve_dossier_asset_path(
+                sol.lightcurve_plot_path,
+                project_root,
+                output_dir,
+                subdir="plots",
+                prefix=f"{event.event_id}_{sol.solution_id}_lightcurve",
+            )
+            lens_plot = resolve_dossier_asset_path(
+                sol.lens_plane_plot_path,
+                project_root,
+                output_dir,
+                subdir="plots",
+                prefix=f"{event.event_id}_{sol.solution_id}_lens",
+            )
+            posterior = resolve_dossier_asset_path(
+                sol.posterior_path,
+                project_root,
+                output_dir,
+                subdir="posteriors",
+                prefix=f"{event.event_id}_{sol.solution_id}_posterior",
+            )
+            sol_html = _generate_solution_page_content(
+                sol,
+                event,
+                submission,
+                lc_plot=lc_plot,
+                lens_plot=lens_plot,
+                posterior=posterior,
+            )
             sol_body = extract_main_content_body(
                 sol_html,
                 section_type="solution",
                 section_id=sol.solution_id,
-                project_root=Path(submission.project_path),
+                project_root=project_root,
                 solution=sol,
             )
             all_html_sections.append(sol_body)

microlens_submit/dossier/solution_page.py

@@ -8,6 +8,7 @@ notes rendering, and evaluator-only sections.
 
 from datetime import datetime
 from pathlib import Path
+from typing import Optional
 
 import markdown
 
@@ -15,6 +16,7 @@ from .. import __version__
 from ..models.event import Event
 from ..models.solution import Solution
 from ..models.submission import Submission
+from .utils import resolve_dossier_asset_path
 
 
 def generate_solution_page(solution: Solution, event: Event, submission: Submission, output_dir: Path) -> None:
@@ -55,12 +57,49 @@ def generate_solution_page(solution: Solution, event: Event, submission: Submiss
         Notes are rendered with syntax highlighting for code blocks.
     """
     # Prepare output directory (already created)
-    html = _generate_solution_page_content(solution, event, submission)
+    project_root = Path(submission.project_path)
+    lc_plot = resolve_dossier_asset_path(
+        solution.lightcurve_plot_path,
+        project_root,
+        output_dir,
+        subdir="plots",
+        prefix=f"{event.event_id}_{solution.solution_id}_lightcurve",
+    )
+    lens_plot = resolve_dossier_asset_path(
+        solution.lens_plane_plot_path,
+        project_root,
+        output_dir,
+        subdir="plots",
+        prefix=f"{event.event_id}_{solution.solution_id}_lens",
+    )
+    posterior = resolve_dossier_asset_path(
+        solution.posterior_path,
+        project_root,
+        output_dir,
+        subdir="posteriors",
+        prefix=f"{event.event_id}_{solution.solution_id}_posterior",
+    )
+    html = _generate_solution_page_content(
+        solution,
+        event,
+        submission,
+        lc_plot=lc_plot,
+        lens_plot=lens_plot,
+        posterior=posterior,
+    )
     with (output_dir / f"{solution.solution_id}.html").open("w", encoding="utf-8") as f:
         f.write(html)
 
 
-def _generate_solution_page_content(solution: Solution, event: Event, submission: Submission) -> str:
+def _generate_solution_page_content(
+    solution: Solution,
+    event: Event,
+    submission: Submission,
+    *,
+    lc_plot: Optional[str] = None,
+    lens_plot: Optional[str] = None,
+    posterior: Optional[str] = None,
+) -> str:
     """Generate the HTML content for a solution dossier page.
 
     Creates the complete HTML content for a single solution page, including
@@ -138,9 +177,9 @@ def _generate_solution_page_content(solution: Solution, event: Event, submission
     # Higher-order effects
     hoe_str = ", ".join(solution.higher_order_effects) if solution.higher_order_effects else "None"
     # Plot paths (relative to solution page)
-    lc_plot = solution.lightcurve_plot_path or ""
-    lens_plot = solution.lens_plane_plot_path or ""
-    posterior = solution.posterior_path or ""
+    lc_plot = lc_plot if lc_plot is not None else (solution.lightcurve_plot_path or "")
+    lens_plot = lens_plot if lens_plot is not None else (solution.lens_plane_plot_path or "")
+    posterior = posterior if posterior is not None else (solution.posterior_path or "")
     # Physical parameters table
     phys_rows = []
     phys = solution.physical_parameters or {}

microlens_submit/dossier/utils.py

@@ -6,7 +6,11 @@ generation package, including hardware formatting, GitHub URL parsing,
 and other helper functions.
 """
 
+import hashlib
+import shutil
+from pathlib import Path
 from typing import Any, Dict, Optional
+from urllib.parse import quote, urlparse
 
 
 def format_hardware_info(hardware_info: Optional[Dict[str, Any]]) -> str:
@@ -109,3 +113,62 @@ def extract_github_repo_name(repo_url: str) -> str:
             return f"{parts[-2]}/{parts[-1]}"
 
     return None
+
+
+def resolve_dossier_asset_path(
+    path_value: Optional[str],
+    project_root: Path,
+    output_dir: Path,
+    *,
+    subdir: str,
+    prefix: Optional[str] = None,
+) -> str:
+    """Resolve and copy a local asset into the dossier assets folder.
+
+    If the input path is a URL, it is returned unchanged. If it is a local
+    filesystem path, it is resolved relative to the project root, copied into
+    the dossier assets folder, and returned as a URL-encoded relative path.
+
+    Args:
+        path_value: The original path or URL string.
+        project_root: Root directory of the submission project.
+        output_dir: Dossier output directory containing the HTML files.
+        subdir: Subdirectory under assets/ for the copied file.
+        prefix: Optional prefix for the copied file name to avoid collisions.
+
+    Returns:
+        str: A URL or a relative path suitable for HTML src/href attributes.
+    """
+    if not path_value:
+        return ""
+
+    parsed = urlparse(path_value)
+    if parsed.scheme in {"http", "https", "data"}:
+        return path_value
+
+    if parsed.scheme == "file":
+        source_path = Path(parsed.path)
+    else:
+        source_path = Path(path_value).expanduser()
+
+    if not source_path.is_absolute():
+        source_path = (project_root / source_path).resolve()
+    else:
+        source_path = source_path.resolve()
+
+    if not source_path.exists():
+        return path_value
+
+    assets_dir = output_dir / "assets" / subdir
+    assets_dir.mkdir(parents=True, exist_ok=True)
+
+    digest = hashlib.sha1(str(source_path).encode("utf-8")).hexdigest()[:8]
+    safe_prefix = prefix or "asset"
+    dest_name = f"{safe_prefix}_{digest}_{source_path.name}"
+    dest_path = assets_dir / dest_name
+
+    if not dest_path.exists():
+        shutil.copy2(source_path, dest_path)
+
+    rel_path = dest_path.relative_to(output_dir).as_posix()
+    return quote(rel_path)

{microlens_submit-0.16.4.dist-info → microlens_submit-0.16.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: microlens-submit
-Version: 0.16.4
+Version: 0.16.5
 Summary: A tool for managing and submitting microlensing solutions
 Home-page: https://github.com/AmberLee2427/microlens-submit
 Author: Amber Malpas
@@ -95,6 +95,10 @@ 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-0.16.4.dist-info → microlens_submit-0.16.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-microlens_submit/__init__.py,sha256=UdGr8NQ2klUr7cLPboLkHX6qRsn_rTwVfv3LrJ6Z8FE,399
+microlens_submit/__init__.py,sha256=fyqDCZ_UClGfQ7zkhWJC8HFJqh2RQDudEXw2LwhLIYs,399
 microlens_submit/error_messages.py,sha256=8Wzx1NQiAF7hUOjlt-uGhtPC7akknv_PDkokoxhWquk,10411
 microlens_submit/text_symbols.py,sha256=PbQSkqF_FwTBs45TkUL0zZl74IYDz7L4xVxy8eKxQsU,3146
 microlens_submit/tier_validation.py,sha256=FbVHQwItqQnrCeKhkQSgQmMT6dgreTGOptRRYf-AYVE,6649
@@ -17,17 +17,17 @@ microlens_submit/cli/commands/solutions.py,sha256=GvbAiiTaCaqcDRHOAReaMY-gDLlahR
 microlens_submit/cli/commands/validation.py,sha256=1M8mYSNopsA30u3S-yFBd3iJZxsDoNa0vhwo9brJ1VQ,9028
 microlens_submit/dossier/__init__.py,sha256=INAacbrY0Wi5ueH8c7b156bGzelyUFcynbE7_YRiku0,1948
 microlens_submit/dossier/dashboard.py,sha256=4OvTUCxIC4LbAqKwimIFhi65fNo5MMJswiQ5OWtyWFA,19907
-microlens_submit/dossier/event_page.py,sha256=F9waw-Ce2_4ikdCPo-hNURUSYEPGMCfvsY3PbCXpsFg,14425
-microlens_submit/dossier/full_report.py,sha256=zQXoo6ZQfwv_NNFFel3ZYW1DgnqD--VU0L7J7p9yEng,12864
-microlens_submit/dossier/solution_page.py,sha256=qp2JaDamHD__3bwOzZ3CRj2UUSCiOf94wNyOfkQUGGU,23593
-microlens_submit/dossier/utils.py,sha256=LopBbVg6nzQasL1lnaI63y3bpmqYqBeDEwfB_NqEeCA,3845
+microlens_submit/dossier/event_page.py,sha256=7740o3tpW9Urv7GSzYdp2TiphvDi6U7XnjlLZYipvLw,14878
+microlens_submit/dossier/full_report.py,sha256=cNkaUML93oRnARp4VnLkbRMudrByWyj06ohvmH4Qcq0,14310
+microlens_submit/dossier/solution_page.py,sha256=-5kgkOZ9ziNRNAFpVeT_9-6aCcQRL4vv9APopKDFeAw,24748
+microlens_submit/dossier/utils.py,sha256=-DbWByBMsEeQZ-eUyRT74O_3lakE1vHKUD62jPj1_t4,5839
 microlens_submit/models/__init__.py,sha256=1sHFjAWyFtGgQBRSo8lBYiPzToo4tIoHP3uBjtgJSPY,861
 microlens_submit/models/event.py,sha256=ifQqE7d7PJTTI9lGylwWV3EGxgyyNGiJtHbm_DLmuys,17105
 microlens_submit/models/solution.py,sha256=ollTpKv8zMSEqIL2Q9gXJTbaX0fWZt6rg76edBmYOWQ,23629
 microlens_submit/models/submission.py,sha256=f_ewUFhXghnh-pn077bkfBg_6jVbcN_jRhy2wVdKUgk,27941
-microlens_submit-0.16.4.dist-info/licenses/LICENSE,sha256=cy1qkVR-kGxD6FXVsparmU2vHJXYeoyAAHv6SgT67sw,1069
-microlens_submit-0.16.4.dist-info/METADATA,sha256=cs2ufm5y99az4OLvMvDN_Y7982LhJKFolxVU9zRO-Ig,10367
-microlens_submit-0.16.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-microlens_submit-0.16.4.dist-info/entry_points.txt,sha256=kA85yhxYrpQnUvVZCRS2giz52gaf1ZOfZFjY4RHIZ2s,62
-microlens_submit-0.16.4.dist-info/top_level.txt,sha256=uJ9_bADYRySlhEpP-8vTm90ZLV2SrKEzutAaRx8WF0k,17
-microlens_submit-0.16.4.dist-info/RECORD,,
+microlens_submit-0.16.5.dist-info/licenses/LICENSE,sha256=cy1qkVR-kGxD6FXVsparmU2vHJXYeoyAAHv6SgT67sw,1069
+microlens_submit-0.16.5.dist-info/METADATA,sha256=4mSk_0rksMNxU7NOl2dEA7J73Zvb1SwJ-DKGW00WPkM,10673
+microlens_submit-0.16.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+microlens_submit-0.16.5.dist-info/entry_points.txt,sha256=kA85yhxYrpQnUvVZCRS2giz52gaf1ZOfZFjY4RHIZ2s,62
+microlens_submit-0.16.5.dist-info/top_level.txt,sha256=uJ9_bADYRySlhEpP-8vTm90ZLV2SrKEzutAaRx8WF0k,17
+microlens_submit-0.16.5.dist-info/RECORD,,

{microlens_submit-0.16.4.dist-info → microlens_submit-0.16.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any