codegrade 16.1.56__tar.gz → 16.1.59__tar.gz

{codegrade-16.1.56 → codegrade-16.1.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codegrade
-Version: 16.1.56
+Version: 16.1.59
 Summary: A client library for accessing CodeGrade
 License: AGPL-3.0-only OR BSD-3-Clause-Clear
 Requires-Python: >=3.8.0,<4.0

{codegrade-16.1.56 → codegrade-16.1.59}/cg_maybe/_just.py

@@ -1,11 +1,9 @@
 """This module implements the ``Just`` part of the ``Maybe`` monad.
-
-
 """
 import os
 import typing as t
 
-from ._nothing import Nothing
+from ._nothing import Nothing, _Nothing
 from ._type_helpers import Final, Literal
 from ._type_helpers import SupportsLessThan as _SupportsLessThan
 from ._type_helpers import SupportsGreaterOrEqual as _SupportsGreaterOrEqual
@@ -344,6 +342,14 @@ class Just(t.Generic[_T]):
             return self.value == other.value
         return NotImplemented
 
+    def __lt__(self, other: object) -> bool:
+        if isinstance(other, Just):
+            return self.value < other.value
+        elif isinstance(other, _Nothing):
+            return False
+        return NotImplemented
+
+
     def ne(  # pylint: disable=invalid-name
         self: 'Just[_Y]',
         val: _Y,

{codegrade-16.1.56 → codegrade-16.1.59}/cg_maybe/_nothing.py

@@ -116,6 +116,14 @@ class _Nothing(t.Generic[_T]):
             return True
         return NotImplemented
 
+    def __lt__(self, other: object) -> bool:
+        if isinstance(other, _Nothing):
+            return False
+        from ._just import Just  # pylint: disable=import-outside-toplevel
+        if isinstance(other, Just):
+            return True
+        return NotImplemented
+
     def __structlog__(self) -> t.Mapping[str, object]:
         return {'type': 'Nothing'}
 

{codegrade-16.1.56 → codegrade-16.1.59}/cg_request_args/_convert.py

@@ -221,28 +221,44 @@ def remove_converter(converter: Converter) -> None:
     _CONVERTERS = [c for c in _CONVERTERS if c[-1] != converter]
 
 
+def get_required_keys(typ: t.Type) -> t.Set[str]:
+    """Retrieve the required keys from a given type hinted object.
+
+    This function specifically targets Python's `TypedDict` type, which allows
+    for optional keys. It uses the `get_type_hints` function from the `typing`
+    module to extract the type hints from the given object. It then iterates
+    over the annotations, checking for keys with a `NotRequired`
+    origin. These keys are considered optional and are discarded from the set
+    of required keys.
+
+    :param typ: The type hinted object from which to retrieve the required keys
+    :return: A set of strings representing the required keys.
+    """
+    annotations = t.get_type_hints(typ, include_extras=True)
+    required_keys = set(typ.__required_keys__)
+    for key, subtyp in annotations.items():
+        origin = t.get_origin(subtyp)
+        # The reason for these checks:
+        # https://docs.python.org/3/library/typing.html#typing.TypedDict.__optional_keys__
+        if origin == t.NotRequired:
+            required_keys.discard(key)
+    return required_keys
+
+
 def _get_args_typeddict(
     ctx: ConvertCtx,
     get_doc: t.Callable[[str], str] = lambda _: '',
 ) -> t.Sequence[t.Union[RequiredArgument, OptionalArgument]]:
     args: t.List[t.Union[RequiredArgument, OptionalArgument]] = []
-    annotations = t.get_type_hints(ctx.typ, include_extras=True)
-    required_keys = set(ctx.typ.__required_keys__)
+    annotations = t.get_type_hints(ctx.typ)
+    required_keys = get_required_keys(ctx.typ)
 
     for key, subtyp in annotations.items():
         doc = get_doc(key)
-        origin = t.get_origin(subtyp)
-        # The reason for these checks:
-        # https://docs.python.org/3/library/typing.html#typing.TypedDict.__optional_keys__
-        if origin in (t.NotRequired, t.Required):
-            required = origin == t.Required
-            subtyp = subtyp.__args__[0]
-        else:
-            required = key in required_keys
 
         sub_parse = ctx.recurse_with_guard(subtyp)
 
-        if required:
+        if key in required_keys:
             args.append(
                 RequiredArgument(key, sub_parse, doc)  # type: ignore[misc]
             )

{codegrade-16.1.56 → codegrade-16.1.59}/codegrade/__init__.py

@@ -7,7 +7,7 @@ from functools import wraps
 from .client import AuthenticatedClient, Client
 
 __all__ = ("login", "AuthenticatedClient", "Client", "login_from_cli")
-__version__ = "16.1.56"
+__version__ = "16.1.59"
 
 
 @wraps(AuthenticatedClient.get)

{codegrade-16.1.56 → codegrade-16.1.59}/codegrade/_api/__init__.py

@@ -19,6 +19,7 @@ from . import (
     permission,
     plagiarism,
     role,
+    saml,
     section,
     site_settings,
     snippet,

{codegrade-16.1.56 → codegrade-16.1.59}/codegrade/_api/course.py

@@ -21,7 +21,6 @@ if t.TYPE_CHECKING or os.getenv("CG_EAGERIMPORT", False):
     from ..models.course_bulk_enroll_result import CourseBulkEnrollResult
     from ..models.course_perm_map import CoursePermMap
     from ..models.course_price import CoursePrice
-    from ..models.course_register_response import CourseRegisterResponse
     from ..models.course_registration_link import CourseRegistrationLink
     from ..models.course_role import CourseRole
     from ..models.course_role_as_json_with_perms import (
@@ -57,6 +56,7 @@ if t.TYPE_CHECKING or os.getenv("CG_EAGERIMPORT", False):
     )
     from ..models.user import User
     from ..models.user_course import UserCourse
+    from ..models.user_login_response import UserLoginResponse
 
 
 _ClientT = t.TypeVar("_ClientT", bound="codegrade.client._BaseClient")
@@ -1865,7 +1865,7 @@ class CourseService(t.Generic[_ClientT]):
         extra_parameters: t.Optional[
             t.Mapping[str, t.Union[str, bool, int, float]]
         ] = None,
-    ) -> "CourseRegisterResponse":
+    ) -> "UserLoginResponse":
         """Register as a new user, and directly enroll in a course.
 
         :param json_body: The body of the request. See
@@ -1895,11 +1895,11 @@ class CourseService(t.Generic[_ClientT]):
 
         if utils.response_code_matches(resp.status_code, 200):
             # fmt: off
-            from ..models.course_register_response import CourseRegisterResponse
+            from ..models.user_login_response import UserLoginResponse
 
             # fmt: on
             return parsers.JsonResponseParser(
-                parsers.ParserFor.make(CourseRegisterResponse)
+                parsers.ParserFor.make(UserLoginResponse)
             ).try_parse(resp)
 
         from ..models.any_error import AnyError

codegrade-16.1.59/codegrade/_api/saml.py

@@ -0,0 +1,79 @@
+"""The endpoints for saml objects.
+
+SPDX-License-Identifier: AGPL-3.0-only OR BSD-3-Clause-Clear
+"""
+import os
+import typing as t
+
+import cg_request_args as rqa
+from cg_maybe import Maybe, Nothing
+
+from .. import parsers, utils
+
+if t.TYPE_CHECKING or os.getenv("CG_EAGERIMPORT", False):
+    import codegrade
+
+    from ..models.user_login_response import UserLoginResponse
+
+
+_ClientT = t.TypeVar("_ClientT", bound="codegrade.client._BaseClient")
+
+
+class SamlService(t.Generic[_ClientT]):
+    __slots__ = ("__client",)
+
+    def __init__(self, client: _ClientT) -> None:
+        self.__client = client
+
+    def get_session(
+        self,
+        *,
+        token: "str",
+        extra_parameters: t.Optional[
+            t.Mapping[str, t.Union[str, bool, int, float]]
+        ] = None,
+    ) -> "UserLoginResponse":
+        """Get a JWT token for a user after doing a successful launch.
+
+        This method will use various pieces of information from the session
+        from the requested user.
+
+        This method can only be used once to retrieve the JWT, as the data will
+        be removed after the first request.
+
+        :param token: The token that we will use to verify that you are the
+            correct owner of the SAML launch. This data will be cross
+            referenced to stored data and your session.
+        :param extra_parameters: The extra query parameters you might want to
+            add. By default no extra query parameters are added.
+
+        :returns: A mapping containing one key (`access_token`).
+        """
+
+        url = "/api/sso/saml2/jwts/{token}".format(token=token)
+        params = extra_parameters or {}
+
+        with self.__client as client:
+            resp = client.http.post(url=url, params=params)
+        utils.log_warnings(resp)
+
+        if utils.response_code_matches(resp.status_code, 200):
+            # fmt: off
+            from ..models.user_login_response import UserLoginResponse
+
+            # fmt: on
+            return parsers.JsonResponseParser(
+                parsers.ParserFor.make(UserLoginResponse)
+            ).try_parse(resp)
+
+        from ..models.any_error import AnyError
+
+        raise utils.get_error(
+            resp,
+            (
+                (
+                    (400, 409, 401, 403, 404, 429, 500),
+                    utils.unpack_union(AnyError),
+                ),
+            ),
+        )

{codegrade-16.1.56 → codegrade-16.1.59}/codegrade/client.py

@@ -53,6 +53,7 @@ if t.TYPE_CHECKING or os.getenv("CG_EAGERIMPORT", False):
         PlagiarismService as _PlagiarismService,
     )
     from codegrade._api.role import RoleService as _RoleService
+    from codegrade._api.saml import SamlService as _SamlService
     from codegrade._api.section import SectionService as _SectionService
     from codegrade._api.site_settings import (
         SiteSettingsService as _SiteSettingsService,
@@ -100,6 +101,7 @@ class _BaseClient:
         "__permission",
         "__plagiarism",
         "__role",
+        "__saml",
         "__section",
         "__site_settings",
         "__snippet",
@@ -155,6 +157,7 @@ class _BaseClient:
             "_PlagiarismService[_BaseClientT]"
         ] = None
         self.__role: t.Optional["_RoleService[_BaseClientT]"] = None
+        self.__saml: t.Optional["_SamlService[_BaseClientT]"] = None
         self.__section: t.Optional["_SectionService[_BaseClientT]"] = None
         self.__site_settings: t.Optional[
             "_SiteSettingsService[_BaseClientT]"
@@ -399,6 +402,15 @@ class _BaseClient:
             self.__role = m.RoleService(self)
         return self.__role
 
+    @property
+    def saml(self: _BaseClientT) -> "_SamlService[_BaseClientT]":
+        """Get a :class:`.SamlService` to do requests concerning Saml."""
+        if self.__saml is None:
+            import codegrade._api.saml as m
+
+            self.__saml = m.SamlService(self)
+        return self.__saml
+
     @property
     def section(self: _BaseClientT) -> "_SectionService[_BaseClientT]":
         """Get a :class:`.SectionService` to do requests concerning Section."""
@@ -526,7 +538,7 @@ class Client(_BaseClient):
         return httpx.Client(
             base_url=self.base_url,
             headers={
-                "User-Agent": "CodeGradeAPI/16.1.56",
+                "User-Agent": "CodeGradeAPI/16.1.59",
             },
             follow_redirects=True,
         )
@@ -546,7 +558,7 @@ class AuthenticatedClient(_BaseClient):
             base_url=self.base_url,
             headers={
                 "Authorization": f"Bearer {self.token}",
-                "User-Agent": "CodeGradeAPI/16.1.56",
+                "User-Agent": "CodeGradeAPI/16.1.59",
             },
             follow_redirects=True,
         )

{codegrade-16.1.56 → codegrade-16.1.59}/codegrade/models/__init__.py

@@ -13,6 +13,7 @@ from .abstract_role import AbstractRole
 from .add_users_section_data import AddUsersSectionData
 from .all_auto_test_results import AllAutoTestResults
 from .all_site_settings import AllSiteSettings
+from .always_update_pii_with_lti_setting import AlwaysUpdatePiiWithLtiSetting
 from .analytics_enabled_setting import AnalyticsEnabledSetting
 from .any_auto_test_step_as_json import AnyAutoTestStepAsJSON
 from .any_error import AnyError
@@ -214,7 +215,6 @@ from .course_perm_map import CoursePermMap
 from .course_permission import CoursePermission
 from .course_price import CoursePrice
 from .course_register_enabled_setting import CourseRegisterEnabledSetting
-from .course_register_response import CourseRegisterResponse
 from .course_registration_link import CourseRegistrationLink
 from .course_role import CourseRole
 from .course_role_as_json_with_perms import CourseRoleAsJSONWithPerms
@@ -348,6 +348,8 @@ from .hide_code_editor_output_viewer_with_only_quiz_steps_setting import (
 from .hide_empty_rubric_row_description_setting import (
     HideEmptyRubricRowDescriptionSetting,
 )
+from .hide_no_deadline_enabled_setting import HideNoDeadlineEnabledSetting
+from .hubspot_syncing_enabled_setting import HubspotSyncingEnabledSetting
 from .ignore_handling import IgnoreHandling
 from .ignored_files_exception import IgnoredFilesException
 from .import_into_assignment_data import ImportIntoAssignmentData
@@ -446,6 +448,9 @@ from .min_password_score_setting import MinPasswordScoreSetting
 from .mirror_file_result import MirrorFileResult
 from .missing_cookie_error import MissingCookieError
 from .missing_file import MissingFile
+from .name_and_email_from_nrps_only_setting import (
+    NameAndEmailFromNrpsOnlySetting,
+)
 from .new_auto_test_allowed_initial_build_ids_setting import (
     NewAutoTestAllowedInitialBuildIdsSetting,
 )
@@ -634,6 +639,7 @@ from .server_time_correction_enabled_setting import (
 )
 from .server_time_diff_tolerance_setting import ServerTimeDiffToleranceSetting
 from .server_time_sync_interval_setting import ServerTimeSyncIntervalSetting
+from .session_restrictions import SessionRestrictions
 from .setting_token_time_setting import SettingTokenTimeSetting
 from .setup_oauth_result import SetupOAuthResult
 from .simple_submission_mode_enabled_setting import (
@@ -699,6 +705,7 @@ from .user import User
 from .user_course import UserCourse
 from .user_info_with_role import UserInfoWithRole
 from .user_input import UserInput
+from .user_login_response import UserLoginResponse
 from .user_without_group import UserWithoutGroup
 from .weak_password_exception import WeakPasswordException
 from .weak_password_feedback import WeakPasswordFeedback

{codegrade-16.1.56 → codegrade-16.1.59}/codegrade/models/all_site_settings.py

@@ -147,6 +147,14 @@ class AllSiteSettings(FrontendSiteSettings):
     #: Enabling this prevents replay attacks. If unsure, consult with the
     #: Security Officer before disabling.
     lti_1p3_prevent_nonce_reuse_enabled: Maybe["bool"] = Nothing
+    #: Do not store names and emails of users, but always retrieve them through
+    #: NRPS.
+    name_and_email_from_nrps_only: Maybe["bool"] = Nothing
+    #: Should we always update names and emails on LTI launches, or just when
+    #: indicated and on the first launch.
+    always_update_pii_with_lti: Maybe["bool"] = Nothing
+    #: Should we sync teachers to Hubspot.
+    hubspot_syncing_enabled: Maybe["bool"] = Nothing
 
     raw_data: t.Optional[t.Dict[str, t.Any]] = field(init=False, repr=False)
 
@@ -492,6 +500,28 @@ class AllSiteSettings(FrontendSiteSettings):
                         " Officer before disabling."
                     ),
                 ),
+                rqa.OptionalArgument(
+                    "NAME_AND_EMAIL_FROM_NRPS_ONLY",
+                    rqa.SimpleValue.bool,
+                    doc=(
+                        "Do not store names and emails of users, but always"
+                        " retrieve them through NRPS."
+                    ),
+                ),
+                rqa.OptionalArgument(
+                    "ALWAYS_UPDATE_PII_WITH_LTI",
+                    rqa.SimpleValue.bool,
+                    doc=(
+                        "Should we always update names and emails on LTI"
+                        " launches, or just when indicated and on the first"
+                        " launch."
+                    ),
+                ),
+                rqa.OptionalArgument(
+                    "HUBSPOT_SYNCING_ENABLED",
+                    rqa.SimpleValue.bool,
+                    doc="Should we sync teachers to Hubspot.",
+                ),
             )
         ).use_readable_describe(True)
     )
@@ -604,6 +634,15 @@ class AllSiteSettings(FrontendSiteSettings):
         self.lti_1p3_prevent_nonce_reuse_enabled = maybe_from_nullable(
             self.lti_1p3_prevent_nonce_reuse_enabled
         )
+        self.name_and_email_from_nrps_only = maybe_from_nullable(
+            self.name_and_email_from_nrps_only
+        )
+        self.always_update_pii_with_lti = maybe_from_nullable(
+            self.always_update_pii_with_lti
+        )
+        self.hubspot_syncing_enabled = maybe_from_nullable(
+            self.hubspot_syncing_enabled
+        )
 
     def to_dict(self) -> t.Dict[str, t.Any]:
         res: t.Dict[str, t.Any] = {}
@@ -945,6 +984,10 @@ class AllSiteSettings(FrontendSiteSettings):
             )
         if self.analytics_enabled.is_just:
             res["ANALYTICS_ENABLED"] = to_dict(self.analytics_enabled.value)
+        if self.hide_no_deadline_enabled.is_just:
+            res["HIDE_NO_DEADLINE_ENABLED"] = to_dict(
+                self.hide_no_deadline_enabled.value
+            )
         if self.auto_test_heartbeat_interval.is_just:
             res["AUTO_TEST_HEARTBEAT_INTERVAL"] = to_dict(
                 self.auto_test_heartbeat_interval.value
@@ -1089,6 +1132,18 @@ class AllSiteSettings(FrontendSiteSettings):
             res["LTI_1P3_PREVENT_NONCE_REUSE_ENABLED"] = to_dict(
                 self.lti_1p3_prevent_nonce_reuse_enabled.value
             )
+        if self.name_and_email_from_nrps_only.is_just:
+            res["NAME_AND_EMAIL_FROM_NRPS_ONLY"] = to_dict(
+                self.name_and_email_from_nrps_only.value
+            )
+        if self.always_update_pii_with_lti.is_just:
+            res["ALWAYS_UPDATE_PII_WITH_LTI"] = to_dict(
+                self.always_update_pii_with_lti.value
+            )
+        if self.hubspot_syncing_enabled.is_just:
+            res["HUBSPOT_SYNCING_ENABLED"] = to_dict(
+                self.hubspot_syncing_enabled.value
+            )
         return res
 
     @classmethod
@@ -1186,6 +1241,7 @@ class AllSiteSettings(FrontendSiteSettings):
             hide_empty_rubric_row_description=parsed.HIDE_EMPTY_RUBRIC_ROW_DESCRIPTION,
             default_submission_page_tab=parsed.DEFAULT_SUBMISSION_PAGE_TAB,
             analytics_enabled=parsed.ANALYTICS_ENABLED,
+            hide_no_deadline_enabled=parsed.HIDE_NO_DEADLINE_ENABLED,
             auto_test_heartbeat_interval=parsed.AUTO_TEST_HEARTBEAT_INTERVAL,
             auto_test_heartbeat_max_missed=parsed.AUTO_TEST_HEARTBEAT_MAX_MISSED,
             auto_test_max_jobs_per_runner=parsed.AUTO_TEST_MAX_JOBS_PER_RUNNER,
@@ -1224,6 +1280,9 @@ class AllSiteSettings(FrontendSiteSettings):
             default_course_ta_role=parsed.DEFAULT_COURSE_TA_ROLE,
             lti_1p3_nonce_and_state_validation_enabled=parsed.LTI_1P3_NONCE_AND_STATE_VALIDATION_ENABLED,
             lti_1p3_prevent_nonce_reuse_enabled=parsed.LTI_1P3_PREVENT_NONCE_REUSE_ENABLED,
+            name_and_email_from_nrps_only=parsed.NAME_AND_EMAIL_FROM_NRPS_ONLY,
+            always_update_pii_with_lti=parsed.ALWAYS_UPDATE_PII_WITH_LTI,
+            hubspot_syncing_enabled=parsed.HUBSPOT_SYNCING_ENABLED,
         )
         res.raw_data = d
         return res

codegrade-16.1.59/codegrade/models/always_update_pii_with_lti_setting.py

@@ -0,0 +1,56 @@
+"""The module that defines the ``AlwaysUpdatePiiWithLtiSetting`` model.
+
+SPDX-License-Identifier: AGPL-3.0-only OR BSD-3-Clause-Clear
+"""
+
+import typing as t
+from dataclasses import dataclass, field
+
+import cg_request_args as rqa
+
+from ..utils import to_dict
+
+
+@dataclass
+class AlwaysUpdatePiiWithLtiSetting:
+    """ """
+
+    name: "t.Literal['ALWAYS_UPDATE_PII_WITH_LTI']"
+    value: "t.Optional[bool]"
+
+    raw_data: t.Optional[t.Dict[str, t.Any]] = field(init=False, repr=False)
+
+    data_parser: t.ClassVar = rqa.Lazy(
+        lambda: rqa.FixedMapping(
+            rqa.RequiredArgument(
+                "name",
+                rqa.StringEnum("ALWAYS_UPDATE_PII_WITH_LTI"),
+                doc="",
+            ),
+            rqa.RequiredArgument(
+                "value",
+                rqa.Nullable(rqa.SimpleValue.bool),
+                doc="",
+            ),
+        ).use_readable_describe(True)
+    )
+
+    def to_dict(self) -> t.Dict[str, t.Any]:
+        res: t.Dict[str, t.Any] = {
+            "name": to_dict(self.name),
+            "value": to_dict(self.value),
+        }
+        return res
+
+    @classmethod
+    def from_dict(
+        cls: t.Type["AlwaysUpdatePiiWithLtiSetting"], d: t.Dict[str, t.Any]
+    ) -> "AlwaysUpdatePiiWithLtiSetting":
+        parsed = cls.data_parser.try_parse(d)
+
+        res = cls(
+            name=parsed.name,
+            value=parsed.value,
+        )
+        res.raw_data = d
+        return res

{codegrade-16.1.56 → codegrade-16.1.59}/codegrade/models/assignment_grader.py

@@ -9,16 +9,13 @@ from dataclasses import dataclass, field
 import cg_request_args as rqa
 
 from ..utils import to_dict
+from .user_without_group import UserWithoutGroup
 
 
 @dataclass
-class AssignmentGrader:
+class AssignmentGrader(UserWithoutGroup):
     """A grader for an assignment."""
 
-    #: The id of the grader.
-    id: "int"
-    #: The name of the grader
-    name: "str"
     #: The division weight of the grader, if no division is setup this will be
     #: 0.
     weight: "float"
@@ -29,43 +26,38 @@ class AssignmentGrader:
     raw_data: t.Optional[t.Dict[str, t.Any]] = field(init=False, repr=False)
 
     data_parser: t.ClassVar = rqa.Lazy(
-        lambda: rqa.FixedMapping(
-            rqa.RequiredArgument(
-                "id",
-                rqa.SimpleValue.int,
-                doc="The id of the grader.",
-            ),
-            rqa.RequiredArgument(
-                "name",
-                rqa.SimpleValue.str,
-                doc="The name of the grader",
-            ),
-            rqa.RequiredArgument(
-                "weight",
-                rqa.SimpleValue.float,
-                doc=(
-                    "The division weight of the grader, if no division is"
-                    " setup this will be 0."
+        lambda: UserWithoutGroup.data_parser.parser.combine(
+            rqa.FixedMapping(
+                rqa.RequiredArgument(
+                    "weight",
+                    rqa.SimpleValue.float,
+                    doc=(
+                        "The division weight of the grader, if no division is"
+                        " setup this will be 0."
+                    ),
                 ),
-            ),
-            rqa.RequiredArgument(
-                "done",
-                rqa.SimpleValue.bool,
-                doc=(
-                    "Did this grader indicate that grading has finished? NOTE:"
-                    " This field will be removed or changed in a future"
-                    " release."
+                rqa.RequiredArgument(
+                    "done",
+                    rqa.SimpleValue.bool,
+                    doc=(
+                        "Did this grader indicate that grading has finished?"
+                        " NOTE: This field will be removed or changed in a"
+                        " future release."
+                    ),
                 ),
-            ),
+            )
         ).use_readable_describe(True)
     )
 
     def to_dict(self) -> t.Dict[str, t.Any]:
         res: t.Dict[str, t.Any] = {
-            "id": to_dict(self.id),
-            "name": to_dict(self.name),
             "weight": to_dict(self.weight),
             "done": to_dict(self.done),
+            "id": to_dict(self.id),
+            "name": to_dict(self.name),
+            "username": to_dict(self.username),
+            "is_test_student": to_dict(self.is_test_student),
+            "tenant_id": to_dict(self.tenant_id),
         }
         return res
 
@@ -76,10 +68,21 @@ class AssignmentGrader:
         parsed = cls.data_parser.try_parse(d)
 
         res = cls(
-            id=parsed.id,
-            name=parsed.name,
             weight=parsed.weight,
             done=parsed.done,
+            id=parsed.id,
+            name=parsed.name,
+            username=parsed.username,
+            is_test_student=parsed.is_test_student,
+            tenant_id=parsed.tenant_id,
         )
         res.raw_data = d
         return res
+
+
+import os
+
+if os.getenv("CG_GENERATING_DOCS", "False").lower() in ("", "true"):
+    # fmt: off
+    pass
+    # fmt: on

{codegrade-16.1.56 → codegrade-16.1.59}/codegrade/models/extended_user.py

@@ -25,7 +25,7 @@ class ExtendedUser(User):
 
     #: The email of the user. This will only be provided for the currently
     #: logged in user.
-    email: "str"
+    email: "t.Optional[str]"
     #: Can this user see hidden assignments at least in one course.
     hidden: "bool"
     #: The payments this user did. This will only be provided for the currently
@@ -44,7 +44,7 @@ class ExtendedUser(User):
             rqa.FixedMapping(
                 rqa.RequiredArgument(
                     "email",
-                    rqa.SimpleValue.str,
+                    rqa.Nullable(rqa.SimpleValue.str),
                     doc=(
                         "The email of the user. This will only be provided for"
                         " the currently logged in user."