Merge pull request #34 from iscai-msft/entity_search

updated entity search samples

Author: wiazur

.gitignore

@@ -100,7 +100,7 @@ ENV/
 # mypy
 .mypy_cache/
 
-# idea files
+# idea
 .idea/
 
 #DS store

requirements.txt

@@ -3,9 +3,9 @@ azure-cognitiveservices-language-luis
 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-customsearch>=0.2.0  # sample won't work with previous versions
-azure-cognitiveservices-search-entitysearch
 azure-cognitiveservices-search-imagesearch
 azure-cognitiveservices-search-newssearch
 azure-cognitiveservices-search-videosearch

samples/search/entity_search_samples.py

@@ -1,4 +1,4 @@
-from azure.cognitiveservices.search.entitysearch import EntitySearchAPI
+from azure.cognitiveservices.search.entitysearch import EntitySearchClient
 from azure.cognitiveservices.search.entitysearch.models import Place, ErrorResponseException
 from msrest.authentication import CognitiveServicesCredentials
 
@@ -11,7 +11,10 @@ def dominant_entity_lookup(subscription_key):
 
     This will look up a single entity (Satya Nadella) and print out a short description about them.
     """
-    client = EntitySearchAPI(CognitiveServicesCredentials(subscription_key))
+    client = EntitySearchClient(
+        endpoint="https://api.cognitive.microsoft.com",
+        credentials=CognitiveServicesCredentials(subscription_key)
+    )
 
     try:
         entity_data = client.entities.search(query="satya nadella")
@@ -41,7 +44,10 @@ def handling_disambiguation(subscription_key):
 
     "This will handle disambiguation results for an ambiguous query (William Gates)".
     """
-    client = EntitySearchAPI(CognitiveServicesCredentials(subscription_key))
+    client = EntitySearchClient(
+        endpoint="https://api.cognitive.microsoft.com",
+        credentials=CognitiveServicesCredentials(subscription_key)
+    )
 
     try:
         entity_data = client.entities.search(query="william gates")
@@ -89,7 +95,10 @@ def restaurant_lookup(subscription_key):
 
     This will look up a single restaurant (john howie bellevue) and print out its phone number.
     """
-    client = EntitySearchAPI(CognitiveServicesCredentials(subscription_key))
+    client = EntitySearchClient(
+        endpoint="https://api.cognitive.microsoft.com",
+        credentials=CognitiveServicesCredentials(subscription_key)
+    )
 
     try:
         entity_data = client.entities.search(query="john howie bellevue")
@@ -133,7 +142,10 @@ def multiple_restaurant_lookup(subscription_key):
     This will look up a list of restaurants (seattle restaurants) and present their names and phone numbers.
     """
 
-    client = EntitySearchAPI(CognitiveServicesCredentials(subscription_key))
+    client = EntitySearchClient(
+        endpoint="https://api.cognitive.microsoft.com",
+        credentials=CognitiveServicesCredentials(subscription_key)
+    )
 
     try:
         restaurants = client.entities.search(query="seattle restaurants")
@@ -176,7 +188,10 @@ def error(subscription_key):
     This triggers a bad request and shows how to read the error response.
     """
 
-    client = EntitySearchAPI(CognitiveServicesCredentials(subscription_key))
+    client = EntitySearchClient(
+        endpoint="https://api.cognitive.microsoft.com",
+        credentials=CognitiveServicesCredentials(subscription_key)
+    )
 
     try:
         entity_data = client.entities.search(
@@ -199,8 +214,8 @@ def error(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
+    import execute_samples
     execute_samples(globals(), SUBSCRIPTION_KEY_ENV_NAME)