fix breaking api changes

backend/oasst_backend/api/v1/tasks.py

@@ -18,8 +18,8 @@ router = APIRouter()
 def generate_task(
     request: protocol_schema.TaskRequest, pr: PromptRepository
 ) -> Tuple[protocol_schema.Task, Optional[UUID], Optional[UUID]]:
-    thread_id = None
-    parent_post_id = None
+    message_tree_id = None
+    parent_message_id = None
 
     match request.type:
         case protocol_schema.TaskRequestType.random:
@@ -54,38 +54,42 @@ def generate_task(
             task = protocol_schema.InitialPromptTask(
                 hint="Ask the assistant about a current event."  # this is optional
             )
-        case protocol_schema.TaskRequestType.user_reply:
-            logger.info("Generating a UserReplyTask.")
-            posts = pr.fetch_random_conversation("assistant")
-            messages = [
-                protocol_schema.ConversationMessage(text=p.payload.payload.text, is_assistant=(p.role == "assistant"))
-                for p in posts
+        case protocol_schema.TaskRequestType.prompter_reply:
+            logger.info("Generating a PrompterReplyTask.")
+            messages = pr.fetch_random_conversation("assistant")
+            task_messages = [
+                protocol_schema.ConversationMessage(
+                    text=msg.payload.payload.text, is_assistant=(msg.role == "assistant")
+                )
+                for msg in messages
             ]
 
-            task = protocol_schema.UserReplyTask(conversation=protocol_schema.Conversation(messages=messages))
-            thread_id = posts[-1].thread_id
-            parent_post_id = posts[-1].id
+            task = protocol_schema.PrompterReplyTask(conversation=protocol_schema.Conversation(messages=task_messages))
+            message_tree_id = messages[-1].message_tree_id
+            parent_message_id = messages[-1].id
         case protocol_schema.TaskRequestType.assistant_reply:
             logger.info("Generating a AssistantReplyTask.")
-            posts = pr.fetch_random_conversation("user")
-            messages = [
-                protocol_schema.ConversationMessage(text=p.payload.payload.text, is_assistant=(p.role == "assistant"))
-                for p in posts
+            messages = pr.fetch_random_conversation("prompter")
+            task_messages = [
+                protocol_schema.ConversationMessage(
+                    text=msg.payload.payload.text, is_assistant=(msg.role == "assistant")
+                )
+                for msg in messages
             ]
 
-            task = protocol_schema.AssistantReplyTask(conversation=protocol_schema.Conversation(messages=messages))
-            thread_id = posts[-1].thread_id
-            parent_post_id = posts[-1].id
+            task = protocol_schema.AssistantReplyTask(conversation=protocol_schema.Conversation(messages=task_messages))
+            message_tree_id = messages[-1].message_tree_id
+            parent_message_id = messages[-1].id
         case protocol_schema.TaskRequestType.rank_initial_prompts:
             logger.info("Generating a RankInitialPromptsTask.")
 
-            posts = pr.fetch_random_initial_prompts()
-            task = protocol_schema.RankInitialPromptsTask(prompts=[p.payload.payload.text for p in posts])
-        case protocol_schema.TaskRequestType.rank_user_replies:
-            logger.info("Generating a RankUserRepliesTask.")
-            conversation, replies = pr.fetch_multiple_random_replies(post_role="assistant")
+            messages = pr.fetch_random_initial_prompts()
+            task = protocol_schema.RankInitialPromptsTask(prompts=[msg.payload.payload.text for msg in messages])
+        case protocol_schema.TaskRequestType.rank_prompter_replies:
+            logger.info("Generating a RankPrompterRepliesTask.")
+            conversation, replies = pr.fetch_multiple_random_replies(message_role="assistant")
 
-            messages = [
+            task_messages = [
                 protocol_schema.ConversationMessage(
                     text=p.payload.payload.text,
                     is_assistant=(p.role == "assistant"),
@@ -93,18 +97,18 @@ def generate_task(
                 for p in conversation
             ]
             replies = [p.payload.payload.text for p in replies]
-            task = protocol_schema.RankUserRepliesTask(
+            task = protocol_schema.RankPrompterRepliesTask(
                 conversation=protocol_schema.Conversation(
-                    messages=messages,
+                    messages=task_messages,
                 ),
                 replies=replies,
             )
 
         case protocol_schema.TaskRequestType.rank_assistant_replies:
             logger.info("Generating a RankAssistantRepliesTask.")
-            conversation, replies = pr.fetch_multiple_random_replies(post_role="user")
+            conversation, replies = pr.fetch_multiple_random_replies(message_role="prompter")
 
-            messages = [
+            task_messages = [
                 protocol_schema.ConversationMessage(
                     text=p.payload.payload.text,
                     is_assistant=(p.role == "assistant"),
@@ -113,7 +117,7 @@ def generate_task(
             ]
             replies = [p.payload.payload.text for p in replies]
             task = protocol_schema.RankAssistantRepliesTask(
-                conversation=protocol_schema.Conversation(messages=messages),
+                conversation=protocol_schema.Conversation(messages=task_messages),
                 replies=replies,
             )
         case _:
@@ -121,7 +125,7 @@ def generate_task(
 
     logger.info(f"Generated {task=}.")
 
-    return task, thread_id, parent_post_id
+    return task, message_tree_id, parent_message_id
 
 
 @router.post("/", response_model=protocol_schema.AnyTask)  # work with Union once more types are added
@@ -138,8 +142,8 @@ def request_task(
 
     try:
         pr = PromptRepository(db, api_client, request.user)
-        task, thread_id, parent_post_id = generate_task(request, pr)
-        pr.store_task(task, thread_id, parent_post_id, request.collective)
+        task, message_tree_id, parent_message_id = generate_task(request, pr)
+        pr.store_task(task, message_tree_id, parent_message_id, request.collective)
 
     except OasstError:
         raise
@@ -150,7 +154,7 @@ def request_task(
 
 
 @router.post("/{task_id}/ack")
-def acknowledge_task(
+def tasks_acknowledge(
     *,
     db: Session = Depends(deps.get_db),
     api_key: APIKey = Depends(deps.get_api_key),
@@ -166,9 +170,9 @@ def acknowledge_task(
     try:
         pr = PromptRepository(db, api_client, user=None)
 
-        # here we store the post id in the database for the task
+        # here we store the message id in the database for the task
         logger.info(f"Frontend acknowledges task {task_id=}, {ack_request=}.")
-        pr.bind_frontend_post_id(task_id=task_id, post_id=ack_request.post_id)
+        pr.bind_frontend_message_id(task_id=task_id, frontend_message_id=ack_request.message_id)
 
     except OasstError:
         raise
@@ -179,7 +183,7 @@ def acknowledge_task(
 
 
 @router.post("/{task_id}/nack")
-def acknowledge_task_failure(
+def tasks_acknowledge_failure(
     *,
     db: Session = Depends(deps.get_db),
     api_key: APIKey = Depends(deps.get_api_key),
@@ -201,7 +205,7 @@ def acknowledge_task_failure(
 
 
 @router.post("/interaction")
-def post_interaction(
+def tasks_interaction(
     *,
     db: Session = Depends(deps.get_db),
     api_key: APIKey = Depends(deps.get_api_key),
@@ -216,29 +220,31 @@ def post_interaction(
         pr = PromptRepository(db, api_client, user=interaction.user)
 
         match type(interaction):
-            case protocol_schema.TextReplyToPost:
+            case protocol_schema.TextReplyToMessage:
                 logger.info(
-                    f"Frontend reports text reply to {interaction.post_id=} with {interaction.text=} by {interaction.user=}."
+                    f"Frontend reports text reply to {interaction.message_id=} with {interaction.text=} by {interaction.user=}."
                 )
 
                 # here we store the text reply in the database
                 pr.store_text_reply(
-                    text=interaction.text, post_id=interaction.post_id, user_post_id=interaction.user_post_id
+                    text=interaction.text,
+                    frontend_message_id=interaction.message_id,
+                    user_frontend_message_id=interaction.user_message_id,
                 )
 
                 return protocol_schema.TaskDone()
-            case protocol_schema.PostRating:
+            case protocol_schema.MessageRating:
                 logger.info(
-                    f"Frontend reports rating of {interaction.post_id=} with {interaction.rating=} by {interaction.user=}."
+                    f"Frontend reports rating of {interaction.message_id=} with {interaction.rating=} by {interaction.user=}."
                 )
 
                 # here we store the rating in the database
                 pr.store_rating(interaction)
 
                 return protocol_schema.TaskDone()
-            case protocol_schema.PostRanking:
+            case protocol_schema.MessageRanking:
                 logger.info(
-                    f"Frontend reports ranking of {interaction.post_id=} with {interaction.ranking=} by {interaction.user=}."
+                    f"Frontend reports ranking of {interaction.message_id=} with {interaction.ranking=} by {interaction.user=}."
                 )
 
                 # TODO: check if the ranking is valid
@@ -262,5 +268,5 @@ def close_collective_task(
 ):
     api_client = deps.api_auth(api_key, db)
     pr = PromptRepository(db, api_client, user=None)
-    pr.close_task(close_task_request.post_id)
+    pr.close_task(close_task_request.message_id)
     return protocol_schema.TaskDone()