Generic compute plan

backend/substrapp/serializers/ledger/computeplan/serializer.py

@@ -5,8 +5,11 @@
 from .util import createLedgerComputePlan
 from .tasks import createLedgerComputePlanAsync
 
+from substrapp.serializers.ledger.utils import PermissionsSerializer
+
 
 class ComputePlanTraintupleSerializer(serializers.Serializer):
+    algo_key = serializers.CharField(min_length=64, max_length=64)
     data_manager_key = serializers.CharField(min_length=64, max_length=64)
     train_data_sample_keys = serializers.ListField(
         child=serializers.CharField(min_length=64, max_length=64),
@@ -29,11 +32,38 @@ class ComputePlanTesttupleSerializer(serializers.Serializer):
     tag = serializers.CharField(min_length=0, max_length=64, allow_blank=True, required=False)
 
 
-class LedgerComputePlanSerializer(serializers.Serializer):
+class ComputePlanCompositeTrainTupleSerializer(serializers.Serializer):
     algo_key = serializers.CharField(min_length=64, max_length=64)
+    data_manager_key = serializers.CharField(min_length=64, max_length=64)
+    train_data_sample_keys = serializers.ListField(
+        child=serializers.CharField(min_length=64, max_length=64),
+        min_length=1)
+    composite_traintuple_id = serializers.CharField(min_length=1, max_length=64)
+    in_head_model_id = serializers.CharField(min_length=1, max_length=64, allow_blank=True, required=False,
+                                             allow_null=True)
+    in_trunk_model_id = serializers.CharField(min_length=1, max_length=64, allow_blank=True, required=False,
+                                              allow_null=True)
+    out_trunk_model_permissions = PermissionsSerializer()
+    tag = serializers.CharField(min_length=0, max_length=64, allow_blank=True, required=False)
+
+
+class ComputePlanAggregatetupleSerializer(serializers.Serializer):
+    aggregatetuple_id = serializers.CharField(min_length=1, max_length=64)
+    algo_key = serializers.CharField(min_length=64, max_length=64)
+    worker = serializers.CharField()
+    in_models_ids = serializers.ListField(
+        child=serializers.CharField(min_length=1, max_length=64),
+        min_length=0,
+        required=False)
+    tag = serializers.CharField(min_length=0, max_length=64, allow_blank=True, required=False)
+
+
+class LedgerComputePlanSerializer(serializers.Serializer):
     objective_key = serializers.CharField(min_length=64, max_length=64)
     traintuples = ComputePlanTraintupleSerializer(many=True)
     testtuples = ComputePlanTesttupleSerializer(many=True)
+    composite_traintuples = ComputePlanCompositeTrainTupleSerializer(many=True)
+    aggregatetuples = ComputePlanAggregatetupleSerializer(many=True)
 
     def get_args(self, data):
         # convert snake case fields to camel case fields to match chaincode expected inputs
@@ -42,6 +72,7 @@ def get_args(self, data):
             traintuple = {
                 'dataManagerKey': data_traintuple['data_manager_key'],
                 'dataSampleKeys': data_traintuple['train_data_sample_keys'],
+                'algoKey': data_traintuple['algo_key'],
                 'id': data_traintuple['traintuple_id'],
             }
             if 'in_models_ids' in data_traintuple:
@@ -65,11 +96,49 @@ def get_args(self, data):
 
             testtuples.append(testtuple)
 
+        composite_traintuples = []
+        for data_composite_traintuple in data['composite_traintuples']:
+            composite_traintuple = {
+                'algoKey': data_composite_traintuple['algo_key'],
+                'dataManagerKey': data_composite_traintuple['data_manager_key'],
+                'dataSampleKeys': data_composite_traintuple['train_data_sample_keys'],
+                'id': data_composite_traintuple['composite_traintuple_id'],
+            }
+
+            if 'tag' in data_composite_traintuple:
+                composite_traintuple['tag'] = data_composite_traintuple['tag']
+            if 'in_head_model_id' in data_composite_traintuple:
+                composite_traintuple['inHeadModelID'] = data_composite_traintuple['in_head_model_id']
+            if 'in_trunk_model_id' in data_composite_traintuple:
+                composite_traintuple['inTrunkModelID'] = data_composite_traintuple['in_trunk_model_id']
+            if 'out_trunk_model_permissions' in data_composite_traintuple:
+                composite_traintuple['outTrunkModelPermissions'] = data_composite_traintuple[
+                    'out_trunk_model_permissions'
+                ]
+
+            composite_traintuples.append(composite_traintuple)
+
+        aggregatetuples = []
+        for data_aggregatetuple in data['aggregatetuples']:
+            aggregatetuple = {
+                'algoKey': data_aggregatetuple['algo_key'],
+                'worker': data_aggregatetuple['worker'],
+                'id': data_aggregatetuple['aggregatetuple_id'],
+            }
+
+            if 'in_models_ids' in data_aggregatetuple:
+                aggregatetuple['inModelsIDs'] = data_aggregatetuple['in_models_ids']
+            if 'tag' in data_aggregatetuple:
+                aggregatetuple['tag'] = data_aggregatetuple['tag']
+
+            aggregatetuples.append(aggregatetuple)
+
         return {
-            'algoKey': data['algo_key'],
             'objectiveKey': data['objective_key'],
             'traintuples': traintuples,
             'testtuples': testtuples,
+            'compositeTraintuples': composite_traintuples,
+            'aggregatetuples': aggregatetuples
         }
 
     def create(self, validated_data):

backend/substrapp/tests/views/tests_views_computeplan.py

@@ -41,9 +41,9 @@ def test_create(self):
         dummy_key = 'x' * 64
 
         data = {
-            'algo_key': dummy_key,
             'objective_key': dummy_key,
             'traintuples': [{
+                'algo_key': dummy_key,
                 'data_manager_key': dummy_key,
                 'train_data_sample_keys': [dummy_key],
                 'traintuple_id': dummy_key,
@@ -52,6 +52,8 @@ def test_create(self):
                 'traintuple_id': dummy_key,
                 'data_manager_key': dummy_key,
             }],
+            'composite_traintuples': [],
+            'aggregatetuples': [],
         }
 
         with mock.patch.object(LedgerComputePlanSerializer, 'create') as mcreate: