Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ECS-5104 Hutch-python feature: auto-close after timeout #385

Merged
merged 53 commits into from
Jul 11, 2024
Merged

ECS-5104 Hutch-python feature: auto-close after timeout #385

merged 53 commits into from
Jul 11, 2024

Commits on Jun 22, 2024

  1. Added new ipython_session_timer.py file to automatically time out idl… 

    …e sessions.
    @janeliu-slac
    janeliu-slac committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    9e03ced View commit details
    Browse the repository at this point in the history

  2. Updated ipy_config.InteractiveShellApp.extensions to include 'hutch_p… 

    …ython.ipython_session_timer'.
    @janeliu-slac
    janeliu-slac committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    e6197eb View commit details
    Browse the repository at this point in the history

  3. Removed test values and replaced with actual values for maximum user … 

    …idle time.
    @janeliu-slac
    janeliu-slac committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    a2eac2d View commit details
    Browse the repository at this point in the history

  4. Removed some other test data.

    @janeliu-slac
    janeliu-slac committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    ace5003 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. Updated to set the maximum session duration to the session_duration v… 

    …ariable in each hutch's conf.yml file.
    @janeliu-slac
    janeliu-slac committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    9c1d3d3 View commit details
    Browse the repository at this point in the history

  2. Added logic for new yaml value 'session_timer'.

    @janeliu-slac
    janeliu-slac committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    7ede978 View commit details
    Browse the repository at this point in the history

  3. Added missing 'global max_idle_time' statement in def configure_timeo… 

    …ut().
    @janeliu-slac
    janeliu-slac committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    4455848 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. Updated with a simpler way to set or cancel session timer.

    @janeliu-slac
    janeliu-slac committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    7e9d351 View commit details
    Browse the repository at this point in the history

  2. Removed test code.

    @janeliu-slac
    janeliu-slac committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    28920dd View commit details
    Browse the repository at this point in the history

  3. Fixed synatx to be more pythonic.

    @janeliu-slac
    janeliu-slac committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    1809287 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Tried a new approach. Timer should be working now.

    @janeliu-slac
    janeliu-slac committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    06ad824 View commit details
    Browse the repository at this point in the history

  2. Removed test values.

    @janeliu-slac
    janeliu-slac committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    0edcbba View commit details
    Browse the repository at this point in the history

  3. Changed time.time to time.monotonic. Updated documentation. Changed l… 

    …ogic to check if user is currently active once every 60 seconds.
    @janeliu-slac
    janeliu-slac committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    e4b1fd7 View commit details
    Browse the repository at this point in the history

  4. Added 'session_timer' to VALID_KEYS to prevent warnings on startup.

    @janeliu-slac
    janeliu-slac committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    a0f611f View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Removed previous release note (named incorrectly) and added new relea… 

    …se note for Jira ticket ECS-5104_Hutch-python_feature:_auto-close_after_timeout.
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    b2c187b View commit details
    Browse the repository at this point in the history

  2. Updated hardcoded time values to floating point numbers for consisten… 

    …cy (time.monotonic() is in floating point).
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    548b8ef View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into ECS-5104_ipython_session_timer

    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    d0bfee1 View commit details
    Browse the repository at this point in the history

  4. Added new ipython_session_timer.py file to automatically time out idl… 

    …e sessions.
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    d1d121d View commit details
    Browse the repository at this point in the history

  5. Updated ipy_config.InteractiveShellApp.extensions to include 'hutch_p… 

    …ython.ipython_session_timer'.
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    fdf997a View commit details
    Browse the repository at this point in the history

  6. Removed test values and replaced with actual values for maximum user … 

    …idle time.
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    4010d8f View commit details
    Browse the repository at this point in the history

  7. Removed some other test data.

    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    302d05e View commit details
    Browse the repository at this point in the history

  8. Updated to set the maximum session duration to the session_duration v… 

    …ariable in each hutch's conf.yml file.
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f229b9c View commit details
    Browse the repository at this point in the history

  9. Added logic for new yaml value 'session_timer'.

    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    53acfab View commit details
    Browse the repository at this point in the history

  10. Added missing 'global max_idle_time' statement in def configure_timeo… 

    …ut().
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    64b644f View commit details
    Browse the repository at this point in the history

  11. Updated with a simpler way to set or cancel session timer.

    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    73b1e36 View commit details
    Browse the repository at this point in the history

  12. Removed test code.

    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    cc1da97 View commit details
    Browse the repository at this point in the history

  13. Fixed synatx to be more pythonic.

    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    6396513 View commit details
    Browse the repository at this point in the history

  14. Tried a new approach. Timer should be working now.

    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    78b7c58 View commit details
    Browse the repository at this point in the history

  15. Removed test values.

    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    6ca5371 View commit details
    Browse the repository at this point in the history

  16. Changed time.time to time.monotonic. Updated documentation. Changed l… 

    …ogic to check if user is currently active once every 60 seconds.
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    89ce8ab View commit details
    Browse the repository at this point in the history

  17. Added 'session_timer' to VALID_KEYS to prevent warnings on startup.

    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    21ae070 View commit details
    Browse the repository at this point in the history

  18. Removed previous release note (named incorrectly) and added new relea… 

    …se note for Jira ticket ECS-5104_Hutch-python_feature:_auto-close_after_timeout.
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5e6fb81 View commit details
    Browse the repository at this point in the history

  19. Updated hardcoded time values to floating point numbers for consisten… 

    …cy (time.monotonic() is in floating point).
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    1d8a5f3 View commit details
    Browse the repository at this point in the history

  20. In the release notes removed comments in API Changes. Nothing in this… 

    … new feature breaks API.
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    a083e29 View commit details
    Browse the repository at this point in the history

  21. Merge remote-tracking branch 'origin/ECS-5104_ipython_session_timer' … 

    …into ECS-5104_ipython_session_timer
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    78c8aa4 View commit details
    Browse the repository at this point in the history

  22. Renamed 385-ECS-5104_Hutch-python_feature:_auto-close_after_timeout.r… 

    …st to remove the colon.
    @janeliu-slac
    janeliu-slac committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    323fe52 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Replaced get_ipython() with the 'ipython' parameter passed in to IPyt… 

    …honSessionTimer's init function.
    @janeliu-slac
    janeliu-slac committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    647b1b8 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Removed self._timer() function and replaced it with simple time.sleep… 

    …() everywhere.
    @janeliu-slac
    janeliu-slac committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    3a43139 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. Added unit tests for ipython_session_timer.py.

    @janeliu-slac
    janeliu-slac committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ae7ccaa View commit details
    Browse the repository at this point in the history

  2. Removed unused import 'from IPython import get_ipython'.

    @janeliu-slac
    janeliu-slac committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    673df98 View commit details
    Browse the repository at this point in the history

  3. Updated comments for clarity.

    @janeliu-slac
    janeliu-slac committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    186d86e View commit details
    Browse the repository at this point in the history

  4. Updated comments for clarity.

    @janeliu-slac
    janeliu-slac committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    67be8ec View commit details
    Browse the repository at this point in the history

  5. Updated comments for clarity.

    @janeliu-slac
    janeliu-slac committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    5ee0778 View commit details
    Browse the repository at this point in the history

  6. Fixed a bunch of items from PR comments.

    @janeliu-slac
    janeliu-slac committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    cac9e36 View commit details
    Browse the repository at this point in the history

  7. Fixed issues from PR comments.

    @janeliu-slac
    janeliu-slac committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    8ad5a8f View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Added the 'while(self.user_active)' statement back.

    @janeliu-slac
    janeliu-slac committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    ca8e9b2 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Updated unit test for _start_session() function.

    @janeliu-slac
    janeliu-slac committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    70d75aa View commit details
    Browse the repository at this point in the history

  2. Updated class FakeIpython to handle ask_exit and pt_app.app.exit func… 

    …tions.
    @janeliu-slac
    janeliu-slac committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    d876afa View commit details
    Browse the repository at this point in the history

  3. Updated name of test_start_session function.

    @janeliu-slac
    janeliu-slac committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    c764479 View commit details
    Browse the repository at this point in the history

  4. Replace previous changes with unittest.mock.MagicMock.

    @janeliu-slac
    janeliu-slac committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    c6d118f View commit details
    Browse the repository at this point in the history

  5. Added asserts to check session_timer.ip.ask_exit and session_timer.ip… 

    ….pt_app.app.exit are called.
    @janeliu-slac
    janeliu-slac committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8a09d3c View commit details
    Browse the repository at this point in the history

  6. Fixed a few items.

    @janeliu-slac
    janeliu-slac committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    70252f8 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into ECS-5104_ipython_session_timer

    @janeliu-slac
    janeliu-slac committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    ebfa8c7 View commit details
    Browse the repository at this point in the history