🛂 Support the new config for auto versus pre-generated tokens #918
Conversation
This file contains 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
We should check whether a single string is in the data, not a list.
Testing done:
- without this change, running the intake pipeline on a test user generates the error
```
Error while creating composite objects, timestamp is unchanged
Traceback (most recent call last):
File "/Users/kshankar/e-mission/gis_branch_tests/emission/analysis/plotting/composite_trip_creation.py", line 139, in create_composite_objects
last_done_ts = create_composite_trip(ts, t)
File "/Users/kshankar/e-mission/gis_branch_tests/emission/analysis/plotting/composite_trip_creation.py", line 36, in create_composite_trip
elif "additions" in ct["data"] and ["trip_addition"] in ct["data"]:
TypeError: unhashable type: 'list'
```
The user does not show any trips in the label screen.
- with this change, the intake pipeline runs correctly without errors
The user trips are visible in the label screen
This fixes: e-mission/e-mission-docs#903 (comment)
Verified that these are in fact intermediate style trips:
e-mission/e-mission-docs#903 (comment)
e-mission/e-mission-docs#903 (comment)
…ation_intermediate_format 🚑 use string while check for field in "data"
If the `opcode` field is present in the config, use it to determine whether the
tokens should be auto-generated or pre-generated.
If it is not, fall back to the old study vs program check.
We should remove the backwards compat code after all old-style configs have been removed
Testing done:
- Added new test with new style config
- Added new test for old style config that returns token list
- All tests pass
```
$ ./e-mission-py.bash emission/tests/netTests/TestWebServer.py
storage not configured, falling back to sample, default configuration
URL not formatted, defaulting to "Stage_database"
Connecting to database URL localhost
analysis.debug.conf.json not configured, falling back to sample, default configuration
ERROR:root:habitica not configured, game functions not supported
Traceback (most recent call last):
File "/Users/kshankar/e-mission/gis_branch_tests/emission/net/ext_service/habitica/proxy.py", line 22, in <module>
key_file = open('conf/net/ext_service/habitica.json')
FileNotFoundError: [Errno 2] No such file or directory: 'conf/net/ext_service/habitica.json'
Finished configuring logging for <RootLogger root (WARNING)>
Finished configuring logging for <RootLogger root (WARNING)>
.Finished configuring logging for <RootLogger root (WARNING)>
.Finished configuring logging for <RootLogger root (WARNING)>
.
----------------------------------------------------------------------
Ran 3 tests in 0.735s
OK
```
|
Related join webapp: e-mission/nrel-openpath-join-page#13 This should be the final piece for fixing e-mission/e-mission-docs#850 (comment) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
If the
opcodefield is present in the config, use it to determine whether the tokens should be auto-generated or pre-generated.If it is not, fall back to the old study vs program check. We should remove the backwards compat code after all old-style configs have been removed
Testing done: