Merge pull request #187 from digitalghost-dev/1.7.0

1.7.0

Author: digitalghost-dev

.github/workflows/ci.yml

@@ -30,7 +30,7 @@ on:
       - main
 
 env:
-  VERSION_NUMBER: 'v1.6.2'
+  VERSION_NUMBER: 'v1.7.0'
   DOCKERHUB_REGISTRY_NAME: 'digitalghostdev/poke-cli'
   AWS_REGION: 'us-west-2'
 

.gitignore

@@ -61,3 +61,5 @@ card_data/.tmp*/**
 
 card_data/pipelines/poke_cli_dbt/.user.yml
 /card_data/supabase/
+
+card_data/~/

.goreleaser.yml

@@ -14,7 +14,7 @@ builds:
       - windows
       - darwin
     ldflags:
-      - -s -w -X main.version=v1.6.2
+      - -s -w -X main.version=v1.7.0
 
 archives:
   - formats: [ 'zip' ]

Dockerfile

@@ -8,7 +8,7 @@ RUN go mod download
 
 COPY . .
 
-RUN go build -ldflags "-X main.version=v1.6.2" -o poke-cli .
+RUN go build -ldflags "-X main.version=v1.7.0" -o poke-cli .
 
 # build 2
 FROM --platform=$BUILDPLATFORM alpine:3.22

README.md

@@ -2,7 +2,7 @@
     <img height="250" width="350" src="pokemon.svg" alt="pokemon-logo"/>
     <h1>Pokémon CLI</h1>
     <img src="https://img.shields.io/github/v/release/digitalghost-dev/poke-cli?style=flat-square&logo=git&logoColor=FFCC00&label=Release%20Version&labelColor=EEE&color=FFCC00" alt="version-label">
-    <img src="https://img.shields.io/docker/image-size/digitalghostdev/poke-cli/v1.6.2?arch=arm64&style=flat-square&logo=docker&logoColor=FFCC00&labelColor=EEE&color=FFCC00" alt="docker-image-size">
+    <img src="https://img.shields.io/docker/image-size/digitalghostdev/poke-cli/v1.7.0?arch=arm64&style=flat-square&logo=docker&logoColor=FFCC00&labelColor=EEE&color=FFCC00" alt="docker-image-size">
     <img src="https://img.shields.io/github/actions/workflow/status/digitalghost-dev/poke-cli/ci.yml?branch=main&style=flat-square&logo=github&logoColor=FFCC00&label=CI&labelColor=EEE&color=FFCC00" alt="ci-status-badge">
 </div>
 <div align="center">
@@ -91,11 +91,11 @@ Cloudsmith is a fully cloud-based service that lets you easily create, store, an
 3. Choose how to interact with the container:
    * Run a single command and exit:
     ```bash
-    docker run --rm -it digitalghostdev/poke-cli:v1.6.2 <command> [subcommand] flag]
+    docker run --rm -it digitalghostdev/poke-cli:v1.7.0 <command> [subcommand] flag]
     ```
    * Enter the container and use its shell:
     ```bash
-    docker run --rm -it --name poke-cli --entrypoint /bin/sh digitalghostdev/poke-cli:v1.6.2 -c "cd /app && exec sh"
+    docker run --rm -it --name poke-cli --entrypoint /bin/sh digitalghostdev/poke-cli:v1.7.0 -c "cd /app && exec sh"
    # placed into the /app directory, run the program with './poke-cli'
    # example: ./poke-cli ability swift-swim
     ```
@@ -158,6 +158,7 @@ By running `poke-cli [-h | --help]`, it'll display information on how to use the
 │                                                               │
 │ COMMANDS:                                                     │
 │    ability         Get details about an ability               │
+│    berry           Get details about a berry                  │
 │    item            Get details about an item                  │
 │    move            Get details about a move                   │
 │    natures         Get details about all natures              │
@@ -182,7 +183,7 @@ Below is a list of the planned/completed commands and flags:
 
 - [x] `ability`: get data about an ability.
     - [x] `-p | --pokemon`: display Pokémon that learn this ability.
-- [ ] `berry`: get data about a berry.
+- [x] `berry`: get data about a berry.
 - [x] `item`: get data about an item.
 - [x] `move`: get data about a move.
     - [ ] `-p | --pokemon`: display Pokémon that learn this move.

card_data/pipelines/defs/transformation/transform_data.py

@@ -2,42 +2,17 @@
 from dagster_dbt import DbtCliResource, dbt_assets
 from pathlib import Path
 
-from ..load.load_data import (
-    load_series_data,
-    data_quality_check_on_series,
-    load_set_data,
-    load_card_data
-)
-
 DBT_PROJECT_PATH = Path(__file__).joinpath("..", "..", "..", "poke_cli_dbt").resolve()
 
-@dg.asset(deps=[load_series_data, data_quality_check_on_series, load_set_data, load_card_data], kinds=["dbt"])
-def dbt_transformation(context: dg.AssetExecutionContext):
-    """Run dbt build after all extract and load operations complete"""
-    import subprocess
-    import os
-    
-    # Set environment variables for dbt
-    env = os.environ.copy()
-    env["SUPABASE_PASSWORD"] = os.getenv("SUPABASE_PASSWORD", "")
-    
-    # Run dbt build
-    result = subprocess.run(
-        ["dbt", "build"],
-        cwd=str(DBT_PROJECT_PATH),
-        env=env,
-        capture_output=True,
-        text=True
-    )
-    
-    if result.returncode != 0:
-        context.log.error(f"dbt build failed: {result.stderr}")
-        raise Exception(f"dbt build failed: {result.stderr}")
-    
-    context.log.info(f"dbt build completed successfully: {result.stdout}")
-    return "dbt build completed"
+@dbt_assets(manifest=DBT_PROJECT_PATH / "target" / "manifest.json")
+def poke_cli_dbt_assets(context: dg.AssetExecutionContext, dbt: DbtCliResource):
+    """
+    dbt assets that transform staging data into final models.
+    """
+    yield from dbt.cli(["build"], context=context).stream()
 
-# Create definitions for this transformation
+dbt_resource = DbtCliResource(project_dir=DBT_PROJECT_PATH)
 defs = dg.Definitions(
-    assets=[dbt_transformation]
+    assets=[poke_cli_dbt_assets],
+    resources={"dbt": dbt_resource}
 )

card_data/pipelines/poke_cli_dbt/dbt_project.yml

@@ -0,0 +1,24 @@
+name: 'poke_cli_dbt'
+version: '1.7.0'
+
+profile: 'poke_cli_dbt'
+
+model-paths: ["models"]
+analysis-paths: ["analyses"]
+test-paths: ["tests"]
+seed-paths: ["seeds"]
+macro-paths: ["macros"]
+snapshot-paths: ["snapshots"]
+
+# directories removed by 'dbt clean'
+clean-targets:
+  - "target"
+  - "dbt_packages"
+
+models:
+  poke_cli_dbt:
+    # Transform staging data to public schema
+    +materialized: table
+
+on-run-end:
+  - "{{ create_relationships() }}"

card_data/pipelines/poke_cli_dbt/macros/create_relationships.sql

@@ -0,0 +1,5 @@
+{% macro create_relationships() %}
+    ALTER TABLE {{ ref('series') }} ADD CONSTRAINT pk_series PRIMARY KEY (id);
+    ALTER TABLE {{ ref('sets') }} ADD CONSTRAINT pk_sets PRIMARY KEY (set_id);
+    ALTER TABLE {{ ref('cards') }} ADD CONSTRAINT pk_cards PRIMARY KEY (id);
+{% endmacro %}

card_data/pipelines/poke_cli_dbt/macros/create_rls.sql

@@ -0,0 +1,4 @@
+{% macro enable_rls() %}
+    ALTER TABLE {{ this }} ENABLE ROW LEVEL SECURITY;
+    CREATE POLICY "Enable read access for all users" ON {{ this }} TO PUBLIC USING (true);
+{% endmacro %}

card_data/pipelines/poke_cli_dbt/models/cards.sql

@@ -1,4 +1,7 @@
-{{ config(materialized='table') }}
+{{ config(
+    materialized='table',
+    post_hook="{{ enable_rls() }}"
+) }}
 
-SELECT  id, image, name, "localId", category
-FROM {{ source('staging', 'cards') }}
+SELECT id, image, name, "localId", category, hp
+FROM {{ source('staging', 'cards') }}