cleanup

Author: fskpf

README.md

@@ -1,4 +1,4 @@
-# yFiles-Jupyter Graphs For SPARQL
+# yFiles Jupyter Graphs for SPARQL
 
 ![A screenshot showing the yFiles graph widget for sparql in a jupyter lab notebook](https://raw.githubusercontent.com/yWorks/yfiles-jupyter-graphs-for-sparql/main/images/Getting_started_screenshot.png)
 
@@ -8,14 +8,16 @@ This packages provides an easy-to-use interface to
 the [yFiles Graphs for Jupyter](https://github.com/yWorks/yfiles-jupyter-graphs) widget to directly visualize queries.
 
 ## Installation
-
+Just install it from the [Python Package Index](https://pypi.org/project/yfiles-jupyter-graphs-for-sparql/)
 ```bash
 pip install yfiles_jupyter_graphs_for_sparql==0.9.0rc1
 ```
+or see [README_DEV.md](https://github.com/yWorks/yfiles-jupyter-graphs-for-sparql/blob/main/README_DEV.md) to build it yourself.
 
 ## Usage
 
 ```python
+from SPARQLWrapper import SPARQLWrapper
 from yfiles_jupyter_graphs_for_sparql import SparqlGraphWidget
 
 g = SparqlGraphWidget(wrapper=SPARQLWrapper("http://dbpedia.org/sparql"))
@@ -211,6 +213,7 @@ See [issues](https://github.com/yWorks/yfiles-jupyter-graphs-for-sparql/issues).
 
 * [yFiles Graphs for Jupyter](https://github.com/yWorks/yfiles-jupyter-graphs)
 * [rdfLib](https://rdflib.readthedocs.io/en/stable/)
+* [SPARQLWrapper](https://sparqlwrapper.readthedocs.io/)
 
 ## License
 See [LICENSE](https://github.com/yWorks/yfiles-jupyter-graphs-for-sparql/blob/main/LICENSE.md) file.

examples/Getting_started.ipynb

@@ -15,11 +15,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%pip install rdflib --quiet\n",
-    "%pip install yfiles_jupyter_graphs_for_sparql==0.9.0rc1 --quiet\n",
-    "from yfiles_jupyter_graphs_for_sparql import SparqlGraphWidget\n",
     "%pip install SPARQLWrapper --quiet\n",
-    "from SPARQLWrapper import JSON, SPARQLWrapper, XML"
+    "%pip install yfiles_jupyter_graphs_for_sparql==0.9.0rc1 --quiet\n",
+    "from SPARQLWrapper import SPARQLWrapper, XML\n",
+    "\n",
+    "from yfiles_jupyter_graphs_for_sparql import SparqlGraphWidget"
    ]
   },
   {
@@ -125,7 +125,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.11.11"
   }
  },
  "nbformat": 4,

examples/beatles.ttl

@@ -15,11 +15,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "%pip install rdflib --quiet\n",
-    "%pip install yfiles_jupyter_graphs_for_sparql==0.9.0rc1 --quiet\n",
-    "from yfiles_jupyter_graphs_for_sparql import SparqlGraphWidget\n",
     "%pip install SPARQLWrapper --quiet\n",
-    "from SPARQLWrapper import SPARQLWrapper, JSON"
+    "%pip install yfiles_jupyter_graphs_for_sparql==0.9.0rc1 --quiet\n",
+    "from SPARQLWrapper import SPARQLWrapper, JSON\n",
+    "\n",
+    "from yfiles_jupyter_graphs_for_sparql import SparqlGraphWidget"
    ]
   },
   {
@@ -157,7 +157,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.13.1"
+   "version": "3.11.11"
   }
  },
  "nbformat": 4,

examples/configurations_example.ipynb

@@ -4,13 +4,10 @@ version = "0.9.0rc1"
 authors = [
   {name = "yWorks Support Team", email= "[email protected]"},
 ]
-description = "The open-source adapter for working with RDF databases and SPARQL queries in Jupyter notebooks leveraging the yFiles Graphs for Jupyter plugin.s"
+description = "The open-source adapter for working with RDF databases and SPARQL queries in Jupyter notebooks leveraging the yFiles Graphs for Jupyter plugin."
 readme = "README.md"
 requires-python = ">=3.8"
 classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
-    "Operating System :: OS Independent",
     "Framework :: IPython",
     "Intended Audience :: Developers",
     "Intended Audience :: Science/Research",
@@ -22,14 +19,16 @@ classifiers = [
     "Framework :: Jupyter :: JupyterLab :: Extensions",
     "Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt",
 ]
+license = {file = "LICENSE.md"}
 dependencies = [
-  "yfiles_jupyter_graphs>=1.9.0",
-  "rdflib>=7.1.2",
+  "yfiles_jupyter_graphs>=1.9.0"
 ]
 
 [project.urls]
-Homepage = "https://github.com/yWorks/yfiles-jupyter-graphs-for-sparql"
-Issues = "https://github.com/yWorks/yfiles-jupyter-graphs-for-sparql/issues"
+License = "https://github.com/yWorks/yfiles-jupyter-graphs-for-sparql/blob/main/LICENSE.md"
+"Bug Tracker" = "https://github.com/yWorks/yfiles-jupyter-graphs-for-sparql/issues"
+Documentation = "https://github.com/yWorks/yfiles-jupyter-graphs-for-sparql/"
+Repository = "https://github.com/yWorks/yfiles-jupyter-graphs-for-sparql.git"
 
 [build-system]
 requires = ["setuptools>=61.0"]

pyproject.toml

@@ -1,16 +1,27 @@
 import inspect
 import re
 from typing import Union, Dict, Any, Optional
+from importlib import import_module
 
-from SPARQLWrapper import JSON
 from yfiles_jupyter_graphs import GraphWidget
-from rdflib import Literal
 
 POSSIBLE_NODE_BINDINGS = {'coordinate', 'color', 'size', 'type', 'styles', 'scale_factor', 'position',
                           'layout', 'property', 'label'}
 POSSIBLE_EDGE_BINDINGS = {'color', 'thickness_factor', 'property', 'label'}
 SPARQL_LABEL_KEYS = ['name', 'title', 'text', 'description', 'caption', 'label']
 
+def _try_import(module_name: str, graph_type_name: str):
+    try:
+        module = import_module(module_name)
+        try:
+            return module.__getattribute__(graph_type_name)
+        except AttributeError:
+            return None
+    except ImportError:
+        return None
+
+SPARQLWrapper_JSON = _try_import('SPARQLWrapper', 'JSON')
+rdflib_Literal = _try_import('rdflib', 'Literal')
 
 def extract_label(term, edge):
     """
@@ -85,7 +96,7 @@ def _query(self, query):
             wrapper.setQuery(query)
             ret = wrapper.queryAndConvert()
             # SELECT query
-            if wrapper.returnFormat == JSON and "results" in ret and "bindings" in ret["results"]:
+            if wrapper.returnFormat == SPARQLWrapper_JSON and "results" in ret and "bindings" in ret["results"]:
                 triples = []
                 for row in ret["results"]["bindings"]:
                     s = next((row[key]["value"] for key in row if key.startswith('s')), None)
@@ -145,7 +156,7 @@ def find_element_by_label(array, label):
 
             o_label = str(o)
             o_extracted_label = extract_label(o, False)
-            literal = isinstance(o, Literal)
+            literal = isinstance(o, rdflib_Literal)
 
             p_label = str(p)
             p_extracted_label = extract_label(p, True)
@@ -421,9 +432,9 @@ def show_schema(self):
 
         if self._wrapper is None:
             raise Exception("No data was given to infer schema")
-        elif self._wrapper.returnFormat != JSON:
+        elif self._wrapper.returnFormat != SPARQLWrapper_JSON:
             return_format = self._wrapper.returnFormat
-            self._wrapper.setReturnFormat(JSON)
+            self._wrapper.setReturnFormat(SPARQLWrapper_JSON)
 
         c = f"""
             SELECT DISTINCT ?s ?p ?o