Merge branch 'main' into iss518

ChangeLog.md

@@ -4,7 +4,15 @@ Starting with v1.31.6, this file will contain a record of major features and upd
 
 ## Upcoming
 - Added `--explain-type` option to `%%gremlin` ([Link to PR](https://github.com/aws/graph-notebook/pull/503))
+- Added general documentation for `%%graph_notebook_config` options ([Link to PR](https://github.com/aws/graph-notebook/pull/504))
 - Modified Dockerfile to support Python 3.10 ([Link to PR](https://github.com/aws/graph-notebook/pull/519))
+- Updated Docker documentation with platform-specific run commands ([Link to PR](https://github.com/aws/graph-notebook/pull/502))
+- Fixed deprecation warnings in GitHub workflows ([Link to PR](https://github.com/aws/graph-notebook/pull/506))
+- Fixed seed dataset unzip path in Identity Graph sample notebook ([Link to PR](https://github.com/aws/graph-notebook/pull/507))
+- Fixed unit test workflows failing on type check assertion ([Link to PR](https://github.com/aws/graph-notebook/pull/514))
+- Fixed bad queries in openCypher Language Tutorial samples ([PR #1](https://github.com/aws/graph-notebook/pull/525)) ([PR #2](https://github.com/aws/graph-notebook/pull/526))
+- Fixed kernel crashing with ZMQ errors on magic execution ([Link to PR](https://github.com/aws/graph-notebook/pull/517))
+- Unpinned `boto3` and `botocore` to support NeptuneData SDK ([Link to PR](https://github.com/aws/graph-notebook/pull/528))
 
 ## Release 3.8.2 (June 5, 2023)
 - New Sample Applications - Healthcare and Life Sciences notebooks ([Link to PR](https://github.com/aws/graph-notebook/pull/484))

additional-databases/sagemaker/sagemaker-notebook-lifecycle/install-graph-notebook-lc-cn.sh

@@ -28,12 +28,8 @@ python3 -m ipykernel install --sys-prefix --name python3 --display-name "Python
 echo "installing python dependencies..."
 pip uninstall NeptuneGraphNotebook -y # legacy uninstall when we used to install from source in s3
 
-pip install -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn "ipython==7.16.1"
 pip install -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn "jupyter-console<=6.4.0"
 pip install -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn "jupyter-client<=6.1.12"
-pip install -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn "ipywidgets<=7.7.1"
-pip install -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn "notebook==6.4.12"
-pip install -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn "nbclient<=0.7.0"
 pip install -i https://pypi.tuna.tsinghua.edu.cn/simple --trusted-host pypi.tuna.tsinghua.edu.cn "awswrangler"
 
 if [[ ${VERSION} == "" ]]; then

additional-databases/sagemaker/sagemaker-notebook-lifecycle/install-graph-notebook-lc.sh

@@ -28,12 +28,8 @@ python3 -m ipykernel install --sys-prefix --name python3 --display-name "Python
 echo "installing python dependencies..."
 pip uninstall NeptuneGraphNotebook -y # legacy uninstall when we used to install from source in s3
 
-pip install "ipython==7.16.1"
 pip install "jupyter-console<=6.4.0"
 pip install "jupyter-client<=6.1.12"
-pip install "ipywidgets<=7.7.1"
-pip install "notebook==6.4.12"
-pip install "nbclient<=0.7.0"
 pip install awswrangler
 
 if [[ ${VERSION} == "" ]]; then

requirements.txt

@@ -2,7 +2,7 @@ SPARQLWrapper==1.8.4
 networkx==2.4
 Jinja2>=3.0.3,<=3.1.2
 jupyter==1.0.0
-notebook>=6.1.5,<6.5.0
+notebook>=6.1.5,<7.0.0
 ipywidgets==7.7.2
 jupyterlab_widgets>=1.0.0,<3.0.0
 nbclient<=0.7.0

setup.py

@@ -73,13 +73,13 @@ def get_version():
         'jupyterlab_widgets>=1.0.0,<3.0.0',
         'networkx==2.4',
         'Jinja2>=3.0.3,<=3.1.2',
-        'notebook>=6.1.5,<6.5.0',
+        'notebook>=6.1.5,<7.0.0',
         'nbclient<=0.7.3',
         'jupyter-contrib-nbextensions<=0.7.0',
         'widgetsnbextension<=3.6.1',
         'jupyter==1.0.0',
-        'botocore>=1.21.49,<=1.29.53',
-        'boto3>=1.18.49,<=1.26.53',
+        'botocore>=1.21.49',
+        'boto3>=1.18.49',
         'ipython>=7.16.1,<=8.10.0',
         'neo4j>=4.4.9,<5.0.0',
         'rdflib==5.0.0',

src/graph_notebook/neptune/client.py

@@ -102,7 +102,9 @@
 STREAM_RDF = 'RDF'
 STREAM_ENDPOINTS = {STREAM_PG: 'gremlin', STREAM_RDF: 'sparql'}
 
-NEPTUNE_CONFIG_HOST_IDENTIFIERS = ["neptune.amazonaws.com", "neptune.*.amazonaws.com.cn", "api.aws", "on.aws", "aws.dev"]
+NEPTUNE_CONFIG_HOST_IDENTIFIERS = ["neptune.amazonaws.com", "neptune.*.amazonaws.com.cn",
+                                   "api.aws", "on.aws", "aws.dev",
+                                   "sc2s.sgov.gov", "c2s.ic.gov"]
 
 false_str_variants = [False, 'False', 'false', 'FALSE']
 

src/graph_notebook/notebooks/06-Language-Tutorials/02-openCypher/04-Creating-Updating-Delete-Queries.ipynb

@@ -360,7 +360,7 @@
    "source": [
     "%%oc -d $node_labels\n",
     "MATCH (joe:person {first_name: 'Joseph', last_name: 'Doe'})  \n",
-    "SET joe = null\n",
+    "SET joe.age = null\n",
     "RETURN joe"
    ]
   },

src/graph_notebook/notebooks/06-Language-Tutorials/02-openCypher/openCypher-Exercises-Answer-Key.ipynb

@@ -373,7 +373,8 @@
     "WITH [{first_name: 'Taylor', last_name: 'Hall'},{first_name: 'Kelvin', last_name: 'Fernsby'},{first_name: 'Ian', last_name: 'Rochester'}] as followers\n",
     "\n",
     "UNWIND followers as f\n",
-    "MERGE (n:person {first_name: f.first_name, last_name: f.last_name})-[r:follower]->(:person {first_name: 'Dave'})\n",
+    "MERGE (d:person {first_name: 'Dave'})\n",
+    "MERGE (n:person {first_name: f.first_name, last_name: f.last_name})-[r:follower]->(d)\n",
     "ON CREATE\n",
     "    SET r.creation='Created'\n",
     "ON MATCH\n",