Skip to content

Commit 2823f44

Browse files
Clean up waterlog adapter communication
1 parent 0bd225b commit 2823f44

1 file changed

Lines changed: 4 additions & 26 deletions

File tree

src/foraging_gui/Foraging.py

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,25 +2105,10 @@ def _AddWaterlogResult(self, session: Session):
21052105
for k, v in water_json
21062106
}
21072107

2108-
# extract software information - TODO: Add this to waterlog cli
2108+
# extract software information to send to waterlog once it can accept it
21092109
logging.info("Extracting software information from first data stream")
21102110
software = session.stimulus_epochs[0].software[0]
2111-
2112-
# TODO: validate user first
2113-
# experimenter_name = self.behavior_session_model.experimenter[0]
2114-
# try:
2115-
# resp = requests.get("http://aind-metadata-service/api/v2/active_directory/{experimenter_name}")
2116-
# resp.raise_for_status()
2117-
# validated_username = resp.json()['username']
2118-
# except Exception:
2119-
# logging.warning(
2120-
# "Could not validate experimenter name against aind-metadata-service",
2121-
# exc_info=True
2122-
# )
2123-
# validated_username = experimenter_name
2124-
2125-
# TODO: Should we remove the suggested water calculation from DF?
2126-
# That would mean removing the last two arguments below
2111+
# Access sw name/version with (software.url, software.version)
21272112

21282113
waterlog_args = [
21292114
self.Settings['waterlog_exe_path'],
@@ -2142,17 +2127,10 @@ def _AddWaterlogResult(self, session: Session):
21422127
'--water-supplement-delivered',
21432128
]
21442129

2145-
### Leftover fields that were previously sent to SLIMS
2146-
### TODO: validate that it's okay to leave them out
2147-
# total_water_ml=water["water_in_session_total"]+water["water_after_session"],
2148-
# workstation=session.rig_id,
2149-
# sw_source=software.url,
2150-
# sw_version=software.version,
2151-
21522130
logging.info("Sending water info to waterlog")
21532131
process = subprocess.run([str(arg) for arg in waterlog_args])
2154-
2155-
# TODO: Add message to user to to over to waterlog and hit submit
2132+
2133+
QMessageBox.information(self, "Waterlog", "Go to waterlog app to submit water information.")
21562134

21572135
try:
21582136
process.check_returncode()

0 commit comments

Comments
 (0)