Merge pull request #203 from digitalghost-dev/1.8.0

1.8.0

Author: digitalghost-dev

.github/workflows/ci.yml

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

.gitignore

@@ -50,7 +50,6 @@ dbt_packages/
 logs/
 
 target/
-dbt_packages/
 
 card_data/infrastructure/supabase/access-token
 /card_data/infrastructure/supabase/access-token
@@ -61,5 +60,6 @@ card_data/.tmp*/**
 
 card_data/pipelines/poke_cli_dbt/.user.yml
 /card_data/supabase/
+/card_data/sample_scripts/
 
 card_data/~/

.gitleaksignore

@@ -0,0 +1,3 @@
+cmd/card/setslist.go:generic-api-key:116
+cmd/card/cardlist.go:generic-api-key:157
+codecov.yml:generic-api-key:2

.goreleaser.yml

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

Dockerfile

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

README.md

@@ -2,12 +2,9 @@
     <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.7.4?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.8.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">
-    <img src="https://img.shields.io/coderabbit/prs/github/digitalghost-dev/poke-cli?style=flat-square&logo=coderabbit&logoColor=FF570A&labelColor=F6F6F1&color=FF570A" alt="coderabbit-review-count-badge">
-</div>
 <div align="center">
     <img src="https://img.shields.io/github/actions/workflow/status/digitalghost-dev/poke-cli/go_test.yml?style=flat-square&logo=go&logoColor=00ADD8&label=Tests&labelColor=EEE&color=00ADD8" alt="tests-label">
     <img src="https://img.shields.io/github/go-mod/go-version/digitalghost-dev/poke-cli?style=flat-square&logo=Go&labelColor=EEE&color=00ADD8" alt="go-version"/>
@@ -18,17 +15,21 @@
 `poke-cli` is a hybrid of a classic CLI and a modern TUI tool for viewing data about Pokémon! This is my first Go project.
 View the [documentation](https://docs.poke-cli.com)!
 
-The architecture behind how the tool works is straight forward:
-1. Each command indicates which [API](https://pokeapi.co/) endpoint to use.
-2. Flags provide more information and can be stacked together or used individually.
-3. Each command has a `-h | --help` flag that is built-in with Golang's `flag` package.
-
-View future plans in the [Roadmap](#roadmap) section.
+* [Demo](#demo)
+* [Installation](#installation)
+* [Usage](#usage)
+* [Roadmap](#roadmap)
+* [Tested Terminals](#tested-terminals)
 
 ---
 ## Demo
-![demo](https://poke-cli-s3-bucket.s3.us-west-2.amazonaws.com/demo-v1.6.0.gif)
+### Video Game Data
+
+![demo-vg](https://poke-cli-s3-bucket.s3.us-west-2.amazonaws.com/demo-v1.6.0.gif)
+
+### Trading Card Game Data
 
+![demo-tcg](https://poke-cli-s3-bucket.s3.us-west-2.amazonaws.com/poke-cli-v1.8.0.gif)
 ---
 ## Installation
 
@@ -94,11 +95,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.7.4 <command> [subcommand] flag]
+    docker run --rm -it digitalghostdev/poke-cli:v1.8.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.7.4 -c "cd /app && exec sh"
+    docker run --rm -it --name poke-cli --entrypoint /bin/sh digitalghostdev/poke-cli:v1.8.0 -c "cd /app && exec sh"
    # placed into the /app directory, run the program with './poke-cli'
    # example: ./poke-cli ability swift-swim
     ```
@@ -162,6 +163,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                  │
+│    card            Get details about a TCG card               │
 │    item            Get details about an item                  │
 │    move            Get details about a move                   │
 │    natures         Get details about all natures              │
@@ -187,6 +189,12 @@ 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.
 - [x] `berry`: get data about a berry.
+- [ ] `card`: get data about a TCG card.
+    - [x] add mega evolution data
+    - [x] add scarlet & violet data
+    - [ ] add sword & shield data
+    - [ ] add sun & moon data
+    - [ ] add x & y data
 - [x] `item`: get data about an item.
 - [x] `move`: get data about a move.
     - [ ] `-p | --pokemon`: display Pokémon that learn this move.
@@ -208,15 +216,16 @@ Below is a list of the planned/completed commands and flags:
 
 ---
 ## Tested Terminals
-| Terminal          |            OS             | Status | Issues                                                                          |
-|-------------------|:-------------------------:|:------:|---------------------------------------------------------------------------------|
-| Alacritty         | macOS, Ubuntu,<br>Windows |   ✅    | None                                                                            |
-| Ghostty           |           macOS           |   ✅    | None                                                                            |
-| HyperJS           |           macOS           |   ✅    | None                                                                            |
-| iTerm2            |           macOS           |   ✅    | None                                                                            |
-| Built-in Terminal | Ubuntu, Debian,<br>Fedora |   ✅    | None                                                                            |
-| Built-in Terminal |          Alpine           |   ⚠️   | Some colors aren't supported.<br>`pokemon <name> --image=xx` flag pixel issues. |             
-| Built-in Terminal |           macOS           |   ⚠️   | `pokemon <name> --image=xx` flag pixel issues.                                  |
-| Tabby             |          Ubuntu           |   ✅    | None                                                                            |
-| WezTerm           |      macOS, Windows       |   ✅    | None                                                                            |
-| Built-in Terminal |          Windows          |   ✅    | None                                                                            |
+| Terminal          |            OS             | Status | Issues                                                                                       |
+|-------------------|:-------------------------:|:------:|----------------------------------------------------------------------------------------------|
+| Alacritty         | macOS, Ubuntu,<br>Windows |   🟡   | - Does not support sixel for TCG images.                                                     |
+| Ghostty           |           macOS           |   🟡   | - Does not support sixel for TCG images.                                                     |
+| HyperJS           |           macOS           |   🟡   | - Does not support sixel for TCG images.                                                     |
+| iTerm2            |           macOS           |   🟢   | - None                                                                                       |
+| Built-in Terminal | Ubuntu, Debian,<br>Fedora |   🟡   | - Does not support sixel for TCG images.                                                     |
+| Built-in Terminal |          Alpine           |   🟡   | - Some colors aren't supported.<br>- `pokemon <name> --image=xx` flag pixel issues.          |             
+| Built-in Terminal |           macOS           |   🟠   | - Does not support sixel for TCG images.<br>- `pokemon <name> --image=xx` flag pixel issues. |
+| Foot              |          Ubuntu           |   🟢   | - None                                                                                       |
+| Tabby             |          Ubuntu           |   🟢   | - None                                                                                       |
+| WezTerm           |      macOS, Windows       |   🟡   | - Windows version has issues with displaying TCG images.                                     |
+| Built-in Terminal |          Windows          |   🟢   | - None                                                                                       |

card_data/dagster.yaml

@@ -9,4 +9,7 @@ storage:
       db_name: postgres
       port: 5432
       params:
-        sslmode: require
+        sslmode: require
+
+telemetry:
+  enabled: false

card_data/pipelines/definitions.py

@@ -5,7 +5,7 @@
 import dagster as dg
 
 from .defs.extract.extract_pricing_data import build_dataframe
-from .defs.load.load_pricing_data import load_pricing_data
+from .defs.load.load_pricing_data import load_pricing_data, data_quality_checks_on_pricing
 
 
 @definitions
@@ -17,7 +17,7 @@ def defs():
 # Define the pricing pipeline job that materializes the assets and downstream dbt model
 pricing_pipeline_job = dg.define_asset_job(
     name="pricing_pipeline_job",
-    selection=dg.AssetSelection.assets(build_dataframe, load_pricing_data).downstream(include_self=True),
+    selection=dg.AssetSelection.assets(build_dataframe).downstream(include_self=True),
 )
 
 price_schedule = dg.ScheduleDefinition(
@@ -28,7 +28,7 @@ def defs():
 )
 
 defs_pricing = dg.Definitions(
-    assets=[build_dataframe, load_pricing_data],
+    assets=[build_dataframe, load_pricing_data, data_quality_checks_on_pricing],
     jobs=[pricing_pipeline_job],
     schedules=[price_schedule],
 )

card_data/pipelines/defs/extract/extract_data.py

@@ -90,10 +90,10 @@ def extract_set_data() -> pl.DataFrame:
 @dg.asset(kinds={"API"}, name="extract_card_url_from_set_data")
 def extract_card_url_from_set() -> list:
     urls = [
-        "https://api.tcgdex.net/v2/en/sets/swsh3"
+        "https://api.tcgdex.net/v2/en/sets/me02"
     ]
 
-    all_card_urls = []  # Initialize empty list to collect all URLs
+    all_card_urls = []
 
     for url in urls:
         try:
@@ -103,7 +103,7 @@ def extract_card_url_from_set() -> list:
             data = r.json()["cards"]
 
             set_card_urls = [f"https://api.tcgdex.net/v2/en/cards/{card['id']}" for card in data]
-            all_card_urls.extend(set_card_urls)  # Add all URLs from this set
+            all_card_urls.extend(set_card_urls)
 
             time.sleep(0.1)
 

card_data/pipelines/defs/extract/extract_pricing_data.py

@@ -10,6 +10,22 @@
 SET_PRODUCT_MATCHING = {
     "sv01": "22873",
     "sv02": "23120",
+    "sv03": "23228",
+    "sv03.5": "23237",
+    "sv04": "23286",
+    "sv04.5": "23353",
+    "sv05": "23381",
+    "sv06": "23473",
+    "sv06.5": "23529",
+    "sv07": "23537",
+    "sv08": "23651",
+    "sv08.5": "23821",
+    "sv09": "24073",
+    "sv10": "24269",
+    "sv10.5b": "24325",
+    "sv10.5w": "24326",
+    "me01": "24380",
+    "me02": "24448"
 }
 
 
@@ -49,16 +65,17 @@ def pull_product_information(set_number: str) -> pl.DataFrame:
     product_id = SET_PRODUCT_MATCHING[set_number]
 
     # Fetch product data
-    products_url = (f"https://tcgcsv.com/tcgplayer/3/{product_id}/products")
+    products_url = f"https://tcgcsv.com/tcgplayer/3/{product_id}/products"
     products_data = requests.get(products_url, timeout=30).json()
 
     # Fetch pricing data
-    prices_url = (f"https://tcgcsv.com/tcgplayer/3/{product_id}/prices")
+    prices_url = f"https://tcgcsv.com/tcgplayer/3/{product_id}/prices"
     prices_data = requests.get(prices_url, timeout=30).json()
 
     price_dict = {
         price["productId"]: price.get("marketPrice")
         for price in prices_data.get("results", [])
+        if price.get("subTypeName") != "Reverse Holofoil"
     }
 
     cards_data = []