Skip to content

Commit

Permalink
feat: remove sync engine, sessiond and get_db function
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielmbmb committed Jul 25, 2023
1 parent 9ae1425 commit 9d1230a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 17 deletions.
3 changes: 1 addition & 2 deletions src/argilla/server/apis/v1/handlers/responses.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@

from fastapi import APIRouter, Depends, HTTPException, Security, status
from sqlalchemy.ext.asyncio import AsyncSession
from sqlalchemy.orm import Session

from argilla.server.contexts import datasets
from argilla.server.database import get_async_db, get_db
from argilla.server.database import get_async_db
from argilla.server.models import User
from argilla.server.policies import ResponsePolicyV1, authorize
from argilla.server.schemas.v1.responses import Response, ResponseUpdate
Expand Down
19 changes: 4 additions & 15 deletions src/argilla/server/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
from sqlite3 import Connection as SQLite3Connection
from typing import TYPE_CHECKING, Generator

from sqlalchemy import create_engine, event
from sqlalchemy import event
from sqlalchemy.engine import Engine
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
from sqlalchemy.orm import sessionmaker
from sqlalchemy.ext.asyncio import async_sessionmaker, create_async_engine

import argilla
from argilla.server.settings import settings

if TYPE_CHECKING:
from sqlalchemy.orm import Session
from sqlalchemy.ext.asyncio import AsyncSession


ALEMBIC_CONFIG_FILE = os.path.normpath(os.path.join(os.path.dirname(argilla.__file__), "alembic.ini"))
TAGGED_REVISIONS = OrderedDict(
Expand All @@ -46,21 +46,10 @@ def set_sqlite_pragma(dbapi_connection, connection_record):
cursor.close()


engine = create_engine(settings.database_url)
SessionLocal = sessionmaker(autocommit=False, bind=engine)

async_engine = create_async_engine(settings.database_url_async)
AsyncSessionLocal = async_sessionmaker(autocommit=False, expire_on_commit=False, bind=async_engine)


def get_db() -> Generator["Session", None, None]:
try:
db = SessionLocal()
yield db
finally:
db.close()


async def get_async_db() -> Generator["AsyncSession", None, None]:
try:
db: "AsyncSession" = AsyncSessionLocal()
Expand Down

0 comments on commit 9d1230a

Please sign in to comment.