Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions neon_data_models/models/api/klat/socketio.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ def model_dump(self, **kwargs):

class UserMessage(BaseModel):
sid: str = Field(
description="Shout ID associated with the message"
description="Shout ID associated with the message",
alias="messageID"
)
cid: str = Field(description="Conversation ID associated with the message")
user_id: Optional[str] = Field(
Expand Down Expand Up @@ -260,11 +261,6 @@ class UserMessage(BaseModel):
description="Unix timestamp (epoch seconds)",
alias="timeCreated"
)
message_id: str = Field(
description="UUID for this message",
alias="messageID",
default_factory=lambda: uuid.uuid4().hex[:10],
) # TODO: This is probably `sid` with a different name
bound_service: Optional[str] = Field(
default=None,
description="Service this message is targeting",
Expand Down Expand Up @@ -318,7 +314,7 @@ class Config:

def to_db_query(self) -> Dict[str, Any]:
return {
"_id": self.message_id,
"_id": self.sid,
"cid": self.cid,
"user_id": self.user_uid,
"prompt_id": self.prompt_id,
Expand Down
2 changes: 1 addition & 1 deletion tests/models/api/test_klat.py
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def test_user_message(self):

# Test to_db_query method
db_query = test_object.to_db_query()
self.assertEqual(db_query["_id"], test_object.message_id)
self.assertEqual(db_query["_id"], test_object.sid)
self.assertEqual(db_query["cid"], test_object.cid)
self.assertEqual(db_query["message_text"], test_object.message_body)
self.assertEqual(db_query["is_audio"], test_object.is_audio)
Expand Down