Merge pull request #33 from iscai-msft/image_search

updated image search samples

Author: wiazur

.gitignore

@@ -103,5 +103,3 @@ ENV/
 # idea
 .idea/
 
-#DS store
-.DS_Store

requirements.txt

@@ -4,9 +4,8 @@ azure-cognitiveservices-language-spellcheck
 azure-cognitiveservices-language-textanalytics>=0.2.0  # sample won't work with previous versions
 azure-cognitiveservices-search-autosuggest
 azure-cognitiveservices-search-customsearch
-azure-cognitiveservices-search-entitysearch>=1.0
-azure-cognitiveservices-search-customimagesearch
-azure-cognitiveservices-search-imagesearch
+azure-cognitiveservices-search-entitysearch
+azure-cognitiveservices-search-imagesearch>=1.0
 azure-cognitiveservices-search-newssearch
 azure-cognitiveservices-search-videosearch
 azure-cognitiveservices-search-visualsearch>=0.2.0  # sample won't work with previous versions

samples/search/image_search_samples.py

@@ -1,4 +1,4 @@
-from azure.cognitiveservices.search.imagesearch import ImageSearchAPI
+from azure.cognitiveservices.search.imagesearch import ImageSearchClient
 from azure.cognitiveservices.search.imagesearch.models import ImageType, ImageAspect, ImageInsightModule
 from msrest.authentication import CognitiveServicesCredentials
 
@@ -10,7 +10,10 @@ def image_search(subscription_key):
 
     This will search images for (canadian rockies) then verify number of results and print out first image result, pivot suggestion, and query expansion.
     """
-    client = ImageSearchAPI(CognitiveServicesCredentials(subscription_key))
+    client = ImageSearchClient(
+        endpoint="https://api.cognitive.microsoft.com",
+        credentials=CognitiveServicesCredentials(subscription_key)
+    )
 
     try:
         image_results = client.images.search(query="canadian rockies")
@@ -73,7 +76,10 @@ def image_search_with_filters(subscription_key):
 
     This will search images for (studio ghibli), filtered for animated gifs and wide aspect, then verify number of results and print out insightsToken, thumbnail url and web url of first result.
     """
-    client = ImageSearchAPI(CognitiveServicesCredentials(subscription_key))
+    client = ImageSearchClient(
+        endpoint="https://api.cognitive.microsoft.com",
+        credentials=CognitiveServicesCredentials(subscription_key)
+    )
 
     try:
         image_results = client.images.search(
@@ -104,7 +110,10 @@ def image_trending(subscription_key):
 
     This will search for trending images then verify categories and tiles.
     """
-    client = ImageSearchAPI(CognitiveServicesCredentials(subscription_key))
+    client = ImageSearchClient(
+        endpoint="https://api.cognitive.microsoft.com",
+        credentials=CognitiveServicesCredentials(subscription_key)
+    )
 
     try:
         trending_result = client.images.trending()
@@ -136,7 +145,10 @@ def image_detail(subscription_key):
 
     This will search images for (degas) and then search for image details of the first image.
     """
-    client = ImageSearchAPI(CognitiveServicesCredentials(subscription_key))
+    client = ImageSearchClient(
+        endpoint="https://api.cognitive.microsoft.com",
+        credentials=CognitiveServicesCredentials(subscription_key)
+    )
 
     try:
         image_results = client.images.search(query="degas")
@@ -227,8 +239,7 @@ def image_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
+    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)