From f6354401580bd12765adab1e9025901836fa1d70 Mon Sep 17 00:00:00 2001 From: swve Date: Sat, 9 Aug 2025 14:29:51 +0200 Subject: [PATCH] fix: ruff issues & build --- .../api/src/services/courses/activities/activities.py | 11 +---------- .../src/services/courses/activities/assignments.py | 4 ---- apps/api/src/services/courses/activities/pdf.py | 5 ----- apps/api/src/services/courses/activities/video.py | 4 ---- apps/api/src/services/courses/certifications.py | 7 +------ apps/api/src/services/courses/chapters.py | 7 +------ apps/api/src/services/courses/collections.py | 7 +------ apps/api/src/services/courses/contributors.py | 4 ++-- apps/api/src/services/courses/courses.py | 4 +--- apps/web/components/Hooks/useCourseRights.tsx | 2 +- 10 files changed, 8 insertions(+), 47 deletions(-) diff --git a/apps/api/src/services/courses/activities/activities.py b/apps/api/src/services/courses/activities/activities.py index 51a16987..5929a920 100644 --- a/apps/api/src/services/courses/activities/activities.py +++ b/apps/api/src/services/courses/activities/activities.py @@ -1,19 +1,10 @@ -from typing import Literal from sqlmodel import Session, select from src.db.courses.courses import Course from src.db.courses.chapters import Chapter -from src.security.rbac.rbac import ( - authorization_verify_based_on_roles_and_authorship, - authorization_verify_if_element_is_public, - authorization_verify_if_user_is_anon, - authorization_verify_based_on_org_admin_status, - authorization_verify_based_on_roles, -) from src.db.courses.activities import ActivityCreate, Activity, ActivityRead, ActivityUpdate from src.db.courses.chapter_activities import ChapterActivity from src.db.users import AnonymousUser, PublicUser -from src.db.resource_authors import ResourceAuthor, ResourceAuthorshipEnum, ResourceAuthorshipStatusEnum -from fastapi import HTTPException, Request, status +from fastapi import HTTPException, Request from uuid import uuid4 from datetime import datetime diff --git a/apps/api/src/services/courses/activities/assignments.py b/apps/api/src/services/courses/activities/assignments.py index 624f2737..b18a6d18 100644 --- a/apps/api/src/services/courses/activities/assignments.py +++ b/apps/api/src/services/courses/activities/assignments.py @@ -1,5 +1,4 @@ from datetime import datetime -from typing import Literal from uuid import uuid4 from fastapi import HTTPException, Request, UploadFile from sqlmodel import Session, select @@ -34,9 +33,6 @@ from src.security.features_utils.usage import ( increase_feature_usage, ) from src.security.rbac.rbac import ( - authorization_verify_based_on_roles_and_authorship, - authorization_verify_if_element_is_public, - authorization_verify_if_user_is_anon, authorization_verify_based_on_roles, ) from src.services.courses.activities.uploads.sub_file import upload_submission_file diff --git a/apps/api/src/services/courses/activities/pdf.py b/apps/api/src/services/courses/activities/pdf.py index 85d056ba..ae10de6e 100644 --- a/apps/api/src/services/courses/activities/pdf.py +++ b/apps/api/src/services/courses/activities/pdf.py @@ -1,11 +1,6 @@ -from typing import Literal from src.db.courses.courses import Course from src.db.organizations import Organization from sqlmodel import Session, select -from src.security.rbac.rbac import ( - authorization_verify_based_on_roles_and_authorship, - authorization_verify_if_user_is_anon, -) from src.db.courses.chapters import Chapter from src.db.courses.activities import ( Activity, diff --git a/apps/api/src/services/courses/activities/video.py b/apps/api/src/services/courses/activities/video.py index 1dec5c5d..2072e1b9 100644 --- a/apps/api/src/services/courses/activities/video.py +++ b/apps/api/src/services/courses/activities/video.py @@ -5,10 +5,6 @@ from src.db.organizations import Organization from pydantic import BaseModel from sqlmodel import Session, select -from src.security.rbac.rbac import ( - authorization_verify_based_on_roles_and_authorship, - authorization_verify_if_user_is_anon, -) from src.db.courses.chapters import Chapter from src.db.courses.activities import ( Activity, diff --git a/apps/api/src/services/courses/certifications.py b/apps/api/src/services/courses/certifications.py index 639fc27e..87a78297 100644 --- a/apps/api/src/services/courses/certifications.py +++ b/apps/api/src/services/courses/certifications.py @@ -1,4 +1,4 @@ -from typing import List, Literal +from typing import List from uuid import uuid4 from datetime import datetime from sqlmodel import Session, select @@ -15,11 +15,6 @@ from src.db.courses.courses import Course from src.db.courses.chapter_activities import ChapterActivity from src.db.trail_steps import TrailStep from src.db.users import PublicUser, AnonymousUser -from src.security.rbac.rbac import ( - authorization_verify_based_on_roles_and_authorship, - authorization_verify_if_element_is_public, - authorization_verify_if_user_is_anon, -) from src.security.courses_security import courses_rbac_check_for_certifications diff --git a/apps/api/src/services/courses/chapters.py b/apps/api/src/services/courses/chapters.py index cbabc1c8..ee72bc81 100644 --- a/apps/api/src/services/courses/chapters.py +++ b/apps/api/src/services/courses/chapters.py @@ -1,13 +1,8 @@ from datetime import datetime -from typing import List, Literal +from typing import List from uuid import uuid4 from sqlmodel import Session, select from src.db.users import AnonymousUser, PublicUser -from src.security.rbac.rbac import ( - authorization_verify_based_on_roles_and_authorship, - authorization_verify_if_element_is_public, - authorization_verify_if_user_is_anon, -) from src.db.courses.course_chapters import CourseChapter from src.db.courses.activities import Activity, ActivityRead from src.db.courses.chapter_activities import ChapterActivity diff --git a/apps/api/src/services/courses/collections.py b/apps/api/src/services/courses/collections.py index 976f3eb9..80713b03 100644 --- a/apps/api/src/services/courses/collections.py +++ b/apps/api/src/services/courses/collections.py @@ -1,13 +1,8 @@ from datetime import datetime -from typing import List, Literal +from typing import List from uuid import uuid4 from sqlmodel import Session, select from src.db.users import AnonymousUser, PublicUser -from src.security.rbac.rbac import ( - authorization_verify_based_on_roles_and_authorship, - authorization_verify_if_element_is_public, - authorization_verify_if_user_is_anon, -) from src.db.collections import ( Collection, CollectionCreate, diff --git a/apps/api/src/services/courses/contributors.py b/apps/api/src/services/courses/contributors.py index b0464fcc..746fc615 100644 --- a/apps/api/src/services/courses/contributors.py +++ b/apps/api/src/services/courses/contributors.py @@ -1,10 +1,10 @@ from datetime import datetime -from fastapi import HTTPException, Request, status +from fastapi import HTTPException, Request from sqlmodel import Session, select, and_ from src.db.users import PublicUser, AnonymousUser, User, UserRead from src.db.courses.courses import Course from src.db.resource_authors import ResourceAuthor, ResourceAuthorshipEnum, ResourceAuthorshipStatusEnum -from src.security.rbac.rbac import authorization_verify_if_user_is_anon, authorization_verify_based_on_org_admin_status +from src.security.rbac.rbac import authorization_verify_if_user_is_anon from src.security.courses_security import courses_rbac_check from typing import List diff --git a/apps/api/src/services/courses/courses.py b/apps/api/src/services/courses/courses.py index ba5b449a..5dffdbe6 100644 --- a/apps/api/src/services/courses/courses.py +++ b/apps/api/src/services/courses/courses.py @@ -1,4 +1,4 @@ -from typing import Literal, List +from typing import List from uuid import uuid4 from sqlmodel import Session, select, or_, and_, text from src.db.usergroup_resources import UserGroupResource @@ -21,8 +21,6 @@ from src.db.courses.courses import ( ThumbnailType, ) from src.security.rbac.rbac import ( - authorization_verify_based_on_roles_and_authorship, - authorization_verify_if_element_is_public, authorization_verify_if_user_is_anon, authorization_verify_based_on_org_admin_status, ) diff --git a/apps/web/components/Hooks/useCourseRights.tsx b/apps/web/components/Hooks/useCourseRights.tsx index e02d5a5a..6c143bef 100644 --- a/apps/web/components/Hooks/useCourseRights.tsx +++ b/apps/web/components/Hooks/useCourseRights.tsx @@ -43,7 +43,7 @@ export function useCourseRights(courseuuid: string) { const { data: rights, error, isLoading } = useSWR( courseuuid ? `${getAPIUrl()}courses/${courseuuid}/rights` : null, - (url) => swrFetcher(url, access_token) + (url: string) => swrFetcher(url, access_token) ) return {