Update main branch for Release 1.0.0 #892
Closed
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
* Logging time taken for all three LLM calls * Formatting
When waiting for a reply
* Changed phases to levels * Missed a couple
* new model component * requests to configure model * Add sliders * configure model from the front end * update config on refresh * add info messages to model tuning * only use default model in levels * clean logs * add log
* change token counting method * fix log
* reset numLevelsCompleted = 0 * change project name to spy logic
* change token counting method * fix log * move system role defs from env into prompt templates * request to get level prompt * reset numLevelsCompleted = 0 * show system prompt in the level completion message * remove log
* Example overlay * Can click off overlay to return to the app * Displaying welcome screen to new users * Note on hack * Fixed build issues * Can skip welcome overlay using env var * Better formatting and some example content
added main and header
* Example overlay * Can click off overlay to return to the app * Displaying welcome screen to new users * Note on hack * Fixed build issues * Handbook icon in header * Can skip welcome overlay using env var * Better formatting and some example content * The icon opens the handbook * Attacks in overlay * Removed attacks from the control panel
* reset numLevelsCompleted = 0 * configurable xml tagging pre prompt * fix log * fix configuration defence
* Grouped defences * Better html grouping * Removed strategy box * Visually clearer grouping * Rounded corners on control section * Using some rather than find * Using details html elements For the collapsible sections in the control panel * Better html DRY principles
* add env.example to front end * configures env vars with types * backend service imports URL from env file * update readme to include setup for front end environment file * rearrange the readme slightly * add whitespace at end of .env.example * corrects error message to proper env variable name * adds method which makes and validates the url * returns new url directly rather than setting variable first
* Grouped defences * Better html grouping * Removed strategy box * Visually clearer grouping * Rounded corners on control section * Added the package * Fixed issues in ModelConfigurationSlider * Fixed issues in MainHeader * Fixed issues in DocumentViewBox * Removed autofocus for accessibility considerations * Fixed issues in ApiKeyBox * Using some rather than find * Using details html elements For the collapsible sections in the control panel * Better html DRY principles * Fixed issues in DefenceMechanism * Accessible overlay * No longer disabling eslint rule for file * Using border rather than outline for button hover * Allowing autofocus for chat input * Better overlay close buttons * Aria labels for overlay close buttons * Using class names for styling in handbook overlay * Handbook icon class name * 322 wrap handbook image in a button and give aria label (#341) * aria-labels for handbook and info buttons * Better label for defence toggle checkbox
#359) * hide random sequence seq enclosure defence as it conflicts with xml tagging * remove inactive defence configs from env and readme * add issue number to commented out code
Makes focus indicators consistent, and adds them back in where they were disabled. --------- Co-authored-by: Chris Wilton-Magras <[email protected]>
This work unifies the overlay for the three main popups: welcome message, mission info, handbook.
) --------- Co-authored-by: Chris Wilton-Magras <[email protected]>
Plus additional button styling tweaks and fixes --------- Co-authored-by: Chris Wilton-Magras <[email protected]>
* defences undefined for levels 1 and 2 * fixes tests * propoerly undefines defences on level 1 and 2 * moves variable declarations to destructureing * missed one * undo error swallow * remove bad type guards * improve validation for configureDefence * last bit of validation * update tests for handleConfigureDefence * new folder for defence controller unit tests and wrote first handleDefencecActivation test * adds test for defence activation * adds tests for defence deactivation * moves tests all back into one file again * adds tests for handleResetSingleDefence * improve validation on handleGetDefenceStatus * removes extraneous stuff from test objects * adds tests to make sure defences aren't chngeable for level 1 * add loop to test levels 1 and 2 with same code * adds remaining tests for defence controller integration * handleResetSingleDefence takes level parameter now * adds level to frontend call to reset defence config item. Types all the prop drillings properly * some renamings and fill in gaps in tests * adds another missing test * tweaks * fix test suite * replace defence search with defences.some and replace cuurrentDefences === undefined check with not currentDefences * change defenceId for generic falsy check * improve guards for level and config * improve guards for level and config * correct test for configuring a config item * updates error message when not allowed to activate or modify defences * rescturecure defence controller integration tests * change other tests to use test.each rather than foreach * uses isValidLevel * improve validateFilterConfig * just pass qa defence rather than all defences * fix tests * uses type intersection to define QaLlmDefence * only gedDefencesFrDTOs if it is defined
…ller (#858) * return chatModel in level and start controllers * removes getModel endpoint * frontend start and leveServices now get the chatModel from the response * save chatModel in MainComponent * chatModel is drilled down to the components that need it * now sets the chatModelId so that the message updates * change a null to an undefined for brevity * remove old comment * remove getModel method from chatService * changes chatModel in LevelGetRequest to be optional * conditionally render the chat model selection * move default configs out of function * wraps comment line * improve config update method
* don't rerender mainCOmponent on reset progress * moves reset progress and overlay code into MainComponent * resetController now returns the relevant stuff for the reset level * removes superfluous mock from levelController * fixes levelController test * fixes startController test * reset progress also resets chatModel * completes resetController tests * frontend process the reset response data * remove unnecessary processing for resetting on level 2 or 3 * move setNewUser tond of method * reorder the method agai * rename to resetAllProgress
* conditionally renders an error message when no docMetas * adds test for error mssage
* change error message * fixes test
--------- Co-authored-by: dhinrichs-scottlogic <[email protected]> Co-authored-by: Peter Marsh <[email protected]>
* Docker and backend changes to support prod-lite mode * Bump app version to 1.0.0 across all package files
|
I am going to abandon this in favour of reworking main branch so that it exactly mirrors commits on dev. This would not normally be done, however we don't have any tags on main nor any other branches based on main, so it's safe. I will need to temporarily remove branch protections on main, remove the two squashed commits, then open a PR to merge dev back into main without squashing. It seems that in order to preserve committer history, we need to use GitHub's default "merge without fast-forward" strategy which will add a merge commit, but this is ok as it will be empty, thus not cause any merge conflicts on future merges back into main. |
3 tasks
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.
Description
Time to cut release 1.0.0 - this means bringing main up to date with dev. On the source branch I have cherry-picked all the commits since last merge; this is unfortunately necessary as the previous merges to main were accidentally squashed.
In theory, we could correct this for future releases by
If we don't do it now, before creating the tag, we'll never do it 😓
Resolves #890
Notes
Checklist
Have you done the following?