Commit Graph

1199 Commits

Author SHA1 Message Date
Keith Stevens e1dd677677 Merging with main 2023-01-11 08:47:16 +09:00
Keith Stevens c794c2d83a Merge pull request #598 from othrayte/unified-task-controls
website: Unify task controls
2023-01-11 08:35:35 +09:00
Yannic Kilcher c57becc0d8 Merge pull request #604 from olliestanley/backend-python-version-note
Add note on Python version to backend README.md
2023-01-10 21:11:42 +01:00
Oliver Stanley 8b44183843 Add note on Python version to backend README.md 2023-01-10 20:05:30 +00:00
AbdBarho 8ce84ecef8 Merge pull request #590 from LAION-AI/589-reject-banned-users
Ensure all the API routes reject banned users
2023-01-10 18:40:28 +01:00
Oliver Stanley e5abb2dc85 536: Add endpoint to resolve frontend user by auth method and username (#539)
* Add endpoint to resolve frontend user by auth method and username

* Require client ID for frontend user lookup

* Remove unnecessary if check

* Fix PromptRepository -> UserRepository

* Convert to protocol User

* Move User prep

* Address review comments

* 404 -> HTTP_404_NOT_FOUND
2023-01-10 18:20:56 +01:00
Adrian Cowan 805bc33ba4 website: Unify task controls
Also happens to fix some issues with the no-changes are-you-sure dialog only appearing once and other form values not being reset correctly.
2023-01-11 02:59:10 +11:00
Yannic Kilcher 1318c213d3 Merge pull request #596 from andrewm4894/gitignore-venv
Gitignore `venv`
2023-01-10 16:39:47 +01:00
Andrew Maguire 35ebefb647 add venv to .gitignore 2023-01-10 14:59:50 +00:00
Andrew Maguire 4215846ff2 Merge branch 'LAION-AI:main' into main 2023-01-10 13:08:22 +00:00
Keith Stevens 747c3501d1 Adding a new web api path that returns valid labels and then fetching from that within FlaggableElement. This allows FlaggableElement to fetch all its own data and remove the need to pipe labels through a series of components 2023-01-10 20:57:42 +09:00
Keith Stevens d4e8759a68 Merge pull request #591 from othrayte/refactor-task-pages
website: Refactor remaining task pages to use Task.tsx
2023-01-10 20:04:58 +09:00
Yannic Kilcher 94785578c7 Merge branch 'main' of github.com:LAION-AI/Open-Chat-GPT 2023-01-10 12:04:14 +01:00
Yannic Kilcher a1fd2cc638 added to readme 2023-01-10 12:04:10 +01:00
Adrian Cowan 15e1203be9 website: Refactor remaining task pages to use Task.tsx 2023-01-10 21:44:22 +11:00
Keith Stevens d94cb4b2d6 Ensure all the API routes reject banned users 2023-01-10 19:16:13 +09:00
AbdBarho 0968d8add6 Merge pull request #588 from LAION-AI/fix-messages-view
A simpler fix to ensuring the messages view can render
2023-01-10 11:07:18 +01:00
Keith Stevens 80268136b0 A simpler fix to ensuring the messages view can render 2023-01-10 17:52:48 +09:00
Keith Stevens 600f7f7381 Merge pull request #583 from LAION-AI/web-tidy-sweep
Web tidy sweep
2023-01-10 16:38:44 +09:00
Keith Stevens 9e14de2570 Moving the ValidLabel type 2023-01-10 16:30:44 +09:00
Keith Stevens 2c34b09f85 Merge branch 'main' into web-tidy-sweep 2023-01-10 16:25:43 +09:00
Keith Stevens 062bfdba3a Revert "Centralize task types"
This reverts commit 97c1f12e11.
2023-01-10 16:24:35 +09:00
Keith Stevens 555113a6f2 Revert "changed pre-commit event type"
This reverts commit 5b275ed804.
2023-01-10 16:24:25 +09:00
Keith Stevens 81cb88615b Revert "rebasing with main"
This reverts commit 2c0463f6f8.
2023-01-10 16:24:15 +09:00
Keith Stevens fe4e949f2f Revert "rebasing"
This reverts commit c4d5ed990b.
2023-01-10 16:23:56 +09:00
Keith Stevens c4d5ed990b rebasing 2023-01-10 16:22:23 +09:00
Keith Stevens 2c0463f6f8 rebasing with main 2023-01-10 16:21:44 +09:00
Yannic Kilcher 5b275ed804 changed pre-commit event type 2023-01-10 16:20:50 +09:00
AbdBarho 97c1f12e11 Centralize task types 2023-01-10 16:20:48 +09:00
Yannic Kilcher 79f84697cc changed pre-commit event type 2023-01-10 07:46:53 +01:00
AbdBarho a6a1b86dba Merge pull request #575 from LAION-AI/website-types
Centralize task types
2023-01-10 07:01:23 +01:00
Keith Stevens aa22ed0d1c Remove debug log 2023-01-10 14:52:55 +09:00
AbdBarho 54a042d002 Centralize task types 2023-01-10 06:51:59 +01:00
Keith Stevens 48e9c7d09c Ensure FlaggableElement has an empty list of labels in the messages views 2023-01-10 14:16:19 +09:00
Keith Stevens 54cc88bb1f Ensure FlaggableElement always has the set of labels 2023-01-10 14:08:43 +09:00
Keith Stevens f2c235476e Deleting the auto-ack on task fetching in favor of auto-acking on answer submission. Fixes broken e2e tests 2023-01-10 13:24:56 +09:00
Keith Stevens f028c07dfb Fixing the typing for the MessageView forwardRef 2023-01-10 13:10:31 +09:00
Keith Stevens 34a1715923 Cleaning up a suite of eslint warnings 2023-01-10 13:02:17 +09:00
Keith Stevens 2e2efdec65 Fixing a small remaining issues, reporting labels, rejecting tasks, and redirecting users on landing page 2023-01-10 12:51:56 +09:00
Yannic Kilcher 942dc42d03 Merge pull request #439 from othrayte/ci-e2e-basic
Automate e2e test of the website (basic)
2023-01-10 00:23:20 +01:00
Keith Stevens db8bdbe3de Merge pull request #572 from melvinebenezer/493_text_labels_api
#493 Use API to populate text_labels in frontend
2023-01-10 08:08:47 +09:00
Andrew Maguire defd453639 replace andrewm4894 with LAION-AI now that example notebook is merged (#573) 2023-01-09 23:59:00 +01:00
Yannic Kilcher 156e1bca7d it was a bad fix 2023-01-09 21:25:04 +01:00
Yannic Kilcher abbafe5a4a Merge branch 'main' of github.com:LAION-AI/Open-Chat-GPT 2023-01-09 21:23:45 +01:00
Yannic Kilcher c33c9887dd improved pull request workflow 2023-01-09 21:23:39 +01:00
Yannic Kilcher ba12c35e22 Merge pull request #540 from jojopirker/messageEmbeddings
Store Message embedding
2023-01-09 21:22:56 +01:00
Andrew Maguire 3720104dcd Merge remote-tracking branch 'upstream/main' 2023-01-09 17:16:31 +00:00
James Melvin 420b3739eb fix: retrieval of valid_labels from API to populate the TEXT_LABEL_FLAGS in FlaggableElements.tsx 2023-01-09 22:31:44 +05:30
Yannic Kilcher 66891dd690 added paths to pull_request for deploy docs 2023-01-09 15:22:43 +01:00
Andrew Maguire a206a9a9ab add example notebook (#512)
adds an example notebook and some docs
2023-01-09 14:11:35 +00:00