diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index fed74f699e..90a42394ff 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -8,20 +8,20 @@ plugins: uri: https://github.com/trunk-io/plugins lint: enabled: - - pyright@1.1.386 + - pyright@1.1.387 - actionlint@1.7.3 - git-diff-check - gitleaks@8.21.1 - hadolint@2.12.0 - isort@5.13.2 - markdownlint@0.42.0 - - osv-scanner@1.9.0 + - osv-scanner@1.9.1 - oxipng@9.1.2 - prettier@3.3.3 - - ruff@0.7.1 + - ruff@0.7.2 - shellcheck@0.10.0 - shfmt@3.6.0 - - sqlfluff@3.2.4 + - sqlfluff@3.2.5 - sqlfmt@0.23.2 - svgo@3.3.2 - taplo@0.9.3 diff --git a/src/dbt/kipptaf/models/extracts/google/directory/rpt_google_directory__users_import.sql b/src/dbt/kipptaf/models/extracts/google/directory/rpt_google_directory__users_import.sql index 1d68b6db3b..ff07c86e40 100644 --- a/src/dbt/kipptaf/models/extracts/google/directory/rpt_google_directory__users_import.sql +++ b/src/dbt/kipptaf/models/extracts/google/directory/rpt_google_directory__users_import.sql @@ -7,12 +7,14 @@ with se.school_name, se.is_out_of_district, - to_hex(sha1(se.student_web_password)) as `password`, - if(se.grade_level >= 3, true, false) as `changePasswordAtNextLogin`, - if(se.enroll_status = 0, false, true) as `suspended`, concat( 'group-students-', lower(se.region), '@teamstudents.org' ) as `groupKey`, + + to_hex(sha1(se.student_web_password)) as `password`, + + if(se.grade_level >= 3, true, false) as `changePasswordAtNextLogin`, + if(se.enroll_status = 0, false, true) as `suspended`, from {{ ref("base_powerschool__student_enrollments") }} as se where se.rn_all = 1 and se.student_email_google is not null ), @@ -30,18 +32,17 @@ with u.name__given_name as given_name_target, u.name__family_name as family_name_target, u.suspended as suspended_target, - - o.org_unit_path as org_unit_path_target, + u.org_unit_path as org_unit_path_target, 'SHA-1' as `hashFunction`, + if(u.primary_email is not null, true, false) as is_matched, + if( s.suspended or s.is_out_of_district, '/Students/Disabled', o.org_unit_path ) as `orgUnitPath`, - - if(u.primary_email is not null, true, false) as is_matched, from students as s left join {{ ref("stg_google_directory__users") }} as u diff --git a/src/teamster/libraries/deanslist/resources.py b/src/teamster/libraries/deanslist/resources.py index 512aaeb8b4..b323fec93b 100644 --- a/src/teamster/libraries/deanslist/resources.py +++ b/src/teamster/libraries/deanslist/resources.py @@ -10,7 +10,7 @@ class DeansListResource(ConfigurableResource): subdomain: str api_key_map: str - request_timeout: float = 30.0 + request_timeout: float = 60.0 _session: Session = PrivateAttr(default_factory=Session) _base_url: str = PrivateAttr()