raw_values = param, add legend

pixelsoup42 · Oct 10, 2023 · 3b7541d · 3b7541d
1 parent a510fd6
commit 3b7541d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 22 deletions.
diff --git a/src/cardano_account_pandas_dumper/__main__.py b/src/cardano_account_pandas_dumper/__main__.py
@@ -6,6 +6,7 @@
 from json import JSONDecodeError
 
 import jstyleson
+from matplotlib.patches import Rectangle
 import matplotlib.pyplot as plt
 from blockfrost import ApiError, BlockFrostApi
 from openpyxl.cell.cell import ILLEGAL_CHARACTERS_RE
@@ -190,14 +191,14 @@ def main():
         data=data_from_api,
         known_dict=known_dict_from_file,
         truncate_length=args.truncate_length,
-        raw_values=args.raw_values,
         unmute=args.unmute,
         detail_level=args.detail_level,
     )
     if args.csv_output:
         try:
             reporter.make_transaction_frame(
-                with_total=args.with_total, zero_is_nan=args.zero_is_nan
+                with_total=args.with_total,
+                raw_values=args.raw_values,
             ).to_csv(
                 args.csv_output,
             )
@@ -213,6 +214,7 @@ def main():
                     ),
                     x,
                 ),
+                raw_values=args.raw_values,
             )
             frame.to_excel(
                 args.xlsx_output,
@@ -227,9 +229,17 @@ def main():
         except OSError as exception:
             warnings.warn(f"Failed to write .xlsx file: {exception}")
     if args.plot:
-        balance = reporter.make_balance_frame(with_total=False).cumsum()
+        balance = reporter.make_balance_frame(
+            with_total=False, raw_values=True
+        ).cumsum()
         balance.plot(logy=True)
+
         plt.legend(
+            [
+                Rectangle(xy=(0, 0), width=10, height=10, color=(0.9, 0.9, 0.7))
+                for l in balance.columns
+            ],
+            [reporter.asset_names.get(c, c) for c in balance.columns],
             bbox_to_anchor=(1, 1),
             fontsize="small",
         )

diff --git a/src/cardano_account_pandas_dumper/cardano_account_pandas_dumper.py b/src/cardano_account_pandas_dumper/cardano_account_pandas_dumper.py
@@ -153,13 +153,11 @@ def __init__(
         data: AccountData,
         known_dict: Any,
         truncate_length: int,
-        raw_values: bool,
         unmute: bool,
         detail_level: int,
     ):
         self.data = data
         self.truncate_length = truncate_length
-        self.raw_values = raw_values
         self.unmute = unmute
         self.detail_level = detail_level
         self.address_names = pd.Series(
@@ -169,7 +167,6 @@ def __init__(
         self.policy_names = pd.Series(known_dict.get("policies", {}))
         self.asset_names = pd.Series(
             {asset.asset: self._decode_asset_name(asset) for asset in self.data.assets}
-            | {self.ADA_ASSET: self.ADA_ASSET}
         )
         self.asset_decimals = pd.Series(
             {
@@ -314,14 +311,10 @@ def _format_message(self, tx_obj: blockfrost.utils.Namespace) -> str:
         return " ".join(result)
 
     def _format_script(self, script: str) -> str:
-        return ({} if self.raw_values else self.scripts).get(
-            script, self._truncate(script)
-        )
+        return self.scripts.get(script, self._truncate(script))
 
     def _format_policy(self, policy: str) -> Optional[str]:
-        return ({} if self.raw_values else self.policy_names).get(
-            policy, self._truncate(policy)
-        )
+        return self.policy_names.get(policy, self._truncate(policy))
 
     @classmethod
     def extract_timestamp(
@@ -396,22 +389,31 @@ def reward_transaction(
         result.utxos.nonref_inputs = []
         return result
 
-    def _column_key(self, utxo, amount):
+    def _column_key(
+        self,
+        utxo,
+        amount,
+        raw_values: bool,
+    ):
         # Index: (asset_id, own, address_name)
         return (
             amount.unit if amount.unit != self.data.LOVELACE_ASSET else self.ADA_ASSET,
             self.OWN_LABEL
             if utxo.address in self.data.own_addresses
             else self.OTHER_LABEL,
             self._truncate(utxo.address)
-            if self.raw_values
+            if raw_values
             else self.address_names.get(
                 utxo.address,
                 self.OTHER_LABEL,
             ),
         )
 
-    def _transaction_balance(self, transaction: blockfrost.utils.Namespace) -> Any:
+    def _transaction_balance(
+        self,
+        transaction: blockfrost.utils.Namespace,
+        raw_values: bool,
+    ) -> Any:
         result: MutableMapping[Tuple, np.longlong] = defaultdict(lambda: np.longlong(0))
         result[(self.ADA_ASSET, self.OTHER_LABEL, " fees")] += np.longlong(
             transaction.fees
@@ -441,13 +443,15 @@ def _transaction_balance(self, transaction: blockfrost.utils.Namespace) -> Any:
         for utxo in transaction.utxos.nonref_inputs:
             if not utxo.collateral or not transaction.valid_contract:
                 for amount in utxo.amount:
-                    result[self._column_key(utxo, amount)] -= np.longlong(
+                    result[self._column_key(utxo, amount, raw_values)] -= np.longlong(
                         amount.quantity
                     )
 
         for utxo in transaction.utxos.outputs:
             for amount in utxo.amount:
-                result[self._column_key(utxo, amount)] += np.longlong(amount.quantity)
+                result[self._column_key(utxo, amount, raw_values)] += np.longlong(
+                    amount.quantity
+                )
 
         sum_by_asset: MutableMapping[str, np.longlong] = defaultdict(
             lambda: np.longlong(0)
@@ -477,11 +481,12 @@ def _transaction_balance(self, transaction: blockfrost.utils.Namespace) -> Any:
     def make_balance_frame(
         self,
         with_total: bool,
+        raw_values: bool,
         text_cleaner: Callable = lambda x: x,
     ):
         """Make DataFrame with transaction balances."""
         balance = pd.DataFrame(
-            data=[self._transaction_balance(x) for x in self.transactions],
+            data=[self._transaction_balance(x, raw_values) for x in self.transactions],
             index=self.transactions.index,
             dtype="Int64",
         )
@@ -492,7 +497,7 @@ def make_balance_frame(
 
         if self.detail_level == 1:
             group: Tuple = (0, 1)
-        elif self.raw_values:
+        elif raw_values:
             group = (0, 1, 2)
         else:
             group = (0, 2)
@@ -527,10 +532,11 @@ def make_balance_frame(
             axis=1,
         )
 
-        if not self.raw_values:
+        if not raw_values:
             balance.columns = pd.MultiIndex.from_tuples(
                 [
-                    (text_cleaner(self.asset_names[c[0]]),) + cast(tuple, c)[1:]
+                    (text_cleaner(self.asset_names.get(c[0], c[0])),)
+                    + cast(tuple, c)[1:]
                     for c in balance.columns
                 ]
             )
@@ -542,6 +548,7 @@ def make_balance_frame(
 
     def make_transaction_frame(
         self,
+        raw_values: bool,
         with_total: bool = True,
         text_cleaner: Callable = lambda x: x,
     ) -> pd.DataFrame:
@@ -569,7 +576,7 @@ def make_transaction_frame(
                 ]
             )
         balance_frame = self.make_balance_frame(
-            with_total=with_total, text_cleaner=text_cleaner
+            with_total=with_total, text_cleaner=text_cleaner, raw_values=raw_values
         )
         if self.detail_level > 1:
             msg_frame.columns = pd.MultiIndex.from_tuples(