openCypher Query and Visualization Support

.gitignore

@@ -25,4 +25,7 @@ src/graph_notebook/widgets/lib/
 # npm
 node_modules/
 node_modules/.package-lock.json
-src/graph_notebook/widgets/package-lock.json
+src/graph_notebook/widgets/package-lock.json
+blazegraph.jnl
+rules.log
+*.env

ChangeLog.md

@@ -3,47 +3,68 @@
 Starting with v1.31.6, this file will contain a record of major features and updates made in each release of graph-notebook.
 
 ## Upcoming
-- Add visualization support for elementMap Gremlin step ([Link to PR](https://github.com/aws/graph-notebook/pull/140))
-- Support additional customization of edge node labels in Gremlin ([Link to PR](https://github.com/aws/graph-notebook/pull/132))
-- Include index operations metrics in metadata results tab for Gremlin Profile queries([Link to PR](https://github.com/aws/graph-notebook/pull/150))
-- Update SPARQL EPL seed dataset file ([Link to PR](https://github.com/aws/graph-notebook/pull/134))
-- Update documentation on using `%%graph_notebook_config` with an IAM enabled Neptune cluster ([Link to PR](https://github.com/aws/graph-notebook/pull/136))
-- Fix improper handling of Blazegraph status response ([Link to PR](https://github.com/aws/graph-notebook/pull/137))
-- Fix Gremlin node tooltips being displayed incorrectly ([Link to PR](https://github.com/aws/graph-notebook/pull/139))
-- Fix bug in using Gremlin explain/profile with large result sets ([Link to PR](https://github.com/aws/graph-notebook/pull/141))
-- Pin RDFLib version ([Link to PR](https://github.com/aws/graph-notebook/pull/151))
+
+**openCypher Support**:
+
+With the release of support for the openCypher query language in Amazon Neptune's lab mode, graph-notebook can now be used to execute and visualize openCypher queries with any compatible graph database.
+
+Two new magic commands have been added: 
+- `%%oc`/`%%opencypher` 
+- `%%oc_status`/`%%opencypher_status`
+
+These openCypher magic commands inherit the majority of the query and visualization customization features that are already available in the Gremlin and SPARQL magics.
+
+For more detailed information and examples of how you can execute and visualize openCypher queries through graph-notebook, please refer to the new `Air-Routes-openCypher` and `EPL-openCypher` sample notebooks.
+
+**Other major updates**:
+- Added visualization support for elementMap Gremlin step ([Link to PR](https://github.com/aws/graph-notebook/pull/140))
+- Added support for additional customization of edge node labels in Gremlin ([Link to PR](https://github.com/aws/graph-notebook/pull/132))
+- Refactored %load form display code for flexibility; fixes some descriptions being cut off
+- Updated Neptune ML notebooks, utils, and pretrained models config
+- Added support for `modeltransform` commands in `%neptune_ml`
+
+**Minor updates**:
+- Included index operations metrics in metadata results tab for Gremlin Profile queries([Link to PR](https://github.com/aws/graph-notebook/pull/150))
+- Updated SPARQL EPL seed dataset file ([Link to PR](https://github.com/aws/graph-notebook/pull/134))
+- Updated documentation on using `%%graph_notebook_config` with an IAM enabled Neptune cluster ([Link to PR](https://github.com/aws/graph-notebook/pull/136))
+
+**Bugfixes**:
+- Fixed improper handling of Blazegraph status response ([Link to PR](https://github.com/aws/graph-notebook/pull/137))
+- Fixed Gremlin node tooltips being displayed incorrectly ([Link to PR](https://github.com/aws/graph-notebook/pull/139))
+- Fixed bug in using Gremlin explain/profile with large result sets ([Link to PR](https://github.com/aws/graph-notebook/pull/141))
+- Pinned RDFLib version ([Link to PR](https://github.com/aws/graph-notebook/pull/151))
 
 ## Release 2.1.4 (June 27, 2021)
-- Support for additional customization of graph node labels in Gremlin ([Link to PR](https://github.com/aws/graph-notebook/pull/127))
+- Added support for additional customization of graph node labels in Gremlin ([Link to PR](https://github.com/aws/graph-notebook/pull/127))
 
 ## Release 2.1.3 (June 18, 2021)
-- Support dictionary value access in variable injection([Link to PR](https://github.com/aws/graph-notebook/pull/126))
+- Added support for dictionary value access in variable injection([Link to PR](https://github.com/aws/graph-notebook/pull/126))
 
 ## Release 2.1.2 (May 10, 2021)
 
-- Pin gremlinpython to `<3.5.*` ([Link to PR](https://github.com/aws/graph-notebook/pull/123))
-- Add support for notebook variables in Sparql/Gremlin magic queries ([Link to PR](https://github.com/aws/graph-notebook/pull/113))
-- Add support for grouping by different properties per label in Gremlin ([Link to PR](https://github.com/aws/graph-notebook/pull/115))
-- Fix missing Boto3 dependency in setup.py ([Link to PR](https://github.com/aws/graph-notebook/pull/118))
-- Update %load execution time to HH:MM:SS format if over a minute ([Link to PR](https://github.com/aws/graph-notebook/pull/121))
+- Pinned gremlinpython to `<3.5.*` ([Link to PR](https://github.com/aws/graph-notebook/pull/123))
+- Added support for notebook variables in Sparql/Gremlin magic queries ([Link to PR](https://github.com/aws/graph-notebook/pull/113))
+- Added support for grouping by different properties per label in Gremlin ([Link to PR](https://github.com/aws/graph-notebook/pull/115))
+- Fixed missing Boto3 dependency in setup.py ([Link to PR](https://github.com/aws/graph-notebook/pull/118))
+- Updated %load execution time to HH:MM:SS format if over a minute ([Link to PR](https://github.com/aws/graph-notebook/pull/121))
 
 ## Release 2.1.1 (April 22, 2021)
 
-- Fix bug in `%neptune_ml export ...` logic where the iam setting for the exporter endpoint wasn't getting picked up properly
+- Fixed bug in `%neptune_ml export ...` logic where the iam setting for the exporter endpoint wasn't getting picked up properly
 
 ## Release 2.1.0 (April 15, 2021)
 
-- Add support for Mode, queueRequest, and Dependencies parameters when running %load command ([Link to PR](https://github.com/aws/graph-notebook/pull/91))
-- Add support for list and dict as map keys in Python Gremlin ([Link to PR](https://github.com/aws/graph-notebook/pull/100))
-- Refactor modules that call to Neptune or other SPARQL/Gremlin endpoints to use a unified client object ([Link to PR](https://github.com/aws/graph-notebook/pull/104))
+- Added support for Mode, queueRequest, and Dependencies parameters when running %load command ([Link to PR](https://github.com/aws/graph-notebook/pull/91))
+- Added support for list and dict as map keys in Python Gremlin ([Link to PR](https://github.com/aws/graph-notebook/pull/100))
+- Refactored modules that call to Neptune or other SPARQL/Gremlin endpoints to use a unified client object ([Link to PR](https://github.com/aws/graph-notebook/pull/104))
 - Added an additional notebook under [02-Visualization](src/graph_notebook/notebooks/02-Visualization) demonstrating how to use the visualzation grouping and coloring options in Gremlin. ([Link to PR](https://github.com/aws/graph-notebook/pull/107))
-- Add metadata output tab for magic queries ([Link to PR](https://github.com/aws/graph-notebook/pull/108))
+- Added metadata output tab for magic queries ([Link to PR](https://github.com/aws/graph-notebook/pull/108))
 
 ## Release 2.0.12 (Mar 25, 2021)
 
- - Add default parameters for `get_load_status` ([Link to PR](https://github.com/aws/graph-notebook/pull/96))
- - Add ipython as a dependency in `setup.py` ([Link to PR](https://github.com/aws/graph-notebook/pull/95))
- - Add parameters in `load_status` for `details`, `errors`, `page`, and `errorsPerPage` ([Link to PR](https://github.com/aws/graph-notebook/pull/88))
+ - Added default parameters for `get_load_status` ([Link to PR](https://github.com/aws/graph-notebook/pull/96))
+ - Added ipython as a dependency in `setup.py` ([Link to PR](https://github.com/aws/graph-notebook/pull/95))
+ - Added parameters in `load_status` for `details`, `errors`, `page`, and `errorsPerPage` ([Link to PR](https://github.com/aws/graph-notebook/pull/88))
 
 ## Release 2.0.10 (Mar 18, 2021)
 

README.md

@@ -1,19 +1,26 @@
-## Graph Notebook: easily query and visualize graphs 
+## Graph Notebook: easily query and visualize graphs
+
+The graph notebook provides an easy way to interact with graph databases using Jupyter notebooks. Using this open-source Python package, you can connect to any graph database that supports the [Apache TinkerPop](https://tinkerpop.apache.org/), [openCypher](https://github.com/opencypher/openCypher) or the [RDF SPARQL](https://www.w3.org/TR/rdf-sparql-query/) graph models. These databases could be running locally on your desktop or in the cloud. Graph databases can be used to explore a variety of use cases including [knowledge graphs](https://aws.amazon.com/neptune/knowledge-graphs-on-aws/) and [identity graphs](https://aws.amazon.com/neptune/identity-graphs-on-aws/).
+
+![A colorful graph picture](./images/ColorfulGraph.png)
 
-The graph notebook provides an easy way to interact with graph databases using Jupyter notebooks. Using this open-source Python package, you can connect to any graph database that supports the [Apache TinkerPop](https://tinkerpop.apache.org/) or the [RDF SPARQL](https://www.w3.org/TR/rdf-sparql-query/) graph model. These databases could be running locally on your desktop or in the cloud. Graph databases can be used to explore a variety of use cases including [knowledge graphs](https://aws.amazon.com/neptune/knowledge-graphs-on-aws/) and [identity graphs](https://aws.amazon.com/neptune/identity-graphs-on-aws/).
 
 ### Visualizing Gremlin queries:
 
 ![Gremlin query and graph](./images/GremlinQueryGraph.png)
 
+### Visualizing openCypher queries
+
+![openCypher query and graph](./images/OCQueryGraph.png)
+
 ### Visualizing SPARQL queries:
 
 ![SPARL query and graph](./images/SPARQLQueryGraph.png)
 
 Instructions for connecting to the following graph databases:
 
 |             Endpoint            |       Graph model       |   Query language    |
-| :-----------------------------: | :---------------------: | :-----------------: | 
+| :-----------------------------: | :---------------------: | :-----------------: |
 |[Gremlin Server](#gremlin-server)|     property graph      |       Gremlin       |
 |    [Blazegraph](#blazegraph)    |            RDF          |       SPARQL        |
 |[Amazon Neptune](#amazon-neptune)|  property graph or RDF  |  Gremlin or SPARQL  |
@@ -25,7 +32,9 @@ We encourage others to contribute configurations they find useful. There is an [
 #### Notebook cell 'magic' extensions in the IPython 3 kernel
 `%%sparql` - Executes a SPARQL query against your configured database endpoint.
 
-`%%gremlin` - Executes a Gremlin query against your database using web sockets. The results are similar to what the Gremlin console would return.
+`%%gremlin` - Executes a Gremlin query against your database using web sockets. The results are similar to those a Gremlin console would return.
+
+`%%opencypher` or `%%oc` Executes an openCypher query against your database.
 
 `%%graph_notebook_config` - Sets the executing notebook's database configuration to the JSON payload provided in the cell body.
 
@@ -41,18 +50,20 @@ We encourage others to contribute configurations they find useful. There is an [
 
 `%sparql_status` - Obtain the status of SPARQL queries. [Documentation](https://docs.aws.amazon.com/neptune/latest/userguide/sparql-api-status.html)
 
+`%opencypher_status` or `%oc_status` - Obtain the status of openCypher queries.
+
 `%load` - Generate a form to submit a bulk loader job. [Documentation](https://docs.aws.amazon.com/neptune/latest/userguide/bulk-load.html)
 
 `%load_ids` - Get ids of bulk load jobs. [Documentation](https://docs.aws.amazon.com/neptune/latest/userguide/load-api-reference-status-examples.html)
 
 `%load_status` - Get the status of a provided `load_id`. [Documentation](https://docs.aws.amazon.com/neptune/latest/userguide/load-api-reference-status-examples.html)
 
-`%neptune_ml` - Set of commands to integrate with NeptuneML functionality. You can find a set of tutorial notebooks [here](https://github.com/aws/graph-notebook/tree/main/src/graph_notebook/notebooks/04-Machine-Learning). 
+`%neptune_ml` - Set of commands to integrate with NeptuneML functionality. You can find a set of tutorial notebooks [here](https://github.com/aws/graph-notebook/tree/main/src/graph_notebook/notebooks/04-Machine-Learning).
 [Documentation](https://aws.amazon.com/neptune/machine-learning/)
 
 `%status` - Check the Health Status of the configured host endpoint. [Documentation](https://docs.aws.amazon.com/neptune/latest/userguide/access-graph-status.html)
 
-`%seed` - Provides a form to add data to your graph without the use of a bulk loader. both SPARQL and Gremlin have an airport routes dataset.
+`%seed` - Provides a form to add data to your graph without the use of a bulk loader. Supports both RDF and Property Graph data models.
 
 `%graph_notebook_config` - Returns a JSON payload that contains connection information for your host.
 
@@ -64,6 +75,13 @@ We encourage others to contribute configurations they find useful. There is an [
 
 **TIP** :point_right: You can list all the magics installed in the Python 3 kernel using the `%lsmagic` command.
 
+**TIP** :point_right: Many of the magic commands support a `--help` option in order to provide additional information.
+
+## Example notebooks
+This project includes many example Jupyter notebooks. It is recommended to explore them. All of the commands and features supported by `graph-notebook` are explained in detail with examples within the sample notebooks. You can find them  [here](./src/graph_notebook/notebooks/). As this project has evolved, many new features have been added. If you are already familiar with graph-notebook but want a quick summary of new features added, a good place to start is the Air-Routes notebooks in the [02-Visualization](./src/graph_notebook/notebooks/02-Visualization) folder.
+
+## Keeping track of new features
+It is recommended to check the [ChangeLog.md](ChangeLog.md) file periodically to keep up to date as new features are added.
 
 ## Prerequisites
 
@@ -74,7 +92,6 @@ You will need:
 * [Tornado](https://pypi.org/project/tornado/) 4.5.3
 * A graph database that provides a SPARQL 1.1 Endpoint or a Gremlin Server
 
-
 ## Installation
 
 ```
@@ -102,7 +119,7 @@ jupyter notebook ~/notebook/destination/dir
 
 ## Connecting to a graph database
 
-### Gremlin Server 
+### Gremlin Server
 
 In a new cell in the Jupyter notebook, change the configuration using `%%graph_notebook_config` and modify the fields for `host`, `port`, and `ssl`.  For a local Gremlin server (HTTP or WebSockets), you can use the following command:
 
@@ -154,7 +171,7 @@ You can also make use of namespaces for Blazegraph by specifying the path `graph
 }
 ```
 
-This will result in the url `localhost:9999/blazegraph/namespace/foo/sparql` being used when executing any `%%sparql` magic commands. 
+This will result in the url `localhost:9999/blazegraph/namespace/foo/sparql` being used when executing any `%%sparql` magic commands.
 
 To setup a new local Blazegraph database for use with the graph notebook, check out the [Quick Start](https://github.com/blazegraph/database/wiki/Quick_Start) from Blazegraph.
 
@@ -175,7 +192,7 @@ Change the configuration using `%%graph_notebook_config` and modify the defaults
 ```
 To setup a new Amazon Neptune cluster, check out the [AWS documentation](https://docs.aws.amazon.com/neptune/latest/userguide/manage-console-launch.html).
 
-When connecting the graph notebook to Neptune, make sure you have a network setup to communicate to the VPC that Neptune runs on. If not, you can follow [this guide](https://github.com/aws/graph-notebook/tree/main/additional-databases/neptune). 
+When connecting the graph notebook to Neptune, make sure you have a network setup to communicate to the VPC that Neptune runs on. If not, you can follow [this guide](https://github.com/aws/graph-notebook/tree/main/additional-databases/neptune).
 
 ## Authentication (Amazon Neptune)
 

additional-databases/blazegraph/README.md

@@ -0,0 +1,18 @@
+## Connecting graph notebook to Blazegraph SPARQL Endpoint
+
+The official SPARQL endpoint for DBPedia is available from https://dbpedia.org/sparql and is based on a Virtuoso engine.
+
+It is possible to connect to this endpoint using the following configuration:
+
+```
+%%graph_notebook_config
+{
+  "host": "dbpedia.org",
+  "port": 443,
+  "auth_mode": "DEFAULT",
+  "iam_credentials_provider_type": "ROLE",
+  "load_from_s3_arn": "",
+  "ssl": true,
+  "aws_region": ""
+}
+```

requirements.txt

@@ -7,11 +7,15 @@ notebook==5.7.10
 ipywidgets==7.5.1
 jupyter-contrib-nbextensions
 widgetsnbextension
-gremlinpython
+gremlinpython<=3.4.*
 requests==2.24.0
 ipython==7.16.1
+neo4j==4.2.1
+rdflib~=5.0.0
+traitlets~=4.3.3
+setuptools~=40.6.2
 
 # requirements for testing
-boto3==1.15.15
-botocore==1.18.18
+botocore~=1.18.18
+boto3~=1.15.15
 pytest==6.2.2

setup.py

@@ -81,6 +81,7 @@ def get_version():
         'botocore>=1.19.37',
         'boto3>=1.17.58',
         'ipython>=7.16.1',
+        'neo4j==4.3.2',
         'rdflib==5.0.0'
     ],
     package_data={

src/graph_notebook/magics/completers/graph_completer.py

@@ -14,7 +14,8 @@
                   'GRAPH',
                   'FILTER',
                   'ASK',
-                  'DESCRIBE']
+                  'DESCRIBE',
+                  'UNLOAD']
 GREMLIN_OPTIONS = [
     '.toString',
     '.tx',