feat: use new dbt model names

openedx · Jan 30, 2025 · 1f89961 · 1f89961
1 parent 445b86b
commit 1f89961
Show file tree

Hide file tree

Showing 55 changed files with 745 additions and 932 deletions.
diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py
@@ -338,25 +338,7 @@
         (
             "SUPERSET_DASHBOARD_LOCALES",
             [
-                "ar",
-                "da",
-                "de_DE",
-                "el",
                 "en",
-                "es_419",
-                "es_ES",
-                "fr_CA",
-                "he",
-                "hi",
-                "id",
-                "it_IT",
-                "pt_BR",
-                "pt_PT",
-                "ru",
-                "th",
-                "tr_TR",
-                "uk",
-                "zh_CN",
             ],
         ),
         ("SUPERSET_EXTRA_JINJA_FILTERS", {}),
@@ -385,8 +367,8 @@
         # DBT_PROFILE_* settings get passed into the dbt_profile.yml file.
         # For now we are pulling this from github, which should allow maximum
         # flexibility for forking, running branches, specific versions, etc.
-        ("DBT_REPOSITORY", "https://github.com/openedx/aspects-dbt"),
-        ("DBT_BRANCH", "v3.33.9"),
+        ("DBT_REPOSITORY", "https://github.com/saraburns1/aspects-dbt"),
+        ("DBT_BRANCH", "rearrangemodels"),
         ("DBT_SSH_KEY", ""),
         ("DBT_STATE_DIR", "/app/aspects-dbt/state"),
         ("DBT_PROFILES_DIR", "/app/aspects/dbt/"),

diff --git a/...spects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_f909e0.yaml b/...spects/build/aspects-superset/openedx-assets/assets/charts/Course_Information_f909e0.yaml
@@ -12,6 +12,7 @@ params:
     operator: TEMPORAL_RANGE
     subject: enrolled_at
   all_columns: []
+  annotation_layers: []
   color_pn: true
   column_config:
     Avg Course Grade:
@@ -91,7 +92,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 60
+    id: 281
     type: table
   force: false
   form_data:
@@ -102,6 +103,7 @@ query_context:
       operator: TEMPORAL_RANGE
       subject: enrolled_at
     all_columns: []
+    annotation_layers: []
     color_pn: true
     column_config:
       Avg Course Grade:
@@ -136,9 +138,7 @@ query_context:
       column: Active Within Last 7 Days
       operator: '>'
       targetValue: 0
-    dashboards:
-    - 24
-    datasource: 60__table
+    datasource: 281__table
     extra_form_data: {}
     force: false
     groupby:
@@ -181,7 +181,7 @@ query_context:
     result_type: full
     row_limit: 1000
     show_cell_bars: true
-    slice_id: 119
+    slice_id: 121
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       enrolled_at: true

diff --git a/...aspects/build/aspects-superset/openedx-assets/assets/charts/Current_Enrollees_00de2f.yaml b/...aspects/build/aspects-superset/openedx-assets/assets/charts/Current_Enrollees_00de2f.yaml
@@ -39,7 +39,7 @@ params:
   y_axis_format: ',d'
 query_context:
   datasource:
-    id: 35
+    id: 121
     type: table
   force: false
   form_data:
@@ -68,14 +68,14 @@ query_context:
       subject: enrollment_status
     annotation_layers: []
     conditional_formatting: []
-    datasource: 35__table
+    datasource: 121__table
     extra_form_data: {}
     force: false
     header_font_size: 0.4
     metric: number_of_learners
     result_format: json
     result_type: full
-    slice_id: 8
+    slice_id: 1021
     subheader_font_size: 0.2
     time_format: smart_date
     viz_type: big_number_total

diff --git a/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml b/...aspects/build/aspects-superset/openedx-assets/assets/charts/Enrollment_Counts_8230a3.yaml
@@ -34,7 +34,7 @@ params:
   viz_type: pivot_table_v2
 query_context:
   datasource:
-    id: 221
+    id: 261
     type: table
   force: false
   form_data:
@@ -45,12 +45,11 @@ query_context:
       operator: TEMPORAL_RANGE
       subject: emission_time
     aggregateFunction: Sum
+    annotation_layers: []
     colOrder: key_a_to_z
     colSubTotals: false
     conditional_formatting: []
-    dashboards:
-    - 3141
-    datasource: 221__table
+    datasource: 261__table
     date_format: smart_date
     extra_form_data: {}
     force: false
@@ -66,7 +65,7 @@ query_context:
     result_type: full
     rowOrder: key_a_to_z
     row_limit: 50000
-    slice_id: 1081
+    slice_id: 1141
     temporal_columns_lookup: {}
     time_grain_sqla: P1D
     valueFormat: SMART_NUMBER

diff --git a/...ld/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_and_Results_ba14d2.yaml b/...ld/aspects-superset/openedx-assets/assets/charts/Problem_Attempts_and_Results_ba14d2.yaml
@@ -113,7 +113,7 @@ params:
   viz_type: table
 query_context:
   datasource:
-    id: 600
+    id: 564
     type: table
   force: false
   form_data:
@@ -130,6 +130,7 @@ query_context:
       subject: emission_time
     all_columns: []
     allow_render_html: true
+    annotation_layers: []
     color_pn: true
     column_config:
       correct_percent:
@@ -167,9 +168,7 @@ query_context:
       column: median_attemps
       operator: '>'
       targetValue: 5
-    dashboards:
-    - 303
-    datasource: 600__table
+    datasource: 564__table
     extra_form_data: {}
     force: false
     groupby:
@@ -197,7 +196,7 @@ query_context:
     row_limit: 1000
     server_page_length: 10
     show_cell_bars: true
-    slice_id: 169
+    slice_id: 761
     table_timestamp_format: smart_date
     temporal_columns_lookup:
       emission_time: true
@@ -315,7 +314,6 @@ query_context:
       label: AVG(course_order)
       optionName: metric_fy7mao4qznk_sumf5x11o8i
       sqlExpression: null
-    time_offsets: []
     url_params: {}
   result_format: json
   result_type: full

diff --git a/.../aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_6b7610.yaml b/.../aspects/build/aspects-superset/openedx-assets/assets/charts/Video_Engagement_6b7610.yaml
@@ -7,7 +7,6 @@ description: null
 params:
   adhoc_filters: []
   all_columns: []
-  annotation_layers: []
   color_pn: true
   column_config:
     rewatched_percent:
@@ -30,7 +29,6 @@ params:
   percent_metrics: []
   query_mode: aggregate
   row_limit: 50000
-  server_page_length: 10
   show_cell_bars: false
   table_timestamp_format: smart_date
   temporal_columns_lookup: {}
@@ -51,7 +49,7 @@ query_context:
         d3NumberFormat: ',.1%'
     conditional_formatting: []
     dashboards:
-    - 241
+    - 661
     datasource: 161__table
     extra_form_data: {}
     force: false
@@ -71,7 +69,6 @@ query_context:
     result_format: json
     result_type: full
     row_limit: 50000
-    server_page_length: 10
     show_cell_bars: false
     slice_id: 641
     table_timestamp_format: smart_date