Skip to content

Commit

Permalink
[WT-7] Improve Taskfile and development flow (#17)
Browse files Browse the repository at this point in the history
This PR seeks to improve the Taskfile easy setup path. In doing so, it
removes SQLFluff temporarily until a path forward for using SQFluff and
the dbt Cloud CLI can be resolved. SQLFluff's dbt templater need
dbt-core to run, which eats the dbt bin in the virtual environment that
would otherwise be the Cloud CLI. It's more important that this repo
supports the Cloud CLI for the time being, so we're removing SQLFluff.

SQL linting is still performed by pre-commit, as it installs isolated
environments in which to run all its hooks, so SQL linting on commit as
well as on demand via pre-commit commands is still available.
  • Loading branch information
gwenwindflower authored Mar 20, 2024
1 parent ac611f0 commit 2eec48b
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 275 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ dbt_packages/
logs/

.DS_Store

.user.yml
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ repos:
- id: trailing-whitespace
- id: requirements-txt-fixer
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.2.1
rev: v0.3.3
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/sqlfluff/sqlfluff
rev: "2.3.5"
rev: "3.0.1"
hooks:
- id: sqlfluff-lint
additional_dependencies:
[
"dbt-metricflow[duckdb,snowflake,postgres]~=0.5.0",
"sqlfluff-templater-dbt~=2.3.5",
"dbt-metricflow[duckdb,snowflake,postgres]~=0.6.0",
"sqlfluff-templater-dbt~=3.0.1",
]
- id: sqlfluff-fix
additional_dependencies:
[
"dbt-metricflow[duckdb,snowflake,postgres]~=0.5.0",
"sqlfluff-templater-dbt~=2.3.5",
"dbt-metricflow[duckdb,snowflake,postgres]~=0.6.0",
"sqlfluff-templater-dbt~=3.0.1",
]
- repo: https://github.com/psf/black
rev: "24.2.0"
rev: "24.3.0"
hooks:
- id: black
34 changes: 19 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,24 @@ This is a sandbox project for exploring the basic functionality and latest featu

## Platform setup

### dbt Cloud IDE (most beginner friendly)
1. Set up a dbt Cloud account and follow Step 4 in the [Quickstart instructions for your data platform](https://docs.getdbt.com/quickstarts), to connect your platform to dbt Cloud, then follow one of the two paths below to set up your development environment.

1. Set up a dbt Cloud account and follow Step 4 in the [Quickstart instructions for your data platform](https://docs.getdbt.com/quickstarts), to connect your platform to dbt Cloud.
### dbt Cloud IDE (most beginner friendly)

2. Choose the repo you created in Step 1 as the repository for your dbt Project code.
1. Choose the repo you created in Step 1 as the repository for your dbt Project code.

3. Click `Develop` in the top nav, you should be prompted to run a `dbt deps`, which you should do.
2. Click `Develop` in the top nav, you should be prompted to run a `dbt deps`, which you should do.

### dbt Cloud CLI (if you prefer to work locally)

> If you'd like to use the dbt Cloud CLI, but are a little intimidated by the terminal, we've included a task runner called, fittingly, `task`. It's a simple way to run the commands you need to get started with dbt. You can install it by following the instructions [here](https://taskfile.dev/#/installation). We'll call out the `task` based alternative to each command below.
> [!NOTE]
> If you'd like to use the dbt Cloud CLI, but are a little intimidated by the terminal, we've included a task runner called, fittingly, `task`. It's a simple way to run the commands you need to get started with dbt. You can install it by following the instructions [here](https://taskfile.dev/#/installation). We'll call out the `task` based alternative to each command below. You can also run `task setup` to perform all the setup commands at once.
1. Run `git clone [new repo name]` to clone your new repo to your local machine.

2. Set up a virtual environment and activate it. I like to call my virtual environment `.venv` and add it to my `.gitignore` file (we've already done this if you name your virtual environment '.venv') so that I don't accidentally commit it to the repository, but you can call it whatever you want.
2. [Follow Step 1 on this page](https://cloud.getdbt.com/cloud-cli) to install the dbt Cloud CLI, we'll do the other steps in a second.

3. Set up a virtual environment and activate it. I like to call my virtual environment `.venv` and add it to my `.gitignore` file (we've already done this if you name your virtual environment '.venv') so that I don't accidentally commit it to the repository, but you can call it whatever you want.

```shell
python3 -m venv .venv # create a virtual environment
Expand All @@ -40,34 +43,35 @@ This is a sandbox project for exploring the basic functionality and latest featu
source .venv/bin/activate # activate the virtual environment
```

3. Install the project's requirements into your virtual environment.
4. Install the project's requirements into your virtual environment.

```shell
python3 -m pip install -r requirements.txt # install the project's requirements
OR
task install # install the project's requirements
```

4. [Follow steps 2 and 3 on this page](https://cloud.getdbt.com/cloud-cli) to setup dbt Cloud CLI's connection to dbt Cloud, only if you haven't already done so (we handled step 1 above and will do step 4 together next).
5. [Follow steps 2 and 3 on this page](https://cloud.getdbt.com/cloud-cli) to setup dbt Cloud CLI's connection to dbt Cloud, only if you haven't already done so (we handled step 1 above and will do step 4 together next).

5. Double check that your `dbt_project.yml` is set up correctly by running `dbt list`. You should get back a list of models and tests in your project.
6. Double check that your `dbt_project.yml` is set up correctly by running `dbt list`. You should get back a list of models and tests in your project.

## Project setup

Once your development platform of choice is set up, use the following steps to get the project ready for whatever you'd like to do with it.

1. Run `task setup`.

#### OR

1. Run `dbt build` to load the sample data into your raw schema, build your models, and test your project.

2. Delete the `jaffle-data` directory now that the raw data is loaded into the warehouse. It will be loaded into a `raw_jaffle_shop` schema in your warehouse. That both `dev` and `prod` targets are set up to use. Take a look at the `generate_schema_name` macro in the `macros` directory to if you're curious how this is done.

#### OR

1. Run `task build`.

## Pre-commit and linting with SQLFluff

This project uses a tool called [pre-commit](https://pre-commit.com/) to automatically run a suite of of processes on your code, like linters and formatters, when you commit. If it finds an issue and updates a file, you'll need to stage the changes and commit them again (the first commit will not have gone through because pre-commit found and fixed an issue). The outcome of this is that your code will be more consistent automatically, and everybody's changes will be running through the same set of processes. We recommend it for any project. You can see the configuration for pre-commit in the `.pre-commit-config.yaml` file. You can run the checks manually with `pre-commit run --all-files` to see what it does without making a commit.

The most important pre-commit hook that runs in this project is [SQLFluff](https://sqlfluff.com/), which will lint your SQL code. It's configured with the `.sqlfluff` file in the root of the project. You can also run this manually, either to lint your code or to fix it automatically (which also functions loosely as a fairly relaxed formatter), with `sqlfluff lint` and `sqlfluff fix` respectively, but if you don't, it will still run whenever you commit to ensure the committed code is consistent.
The most important pre-commit hook that runs in this project is [SQLFluff](https://sqlfluff.com/), which will lint your SQL code. It's configured with the `.sqlfluff` file in the root of the project. You can also run this manually, either to lint your code or to fix it automatically (which also functions loosely as a fairly relaxed formatter), with `pre-commit run sqlfluff-lint` or `pre-commit run sqlfluff-fix` respectively, but if you don't, it will still run whenever you commit to ensure the committed code is consistent.

SQLFluff offers a few different templating options to deal with Jinja in SQL, this project uses the `dbt` templater, which actually compiles your code with your dbt Core, to ensure maximum correctness. While dbt Cloud does not make use of a `profiles.yml`, dbt Core does, to define how it connects to your warehouse. Therefore, this project needs a `profiles.yml` file for SQLFluff to run. We've included a functioning `profiles.yml` file in the project, as well as a heavily commented `profiles-example.yml` for you to fill out and replace it with. Make sure to do this if you want to run SQLFluff. If you don't, you can remove the `.sqlfluff` and `.sqlfluffignore` files and the `sqlfluff` commands from the `.pre-commit-config.yaml` file to get rid of these checks. The same is true for any other pre-commit hooks you don't want to run.
> [!NOTE]
> SQLFluff's dbt templater relies on dbt Core, which conflicts with dbt Cloud CLI for the time being. Thankfully, pre-commit installs its hooks into isolated environments, so you can still use SQLFluff with dbt Cloud CLI via pre-commit, but you can't call SQLFluff directly. The dbt Labs team is actively working on a solution for this issue.
20 changes: 13 additions & 7 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@ tasks:

install:
cmds:
- python3 -m pip install --upgrade pip
- python3 -m pip install --progress-bar off -- -r requirements.txt
- source .venv/bin/activate && python3 -m pip install --upgrade pip
- source .venv/bin/activate && python3 -m pip install -r requirements.txt --progress-bar off

setup:
build:
cmds:
- dbt deps
- dbt seed
- source .venv/bin/activate && dbt deps
- source .venv/bin/activate && dbt seed
- rm -rf jaffle-data
- dbt run
- dbt test
- source .venv/bin/activate && dbt run
- source .venv/bin/activate && dbt test

setup:
cmds:
- task: venv
- task: install
- task: build
5 changes: 1 addition & 4 deletions dbt_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,10 @@ require-dbt-version: ">=1.7.1"

dbt-cloud:
project-id: 283328 # Put your project id here
# dbt Cloud CLI does not use a profiles.yml, this is for
# SQLFluff's dbt templater
profile: snowflake #Put your profile name here

model-paths: ["models"]
analysis-paths: ["analyses"]
test-paths: ["tests"]
test-paths: ["data-tests"]
seed-paths: ["jaffle-data"]
macro-paths: ["macros"]
snapshot-paths: ["snapshots"]
Expand Down
19 changes: 0 additions & 19 deletions profiles-example.yml

This file was deleted.

25 changes: 0 additions & 25 deletions profiles.yml

This file was deleted.

3 changes: 0 additions & 3 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
dbt~=1.0.0.36.0
pre-commit~=3.6.0
sqlfluff~=2.3.5
sqlfluff-templater-dbt~=2.3.5
Loading

0 comments on commit 2eec48b

Please sign in to comment.