Training Model

tests/arrangement_fixtures.py

@@ -1,19 +1,11 @@
 import unittest.mock
+from generator import comping, vocabulary, parts
+from generator.arrange import form, generate
 
-import generator.arrange.form
-import generator.arrange.generate
-import generator.parts
-
-def section_document(document, part_type, *, rhythms, plan=None):
-  """Exercise the real part pipeline with a single section instead of a full song."""
-  prepared = generator.parts.prepare_document(document)
-  role = {'acoustic': 'accompaniment', 'electric': 'melody', 'vocal': 'vocal'}[part_type]
-  section = generator.arrange.form.ArrangementSection('', 0, len(prepared['staves'][0]['measures']), 0, role)
-  with unittest.mock.patch('generator.arrange.form.full_arrangement_sections', return_value=[section]):
-    if plan is not None:
-      plans = {0: plan}
-    elif part_type == 'acoustic':
-      plans = generator.arrange.generate.plan_arrangement(prepared, rhythms)
-    else:
-      plans = {}
-    return generator.arrange.generate._arrange_document(prepared, part_type, plans)
+def section_document(document,part_type):
+  prepared=parts.prepare_document(document)
+  role={'acoustic':'accompaniment','electric':'melody','vocal':'vocal'}[part_type]
+  section=form.ArrangementSection('',0,len(prepared['staves'][0]['measures']),0,role)
+  with unittest.mock.patch('generator.arrange.form.full_arrangement_sections',return_value=[section]), vocabulary.using(vocabulary.load(),part_type+'_accompaniment'):
+    backing=comping.Canonical(prepared,part_type,'fixture') if part_type=='acoustic' else None
+    return generate._arrange_document(prepared,part_type,accompaniment=backing)