Merge pull request #250 from digitalghost-dev/1.8.11

1.8.11

Author: digitalghost-dev

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ on:
       - main
 
 env:
-  VERSION_NUMBER: 'v1.8.10'
+  VERSION_NUMBER: 'v1.8.11'
   DOCKERHUB_REGISTRY_NAME: 'digitalghostdev/poke-cli'
   AWS_REGION: 'us-west-2'
 

.goreleaser.yml

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

Dockerfile

@@ -8,7 +8,7 @@ RUN go mod download
 
 COPY . .
 
-RUN go build -ldflags "-X main.version=v1.8.10" -o poke-cli .
+RUN go build -ldflags "-X main.version=v1.8.11" -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.10?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.11?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">
@@ -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.10 <command> [subcommand] [flag]
+    docker run --rm -it digitalghostdev/poke-cli:v1.8.11 <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.10 -c "cd /app && exec sh"
+    docker run --rm -it --name poke-cli --entrypoint /bin/sh digitalghostdev/poke-cli:v1.8.11 -c "cd /app && exec sh"
    # placed into the /app directory, run the program with './poke-cli'
    # example: ./poke-cli ability swift-swim
     ```

card_data/pipelines/definitions.py

@@ -4,9 +4,11 @@
 
 import dagster as dg
 
+from .defs.extract.limitless.extract_standings import create_standings_dataframe
 from .defs.extract.tcgcsv.extract_pricing import build_dataframe
 from .defs.extract.tcgdex.extract_sets import extract_sets_data
 from .defs.extract.tcgdex.extract_series import extract_series_data
+from .defs.load.limitless.load_standings import load_standings_data
 from .defs.load.tcgcsv.load_pricing import load_pricing_data, data_quality_checks_on_pricing
 from .defs.load.tcgdex.load_sets import load_sets_data, data_quality_check_on_sets
 from .defs.load.tcgdex.load_series import load_series_data, data_quality_check_on_series
@@ -17,7 +19,7 @@
 def defs() -> dg.Definitions:
     # load_from_defs_folder discovers dbt assets from transform_data.py
     folder_defs: dg.Definitions = load_from_defs_folder(project_root=Path(__file__).parent.parent)
-    return dg.Definitions.merge(folder_defs, defs_discord_sensors, defs_pricing, defs_sets, defs_series)
+    return dg.Definitions.merge(folder_defs, defs_discord_sensors, defs_pricing, defs_sets, defs_series, defs_standings)
 
 
 defs_discord_sensors: dg.Definitions = dg.Definitions(
@@ -63,4 +65,15 @@ def defs() -> dg.Definitions:
 defs_sets: dg.Definitions = dg.Definitions(
     assets=[extract_sets_data, load_sets_data, data_quality_check_on_sets],
     jobs=[sets_pipeline],
+)
+
+# Standings pipeline job
+standings_pipeline = dg.define_asset_job(
+    name="standings_pipeline_job",
+    selection=dg.AssetSelection.assets(create_standings_dataframe).downstream(include_self=True),
+)
+
+defs_standings: dg.Definitions = dg.Definitions(
+    assets=[create_standings_dataframe, load_standings_data],
+    jobs=[standings_pipeline],
 )

card_data/pipelines/defs/extract/tcgcsv/extract_pricing.py

@@ -48,6 +48,22 @@
     "swsh3": "2675",
     "swsh2": "2626",
     "swsh1": "2585",
+    # Sun & Moon
+    "sm12": "2534",
+    "sm115": "2480",
+    "sm11": "2464",
+    "sm10": "2420",
+    "sm9": "2377",
+    "sm8": "2328",
+    "sm7.5": "2295",
+    "sm7": "2278",
+    "sm6": "2209",
+    "sm5": "2178",
+    "sm4": "2071",
+    "sm3.5": "2054",
+    "sm3": "1957",
+    "sm2": "1919",
+    "sm1": "1863"
 }
 
 
@@ -74,6 +90,18 @@ def get_card_number(card: dict) -> Optional[str]:
     return None
 
 
+def normalize_card_number(card_number: str) -> str:
+    """Zero-pad numeric parts of a card number to 3 digits.
+    e.g. '1/149' -> '001/149', '10/149' -> '010/149'.
+    """
+    if "/" in card_number:
+        left, right = card_number.split("/", 1)
+        left = left.zfill(3) if left.isdigit() else left
+        right = right.zfill(3) if right.isdigit() else right
+        return f"{left}/{right}"
+    return card_number
+
+
 def extract_card_name(full_name: str) -> str:
     """Extract clean card name, removing variant information after dash and parenthetical suffixes"""
 
@@ -151,6 +179,9 @@ def pull_product_information(set_number: str) -> pl.DataFrame:
         if card_number is None:
             continue
 
+        if set_number.startswith("sm"):
+            card_number = normalize_card_number(card_number)
+
         card_info = {
             "product_id": card["productId"],
             "name": extract_card_name(card_name),

card_data/pipelines/defs/extract/tcgdex/extract_cards.py

@@ -97,13 +97,13 @@ def create_card_dataframe(extract_card_info: list) -> pl.DataFrame:
         # Flatten types (list of strings)
         flat["types"] = ", ".join(card.get("types", []))
 
-        flat["attacks_json"] = json.dumps(card.get("attacks", []), ensure_ascii=False)
-
-        attacks = card.get("attacks", [])
+        attacks = [atk for atk in card.get("attacks", []) if atk.get("name")]
+        flat["attacks_json"] = json.dumps(attacks, ensure_ascii=False)
         for i, atk in enumerate(attacks):
             prefix = f"attack_{i + 1}"
             flat[f"{prefix}_name"] = atk.get("name")
-            flat[f"{prefix}_damage"] = atk.get("damage")
+            damage = atk.get("damage")
+            flat[f"{prefix}_damage"] = str(damage) if damage is not None else None
             flat[f"{prefix}_effect"] = atk.get("effect")
             flat[f"{prefix}_cost"] = ", ".join(atk.get("cost", []))
 

card_data/pipelines/defs/extract/tcgdex/extract_series.py

@@ -31,6 +31,6 @@ def extract_series_data() -> pl.DataFrame:
         raise
 
     filtered = [
-        s.model_dump(mode="json") for s in validated if s.id in ["swsh", "sv", "me"]
+        s.model_dump(mode="json") for s in validated if s.id in ["me", "sv", "swsh", "sm"]
     ]
     return pl.DataFrame(filtered)

card_data/pipelines/defs/extract/tcgdex/extract_sets.py

@@ -24,6 +24,7 @@ def extract_sets_data() -> pl.DataFrame:
         "https://api.tcgdex.net/v2/en/series/me",
         "https://api.tcgdex.net/v2/en/series/sv",
         "https://api.tcgdex.net/v2/en/series/swsh",
+        "https://api.tcgdex.net/v2/en/series/sm",
     ]
 
     flat: list[dict] = []

card_data/pipelines/poke_cli_dbt/dbt_project.yml

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