From 07cba37fc578f26bf59999a9a31794a05d7ed925 Mon Sep 17 00:00:00 2001 From: Tyler Adam Martinez Date: Wed, 24 Jun 2026 10:02:48 -0500 Subject: [PATCH 1/2] fix(core/dependencies): Corrected types & improved core route guard --- core/app.py | 3 ++- core/dependencies.py | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/core/app.py b/core/app.py index 17c04484c..6ee7ad992 100644 --- a/core/app.py +++ b/core/app.py @@ -128,7 +128,8 @@ def public_openapi(): ( r for r in app.routes - if r.path == path and method.upper() in r.methods + if getattr(r, "path", None) == path + and method.upper() in getattr(r, "methods", set()) ), None, ) diff --git a/core/dependencies.py b/core/dependencies.py index 98cfbfe64..8d4aa354d 100644 --- a/core/dependencies.py +++ b/core/dependencies.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # =============================================================================== -from typing import Annotated +from typing import Annotated, TypeAlias from fastapi import Depends from sqlalchemy.orm import Session @@ -21,7 +21,7 @@ from core.permissions import authenticated from db.engine import get_db_session -session_dependency: type[Session] = Annotated[Session, Depends(get_db_session)] +session_dependency: TypeAlias = Annotated[Session, Depends(get_db_session)] """ Developer Notes @@ -61,18 +61,18 @@ # Permissions Dependencies ----------------------------------------------------- -admin_dependency: type[dict] = Annotated[dict, Depends(admin_function)] -editor_dependency: type[dict] = Annotated[dict, Depends(editor_function)] -viewer_dependency: type[dict] = Annotated[dict, Depends(viewer_function)] +admin_dependency: TypeAlias = Annotated[dict, Depends(admin_function)] +editor_dependency: TypeAlias = Annotated[dict, Depends(editor_function)] +viewer_dependency: TypeAlias = Annotated[dict, Depends(viewer_function)] -lexicon_admin_dependency: type[dict] = Annotated[dict, Depends(lexicon_admin_function)] -lexicon_editor_dependency: type[dict] = Annotated[ +lexicon_admin_dependency: TypeAlias = Annotated[dict, Depends(lexicon_admin_function)] +lexicon_editor_dependency: TypeAlias = Annotated[ dict, Depends(lexicon_editor_function) ] -amp_admin_dependency: type[dict] = Annotated[dict, Depends(amp_admin_function)] -amp_editor_dependency: type[dict] = Annotated[dict, Depends(amp_editor_function)] -amp_viewer_dependency: type[dict] = Annotated[dict, Depends(amp_viewer_function)] +amp_admin_dependency: TypeAlias = Annotated[dict, Depends(amp_admin_function)] +amp_editor_dependency: TypeAlias = Annotated[dict, Depends(amp_editor_function)] +amp_viewer_dependency: TypeAlias = Annotated[dict, Depends(amp_viewer_function)] -no_permission_dependency: type[dict] = Annotated[dict, Depends(no_permission_function)] +no_permission_dependency: TypeAlias = Annotated[dict, Depends(no_permission_function)] # ============= EOF ============================================= From 5c3e8afdad55f56176a28ef4fe40c82cd3f82a4a Mon Sep 17 00:00:00 2001 From: TylerAdamMartinez <57375362+TylerAdamMartinez@users.noreply.github.com> Date: Wed, 24 Jun 2026 15:04:55 +0000 Subject: [PATCH 2/2] Formatting changes --- core/dependencies.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/dependencies.py b/core/dependencies.py index 8d4aa354d..eabcd009a 100644 --- a/core/dependencies.py +++ b/core/dependencies.py @@ -66,9 +66,7 @@ viewer_dependency: TypeAlias = Annotated[dict, Depends(viewer_function)] lexicon_admin_dependency: TypeAlias = Annotated[dict, Depends(lexicon_admin_function)] -lexicon_editor_dependency: TypeAlias = Annotated[ - dict, Depends(lexicon_editor_function) -] +lexicon_editor_dependency: TypeAlias = Annotated[dict, Depends(lexicon_editor_function)] amp_admin_dependency: TypeAlias = Annotated[dict, Depends(amp_admin_function)] amp_editor_dependency: TypeAlias = Annotated[dict, Depends(amp_editor_function)]