Merge pull request #272 from SoryRawyer/rds/use-dbt-problem-models

feat: use dbt models for problem datasets
openedx · Aug 7, 2023 · 0670e79 · 0670e79
2 parents f8e70b5 + 2a9074c
commit 0670e79
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 83 deletions.
diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py
@@ -214,7 +214,7 @@
         # 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", "v1.2"),
+        ("DBT_BRANCH", "v1.3.1"),
         # Path to the dbt project inside the repository
         ("DBT_REPOSITORY_PATH", "aspects-dbt/aspects"),
         # This is a pip compliant list of Python packages to install to run dbt

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/fact_learner_problem_summary.yaml
@@ -127,8 +127,8 @@
       warning_text: null
   offset: 0
   params: null
-  schema: null
-  sql: "{% include 'openedx-assets/queries/fact_learner_problem_summary.sql' %}"
+  schema: {{ DBT_PROFILE_TARGET_DATABASE }}
+  sql: null
   table_name: fact_learner_problem_summary
   template_params: null
   uuid: 9362354c-1541-43c2-b769-da9818236298

diff --git a/tutoraspects/templates/openedx-assets/assets/datasets/fact_problem_responses.yaml b/tutoraspects/templates/openedx-assets/assets/datasets/fact_problem_responses.yaml
@@ -127,8 +127,8 @@
       warning_text: null
   offset: 0
   params: null
-  schema: null
-  sql: "{% include 'openedx-assets/queries/fact_problem_responses.sql' %}"
+  schema: {{ DBT_PROFILE_TARGET_DATABASE }}
+  sql: null
   table_name: fact_problem_responses
   template_params: null
   uuid: 511dd5f1-3925-4e9e-ad8a-a227b5680047

diff --git a/tutoraspects/templates/openedx-assets/queries/fact_learner_problem_summary.sql b/tutoraspects/templates/openedx-assets/queries/fact_learner_problem_summary.sql
diff --git a/tutoraspects/templates/openedx-assets/queries/fact_problem_responses.sql b/tutoraspects/templates/openedx-assets/queries/fact_problem_responses.sql
diff --git a/tutoraspects/templates/openedx-assets/queries/hints_per_success.sql b/tutoraspects/templates/openedx-assets/queries/hints_per_success.sql
@@ -1,7 +1,3 @@
-with summary as (
-    {% include 'openedx-assets/queries/fact_learner_problem_summary.sql' %}
-)
-
 select
     org,
     course_name,
@@ -10,7 +6,7 @@ select
     actor_id,
     sum(num_hints_displayed) + sum(num_answers_displayed) as total_hints
 from
-    summary
+    {{ DBT_PROFILE_TARGET_DATABASE }}.fact_learner_problem_summary
 where success = 1
 group by
     org,