Skip to content

Commit 65c895d

Browse files
committed
change query for RME projects to upload
1 parent 1ff19e8 commit 65c895d

1 file changed

Lines changed: 23 additions & 8 deletions

File tree

pipelines/rme_to_athena/rme_to_athena_parquet.py

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,37 @@
4545
with huc_projects_dex as
4646
(select project_id,
4747
huc,
48-
created_on
49-
from vw_projects
48+
name,
49+
model_version,
50+
model_version_int,
51+
created_on,
52+
created_on_date
53+
from default.vw_projects
5054
WHERE project_type_id = 'rs_metric_engine'
5155
and owner = 'a52b8094-7a1d-4171-955c-ad30ae935296'
5256
AND created_on >= 1735689600
5357
AND (contains(tags, '2025CONUS')
5458
OR contains(tags, 'conus_athena'))),
55-
huc_projects_scraped as
56-
(select substr(huc12, 1, 10) as huc10,
57-
raw_rme_pq2.rme_date_created_ts
58-
from rs_raw.raw_rs_metric_engine2 raw_rme_pq2)
59-
select distinct project_id, huc, created_on, rme_date_created_ts
59+
huc_projects_scraped as (
60+
-- Grouping ensures strictly 1 row per HUC before the join
61+
SELECT substr(huc12, 1, 10) AS huc10,
62+
MIN(rme_date_created_ts) AS oldest_scrape_ts
63+
FROM rs_raw.raw_rs_metric_engine2
64+
GROUP BY substr(huc12, 1, 10)
65+
),
66+
ranked_projects as
67+
(select project_id, huc, created_on, oldest_scrape_ts, created_on_date, model_version, model_version_int, name
68+
,CASE
69+
WHEN ROW_NUMBER() OVER (PARTITION BY huc ORDER BY model_version_int DESC) = 1 THEN true
70+
ELSE false
71+
END AS is_latest_version
6072
from huc_projects_dex dex
6173
left join huc_projects_scraped scr on dex.huc = scr.huc10
6274
where scr.huc10 is null
63-
or scr.rme_date_created_ts < truncate(dex.created_on/1000)*1000
75+
OR scr.oldest_scrape_ts < truncate(dex.created_on/1000)*1000
76+
)
77+
select * from ranked_projects
78+
where is_latest_version
6479
"""
6580

6681

0 commit comments

Comments
 (0)