mtg-ssm 2.8.3.dev2__tar.gz → 2.8.3.dev5__tar.gz

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mtg_ssm
-Version: 2.8.3.dev2
+Version: 2.8.3.dev5
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License-Expression: MIT
@@ -243,7 +243,8 @@ Changelog
 Development
 -----------
 
--   ...
+-   Fix Scryfall fetching with application request headers, JSON Lines bulk
+    downloads, and updated card layout and format values.
 
 2.8.1
 -----

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/README.rst

@@ -204,7 +204,8 @@ Changelog
 Development
 -----------
 
--   ...
+-   Fix Scryfall fetching with application request headers, JSON Lines bulk
+    downloads, and updated card layout and format values.
 
 2.8.1
 -----

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/mtg_ssm/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.8.3.dev2'
-__version_tuple__ = version_tuple = (2, 8, 3, 'dev2')
+__version__ = version = '2.8.3.dev5'
+__version_tuple__ = version_tuple = (2, 8, 3, 'dev5')
 
-__commit_id__ = commit_id = 'g2f6215329'
+__commit_id__ = commit_id = 'gbe794fd02'

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/mtg_ssm/scryfall/fetcher.py

@@ -1,12 +1,14 @@
 """Scryfall data fetcher."""
 
 import gzip
+import io
 from pathlib import Path
 
 import msgspec
 from platformdirs import user_cache_dir
 from requests_cache import CachedSession, SerializerPipeline, Stage, pickle_serializer
 
+from mtg_ssm import __version__
 from mtg_ssm.containers.bundles import ScryfallDataSet
 from mtg_ssm.scryfall.models import ScryBulkData, ScryCard, ScryList, ScryMigration, ScrySet
 
@@ -27,6 +29,12 @@ SESSION = CachedSession(
     cache_control=True,
     expire_after=86400,
 )
+SESSION.headers.update(
+    {
+        "User-Agent": f"mtg-ssm/{__version__} (https://github.com/gwax/mtg_ssm)",
+        "Accept": "application/json;q=0.9,*/*;q=0.8",
+    }
+)
 
 BULK_DATA_ENDPOINT = "https://api.scryfall.com/bulk-data"
 SETS_ENDPOINT = "https://api.scryfall.com/sets"
@@ -44,6 +52,22 @@ def _fetch_endpoint(endpoint: str) -> bytes:
     return response.content
 
 
+def _fetch_cards(bulk: ScryBulkData) -> list[ScryCard]:
+    if bulk.jsonl_download_uri is not None:
+        content = _fetch_endpoint(bulk.jsonl_download_uri)
+        decoder = msgspec.json.Decoder(ScryCard)
+        # Requests may already have decoded gzip supplied as an HTTP encoding.
+        with (
+            io.BytesIO(content) as stream,
+            gzip.GzipFile(fileobj=stream) if content.startswith(b"\x1f\x8b") else stream as lines,
+        ):
+            return [decoder.decode(line) for line in lines if line.strip()]
+    if bulk.download_uri is not None:
+        return msgspec.json.decode(_fetch_endpoint(bulk.download_uri), type=list[ScryCard])
+    msg = f"No download URI for Scryfall bulk data: {bulk.type}"
+    raise ValueError(msg)
+
+
 def scryfetch() -> ScryfallDataSet:
     """Retrieve and deserialize Scryfall object data."""
     print("Reading data from scryfall")
@@ -67,7 +91,7 @@ def scryfetch() -> ScryfallDataSet:
         )
         migrations_data += migrations_list.data
 
-    [cards_endpoint] = [bd.download_uri for bd in bulk_data if bd.type == BULK_TYPE]
-    cards_data = msgspec.json.decode(_fetch_endpoint(cards_endpoint), type=list[ScryCard])
+    [cards_bulk] = [bd for bd in bulk_data if bd.type == BULK_TYPE]
+    cards_data = _fetch_cards(cards_bulk)
 
     return ScryfallDataSet(sets=sets_data, cards=cards_data, migrations=migrations_data)

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/mtg_ssm/scryfall/models.py

@@ -62,6 +62,7 @@ class ScryCardLayout(str, Enum):
     DOUBLE_SIDED = "double_sided"
     EMBLEM = "emblem"
     FLIP = "flip"
+    FRONT_CARD = "front_card"
     HOST = "host"
     LEVELER = "leveler"
     MELD = "meld"
@@ -202,6 +203,7 @@ class ScryFormat(str, Enum):
     ALCHEMY = "alchemy"
     BRAWL = "brawl"
     COMMANDER = "commander"
+    COMPETITIVEBRAWL = "competitivebrawl"
     DUEL = "duel"
     EXPLORER = "explorer"
     FRONTIER = "frontier"
@@ -326,7 +328,7 @@ class CardPreviewBlock(Struct):
     """Model for card preview block."""
 
     source: str
-    source_uri: str
+    source_uri: str | None
     previewed_at: dt.date
 
 
@@ -442,11 +444,12 @@ class ScryBulkData(
     type: str
     name: str
     description: str
-    download_uri: str
+    download_uri: str | None = None
+    jsonl_download_uri: str | None = None
     updated_at: dt.datetime
     compressed_size: int | None = None
-    content_type: str
-    content_encoding: str
+    content_type: str | None = None
+    content_encoding: str | None = None
 
 
 class ScryMigration(

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/mtg_ssm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mtg_ssm
-Version: 2.8.3.dev2
+Version: 2.8.3.dev5
 Summary: A tool to manage Magic: the Gathering collection spreadsheets
 Author-email: George Leslie-Waksman <waksman@gmail.com>
 License-Expression: MIT
@@ -243,7 +243,8 @@ Changelog
 Development
 -----------
 
--   ...
+-   Fix Scryfall fetching with application request headers, JSON Lines bulk
+    downloads, and updated card layout and format values.
 
 2.8.1
 -----

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/mtg_ssm.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ tests/containers/test_bundles.py
 tests/containers/test_counts.py
 tests/containers/test_indexes.py
 tests/containers/test_legacy.py
+tests/data/.gitattributes
 tests/data/LICENSE.txt
 tests/data/bulk_data.json
 tests/data/cards.json

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/mtg_ssm.egg-info/scm_file_list.json

@@ -37,6 +37,7 @@
     "tests/containers/test_counts.py",
     "tests/containers/test_indexes.py",
     "tests/containers/test_legacy.py",
+    "tests/data/.gitattributes",
     "tests/data/LICENSE.txt",
     "tests/data/bulk_data.json",
     "tests/data/cards.json",

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/mtg_ssm.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
   "tag": "2.8.2",
-  "distance": 2,
-  "node": "g2f6215329a6d69f3dd36d4e0262472a34418b701",
+  "distance": 5,
+  "node": "gbe794fd029820ddaed88cc6321250acaf0be03a7",
   "dirty": false,
   "branch": "trunk",
   "node_date": "2026-10-16"

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/tests/containers/test_bundles.py

@@ -8,6 +8,7 @@ from mtg_ssm.scryfall.models import ScryCardLayout, ScrySetType
 
 
 def test_remove_digital(scryfall_data: bundles.ScryfallDataSet) -> None:
+    digital_pathway_id = UUID("edc71870-656c-40f9-b2b0-f69a46bf8c51")
     set_codes = {s.code for s in scryfall_data.sets}
     card_ids = {c.id for c in scryfall_data.cards}
     card_names = {c.name for c in scryfall_data.cards}
@@ -17,7 +18,10 @@ def test_remove_digital(scryfall_data: bundles.ScryfallDataSet) -> None:
 
     assert "khm" in set_codes
     assert "Cosmos Elixir" in card_names
-    assert "A-Cosmos Elixir" in card_names
+
+    assert "znr" in set_codes
+    assert "Needleverge Pathway // Pillarverge Pathway" in card_names
+    assert digital_pathway_id in card_ids
 
     assert "yecl" in set_codes
     assert "Thoughtsteal Sprites" in card_names
@@ -32,7 +36,10 @@ def test_remove_digital(scryfall_data: bundles.ScryfallDataSet) -> None:
 
     assert "khm" in set_codes2
     assert "Cosmos Elixir" in card_names2
-    assert "A-Cosmos Elixir" not in card_names2
+
+    assert "znr" in set_codes2
+    assert "Needleverge Pathway // Pillarverge Pathway" in card_names2
+    assert digital_pathway_id not in card_ids2
 
     assert "yecl" not in set_codes2
     assert "Thoughtsteal Sprites" not in card_names2

mtg_ssm-2.8.3.dev5/tests/data/.gitattributes

@@ -0,0 +1 @@
+*.json linguist-generated=true

{mtg_ssm-2.8.3.dev2 → mtg_ssm-2.8.3.dev5}/tests/data/bulk_data.json

@@ -8,10 +8,9 @@
       "type": "default_cards",
       "name": "Default Cards",
       "description": "A JSON file containing every card object on Scryfall in English or the printed language if the card is only available in one language.",
-      "download_uri": "https://data.scryfall.io/default-cards/default-cards-20260402212821.json",
-      "updated_at": "2026-04-02T21:28:21.973000Z",
-      "content_type": "application/json",
-      "content_encoding": "gzip"
+      "jsonl_download_uri": "https://data.scryfall.io/default-cards/default-cards-20261016090544.jsonl.gz",
+      "updated_at": "2026-10-16T09:05:44.990000Z",
+      "compressed_size": 79720941
     }
   ],
   "has_more": false