Stricter types

personal_data/data.py

@@ -1,6 +1,6 @@
 import abc
 import dataclasses
-from collections.abc import Iterator
+from collections.abc import Iterator, Mapping
 from enum import Enum
 
 import requests
@@ -38,5 +38,5 @@ class Scraper(abc.ABC):
         return False
 
     @abc.abstractmethod
-    def scrape(self) -> Iterator[object]:
+    def scrape(self) -> Iterator[Mapping[str, object]]:
         pass

personal_data/fetchers/partisia_blockchain.py

@@ -3,8 +3,11 @@ import datetime
 import email.utils
 import json
 import logging
+from collections.abc import Iterator, Mapping
 from decimal import Decimal
 
+from frozendict import frozendict
+
 from personal_data.data import DeduplicateMode, Scraper
 
 from .. import secrets
@@ -61,8 +64,7 @@ class MpcBalance(Scraper):
         json_data, date = self.get_json(url, data=data)
         return json_data['coins']['coins']
 
-    def scrape(self):
+    def scrape_latest_values_for(self, address: str) -> frozendict[str, object]:
-        address = secrets.PBC_ACCOUNT_ADDRESS
         coins = self.determine_coins()
 
         url = URL_ACCOUNT_PLUGIN.format(
@@ -93,4 +95,7 @@ class MpcBalance(Scraper):
             data_point['balance.' + coin_data['symbol']] = native_balance
             del coin_idx, coin_data
 
-        yield data_point
+        return frozendict(data_point)
+
+    def scrape(self) -> Iterator[Mapping[str, object]]:
+        yield self.scrape_latest_values_for(secrets.PBC_ACCOUNT_ADDRESS)

personal_data/main.py

@@ -1,8 +1,8 @@
 import csv
 import datetime
+import decimal
 import io
 import logging
-import decimal
 from decimal import Decimal
 
 import requests

test/test_parsing.py

@@ -1,6 +1,6 @@
 import datetime
-
 from decimal import Decimal
+
 import pytest
 
 from personal_data.main import to_value