feat: logging on sending file error, refactoring

external/chat/schemas.py

@@ -6,18 +6,13 @@ from schemas.base import BaseSchema, OkMessageSchema
 
 # region Entities
 
-class ExternalSendFileSchema(BaseSchema):
-    buffer: bytes
-    file_name: str
-    file_size: int
-
-
 class ExternalMessageFileSchema(BaseSchema):
     file_path: str
     type: str
     file_name: str
     file_size: int
 
+
 # endregion
 
 # region Requests

external/kafka/consumer.py

@@ -20,11 +20,9 @@ async def consume_messages():
 
     async with session_maker() as session:
         consumer_service = ConsumerService(session)
-        print("started consuming messages")
 
         try:
             async for message in consumer:
-                print("consume")
                 await consumer_service.consume_message(message)
         finally:
             await consumer.stop()

external/kafka/schemas/consumer.py

@@ -41,19 +41,18 @@ class MessageFromTelegramRequest(BaseSchema):
 
 class BaseConnectorResponse(OkMessageSchema):
     message_type: int
+    message_id: int
 
 
 class SendMessageToConnectorResponse(BaseConnectorResponse):
-    message_id: int
-    tg_message_id: int
+    tg_message_id: Optional[int] = None
 
 
 class DeleteMessageResponse(BaseConnectorResponse):
-    message_id: int
+    pass
 
 
 class EditMessageResponse(BaseConnectorResponse):
-    message_id: int
     text: str
 
 # endregion

external/kafka/services/consumer_service.py

@@ -14,7 +14,6 @@ from services.base import BaseService
 class ConsumerService(BaseService):
     async def consume_message(self, message: ConsumerRecord):
         value = pickle.loads(message.value)
-        print("Consumer: received message: ", value)
 
         try:
             if 'ok' in value:

external/kafka/services/producer_service.py

@@ -16,7 +16,7 @@ class ProducerService(BaseService):
         try:
             await producer.send(KAFKA_PRODUCER_TOPIC, value=pickle.dumps(request.model_dump()))
         except ClientConnectorError:
-            return False, 'Ошибка подключения к коннектору'
+            return False, 'Ошибка подключения к сервису'
         except Exception as e:
             return False, str(e)
         return True, 'Сообщение отправлено'
@@ -72,6 +72,6 @@ class ProducerService(BaseService):
                 tg_message_id=tg_message_id,
                 group_id=str(group_id),
                 text=text,
-            )
+            ),
         )
         return await ProducerService._send_message(request)