Merge pull request #177 from openvinotoolkit/fix-model-wrapper-namesp…

…ace-collision Make model wrapper module namespace unique
openvinotoolkit · Mar 28, 2023 · 6e32caa · 6e32caa
2 parents d0acc19 + 2f9b7e5
commit 6e32caa
Show file tree

Hide file tree

Showing 82 changed files with 162 additions and 162 deletions.
diff --git a/geti_sdk/deployment/deployed_model.py b/geti_sdk/deployment/deployed_model.py
@@ -269,7 +269,7 @@ def load_inference_model(
             wrapper_module_path = os.path.join(
                 self._model_python_path, WRAPPER_DIR_NAME
             )
-            module_name = WRAPPER_DIR_NAME
+            module_name = WRAPPER_DIR_NAME + "." + model_type.lower().replace(" ", "-")
             try:
                 spec = importlib.util.spec_from_file_location(
                     module_name, os.path.join(wrapper_module_path, "__init__.py")

diff --git a/tests/fixtures/cassettes/TestAnnotationClient.test_download_annotations_for_video.cassette b/tests/fixtures/cassettes/TestAnnotationClient.test_download_annotations_for_video.cassette
diff --git a/...s/cassettes/TestAnnotationClient.test_upload_and_retrieve_annotations_for_images.cassette b/...s/cassettes/TestAnnotationClient.test_upload_and_retrieve_annotations_for_images.cassette
diff --git a/...es/cassettes/TestAnnotationClient.test_upload_and_retrieve_annotations_for_video.cassette b/...es/cassettes/TestAnnotationClient.test_upload_and_retrieve_annotations_for_video.cassette
diff --git a/...s/cassettes/TestAnnotationClient.test_upload_and_retrieve_annotations_for_videos.cassette b/...s/cassettes/TestAnnotationClient.test_upload_and_retrieve_annotations_for_videos.cassette
diff --git a/tests/fixtures/cassettes/TestConfigurationClient.test_get_and_set_configuration.cassette b/tests/fixtures/cassettes/TestConfigurationClient.test_get_and_set_configuration.cassette
diff --git a/...es/TestGeti.test_create_single_task_project_from_dataset[Classification project].cassette b/...es/TestGeti.test_create_single_task_project_from_dataset[Classification project].cassette
diff --git a/...ssettes/TestGeti.test_create_single_task_project_from_dataset[Detection project].cassette b/...ssettes/TestGeti.test_create_single_task_project_from_dataset[Detection project].cassette
diff --git a/...Geti.test_create_single_task_project_from_dataset[Instance segmentation project].cassette b/...Geti.test_create_single_task_project_from_dataset[Instance segmentation project].cassette
diff --git a/...TestGeti.test_create_single_task_project_from_dataset[Rotated detection project].cassette b/...TestGeti.test_create_single_task_project_from_dataset[Rotated detection project].cassette
diff --git a/...ttes/TestGeti.test_create_single_task_project_from_dataset[Segmentation project].cassette b/...ttes/TestGeti.test_create_single_task_project_from_dataset[Segmentation project].cassette
diff --git a/...test_create_task_chain_project_from_dataset[Detection to classification project].cassette b/...test_create_task_chain_project_from_dataset[Detection to classification project].cassette
diff --git a/...i.test_create_task_chain_project_from_dataset[Detection to segmentation project].cassette b/...i.test_create_task_chain_project_from_dataset[Detection to segmentation project].cassette
diff --git a/tests/fixtures/cassettes/TestGeti.test_deployment[Single task project].cassette b/tests/fixtures/cassettes/TestGeti.test_deployment[Single task project].cassette
diff --git a/tests/fixtures/cassettes/TestGeti.test_deployment[Task chain project].cassette b/tests/fixtures/cassettes/TestGeti.test_deployment[Task chain project].cassette
diff --git a/...ixtures/cassettes/TestGeti.test_download_and_upload_project[Single task project].cassette b/...ixtures/cassettes/TestGeti.test_download_and_upload_project[Single task project].cassette
diff --git a/...fixtures/cassettes/TestGeti.test_download_and_upload_project[Task chain project].cassette b/...fixtures/cassettes/TestGeti.test_download_and_upload_project[Task chain project].cassette
diff --git a/...xtures/cassettes/TestGeti.test_download_project_including_models_and_predictions.cassette b/...xtures/cassettes/TestGeti.test_download_project_including_models_and_predictions.cassette
diff --git a/...s/fixtures/cassettes/TestGeti.test_upload_and_predict_image[Single task project].cassette b/...s/fixtures/cassettes/TestGeti.test_upload_and_predict_image[Single task project].cassette
diff --git a/tests/fixtures/cassettes/TestGeti.test_upload_and_predict_image[Task chain project].cassette b/tests/fixtures/cassettes/TestGeti.test_upload_and_predict_image[Task chain project].cassette
diff --git a/tests/fixtures/cassettes/TestGeti.test_upload_and_predict_media_folder.cassette b/tests/fixtures/cassettes/TestGeti.test_upload_and_predict_media_folder.cassette
diff --git a/tests/fixtures/cassettes/TestGeti.test_upload_and_predict_video.cassette b/tests/fixtures/cassettes/TestGeti.test_upload_and_predict_video.cassette
diff --git a/tests/fixtures/cassettes/TestGetiSession.test_logout.cassette b/tests/fixtures/cassettes/TestGetiSession.test_logout.cassette
diff --git a/tests/fixtures/cassettes/TestImageClient.test_upload_and_delete_image.cassette b/tests/fixtures/cassettes/TestImageClient.test_upload_and_delete_image.cassette
diff --git a/tests/fixtures/cassettes/TestImageClient.test_upload_image_folder_and_download.cassette b/tests/fixtures/cassettes/TestImageClient.test_upload_image_folder_and_download.cassette
diff --git a/...tures/cassettes/TestModelAndPredictionClient.test_download_active_model_for_task.cassette b/...tures/cassettes/TestModelAndPredictionClient.test_download_active_model_for_task.cassette
diff --git a/...cassettes/TestModelAndPredictionClient.test_get_model_algorithm_task_and_version.cassette b/...cassettes/TestModelAndPredictionClient.test_get_model_algorithm_task_and_version.cassette
diff --git a/...ixtures/cassettes/TestModelAndPredictionClient.test_get_model_group_by_algo_name.cassette b/...ixtures/cassettes/TestModelAndPredictionClient.test_get_model_group_by_algo_name.cassette
diff --git a/tests/fixtures/cassettes/TestModelAndPredictionClient.test_predict_image.cassette b/tests/fixtures/cassettes/TestModelAndPredictionClient.test_predict_image.cassette
diff --git a/...s/cassettes/TestModelAndPredictionClient.test_project_setup_and_get_model_by_job.cassette b/...s/cassettes/TestModelAndPredictionClient.test_project_setup_and_get_model_by_job.cassette
diff --git a/tests/fixtures/cassettes/TestProjectClient.test_add_labels_multitask.cassette b/tests/fixtures/cassettes/TestProjectClient.test_add_labels_multitask.cassette
diff --git a/tests/fixtures/cassettes/TestProjectClient.test_add_labels_single_task.cassette b/tests/fixtures/cassettes/TestProjectClient.test_add_labels_single_task.cassette
diff --git a/tests/fixtures/cassettes/TestProjectClient.test_create_and_delete_project.cassette b/tests/fixtures/cassettes/TestProjectClient.test_create_and_delete_project.cassette
diff --git a/tests/fixtures/cassettes/TestProjectClient.test_get_all_projects.cassette b/tests/fixtures/cassettes/TestProjectClient.test_get_all_projects.cassette
diff --git a/tests/fixtures/cassettes/TestProjectClient.test_list_projects.cassette b/tests/fixtures/cassettes/TestProjectClient.test_list_projects.cassette
diff --git a/tests/fixtures/cassettes/TestTrainingClient.test_get_status.cassette b/tests/fixtures/cassettes/TestTrainingClient.test_get_status.cassette
diff --git a/tests/fixtures/cassettes/TestTrainingClient.test_train_task_and_get_jobs.cassette b/tests/fixtures/cassettes/TestTrainingClient.test_train_task_and_get_jobs.cassette
diff --git a/tests/fixtures/cassettes/TestUtils.test_get_supported_algorithms.cassette b/tests/fixtures/cassettes/TestUtils.test_get_supported_algorithms.cassette
diff --git a/tests/fixtures/cassettes/geti.cassette b/tests/fixtures/cassettes/geti.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_annotation_client.cassette b/tests/fixtures/cassettes/geti_sdk_test_annotation_client.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_annotation_client_deletion.cassette b/tests/fixtures/cassettes/geti_sdk_test_annotation_client_deletion.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_configuration_client.cassette b/tests/fixtures/cassettes/geti_sdk_test_configuration_client.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_configuration_client_configuration_client.cassette b/tests/fixtures/cassettes/geti_sdk_test_configuration_client_configuration_client.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_configuration_client_deletion.cassette b/tests/fixtures/cassettes/geti_sdk_test_configuration_client_deletion.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_geti_classification.cassette b/tests/fixtures/cassettes/geti_sdk_test_geti_classification.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_geti_classification_deletion.cassette b/tests/fixtures/cassettes/geti_sdk_test_geti_classification_deletion.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_geti_classification_is_training.cassette b/tests/fixtures/cassettes/geti_sdk_test_geti_classification_is_training.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_geti_classification_prediction_client.cassette b/tests/fixtures/cassettes/geti_sdk_test_geti_classification_prediction_client.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_geti_classification_setup_training.cassette b/tests/fixtures/cassettes/geti_sdk_test_geti_classification_setup_training.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_geti_classification_training_client.cassette b/tests/fixtures/cassettes/geti_sdk_test_geti_classification_training_client.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_geti_detection_to_classification.cassette b/tests/fixtures/cassettes/geti_sdk_test_geti_detection_to_classification.cassette
diff --git a/...res/cassettes/geti_sdk_test_geti_detection_to_classification_add_annotated_media.cassette b/...res/cassettes/geti_sdk_test_geti_detection_to_classification_add_annotated_media.cassette
diff --git a/...es/cassettes/geti_sdk_test_geti_detection_to_classification_configuration_client.cassette b/...es/cassettes/geti_sdk_test_geti_detection_to_classification_configuration_client.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_geti_detection_to_classification_deletion.cassette b/tests/fixtures/cassettes/geti_sdk_test_geti_detection_to_classification_deletion.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_geti_detection_to_classification_is_training.cassette b/tests/fixtures/cassettes/geti_sdk_test_geti_detection_to_classification_is_training.cassette
diff --git a/...tures/cassettes/geti_sdk_test_geti_detection_to_classification_prediction_client.cassette b/...tures/cassettes/geti_sdk_test_geti_detection_to_classification_prediction_client.cassette
diff --git a/...fixtures/cassettes/geti_sdk_test_geti_detection_to_classification_set_auto_train.cassette b/...fixtures/cassettes/geti_sdk_test_geti_detection_to_classification_set_auto_train.cassette
diff --git a/...ures/cassettes/geti_sdk_test_geti_detection_to_classification_set_minimal_hypers.cassette b/...ures/cassettes/geti_sdk_test_geti_detection_to_classification_set_minimal_hypers.cassette
diff --git a/...fixtures/cassettes/geti_sdk_test_geti_detection_to_classification_setup_training.cassette b/...fixtures/cassettes/geti_sdk_test_geti_detection_to_classification_setup_training.cassette
diff --git a/...ixtures/cassettes/geti_sdk_test_geti_detection_to_classification_training_client.cassette b/...ixtures/cassettes/geti_sdk_test_geti_detection_to_classification_training_client.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_image_client.cassette b/tests/fixtures/cassettes/geti_sdk_test_image_client.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_image_client_deletion.cassette b/tests/fixtures/cassettes/geti_sdk_test_image_client_deletion.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_model_and_prediction_client.cassette b/tests/fixtures/cassettes/geti_sdk_test_model_and_prediction_client.cassette
diff --git a/...fixtures/cassettes/geti_sdk_test_model_and_prediction_client_add_annotated_media.cassette b/...fixtures/cassettes/geti_sdk_test_model_and_prediction_client_add_annotated_media.cassette
diff --git a/...ixtures/cassettes/geti_sdk_test_model_and_prediction_client_configuration_client.cassette b/...ixtures/cassettes/geti_sdk_test_model_and_prediction_client_configuration_client.cassette
diff --git a/tests/fixtures/cassettes/geti_sdk_test_model_and_prediction_client_deletion.cassette b/tests/fixtures/cassettes/geti_sdk_test_model_and_prediction_client_deletion.cassette