Merge pull request #365 from MetaCell/feature/201_fix_filename_export

Feature/201 fix filename export

Author: Lucas Rebscher

netpyne_ui/netpyne_geppetto.py

@@ -9,6 +9,7 @@
 import subprocess
 import logging
 import re
+import base64
 
 from netpyne import specs, sim, analysis
 from netpyne.specs.utils import validateFunction
@@ -593,42 +594,51 @@ def header(title, spacer='-'):
             params = ['popParams', 'cellParams', 'synMechParams']
             params += ['connParams', 'stimSourceParams', 'stimTargetParams']
 
-            fname = args['fileName'] if args['fileName'][-3:] == '.py' else args['fileName'] + '.py'
+            fname = args['fileName']
+            if not fname:
+                # default option
+                fname = 'output.py'
+            
+            if not fname[-3:] == '.py':
+                fname = f"{fname}.py"
 
+            # TODO: use methods offered by netpyne to create this script!
             with open(fname, 'w') as script:
-                script.write('from netpyne import specs, sim\n')
-                script.write(header('documentation'))
-                script.write("''' Script generated with NetPyNE-UI. Please visit:\n")
-                script.write("    - https://www.netpyne.org\n    - https://github.com/MetaCell/NetPyNE-UI\n'''\n")
-                script.write(header('script', spacer='='))
-                script.write('netParams = specs.NetParams()\n')
-                script.write('simConfig = specs.SimConfig()\n')
-                script.write(header('single value attributes'))
+                script.write("from netpyne import specs, sim\n")
+                script.write(header("documentation"))
+                script.write("Script generated with NetPyNE-UI. Please visit:\n")
+                script.write("    - https://www.netpyne.org\n    - https://github.com/MetaCell/NetPyNE-UI\n\n")
+                script.write(header("script", spacer="="))
+                script.write("netParams = specs.NetParams()\n")
+                script.write("simConfig = specs.SimConfig()\n")
+                script.write(header("single value attributes"))
                 for attr, value in list(self.netParams.__dict__.items()):
                     if attr not in params:
                         if value != getattr(specs.NetParams(), attr):
-                            script.write('netParams.' + attr + ' = ')
-                            script.write(convert2bool(json.dumps(value, indent=4)) + '\n')
+                            script.write("netParams." + attr + " = ")
+                            script.write(convert2bool(json.dumps(value, indent=4)) + "\n")
 
-                script.write(header('network attributes'))
+                script.write(header("network attributes"))
                 for param in params:
                     for key, value in list(getattr(self.netParams, param).items()):
-                        script.write("netParams." + param + "['" + key + "'] = ")
-                        script.write(convert2bool(json.dumps(value, indent=4)) + '\n')
+                        script.write("netParams." + param + "[" + key + "] = ")
+                        script.write(convert2bool(json.dumps(value, indent=4)) + "\n")
 
-                script.write(header('network configuration'))
+                script.write(header("network configuration"))
                 for attr, value in list(self.simConfig.__dict__.items()):
                     if value != getattr(specs.SimConfig(), attr):
-                        script.write('simConfig.' + attr + ' = ')
-                        script.write(convert2bool(json.dumps(value, indent=4)) + '\n')
+                        script.write("simConfig." + attr + " = ")
+                        script.write(convert2bool(json.dumps(value, indent=4)) + "\n")
 
-                script.write(header('create simulate analyze  network'))
-                script.write('# sim.createSimulateAnalyze(netParams=netParams, simConfig=simConfig)\n')
+                script.write(header("create simulate analyze  network"))
+                script.write("# sim.createSimulateAnalyze(netParams=netParams, simConfig=simConfig)\n")
 
-                script.write(header('end script', spacer='='))
+                script.write(header("end script", spacer="="))
 
             with open(fname) as f:
-                return f.read()
+                file_b64 = base64.b64encode(bytes(f.read(), 'utf-8')).decode()
+                export_info = {"fileContent": file_b64, "fileName": fname}
+                return export_info
 
         except:
             return utils.getJSONError("Error while importing the NetPyNE model", sys.exc_info())

webapp/package-lock.json

@@ -19,6 +19,7 @@
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.51",
     "jquery": "^3.6.0",
+    "js-base64": "^3.6.1",
     "less-vars-to-js": "^1.3.0",
     "react": "^17.0.1",
     "react-dom": "^16.4.0",

webapp/package.json

@@ -1,13 +1,8 @@
-const createFileName = (name) => name + getTimeStamp();
+import { Base64 } from 'js-base64';
 
 const getTimeStamp = () => new Date().toGMTString().replace(',', '').replace(/[ ,:]/g, '_');
 
-const unescapeText = (text) => {
-  const unescaped = text.replace(/\\\\/g, '\\').replace(/\\'/g, "'").replace(/\\"/g, '"').split('\\n')
-    .join('\n')
-    .substring(1);
-  return unescaped.substring(0, unescaped.length - 1);
-};
+const createFileName = (name) => name + getTimeStamp();
 
 const forceBlobDownload = (blob, filename) => {
   const url = window.URL.createObjectURL(blob);
@@ -32,8 +27,8 @@ export const downloadJsonResponse = (jsonData) => {
   forceBlobDownload(blob, filename);
 };
 
-export const downloadPythonResponse = (textData) => {
-  const filename = `${createFileName('NetPyNE_init_')}.py`;
-  const blob = new Blob([unescapeText(textData)], { type: 'text/plain;charset=utf-8' });
-  forceBlobDownload(blob, filename);
+export const downloadPythonResponse = (exportInfo) => {
+  const content = Base64.decode(exportInfo.fileContent);
+  const blob = new Blob([content], { type: 'text/plain;charset=utf-8' });
+  forceBlobDownload(blob, exportInfo.fileName);
 };