Centralize collection directory by JunAishima · Pull Request #299 · NSLS2/lsdc

JunAishima · 2023-06-06T14:38:14Z

Changes to ensure server and GUI are writing to the same directory
GUI
- Not allowed to start if the directory where it is started is not the same as where the server is started
- Will be terminated if the visit directory is changed while it is running
Server
- Not allowed to start if the current_visit_lsdc_<tla> file does not exist or the CURRENT_VISIT_DIR variable does not point to a proposal directory-like name

* use this as the source of truth for both GUI and server

* on startup. if not started there, show an error and exit

* if it has changed, kill the GUI, and do this check in a separate thread

* use QThread to allow ability to repeat

* make this a configurable value

* the GUI should terminate quickly after the visit directory is changed to prevent the user collecting data in an undesired place

* user is not likely to have the GUI log open, so also ensure the message is printed out to the terminal

Added checks for server: - Checks to if env file exists - Checks if CURRENT_VISIT_DIR has a value and is valid

utils/healthcheck.py

JunAishima · 2023-06-15T18:17:58Z

@vshekar - some information about the branches of LSDC in the current condition with the fixes from this pull request vs. what was running before

current branches containing the fixes:
AMX: 2023-2-amxfmx-production-dev
FMX: 2023-2-amxfmx-production-dev

previous branches that we must roll back to if necessary (pre-fix branches):
AMX: 2023-2-amxfmx-production (also archive-2023-05-16)
FMX: 2023-2-amxfmx-production-transmission-fixes

daq_main2.py

top_view.py

gui/data_loc_info.py

tacaswell · 2023-06-15T21:22:23Z

gui/control_main.py

        hutchTopCamThread.start()
+        serverCheckThread = ServerCheckThread(
+            parent=self, delay=SERVER_CHECK_DELAY)
+        serverCheckThread.visit_dir_changed.connect(self.close)


is app.exit (or similar) a better choice here? It does look like def closeEvent will exit, but directly exiting the app here may be more reliable?

tacaswell

I left a few comments that I think would reduce edge cases, but as-is this PR achieves the goals of:

only starting the server if it is in a directory with the correct structure
the GUI exits with in 2 seconds of the server directory being different than the cwd

Co-authored-by: Thomas A Caswell <tcaswell@gmail.com>

* the object in question is a QLabel(), which is not editable

Inspired by: ``` if the goal is murder the app...just murder the app -Tom Caswell ```

JunAishima · 2023-06-20T15:53:17Z

@tacaswell
Before: started at commit 02aca1 of LSDC, on 2023-2-amxfmx-production-dev, which includes up to commit 88b4ed of the centralize-collection-directory branch.

output with self.close():
The server visit directory has changed, stopping!

After: merged in latest centralize-collection-directory into 2023-2-amxfmx-production-dev. this includes the QApplication fix, in addition to top view fix for cwd. The latter was not checked.
output with QApplication.getInstance().quit:

The server visit directory has changed, stopping!
QPixmap::fromImage: QPixmap cannot be created without a QGuiApplication
QPixmap: Must construct a QGuiApplication before a QPixmap

The GUI application does stop so it still works.

tacaswell · 2023-06-20T16:30:35Z

QPixmap::fromImage: QPixmap cannot be created without a QGuiApplication
QPixmap: Must construct a QGuiApplication before a QPixmap

That suggests that you have a slot someplace that does not check if the application is doing down before it does some work

vshekar · 2023-06-20T17:06:07Z

That is most likely from a QThread that is getting camera images in the background to put in the UI. I can add a fix to clean up these threads before the quit is called either in this PR or a separate one

- Using already existing closeAll() method - Threads are stopped cleanly and quit

JunAishima · 2023-06-27T14:30:30Z

I'm still getting QPixmap: Must construct a QGuiApplication before a QPixmap error as the GUI is being killed. this is slightly different from before in that the first line of the previous error is no longer shown.

JunAishima requested review from mskinner5278 and vshekar June 6, 2023 14:38

JunAishima and others added 12 commits June 6, 2023 16:09

set visitDirectory config variable when starting server

978b8a2

* use this as the source of truth for both GUI and server

remove os.getcwd() and use visitDirectory config var instead

b8f6599

check that GUI is started in server visit directory

01ad293

* on startup. if not started there, show an error and exit

monitor server visit directory from GUI

ab0662f

* if it has changed, kill the GUI, and do this check in a separate thread

create a visit directory checker that runs regularly

57d0eac

* use QThread to allow ability to repeat

move GUI current and visit directory check to healthcheck

f629116

set default server (visit directory) check interval to 60 sec

61b1a0d

* make this a configurable value

shorten the visit directory change checking cycle

e78a459

* the GUI should terminate quickly after the visit directory is changed to prevent the user collecting data in an undesired place

print out a visit changed message to the terminal

0b993f0

* user is not likely to have the GUI log open, so also ensure the message is printed out to the terminal

Update healthcheck.py

56162df

Added checks for server: - Checks to if env file exists - Checks if CURRENT_VISIT_DIR has a value and is valid

Added server checks to daq_main2.py

c2724c8

Fixed check_curr_visit_dir in healthcheck.py

713237f

JunAishima force-pushed the centralize-collection-directory branch from e29e862 to 713237f Compare June 6, 2023 20:10

Checks if current visit dir exists in BASE_DATA_DIRS

9fc8f31

JunAishima commented Jun 7, 2023

View reviewed changes

utils/healthcheck.py Show resolved Hide resolved

JunAishima commented Jun 7, 2023

View reviewed changes

utils/healthcheck.py Show resolved Hide resolved

vshekar added 4 commits June 8, 2023 10:01

Added beamline tla to environment variable

884a802

Fixes to get LSDC working

216df67

Cleaner way to quit LSDC from QThread

9c5f555

Added write permission check to server

88b4ede

tacaswell reviewed Jun 15, 2023

View reviewed changes

daq_main2.py Show resolved Hide resolved

tacaswell reviewed Jun 15, 2023

View reviewed changes

top_view.py Outdated Show resolved Hide resolved

tacaswell reviewed Jun 15, 2023

View reviewed changes

gui/data_loc_info.py Outdated Show resolved Hide resolved

tacaswell reviewed Jun 15, 2023

View reviewed changes

tacaswell approved these changes Jun 15, 2023

View reviewed changes

JunAishima and others added 2 commits June 15, 2023 17:39

Update top_view.py

498a505

Co-authored-by: Thomas A Caswell <tcaswell@gmail.com>

fix typo in popen call

e1268f6

JunAishima and others added 2 commits June 15, 2023 17:58

remove misleading comment

d785be0

* the object in question is a QLabel(), which is not editable

Used QApplication.instace().quit to exit

a437f7c

Inspired by: ``` if the goal is murder the app...just murder the app -Tom Caswell ```

tacaswell approved these changes Jun 20, 2023

View reviewed changes

Stopping cam threads when quitting App

85da26a

- Using already existing closeAll() method - Threads are stopped cleanly and quit

JunAishima merged commit 2334267 into NSLS2:2023-2-amxfmx Jun 27, 2023

mrakitin mentioned this pull request Jul 10, 2023

Centralize collection directory changes #309

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Centralize collection directory#299

Centralize collection directory#299
JunAishima merged 22 commits intoNSLS2:2023-2-amxfmxfrom
JunAishima:centralize-collection-directory

JunAishima commented Jun 6, 2023

Uh oh!

Uh oh!

Uh oh!

JunAishima commented Jun 15, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tacaswell Jun 15, 2023

Uh oh!

tacaswell left a comment

Uh oh!

JunAishima commented Jun 20, 2023 •

edited

Loading

Uh oh!

tacaswell commented Jun 20, 2023

Uh oh!

vshekar commented Jun 20, 2023

Uh oh!

JunAishima commented Jun 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

JunAishima commented Jun 6, 2023

Uh oh!

Uh oh!

Uh oh!

JunAishima commented Jun 15, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tacaswell Jun 15, 2023

Choose a reason for hiding this comment

Uh oh!

tacaswell left a comment

Choose a reason for hiding this comment

Uh oh!

JunAishima commented Jun 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tacaswell commented Jun 20, 2023

Uh oh!

vshekar commented Jun 20, 2023

Uh oh!

JunAishima commented Jun 27, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

JunAishima commented Jun 20, 2023 •

edited

Loading