Commit Graph

418 Commits

Author SHA1 Message Date
Alex Ott 6cccd74e34 switch to loguru 2022-12-30 05:28:51 -08:00
Alex Ott 708011e6a0 move EXAMPLEs.md 2022-12-30 05:14:16 -08:00
Alex Ott 47d449e19b Merge branch 'upstream' 2022-12-30 05:12:43 -08:00
Alex Ott 36c429d2c5 Merge branch 'main' of https://github.com/LAION-AI/Open-Assistant into upstream 2022-12-30 05:12:25 -08:00
Alex Ott 84d52effee remove address todo comments 2022-12-30 05:11:36 -08:00
Yannic Kilcher f6bdce4da0 going back to npm install for lint 2022-12-30 14:10:25 +01:00
Yannic Kilcher 7bcf0be8a2 using double quotes in pre-commit bash for windows 2022-12-30 14:09:22 +01:00
Alex Ott b81eeebe9e switch to using pre-commit 2022-12-30 04:35:45 -08:00
Alex Ott 65c078fb9f pre-commit changes 2022-12-30 04:12:54 -08:00
Yannic Kilcher 228d304d8c Merge pull request #172 from kiritowu/improve-collaboration-docs
Improved collaboration docs
2022-12-30 12:48:33 +01:00
Alex Ott 98955441d1 explain text_label logic 2022-12-30 03:21:21 -08:00
Alex Ott d71ded1364 send the task completion message in the guild's configured channel 2022-12-30 03:15:22 -08:00
Alex Ott e4b097edff add database schema and guild setting 2022-12-30 02:59:52 -08:00
Alex Ott 63e2120825 add completion message to task and add message labeling 2022-12-30 02:02:46 -08:00
AbdBarho 2299f87022 Merge pull request #169 from LAION-AI/fix-discord-auth
Fixing discord signin
2022-12-30 08:26:56 +01:00
kiritowu fd33a8b6c7 Ensure consistency for the use of full stop in README/Submitting Work 2022-12-30 12:08:31 +08:00
kiritowu 99bfa02eba Break instructions to multiple lines for improved readibility 2022-12-30 12:05:55 +08:00
kiritowu c4e2e75404 Update README to include github collaboration guide 2022-12-30 11:57:30 +08:00
Keith Stevens 97c7541fea Also fixing the .env for local development to be inline with the docker compose setup 2022-12-30 10:24:51 +09:00
Keith Stevens 7c187bbfab Fixing discord signin 2022-12-30 10:16:43 +09:00
Alex Ott 9c15258fd1 move api_client.py back to the correct position 2022-12-29 16:25:37 -08:00
Alex Ott 26c1b4eaab merge upstream main 2022-12-29 16:24:55 -08:00
Alex Ott f7ecf8ae25 Merge branch 'main' of https://github.com/LAION-AI/Open-Assistant into upstream 2022-12-29 16:20:03 -08:00
Alex Ott a2a0e1608d fix: parse TaskRequestType enum correctly 2022-12-29 15:45:01 -08:00
Igor Miagkov 7867466700 added trusted api client flag 2022-12-30 00:35:30 +01:00
Alex Ott 0ed29033c9 Merge pull request #2 from AlexanderHOtt/LAION-AI-main
Laion ai main
2022-12-29 15:02:51 -08:00
Alex Ott bb3b0e7397 update api client to upstream version 2022-12-29 15:00:20 -08:00
Alex Ott 27ab051e22 Merge branch 'main' of https://github.com/LAION-AI/Open-Assistant into LAION-AI-main 2022-12-29 14:57:51 -08:00
Keith Stevens 8c59cbe034 Merge pull request #154 from LAION-AI/rank_assistant_replies
Implement `rank_assistant_replies` in web
2022-12-30 07:54:45 +09:00
AlexanderHOtt 84146f2396 remove database file (luckly it was empty) 2022-12-29 14:42:55 -08:00
AlexanderHOtt 221d3396f7 clean up code 2022-12-29 14:39:02 -08:00
AlexanderHOtt 9fd2e76917 add initial task loop for initial_prompt and rank_initial_prompts 2022-12-29 14:20:56 -08:00
Yannic Kilcher 65d6e9501e Merge pull request #163 from sryu1/patch-1
Update README.md
2022-12-29 22:31:40 +01:00
sryu1 39fae26fde Update README.md 2022-12-30 07:22:09 +10:00
Yannic Kilcher d9d65be8c5 added vanished debug login 2022-12-29 22:00:00 +01:00
Yannic Kilcher 90747937b8 improved readme 2022-12-29 21:41:50 +01:00
Yannic Kilcher 665ab862a6 Merge pull request #122 from MohamedAliRashad/main
Slightly better README.md
2022-12-29 21:41:05 +01:00
Yannic Kilcher ad5f8a5a52 Merge branch 'main' of github.com:LAION-AI/Open-Chat-GPT 2022-12-29 21:35:50 +01:00
Yannic Kilcher 5ab2e2d92c added debug login env to web container 2022-12-29 21:35:45 +01:00
Yannic Kilcher 3ab2e01b21 Merge pull request #128 from GraemeHarris/add-lang-column
Added column to post table for lang with US english set to default.
2022-12-29 21:33:41 +01:00
Yannic Kilcher 540f2d58c3 Merge pull request #155 from mjagkow/feature-collective-tasks
Added support for collective tasks
2022-12-29 21:18:14 +01:00
AbdBarho 4f8c4e0457 Implement rank_assistant_replies in web 2022-12-29 21:13:25 +01:00
AbdBarho 2990bb9924 Merge pull request #127 from LAION-AI/rank_user_replies
Implement `rank_user_replies` in web
2022-12-29 21:06:23 +01:00
AbdBarho 5b0b326fc5 Add Loading Screen 2022-12-29 19:44:29 +01:00
AbdBarho 66b89d4685 Implement rank_user_replies in web 2022-12-29 19:44:29 +01:00
Desmond Grealy d0cc4d64bf Merge pull request #142 from LAION-AI/eslint
Update eslint config
2022-12-29 10:34:27 -08:00
Desmond Grealy ea65654fc2 Merge branch 'main' into eslint 2022-12-29 10:32:21 -08:00
Igor Miagkov acfcd7b8d2 Fixed warning: SAWarning: Coercing Subquery object into a select() for use in IN() 2022-12-29 18:59:44 +01:00
AbdBarho 65dbb9c4e1 Merge pull request #152 from billray0259/issue132
Updated join-us and FAQ links
2022-12-29 18:33:01 +01:00
Igor Miagkov efafc0173a added support for collective tasks 2022-12-29 21:32:17 +04:00