refactor circuit draw (render)

Author: Mayank447

src/qutip_qip/circuit/circuit.py

@@ -8,9 +8,8 @@
 import numpy as np
 from copy import deepcopy
 
-from .texrenderer import TeXRenderer
 from ._decompose import _resolve_to_universal, _resolve_2q_basis
-from ..operations import (
+from qutip_qip.operations import (
     Gate,
     Measurement,
     expand_operator,
@@ -37,7 +36,6 @@ def DisplaySVG(data, *args, **kwargs):
 
 __all__ = [
     "QubitCircuit",
-    "CircuitResult",
 ]
 
 
@@ -967,6 +965,8 @@ def draw(
         """
 
         if renderer == "latex":
+            from qutip_qip.circuit.draw import TeXRenderer
+            
             if file_type == "png" and dpi is None:
                 dpi = 100
 
@@ -985,7 +985,7 @@ def draw(
             )
 
         elif renderer == "matplotlib":
-            from .mat_renderer import MatRenderer
+            from qutip_qip.circuit.draw import MatRenderer
 
             if dpi is not None:
                 kwargs["dpi"] = dpi
@@ -996,7 +996,7 @@ def draw(
                 mat.save(file_path)
 
         elif renderer == "text":
-            from .text_renderer import TextRenderer
+            from qutip_qip.circuit.draw import TextRenderer
 
             text = TextRenderer(self, **kwargs)
             text.layout()

src/qutip_qip/circuit/draw/__init__.py

@@ -0,0 +1,13 @@
+from qutip_qip.circuit.draw.base_renderer import BaseRenderer, StyleConfig
+from qutip_qip.circuit.draw.mat_renderer import MatRenderer
+from qutip_qip.circuit.draw.texrenderer import CONVERTERS, TeXRenderer
+from qutip_qip.circuit.draw.text_renderer import TextRenderer
+
+__all__ = [
+    "BaseRenderer",
+    "StyleConfig",
+    "MatRenderer",
+    "TeXRenderer",
+    "CONVERTERS",
+    "TextRenderer",
+]

src/qutip_qip/circuit/base_renderer.py …/qutip_qip/circuit/draw/base_renderer.pysrc/qutip_qip/circuit/base_renderer.py renamed to src/qutip_qip/circuit/draw/base_renderer.py src/qutip_qip/circuit/base_renderer.py renamed to src/qutip_qip/circuit/draw/base_renderer.py

@@ -8,9 +8,6 @@
 from .color_theme import qutip, light, dark, modern
 
 
-__all__ = ["BaseRenderer", "StyleConfig"]
-
-
 @dataclass
 class StyleConfig:
     """

src/qutip_qip/circuit/color_theme.py src/qutip_qip/circuit/draw/color_theme.pysrc/qutip_qip/circuit/color_theme.py renamed to src/qutip_qip/circuit/draw/color_theme.py

@@ -14,13 +14,9 @@
     FancyArrow,
 )
 
-from .base_renderer import BaseRenderer, StyleConfig
-from ..operations import Gate, Measurement
-from ..circuit import QubitCircuit
-
-__all__ = [
-    "MatRenderer",
-]
+from qutip_qip.circuit.draw import BaseRenderer, StyleConfig
+from qutip_qip.operations import Gate, Measurement
+from qutip_qip.circuit import QubitCircuit
 
 
 class MatRenderer(BaseRenderer):

src/qutip_qip/circuit/mat_renderer.py …c/qutip_qip/circuit/draw/mat_renderer.pysrc/qutip_qip/circuit/mat_renderer.py renamed to src/qutip_qip/circuit/draw/mat_renderer.py src/qutip_qip/circuit/mat_renderer.py renamed to src/qutip_qip/circuit/draw/mat_renderer.py

@@ -6,9 +6,7 @@
 import subprocess
 import collections
 
-from ..operations import Gate
-
-__all__ = ["TeXRenderer", "CONVERTERS"]
+from qutip_qip.operations import Gate
 
 
 class TeXRenderer:

src/qutip_qip/circuit/texrenderer.py src/qutip_qip/circuit/draw/texrenderer.pysrc/qutip_qip/circuit/texrenderer.py renamed to src/qutip_qip/circuit/draw/texrenderer.py

@@ -5,13 +5,9 @@
 from math import ceil
 from typing import List
 
-from .base_renderer import BaseRenderer, StyleConfig
-from ..operations import Gate, Measurement
-from . import QubitCircuit
-
-__all__ = [
-    "TextRenderer",
-]
+from qutip_qip.circuit.draw import BaseRenderer, StyleConfig
+from qutip_qip.operations import Gate, Measurement
+from qutip_qip.circuit import QubitCircuit
 
 
 class TextRenderer(BaseRenderer):

src/qutip_qip/circuit/text_renderer.py …/qutip_qip/circuit/draw/text_renderer.pysrc/qutip_qip/circuit/text_renderer.py renamed to src/qutip_qip/circuit/draw/text_renderer.py src/qutip_qip/circuit/text_renderer.py renamed to src/qutip_qip/circuit/draw/text_renderer.py

@@ -6,7 +6,7 @@
 
 
 from qutip_qip.circuit import QubitCircuit, CircuitSimulator
-from qutip_qip.circuit.texrenderer import TeXRenderer
+from qutip_qip.circuit.draw import TeXRenderer
 from qutip import (
     tensor,
     Qobj,

tests/test_circuit.py

@@ -2,7 +2,7 @@
 import numpy as np
 from unittest.mock import patch
 from qutip_qip.circuit import QubitCircuit
-from qutip_qip.circuit.text_renderer import TextRenderer
+from qutip_qip.circuit.draw import TextRenderer
 
 
 @pytest.fixture