fix more models

agixt/graphqlendpoints/Conversations.py

@@ -20,16 +20,6 @@
 )
 from ApiClient import verify_api_key
 from datetime import datetime
-from Models import (
-    ConversationHistoryModel,
-    ConversationHistoryMessageModel,
-    RenameConversationModel,
-    ConversationFork,
-    LogInteraction,
-    UpdateConversationHistoryMessageModel,
-    UpdateMessageModel,
-    DeleteMessageModel,
-)
 
 
 # Helper for auth
@@ -43,6 +33,53 @@ async def get_user_and_auth_from_context(info):
         raise Exception(str(e.detail))
 
 
+@strawberry.type
+class DeleteMessageModel:
+    conversation_name: str
+
+
+@strawberry.type
+class UpdateMessageModel:
+    conversation_name: str
+    message_id: str
+    new_message: str
+
+
+@strawberry.type
+class UpdateConversationHistoryMessageModel:
+    agent_name: Optional[str] = ""
+    conversation_name: str
+    message: str
+    new_message: str
+
+
+@strawberry.type
+class LogInteraction:
+    role: str
+    message: str
+    conversation_name: Optional[str] = ""
+
+
+@strawberry.type
+class ConversationFork:
+    conversation_name: str
+    message_id: str
+
+
+@strawberry.type
+class RenameConversationModel:
+    agent_name: str
+    conversation_name: str
+    new_conversation_name: Optional[str] = "-"
+
+
+@strawberry.type
+class ConversationHistoryMessageModel:
+    agent_name: Optional[str] = ""
+    conversation_name: str
+    message: str
+
+
 @strawberry.type
 class ConversationMessage:
     id: str
@@ -54,6 +91,13 @@ class ConversationMessage:
     feedback_received: bool
 
 
+@strawberry.type
+class ConversationHistoryModel:
+    agent_name: Optional[str] = ""
+    conversation_name: str
+    conversation_content: List["ConversationMessageInput"]
+
+
 @strawberry.type
 class ConversationMetadata:
     name: str
@@ -110,20 +154,20 @@ class ConversationHistoryMessageInput:
     message: str
 
 
-@strawberry.input
-class ConversationHistoryInput:
-    conversation_name: str
-    agent_name: Optional[str] = ""
-    conversation_content: List["ConversationMessageInput"]
-
-
 @strawberry.input
 class ConversationMessageInput:
     role: str
     message: str
     timestamp: Optional[datetime] = None
 
 
+@strawberry.input
+class ConversationHistoryInput:
+    conversation_name: str
+    agent_name: Optional[str] = ""
+    conversation_content: List[ConversationMessageInput] = []
+
+
 @strawberry.input
 class LogInteractionInput:
     role: str

agixt/graphqlendpoints/Prompts.py

@@ -2,10 +2,6 @@
 import strawberry
 from fastapi import HTTPException
 from ApiClient import verify_api_key
-from Models import (
-    CustomPromptModel,
-    PromptName,
-)
 from endpoints.Prompt import (
     add_prompt as rest_add_prompt,
     get_prompt_with_category as rest_get_prompt,
@@ -25,6 +21,17 @@ class Prompt:
     prompt: str
 
 
+@strawberry.type
+class CustomPromptModel:
+    prompt_name: str
+    prompt: str
+
+
+@strawberry.type
+class PromptName:
+    name: str
+
+
 @strawberry.type
 class ResponseMessage:
     message: str