Merge branch 'master' into sarc-331

pyproject.toml

@@ -70,6 +70,7 @@ disable = [
     "import-outside-toplevel",  # These imports are useful to reduce loading times
     "too-many-arguments",
     "too-many-locals",
+    "too-many-positional-arguments",
     "missing-module-docstring",
     "missing-class-docstring",
     "missing-function-docstring",

sarc/alerts/cache.py

@@ -22,7 +22,6 @@ class CachedResult:
 
 @dataclass(unsafe_hash=True)
 class Timespan:
-
     # Time duration
     duration: timedelta
 

sarc/alerts/common.py

@@ -315,7 +315,6 @@ class HealthMonitorConfig:
     checks: dict[str, TaggedSubclass[HealthCheck]] = field(default_factory=dict)
 
     def __post_init__(self):
-
         all_checks = {}
 
         # Parameterize the checks

sarc/client/users/api.py

@@ -29,6 +29,8 @@ class User(BaseModel):
     mila: Credentials
     drac: Optional[Credentials]
 
+    teacher_delegations: Optional[list[str]] = None
+
     mila_ldap: dict
     drac_members: Optional[dict]
     drac_roles: Optional[dict]

sarc/users/acquire.py

@@ -20,6 +20,10 @@
 from sarc.users.mymila import fetch_mymila
 from sarc.users.read_mila_ldap import fetch_ldap
 from sarc.users.revision import commit_matches_to_database
+from sarc.users.users_exceptions import (
+    apply_users_delegation_exceptions,
+    apply_users_supervisor_exceptions,
+)
 
 
 def run(
@@ -135,6 +139,12 @@ def run(
         for _, user in DD_persons_matched.items():
             fill_computed_fields(user)
 
+        # apply delegation exceptions
+        apply_users_delegation_exceptions(DD_persons_matched, cfg.ldap, span)
+
+        # apply supervisor exceptions
+        apply_users_supervisor_exceptions(DD_persons_matched, cfg.ldap, span)
+
         # These associations can now be propagated to the database.
         span.add_event("Committing matches to database ...")
         commit_matches_to_database(

sarc/users/revision.py

@@ -114,6 +114,7 @@ def user_insert(newuser: dict) -> list:
         "mila",
         "drac_roles",
         "drac_members",
+        "teacher_delegations",
     )
 
     update = {

sarc/users/supervisor.py

@@ -177,6 +177,7 @@ def sortkey(x):
     return sorted(supervisors, key=sortkey, reverse=True)
 
 
+# pylint: disable=too-many-branches
 def resolve_supervisors(
     ldap_people: list[dict], group_to_prof: dict, exceptions: dict
 ) -> SupervisorMatchingErrors:

sarc/users/users_exceptions.py

@@ -0,0 +1,56 @@
+from sarc.config import LDAPConfig
+from sarc.users.read_mila_ldap import load_ldap_exceptions
+
+
+def apply_users_delegation_exceptions(DD_persons, ldap_config: LDAPConfig, span):
+    """
+    Apply manual exceptions to users;
+    these exceptions are defined in the exceptions.json file refered in the LDAPConfig.
+    """
+    span.add_event("Applying users delegation exceptions ...")
+    # Load exceptions
+    exceptions = load_ldap_exceptions(ldap_config)
+
+    for _, user in DD_persons.items():
+        if (
+            exceptions
+            and user["mila_ldap"]["mila_email_username"] in exceptions["delegations"]
+        ):
+            span.add_event(
+                f"Applying delegation exception for {user['mila_ldap']['mila_email_username']} ..."
+            )
+            user["teacher_delegations"] = exceptions["delegations"][
+                user["mila_ldap"]["mila_email_username"]
+            ]
+
+
+def apply_users_supervisor_exceptions(DD_persons, ldap_config: LDAPConfig, span):
+    """
+    Apply manual exceptions to users;
+    these exceptions are defined in the exceptions.json file refered in the LDAPConfig.
+    """
+    span.add_event("Applying users supervisor exceptions ...")
+    # Load exceptions
+    exceptions = load_ldap_exceptions(ldap_config)
+
+    for _, user in DD_persons.items():
+        # if there is a supervisors override, use it whatever the student status may be
+        if exceptions and user["mila_ldap"]["mila_email_username"] in exceptions.get(
+            "supervisors_overrides", []
+        ):
+            span.add_event(
+                f"Applying supervisor exception for {user['mila_ldap']['mila_email_username']} ..."
+            )
+            supervisors = exceptions["supervisors_overrides"][
+                user["mila_ldap"]["mila_email_username"]
+            ]
+            user["mila_ldap"]["supervisor"] = None
+            user["mila_ldap"]["co_supervisor"] = None
+            if len(supervisors) >= 1:
+                user["mila_ldap"]["supervisor"] = supervisors[0]
+            else:
+                user["mila_ldap"]["supervisor"] = None
+            if len(supervisors) >= 2:
+                user["mila_ldap"]["co_supervisor"] = supervisors[1]
+            else:
+                user["mila_ldap"]["co_supervisor"] = None

tests/conftest.py

@@ -216,8 +216,24 @@ def file_contents():
     """
     exceptions_json_path = """
     {
-        "not_prof": [],
-        "not_student": []
+        "not_teacher": [],
+        "not_student": [],
+        "delegations": {
+            "[email protected]": [
+                "[email protected]",            
+                "[email protected]"            
+            ]
+        },
+        "supervisors_overrides": {
+            "[email protected]": [
+                "[email protected]"        
+            ],
+            "[email protected]": [
+                "[email protected]",            
+                "[email protected]"            
+            ]
+        }
+        
     }
     """
 

tests/functional/cli/acquire/test_acquire_users.py

@@ -118,6 +118,37 @@ def test_acquire_users(cli_main, patch_return_values, mock_file, captrace):
     js_user = get_user(drac_account_username="stranger.person")
     assert js_user is None
 
+    # test supervisor overrides
+    js_user = get_user(mila_email_username="[email protected]")
+    assert js_user is not None
+    assert js_user.mila_ldap["supervisor"] == "[email protected]"
+    assert js_user.mila_ldap["co_supervisor"] == None
+
+    js_user = get_user(mila_email_username="[email protected]")
+    assert js_user is not None
+    assert js_user.mila_ldap["supervisor"] == "[email protected]"
+    assert js_user.mila_ldap["co_supervisor"] == "[email protected]"
+
+    # test delegations
+    # john.smith003 should have delegations for john.smith004 and john.smith005
+    # john.smith004 should have no delegations
+    # john.smith005 should have no delegations
+
+    js_user = get_user(mila_email_username="[email protected]")
+    assert js_user is not None
+    assert js_user.teacher_delegations is not None
+    assert "[email protected]" in js_user.teacher_delegations
+    assert "[email protected]" in js_user.teacher_delegations
+    assert "[email protected]" not in js_user.teacher_delegations
+
+    js_user = get_user(mila_email_username="[email protected]")
+    assert js_user is not None
+    assert js_user.teacher_delegations == None
+
+    js_user = get_user(mila_email_username="[email protected]")
+    assert js_user is not None
+    assert js_user.teacher_delegations == None
+
     # Check traces
     # NB: We don't check logging here, because
     # this execution won't display "acquire users" logs,
@@ -132,14 +163,28 @@ def test_acquire_users(cli_main, patch_return_values, mock_file, captrace):
 
     assert spans[1].name == "match_drac_to_mila_accounts"
     assert spans[1].status.status_code == StatusCode.OK
-    assert len(spans[1].events) == 4
+    assert len(spans[1].events) == 9
     assert (
         spans[1].events[0].name
         == "Loading mila_ldap, drac_roles and drac_members from files ..."
     )
     assert spans[1].events[1].name == "Loading matching config from file ..."
     assert spans[1].events[2].name == "Matching DRAC/CC to mila accounts ..."
-    assert spans[1].events[3].name == "Committing matches to database ..."
+    assert spans[1].events[3].name == "Applying users delegation exceptions ..."
+    assert (
+        spans[1].events[4].name
+        == "Applying delegation exception for [email protected] ..."
+    )
+    assert spans[1].events[5].name == "Applying users supervisor exceptions ..."
+    assert (
+        spans[1].events[6].name
+        == "Applying supervisor exception for [email protected] ..."
+    )
+    assert (
+        spans[1].events[7].name
+        == "Applying supervisor exception for [email protected] ..."
+    )
+    assert spans[1].events[8].name == "Committing matches to database ..."
 
 
 @pytest.mark.parametrize(
@@ -184,12 +229,16 @@ def test_acquire_users_supervisors(
     nbr_users = 4
     nbr_profs = 2
 
+    # for the test we will use the user with index 3,
+    # which is the first user who has no supervisor override in the mock data
+    # so that this test won't be affected by the previous test
+
     patch_return_values(
         {
             "sarc.users.read_mila_ldap.query_ldap": fake_raw_ldap_data(
                 nbr_users,
                 hardcoded_values_by_user={
-                    2: {  # The first user who is not a prof is the one with index 2
+                    3: {  # The first user who is not a prof is the one with index 3
                         "supervisor": ldap_supervisor
                     }
                 },
@@ -198,7 +247,7 @@ def test_acquire_users_supervisors(
                 nbr_users=nbr_users,
                 nbr_profs=nbr_profs,
                 hardcoded_values_by_user={
-                    2: {  # The first user who is not a prof is the one with index 2
+                    3: {  # The first user who is not a prof is the one with index 3
                         "Supervisor Principal": mymila_supervisor
                     }
                 },
@@ -221,8 +270,8 @@ def test_acquire_users_supervisors(
 
     # Validate the results of all of this by inspecting the database.
     js_user = get_user(
-        mila_email_username=f"john.smith002@mila.quebec"
-    )  # We modified the user with index 2; thus this is the one we retrieve
+        mila_email_username=f"john.smith003@mila.quebec"
+    )  # We modified the user with index 3; thus this is the one we retrieve
     assert js_user.mila_ldap["supervisor"] == expected_supervisor
 
 
@@ -268,12 +317,16 @@ def test_acquire_users_co_supervisors(
     nbr_users = 4
     nbr_profs = 2
 
+    # for the test we will use the user with index 3,
+    # which is the first user who has no supervisor override in the mock data
+    # so that this test won't be affected by the previous test
+
     patch_return_values(
         {
             "sarc.users.read_mila_ldap.query_ldap": fake_raw_ldap_data(
                 nbr_users,
                 hardcoded_values_by_user={
-                    2: {  # The first user who is not a prof is the one with index 2
+                    3: {  # The first user who is not a prof is the one with index 3
                         "co_supervisor": ldap_co_supervisor
                     }
                 },
@@ -282,7 +335,7 @@ def test_acquire_users_co_supervisors(
                 nbr_users=nbr_users,
                 nbr_profs=nbr_profs,
                 hardcoded_values_by_user={
-                    2: {  # The first user who is not a prof is the one with index 2
+                    3: {  # The first user who is not a prof is the one with index 3
                         "Co-Supervisor": mymila_co_supervisor
                     }
                 },
@@ -305,8 +358,8 @@ def test_acquire_users_co_supervisors(
 
     # Validate the results of all of this by inspecting the database.
     js_user = get_user(
-        mila_email_username=f"john.smith002@mila.quebec"
-    )  # We modified the user with index 2; thus this is the one we retrieve
+        mila_email_username=f"john.smith003@mila.quebec"
+    )  # We modified the user with index 3; thus this is the one we retrieve
     assert js_user.mila_ldap["co_supervisor"] == expected_co_supervisor
 
 
@@ -411,12 +464,26 @@ def test_acquire_users_prompt(
 
     assert spans[1].name == "match_drac_to_mila_accounts"
     assert spans[1].status.status_code == StatusCode.OK
-    assert len(spans[1].events) == 5
+    assert len(spans[1].events) == 10
     assert (
         spans[1].events[0].name
         == "Loading mila_ldap, drac_roles and drac_members from files ..."
     )
     assert spans[1].events[1].name == "Loading matching config from file ..."
     assert spans[1].events[2].name == "Matching DRAC/CC to mila accounts ..."
-    assert spans[1].events[3].name == "Committing matches to database ..."
-    assert spans[1].events[4].name == "Saving 1 manual matches ..."
+    assert spans[1].events[3].name == "Applying users delegation exceptions ..."
+    assert (
+        spans[1].events[4].name
+        == "Applying delegation exception for [email protected] ..."
+    )
+    assert spans[1].events[5].name == "Applying users supervisor exceptions ..."
+    assert (
+        spans[1].events[6].name
+        == "Applying supervisor exception for [email protected] ..."
+    )
+    assert (
+        spans[1].events[7].name
+        == "Applying supervisor exception for [email protected] ..."
+    )
+    assert spans[1].events[8].name == "Committing matches to database ..."
+    assert spans[1].events[9].name == "Saving 1 manual matches ..."

tests/functional/client/test_func_get_user/test_get_user.txt

@@ -7,6 +7,7 @@ Found user:
         "active": true
     },
     "drac": null,
+    "teacher_delegations": null,
     "mila_ldap": {
         "co_supervisor": null,
         "display_name": "M/Ms Bonhomme",

tests/functional/client/test_func_get_user/test_get_users.txt

@@ -7,6 +7,7 @@ Found 3 users(s):
         "active": true
     },
     "drac": null,
+    "teacher_delegations": null,
     "mila_ldap": {
         "co_supervisor": null,
         "display_name": "M/Ms Bonhomme",
@@ -34,6 +35,7 @@ Found 3 users(s):
         "email": "[email protected]",
         "active": true
     },
+    "teacher_delegations": null,
     "mila_ldap": {
         "co_supervisor": null,
         "display_name": "M/Ms Petitbonhomme",
@@ -74,6 +76,7 @@ Found 3 users(s):
         "email": "[email protected]",
         "active": true
     },
+    "teacher_delegations": null,
     "mila_ldap": {
         "co_supervisor": null,
         "display_name": "M/Ms Beaubonhomme",

tests/functional/jobs/test_func_load_job_series.py

@@ -93,6 +93,7 @@
     "user.name",
     "user.record_start",
     "user.record_end",
+    "user.teacher_delegations",
     "user.mila.username",
     "user.mila.email",
     "user.mila.active",