Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
20736e2
#409 updated references to the new library
ddelpiano Nov 17, 2021
f763d0a
#410 updated application entry point
ddelpiano Nov 17, 2021
b1092d9
#412 migration to geppetto layout manager
ddelpiano Nov 18, 2021
b88776f
#412 still part of the migration, more fixes done
ddelpiano Nov 23, 2021
247f9ab
#387 limit user's ability on experiment number of trials
Muhaddatha Nov 23, 2021
9dc5ec7
#387 move variable inside component
Muhaddatha Nov 24, 2021
0afde8b
#412 more on the layout manager, redux refactoring and friends
ddelpiano Nov 25, 2021
60eb63c
Added sentry client
enicolasgomez Nov 25, 2021
96d5a62
Added sentry logger
enicolasgomez Nov 26, 2021
399a93c
Migrated NetPyNEInstantiated control to geppetto-meta
enicolasgomez Nov 29, 2021
b17f7e6
Added sentry logging to python layer
enicolasgomez Jan 3, 2022
0415cea
Fixing python controlled capability, passing model through the widget…
ddelpiano Jan 7, 2022
ec91bf4
Merge branch 'feature/meta_migration' of https://github.com/MetaCell/…
ddelpiano Jan 7, 2022
556a094
adding three js dependency and sentry react and tracing missing depen…
ddelpiano Jan 7, 2022
78e8a1a
adding dependencies
ddelpiano Jan 11, 2022
a393ace
fixing plot instatiation
ddelpiano Jan 12, 2022
9d0b9d9
fix drawer list when switching from edit to model view
ddelpiano Jan 12, 2022
696e7c7
removed old widget factory
ddelpiano Jan 12, 2022
4fb8d81
adding dark flexlayout styling
ddelpiano Jan 14, 2022
a7c106c
Fixed installation issues
enicolasgomez Jan 17, 2022
4e8ecf3
adding props to widget object
ddelpiano Jan 18, 2022
6604012
Merge branch 'feature/meta_migration' of https://github.com/MetaCell/…
ddelpiano Jan 18, 2022
6d9d6cc
aligning open PRs regarding the change from trial to condition
ddelpiano Jan 19, 2022
ed8d2e0
Merge branch 'development' of https://github.com/MetaCell/netpyne-ui …
ddelpiano Jan 19, 2022
abdea5f
Merge branch 'feature/387_limit_trial_numbers' of https://github.com/…
ddelpiano Jan 19, 2022
42b60ad
fixing some conditions in displaying the last number of conditions
ddelpiano Jan 19, 2022
f553e70
#431 Layout fixes after migration to meta
vidhyalongani Jan 24, 2022
2026f39
#435 restoring old tree component for the file browser
ddelpiano Jan 25, 2022
fdf5bed
#475 fixing dependency version
ddelpiano Jan 25, 2022
01fb072
Added test_netpyne_exported_model_1
enicolasgomez Jan 25, 2022
a0af340
Removed console logs left overs
enicolasgomez Jan 25, 2022
fae0db4
Changed test case name
enicolasgomez Jan 25, 2022
fec1db8
Merge pull request #434 from MetaCell/feature/431
ddelpiano Jan 25, 2022
41a73a0
#435 Add missing font family
vidhyalongani Jan 26, 2022
efe5100
Merge pull request #436 from MetaCell/feature/435
ddelpiano Jan 26, 2022
e8bb57b
Updated yarn lock file
enicolasgomez Jan 26, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ init.py
webapp/node_modules
webapp/geppetto-client
webapp/build
webapp/.yalc
workspace
netpyne_workspace
tests/frontend/e2e/node_modules
Expand All @@ -25,4 +26,5 @@ utilities/x86_64
*.iml
x86_64
.jupyter-config
venv
venv
node_modules
10 changes: 10 additions & 0 deletions netpyne_ui/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
from jupyter_geppetto.webapi import RouteManager
from netpyne_ui import api
import sentry_sdk

sentry_sdk.init(
"https://d8bf7e40eec34cb9891f6dd8207b5e83@sentry.metacell.us/6",

# Set traces_sample_rate to 1.0 to capture 100%
# of transactions for performance monitoring.
# We recommend adjusting this value in production.
traces_sample_rate=1.0,
)

RouteManager.add_controller(api.NetPyNEController)
6 changes: 3 additions & 3 deletions netpyne_ui/experiments.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def get_model_specification(name: str, trial: str) -> dict:
"""
path = get_trial_output_path(name, trial, fallback=True)
if path is None or not os.path.exists(path):
raise ExperimentsError(f"Trial file {path} not found")
raise ExperimentsError(f"Condition file {path} not found")

with open(path, "r") as f:
trial_output = json.load(f)
Expand Down Expand Up @@ -273,7 +273,7 @@ def onerror(func, path, exc_info):


def _create_base_model_trial() -> model.Trial:
return model.Trial(name="Trial 1", id=BASE_TRIAL_ID)
return model.Trial(name="Condition 1", id=BASE_TRIAL_ID)


def _create_trials(experiment: model.Experiment) -> List[model.Trial]:
Expand Down Expand Up @@ -315,7 +315,7 @@ def _create_trials(experiment: model.Experiment) -> List[model.Trial]:

filename = combinations["filenames"][combIdx][1:]
indices = combinations["indices"][combIdx]
name = f"Trial {combIdx + 1}"
name = f"Condition {combIdx + 1}"

trials.append(
model.Trial(name=name, params=params, indices=indices, id=filename)
Expand Down
4 changes: 2 additions & 2 deletions netpyne_ui/netpyne_geppetto.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def viewExperimentResult(self, payload: dict):

file = experiments.get_trial_output_path(name, trial)
if file is None or not os.path.exists(file):
return utils.getJSONError(f"Couldn't find output file of trial. Please take a look at the simulation log.", "")
return utils.getJSONError(f"Couldn't find output file of condition. Please take a look at the simulation log.", "")

if self.doIhaveInstOrSimData()['haveInstance']:
sim.clearAll()
Expand Down Expand Up @@ -184,7 +184,7 @@ def instantiateNetPyNEModelInGeppetto(self, args):
self.geppetto_model = self.model_interpreter.getGeppettoModel(netpyne_model)

return json.loads(GeppettoModelSerializer.serialize(self.geppetto_model))
except Exception:
except Exception as e:
message = "Error while instantiating the NetPyNE model"
logging.exception(message)
return utils.getJSONError(message, sys.exc_info())
Expand Down
Loading