From fd58fbccaa248300952915f6f303b9dd0fd351ff Mon Sep 17 00:00:00 2001
From: Bulat Kurbanov <kurbanovbul@gmail.com>
Date: Wed, 26 Oct 2022 23:35:39 +0200
Subject: [PATCH] Migrate from aioredis to redis

---
 poetry.lock                       | 29 +++++------------------------
 pyproject.toml                    |  2 +-
 src/app/services/cache_updater.py |  4 ++--
 src/core/redis_client.py          |  2 +-
 4 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index d6a44d9..e69bbdd 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,18 +1,3 @@
-[[package]]
-name = "aioredis"
-version = "2.0.1"
-description = "asyncio (PEP 3156) Redis support"
-category = "main"
-optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-async-timeout = "*"
-typing-extensions = "*"
-
-[package.extras]
-hiredis = ["hiredis (>=1.0)"]
-
 [[package]]
 name = "alembic"
 version = "1.8.1"
@@ -379,11 +364,11 @@ diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "redis"
-version = "4.4.0rc1"
+version = "4.3.4"
 description = "Python client for Redis database and key-value store"
 category = "main"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.6"
 
 [package.dependencies]
 async-timeout = ">=4.0.2"
@@ -569,13 +554,9 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.9"
-content-hash = "c6103216a83e76b2de1cba42359fa18af67449778215a54e4b47be48f8fbdbf3"
+content-hash = "1c32666f5c6add73d5377c889c17c3a0817de53e26d871fcc4fc8ca2b4dd66e7"
 
 [metadata.files]
-aioredis = [
-    {file = "aioredis-2.0.1-py3-none-any.whl", hash = "sha256:9ac0d0b3b485d293b8ca1987e6de8658d7dafcca1cddfcd1d506cae8cdebfdd6"},
-    {file = "aioredis-2.0.1.tar.gz", hash = "sha256:eaa51aaf993f2d71f54b70527c440437ba65340588afeb786cd87c55c89cd98e"},
-]
 alembic = [
     {file = "alembic-1.8.1-py3-none-any.whl", hash = "sha256:0a024d7f2de88d738d7395ff866997314c837be6104e90c5724350313dee4da4"},
     {file = "alembic-1.8.1.tar.gz", hash = "sha256:cd0b5e45b14b706426b833f06369b9a6d5ee03f826ec3238723ce8caaf6e5ffa"},
@@ -989,8 +970,8 @@ pyparsing = [
     {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
 ]
 redis = [
-    {file = "redis-4.4.0rc1-py3-none-any.whl", hash = "sha256:b538a9ab71441ce5aff06552a6e0383c9720c29d7073082bd691a0b3dcbb7ac3"},
-    {file = "redis-4.4.0rc1.tar.gz", hash = "sha256:0b82ad83f37b89b25cca2d18592eee379dabdfe8550e80b34d852acf2d9fb015"},
+    {file = "redis-4.3.4-py3-none-any.whl", hash = "sha256:a52d5694c9eb4292770084fa8c863f79367ca19884b329ab574d5cb2036b3e54"},
+    {file = "redis-4.3.4.tar.gz", hash = "sha256:ddf27071df4adf3821c4f2ca59d67525c3a82e5f268bed97b813cb4fabf87880"},
 ]
 rfc3986 = [
     {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"},
diff --git a/pyproject.toml b/pyproject.toml
index a7d7385..bc9b70e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,10 +16,10 @@ uvloop = "^0.17.0"
 gunicorn = "^20.1.0"
 orjson = "^3.8.1"
 sentry-sdk = "^1.10.1"
-aioredis = "^2.0.1"
 ormar = {extras = ["postgresql"], version = "^0.12.0"}
 greenlet = "1.1.3"
 pydantic = "1.10.2"
+redis = {extras = ["hiredis"], version = "^4.3.4"}
 
 [tool.poetry.dev-dependencies]
 
diff --git a/src/app/services/cache_updater.py b/src/app/services/cache_updater.py
index cf6f8da..e9cd85f 100644
--- a/src/app/services/cache_updater.py
+++ b/src/app/services/cache_updater.py
@@ -7,11 +7,11 @@ from typing import Optional, cast
 
 from fastapi import UploadFile
 
-import aioredis
-from aioredis.exceptions import LockError
 from arq.connections import ArqRedis
 from arq.worker import Retry
 import httpx
+from redis import asyncio as aioredis
+from redis.exceptions import LockError
 
 from app.models import CachedFile
 from app.services.caption_getter import get_caption
diff --git a/src/core/redis_client.py b/src/core/redis_client.py
index 609d9d4..09e6518 100644
--- a/src/core/redis_client.py
+++ b/src/core/redis_client.py
@@ -1,4 +1,4 @@
-import aioredis
+from redis import asyncio as aioredis
 
 from core.config import env_config