diff --git a/poetry.lock b/poetry.lock index 94a611f..a489c2f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1255,7 +1255,7 @@ requests = "^2.31.0" type = "git" url = "https://github.com/cfpb/regtech-api-commons.git" reference = "HEAD" -resolved_reference = "e65414c33af3bc8fa84af68deffdd9d41745d0dc" +resolved_reference = "29356c630d2609cb81087ce35dd6c79512954d49" [[package]] name = "requests" @@ -1507,4 +1507,4 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", [metadata] lock-version = "2.0" python-versions = ">=3.12,<4" -content-hash = "9746ae6b352991413938db37bc3c35e51fcacd6b91650a377e1e5452742a03aa" +content-hash = "80e17382fb2de14a85772e1e65c1c9147e75bbe7033cd6cf8e3be2b90726f0f3" diff --git a/pyproject.toml b/pyproject.toml index 38418d2..8027cf0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,17 +8,13 @@ packages = [{ include = "regtech_user_fi_management", from = "src" }] [tool.poetry.dependencies] python = ">=3.12,<4" -fastapi = "^0.109.1" uvicorn = "^0.22.0" python-dotenv = "^1.0.0" python-keycloak = "^3.0.0" SQLAlchemy = "^2.0.16" psycopg2-binary = "^2.9.6" -python-jose = "^3.3.0" -requests = "^2.31.0" asyncpg = "^0.29.0" alembic = "^1.12.0" -pydantic-settings = "^2.0.3" regtech-api-commons = {git = "https://github.com/cfpb/regtech-api-commons.git"} [tool.poetry.group.dev.dependencies] diff --git a/src/regtech_user_fi_management/entities/repos/institutions_repo.py b/src/regtech_user_fi_management/entities/repos/institutions_repo.py index 263332e..d7210e1 100644 --- a/src/regtech_user_fi_management/entities/repos/institutions_repo.py +++ b/src/regtech_user_fi_management/entities/repos/institutions_repo.py @@ -4,7 +4,7 @@ from sqlalchemy.orm import joinedload from sqlalchemy.ext.asyncio import AsyncSession -from regtech_api_commons.models import AuthenticatedUser +from regtech_api_commons.models.auth import AuthenticatedUser from .repo_utils import get_associated_sbl_types, query_type diff --git a/src/regtech_user_fi_management/routers/admin.py b/src/regtech_user_fi_management/routers/admin.py index 8feb0c1..bc663c5 100644 --- a/src/regtech_user_fi_management/routers/admin.py +++ b/src/regtech_user_fi_management/routers/admin.py @@ -4,11 +4,11 @@ from starlette.authentication import requires from regtech_user_fi_management.dependencies import check_domain -from regtech_api_commons.api import Router +from regtech_api_commons.api.router_wrapper import Router from regtech_user_fi_management.entities.models.dto import UserProfile -from regtech_api_commons.models import RegTechUser -from regtech_api_commons.oauth2 import OAuth2Admin +from regtech_api_commons.models.auth import RegTechUser +from regtech_api_commons.oauth2.oauth2_admin import OAuth2Admin from regtech_user_fi_management.config import kc_settings router = Router() diff --git a/src/regtech_user_fi_management/routers/institutions.py b/src/regtech_user_fi_management/routers/institutions.py index a0db2c3..dd534a6 100644 --- a/src/regtech_user_fi_management/routers/institutions.py +++ b/src/regtech_user_fi_management/routers/institutions.py @@ -2,7 +2,7 @@ from http import HTTPStatus from regtech_api_commons.oauth2.oauth2_admin import OAuth2Admin from regtech_user_fi_management.config import kc_settings -from regtech_api_commons.api import Router +from regtech_api_commons.api.router_wrapper import Router from regtech_user_fi_management.dependencies import ( check_domain, parse_leis,