Add Python 3.14 classifier and update specs (#113)

* Add Python 3.14 classifier and update specs

* Use different type checkers for different versions

* remove ty

* pyrefly check

* make mypy not strict

* remove pyrefly

* Fixes for pyrefly, run on py 3.14

* reformat imports

* pyrefly ignores

Author: hbmartin

.github/workflows/lint.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
     steps:
       - uses: actions/checkout@v4
       - name: Setup Graphviz
@@ -30,8 +30,12 @@ jobs:
           if [[ '${{ steps.cpython3.outputs.python-version }}' == 3.11* ]]; then
             pip install pytype
             pytype -j auto graphviz2drawio
+          elif [[ '${{ steps.cpython3.outputs.python-version }}' == 3.14* ]]; then
+            echo "Using pyrefly for Python 3.14"
+            pip install pyrefly
+            pyrefly check
           else
-            echo "pytype does not support >= 3.12: https://github.com/google/pytype/issues/1475"
+            echo "Using mypy for Python 3.12"
             pip install mypy
             mypy graphviz2drawio --ignore-missing-imports
           fi

graphviz2drawio/graphviz2drawio.py

@@ -4,6 +4,7 @@
 
 from pygraphviz import AGraph
 
+from .models.Errors import UnableToParseGraphError
 from .models.SvgParser import parse_nodes_edges_clusters
 from .mx.MxGraph import MxGraph
 
@@ -16,12 +17,17 @@ def convert(graph_to_convert: AGraph | str | IO, layout_prog: str = "dot") -> st
 
     graph_edges: dict[str, dict] = {
         f"{e[0]}->{e[1]}-"
+        # pyrefly: ignore  # missing-attribute
         + (e.attr.get("xlabel") or e.attr.get("label") or ""): e.attr.to_dict()
         for e in graph.edges_iter()
     }
+    # pyrefly: ignore  # missing-attribute
     graph_nodes: dict[str, dict] = {n: n.attr.to_dict() for n in graph.nodes_iter()}
 
-    svg_graph = graph.draw(prog=layout_prog, format="svg")
+    svg_graph: bytes | None = graph.draw(prog=layout_prog, format="svg")
+
+    if svg_graph is None:
+        raise UnableToParseGraphError(graph)
 
     nodes, edges, clusters = parse_nodes_edges_clusters(
         svg_data=svg_graph,

graphviz2drawio/models/Errors.py

@@ -1,5 +1,7 @@
 from xml.etree.ElementTree import Element
 
+from pygraphviz import AGraph
+
 
 class GdValueError(ValueError):
     """Base class for exceptions raised during conversion."""
@@ -40,3 +42,12 @@ def __init__(self, sid: str | None, gid: str | None) -> None:
         super().__init__(
             f"Missing identifiers for a geometry: sid(id): {sid}, gid(title): {gid}.",
         )
+
+
+class UnableToParseGraphError(GdValueError):
+    """Graph was unexpectedly None."""
+
+    def __init__(self, graph: AGraph) -> None:
+        super().__init__(
+            f"Graph.draw() returned by pygraphviz was unexpectedly None: {graph}",
+        )

graphviz2drawio/models/SvgParser.py

@@ -2,27 +2,30 @@
 from collections import OrderedDict
 from collections.abc import Iterable
 from math import isclose
+from typing import TYPE_CHECKING
 from xml.etree import ElementTree
 
-from graphviz2drawio.mx.Edge import Edge
-from graphviz2drawio.mx.EdgeFactory import EdgeFactory
-from graphviz2drawio.mx.Node import Gradient, Node
-from graphviz2drawio.mx.NodeFactory import NodeFactory
-
 from ..mx.Curve import LINE_TOLERANCE
+from ..mx.Edge import Edge
+from ..mx.EdgeFactory import EdgeFactory
+from ..mx.Node import Gradient, Node
+from ..mx.NodeFactory import NodeFactory
 from ..mx.utils import adjust_color_opacity
 from . import SVG
 from .commented_tree_builder import COMMENT, CommentedTreeBuilder
 from .CoordsTranslate import CoordsTranslate
 from .Errors import MissingTitleError
 
+if TYPE_CHECKING:
+    from xml.etree.ElementTree import Element
+
 
 def parse_nodes_edges_clusters(
     svg_data: bytes,
     *,
     is_directed: bool,
 ) -> tuple[OrderedDict[str, Node], list[Edge], OrderedDict[str, Node]]:
-    root = ElementTree.fromstring(
+    root: Element = ElementTree.fromstring(
         svg_data,
         parser=ElementTree.XMLParser(target=CommentedTreeBuilder()),
     )[0]
@@ -37,6 +40,7 @@ def parse_nodes_edges_clusters(
     gradients = dict[str, Gradient]()
 
     prev_comment = None
+    # pyrefly: ignore  # unknown
     for g in root:
         if g.tag == COMMENT:
             prev_comment = g.text

graphviz2drawio/models/commented_tree_builder.py

@@ -18,12 +18,15 @@ def __init__(self):
         self.was_root_set = False
 
     def start(self, tag, attrs):
-        super().start(tag, attrs)
+        elem = super().start(tag, attrs)
         self.was_root_set = True
+        return elem
 
     def comment(self, data):
+        rv = super().comment(data)
         if not self.was_root_set:
-            return
+            return rv
         self.start(COMMENT, {})
         self.data(unescape(data.strip()))
         self.end(COMMENT)
+        return rv

graphviz2drawio/mx/CurveFactory.py

@@ -42,8 +42,10 @@ def from_svg(self, svg_path: str) -> Curve:
                     ]
                     points.extend(split_controls)
 
-        start = self.coords.complex_translate(path[0].start)
-        end = self.coords.complex_translate(path[-1].end)
+        # pyrefly: ignore  # missing-attribute
+        start: complex = self.coords.complex_translate(path[0].start)
+        # pyrefly: ignore  # missing-attribute
+        end: complex = self.coords.complex_translate(path[-1].end)
 
         if len(points) > 0 and cmath.isclose(
             start,

graphviz2drawio/mx/Edge.py

@@ -1,5 +1,4 @@
-from graphviz2drawio.models import DotAttr
-
+from ..models import DotAttr
 from ..models.Rect import Rect
 from . import MxConst
 from .Curve import Curve

graphviz2drawio/mx/EdgeFactory.py

@@ -1,7 +1,6 @@
 from xml.etree.ElementTree import Element
 
-from graphviz2drawio.models import SVG, DotAttr
-
+from ..models import SVG, DotAttr
 from ..models.CoordsTranslate import CoordsTranslate
 from .CurveFactory import CurveFactory
 from .Edge import Edge
@@ -22,7 +21,8 @@ def from_svg(self, g: Element, title: str) -> Edge:
         stroke = "#000000"
         stroke_width = DEFAULT_STROKE_WIDTH
         line_style = None
-        labels = [
+        # pyrefly: ignore  # bad-assignment
+        labels: list[Text] = [
             text_from_tag
             for tag in g
             if SVG.is_tag(tag, "text")

graphviz2drawio/mx/MxGraph.py

@@ -1,13 +1,13 @@
 from collections import OrderedDict
 from xml.etree.ElementTree import Element, SubElement, indent, tostring
 
-from graphviz2drawio.models import DotAttr
-from graphviz2drawio.models.Rect import Rect
-from graphviz2drawio.mx import MxConst
-from graphviz2drawio.mx.Curve import Curve
-from graphviz2drawio.mx.Edge import Edge
-from graphviz2drawio.mx.Node import Node
-from graphviz2drawio.mx.Styles import Styles
+from ..models import DotAttr
+from ..models.Rect import Rect
+from . import MxConst
+from .Curve import Curve
+from .Edge import Edge
+from .Node import Node
+from .Styles import Styles
 
 
 class MxGraph:

graphviz2drawio/mx/Node.py

@@ -66,7 +66,7 @@ def get_node_style(self) -> str:
             )
 
         if (rect := self.rect) is not None and (image_path := rect.image) is not None:
-            from graphviz2drawio.mx.image import image_data_for_path
+            from .image import image_data_for_path
 
             attributes["image"] = image_data_for_path(image_path)