Merge branch 'main' of github.com:ageller/Firefly

src/firefly/data_reader/json_utils.py

@@ -1,5 +1,6 @@
 import pandas as pd
 import os
+import json
 
 def write_to_json(dictionary,path=None):
     """Simple utility function to write a dictionary to a path as :code:`.json` file.
@@ -25,7 +26,9 @@ def load_from_json(path):
     :return: dictionary
     :rtype: dict
     """
-    if os.path.isfile(path):
-        with open(path,'r') as handle:
-            dictionary=pd.io.json.loads(''.join(handle.readlines()))
+    if not os.path.isfile(path):
+        raise FileNotFoundError(path)
+
+    with open(path,'r') as handle:
+        dictionary = json.load(handle)
     return dictionary

src/firefly/ntbks/minimal_example.ipynb

@@ -80,14 +80,30 @@
     "from firefly.server import spawnFireflyServer,quitAllFireflyServers"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "bbdc4f84",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# depending on how you installed Firefly, you may need to define a directory path to send to the spawnFireflyServer command\n",
+    "#     the directory should point to the location of the \"static\" directory in your firefly distribution, \n",
+    "#     e.g., in our GitHub repo that is \"Firefly/src/firefly\"\n",
+    "#     if you are running the notebook from Firefly/src/firefly/ntbks you could define the directory as\n",
+    "import os\n",
+    "directory = os.path.join(os.getcwd(),'..') \n",
+    "print(directory)"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
    "id": "6e2fa016-019c-482a-a039-114816ecee37",
    "metadata": {},
    "outputs": [],
    "source": [
-    "process = spawnFireflyServer()"
+    "process = spawnFireflyServer(directory = directory)"
    ]
   },
   {
@@ -151,7 +167,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.6"
+   "version": "3.10.11"
   }
  },
  "nbformat": 4,

src/firefly/static/js/gui/initGUI.js

@@ -22,13 +22,13 @@ function makeUI(local=false){
 			if (GUIParams.cameraNeedsUpdate) updateGUICamera();
 			createUI();
 		}
-		// attempt to fix the issue where the GUI and viewer don't connect to the socket
-		// this might result in some infinite loop of reloads...
-		if (GUIParams.GUItries > 5 && GUIparams.usingSocket){
-			console.log('ERROR IN CREATING GUI.  TRYING AGAIN.');
-			GUIParams.GUItries = 0;
-			location.reload();
-		}
+		// // attempt to fix the issue where the GUI and viewer don't connect to the socket
+		// // this might result in some infinite loop of reloads...
+		// if (GUIParams.GUItries > 5 && GUIParams.usingSocket){
+		// 	console.log('ERROR IN CREATING GUI.  TRYING AGAIN.');
+		// 	GUIParams.GUItries = 0;
+		// 	location.reload();
+		// }
 	}, 1000);
 
 

src/firefly/static/js/misc/socketParams.js

@@ -18,6 +18,7 @@ function defineSocketParams(){
 		// Connect to the Socket.IO server.
 		// The connection URL has the following format:
 		//     http[s]://<domain>:<port>[/<namespace>]
+
 		this.socket = io.connect(location.protocol + '//' + document.domain + ':' + location.port + this.namespace, 
 		{
 			rememberTransport: false,