mtgdata 0.2.2__tar.gz → 0.2.3__tar.gz

{mtgdata-0.2.2 → mtgdata-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mtgdata
-Version: 0.2.2
+Version: 0.2.3
 Summary: MTG image dataset with automatic image scraping and conversion.
 Author-email: Nathan Juraj Michlo <NathanJMichlo@gmail.com>
 Project-URL: Homepage, https://github.com/nmichlo/mtg-dataset

{mtgdata-0.2.2 → mtgdata-0.2.3}/mtgdata/scryfall.py

@@ -38,8 +38,9 @@ import warnings
 from datetime import datetime, timedelta
 from enum import Enum
 from pathlib import Path
-from typing import Any, Callable, Iterator, Literal, TYPE_CHECKING
+from typing import Any, Callable, Iterator, Literal, TYPE_CHECKING, Union
 from typing import Tuple
+from uuid import UUID
 
 import duckdb
 import pytz
@@ -155,8 +156,8 @@ _IMG_TYPE_SIZES_HWC: dict[ScryfallImageType, Tuple[int, int, int] | None] = {
 @dataclasses.dataclass(frozen=True)
 class ScryfallCardFace:
     # query
-    id: str
-    oracle_id: str
+    id: Union[str, UUID]
+    oracle_id: Union[str, UUID]
     name: str
     set_code: str
     set_name: str
@@ -175,9 +176,16 @@ class ScryfallCardFace:
     def bulk_type(self) -> ScryfallBulkType:
         return ScryfallBulkType(self._bulk_type)
 
+    @property
+    def uuid(self):
+        if isinstance(self.id, str):
+            return UUID(self.id)
+        else:
+            return self.id
+
     @property
     def img_path(self) -> Path:
-        return self._sets_dir / f"{self.set_code}/{self.id}.{self.img_type.extension}"
+        return self._sets_dir / f"{self.set_code}/{self.uuid}.{self.img_type.extension}"
 
     @property
     def url_path_pair(self) -> Tuple[str, str]:
@@ -528,7 +536,7 @@ class ScryfallDataset:
             self._ondemand_dl = download_mode == "ondemand"
             self._cards = list(self._ds.yield_all())
         # sort cards
-        self._cards.sort(key=lambda x: x.id)
+        self._cards.sort(key=lambda x: x.uuid)
         # init
         self.transform = transform if transform else _noop
 

{mtgdata-0.2.2 → mtgdata-0.2.3}/mtgdata.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mtgdata
-Version: 0.2.2
+Version: 0.2.3
 Summary: MTG image dataset with automatic image scraping and conversion.
 Author-email: Nathan Juraj Michlo <NathanJMichlo@gmail.com>
 Project-URL: Homepage, https://github.com/nmichlo/mtg-dataset