Merge pull request #11 from ericsk/master

wiazur · web-flow · commit 4b5c95aafdad · 2019-12-02T20:15:06.000-08:00
Modify the package import path to enhance the compatibility.
diff --git a/samples/language/spellcheck_samples.py b/samples/language/spellcheck_samples.py
@@ -45,8 +45,7 @@ def spellcheck(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/language/text_analytics_samples.py b/samples/language/text_analytics_samples.py
@@ -144,10 +144,7 @@ def entity_recognition():
 # </entityRecognition>
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    key_env_name = "TEXTANALYTICS_SUBSCRIPTION_KEY"
-    execute_samples(globals(), key_env_name)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/custom_search_samples.py b/samples/search/custom_search_samples.py
@@ -30,8 +30,7 @@ def custom_search_web_page_result_lookup(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/entity_search_samples.py b/samples/search/entity_search_samples.py
@@ -215,7 +215,6 @@ def error(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))    
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
     from samples.tools import execute_samples
-    import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/image_search_samples.py b/samples/search/image_search_samples.py
@@ -240,6 +240,6 @@ def image_detail(subscription_key):
 
 if __name__ == "__main__":
     import sys, os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))    
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
     from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/news_search_samples.py b/samples/search/news_search_samples.py
@@ -146,8 +146,7 @@ def news_trending(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/video_search_samples.py b/samples/search/video_search_samples.py
@@ -160,8 +160,7 @@ def video_detail(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))    
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/visual_search_samples.py b/samples/search/visual_search_samples.py
@@ -290,8 +290,7 @@ def search_url_with_json(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/search/web_search_samples.py b/samples/search/web_search_samples.py
@@ -160,8 +160,7 @@ def web_search_with_answer_count_promote_and_safe_search(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/computer_vision_samples.py b/samples/vision/computer_vision_samples.py
@@ -104,8 +104,7 @@ def recognize_printed_text_in_stream(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_image_job_samples.py b/samples/vision/content_moderator_image_job_samples.py
@@ -102,8 +102,7 @@ def image_review_jobs(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_image_list_samples.py b/samples/vision/content_moderator_image_list_samples.py
@@ -221,8 +221,7 @@ def add_images(list_id, image_url, label):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_image_moderation_samples.py b/samples/vision/content_moderator_image_moderation_samples.py
@@ -65,8 +65,7 @@ def image_moderation(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_image_review.py b/samples/vision/content_moderator_image_review.py
@@ -77,8 +77,7 @@ def image_review(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
     from samples.tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_term_list_samples.py b/samples/vision/content_moderator_term_list_samples.py
@@ -177,8 +177,7 @@ def terms_lists(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_text_moderation_samples.py b/samples/vision/content_moderator_text_moderation_samples.py
@@ -45,8 +45,7 @@ def text_moderation(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_video_review.py b/samples/vision/content_moderator_video_review.py
@@ -119,8 +119,7 @@ def create_frames_to_add_to_reviews(timestamp_seconds, url):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/content_moderator_video_transcript_review.py b/samples/vision/content_moderator_video_transcript_review.py
@@ -113,8 +113,7 @@ def video_transcript_review(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
-    execute_samples(globals(), SUBSCRIPTION_KEY)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/custom_vision_object_detection_sample.py b/samples/vision/custom_vision_object_detection_sample.py
@@ -2,10 +2,12 @@
 import sys
 import time
 
-from azure.cognitiveservices.vision.customvision.training import CustomVisionTrainingClient
+from azure.cognitiveservices.vision.customvision.training import training_api
 from azure.cognitiveservices.vision.customvision.training.models import ImageFileCreateEntry, Region
 from azure.cognitiveservices.vision.customvision.prediction import CustomVisionPredictionClient
 
+sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+
 # Replace with a valid key
 SUBSCRIPTION_KEY_ENV_NAME = "CUSTOMVISION_TRAINING_KEY"
 PREDICTION_RESOURCE_ID_KEY_ENV_NAME = "CUSTOMVISION_PREDICTION_ID"
@@ -26,8 +28,8 @@ def run_sample(subscription_key):
     try:
         prediction_key = os.environ[PREDICTION_KEY_ENV_NAME]
     except KeyError:
-        raise SubscriptionKeyError(
-            "You need to set the {} env variable.".format(PREDICTION_KEY_ENV_NAME))
+        from samples.tools import SubscriptionKeyError
+        raise SubscriptionKeyError("You need to set the {} env variable.".format(PREDICTION_KEY_ENV_NAME))
 
     project, iteration = train_project(subscription_key)
     predict_project(prediction_key, project, iteration)
@@ -157,8 +159,5 @@ def predict_project(prediction_key, project, iteration):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/custom_vision_prediction_samples.py b/samples/vision/custom_vision_prediction_samples.py
@@ -53,8 +53,7 @@ def predict_project(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples, SubscriptionKeyError
-    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples, SubscriptionKeyError
+    execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
diff --git a/samples/vision/custom_vision_training_samples.py b/samples/vision/custom_vision_training_samples.py
@@ -63,8 +63,7 @@ def train_project(subscription_key):
 
 
 if __name__ == "__main__":
-    import sys
-    import os.path
-    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..")))
-    from tools import execute_samples
+    import sys, os.path
+    sys.path.append(os.path.abspath(os.path.join(__file__, "..", "..", "..")))
+    from samples.tools import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)
