refactor: contravariant typevars for typed factory protocol

plus a fix for box decoding

Author: aorumbayev

src/algokit_utils/applications/app_factory.py

@@ -506,7 +506,14 @@ def create(
         )
 
 
-class TypedAppFactoryProtocol(Protocol):
+CreateParamsT = TypeVar(  # noqa: PLC0105
+    "CreateParamsT", bound=AppClientMethodCallCreateParams | AppClientBareCallCreateParams, contravariant=True
+)
+UpdateParamsT = TypeVar("UpdateParamsT", bound=AppClientMethodCallParams | AppClientBareCallParams, contravariant=True)  # noqa: PLC0105
+DeleteParamsT = TypeVar("DeleteParamsT", bound=AppClientMethodCallParams | AppClientBareCallParams, contravariant=True)  # noqa: PLC0105
+
+
+class TypedAppFactoryProtocol(Protocol, Generic[CreateParamsT, UpdateParamsT, DeleteParamsT]):
     def __init__(
         self,
         algorand: AlgorandClientProtocol,
@@ -519,9 +526,9 @@ def deploy(  # noqa: PLR0913
         deploy_time_params: TealTemplateParams | None = None,
         on_update: OnUpdate = OnUpdate.Fail,
         on_schema_break: OnSchemaBreak = OnSchemaBreak.Fail,
-        create_params: AppClientMethodCallCreateParams | AppClientBareCallCreateParams | None = None,
-        update_params: AppClientMethodCallParams | AppClientBareCallParams | None = None,
-        delete_params: AppClientMethodCallParams | AppClientBareCallParams | None = None,
+        create_params: CreateParamsT | None = None,
+        update_params: UpdateParamsT | None = None,
+        delete_params: DeleteParamsT | None = None,
         existing_deployments: AppLookup | None = None,
         ignore_cache: bool = False,
         updatable: bool | None = None,

src/algokit_utils/applications/app_manager.py

@@ -216,7 +216,7 @@ def get_box_value_from_abi_type(self, app_id: int, box_name: BoxIdentifier, abi_
         value = self.get_box_value(app_id, box_name)
         try:
             parse_to_tuple = isinstance(abi_type, algosdk.abi.TupleType)
-            decoded_value = abi_type.decode(base64.b64decode(value))
+            decoded_value = abi_type.decode(value)
             return tuple(decoded_value) if parse_to_tuple else decoded_value
         except Exception as e:
             raise ValueError(f"Failed to decode box value {value.decode('utf-8')} with ABI type {abi_type}") from e

tests/applications/test_app_client.py

@@ -517,11 +517,11 @@ def test_retrieve_state(test_app_client: AppClient, funded_account: Account) ->
 
     assert sorted(b.name.name_base64 for b in box_values) == sorted([box_name1_base64, box_name2_base64])
     box1 = next(b for b in box_values if b.name.name_base64 == box_name1_base64)
-    assert box1.value == base64.b64encode(bytes("value1", "utf-8"))
+    assert box1.value == b"value1"
     assert box1_value == box1.value
 
     box2 = next(b for b in box_values if b.name.name_base64 == box_name2_base64)
-    assert box2.value == base64.b64encode(bytes("value2", "utf-8"))
+    assert box2.value == b"value2"
 
     # Legacy contract strips ABI prefix; manually encoded ABI string after
     # passing algosdk's atc results in \x00\n\x00\n1234524352.
@@ -659,8 +659,7 @@ def test_box_methods_with_arc4_returns_parametrized(
     )
 
     # Encode the expected value using the specified ABI type
-    value_encoded = ABIType.from_string(value_type).encode(arg_value)
-    expected_value = base64.b64encode(value_encoded)
+    expected_value = ABIType.from_string(value_type).encode(arg_value)
 
     # Retrieve the actual box value
     actual_box_value = test_app_client_puya.get_box_value(box_reference)