Pass template_values to context (#6)

Author: droserasprout

README.md

@@ -27,6 +27,7 @@ spec_version: 0.0.1
 package: dipdup_hic_et_nunc
 
 database:
+  kind: sqlite
   path: db.sqlite3
 
 contracts:
@@ -124,15 +125,16 @@ class Token(Model):
 Now take a look at `handlers` module generated by `init` command. When operation group matching `pattern` block of corresponding handler at config will arrive callback will be fired. This example will simply save minted Hic Et Nunc tokens and their owners to the database:
 
 ```python
-from dipdup_hic_et_nunc.models import Address, Token
+from dipdup.models import HandlerContext, OperationContext
+from dipdup_hic_et_nunc.models import *
 from dipdup_hic_et_nunc.types.KT1Hkg5qeNhfwpKW4fXvq7HGZB9z2EnmCCA9.parameter.mint_OBJKT import MintObjkt
 from dipdup_hic_et_nunc.types.KT1RJ6PbjHpwc3M5rw5s2Nbmefwbuwbdxton.parameter.mint import Mint
-from dipdup_dapps.models import HandlerContext
 
 
 async def on_mint(
-    mint_OBJKT: HandlerContext[MintObjkt],
-    mint: HandlerContext[Mint]
+    ctx: HandlerContext,
+    mint_OBJKT: OperationContext[MintObjkt],
+    mint: OperationContext[Mint],
 ) -> None:
     address, _ = await Address.get_or_create(address=mint.parameter.address)
 

poetry.lock

@@ -27,7 +27,7 @@ aiomysql = "^0.0.21"
 asyncpg = "^0.22.0"
 datamodel-code-generator = "^0.10.0"
 "ruamel.yaml" = "^0.17.2"
-signalrcore = {git = "https://github.com/droserasprout/signalrcore", rev = "async"}
+signalrcore = {git = "https://github.com/dipdup-net/signalrcore", rev = "async"}
 tortoise-orm = "^0.17.1"
 websockets = "^8.1"
 pydantic = "^1.8.1"

pyproject.toml

@@ -1,7 +1,7 @@
 import asyncio
 import logging
 from functools import partial
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 import aiohttp
 from signalrcore.hub.base_hub_connection import BaseHubConnection  # type: ignore
@@ -12,7 +12,7 @@
 from dipdup.config import ROLLBACK_HANDLER, OperationHandlerConfig, OperationIndexConfig
 from dipdup.datasources.tzkt.cache import OperationCache
 from dipdup.datasources.tzkt.enums import TzktMessageType
-from dipdup.models import HandlerContext, OperationData, State
+from dipdup.models import HandlerContext, OperationContext, OperationData, State
 
 TZKT_HTTP_REQUEST_LIMIT = 10000
 TZKT_HTTP_REQUEST_SLEEP = 1
@@ -236,19 +236,23 @@ async def on_operation_match(
         matched_operations: List[OperationData],
         operations: List[OperationData],
     ):
-        args = []
+        handler_context = HandlerContext(
+            operations=operations,
+            template_values=index_config.template_values,
+        )
+        args: List[Union[OperationContext, HandlerContext]] = [handler_context]
         for pattern_config, operation in zip(handler_config.pattern, matched_operations):
 
             parameter_type = pattern_config.parameter_type_cls
             parameter = parameter_type.parse_obj(operation.parameter_json)
 
-            context = HandlerContext(
+            operation_context = OperationContext(
                 data=operation,
                 parameter=parameter,
             )
-            args.append(context)
+            args.append(operation_context)
 
-        await handler_config.callback_fn(*args, operations, index_config.template_values)
+        await handler_config.callback_fn(*args)
 
     @classmethod
     def convert_operation(cls, operation_json: Dict[str, Any]) -> OperationData:

src/dipdup/datasources/tzkt/datasource.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from enum import Enum
-from typing import Any, Dict, Generic, Optional, TypeVar
+from typing import Any, Dict, Generic, List, Optional, TypeVar
 
 from pydantic.dataclasses import dataclass
 from tortoise import Model, fields
@@ -56,6 +56,12 @@ class OperationData:
 
 
 @dataclass
-class HandlerContext(Generic[ParameterType]):
+class OperationContext(Generic[ParameterType]):
     data: OperationData
     parameter: ParameterType
+
+
+@dataclass
+class HandlerContext:
+    operations: List[OperationData]
+    template_values: Optional[Dict[str, str]]

src/dipdup/models.py

@@ -1,16 +1,15 @@
-from typing import Dict, List, Optional
-from dipdup.models import HandlerContext, OperationData
+from dipdup.models import HandlerContext, OperationContext
 
 from {{ package }}.models import *
+
 {% for pattern in patterns %}
 from {{ package }}.types.{{ pattern.destination }}.parameter.{{ pattern.entrypoint }} import {{ pattern.entrypoint.title().replace('_', '') }}
 {%- endfor %}
 
 async def {{ handler }}(
+    ctx: HandlerContext,
 {%- for pattern in patterns %}
-    {{ pattern.entrypoint }}: HandlerContext[{{ pattern.entrypoint.title().replace('_', '') }}],
+    {{ pattern.entrypoint }}: OperationContext[{{ pattern.entrypoint.title().replace('_', '') }}],
 {%- endfor %}
-    operations: List[OperationData],
-    template_values: Optional[Dict[str, str]] = None,
 ) -> None:
     ...

src/dipdup/templates/handler.py.j2

@@ -1,15 +1,12 @@
-from typing import Dict, List, Optional
-from dipdup.models import HandlerContext, OperationData
-
+from dipdup.models import HandlerContext, OperationContext
 from dipdup_hic_et_nunc.models import *
-
 from dipdup_hic_et_nunc.types.KT1Hkg5qeNhfwpKW4fXvq7HGZB9z2EnmCCA9.parameter.mint_OBJKT import MintObjkt
 from dipdup_hic_et_nunc.types.KT1RJ6PbjHpwc3M5rw5s2Nbmefwbuwbdxton.parameter.mint import Mint
 
+
 async def on_mint(
-    mint_OBJKT: HandlerContext[MintObjkt],
-    mint: HandlerContext[Mint],
-    operations: List[OperationData],
-    template_values: Optional[Dict[str, str]] = None,
+    ctx: HandlerContext,
+    mint_OBJKT: OperationContext[MintObjkt],
+    mint: OperationContext[Mint],
 ) -> None:
-    ...
+    ...

src/dipdup_hic_et_nunc/handlers/on_mint.py

@@ -13,4 +13,4 @@ async def on_rollback(
 ) -> None:
     _logger.warning('Rollback event received, reindexing')
     await Tortoise._drop_databases()
-    os.execl(sys.executable, sys.executable, *sys.argv)
+    os.execl(sys.executable, sys.executable, *sys.argv)