From 6ba0e2df9a4da00f92d1f9525c2a4a86b681b6f6 Mon Sep 17 00:00:00 2001
From: Edward Wang <hack@fb.com>
Date: Tue, 3 Mar 2020 18:40:20 -0800
Subject: [PATCH] Use relative paths for Insights

---
 captum/insights/api.py                 | 6 +++---
 captum/insights/frontend/package.json  | 1 +
 captum/insights/frontend/src/WebApp.js | 6 +++---
 captum/insights/server.py              | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/captum/insights/api.py b/captum/insights/api.py
index dd11be2c2d..9060fe1ddf 100644
--- a/captum/insights/api.py
+++ b/captum/insights/api.py
@@ -256,14 +256,14 @@ def render(self, debug=True):
     def serve(self, blocking=False, debug=False, port=None):
         context = _get_context()
         if context == _CONTEXT_COLAB:
-            self._serve_colab(blocking=blocking, debug=debug, port=port)
+            return self._serve_colab(blocking=blocking, debug=debug, port=port)
         else:
-            self._serve(blocking=blocking, debug=debug, port=port)
+            return self._serve(blocking=blocking, debug=debug, port=port)
 
     def _serve(self, blocking=False, debug=False, port=None):
         from captum.insights.server import start_server
 
-        start_server(self, blocking=blocking, debug=debug, _port=port)
+        return start_server(self, blocking=blocking, debug=debug, _port=port)
 
     def _serve_colab(self, blocking=False, debug=False, port=None):
         from IPython.display import display, HTML
diff --git a/captum/insights/frontend/package.json b/captum/insights/frontend/package.json
index 21f899322d..ccb5e9f721 100644
--- a/captum/insights/frontend/package.json
+++ b/captum/insights/frontend/package.json
@@ -2,6 +2,7 @@
   "name": "frontend",
   "version": "0.2.0",
   "private": true,
+  "homepage": ".",
   "dependencies": {
     "@babel/plugin-proposal-class-properties": "^7.5.5",
     "babel-loader": "^8.0.6",
diff --git a/captum/insights/frontend/src/WebApp.js b/captum/insights/frontend/src/WebApp.js
index 4668675f7c..7ee6eb6917 100644
--- a/captum/insights/frontend/src/WebApp.js
+++ b/captum/insights/frontend/src/WebApp.js
@@ -17,14 +17,14 @@ class WebApp extends React.Component {
   }
 
   _fetchInit = () => {
-    fetch("/init")
+    fetch("init")
       .then(r => r.json())
       .then(r => this.setState({ config: r }));
   };
 
   fetchData = filter_config => {
     this.setState({ loading: true });
-    fetch("/fetch", {
+    fetch("fetch", {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -36,7 +36,7 @@ class WebApp extends React.Component {
   };
 
   onTargetClick = (labelIndex, instance, callback) => {
-    fetch("/attribute", {
+    fetch("attribute", {
       method: "POST",
       headers: {
         "Content-Type": "application/json"
diff --git a/captum/insights/server.py b/captum/insights/server.py
index 07e363e638..31edc85164 100644
--- a/captum/insights/server.py
+++ b/captum/insights/server.py
@@ -91,7 +91,6 @@ def start_server(
             app.logger.disabled = True
 
         port = _port or get_free_tcp_port()
-        print(f"\nFetch data and view Captum Insights at http://localhost:{port}/\n")
         # Start in a new thread to not block notebook execution
         t = threading.Thread(target=run_app, kwargs={"debug": debug})
         t.start()
@@ -99,4 +98,5 @@ def start_server(
         if blocking:
             t.join()
 
+    print(f"\nFetch data and view Captum Insights at http://localhost:{port}/\n")
     return port