From 76f73dd0f8a35573449da52bc0528b2f6cf30f9c Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Tue, 12 Sep 2023 14:15:38 -0500
Subject: [PATCH 01/16] Added server timeout config + fetch timeout

---
 .../node-server.js                            | 76 +++++++++++--------
 1 file changed, 43 insertions(+), 33 deletions(-)

diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index e3904e64c..cef2e828c 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -12,6 +12,12 @@ const { fromNodeProviderChain } = require("@aws-sdk/credential-providers");
 const aws4 = require("aws4");
 
 dotenv.config({ path: "../graph-explorer/.env" });
+const milis = 5 * 60 * 1000;
+// convert milis to miliseconds
+const 
+
+const proxyTimeout = process.env.PROXY_REQUEST_TIMEOUT || 5 * 60 * 1000; // 5 minutes in milliseconds
+const refetchMaxRetries = process.env.PROXY_MAX_RETRIES || 1;
 
 const proxyLogger = pino({
   level: process.env.LOG_LEVEL,
@@ -79,7 +85,7 @@ const errorHandler = (error, request, response, next) => {
     );
   }
 
-  const retryFetch = async (url, headers, retryDelay = 10000, refetchMaxRetries = 1) => {
+  const retryFetch = async (url, headers, retryDelay = 10000) => {
     // remove the existing host headers, we want ensure that we are passing the DB endpoint hostname.
     delete headers["host"];
     if (headers["aws-neptune-region"]) {
@@ -95,7 +101,10 @@ const errorHandler = (error, request, response, next) => {
     for (let i = 0; i < refetchMaxRetries; i++) {
       try {
         proxyLogger.debug("Fetching: " + url.href);
-        const res = await fetch(url.href, {headers});
+        const res = await fetch(url.href, {
+          headers: headers,
+          signal: AbortSignal.timeout(proxyTimeout - 1000), // timing out the request before the proxy timeout
+        });
         if (!res.ok) {
           const result = await res.json();
           proxyLogger.error("!!Request failure!!");
@@ -196,44 +205,45 @@ const errorHandler = (error, request, response, next) => {
     }
   });
 
- app.get("/logger", (req, res, next) => {
-  let message;
-  let level;
+  app.get("/logger", (req, res) => {
+    let message;
+    let level;
 
-  try {
-    if (req.headers["level"] === undefined) {
-      throw new Error("No log level passed.");
-    } else {
-      level = req.headers["level"];
-    }
+    try {
+      if (req.headers["level"] === undefined) {
+        throw new Error("No log level passed.");
+      } else {
+        level = req.headers["level"];
+      }
 
-    if (req.headers["message"] === undefined) {
-      throw new Error("No log message passed.");
-    } else {
-      message = req.headers["message"].replaceAll("\\", "");
-    }
+      if (req.headers["message"] === undefined) {
+        throw new Error("No log message passed.");
+      } else {
+        message = req.headers["message"].replaceAll("\\", "");
+      }
 
-    if (level.toLowerCase() === "error") {
-      proxyLogger.error(message);
-    } else if (level.toLowerCase() === "warn") {
-      proxyLogger.warn(message);
-    } else if (level.toLowerCase() === "info") {
-      proxyLogger.info(message);
-    } else if (level.toLowerCase() === "debug") {
-      proxyLogger.debug(message);
-    } else if (level.toLowerCase() === "trace") {
-      proxyLogger.trace(message);
-    } else {
-      throw new Error("Tried to log to an unknown level.");
-    }
+      if (level.toLowerCase() === "error") {
+        proxyLogger.error(message);
+      } else if (level.toLowerCase() === "warn") {
+        proxyLogger.warn(message);
+      } else if (level.toLowerCase() === "info") {
+        proxyLogger.info(message);
+      } else if (level.toLowerCase() === "debug") {
+        proxyLogger.debug(message);
+      } else if (level.toLowerCase() === "trace") {
+        proxyLogger.trace(message);
+      } else {
+        throw new Error("Tried to log to an unknown level.");
+      }
 
-    res.send("Log received.");
-  } catch (error) {
-    next(error);
-  }
+      res.send("Log received.");
+    } catch (error) {
+      next(error);
+    }
 });
 
   app.use(errorHandler);
+  app.timeout = proxyTimeout; // Express default is 120000 (2 minutes)
 
   // Start the server on port 80 or 443 (if HTTPS is enabled)
   if (process.env.NEPTUNE_NOTEBOOK === "true") {

From bffd8378a14adc2696f022d9f3098324ae8fc57d Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Tue, 12 Sep 2023 14:16:00 -0500
Subject: [PATCH 02/16] updated README

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 41d98a862..469d494a7 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,8 @@ To provide a default connection such that initial loads of the graph explorer al
   - `IAM` - `False` - See [Add a New Connection](#connections-ui)
   - `GRAPH_EXP_HTTPS_CONNECTION` - `True` - Controls whether the Graph Explorer uses SSL or not
   - `PROXY_SERVER_HTTPS_CONNECTION` - `True` - Controls whether the server uses SSL or not
-  - `GRAPH_EXP_FETCH_REQUEST_TIMEOUT` - `9000` - Controls the timeout for the fetch request
+  - `PROXY_SERVER_REQUEST_TIMEOUT` - `300000` - Controls the timeout for proxy requests
+  - `PROXY_SERVER_MAX_RETRIES` - `1` - Controls the number of retries for proxy requests
 - Conditionally Required:
   - Required if `USING_PROXY_SERVER=True`
     - `GRAPH_CONNECTION_URL` - `None` - See [Add a New Connection](#connections-ui)
@@ -137,7 +138,8 @@ First, create a `config.json` file containing values for the connection attribut
      "GRAPH_TYPE": "gremlin" (Possible Values: "gremlin", "sparql", "opencypher"),
      "GRAPH_EXP_HTTPS_CONNECTION": true (Can be string or boolean),
      "PROXY_SERVER_HTTPS_CONNECTION": true, (Can be string or boolean),
-     "GRAPH_EXP_FETCH_REQUEST_TIMEOUT": 9000 (Can be number)
+     "PROXY_SERVER_REQUEST_TIMEOUT": 300000,
+     "PROXY_SERVER_MAX_RETRIES": 1
 }
 ```
 
@@ -161,7 +163,8 @@ docker run -p 80:80 -p 443:443 \
  --env GRAPH_CONNECTION_URL=https://cluster-cqmizgqgrsbf.us-west-2.neptune.amazonaws.com:8182 \
  --env AWS_REGION=us-west-2 \
  --env PROXY_SERVER_HTTPS_CONNECTION=true \
- --env GRAPH_EXP_FETCH_REQUEST_TIMEOUT=9000 \
+ --env PROXY_SERVER_REQUEST_TIMEOUT=300000 \
+ --env PROXY_SERVER_MAX_RETRIES=1 \
  graph-explorer
 ```
 

From b463e330771ffedc59b3cfa90dbd9ceda8b0d1a4 Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Tue, 12 Sep 2023 14:16:46 -0500
Subject: [PATCH 03/16] env to configure proxy server timeout and retry

---
 packages/graph-explorer-proxy-server/node-server.js | 5 +----
 packages/graph-explorer/.env                        | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index cef2e828c..dd4366975 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -12,9 +12,6 @@ const { fromNodeProviderChain } = require("@aws-sdk/credential-providers");
 const aws4 = require("aws4");
 
 dotenv.config({ path: "../graph-explorer/.env" });
-const milis = 5 * 60 * 1000;
-// convert milis to miliseconds
-const 
 
 const proxyTimeout = process.env.PROXY_REQUEST_TIMEOUT || 5 * 60 * 1000; // 5 minutes in milliseconds
 const refetchMaxRetries = process.env.PROXY_MAX_RETRIES || 1;
@@ -103,7 +100,7 @@ const errorHandler = (error, request, response, next) => {
         proxyLogger.debug("Fetching: " + url.href);
         const res = await fetch(url.href, {
           headers: headers,
-          signal: AbortSignal.timeout(proxyTimeout - 1000), // timing out the request before the proxy timeout
+          timeout: proxyTimeout - 1000,
         });
         if (!res.ok) {
           const result = await res.json();
diff --git a/packages/graph-explorer/.env b/packages/graph-explorer/.env
index 0c9e59631..fe87ea757 100644
--- a/packages/graph-explorer/.env
+++ b/packages/graph-explorer/.env
@@ -1,4 +1,4 @@
 ## Server and client side logging level
 LOG_LEVEL=info
-## Client side fetch request timeout
-GRAPH_EXP_FETCH_REQUEST_TIMEOUT=9000
+PROXY_REQUEST_TIMEOUT=300000
+PROXY_MAX_RETRIES=1

From 58efcf257dc398afa8bd3ef374363b788f9e78c0 Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Tue, 12 Sep 2023 14:22:30 -0500
Subject: [PATCH 04/16] use the new variable names

---
 packages/graph-explorer/.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/graph-explorer/.env b/packages/graph-explorer/.env
index fe87ea757..3ceb65b88 100644
--- a/packages/graph-explorer/.env
+++ b/packages/graph-explorer/.env
@@ -1,4 +1,4 @@
 ## Server and client side logging level
 LOG_LEVEL=info
-PROXY_REQUEST_TIMEOUT=300000
-PROXY_MAX_RETRIES=1
+PROXY_SERVER_REQUEST_TIMEOUT=300000
+PROXY_SERVER_MAX_RETRIES=1

From 4863c90562cc2977234cc49866f0621f8bd58f22 Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Fri, 10 Nov 2023 10:59:46 -0600
Subject: [PATCH 05/16] removed RequestSig class and use IAMService environment
 variable in node-server.js.

---
 .../graph-explorer-proxy-server/RequestSig.js | 27 -------------------
 .../node-server.js                            |  5 ++--
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 packages/graph-explorer-proxy-server/RequestSig.js

diff --git a/packages/graph-explorer-proxy-server/RequestSig.js b/packages/graph-explorer-proxy-server/RequestSig.js
deleted file mode 100644
index 38c2ddddc..000000000
--- a/packages/graph-explorer-proxy-server/RequestSig.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const aws4 = require("aws4");
-
-class RequestSig {
-    _algorithm = "AWS4-HMAC-SHA256";
-    _region;
-    _service = "neptune-db";
-    _host;
-    _ac;
-    _sac;
-  
-    constructor(host, region, accessKey, secretAccessKey, sessionToken) {
-      this._region = region;
-      this._host = host;
-      this._ac = accessKey;
-      this._sac = secretAccessKey;
-      this._st = sessionToken;
-    }
-
-    requestAuthHeaders(inputPort, requestedPath) {
-      var opts = { host: this._host.split(":")[0], path: requestedPath, service: this._service, region: this._region, port: inputPort };
-      return aws4.sign(opts, {accessKeyId: this._ac, secretAccessKey: this._sac, sessionToken: this._st});
-    }
-  }
-
-  module.exports = {
-    RequestSig
-  };
\ No newline at end of file
diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index dd4366975..d2df1451e 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -15,6 +15,7 @@ dotenv.config({ path: "../graph-explorer/.env" });
 
 const proxyTimeout = process.env.PROXY_REQUEST_TIMEOUT || 5 * 60 * 1000; // 5 minutes in milliseconds
 const refetchMaxRetries = process.env.PROXY_MAX_RETRIES || 1;
+const IAMService = process.env.IAM_SERVICE || "neptune-db";
 
 const proxyLogger = pino({
   level: process.env.LOG_LEVEL,
@@ -90,7 +91,7 @@ const errorHandler = (error, request, response, next) => {
         host: url.hostname,
         port: url.port,
         path: url.pathname + url.search,
-        service: "neptune-db",
+        service: IAMService,
         region: headers["aws-neptune-region"],
       });
       headers = { ...headers, ...data };
@@ -237,7 +238,7 @@ const errorHandler = (error, request, response, next) => {
     } catch (error) {
       next(error);
     }
-});
+  });
 
   app.use(errorHandler);
   app.timeout = proxyTimeout; // Express default is 120000 (2 minutes)

From 3bacb01c1f422f30f9bc664d44f02a32eabb2cec Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Fri, 10 Nov 2023 11:19:46 -0600
Subject: [PATCH 06/16] Add Neptune graph permissions and update IAM service
 type

---
 .../sagemaker/graph-explorer-policy.json      |  7 +++
 .../node-server.js                            |  4 +-
 .../src/core/ConfigurationProvider/types.ts   |  4 ++
 .../CreateConnection/CreateConnection.tsx     | 49 +++++++++++++------
 4 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/additionaldocs/sagemaker/graph-explorer-policy.json b/additionaldocs/sagemaker/graph-explorer-policy.json
index d5f21b2d8..a95d7b080 100644
--- a/additionaldocs/sagemaker/graph-explorer-policy.json
+++ b/additionaldocs/sagemaker/graph-explorer-policy.json
@@ -8,6 +8,13 @@
 				"arn:aws:neptune-db:[AWS_REGION]:[AWS_ACCOUNT_ID]:[NEPTUNE_CLUSTER_RESOURCE_ID]/*"
 			]
 		},
+		{
+			"Effect": "Allow",
+			"Action": "neptune-graph:*",
+			"Resource": [
+				"arn:aws:neptune-graph:[AWS_REGION]:[AWS_ACCOUNT_ID]:[NEPTUNE_CLUSTER_RESOURCE_ID]/*"
+			]
+		},
 		{
             "Effect": "Allow",
             "Action": "sagemaker:DescribeNotebookInstance",
diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index d2df1451e..5c2d8ec1c 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -15,7 +15,7 @@ dotenv.config({ path: "../graph-explorer/.env" });
 
 const proxyTimeout = process.env.PROXY_REQUEST_TIMEOUT || 5 * 60 * 1000; // 5 minutes in milliseconds
 const refetchMaxRetries = process.env.PROXY_MAX_RETRIES || 1;
-const IAMService = process.env.IAM_SERVICE || "neptune-db";
+const serviceType = process.env.SERVICE_TYPE || "neptune-db";
 
 const proxyLogger = pino({
   level: process.env.LOG_LEVEL,
@@ -91,7 +91,7 @@ const errorHandler = (error, request, response, next) => {
         host: url.hostname,
         port: url.port,
         path: url.pathname + url.search,
-        service: IAMService,
+        service: serviceType,
         region: headers["aws-neptune-region"],
       });
       headers = { ...headers, ...data };
diff --git a/packages/graph-explorer/src/core/ConfigurationProvider/types.ts b/packages/graph-explorer/src/core/ConfigurationProvider/types.ts
index ecfa22cf8..dcc1541c2 100644
--- a/packages/graph-explorer/src/core/ConfigurationProvider/types.ts
+++ b/packages/graph-explorer/src/core/ConfigurationProvider/types.ts
@@ -131,6 +131,10 @@ export type ConnectionConfig = {
    * If it is Neptune, it could need authentication.
    */
   awsAuthEnabled?: boolean;
+  /**
+   * If it is Neptune, it could need authentication.
+   */
+  serviceType: 'neptune-db' | 'neptune-graph',
   /**
    * AWS Region where the Neptune cluster is deployed.
    * It is needed to sign requests.
diff --git a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
index d3ef6cef6..7ccffcbdf 100644
--- a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
+++ b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
@@ -29,6 +29,7 @@ type ConnectionForm = {
   proxyConnection?: boolean;
   graphDbUrl?: string;
   awsAuthEnabled?: boolean;
+  serviceType?: "neptune-db" | "neptune-graph";
   awsRegion?: string;
   enableCache?: boolean;
   cacheTimeMs?: number;
@@ -39,9 +40,9 @@ export const CONNECTIONS_OP: {
   label: string;
   value: NonNullable<ConnectionConfig["queryEngine"]>;
 }[] = [
-  { label: "PG (Property Graph) - Gremlin", value: "gremlin" },
-  { label: "PG (Property Graph) - OpenCypher", value: "openCypher" },
-  { label: "RDF (Resource Description Framework) - SPARQL", value: "sparql" },
+  { label: "Gremlin - PG (Property Graph)", value: "gremlin" },
+  { label: "OpenCypher - PG (Property Graph)", value: "openCypher" },
+  { label: "SPARQL - RDF (Resource Description Framework)", value: "sparql" },
 ];
 
 export type CreateConnectionProps = {
@@ -74,6 +75,7 @@ const CreateConnection = ({
             proxyConnection: data.proxyConnection,
             graphDbUrl: data.graphDbUrl,
             awsAuthEnabled: data.awsAuthEnabled,
+            serviceType: data.serviceType,
             awsRegion: data.awsRegion,
             enableCache: data.enableCache,
             cacheTimeMs: data.cacheTimeMs * 60 * 1000,
@@ -103,6 +105,7 @@ const CreateConnection = ({
             proxyConnection: data.proxyConnection,
             graphDbUrl: data.graphDbUrl,
             awsAuthEnabled: data.awsAuthEnabled,
+            serviceType: data.serviceType,
             awsRegion: data.awsRegion,
             cacheTimeMs: data.cacheTimeMs * 60 * 1000,
             fetchTimeoutMs: data.fetchTimeMs,
@@ -144,6 +147,7 @@ const CreateConnection = ({
     proxyConnection: initialData?.proxyConnection || false,
     graphDbUrl: initialData?.graphDbUrl || "",
     awsAuthEnabled: initialData?.awsAuthEnabled || false,
+    serviceType: initialData?.serviceType || "neptune-db",
     awsRegion: initialData?.awsRegion || "",
     enableCache: true,
     cacheTimeMs: (initialData?.cacheTimeMs ?? 10 * 60 * 1000) / 60000,
@@ -271,19 +275,32 @@ const CreateConnection = ({
           </div>
         )}
         {form.proxyConnection && form.awsAuthEnabled && (
-          <div className={pfx("input-url")}>
-            <Input
-              data-autofocus={true}
-              label={"AWS Region"}
-              value={form.awsRegion}
-              onChange={onFormChange("awsRegion")}
-              errorMessage={"Region is required"}
-              placeholder={"us-east-1"}
-              validationState={
-                hasError && !form.awsRegion ? "invalid" : "valid"
-              }
-            />
-          </div>
+          <>
+            <div className={pfx("input-url")}>
+              <Input
+                data-autofocus={true}
+                label={"AWS Region"}
+                value={form.awsRegion}
+                onChange={onFormChange("awsRegion")}
+                errorMessage={"Region is required"}
+                placeholder={"us-east-1"}
+                validationState={
+                  hasError && !form.awsRegion ? "invalid" : "valid"
+                }
+              />
+            </div>
+            <div className={pfx("input-url")}>
+              <Select
+                label={"Service Type"}
+                options={[
+                  { label: "Neptune DB", value: "neptune-db" },
+                  { label: "Neptune Graph", value: "neptune-graph" },
+                ]}
+                value={form.serviceType}
+                onChange={onFormChange("serviceType")}
+              />
+            </div>
+          </>
         )}
       </div>
       <div className={pfx("configuration-form")}>

From 553675df442d4a06206190128fe684f475c754ff Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Fri, 10 Nov 2023 11:43:59 -0600
Subject: [PATCH 07/16] revert and adjust

---
 README.md                                     | 13 ++++++------
 .../node-server.js                            | 20 +++++++++----------
 packages/graph-explorer/.env                  |  6 ++++--
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 469d494a7..9ec1e79db 100644
--- a/README.md
+++ b/README.md
@@ -49,6 +49,7 @@ You can create and manage connections to graph databases using this feature. Con
   - **Using proxy server:** Check this box if using a proxy endpoint.
   - **Graph connection URL:** Provide the endpoint for the graph database
   - **AWS IAM Auth Enabled:** Check this box if connecting to Amazon Neptune using IAM Auth and SigV4 signed requests
+  - **Service Type:** Choose the service type
   - **AWS Region:** Specify the AWS region where the Neptune cluster is hosted (e.g., us-east-1)
   - **Fetch Timeout:** Specify the timeout for the fetch request
 
@@ -116,13 +117,13 @@ To provide a default connection such that initial loads of the graph explorer al
   - `IAM` - `False` - See [Add a New Connection](#connections-ui)
   - `GRAPH_EXP_HTTPS_CONNECTION` - `True` - Controls whether the Graph Explorer uses SSL or not
   - `PROXY_SERVER_HTTPS_CONNECTION` - `True` - Controls whether the server uses SSL or not
-  - `PROXY_SERVER_REQUEST_TIMEOUT` - `300000` - Controls the timeout for proxy requests
-  - `PROXY_SERVER_MAX_RETRIES` - `1` - Controls the number of retries for proxy requests
+  - `GRAPH_EXP_FETCH_REQUEST_TIMEOUT` - `9000` - Controls the timeout for the fetch request
 - Conditionally Required:
   - Required if `USING_PROXY_SERVER=True`
     - `GRAPH_CONNECTION_URL` - `None` - See [Add a New Connection](#connections-ui)
   - Required if `USING_PROXY_SERVER=True` and `IAM=True`
     - `AWS_REGION` - `None` - See [Add a New Connection](#connections-ui)
+    - `SERVICE_TYPE` - `Neptune-db`
 
 #### JSON Configuration Approach
 
@@ -134,12 +135,12 @@ First, create a `config.json` file containing values for the connection attribut
      "GRAPH_CONNECTION_URL": "https://cluster-cqmizgqgrsbf.us-west-2.neptune.amazonaws.com:8182",
      "USING_PROXY_SERVER": true, (Can be string or boolean)
      "IAM": true, (Can be string or boolean)
+     "SERVICE_TYPE": "Neptune-db",
      "AWS_REGION": "us-west-2",
      "GRAPH_TYPE": "gremlin" (Possible Values: "gremlin", "sparql", "opencypher"),
      "GRAPH_EXP_HTTPS_CONNECTION": true (Can be string or boolean),
      "PROXY_SERVER_HTTPS_CONNECTION": true, (Can be string or boolean),
-     "PROXY_SERVER_REQUEST_TIMEOUT": 300000,
-     "PROXY_SERVER_MAX_RETRIES": 1
+     "GRAPH_EXP_FETCH_REQUEST_TIMEOUT": 9000 (Can be number)
 }
 ```
 
@@ -162,9 +163,9 @@ docker run -p 80:80 -p 443:443 \
  --env IAM=false \
  --env GRAPH_CONNECTION_URL=https://cluster-cqmizgqgrsbf.us-west-2.neptune.amazonaws.com:8182 \
  --env AWS_REGION=us-west-2 \
+ --env SERVICE_TYPE=Neptune-db \
  --env PROXY_SERVER_HTTPS_CONNECTION=true \
- --env PROXY_SERVER_REQUEST_TIMEOUT=300000 \
- --env PROXY_SERVER_MAX_RETRIES=1 \
+ --env GRAPH_EXP_FETCH_REQUEST_TIMEOUT=9000 \
  graph-explorer
 ```
 
diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index 5c2d8ec1c..4f22e82bc 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -10,13 +10,10 @@ const path = require("path");
 const pino = require("pino");
 const { fromNodeProviderChain } = require("@aws-sdk/credential-providers");
 const aws4 = require("aws4");
+const serviceType = process.env.SERVICE_TYPE || "neptune-db";
 
 dotenv.config({ path: "../graph-explorer/.env" });
 
-const proxyTimeout = process.env.PROXY_REQUEST_TIMEOUT || 5 * 60 * 1000; // 5 minutes in milliseconds
-const refetchMaxRetries = process.env.PROXY_MAX_RETRIES || 1;
-const serviceType = process.env.SERVICE_TYPE || "neptune-db";
-
 const proxyLogger = pino({
   level: process.env.LOG_LEVEL,
   transport: {
@@ -83,7 +80,12 @@ const errorHandler = (error, request, response, next) => {
     );
   }
 
-  const retryFetch = async (url, headers, retryDelay = 10000) => {
+  const retryFetch = async (
+    url,
+    headers,
+    retryDelay = 10000,
+    refetchMaxRetries = 1
+  ) => {
     // remove the existing host headers, we want ensure that we are passing the DB endpoint hostname.
     delete headers["host"];
     if (headers["aws-neptune-region"]) {
@@ -99,10 +101,7 @@ const errorHandler = (error, request, response, next) => {
     for (let i = 0; i < refetchMaxRetries; i++) {
       try {
         proxyLogger.debug("Fetching: " + url.href);
-        const res = await fetch(url.href, {
-          headers: headers,
-          timeout: proxyTimeout - 1000,
-        });
+        const res = await fetch(url.href, { headers });
         if (!res.ok) {
           const result = await res.json();
           proxyLogger.error("!!Request failure!!");
@@ -203,7 +202,7 @@ const errorHandler = (error, request, response, next) => {
     }
   });
 
-  app.get("/logger", (req, res) => {
+  app.get("/logger", (req, res, next) => {
     let message;
     let level;
 
@@ -241,7 +240,6 @@ const errorHandler = (error, request, response, next) => {
   });
 
   app.use(errorHandler);
-  app.timeout = proxyTimeout; // Express default is 120000 (2 minutes)
 
   // Start the server on port 80 or 443 (if HTTPS is enabled)
   if (process.env.NEPTUNE_NOTEBOOK === "true") {
diff --git a/packages/graph-explorer/.env b/packages/graph-explorer/.env
index 3ceb65b88..182378ae3 100644
--- a/packages/graph-explorer/.env
+++ b/packages/graph-explorer/.env
@@ -1,4 +1,6 @@
 ## Server and client side logging level
 LOG_LEVEL=info
-PROXY_SERVER_REQUEST_TIMEOUT=300000
-PROXY_SERVER_MAX_RETRIES=1
+## Client side fetch request timeout
+GRAPH_EXP_FETCH_REQUEST_TIMEOUT=9000
+## Service
+SERVICE_TYPE=neptune-db

From 3813e1d84177a2055022e50355b1fa09de3b68df Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Fri, 10 Nov 2023 11:45:46 -0600
Subject: [PATCH 08/16] optinal serviceType

---
 packages/graph-explorer/src/core/ConfigurationProvider/types.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/graph-explorer/src/core/ConfigurationProvider/types.ts b/packages/graph-explorer/src/core/ConfigurationProvider/types.ts
index dcc1541c2..124f204b7 100644
--- a/packages/graph-explorer/src/core/ConfigurationProvider/types.ts
+++ b/packages/graph-explorer/src/core/ConfigurationProvider/types.ts
@@ -134,7 +134,7 @@ export type ConnectionConfig = {
   /**
    * If it is Neptune, it could need authentication.
    */
-  serviceType: 'neptune-db' | 'neptune-graph',
+  serviceType?: 'neptune-db' | 'neptune-graph',
   /**
    * AWS Region where the Neptune cluster is deployed.
    * It is needed to sign requests.

From 811721a9b0ad547a0c4a1f046284ee440d987bff Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Thu, 16 Nov 2023 11:15:20 -0600
Subject: [PATCH 09/16] Fix service type casing in environment variables and
 headers

---
 README.md                                            |  6 +++---
 packages/graph-explorer-proxy-server/node-server.js  | 12 +++++++++---
 .../src/connector/AbstractConnector.ts               |  3 +++
 .../modules/ConnectionDetail/ConnectionDetail.tsx    |  1 +
 .../modules/CreateConnection/CreateConnection.tsx    |  4 ++--
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 9ec1e79db..f0aa51e08 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ To provide a default connection such that initial loads of the graph explorer al
     - `GRAPH_CONNECTION_URL` - `None` - See [Add a New Connection](#connections-ui)
   - Required if `USING_PROXY_SERVER=True` and `IAM=True`
     - `AWS_REGION` - `None` - See [Add a New Connection](#connections-ui)
-    - `SERVICE_TYPE` - `Neptune-db`
+    - `SERVICE_TYPE` - `neptune-db`
 
 #### JSON Configuration Approach
 
@@ -135,7 +135,7 @@ First, create a `config.json` file containing values for the connection attribut
      "GRAPH_CONNECTION_URL": "https://cluster-cqmizgqgrsbf.us-west-2.neptune.amazonaws.com:8182",
      "USING_PROXY_SERVER": true, (Can be string or boolean)
      "IAM": true, (Can be string or boolean)
-     "SERVICE_TYPE": "Neptune-db",
+     "SERVICE_TYPE": "neptune-db",
      "AWS_REGION": "us-west-2",
      "GRAPH_TYPE": "gremlin" (Possible Values: "gremlin", "sparql", "opencypher"),
      "GRAPH_EXP_HTTPS_CONNECTION": true (Can be string or boolean),
@@ -163,7 +163,7 @@ docker run -p 80:80 -p 443:443 \
  --env IAM=false \
  --env GRAPH_CONNECTION_URL=https://cluster-cqmizgqgrsbf.us-west-2.neptune.amazonaws.com:8182 \
  --env AWS_REGION=us-west-2 \
- --env SERVICE_TYPE=Neptune-db \
+ --env SERVICE_TYPE=neptune-db \
  --env PROXY_SERVER_HTTPS_CONNECTION=true \
  --env GRAPH_EXP_FETCH_REQUEST_TIMEOUT=9000 \
  graph-explorer
diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index 4f22e82bc..f34b1e4a3 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -10,7 +10,6 @@ const path = require("path");
 const pino = require("pino");
 const { fromNodeProviderChain } = require("@aws-sdk/credential-providers");
 const aws4 = require("aws4");
-const serviceType = process.env.SERVICE_TYPE || "neptune-db";
 
 dotenv.config({ path: "../graph-explorer/.env" });
 
@@ -62,6 +61,10 @@ const errorHandler = (error, request, response, next) => {
 
 (async () => {
   app.use(cors());
+  app.use((req, res, next) => {
+    console.log("Headers: ", req.headers);
+    next();
+  });
   app.use(
     "/defaultConnection",
     express.static(
@@ -88,13 +91,16 @@ const errorHandler = (error, request, response, next) => {
   ) => {
     // remove the existing host headers, we want ensure that we are passing the DB endpoint hostname.
     delete headers["host"];
-    if (headers["aws-neptune-region"]) {
+    const serviceType = headers["service-type"];
+    const AWSRegion = headers["aws-neptune-region"];
+
+    if (AWSRegion && serviceType) {
       data = await getIAMHeaders({
         host: url.hostname,
         port: url.port,
         path: url.pathname + url.search,
         service: serviceType,
-        region: headers["aws-neptune-region"],
+        region: AWSRegion,
       });
       headers = { ...headers, ...data };
     }
diff --git a/packages/graph-explorer/src/connector/AbstractConnector.ts b/packages/graph-explorer/src/connector/AbstractConnector.ts
index b0e0ba01e..528684b55 100644
--- a/packages/graph-explorer/src/connector/AbstractConnector.ts
+++ b/packages/graph-explorer/src/connector/AbstractConnector.ts
@@ -307,6 +307,9 @@ export abstract class AbstractConnector {
     if (this._connection?.awsAuthEnabled) {
       headers["aws-neptune-region"] = this._connection?.awsRegion || "";
     }
+    if (this._connection?.serviceType) {
+      headers["service-type"] = this._connection?.serviceType || "";
+    }
 
     return headers;
   }
diff --git a/packages/graph-explorer/src/modules/ConnectionDetail/ConnectionDetail.tsx b/packages/graph-explorer/src/modules/ConnectionDetail/ConnectionDetail.tsx
index 7f602fe55..bd0b7ad82 100644
--- a/packages/graph-explorer/src/modules/ConnectionDetail/ConnectionDetail.tsx
+++ b/packages/graph-explorer/src/modules/ConnectionDetail/ConnectionDetail.tsx
@@ -217,6 +217,7 @@ const ConnectionDetail = ({ isSync, onSyncChange }: ConnectionDetailProps) => {
             url: config.connection?.url,
             type: config.connection?.queryEngine,
             fetchTimeMs: config.connection?.fetchTimeoutMs,
+            serviceType: config.connection?.serviceType,
           }}
         />
       </Modal>
diff --git a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
index 7ccffcbdf..d0284af05 100644
--- a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
+++ b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
@@ -147,7 +147,7 @@ const CreateConnection = ({
     proxyConnection: initialData?.proxyConnection || false,
     graphDbUrl: initialData?.graphDbUrl || "",
     awsAuthEnabled: initialData?.awsAuthEnabled || false,
-    serviceType: initialData?.serviceType || "neptune-db",
+    serviceType: initialData?.serviceType || "neptune-graph",
     awsRegion: initialData?.awsRegion || "",
     enableCache: true,
     cacheTimeMs: (initialData?.cacheTimeMs ?? 10 * 60 * 1000) / 60000,
@@ -177,7 +177,7 @@ const CreateConnection = ({
       return;
     }
 
-    if (form.awsAuthEnabled && !form.awsRegion) {
+    if (form.awsAuthEnabled && !form.awsRegion && !form.serviceType) {
       setError(true);
       return;
     }

From fea0ebc7eed8afd70f2151422a3e2062e6d40f3b Mon Sep 17 00:00:00 2001
From: Juan Cubeddu <vcubjuan@amzon.com>
Date: Thu, 16 Nov 2023 11:25:55 -0600
Subject: [PATCH 10/16] Remove unnecessary console.log statement in
 node-server.js

---
 packages/graph-explorer-proxy-server/node-server.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index f34b1e4a3..2ca5fffad 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -61,10 +61,6 @@ const errorHandler = (error, request, response, next) => {
 
 (async () => {
   app.use(cors());
-  app.use((req, res, next) => {
-    console.log("Headers: ", req.headers);
-    next();
-  });
   app.use(
     "/defaultConnection",
     express.static(

From cc3676dffe2aaa22c67275a835479df2fdf29df4 Mon Sep 17 00:00:00 2001
From: Valentyn Kahamlyk <Valentyn.Kahamlyk@improving.com>
Date: Wed, 21 Feb 2024 10:29:56 -0800
Subject: [PATCH 11/16] pass service-type to proxy

---
 .gitignore                                    |  2 ++
 .../node-server.js                            | 27 ++++++++++++-------
 .../openCypher/queries/fetchSchema.ts         |  1 +
 .../src/connector/useGEFetch.ts               |  1 +
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index e4d272aee..ae219abef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 **/node_modules/
 **/coverage/
 **/.DS_Store
+**/.vs/
+**/.idea/
diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index abec9e304..bb33a1d30 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -69,6 +69,7 @@ const retryFetch = async (
   options,
   isIamEnabled,
   region,
+  serviceType,
   retryDelay = 10000,
   refetchMaxRetries = 1
 ) => {
@@ -78,7 +79,7 @@ const retryFetch = async (
         host: url.hostname,
         port: url.port,
         path: url.pathname + url.search,
-        service: "neptune-db",
+        service: serviceType,
         region,
         method: options.method,
         body: options.body ?? undefined,
@@ -88,7 +89,7 @@ const retryFetch = async (
         host: url.hostname,
         port: url.port,
         path: url.pathname + url.search,
-        service: "neptune-db",
+        service: serviceType,
         region,
         method: options.method,
         body: options.body ?? undefined,
@@ -99,7 +100,7 @@ const retryFetch = async (
       host: url.hostname,
       port: url.port,
       path: url.pathname + url.search,
-      service: "neptune-db",
+      service: serviceType,
       method: options.method,
       body: options.body ?? undefined,
       headers: options.headers,
@@ -129,13 +130,14 @@ const retryFetch = async (
 };
 
 // Function to fetch data from the given URL and send it as a response.
-async function fetchData(res, next, url, options, isIamEnabled, region) {
+async function fetchData(res, next, url, options, isIamEnabled, region, serviceType) {
   try {
     const response = await retryFetch(
       new URL(url),
       options,
       isIamEnabled,
-      region
+      region,
+      serviceType
     );
     const data = await response.json();
     res.send(data);
@@ -185,8 +187,9 @@ async function fetchData(res, next, url, options, isIamEnabled, region) {
     };
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
 
-    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region);
+    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
 
   // POST endpoint for Gremlin queries.
@@ -209,8 +212,9 @@ async function fetchData(res, next, url, options, isIamEnabled, region) {
 
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
 
-    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region);
+    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
 
   // POST endpoint for openCypher queries.
@@ -233,8 +237,9 @@ async function fetchData(res, next, url, options, isIamEnabled, region) {
 
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
 
-    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region);
+    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
 
   // GET endpoint to retrieve PostgreSQL statistics summary.
@@ -247,8 +252,9 @@ async function fetchData(res, next, url, options, isIamEnabled, region) {
 
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
 
-    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region);
+    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
 
   // GET endpoint to retrieve RDF statistics summary.
@@ -261,8 +267,9 @@ async function fetchData(res, next, url, options, isIamEnabled, region) {
 
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
 
-    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region);
+    fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
 
   app.get("/logger", (req, res, next) => {
diff --git a/packages/graph-explorer/src/connector/openCypher/queries/fetchSchema.ts b/packages/graph-explorer/src/connector/openCypher/queries/fetchSchema.ts
index 98772eefd..1b2cb7393 100644
--- a/packages/graph-explorer/src/connector/openCypher/queries/fetchSchema.ts
+++ b/packages/graph-explorer/src/connector/openCypher/queries/fetchSchema.ts
@@ -79,6 +79,7 @@ const fetchVerticesAttributes = async (
       const response = await openCypherFetch<RawVerticesSchemaResponse>(verticesTemplate);
 
       const vertex = response.results[0]?.object as OCVertex;
+      if (!vertex) return;
       const label = vertex["~labels"][0] as string;
       const properties = vertex["~properties"];
       vertices.push({
diff --git a/packages/graph-explorer/src/connector/useGEFetch.ts b/packages/graph-explorer/src/connector/useGEFetch.ts
index 98d86f5c9..9d58bcd03 100644
--- a/packages/graph-explorer/src/connector/useGEFetch.ts
+++ b/packages/graph-explorer/src/connector/useGEFetch.ts
@@ -46,6 +46,7 @@ const useGEFetch = () => {
     }
     if (connection?.awsAuthEnabled) {
       headers["aws-neptune-region"] = connection.awsRegion || "";
+      headers["service-type"] = connection.serviceType || "neptune-db";
     }
 
     return { ...headers, ...typeHeaders };

From f80e5b2561c2ffaf8b13351451da86576228035e Mon Sep 17 00:00:00 2001
From: Valentyn Kahamlyk <Valentyn.Kahamlyk@improving.com>
Date: Wed, 21 Feb 2024 11:45:25 -0800
Subject: [PATCH 12/16] pickup SERVICE_TYPE from env

---
 README.md                                    | 2 +-
 additionaldocs/ecs/ECS_FARGATE_DEPLOYMENT.md | 5 +++++
 packages/graph-explorer/src/index.tsx        | 1 +
 process-environment.sh                       | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 407547fa3..db1a05b4f 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ To provide a default connection such that initial loads of the graph explorer al
     - `GRAPH_CONNECTION_URL` - `None` - See [Add a New Connection](#connections-ui)
   - Required if `USING_PROXY_SERVER=True` and `IAM=True`
     - `AWS_REGION` - `None` - See [Add a New Connection](#connections-ui)
-    - `SERVICE_TYPE` - `neptune-db`
+    - `SERVICE_TYPE` - `neptune-db`, Set this as `neptune-db` for Neptune database or `neptune-graph` for Neptune Analytics.
 
 #### JSON Configuration Approach
 
diff --git a/additionaldocs/ecs/ECS_FARGATE_DEPLOYMENT.md b/additionaldocs/ecs/ECS_FARGATE_DEPLOYMENT.md
index eecc1b4db..f6229bb47 100644
--- a/additionaldocs/ecs/ECS_FARGATE_DEPLOYMENT.md
+++ b/additionaldocs/ecs/ECS_FARGATE_DEPLOYMENT.md
@@ -113,6 +113,10 @@ After the request is processed, the console will return you to your certificate
                           "name": "HOST",
                           "value": "localhost"
                       },
+                      {
+                          "name": "SERVICE_TYPE",
+                          "value": "neptune-db"
+                      },
                       {
                           "name": "GRAPH_CONNECTION_URL",
                           "value": "https://{NEPTUNE_ENDPOINT}:8182"
@@ -157,6 +161,7 @@ After the request is processed, the console will return you to your certificate
      - `IAM`: Set this to `true` to use SigV4 signed requests, if your Neptune cluster has IAM db authentication enabled.
      - `GRAPH_CONNECTION_URL`: Set this as `https://{NEPTUNE_ENDPOINT}:8182`.
      - `PUBLIC_OR_PROXY_ENDPOINT`: Set this as `https://{Domain name set in Step 5 of "Request an ACM Public Certificate"}`.
+     - `SERVICE_TYPE`:  Set this as `neptune-db` for Neptune database or `neptune-graph` for Neptune Analytics.
 6. Click **Create**.
 
 ### Create a Fargate Service
diff --git a/packages/graph-explorer/src/index.tsx b/packages/graph-explorer/src/index.tsx
index 2ce70e31c..0682a6e93 100644
--- a/packages/graph-explorer/src/index.tsx
+++ b/packages/graph-explorer/src/index.tsx
@@ -62,6 +62,7 @@ const grabConfig = async (): Promise<RawConfiguration | undefined> => {
         graphDbUrl: defaultConnectionData.GRAPH_EXP_CONNECTION_URL || "",
         awsAuthEnabled: !!defaultConnectionData.GRAPH_EXP_IAM,
         awsRegion: defaultConnectionData.GRAPH_EXP_AWS_REGION || "",
+        serviceType: defaultConnectionData.SERVICE_TYPE || "neptune-db",
         fetchTimeoutMs:
           defaultConnectionData.GRAPH_EXP_FETCH_REQUEST_TIMEOUT || 240000,
       },
diff --git a/process-environment.sh b/process-environment.sh
index a63c824d6..78c67805e 100644
--- a/process-environment.sh
+++ b/process-environment.sh
@@ -6,6 +6,7 @@ if [ -f "./config.json" ]; then
 
     PUBLIC_OR_PROXY_ENDPOINT=$(echo "$json" | grep -o '"PUBLIC_OR_PROXY_ENDPOINT":[^,}]*' | cut -d '"' -f 4)
     GRAPH_TYPE=$(echo "$json" | grep -o '"GRAPH_TYPE":[^,}]*' | cut -d '"' -f 4)
+    SERVICE_TYPE=$(echo "$json" | grep -o '"SERVICE_TYPE":[^,}]*' | cut -d '"' -f 4)
     USING_PROXY_SERVER=$(echo "$json" | grep -o '"USING_PROXY_SERVER":[^,}]*' | cut -d ':' -f 2 | tr -d '[:space:]' | sed 's/"//g')
     IAM=$(echo "$json" | grep -o '"IAM":[^,}]*' | cut -d ':' -f 2 | tr -d '[:space:]' | sed 's/"//g')
     GRAPH_CONNECTION_URL=$(echo "$json" | grep -o '"GRAPH_CONNECTION_URL":[^,}]*' | cut -d '"' -f 4)

From 572ae4bc68459015a392dafccf870e72d19a92f1 Mon Sep 17 00:00:00 2001
From: Valentyn Kahamlyk <Valentyn.Kahamlyk@improving.com>
Date: Fri, 23 Feb 2024 16:53:17 -0800
Subject: [PATCH 13/16] code review suggestions

---
 packages/graph-explorer-proxy-server/node-server.js  | 12 +++++++-----
 packages/graph-explorer/src/connector/useGEFetch.ts  |  3 ++-
 packages/graph-explorer/src/index.tsx                |  3 ++-
 .../modules/CreateConnection/CreateConnection.tsx    |  2 +-
 packages/graph-explorer/src/utils/constants.ts       |  1 +
 packages/graph-explorer/src/utils/index.ts           |  1 +
 6 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 packages/graph-explorer/src/utils/constants.ts

diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index bb33a1d30..4d5e8731f 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -16,6 +16,8 @@ const aws4 = require("aws4");
 // Load environment variables from .env file.
 dotenv.config({ path: "../graph-explorer/.env" });
 
+const DEFAULT_SERVICE_TYPE = "neptune-db";
+
 // Create a logger instance with pino.
 const proxyLogger = pino({
   level: process.env.LOG_LEVEL || "info",
@@ -187,7 +189,7 @@ async function fetchData(res, next, url, options, isIamEnabled, region, serviceT
     };
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
-    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? DEFAULT_SERVICE_TYPE) : "";
 
     fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
@@ -212,7 +214,7 @@ async function fetchData(res, next, url, options, isIamEnabled, region, serviceT
 
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
-    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? DEFAULT_SERVICE_TYPE) : "";
 
     fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
@@ -237,7 +239,7 @@ async function fetchData(res, next, url, options, isIamEnabled, region, serviceT
 
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
-    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? DEFAULT_SERVICE_TYPE) : "";
 
     fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
@@ -252,7 +254,7 @@ async function fetchData(res, next, url, options, isIamEnabled, region, serviceT
 
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
-    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? DEFAULT_SERVICE_TYPE) : "";
 
     fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
@@ -267,7 +269,7 @@ async function fetchData(res, next, url, options, isIamEnabled, region, serviceT
 
     const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
-    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? "neptune-db") : "";
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? DEFAULT_SERVICE_TYPE) : "";
 
     fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
diff --git a/packages/graph-explorer/src/connector/useGEFetch.ts b/packages/graph-explorer/src/connector/useGEFetch.ts
index 9d58bcd03..51924d02a 100644
--- a/packages/graph-explorer/src/connector/useGEFetch.ts
+++ b/packages/graph-explorer/src/connector/useGEFetch.ts
@@ -2,6 +2,7 @@ import { useCallback } from 'react';
 import localforage from "localforage";
 import { CacheItem } from './useGEFetchTypes';
 import { useConfiguration, type ConnectionConfig } from '../core';
+import { DEFAULT_SERVICE_TYPE } from "../utils/constants";
 
 // 10 minutes
 const CACHE_TIME_MS = 10 * 60 * 1000;
@@ -46,7 +47,7 @@ const useGEFetch = () => {
     }
     if (connection?.awsAuthEnabled) {
       headers["aws-neptune-region"] = connection.awsRegion || "";
-      headers["service-type"] = connection.serviceType || "neptune-db";
+      headers["service-type"] = connection.serviceType || DEFAULT_SERVICE_TYPE;
     }
 
     return { ...headers, ...typeHeaders };
diff --git a/packages/graph-explorer/src/index.tsx b/packages/graph-explorer/src/index.tsx
index 0682a6e93..e00de0bb7 100644
--- a/packages/graph-explorer/src/index.tsx
+++ b/packages/graph-explorer/src/index.tsx
@@ -6,6 +6,7 @@ import App from "./App";
 import { RawConfiguration } from "./core";
 import ConnectedProvider from "./core/ConnectedProvider";
 import "./index.css";
+import { DEFAULT_SERVICE_TYPE } from "./utils/constants";
 
 const grabConfig = async (): Promise<RawConfiguration | undefined> => {
   const defaultConnectionPath = `${location.origin}/defaultConnection`;
@@ -62,7 +63,7 @@ const grabConfig = async (): Promise<RawConfiguration | undefined> => {
         graphDbUrl: defaultConnectionData.GRAPH_EXP_CONNECTION_URL || "",
         awsAuthEnabled: !!defaultConnectionData.GRAPH_EXP_IAM,
         awsRegion: defaultConnectionData.GRAPH_EXP_AWS_REGION || "",
-        serviceType: defaultConnectionData.SERVICE_TYPE || "neptune-db",
+        serviceType: defaultConnectionData.SERVICE_TYPE || DEFAULT_SERVICE_TYPE,
         fetchTimeoutMs:
           defaultConnectionData.GRAPH_EXP_FETCH_REQUEST_TIMEOUT || 240000,
       },
diff --git a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
index d0284af05..b9e569c2b 100644
--- a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
+++ b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
@@ -177,7 +177,7 @@ const CreateConnection = ({
       return;
     }
 
-    if (form.awsAuthEnabled && !form.awsRegion && !form.serviceType) {
+    if (form.awsAuthEnabled && (!form.awsRegion || !form.serviceType)) {
       setError(true);
       return;
     }
diff --git a/packages/graph-explorer/src/utils/constants.ts b/packages/graph-explorer/src/utils/constants.ts
new file mode 100644
index 000000000..e6dd391be
--- /dev/null
+++ b/packages/graph-explorer/src/utils/constants.ts
@@ -0,0 +1 @@
+export const DEFAULT_SERVICE_TYPE = "neptune-db";
\ No newline at end of file
diff --git a/packages/graph-explorer/src/utils/index.ts b/packages/graph-explorer/src/utils/index.ts
index f48f7e7f9..1e595568a 100644
--- a/packages/graph-explorer/src/utils/index.ts
+++ b/packages/graph-explorer/src/utils/index.ts
@@ -5,4 +5,5 @@ export { default as groupChildrenByType } from "./groupChildrenByType";
 export { default as memoize } from "./memoize";
 export { default as useClickOutside } from "./useClickOutside";
 export { default as sanitizeText } from "./sanitizeText";
+export { DEFAULT_SERVICE_TYPE } from "./constants";
 export * from "./set";

From 45486ab0b28dba83977069feb00a3cd2fa315587 Mon Sep 17 00:00:00 2001
From: Valentyn Kahamlyk <vkagamlyk@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:54:52 -0800
Subject: [PATCH 14/16] Update packages/graph-explorer/src/utils/constants.ts

Co-authored-by: Alexey Temnikov <alexey.temnikov@improving.com>
---
 packages/graph-explorer/src/utils/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/graph-explorer/src/utils/constants.ts b/packages/graph-explorer/src/utils/constants.ts
index e6dd391be..14daa9b5e 100644
--- a/packages/graph-explorer/src/utils/constants.ts
+++ b/packages/graph-explorer/src/utils/constants.ts
@@ -1 +1 @@
-export const DEFAULT_SERVICE_TYPE = "neptune-db";
\ No newline at end of file
+export const DEFAULT_SERVICE_TYPE = "neptune-db";

From 4dc9e6982fe3162553882f8e18656d464606ccde Mon Sep 17 00:00:00 2001
From: Valentyn Kahamlyk <Valentyn.Kahamlyk@improving.com>
Date: Wed, 28 Feb 2024 15:11:19 -0800
Subject: [PATCH 15/16] fixed schema fetch for Neptune Analytics. Cleanup

---
 Changelog.md                                  |  4 ++++
 .../node-server.js                            | 11 +++++----
 .../src/connector/openCypher/useOpenCypher.ts |  2 +-
 .../ConnectionDetail/ConnectionDetail.tsx     |  2 +-
 .../CreateConnection/CreateConnection.tsx     | 23 +++++++++++++------
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3cad479da..8fc482d95 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,10 @@ This release includes the following feature enhancements and bug fixes:
 - Bumped `vite` to `4.5.2` (<https://github.com/aws/graph-explorer/pull/233>)
 - Searching for text containing quotes now works.
 
+**Features**
+
+- Added compatibility with Neptune Analitycs.
+
 ## Release 1.5.0
 
 This release includes the following feature enhancements and bug fixes:
diff --git a/packages/graph-explorer-proxy-server/node-server.js b/packages/graph-explorer-proxy-server/node-server.js
index 4d5e8731f..6adbf4cb1 100644
--- a/packages/graph-explorer-proxy-server/node-server.js
+++ b/packages/graph-explorer-proxy-server/node-server.js
@@ -17,6 +17,7 @@ const aws4 = require("aws4");
 dotenv.config({ path: "../graph-explorer/.env" });
 
 const DEFAULT_SERVICE_TYPE = "neptune-db";
+const NEPTUNE_ANALYTICS_SERVICE_TYPE = "neptune-graph";
 
 // Create a logger instance with pino.
 const proxyLogger = pino({
@@ -244,17 +245,19 @@ async function fetchData(res, next, url, options, isIamEnabled, region, serviceT
     fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
 
-  // GET endpoint to retrieve PostgreSQL statistics summary.
+  // GET endpoint to retrieve statistics summary.
   app.get("/pg/statistics/summary", async (req, res, next) => {
-    const rawUrl = `${req.headers["graph-db-connection-url"]}/pg/statistics/summary?mode=detailed`;
+    const isIamEnabled = !!req.headers["aws-neptune-region"];
+    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? DEFAULT_SERVICE_TYPE) : "";
+    const rawUrl = serviceType === NEPTUNE_ANALYTICS_SERVICE_TYPE
+      ? `${req.headers["graph-db-connection-url"]}/summary?mode=detailed`
+      : `${req.headers["graph-db-connection-url"]}/pg/statistics/summary?mode=detailed`;
 
     const requestOptions = {
       method: "GET",
     };
 
-    const isIamEnabled = !!req.headers["aws-neptune-region"];
     const region = isIamEnabled ? req.headers["aws-neptune-region"] : "";
-    const serviceType = isIamEnabled ? (req.headers["service-type"] ?? DEFAULT_SERVICE_TYPE) : "";
 
     fetchData(res, next, rawUrl, requestOptions, isIamEnabled, region, serviceType);
   });
diff --git a/packages/graph-explorer/src/connector/openCypher/useOpenCypher.ts b/packages/graph-explorer/src/connector/openCypher/useOpenCypher.ts
index 20b98ede0..4ab75c438 100644
--- a/packages/graph-explorer/src/connector/openCypher/useOpenCypher.ts
+++ b/packages/graph-explorer/src/connector/openCypher/useOpenCypher.ts
@@ -37,7 +37,7 @@ const useOpenCypher = () => {
         ...ops
       });
 
-      summary = response.payload.graphSummary as GraphSummary || undefined;
+      summary = (response.payload ? response.payload.graphSummary as GraphSummary : response.graphSummary as GraphSummary) || undefined;
     } catch (e) {
       if (import.meta.env.DEV) {
         console.error("[Summary API]", e);
diff --git a/packages/graph-explorer/src/modules/ConnectionDetail/ConnectionDetail.tsx b/packages/graph-explorer/src/modules/ConnectionDetail/ConnectionDetail.tsx
index bd0b7ad82..251f53bf6 100644
--- a/packages/graph-explorer/src/modules/ConnectionDetail/ConnectionDetail.tsx
+++ b/packages/graph-explorer/src/modules/ConnectionDetail/ConnectionDetail.tsx
@@ -210,7 +210,7 @@ const ConnectionDetail = ({ isSync, onSyncChange }: ConnectionDetailProps) => {
         <CreateConnection
           onClose={() => setEdit(false)}
           configId={config.id}
-          disabledFields={config.__fileBase ? ["type", "url"] : undefined}
+          disabledFields={config.__fileBase ? ["type", "url", "serviceType"] : undefined}
           initialData={{
             ...(config.connection || {}),
             name: config.displayLabel || config.id,
diff --git a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
index b9e569c2b..aa23ea8d1 100644
--- a/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
+++ b/packages/graph-explorer/src/modules/CreateConnection/CreateConnection.tsx
@@ -48,7 +48,7 @@ export const CONNECTIONS_OP: {
 export type CreateConnectionProps = {
   configId?: string;
   initialData?: ConnectionForm;
-  disabledFields?: Array<"name" | "type" | "url">;
+  disabledFields?: Array<"name" | "type" | "url" | "serviceType">;
   onClose(): void;
 };
 
@@ -147,7 +147,7 @@ const CreateConnection = ({
     proxyConnection: initialData?.proxyConnection || false,
     graphDbUrl: initialData?.graphDbUrl || "",
     awsAuthEnabled: initialData?.awsAuthEnabled || false,
-    serviceType: initialData?.serviceType || "neptune-graph",
+    serviceType: initialData?.serviceType || "neptune-db",
     awsRegion: initialData?.awsRegion || "",
     enableCache: true,
     cacheTimeMs: (initialData?.cacheTimeMs ?? 10 * 60 * 1000) / 60000,
@@ -157,10 +157,18 @@ const CreateConnection = ({
   const [hasError, setError] = useState(false);
   const onFormChange = useCallback(
     (attribute: string) => (value: number | string | string[] | boolean) => {
-      setForm(prev => ({
-        ...prev,
-        [attribute]: value,
-      }));
+      if (attribute === "serviceType" && value === "neptune-graph") {
+        setForm(prev => ({
+          ...prev,
+          [attribute]: value,
+          ["type"]: "openCypher",
+        }));
+      } else {
+        setForm(prev => ({
+          ...prev,
+          [attribute]: value,
+        }));
+      }
     },
     []
   );
@@ -203,7 +211,7 @@ const CreateConnection = ({
           options={CONNECTIONS_OP}
           value={form.type}
           onChange={onFormChange("type")}
-          isDisabled={disabledFields?.includes("type")}
+          isDisabled={disabledFields?.includes("type") || form.serviceType === "neptune-graph"}
         />
         <div className={pfx("input-url")}>
           <Input
@@ -298,6 +306,7 @@ const CreateConnection = ({
                 ]}
                 value={form.serviceType}
                 onChange={onFormChange("serviceType")}
+                isDisabled={disabledFields?.includes("serviceType")}
               />
             </div>
           </>

From 200a1a992f19aeac940fc3805e27a0f8b9e700af Mon Sep 17 00:00:00 2001
From: Valentyn Kahamlyk <Valentyn.Kahamlyk@improving.com>
Date: Thu, 29 Feb 2024 21:41:30 -0800
Subject: [PATCH 16/16] ...

---
 additionaldocs/sagemaker/install-graph-explorer-lc.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/additionaldocs/sagemaker/install-graph-explorer-lc.sh b/additionaldocs/sagemaker/install-graph-explorer-lc.sh
index 2687a6b55..14d368818 100644
--- a/additionaldocs/sagemaker/install-graph-explorer-lc.sh
+++ b/additionaldocs/sagemaker/install-graph-explorer-lc.sh
@@ -4,6 +4,7 @@ sudo -u ec2-user -i <<'EOF'
 
 echo "export GRAPH_NOTEBOOK_AUTH_MODE=DEFAULT" >> ~/.bashrc  # set to IAM instead of DEFAULT if cluster is IAM enabled
 echo "export GRAPH_NOTEBOOK_HOST=CHANGE-ME" >> ~/.bashrc
+echo "export GRAPH_NOTEBOOK_SERVICE=neptune-db" >> ~/.bashrc # set to `neptune-db` for Neptune database or `neptune-graph` for Neptune Analytics
 echo "export GRAPH_NOTEBOOK_PORT=8182" >> ~/.bashrc
 echo "export AWS_REGION=us-west-2" >> ~/.bashrc  # modify region if needed