Commit Graph

759 Commits

Author SHA1 Message Date
Andrew Maguire 25667956e2 Merge branch 'LAION-AI:main' into devcontainer-improvements 2023-01-03 21:17:34 +00:00
AbdBarho 7ff6a55c45 Merge pull request #256 from LAION-AI/46-privacy-and-terms
Adding a bare bones unstyled terms of service and privacy policy
2023-01-03 22:07:32 +01:00
Andrew Maguire da776c47e4 link to folder 2023-01-03 21:00:06 +00:00
Andrew Maguire 6160bccf01 Merge branch 'devcontainer-improvements' of https://github.com/andrewm4894/Open-Assistant into devcontainer-improvements 2023-01-03 20:59:25 +00:00
Andrew Maguire e608a2c59b typo 2023-01-03 20:59:22 +00:00
Andrew Maguire f440d1924d Merge branch 'LAION-AI:main' into devcontainer-improvements 2023-01-03 20:57:42 +00:00
Andrew Maguire f43c8718ba add devcontainer note to main readme 2023-01-03 20:56:35 +00:00
Yannic Kilcher e14c670cb0 Merge pull request #239 from markcheeky/patch-1
Create docs/supervised_datasets.md, suggested by yk in issue 186
2023-01-03 21:35:05 +01:00
Marek Kadlcik c7ff4c6a97 fix formatting on docs/supervised_data again to make linter happy again because the formatting rules changed in between 2023-01-03 21:25:54 +01:00
Marek Kadlcik 43d82dfaf5 Merge branch 'patch-1' of github.com:markcheeky/Open-Assistant into patch-1 2023-01-03 21:23:11 +01:00
Marek Kadlcik 35cc68d7f7 fix formatting to make linter happy 2023-01-03 21:22:54 +01:00
Andrew Maguire 5d8f081a7f readme 2023-01-03 19:56:50 +00:00
markcheeky f10e10e842 Merge branch 'LAION-AI:main' into patch-1 2023-01-03 20:44:41 +01:00
Andrew Maguire 79196b066b Merge branch 'LAION-AI:main' into devcontainer-improvements 2023-01-03 18:54:10 +00:00
AbdBarho 1970b43a57 Merge pull request #329 from othrayte/website-implement-create-initial-prompt
Website implement create initial prompt
2023-01-03 18:42:45 +01:00
Andrew Maguire 767be0830a reduce image size in readme 2023-01-03 16:24:51 +00:00
Andrew Maguire 3de5f1ac29 precommit 2023-01-03 16:18:23 +00:00
Andrew Maguire cbc17683d9 add to readme 2023-01-03 16:13:25 +00:00
Andrew Maguire 204b9030c9 add readme 2023-01-03 15:52:48 +00:00
Andrew Maguire e176a5292c add command to ensure pre-commit is installed 2023-01-03 15:43:09 +00:00
Andrew Maguire 671e33460d fix script path 2023-01-03 15:39:36 +00:00
Andrew Maguire 0bdfdcd8f5 remove shebang 2023-01-03 15:19:10 +00:00
Andrew Maguire 39d5e67421 clean up 2023-01-03 15:10:43 +00:00
Andrew Maguire 446b69ad60 dev 2023-01-03 15:04:16 +00:00
Yannic Kilcher c14f86e6eb Merge pull request #304 from janosh/pre-commit-jupyter-black
pre-commit hook black->black-jupyter
2023-01-03 15:57:58 +01:00
Andrew Maguire e498d3c579 more generic 2023-01-03 14:43:36 +00:00
Janosh Riebesell d717c48a92 black-jupyter again after merge-conflict fix 2023-01-03 06:43:31 -08:00
Janosh Riebesell 731477e2e3 Merge branch 'main' into pre-commit-jupyter-black 2023-01-03 06:42:40 -08:00
Janosh Riebesell 3740e38342 pre-commit unexclude notebooks and pre-commit run --all-files 2023-01-03 06:40:42 -08:00
Adrian Cowan 81e354dec5 website: Implement page for creating initial prompts 2023-01-04 00:13:15 +11:00
Adrian Cowan 413e211761 website: Fix broken e2e tests 2023-01-04 00:13:15 +11:00
Alex Ott e7515fd08e Feat/better messages (#318)
* improve messages and UX

* move log statement

Co-authored-by: Andreas Köpf <andreas.koepf@provisio.com>
2023-01-03 13:13:44 +01:00
Yannic Kilcher b26d62761e Merge pull request #323 from Klotske/fix-color-toggle
#320 - fixed color toggle being missing on light mode
2023-01-03 11:54:54 +01:00
Alex Ott 29ffc276f3 Allow user to start work from DMs. (#267)
* merge upstream/main

* update permissions check for guild settings

* add error handler for the bot

* allow users to start work from DMs and broadcast task completion messages to all log channels

* remove print statement
2023-01-03 10:31:33 +00:00
Klotske 20b313ddcf Fixed toggle icon being missing on light theme 2023-01-03 13:11:11 +03:00
Keith Stevens e835e4424b Merge pull request #321 from LAION-AI/257-backend-on-aws
257 backend on aws
2023-01-03 19:05:49 +09:00
Keith Stevens 22cf775486 Undoing a docker compose change 2023-01-03 19:03:41 +09:00
Keith Stevens da3c5899e4 Deleting the copilot addons now that we're using a pure RDS postgres database 2023-01-03 19:02:11 +09:00
Keith Stevens 51f572d928 Fixing some debug changes 2023-01-03 18:50:00 +09:00
Yannic Kilcher 9ae593fb61 Merge pull request #306 from LAION-AI/156-resolve-merge-issues
Fixing merge issues with website and backend
2023-01-03 10:25:57 +01:00
Yannic Kilcher 1ae880ddab Merge pull request #316 from Jac-Zac/main
Fix table in detoxify eval readme
2023-01-03 10:24:33 +01:00
Yannic Kilcher d7583efff1 Merge pull request #278 from chandru1003/main
added clear list for more understanding of result
2023-01-03 10:12:06 +01:00
Jacopo Zacchigna 5841e53756 Merge branch 'LAION-AI:main' into main 2023-01-03 09:00:26 +01:00
Yannic Kilcher 9dd6c748b8 Merge pull request #300 from jack-michaud/jm/oasst-api-client-handle-error
feat: handle OasstError in OasstApiClient
2023-01-03 08:55:26 +01:00
Jac-Zac 556c4f2d91 Fix table in detoxify eval readme 2023-01-03 08:48:18 +01:00
Yannic Kilcher 50e01cd76b Merge pull request #302 from croumegous/minor-doc-discord
minor: add documentation on discord env variable to set up and fix shell script to run discord bot
2023-01-03 08:45:24 +01:00
Yannic Kilcher 16fb6881fa changed code owners 2023-01-03 08:43:12 +01:00
Yannic Kilcher d0b8d5e169 Merge branch 'main' of github.com:LAION-AI/Open-Chat-GPT 2023-01-03 08:40:10 +01:00
Yannic Kilcher 1924e93d1f added section to schemas 2023-01-03 08:40:04 +01:00
Yannic Kilcher cc57158516 Merge pull request #301 from sanagno/main
SFT training
2023-01-03 08:39:32 +01:00