[AL-0] Fix S2A validation tests

Author: whistler

labelbox/schema/model.py

@@ -16,6 +16,7 @@ class Model(DbObject):
         """
 
     name = Field.String("name")
+    ontology_id = Field.String("ontology_id")
     model_runs = Relationship.ToMany("ModelRun", False)
 
     def create_model_run(self, name, config=None) -> "ModelRun":

tests/integration/annotation_import/test_send_to_annotate_mea.py

@@ -6,13 +6,15 @@
 
 def test_send_to_annotate_from_model(client, configured_project,
                                      model_run_predictions,
-                                     model_run_with_data_rows,
-                                     project_with_ontology):
+                                     model_run_with_data_rows, project):
     model_run = model_run_with_data_rows
     data_row_ids = [p['dataRow']['id'] for p in model_run_predictions]
     assert len(data_row_ids) > 0
 
-    destination_project, _ = project_with_ontology
+    destination_project = project
+    model = client.get_model(model_run.model_id)
+    ontology = client.get_ontology(model.ontology_id)
+    destination_project.setup_editor(ontology)
 
     queues = destination_project.task_queues()
     initial_review_task = next(

tests/integration/test_send_to_annotate.py

@@ -3,21 +3,22 @@
 
 
 def test_send_to_annotate_include_annotations(
-        client, configured_batch_project_with_label, project_pack):
+        client, configured_batch_project_with_label, project_pack, ontology):
     [source_project, _, data_row, _] = configured_batch_project_with_label
     destination_project = project_pack[0]
 
-    source_ontology_builder = OntologyBuilder.from_project(source_project)
-    editor = list(
-        client.get_labeling_frontends(
-            where=LabelingFrontend.name == "editor"))[0]
-    destination_project.setup(editor, source_ontology_builder.asdict())
+    src_ontology = source_project.ontology()
+    destination_project.setup_editor(ontology)
 
     # build an ontology mapping using the top level tools
-    feature_schema_ids = list(
-        tool.feature_schema_id for tool in source_ontology_builder.tools)
+    src_feature_schema_ids = list(
+        tool.feature_schema_id for tool in src_ontology.tools())
+    dest_ontology = destination_project.ontology()
+    dest_feature_schema_ids = list(
+        tool.feature_schema_id for tool in dest_ontology.tools())
     # create a dictionary of feature schema id to itself
-    ontology_mapping = dict(zip(feature_schema_ids, feature_schema_ids))
+    ontology_mapping = dict(zip(src_feature_schema_ids,
+                                dest_feature_schema_ids))
 
     try:
         queues = destination_project.task_queues()