Skip to content

Commit 9d7a1aa

Browse files
fix: messages fields and type
1 parent 5a0e20f commit 9d7a1aa

File tree

1 file changed

+23
-10
lines changed
  • services/web/server/src/simcore_service_webserver/conversations

1 file changed

+23
-10
lines changed

services/web/server/src/simcore_service_webserver/conversations/_socketio.py

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,46 @@
1111
from models_library.projects import ProjectID
1212
from models_library.socketio import SocketMessageDict
1313
from models_library.users import UserID
14-
from pydantic import BaseModel
14+
from pydantic import AliasGenerator, BaseModel, ConfigDict
15+
from pydantic.alias_generators import to_camel
1516

1617
from ..socketio.messages import send_message_to_standard_group
1718

18-
SOCKET_IO_CONVERSATION_MESSAGE_CREATED_EVENT: Final[str] = "conversationMessageCreated"
19-
20-
SOCKET_IO_CONVERSATION_MESSAGE_DELETED_EVENT: Final[str] = "conversationMessageDeleted"
21-
22-
SOCKET_IO_CONVERSATION_MESSAGE_UPDATED_EVENT: Final[str] = "conversationMessageUpdated"
19+
SOCKET_IO_CONVERSATION_MESSAGE_CREATED_EVENT: Final[str] = (
20+
"conversation:message:created"
21+
)
22+
SOCKET_IO_CONVERSATION_MESSAGE_DELETED_EVENT: Final[str] = (
23+
"conversation:message:deleted"
24+
)
25+
SOCKET_IO_CONVERSATION_MESSAGE_UPDATED_EVENT: Final[str] = (
26+
"conversation:message:updated"
27+
)
2328

2429

25-
class ConversationMessage(BaseModel):
30+
class BaseConversationMessage(BaseModel):
2631
conversation_id: ConversationID
2732
message_id: ConversationMessageID
2833

34+
model_config = ConfigDict(
35+
populate_by_name=True,
36+
from_attributes=True,
37+
alias_generator=AliasGenerator(
38+
serialization_alias=to_camel,
39+
),
40+
)
41+
2942

30-
class ConversationMessageCreated(ConversationMessage):
43+
class ConversationMessageCreated(BaseConversationMessage):
3144
content: str
3245
created: datetime.datetime
3346

3447

35-
class ConversationMessageUpdated(ConversationMessage):
48+
class ConversationMessageUpdated(BaseConversationMessage):
3649
content: str
3750
modified: datetime.datetime
3851

3952

40-
class ConversationMessageDeleted(ConversationMessage): ...
53+
class ConversationMessageDeleted(BaseConversationMessage): ...
4154

4255

4356
async def _send_message_to_recipients(app, recipients, notification_message):

0 commit comments

Comments
 (0)