add path handling so that clusters/groups will display correctly (#116)

* add path handling so that clusters/groups will display correctly

* PR comments, bump version to 1.1

* include path in CouldNotParsePathError

* update table test

* install diagrams on CI

* simplify diagrams test

Author: hbmartin

.github/workflows/lint.yml

@@ -41,4 +41,4 @@ jobs:
       - uses: psf/black@stable
         with:
           options: "--check --verbose"
-      - run: pytest --cov
+      - run: pip install diagrams && pytest --cov

.idea/misc.xml

@@ -14,7 +14,7 @@ def convert(
     graph_to_convert: AGraph | str | TextIOBase | Path | TextIO,
     layout_prog: str = "dot",
 ) -> str:
-    graph = _load_pygraphviz_graph(graph_to_convert)
+    graph = _load_pygraphviz_agraph(graph_to_convert)
 
     graph_edges: dict[str, dict] = {
         f"{e[0]}->{e[1]}-"
@@ -49,12 +49,16 @@ def convert(
     return mx_graph.value()
 
 
-def _load_pygraphviz_graph(
+def _load_pygraphviz_agraph(  # noqa: PLR0911
     graph_to_convert: AGraph | str | TextIOBase | Path | TextIO,
 ) -> AGraph:
     if isinstance(graph_to_convert, AGraph):
         return graph_to_convert
     if isinstance(graph_to_convert, str):
+        if graph_to_convert.endswith((".dot", ".gv", ".txt")):
+            return AGraph(filename=graph_to_convert)
+        if graph_to_convert.endswith(("}", "}\n")):
+            return AGraph(string=graph_to_convert)
         # This fixes a pygraphviz bug where a string beginning with a comment
         # is mistakenly identified as a filename.
         # https://github.com/pygraphviz/pygraphviz/issues/536
@@ -63,6 +67,7 @@ def _load_pygraphviz_graph(
             flags=re.MULTILINE,
         )
         if pattern.search(graph_to_convert):
+            # graph_to_convert was a graph / dot string
             return AGraph(string=graph_to_convert)
         return AGraph(filename=graph_to_convert)
     # pyrefly: ignore  # missing-attribute

graphviz2drawio/graphviz2drawio.py

@@ -10,6 +10,15 @@ def __init__(self, message: str) -> None:
         super().__init__(message)
 
 
+class CouldNotParsePathError(GdValueError):
+    """Could not parse path from SVG element."""
+
+    def __init__(self, path: str) -> None:
+        super().__init__(
+            f"Could not parse path from SVG element: {path}",
+        )
+
+
 class MissingTitleError(GdValueError):
     """Title missing from SVG element."""
 

graphviz2drawio/models/Errors.py

@@ -7,7 +7,12 @@
 from . import MxConst, Shape
 from .MxConst import DEFAULT_STROKE_WIDTH
 from .Node import Gradient, Node
-from .RectFactory import rect_from_ellipse_svg, rect_from_image, rect_from_svg_points
+from .RectFactory import (
+    rect_from_ellipse_svg,
+    rect_from_image,
+    rect_from_svg_path,
+    rect_from_svg_points,
+)
 from .Text import Text
 from .utils import adjust_color_opacity
 
@@ -64,6 +69,11 @@ def from_svg(
             stroke_width = ellipse.attrib.get("stroke-width", DEFAULT_STROKE_WIDTH)
             if "stroke-dasharray" in ellipse.attrib:
                 dashed = True
+        elif (path := SVG.get_first(g, "path")) is not None:
+            rect = rect_from_svg_path(self.coords, path.attrib["d"])
+            shape = Shape.RECT
+            fill = self._extract_fill(path, gradients)
+            stroke = self._extract_stroke(path)
         else:
             shape = Shape.ELLIPSE
 

graphviz2drawio/mx/NodeFactory.py

@@ -1,7 +1,33 @@
+from svg import path as svg_path
+
 from ..models.CoordsTranslate import CoordsTranslate
+from ..models.Errors import CouldNotParsePathError
 from ..models.Rect import Rect
 
 
+def rect_from_svg_path(coords: CoordsTranslate, path_d: str) -> Rect:
+    parsed_path: svg_path.Path = svg_path.parse_path(path_d)
+    if len(parsed_path) == 0 or not isinstance(parsed_path[0], svg_path.Move):
+        raise CouldNotParsePathError(path_d)
+    start: svg_path.Move = parsed_path.pop(0)
+    min_x = start.start.real
+    min_y = start.start.imag
+    max_x = start.start.real
+    max_y = start.start.imag
+
+    # Note that this loop may not be accurate since it does not calculate
+    # the Bezier curve based on the control points
+    for e in parsed_path:
+        min_x = min(min_x, e.start.real, e.end.real)
+        min_y = min(min_y, e.start.imag, e.end.imag)
+        max_x = max(max_x, e.start.real, e.end.real)
+        max_y = max(max_y, e.start.imag, e.end.imag)
+
+    (x, y) = coords.translate(min_x, min_y)
+
+    return Rect(x=x, y=y, width=max_x - min_x, height=max_y - min_y)
+
+
 def rect_from_svg_points(coords: CoordsTranslate, svg: str) -> Rect:
     """Don't use this function.
 

graphviz2drawio/mx/RectFactory.py

@@ -81,7 +81,7 @@ class Styles(Enum):
     )
     LARROW = "flipH=1;" + RARROW
     IMAGE = (
-        "shape=image;verticalLabelPosition=bottom;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;"
+        "shape=image;verticalLabelPosition=top;labelBackgroundColor=default;verticalAlign=top;aspect=fixed;"
         "imageAspect=0;image={image};" + NODE
     )
 

graphviz2drawio/mx/Styles.py

@@ -1,4 +1,4 @@
-__version__ = "1.0.0"
+__version__ = "1.1.0"
 
 if __name__ == "__main__":
     print(__version__)

graphviz2drawio/version.py

@@ -10,7 +10,7 @@ line-length = 88
 indent-width = 4
 
 lint.select = ["ALL"]
-lint.ignore = ["D100", "D101", "D102", "D103", "D104", "D105", "D107", "D203", "D213", "ERA001", "ICN001", "PLR0913", "PT009", "S314", "SIM102", "TD002", "TID252", "N999"]
+lint.ignore = ["D100", "D101", "D102", "D103", "D104", "D105", "D107", "D203", "D213", "ERA001", "ICN001", "PLR0913", "PT009", "RSE102", "S314", "SIM102", "TD002", "TID252", "N999"]
 target-version = "py310"
 
 [tool.ruff.format]

pyproject.toml

@@ -41,11 +41,11 @@
         "Programming Language :: Python :: 3.14",
     ],
     license="GPLv3",
-    keywords="graphviz graph agraph dot convert conversion draw drawio mxgraph maxgraph",
+    keywords="graphviz graph agraph dot convert conversion diagrams drawio mxgraph maxgraph Lucidchart",
     packages=find_packages(exclude=["doc", "test"]),
     python_requires=">=3.10",
     install_requires=["puremagic", "pygraphviz", "svg.path"],
-    tests_require=["pytest"],
+    tests_require=["diagrams", "pytest"],
     entry_points={"console_scripts": ["graphviz2drawio=graphviz2drawio.__main__:main"]},
     project_urls={
         "Bug Reports": "https://github.com/hbmartin/graphviz2drawio/issues",