moved bot to discord-bot

LAION-AI · Dec 24, 2022 · 289d9f7 · 289d9f7
1 parent 5284e30
commit 289d9f7
Show file tree

Hide file tree

Showing 31 changed files with 19 additions and 20 deletions.
diff --git a/bot/templates/teaser_assistant_reply.msg b/bot/templates/teaser_assistant_reply.msg
diff --git a/bot/templates/teaser_initial_prompt.msg b/bot/templates/teaser_initial_prompt.msg
diff --git a/bot/.gitignore → discord-bot/.gitignore b/bot/.gitignore → discord-bot/.gitignore
diff --git a/bot/README.md → discord-bot/README.md b/bot/README.md → discord-bot/README.md
diff --git a/bot/__main__.py → discord-bot/__main__.py b/bot/__main__.py → discord-bot/__main__.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-from bot_settings import settings
-
 from bot import OpenAssistantBot
+from bot_settings import settings
 
 # invite bot url: https://discord.com/api/oauth2/authorize?client_id=1054078345542910022&permissions=1634235579456&scope=bot
 

diff --git a/bot/api_client.py → discord-bot/api_client.py b/bot/api_client.py → discord-bot/api_client.py
diff --git a/bot/bot.py → discord-bot/bot.py b/bot/bot.py → discord-bot/bot.py
diff --git a/bot/bot_base.py → discord-bot/bot_base.py b/bot/bot_base.py → discord-bot/bot_base.py
diff --git a/bot/bot_settings.py → discord-bot/bot_settings.py b/bot/bot_settings.py → discord-bot/bot_settings.py
diff --git a/bot/channel_handlers.py → discord-bot/channel_handlers.py b/bot/channel_handlers.py → discord-bot/channel_handlers.py
diff --git a/bot/message_templates.py → discord-bot/message_templates.py b/bot/message_templates.py → discord-bot/message_templates.py
diff --git a/bot/requirements.txt → discord-bot/requirements.txt b/bot/requirements.txt → discord-bot/requirements.txt
diff --git a/bot/task_handlers.py → discord-bot/task_handlers.py b/bot/task_handlers.py → discord-bot/task_handlers.py
diff --git a/bot/templates/boot.msg → discord-bot/templates/boot.msg b/bot/templates/boot.msg → discord-bot/templates/boot.msg
diff --git a/bot/templates/help.msg → discord-bot/templates/help.msg b/bot/templates/help.msg → discord-bot/templates/help.msg
@@ -10,6 +10,6 @@ Commands for bot owners:
 
 `!sync`
 `!sync.guild`
-`!sync.copy_global` 
+`!sync.copy_global`
 `!sync.clear_guild`
-{% endif %}
+{% endif %}
diff --git a/bot/templates/task_assistant_reply.msg → ...rd-bot/templates/task_assistant_reply.msg b/bot/templates/task_assistant_reply.msg → ...rd-bot/templates/task_assistant_reply.msg
@@ -9,4 +9,4 @@ Here is the conversation so far:
 **{{ message.text }}**"
 {% endif %}
 {% endfor %}
-:robot: Assistant: { human, pls help me! ... }
+:robot: Assistant: { human, pls help me! ... }
diff --git a/bot/templates/task_initial_prompt.msg → ...ord-bot/templates/task_initial_prompt.msg b/bot/templates/task_initial_prompt.msg → ...ord-bot/templates/task_initial_prompt.msg
@@ -1,4 +1,4 @@
 Please provide an initial prompt to the assistant.
 {% if task.hint is not none %}
 Hint: {{task.hint}}
-{% endif %}
+{% endif %}
diff --git a/...plates/task_rank_conversation_replies.msg → ...plates/task_rank_conversation_replies.msg b/...plates/task_rank_conversation_replies.msg → ...plates/task_rank_conversation_replies.msg
@@ -10,4 +10,4 @@ Rank the following replies:
 {% for reply in task.replies %}
 {{loop.index}}: {{reply}}{% endfor %}
 
-:scroll: Reply with the numbers of best to worst prompts separated by commas (example: "4,1,3,2").
+:scroll: Reply with the numbers of best to worst prompts separated by commas (example: "4,1,3,2").
diff --git a/bot/templates/task_rank_initial_prompts.msg → ...t/templates/task_rank_initial_prompts.msg b/bot/templates/task_rank_initial_prompts.msg → ...t/templates/task_rank_initial_prompts.msg
@@ -2,4 +2,4 @@ Rank the following prompts:
 {% for prompt in task.prompts %}
 {{loop.index}}: {{prompt}}{% endfor %}
 
-:scroll: Reply with the numbers of best to worst prompts separated by commas (example: "4,1,3,2").
+:scroll: Reply with the numbers of best to worst prompts separated by commas (example: "4,1,3,2").
diff --git a/bot/templates/task_rate_summary.msg → discord-bot/templates/task_rate_summary.msg b/bot/templates/task_rate_summary.msg → discord-bot/templates/task_rate_summary.msg
diff --git a/bot/templates/task_summarize_story.msg → ...rd-bot/templates/task_summarize_story.msg b/bot/templates/task_summarize_story.msg → ...rd-bot/templates/task_summarize_story.msg
diff --git a/bot/templates/task_user_reply.msg → discord-bot/templates/task_user_reply.msg b/bot/templates/task_user_reply.msg → discord-bot/templates/task_user_reply.msg
@@ -9,4 +9,4 @@ Here is the conversation so far:
 {% endif %}{% endfor %}
 {% if task.hint %}
 Hint: {{ task.hint }}
-{% endif %}
+{% endif %}
diff --git a/discord-bot/templates/teaser_assistant_reply.msg b/discord-bot/templates/teaser_assistant_reply.msg
@@ -0,0 +1,3 @@
+:robot:  **Challenge: Assistant Reply**
+
+:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
diff --git a/discord-bot/templates/teaser_initial_prompt.msg b/discord-bot/templates/teaser_initial_prompt.msg
@@ -0,0 +1,3 @@
+:microphone2:  **Challenge: Initial Prompt**
+
+:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
diff --git a/...ates/teaser_rank_conversation_replies.msg → ...ates/teaser_rank_conversation_replies.msg b/...ates/teaser_rank_conversation_replies.msg → ...ates/teaser_rank_conversation_replies.msg
@@ -1,3 +1,3 @@
 :bar_chart:  **Challenge: Rank Replies**
 
-:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
+:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
diff --git a/...templates/teaser_rank_initial_prompts.msg → ...templates/teaser_rank_initial_prompts.msg b/...templates/teaser_rank_initial_prompts.msg → ...templates/teaser_rank_initial_prompts.msg
@@ -1,3 +1,3 @@
 :bar_chart:  **Challenge: Rank Initial Prompts**
 
-:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
+:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
diff --git a/bot/templates/teaser_rate_summary.msg → ...ord-bot/templates/teaser_rate_summary.msg b/bot/templates/teaser_rate_summary.msg → ...ord-bot/templates/teaser_rate_summary.msg
@@ -1,3 +1,3 @@
 :ballot_box:  **Challenge: Rate Summary**
 
-:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
+:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
diff --git a/bot/templates/teaser_summarize_story.msg → ...-bot/templates/teaser_summarize_story.msg b/bot/templates/teaser_summarize_story.msg → ...-bot/templates/teaser_summarize_story.msg
@@ -1,3 +1,3 @@
 :books:  **Challenge: Summarize Story**
 
-:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
+:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
diff --git a/bot/templates/teaser_user_reply.msg → discord-bot/templates/teaser_user_reply.msg b/bot/templates/teaser_user_reply.msg → discord-bot/templates/teaser_user_reply.msg
@@ -1,3 +1,3 @@
 :person_red_hair:  **Challenge: User Reply**
 
-:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
+:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
diff --git a/bot/templates/welcome.msg → discord-bot/templates/welcome.msg b/bot/templates/welcome.msg → discord-bot/templates/welcome.msg
diff --git a/bot/utils.py → discord-bot/utils.py b/bot/utils.py → discord-bot/utils.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		:robot: Challenge: Assistant Reply

		:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		:microphone2: Challenge: Initial Prompt

		:point_down: Work on it here (:fire: Thread will self-destruct at {{ expiry_time }}, {{ expiry_relative }}).