add graph type support clingraph

backend/src/viasp/api.py

@@ -301,22 +301,24 @@ def relax_constraints(*args, **kwargs) -> viaspControl:
     connector = _get_connector(**kwargs)
     return connector.relax_constraints(head_name, collect_variables)
 
-def clingraph(viz_encoding, engine, **kwargs) -> None:
+def clingraph(viz_encoding, engine="dot", graphviz_type="graph", **kwargs) -> None:
     r"""
     Generate the a clingraph from the marked models and the visualization encoding.
 
     :param viz_encoding: ``str``
         The path to the visualization encoding.
     :param engine: ``str``
         The visualization engine. See ``clingraph`` for more details.
+    :param graphviz_type: ``str``
+        The graph type. See ``clingraph`` for more details.
     :param kwargs:
         * *viasp_backend_url* (``str``) --
             url of the viasp backend
         * *_viasp_client* (``ClingoClient``) --
           a viasp client object
     """
     connector = _get_connector(**kwargs)
-    connector.clingraph(viz_encoding, engine)
+    connector.clingraph(viz_encoding, engine, graphviz_type)
 
 def register_transformer(transformer: Transformer, imports: str = "", path: str = "", **kwargs) -> None:
     r"""

backend/src/viasp/clingoApiClient.py

@@ -83,12 +83,12 @@ def relax_constraints(self, *args, **kwargs):
             error(f"Transforming constraints failed [{r.status_code}] ({r.reason})")    
             return None
 
-    def clingraph(self, viz_encoding_path, engine):
+    def clingraph(self, viz_encoding_path, engine, graphviz_type):
         with open(viz_encoding_path, "r") as f:
             prg = f.read().splitlines()
             prg = '\n'.join(prg)
 
-        serialized = json.dumps({"viz-encoding":prg, "engine":engine}, cls=DataclassJSONEncoder)
+        serialized = json.dumps({"viz-encoding":prg, "engine":engine, "graphviz-type":graphviz_type}, cls=DataclassJSONEncoder)
 
         r = requests.post(f"{self.backend_url}/control/clingraph",
                               data=serialized,

backend/src/viasp/server/blueprints/api.py

@@ -196,6 +196,7 @@ def clingraph_generate():
         marked_models = wrap_marked_models(marked_models)
         viz_encoding = request.json["viz-encoding"]
         engine = request.json["engine"]
+        graphviz_type = request.json["graphviz-type"]
 
 
         # for every model that was maked
@@ -208,7 +209,7 @@ def clingraph_generate():
             with control.solve(yield_=True) as handle:
                 for m in handle:
                     fb = Factbase.from_model(m, default_graph="base")
-                    graphs = compute_graphs(fb)
+                    graphs = compute_graphs(fb, graphviz_type)
 
                     filename = uuid4().hex
                     using_clingraph.append(filename)

backend/src/viasp/wrapper.py

@@ -89,8 +89,8 @@ def relax_constraints(self, head_name:str = "unsat", collect_variables:bool = Tr
         return ctl
 
 
-    def clingraph(self, viz_encoding, engine="dot"):
-        self._database.clingraph(viz_encoding, engine)
+    def clingraph(self, viz_encoding, engine="dot", graphviz_type="graph"):
+        self._database.clingraph(viz_encoding, engine, graphviz_type)
 
     def register_transformer(self, transformer, imports="", path=""):
         self._database._register_transformer(transformer, imports, path)