icplot 0.3.0__py3-none-any.whl → 0.3.3__py3-none-any.whl

icplot/converter/image.py

@@ -5,6 +5,8 @@ formats
 
 import logging
 import os
+import shutil
+import subprocess
 from pathlib import Path
 
 logger = logging.getLogger(__name__)
@@ -29,6 +31,10 @@ def has_wand() -> bool:
     return _HAS_WAND
 
 
+def has_magick() -> bool:
+    return bool(shutil.which("magick"))
+
+
 def has_cairo_svg() -> bool:
     return _HAS_CAIRO_SVG
 
@@ -39,13 +45,27 @@ def _get_out_filename(source: Path, target: Path | None, extension: str) -> Path
     return source.parent / f"{source.stem}.{extension}"
 
 
+def _pdf_to_png(source: Path, target: Path | None = None, resolution: int = 300):
+
+    outfile = _get_out_filename(source, target, "png")
+    os.makedirs(outfile.parent, exist_ok=True)
+    cmd = (
+        f"magick -density {resolution} -background white -alpha off {source} {outfile}"
+    )
+    subprocess.run(cmd, shell=True, check=True)
+
+
 def pdf_to_png(source: Path, target: Path | None = None, resolution: int = 300):
     """
     Convert a pdf to png with white background
     """
 
     if not has_wand():
-        raise RuntimeError("Loading Wand failed - no pdf to png support")
+        if has_magick():
+            _pdf_to_png(source, target, resolution)
+            return
+        else:
+            raise RuntimeError("Loading Wand failed - no pdf to png support")
 
     outfile = _get_out_filename(source, target, "png")
     os.makedirs(outfile.parent, exist_ok=True)

icplot/renderer/__init__.py

@@ -1 +1,5 @@
 from . import formats  # noqa: F401 — trigger handler registration
+from .config import MermaidConfig, RenderConfig, TexConfig
+from .render import render
+
+__all__ = ["RenderConfig", "MermaidConfig", "TexConfig", "render"]

icplot/renderer/formats/mermaid.py

@@ -5,8 +5,10 @@ Mermaid must already be set up on the system, eg. via the npm ecosystem.
 """
 
 import logging
+import os
 import shutil
 import subprocess
+from pathlib import Path
 
 from ..config import RenderContext
 
@@ -26,16 +28,20 @@ def render(ctx: RenderContext):
         raise RuntimeError("Mermaid CLI 'mmdc' not found in path.")
 
     if ctx.output_dir:
-        ctx.output_dir.mkdir(exist_ok=True)
+        ctx.output_dir.mkdir(exist_ok=True, parents=True)
         output_path = ctx.output_dir / f"{ctx.source.stem}.{ctx.output_type}"
     else:
         output_path = ctx.source.parent / f"{ctx.source.stem}.{ctx.output_type}"
 
     logger.info("Rendering: %s -> %s", ctx.source, output_path)
 
-    cmd = f"mmdc -i {ctx.source} -o {output_path}"
-    if ctx.config.mermaid.browser_config:
-        cmd += f" -p {ctx.config.mermaid.browser_config}"
+    browser_config = ctx.config.mermaid.browser_config
+    if not browser_config and (env_path := os.environ.get("MMDC_PUPPETEER_CONFIG")):
+        browser_config = Path(env_path)
+
+    cmd = f"mmdc -i '{ctx.source}' -o '{output_path}'"
+    if browser_config:
+        cmd += f" -p '{browser_config}'"
     logger.debug("Command: %s", cmd)
     subprocess.run(cmd, shell=True, check=True)
     logger.info("Done: %s", output_path.name)

icplot/renderer/formats/plantuml.py

@@ -24,6 +24,9 @@ def render(ctx: RenderContext):
     logger.info("Rendering: %s -> %s", ctx.source, ctx.output_type)
 
     cmd = ["plantuml", f"-t{ctx.output_type}"]
+    if ctx.output_dir:
+        ctx.output_dir.mkdir(exist_ok=True, parents=True)
+        cmd.extend(["-o", str(ctx.output_dir)])
     if ctx.config.plantuml.config_path:
         cmd.extend(["-config", str(ctx.config.plantuml.config_path.resolve())])
     cmd.append(str(ctx.source))

icplot/renderer/formats/tex.py

@@ -37,7 +37,7 @@ def _run_commands(ctx: RenderContext, work_dir: Path):
     logger.debug("Engine: %s | work_dir: %s", ctx.config.tex.build_engine, work_dir)
 
     if ctx.config.tex.build_engine == "pdflatex":
-        cmd = f"{ctx.config.tex.build_engine} {' '.join(extra_flags)} {ctx.source}"
+        cmd = f"{ctx.config.tex.build_engine} {' '.join(extra_flags)} '{ctx.source}'"
         logger.info("Command: %s", cmd.strip())
         with open(work_dir / "stdout.txt", "w", encoding="utf-8") as f:
             subprocess.run(
@@ -45,6 +45,7 @@ def _run_commands(ctx: RenderContext, work_dir: Path):
                 shell=True,
                 check=True,
                 cwd=work_dir,
+                env=tex_env,
                 stdout=f,
                 stderr=f,
                 stdin=subprocess.DEVNULL,
@@ -92,7 +93,9 @@ def render(ctx: RenderContext):
     work_dir = ctx.build_dir / ctx.source.stem
     work_dir.mkdir(exist_ok=True, parents=True)
 
-    _run_commands(ctx, work_dir)
+    err = _run_commands(ctx, work_dir)
+    if err:
+        raise RuntimeError(f"Render failed for {ctx.source.name}: {err}")
 
     tex_path = work_dir / ctx.source.name
     if ctx.config.tex.build_engine == "pdflatex":

icplot/renderer/render.py

@@ -61,10 +61,13 @@ def _get_extension(path: Path) -> str:
 
 
 def _collect_sources(root: Path, formats: list[str], excludes: list[str]) -> list[Path]:
-    files = []
+    files: list[Path] = []
     if root.is_file():
         logger.info("Using source: %s", root)
         suffix = _get_extension(root)
+        if suffix not in _ENVIRONMENT_CHECKS:
+            logger.warning("Unknown extension .%s — no renderer registered", suffix)
+            return files
         if _ENVIRONMENT_CHECKS[suffix]():
             files.append(root)
         else:
@@ -76,6 +79,9 @@ def _collect_sources(root: Path, formats: list[str], excludes: list[str]) -> lis
         if not formats:
             formats = _FORMATS
         for f in formats:
+            if f not in _ENVIRONMENT_CHECKS:
+                logger.warning("Unknown format requested: %s — skipping", f)
+                continue
             if _ENVIRONMENT_CHECKS[f]():
                 files.extend(find_files(root, f, excludes))
             else:
@@ -97,6 +103,9 @@ def _setup_tasks(
             output_formats = _DEFAULT_OUTPUT_FORMATS[ext]
 
         for fmt in output_formats:
+            if ext not in _RENDERERS:
+                logger.warning("No renderer for extension .%s — skipping %s", ext, f)
+                continue
             tasks.append(
                 partial(
                     _RENDERERS[ext],
@@ -135,6 +144,6 @@ def render(
     if errors:
         logger.error("%d/%d task(s) failed:", len(errors), len(tasks))
         for task_error in errors:
-            logger.error("  %s", task_error[1].relative_to(root))
+            logger.error("  %s", task_error.args[0].source.relative_to(root))
     else:
         logger.info("Done — %d/%d task(s) succeeded", succeeded, len(tasks))

{icplot-0.3.0.dist-info → icplot-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: icplot
-Version: 0.3.0
+Version: 0.3.3
 Summary: Utilities for generating plots and graphics for technical reports.
 Author-email: "James Grogan, Irish Centre for High End Computing" <james.grogan@ichec.ie>
 Project-URL: Repository, https://git.ichec.ie/performance/toolshed/icplot

{icplot-0.3.0.dist-info → icplot-0.3.3.dist-info}/RECORD

@@ -8,7 +8,7 @@ icplot/charts/tree.py,sha256=a7v092_RZkj1Q_SBdMvDRwPll3mnZBQQpHf8ZL7LzkA,3303
 icplot/converter/__init__.py,sha256=GfcJduTKQpUgiqxLnF-6lZN_CCuQMDeGbddHA61DmOU,108
 icplot/converter/cli.py,sha256=Eq8POhpmoBZQBiMSC1ksBwHCzyiZFYX5C8UT_TnoCb4,621
 icplot/converter/convert.py,sha256=KQdmtNx3JsoGRelWY9ajBex079SuLgyhRrKuUAPr678,781
-icplot/converter/image.py,sha256=oEMcB15T3cpto6EFdukgQLfUvjZCnQR9VLdC4kuxYyI,2075
+icplot/converter/image.py,sha256=6iNqRspxhSrsFHXBexNAzPdjwAGb3GCG0_LbX6e09bM,2630
 icplot/geometry/__init__.py,sha256=rKIBe0dGG2toJM5BXWX8yJoWVKPVhOyik5P_ksn5l3k,125
 icplot/geometry/base.py,sha256=9HcgcglPMRtnszvS_sFf--FjCgx-swqqqRb5pT_8U10,1434
 icplot/geometry/operations.py,sha256=qZYHbBJ-pKG_T2BChKSLR4__fszbdVS-jQjUoLvpeQA,1476
@@ -31,17 +31,17 @@ icplot/graph/axis.py,sha256=3nyXoqdD-ui2C9CEr7-tZYaYeZI2AHyOU_kPK_qJGfc,965
 icplot/graph/plot.py,sha256=pGwrPoo646tsIMNc8UapsGgOF69gz-qceyDrvhKhzo4,1895
 icplot/graph/plot_group.py,sha256=EGaKWo86vSIPDCfolBQrUocalhZlZGLRqN9UhDvaj3Q,1697
 icplot/graph/series.py,sha256=V4CbozIopX3DFC8Bx82WXSXKNT__85kWaHfovtwmIpY,3169
-icplot/renderer/__init__.py,sha256=j32WdVwl_mkR98_JxHnlcc5BhcUNLqqF8ob2T0GMikg,69
+icplot/renderer/__init__.py,sha256=qFbCv5_5AGNUhi4XC0CTZPpxRvsmnL4xtJKCr5AW7Mk,223
 icplot/renderer/cli.py,sha256=GIhDmmaqnrvCZ8EtKxG6AyGcYfq1aibho-Qn4Li1Ylw,1385
 icplot/renderer/config.py,sha256=2yHNMOk-J0cg4eIQc69zo62bEMdKF4-rXwXxk2vozHU,959
-icplot/renderer/render.py,sha256=5YypuoE7H6faX7j7UnnVHJ5r_39ntBG1Q7UwzayMyRk,4323
+icplot/renderer/render.py,sha256=mQAy4pkpm71gZmxvcg05t1FWS3D7jkazZsMrbGU16ws,4805
 icplot/renderer/video.py,sha256=pgqFx8t-jA672dPaHTJDQntDfd8OjbJLaeU2n0ioy2w,747
 icplot/renderer/charts/pgfgantt.py,sha256=c59uBa-qpki8EiL-dqsv0J7yOnSZ87A9Y1GjMZU4yYE,2079
 icplot/renderer/charts/svggantt.py,sha256=8jQBXA7ZrCPDNDXN0GjvRDSId7n6yBGv8QNvK-B8AYc,1724
 icplot/renderer/formats/__init__.py,sha256=-J5zT5tAmaM8WPLaPvuWcrs9NVhS0GEAZTTpHpt437g,81
-icplot/renderer/formats/mermaid.py,sha256=OdTWotOtvIHMRJ5xxD2ul82XK4NSEx1uo7vu00EbgEo,1099
-icplot/renderer/formats/plantuml.py,sha256=YlYld0xGUcQjF45HINpxVlbdzHgkk6LvwghGAQiFxG0,1022
-icplot/renderer/formats/tex.py,sha256=DxgZMo2ZYLHVsBm3D_NdDcbMNZjbY0wndH9nCc254LQ,3815
+icplot/renderer/formats/mermaid.py,sha256=Fe-3UKcDCJ0G4PCvPZ4UX69-6xQLa56Yw_QI87s4qTk,1297
+icplot/renderer/formats/plantuml.py,sha256=W1jNVwXBrcsKrAY8iByeYWbVodARGl-xmgg35ZgQQ_c,1151
+icplot/renderer/formats/tex.py,sha256=FnM84CqwZAKs13EKNDoQCmO7ESI4gMsKdsU8fnM_rGk,3938
 icplot/renderer/graph/__init__.py,sha256=gP9iFHKgIMzXs9i5dJJ5VKtMvSWnBLQ8lRWdS4xItKw,57
 icplot/renderer/graph/color.py,sha256=MxhzXMxvwCXNBkrlcpH49T2pZTd5fabw7QQEmk4Vy40,480
 icplot/renderer/graph/matplotlib.py,sha256=2UsIFJgX39tF7GFzPNkOR3OzTt7UHCeVCrbU0Ef8HJM,5516
@@ -57,9 +57,9 @@ icplot/theme/theme.py,sha256=-dbg9dueQR-Z7vkItaXAZw7RWzgLgx9MbkMRg06IxjI,3643
 icplot/theme/theme_generator.py,sha256=HDZ9Q_-yrDB2hlULQ2T4sAzrW013_ffkeJ7r-zEW_hc,4380
 icplot/theme/templates/puml.j2,sha256=YUW-awHGGhFtgat7CWUyu1q4ZiUamGrG15eq4ZGa9O4,3498
 icplot/theme/templates/tikz.j2,sha256=vJGbokhsPSoXiy2xK23r1imouHsdGGpwsRMF7rfraEA,6010
-icplot-0.3.0.dist-info/licenses/LICENSE,sha256=JedcPd23DfREo3CH5_Sc8He0jmmbOWIm1_sQaisXZ9E,34592
-icplot-0.3.0.dist-info/METADATA,sha256=3CLZaiR7nhLbMRiT8g_lSm1RTjJX8drkV8a03QmZAiI,3584
-icplot-0.3.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-icplot-0.3.0.dist-info/entry_points.txt,sha256=6CdEGO5Z4NTQoOeRITTKGtzT3xNX47CGHZuWNWxZuZs,52
-icplot-0.3.0.dist-info/top_level.txt,sha256=T_ecIGmXlOO4_xP86S-OFL8nnoxmDQFXjcDoIwpiHQk,7
-icplot-0.3.0.dist-info/RECORD,,
+icplot-0.3.3.dist-info/licenses/LICENSE,sha256=JedcPd23DfREo3CH5_Sc8He0jmmbOWIm1_sQaisXZ9E,34592
+icplot-0.3.3.dist-info/METADATA,sha256=F2X0dajppDIDUAw9lbAYvYWTnU6JNgBDhgWAhiAgKGM,3584
+icplot-0.3.3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+icplot-0.3.3.dist-info/entry_points.txt,sha256=6CdEGO5Z4NTQoOeRITTKGtzT3xNX47CGHZuWNWxZuZs,52
+icplot-0.3.3.dist-info/top_level.txt,sha256=T_ecIGmXlOO4_xP86S-OFL8nnoxmDQFXjcDoIwpiHQk,7
+icplot-0.3.3.dist-info/RECORD,,