Merge pull request #253 from digitalghost-dev/1.9.0

1.9.0

Author: digitalghost-dev

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ on:
       - main
 
 env:
-  VERSION_NUMBER: 'v1.8.11'
+  VERSION_NUMBER: 'v1.9.0'
   DOCKERHUB_REGISTRY_NAME: 'digitalghostdev/poke-cli'
   AWS_REGION: 'us-west-2'
 
@@ -50,7 +50,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Run Gosec Security Scanner
-        uses: securego/gosec@v2.22.11
+        uses: securego/gosec@v2.25.0
         with:
           args: '-no-fail -fmt sarif -out results.sarif ./...'
 

.gitignore

@@ -29,6 +29,11 @@ go.work.sum
 # env file
 .env
 
+# web
+web/.venv
+web/.streamlit/secrets.toml
+web/.coverage
+
 # Python
 card_data/.venv
 __pycache__/
@@ -56,7 +61,6 @@ card_data/infrastructure/supabase/access-token
 
 card_data/.tmp*/**
 
-
 card_data/pipelines/poke_cli_dbt/.user.yml
 /card_data/supabase/
 /card_data/sample_scripts/

.goreleaser.yml

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

Dockerfile

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

README.md

@@ -2,7 +2,7 @@
     <img width="425" src="poke-cli.png" alt="pokemon-logo"/>
     <h4></h4>
     <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.8.11?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.9.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">
@@ -27,11 +27,11 @@ View the [documentation](https://docs.poke-cli.com) on the data infrastructure i
 ## Demo
 ### Video Game Data
 
-![demo-vg](https://poke-cli-s3-bucket.s3.us-west-2.amazonaws.com/demo-v1.6.0.gif)
+![demo-vg](https://dc8hq8aq7pr04.cloudfront.net/demo-v1.6.0.gif)
 
 ### Trading Card Game Data
 
-![demo-tcg](https://poke-cli-s3-bucket.s3.us-west-2.amazonaws.com/poke-cli-card-v1.8.8.gif)
+![demo-tcg](https://dc8hq8aq7pr04.cloudfront.net/poke-cli-card-v1.8.8.gif)
 
 ---
 
@@ -99,11 +99,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.8.11 <command> [subcommand] [flag]
+    docker run --rm -it digitalghostdev/poke-cli:v1.9.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.8.11 -c "cd /app && exec sh"
+    docker run --rm -it --name poke-cli --entrypoint /bin/sh digitalghostdev/poke-cli:v1.9.0 -c "cd /app && exec sh"
    # placed into the /app directory, run the program with './poke-cli'
    # example: ./poke-cli ability swift-swim
     ```
@@ -118,7 +118,7 @@ Cloudsmith is a fully cloud-based service that lets you easily create, store, an
 6. Run the tool!
 
 > [!IMPORTANT]
-> For macOS, you may have to allow the executable to run as it is not signed. Head to System Settings > Privacy & Security > scroll down and allow the executable to run.
+> For macOS, you may have to allow the executable to run as it is not signed. Head to System Settings > Privacy & Security > scroll down and allow executable to run.
 
 <details>
 
@@ -174,6 +174,7 @@ By running `poke-cli [-h | --help]`, it'll display information on how to use the
 │    pokemon         Get details about a Pokémon                │
 │    search          Search for a resource                      │
 │    speed           Calculate the speed of a Pokémon in battle │
+│    tcg             Get details about TCG tournaments          │
 │    types           Get details about a typing                 │
 │                                                               │
 │ hint: when calling a resource with a space, use a hyphen      │
@@ -197,7 +198,7 @@ Below is a list of the planned/completed commands and flags:
     - [x] add mega evolution data
     - [x] add scarlet & violet data
     - [x] add sword & shield data
-    - [ ] add sun & moon data
+    - [x] add sun & moon data
     - [ ] add x & y data
 - [x] `item`: get data about an item.
 - [x] `move`: get data about a move.
@@ -216,6 +217,7 @@ Below is a list of the planned/completed commands and flags:
     - [x] `move`
     - [x] `pokemon`
 - [x] `speed`: compare speed stats between two Pokémon.
+- [x] `tcg`: get data about TCG tournaments.
 - [x] `types`: get data about a specific typing.
 
 ---

card_data/pipelines/defs/extract/limitless/extract_standings.py

@@ -1,18 +1,24 @@
 import dagster as dg
 import polars as pl
 import requests
-from bs4 import BeautifulSoup
+from bs4 import BeautifulSoup, Tag
 
 def seasons(year: int) -> list[dict]:
     url = "https://labs.limitlesstcg.com/"
     r = requests.get(url)
     soup = BeautifulSoup(r.content, 'html.parser')
 
-    season_header = soup.find("h2", string=lambda x: x and f"{year}" in x)
+    season_header = soup.find("h2", string=lambda x: bool(x and f"{year}" in x))
+    if not isinstance(season_header, Tag):
+        return []
     tournament_list = season_header.find_next_sibling("ul")
+    if not isinstance(tournament_list, Tag):
+        return []
 
     tournaments = []
     for a in tournament_list.find_all("a", href=True):
+        if not isinstance(a, Tag):
+            continue
         parts = list(a.stripped_strings)
         tournaments.append({
             "name": parts[0],
@@ -31,23 +37,29 @@ def build_standings(tournament: dict) -> pl.DataFrame | None:
 
     table = soup.find("table", class_="data-table striped")
 
-    if table:
+    if isinstance(table, Tag):
         headers = ['Rank', 'Name', 'Country', 'Points', 'Record', 'OPW%', 'OOPW%', 'Deck', 'Decklist', 'Unknown']
 
         rows = []
         tbody = table.find('tbody')
+        if not isinstance(tbody, Tag):
+            return None
 
         for tr in tbody.find_all('tr'):
+            if not isinstance(tr, Tag):
+                continue
             cells = tr.find_all('td')
 
             if len(cells) == 1:
                 continue
 
             row_data = []
             for i, td in enumerate(cells):
+                if not isinstance(td, Tag):
+                    continue
                 if i == 2:
                     img = td.find('img')
-                    if img:
+                    if isinstance(img, Tag):
                         country = img.get('alt') or img.get('title') or ''
                         row_data.append(country)
                     else:
@@ -56,15 +68,15 @@ def build_standings(tournament: dict) -> pl.DataFrame | None:
                 elif i == 7:  # Deck column
                     pokemon_imgs = td.find_all('img', class_='pokemon')
                     if pokemon_imgs:
-                        pokemon_names = [img.get('alt', '') for img in pokemon_imgs if img.get('alt')]
+                        pokemon_names = [str(img.get('alt', '')) for img in pokemon_imgs if isinstance(img, Tag) and img.get('alt')]
                         pokemon_string = '/'.join(pokemon_names)
                         row_data.append(pokemon_string)
                     else:
                         row_data.append('')
 
                 elif i == 8:  # Decklist column
                     link = td.find('a')
-                    if link:
+                    if isinstance(link, Tag):
                         decklist_url = link.get('href', '')
                         row_data.append(f"https://labs.limitlesstcg.com{decklist_url}" if decklist_url else '')
                     else:

card_data/pipelines/defs/transform/transform_data.py

@@ -17,6 +17,7 @@ def get_asset_key(self, dbt_resource_props):
                 "sets": "data_quality_checks_on_sets",
                 "cards": "load_card_data",
                 "pricing_data": "data_quality_checks_on_pricing",
+                "standings": "load_standings_data",
             }
             if name in source_mapping:
                 return dg.AssetKey([source_mapping[name]])

card_data/pipelines/poke_cli_dbt/dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'poke_cli_dbt'
-version: '1.8.11'
+version: '1.9.0'
 
 profile: 'poke_cli_dbt'
 

card_data/pipelines/poke_cli_dbt/models/sources.yml

@@ -103,13 +103,62 @@ sources:
             description: "Third attack energy cost"
 
       - name: standings
-        description: "Tournament standings data"
+        description: "Player standings data for tournaments"
+        columns:
+          - name: rank
+            description: "Player rank in the tournament"
+          - name: name
+            description: "Player name"
+          - name: points
+            description: "Player points"
+          - name: record
+            description: "Player win/loss record"
+          - name: opp_win_percent
+            description: "Opponent win percentage"
+          - name: opp_opp_win_percent
+            description: "Opponent's opponent win percentage"
+          - name: deck
+            description: "Deck name used by player"
+          - name: decklist
+            description: "Decklist URL"
+          - name: country
+            description: "Player country code"
+          - name: tournament_id
+            description: "Foreign key to tournaments"
 
       - name: tournaments
         description: "Tournament metadata"
+        columns:
+          - name: tournament_id
+            description: "Unique tournament identifier"
+          - name: location
+            description: "Tournament location"
+          - name: start_date
+            description: "Tournament start date"
+          - name: end_date
+            description: "Tournament end date"
+          - name: type
+            description: "Tournament type"
+          - name: player_quantity
+            description: "Number of players in the tournament"
+          - name: text_date
+            description: "Tournament date in text format"
+          - name: country_code
+            description: "Country ISO code"
+          - name: logo
+            description: "Tournament type logo URL"
+          - name: latitude
+            description: "Tournament city latitude"
+          - name: longitude
+            description: "Tournament city longitude"
 
       - name: country_codes
-        description: "Country code to country name mapping"
+        description: "Country code to country name mapping with geographic centroids"
+        columns:
+          - name: code
+            description: "ISO country code"
+          - name: country_name
+            description: "Full country name"
 
       - name: pricing_data
         description: "Card pricing data"

card_data/pipelines/poke_cli_dbt/models/standings.sql

@@ -13,14 +13,20 @@ SELECT
     s.deck,
     s.decklist,
     c.country_name AS player_country,
+    LOWER(c.code) AS country_code,
     t.location,
+    t.country_code AS iso_code,
+    t.latitude AS tournament_latitude,
+    t.longitude AS tournament_longitude,
+    t.logo,
     t.start_date,
     t.end_date,
+    t.text_date,
     t.type,
     t.player_quantity
 FROM
     {{ source('staging', 'standings') }} AS s
 INNER JOIN {{ source('staging', 'tournaments') }} AS t
    ON s.tournament_id = t.tournament_id
-INNER JOIN {{ source('staging', 'country_codes') }} AS c
+LEFT JOIN {{ source('staging', 'country_codes') }} AS c
    ON s.country = c.code