fix: minor changes

Author: NickNaskida

app/migrations/env.py

@@ -7,7 +7,7 @@
 
 from alembic import context
 
-from src.core.config import settings
+from src.db.url import get_sqlalchemy_url
 from src.db.base_class import Base
 
 from src.models import * # necessarily to import something from file where your models are stored
@@ -38,16 +38,6 @@
 # ... etc.
 
 
-def get_sqlalchemy_url() -> str:
- p_user = settings.POSTGRES_USER
- p_password = settings.POSTGRES_PASSWORD
- p_server = settings.POSTGRES_SERVER
- p_db = settings.POSTGRES_DB
- p_port = settings.POSTGRES_PORT
-
- return f"postgresql+asyncpg://{p_user}:{p_password}@{p_server}:{p_port}/{p_db}"
-
-
 def run_migrations_offline() -> None:
  """Run migrations in 'offline' mode.
 

app/requirements/prod.txt

@@ -5,17 +5,18 @@ pydantic==1.10.4
 
 # Database stuff
 SQLAlchemy==1.4.46
+fastapi-async-sqlalchemy==0.3.12
 sqlmodel==0.0.8
 alembic==1.9.2
 asyncpg==0.27.0
 aioredis==2.0.1
 
 # Env
-python-dotenv==0.21.0
+python-dotenv==0.21.1
 
 # JWT
 pyjwt==2.6.0
 
 # etc
-email-validator==1.3.0
+email-validator==1.3.1
 passlib==1.7.4

app/src/dto/__init__.py renamed to app/src/api/__init__.py

@@ -1,4 +1,5 @@
 import aioredis
+from aioredis import Redis
 
 from src.core.config import settings
 
@@ -7,4 +8,7 @@
 redis_username = settings.REDIS_USERNAME
 redis_password = settings.REDIS_PASSWORD
 
-redis = await aioredis.from_url("redis://localhost", db=redis_db, password=redis_password, username=redis_username)
+
+async def get_redis_client() -> Redis:
+ redis = await aioredis.from_url("redis://localhost", db=redis_db, password=redis_password, username=redis_username)
+ return redis

app/src/db/redis.py

@@ -10,6 +10,7 @@
  echo=True,
  future=True,
  pool_size=settings.SQLALCHEMY_POOL_SIZE,
+ max_overflow=settings.SQLALCHEMY_MAX_OVERFLOW,
 )
 
 # TODO: configure setting to postgres db (pool_size, pool_recycle, pool_timeout ...)

app/src/db/session.py

@@ -0,0 +1,12 @@
+from src.core.config import settings
+
+
+def get_sqlalchemy_url() -> str:
+ """Get and build SQLAlchemy URL from settings."""
+ p_user = settings.POSTGRES_USER
+ p_password = settings.POSTGRES_PASSWORD
+ p_server = settings.POSTGRES_SERVER
+ p_db = settings.POSTGRES_DB
+ p_port = settings.POSTGRES_PORT
+
+ return f"postgresql+asyncpg://{p_user}:{p_password}@{p_server}:{p_port}/{p_db}"