Merge branch 'main' of https://github.com/aws/graph-notebook into gre…

…mlin-expanded-serializers-neptune-adjustments

ChangeLog.md

@@ -4,11 +4,12 @@ Starting with v1.31.6, this file will contain a record of major features and upd
 
 ## Upcoming
 
-- Updated the Gremlin `message_serializer` configuration field to accept all TinkerPop serialization formats ([Link to PR](https://github.com/aws/graph-notebook/pull/685))
+- Updated Gremlin config `message_serializer` to accept all TinkerPop serializers ([Link to PR](https://github.com/aws/graph-notebook/pull/685))
 - Added `%get_import_task` line magic ([Link to PR](https://github.com/aws/graph-notebook/pull/668))
 - Added `--export-to` JSON file option to `%%graph_notebook_config` ([Link to PR](https://github.com/aws/graph-notebook/pull/684))
 - Deprecated Python 3.8 support ([Link to PR](https://github.com/aws/graph-notebook/pull/683))
 - Upgraded Neo4j Bolt driver to v5.x ([Link to PR](https://github.com/aws/graph-notebook/pull/682))
+- Upgraded nest_asyncio to 1.6.0 ([Link to PR](https://github.com/aws/graph-notebook/pull/698))
 - Improved iPython config directory retrieval logic ([Link to PR](https://github.com/aws/graph-notebook/pull/687))
 - Fixed `%db_reset` output for token modes ([Link to PR](https://github.com/aws/graph-notebook/pull/691))
 - Fixed `%%gremlin profile` serialization issue on Neptune DB v1.2 and older ([Link to PR](https://github.com/aws/graph-notebook/pull/694))

requirements.txt

@@ -22,7 +22,7 @@ markupsafe<2.1.0
 itables>=2.0.0,<=2.1.0
 pandas>=2.1.0,<=2.2.2
 numpy<1.24.0
-nest_asyncio>=1.5.5,<=1.5.6
+nest_asyncio>=1.5.5,<=1.6.0
 async-timeout>=4.0,<5.0
 json-repair==0.29.2
 

setup.py

@@ -90,7 +90,7 @@ def get_version():
         'itables>=2.0.0,<=2.1.0',
         'pandas>=2.1.0,<=2.2.2',
         'numpy<1.24.0',
-        'nest_asyncio>=1.5.5,<=1.5.6',
+        'nest_asyncio>=1.5.5,<=1.6.0',
         'async-timeout>=4.0,<5.0',
         'json-repair==0.29.2'
     ],

src/graph_notebook/magics/graph_magic.py

@@ -1260,7 +1260,7 @@ def gremlin(self, line, cell, local_ns: dict = None):
                               f"defaulting to {connection_protocol}.")
                     if connection_protocol == DEFAULT_WS_PROTOCOL and \
                             self.graph_notebook_config.gremlin.message_serializer not in GREMLIN_SERIALIZERS_WS:
-                        print(f"Unsupported serializer for GremlinPython client, "
+                        print(f"Serializer is unsupported for GremlinPython client, "
                               f"compatible serializers are: {GREMLIN_SERIALIZERS_WS}")
                         print("Defaulting to HTTP protocol.")
                         connection_protocol = DEFAULT_HTTP_PROTOCOL

test/unit/configuration/test_configuration_from_main.py

@@ -9,7 +9,7 @@
 from graph_notebook.configuration.generate_config import AuthModeEnum, Configuration, GremlinSection
 from graph_notebook.configuration.get_config import get_config
 from graph_notebook.neptune.client import (NEPTUNE_DB_SERVICE_NAME, NEPTUNE_ANALYTICS_SERVICE_NAME,
-                                           DEFAULT_HTTP_PROTOCOL, DEFAULT_WS_PROTOCOL)
+                                           DEFAULT_HTTP_PROTOCOL)
 
 
 class TestGenerateConfigurationMain(unittest.TestCase):
@@ -135,7 +135,7 @@ def test_generate_configuration_main_gremlin_protocol_no_service(self):
         self.assertEqual(0, result)
         config = get_config(self.test_file_path)
         config_dict = config.to_dict()
-        self.assertEqual(DEFAULT_WS_PROTOCOL, config_dict['gremlin']['connection_protocol'])
+        self.assertEqual(DEFAULT_HTTP_PROTOCOL, config_dict['gremlin']['connection_protocol'])
 
     def test_generate_configuration_main_gremlin_protocol_db(self):
         result = os.system(f'{self.python_cmd} -m graph_notebook.configuration.generate_config '
@@ -149,7 +149,7 @@ def test_generate_configuration_main_gremlin_protocol_db(self):
         self.assertEqual(0, result)
         config = get_config(self.test_file_path)
         config_dict = config.to_dict()
-        self.assertEqual(DEFAULT_WS_PROTOCOL, config_dict['gremlin']['connection_protocol'])
+        self.assertEqual(DEFAULT_HTTP_PROTOCOL, config_dict['gremlin']['connection_protocol'])
 
     def test_generate_configuration_main_gremlin_protocol_analytics(self):
         result = os.system(f'{self.python_cmd} -m graph_notebook.configuration.generate_config '