fix: ty compliant & issues from change to mapped columns

src/iam/dependencies.py

@@ -20,7 +20,7 @@ from src.iam.schemas import GroupIDMixin, PermIDMixin
 
 def get_group_model_query(
 	db: db_dependency, group_id: Annotated[int, Query(gt=0)]
-) -> type[Group]:
+) -> Group:
 	group_model = db.get(Group, group_id)
 	if group_model is None:
 		raise GroupNotFoundException(group_id)
@@ -28,12 +28,12 @@ def get_group_model_query(
 	return group_model
 
 
-group_model_query_dependency = Annotated[type[Group], Depends(get_group_model_query)]
+group_model_query_dependency = Annotated[Group, Depends(get_group_model_query)]
 
 
 def get_group_model_body(
 	db: db_dependency, request_model: Optional[GroupIDMixin] = None
-) -> type[Group]:
+) -> Group:
 	group_id = getattr(request_model, "group_id", None)
 	if group_id is None:
 		raise GroupNotFoundException()
@@ -44,12 +44,12 @@ def get_group_model_body(
 	return group_model
 
 
-group_model_body_dependency = Annotated[type[Group], Depends(get_group_model_body)]
+group_model_body_dependency = Annotated[Group, Depends(get_group_model_body)]
 
 
 def get_perm_model_body(
 	db: db_dependency, request_model: Optional[PermIDMixin] = None
-) -> type[Permission]:
+) -> Permission:
 	perm_id = getattr(request_model, "permission_id", None)
 	if perm_id is None:
 		raise PermNotFoundException
@@ -60,12 +60,12 @@ def get_perm_model_body(
 	return perm_model
 
 
-perm_model_body_dependency = Annotated[type[Permission], Depends(get_perm_model_body)]
+perm_model_body_dependency = Annotated[Permission, Depends(get_perm_model_body)]
 
 
 def get_perm_model_query(
 	db: db_dependency, perm_id: Annotated[int, Query(gt=0)]
-) -> type[Permission]:
+) -> Permission:
 	perm_model = db.get(Permission, perm_id)
 	if perm_model is None:
 		raise PermNotFoundException(perm_id)
@@ -73,4 +73,4 @@ def get_perm_model_query(
 	return perm_model
 
 
-perm_model_query_dependency = Annotated[type[Permission], Depends(get_perm_model_query)]
+perm_model_query_dependency = Annotated[Permission, Depends(get_perm_model_query)]

src/iam/models.py

@@ -43,7 +43,9 @@ class Permission(CustomBase):
 	)
 
 	service_rel = relationship(
-		"Service", back_populates="permission_rel", foreign_keys="Permission.service_id"
+		"Service",
+		back_populates="permission_rel",
+		foreign_keys="Permission.service_id",
 	)
 
 	group_rel = relationship(

src/iam/router.py

@@ -207,9 +207,7 @@ async def can_act_on_resource(
 			"content": {
 				"application/json": {
 					"examples": {
-						"db_id": {
-							"summary": "User not found in db when checking claims."
-						},
+						"db_id": {"summary": "User not found in db when checking claims."},
 						"user_model": {"summary": "User model not found in db."},
 						"org_model": {"summary": "Org model not found in db."},
 						"group_model": {"summary": "Group model not found in db."},
@@ -268,9 +266,7 @@ async def get_group_users(
 	status_code=status.HTTP_201_CREATED,
 	response_model=IAMPostGroupResponse,
 	responses={
-		status.HTTP_409_CONFLICT: {
-			"description": "Group with this name already exists"
-		},
+		status.HTTP_409_CONFLICT: {"description": "Group with this name already exists"},
 	},
 )
 async def create_group(
@@ -568,9 +564,7 @@ async def permissions_search(
 		)
 
 	if not (request_model.resource is None or request_model.resource == ""):
-		permission_query = permission_query.filter(
-			Perm.resource == request_model.resource
-		)
+		permission_query = permission_query.filter(Perm.resource == request_model.resource)
 
 	if not (request_model.action is None or request_model.action == ""):
 		permission_query = permission_query.filter(Perm.action == request_model.action)
@@ -633,9 +627,7 @@ async def invitation(
 	response_model=IAMPutGroupInvitationAcceptResponse,
 	responses={
 		status.HTTP_404_NOT_FOUND: {"description": "User|Org|Group not found"},
-		status.HTTP_403_FORBIDDEN: {
-			"description": "Group and organisation do not match"
-		},
+		status.HTTP_403_FORBIDDEN: {"description": "Group and organisation do not match"},
 		status.HTTP_409_CONFLICT: {"description": "User is already in the group"},
 	},
 )
@@ -647,9 +639,7 @@ async def accept_invitation(
 	"""
 	Accepts an invitation to join an org's group
 	"""
-	email_claims = await verify_email_token(
-		token=request_model.jwt, user_model=user_model
-	)
+	email_claims = await verify_email_token(token=request_model.jwt, user_model=user_model)
 
 	org_model = db.get(Org, email_claims["org_id"])
 	if org_model is None: