oaklib 0.2.7__tar.gz → 0.2.8__tar.gz

{oaklib-0.2.7 → oaklib-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oaklib
-Version: 0.2.7
+Version: 0.2.8
 Summary: Ontology Access Kit: Python library for common ontology operations over a variety of backends
 Author: cmungall
 Author-email: cjm@berkeleybop.org

{oaklib-0.2.7 → oaklib-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oaklib"
-version = "v0.2.7"
+version = "v0.2.8"
 description = "Ontology Access Kit: Python library for common ontology operations over a variety of backends"
 authors = ["cmungall <cjm@berkeleybop.org>"]
 

{oaklib-0.2.7 → oaklib-0.2.8}/src/oaklib/cli.py

@@ -11,7 +11,6 @@ import logging
 import os
 import re
 import secrets
-import subprocess
 import sys
 from collections import defaultdict
 from dataclasses import dataclass
@@ -1710,11 +1709,9 @@ def viz(
     if output_type:
         write_graph(graph, format=output_type, output=output)
     else:
-        imgfile = graph_to_image(
-            graph, seeds=curies, stylemap=stylemap, configure=configure, imgfile=output
+        graph_to_image(
+            graph, seeds=curies, stylemap=stylemap, configure=configure, imgfile=output, view=view
         )
-        if view:
-            subprocess.run(["open", imgfile])
 
 
 @main.command()
@@ -2181,10 +2178,14 @@ def paths(
         else:
             if stylemap is None:
                 stylemap = default_stylemap_path()
-            imgfile = graph_to_image(
-                path_graph, seeds=all_curies, imgfile=output, stylemap=stylemap, configure=configure
+            graph_to_image(
+                path_graph,
+                seeds=all_curies,
+                imgfile=output,
+                stylemap=stylemap,
+                configure=configure,
+                view=viz,
             )
-            subprocess.run(["open", imgfile])
 
 
 @main.command()

{oaklib-0.2.7 → oaklib-0.2.8}/src/oaklib/interfaces/differ_interface.py

@@ -191,7 +191,10 @@ class DifferInterface(BasicOntologyInterface, ABC):
             if isinstance(change, kgcl.NodeChange):
                 about = change.about_node
             elif isinstance(change, kgcl.EdgeChange):
-                about = change.about_edge.subject
+                if isinstance(change, kgcl.EdgeDeletion):
+                    about = change.subject
+                else:
+                    about = change.about_edge.subject
             else:
                 about = None
             partition = RESIDUAL_KEY

{oaklib-0.2.7 → oaklib-0.2.8}/src/oaklib/utilities/obograph_utils.py

@@ -11,6 +11,7 @@ import logging
 import os
 import shutil
 import subprocess
+import sys
 import tempfile
 from collections import defaultdict
 from copy import deepcopy
@@ -80,7 +81,9 @@ def draw_graph(graph: Graph, seeds=None, configure=None, stylemap=None, imgfile=
     subprocess.run(["open", imgfile])
 
 
-def graph_to_image(graph: Graph, seeds=None, configure=None, stylemap=None, imgfile=None) -> str:
+def graph_to_image(
+    graph: Graph, seeds=None, configure=None, stylemap=None, imgfile=None, view=None
+) -> str:
     """
     Renders a graph to png using obographviz
 
@@ -102,7 +105,7 @@ def graph_to_image(graph: Graph, seeds=None, configure=None, stylemap=None, imgf
         raise Exception(
             f"Cannot find {exec} on path. Install from https://github.com/INCATools/obographviz"
         )
-    with tempfile.NamedTemporaryFile(dir="/tmp", mode="w") as tmpfile:
+    with tempfile.NamedTemporaryFile(mode="w") as tmpfile:
         style = {}
         logging.info(f"Seed nodes: {seeds}")
         # if seeds is not None:
@@ -122,6 +125,7 @@ def graph_to_image(graph: Graph, seeds=None, configure=None, stylemap=None, imgf
         tmpfile.write(json_dump)
         logging.debug(f"JSON {json_dump}")
         tmpfile.flush()
+
         if imgfile is None:
             imgfile = f"{temp_file_name}.png"
         style_json = json.dumps(style).replace("'", "\\'")
@@ -132,9 +136,17 @@ def graph_to_image(graph: Graph, seeds=None, configure=None, stylemap=None, imgf
         if seeds is not None:
             for seed in seeds:
                 cmdtoks += ["-H", seed]
+        if sys.platform == "win32":
+            cmdtoks = ["cmd.exe", "/c"] + cmdtoks
+            opencmd = ["cmd.exe", "/c", "start", imgfile]
+        else:
+            opencmd = ["open", imgfile]
         logging.debug(f"Run: {cmdtoks}")
         subprocess.run(cmdtoks)
-        return imgfile
+
+        if view:
+            logging.debug(f"Run: {opencmd}")
+            subprocess.run(opencmd)
 
 
 def filter_by_predicates(graph: Graph, predicates: List[PRED_CURIE], graph_id: str = None) -> Graph: