Server: store SessionInfo by id #1056
Merged
+154
−80
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- IDs are strings - active voice in function docstrings
monchier
reviewed
Feb 6, 2020
Collaborator
monchier
left a comment
There was a problem hiding this comment.
I started a review, but wants to spend some more time. @tconkling I am assuming you are not going to land this today. Let me know if in a hurry.
Comment on lines
+289
to
+290
| """Create a mock ReportSession. Each mocked instance will have | ||
| its own unique ID.""" |
Collaborator
There was a problem hiding this comment.
At some point we said to use plain # for descriptions of private methods.
Comment on lines
+301
to
+303
| """Mock the Server's ReportSession import. We don't want | ||
| actual sessions to be instantiated, or scripts to be run. | ||
| """ |
Collaborator
There was a problem hiding this comment.
At some point we said to use plain # for descriptions of private methods.
Contributor
Author
There was a problem hiding this comment.
Whoa, really? I strongly disagree with, and am confused by, that. For example, my IDE auto-parses docstrings to provide inline context.
What do we gain by having two different methods for documenting methods?
Collaborator
There was a problem hiding this comment.
I think """ """ are picked up by documentation tools.
I don't have a strong opinion and I won't block this PR for this. @tvst?
monchier
approved these changes
Feb 10, 2020
Comment on lines
+449
to
+452
| assert len(self._session_info_by_id) == 1 | ||
| LOGGER.debug("Reusing preheated context for ws %s", ws) | ||
| session = self._session_info_by_id[PREHEATED_REPORT_SESSION].session | ||
| del self._session_info_by_id[PREHEATED_REPORT_SESSION] |
Collaborator
There was a problem hiding this comment.
I wonder if all this could be put in a function. It seems this is a get_preheaded_report_session.
Comment on lines
+461
to
+464
| assert session.id not in self._session_info_by_id, ( | ||
| "session.id '%s' registered multiple times!" % session.id | ||
| ) | ||
| self._session_info_by_id[session.id] = SessionInfo(ws, session) |
Collaborator
There was a problem hiding this comment.
Same here. Could this be get_session_info? So that we wrap the check in it/
Comment on lines
+484
to
+485
| session_info = self._session_info_by_id[session_id] | ||
| del self._session_info_by_id[session_id] |
Collaborator
There was a problem hiding this comment.
Another function? BTW, fine if you think this is just a couple of extra lines and it is more readable.
* develop: (30 commits) [Screencast] Fixing countdown bug (streamlit#1082) Release 0.56.0 (streamlit#1101) Fix bug where icon assets were missing from "make install" (streamlit#1100) Clean signatures of wrapped DeltaGenerator methods (streamlit#1099) Using widgetId as the key when rendering elements (streamlit#1102) Pass --skip-lock to pipenv under pipenv-install Makefile target. (streamlit#1093) Allow wider range of int-like types in NumberInput (streamlit#1087) Fix missing caching URL (streamlit#1094) Version 0.55.1 (just pointing to new docs) (streamlit#1089) Retire python-3.7.4 CircleCI project. (streamlit#1086) Handle different Caching error messages (streamlit#1068) Fix an incomplete copy for a dict that's then modified. (streamlit#1078) Fix indentation error in fad994c. (streamlit#1084) Widgets unit tests (streamlit#1077) [mypy] First phase of work on testing Python type annotations. (streamlit#1079) Add CircleCI jobs to run the oldest and newest Python versions we support. (streamlit#1053) Improve docs (streamlit#1075) Adding CORS to troubleshooting guide. (streamlit#1001) Fix for the CORS check (streamlit#965) Advanced caching updates feb (streamlit#1040) ...
tconkling
added a commit
to tconkling/streamlit
that referenced
this pull request
Feb 19, 2020
# By Nahuel Emiliano Rosso Fandiño (1) and others # Via GitHub * develop: Show warning to user and use skipkeys=True if json.dumps causes TypeError (streamlit#1112) Server: store SessionInfo by id (streamlit#1056) [Screencast] Fixing countdown bug (streamlit#1082) # Conflicts: # lib/streamlit/server/Server.py
tconkling
added a commit
to tconkling/streamlit
that referenced
this pull request
Feb 24, 2020
* develop: (53 commits) Update plotly.js to 1.52 (streamlit#1119) Add tooltip in Altair/Vega-lite docstring code (streamlit#1092) Ability to bind to a server address with server.address config option (streamlit#1107) [mypy] Enable check_untyped_defs throughout the codebase. (streamlit#1110) st.map: set "radiusMinPixels" to 3 (streamlit#1113) st.plotly_chart docs incorrectly refer to Altair (streamlit#1118) Fix BytesIO and numpy array data sources for audio/video (streamlit#1116) Show warning to user and use skipkeys=True if json.dumps causes TypeError (streamlit#1112) Server: store SessionInfo by id (streamlit#1056) [Screencast] Fixing countdown bug (streamlit#1082) Release 0.56.0 (streamlit#1101) Fix bug where icon assets were missing from "make install" (streamlit#1100) Clean signatures of wrapped DeltaGenerator methods (streamlit#1099) Using widgetId as the key when rendering elements (streamlit#1102) Pass --skip-lock to pipenv under pipenv-install Makefile target. (streamlit#1093) Allow wider range of int-like types in NumberInput (streamlit#1087) Fix missing caching URL (streamlit#1094) Version 0.55.1 (just pointing to new docs) (streamlit#1089) Retire python-3.7.4 CircleCI project. (streamlit#1086) Handle different Caching error messages (streamlit#1068) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a prelude commit to incoming FileUploader-related changes.
Motivation
Each
ReportSessionhas a unique ID, but the server doesn't currently have a good way to retrieve aReportSessionby its ID. Instead, the Server currently maintains a dictionary that maps WebsocketHandlers -> ReportSessions.This patch essentially just changes that dictionary to be a mapping of SessionID -> ReportSession, which will enable other HTTP endpoints to refer to running
ReportSessions by ID. The upcoming FileUploader HTTP endpoint will use this to add an uploaded file to its associated ReportSession.Details
ReportSession.idis now a str instead of an int. (This isn't strictly necessary, but it simplifies some things, and also allows us to easily make report session ID unguessable in the future - if this is a concern - by using a UUID.)Server._session_infosis nowServer._session_info_by_id, and stores a mapping of string ID toSessionInfo.SessionInfonow holds its associated WebsocketHandler in addition to the ReportSession.