Fix from_ field alias in token transfer handler (#637)

Author: droserasprout

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog], and this project adheres to [Semantic Versioning].
 
+## [Unreleased]
+
+### Fixed
+
+- config: Fixed incorrest parsing of `token_transfer` index filters. 
+
 ## [6.5.3] - 2022-03-28
 
 ### Fixed

src/dipdup/config.py

@@ -37,7 +37,6 @@
 from urllib.parse import quote_plus
 from urllib.parse import urlparse
 
-from pydantic import Field
 from pydantic import validator
 from pydantic.dataclasses import dataclass
 from pydantic.json import pydantic_encoder
@@ -1155,7 +1154,9 @@ class TokenTransferHandlerConfig(HandlerConfig, kind='handler'):
 
     contract: ContractConfig | None = None
     token_id: int | None = None
-    from_: ContractConfig | None = Field(default=None, alias='from')
+    # FIXME: Can't use `from_` field alias in dataclass; fixed in dipdup.yaml instead
+    # FIXME: See https://github.com/pydantic/pydantic/issues/4286
+    from_: ContractConfig | None = None
     to: ContractConfig | None = None
 
     def iter_imports(self, package: str) -> Iterator[tuple[str, str]]:
@@ -1856,16 +1857,14 @@ def _resolve_index_links(self, index_config: ResolvedIndexConfigU) -> None:
             for token_transfer_handler_config in index_config.handlers:
                 token_transfer_handler_config.parent = index_config
 
-                for attribute_name in ['contract', 'from_', 'to']:
-                    attribute_value = getattr(token_transfer_handler_config, attribute_name)
-                    if isinstance(attribute_value, str):
-                        setattr(
-                            token_transfer_handler_config,
-                            attribute_name,
-                            self.get_contract(attribute_value),
-                        )
+                if isinstance(token_transfer_handler_config.contract, str):
+                    token_transfer_handler_config.contract = self.get_contract(token_transfer_handler_config.contract)
+
+                if isinstance(token_transfer_handler_config.from_, str):
+                    token_transfer_handler_config.from_ = self.get_contract(token_transfer_handler_config.from_)
 
-                assert token_transfer_handler_config
+                if isinstance(token_transfer_handler_config.to, str):
+                    token_transfer_handler_config.to = self.get_contract(token_transfer_handler_config.to)
 
         elif isinstance(index_config, OperationUnfilteredIndexConfig):
             index_config.handler_config.parent = index_config

src/dipdup/yaml.py

@@ -16,6 +16,7 @@
 import json
 import logging.config
 import re
+from copy import copy
 from io import StringIO
 from os import environ as env
 from pathlib import Path
@@ -71,6 +72,18 @@ def substitute_env_variables(config_yaml: str) -> tuple[str, dict[str, str]]:
     return config_yaml, environment
 
 
+def fix_dataclass_field_aliases(config: dict[str, Any]) -> None:
+    for k, v in copy(config).items():
+        if 'callack' in config and k == 'from':
+            config['from_'] = config.pop('from')
+        elif isinstance(v, dict):
+            fix_dataclass_field_aliases(v)
+        elif isinstance(v, list):
+            for item in v:
+                if isinstance(item, dict):
+                    fix_dataclass_field_aliases(item)
+
+
 class DipDupYAMLConfig(dict[str, Any]):
     @classmethod
     def load(
@@ -92,6 +105,10 @@ def load(
 
             config.update(yaml.load(path_yaml))
 
+        # FIXME: Can't use `from_` field alias in dataclass; fixed in dipdup.yaml instead
+        # FIXME: See https://github.com/pydantic/pydantic/issues/4286
+        fix_dataclass_field_aliases(config)
+
         return config, config_environment
 
     def dump(self) -> str: