Skip to content

Commit

Permalink
feat: add requests module on core app, add get_request_session_with_r…
Browse files Browse the repository at this point in the history
…etries function to msg callback
  • Loading branch information
helllllllder committed Oct 11, 2024
1 parent 3e51b09 commit fac3aff
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 4 deletions.
13 changes: 9 additions & 4 deletions chats/apps/msgs/models.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import json

import requests
from django.conf import settings
from django.core.serializers.json import DjangoJSONEncoder
from django.db import models
from django.utils.translation import gettext_lazy as _
from rest_framework.exceptions import ValidationError

from chats.core.models import BaseModel
from chats.core.requests import get_request_session_with_retries


class Message(BaseModel):
Expand Down Expand Up @@ -86,8 +86,10 @@ def notify_room(self, action: str, callback: bool = False):
self.room.base_notification(content=data, action=f"msg.{action}")
if self.room.callback_url and callback:
data = self.update_msg_text_with_signature(data)

requests.post(
request_session = get_request_session_with_retries(
status_forcelist=[429, 500, 502, 503, 504], method_whitelist=["POST"]
)
request_session.post(
self.room.callback_url,
data=json.dumps(
{"type": "msg.create", "content": data},
Expand Down Expand Up @@ -147,7 +149,10 @@ def callback(self):
msg_data["text"] = ""

if self.message.room.callback_url:
requests.post(
request_session = get_request_session_with_retries(
status_forcelist=[429, 500, 502, 503, 504], method_whitelist=["POST"]
)
request_session.post(
self.message.room.callback_url,
data=json.dumps(
{"type": "msg.create", "content": msg_data},
Expand Down
27 changes: 27 additions & 0 deletions chats/core/requests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
from numbers import Number

import requests
from requests.adapters import HTTPAdapter
from urllib3.util.retry import Retry


def get_request_session_with_retries(
retries: int = 5,
backoff_factor: Number = 0.1,
status_forcelist: list = [],
method_whitelist: list = [],
) -> requests.Session:
retry_strategy = Retry(
total=retries,
backoff_factor=backoff_factor,
status_forcelist=status_forcelist,
method_whitelist=method_whitelist,
)

adapter = HTTPAdapter(max_retries=retry_strategy)

session = requests.Session()
session.mount("https://", adapter)
session.mount("http://", adapter)

return session

0 comments on commit fac3aff

Please sign in to comment.