Updated Readme

Author: lmazuel

README.md

@@ -1,22 +1,33 @@
-# Bing Search Python SDK Samples
+# Cognitive Services Python SDK Samples
 
-These samples will show you how to get up and running using the Python SDKs for various Bing Search services. They'll cover a few rudimentary use cases and hopefully express best practices for interacting with the data from these APIs.
+These samples will show you how to get up and running using the Python SDKs for various Cognitive Services services. They'll cover a few rudimentary use cases and hopefully express best practices for interacting with the data from these APIs.
 
 ## Features
 
 This project framework provides examples for the following services:
 
-* Using the **Bing Entity Search SDK** [azure-cognititiveservices-search-entitysearch](http://pypi.python.org/pypi/azure-cognititiveservices-search-entitysearch) for the [Entity Search API](https://azure.microsoft.com/en-us/services/cognitive-services/bing-entity-search-api/)
-* Using the **Bing Web Search SDK** [azure-cognititiveservices-search-websearch](http://pypi.python.org/pypi/azure-cognititiveservices-search-websearch) for the [Web Search API](https://azure.microsoft.com/en-us/services/cognitive-services/bing-web-search-api/)
-* Using the **Bing Video Search SDK** [azure-cognititiveservices-search-videosearch](http://pypi.python.org/pypi/azure-cognititiveservices-search-videosearch) for the [Video Search API](https://azure.microsoft.com/en-us/services/cognitive-services/bing-video-search-api/)
+### Language
+
+* Using the **Bing Spell Check SDK** [azure-cognititiveservices-language-spellcheck](http://pypi.python.org/pypi/azure-cognititiveservices-language-spellcheck) for the [Bing Spell Check API](https://azure.microsoft.com/services/cognitive-services/spell-check/)
+
+### Search
+
+* Using the **Bing Custom Search SDK** [azure-cognititiveservices-search-customsearch](http://pypi.python.org/pypi/azure-cognititiveservices-search-customsearch) for the [Custom Search API](https://azure.microsoft.com/services/cognitive-services/bing-custom-search//)
+* Using the **Bing Entity Search SDK** [azure-cognititiveservices-search-entitysearch](http://pypi.python.org/pypi/azure-cognititiveservices-search-entitysearch) for the [Entity Search API](https://azure.microsoft.com/services/cognitive-services/bing-entity-search-api/)
+* Using the **Bing Image Search SDK** [azure-cognititiveservices-search-imagesearch](http://pypi.python.org/pypi/azure-cognititiveservices-search-imagesearch) for the [Image Search API](https://azure.microsoft.com/services/cognitive-services/bing-image-search-api/
+* Using the **Bing News Search SDK** [azure-cognititiveservices-search-newssearch](http://pypi.python.org/pypi/azure-cognititiveservices-search-newssearch) for the [News Search API](https://azure.microsoft.com/services/cognitive-services/bing-news-search-api/
+* Using the **Bing Video Search SDK** [azure-cognititiveservices-search-videosearch](http://pypi.python.org/pypi/azure-cognititiveservices-search-videosearch) for the [Video Search API](https://azure.microsoft.com/services/cognitive-services/bing-video-search-api/)
+* Using the **Bing Web Search SDK** [azure-cognititiveservices-search-websearch](http://pypi.python.org/pypi/azure-cognititiveservices-search-websearch) for the [Web Search API](https://azure.microsoft.com/services/cognitive-services/bing-web-search-api/)
 
 We provide several meta-packages to help you install several packages at a time. Please note that meta-packages are only recommended for development purpose. It's recommended in production to always pin specific version of individual packages.
 
 ## Getting Started
 
 ### Prerequisites
 
-1.  A cognitive services API key with which to authenticate the SDK's calls. [Sign up here](https://azure.microsoft.com/en-us/services/cognitive-services/directory/) by navigating to the **Search** services and acquiring an API key. You can get a trial key for **free** which will expire after 30 days. To execute both samples, you need an EntitySearch key and a Bing WebSearch key.
+1.  A cognitive services API key with which to authenticate the SDK's calls. [Sign up here](https://azure.microsoft.com/services/cognitive-services/directory/) by navigating to the **Language** or **Search** services and acquiring an API key. You can get a trial key for **free** which will expire after 30 days or create a Cognitive Services account on the Azure portal through the *Use with an Azure subscription* button.
+
+> Subscription keys are usually per service. For example, the subscription key for Spell Check will not be the same than Custom Search. Read the previous *sign up* link or the Azure portal for details on subscription keys.
 
 ### Installation
 
@@ -41,31 +52,35 @@ We provide several meta-packages to help you install several packages at a time.
 1.  Clone the repository.
 
     ```
-    git clone https://github.com/Azure-Samples/bing-search-python.git
+    git clone https://github.com/Azure-Samples/cognitive-services-python-sdk-samples.git
     ```
 
 2.  Install the dependencies using pip.
 
     ```
-    cd bing-search-python
+    cd cognitive-services-python-sdk-samples
     pip install -r requirements.txt
     ```
 
-3.  Set up the environment variable `ENTITYSEARCH_SUBSCRIPTION_KEY` with your CS key if you want to execute EntitySearch tests.
-4.  Set up the environment variable `WEBSEARCH_SUBSCRIPTION_KEY` with your CS key if you want to execute WebSearch tests.
-4.  Set up the environment variable `VIDEOSEARCH_SUBSCRIPTION_KEY` with your CS key if you want to execute VideoSearch tests.
+4.  Set up the environment variable `SPELLCHECK_SUBSCRIPTION_KEY` with your key if you want to execute SpellCheck tests.
+3.  Set up the environment variable `CUSTOMSEARCH_SUBSCRIPTION_KEY` with your key if you want to execute CustomSearch tests.
+3.  Set up the environment variable `ENTITYSEARCH_SUBSCRIPTION_KEY` with your key if you want to execute EntitySearch tests.
+4.  Set up the environment variable `IMAGESEARCH_SUBSCRIPTION_KEY` with your key if you want to execute ImageSearch tests.
+4.  Set up the environment variable `NEWSSEARCH_SUBSCRIPTION_KEY` with your key if you want to execute NewsSearch tests.
+4.  Set up the environment variable `VIDEOSEARCH_SUBSCRIPTION_KEY` with your key if you want to execute VideoSearch tests.
+4.  Set up the environment variable `WEBSEARCH_SUBSCRIPTION_KEY` with your key if you want to execute WebSearch tests.
 
 ## Demo
 
 A demo app is included to show how to use the project.
 
 To run the complete demo, execute `python example.py`
 
-To run each individual demo, point directly to the file:
+To run each individual demo, point directly to the file. For example (i.e. not complete list):
 
-1. `python samples/entity_search_samples.py`
-2. `python samples/web_search_samples.py`
-2. `python samples/video_search_samples.py`
+2. `python samples/language/spellchack_samples.py`
+1. `python samples/search/entity_search_samples.py`
+2. `python samples/search/video_search_samples.py`
 
 To see the code of each example, simply look at the examples in the Samples folder. They are written to be isolated in scope so that you can see only what you're interested in.
 

requirements.txt

@@ -1,3 +1,7 @@
+git+https://github.com/Azure/azure-sdk-for-python#egg=azure-cognitiveservices-language-spellcheck&subdirectory=azure-cognitiveservices-language-spellcheck
+git+https://github.com/Azure/azure-sdk-for-python#egg=azure-cognitiveservices-search-customsearch&subdirectory=azure-cognitiveservices-search-customsearch
 git+https://github.com/Azure/azure-sdk-for-python#egg=azure-cognitiveservices-search-entitysearch&subdirectory=azure-cognitiveservices-search-entitysearch
+git+https://github.com/Azure/azure-sdk-for-python#egg=azure-cognitiveservices-search-imagesearch&subdirectory=azure-cognitiveservices-search-imagesearch
+git+https://github.com/Azure/azure-sdk-for-python#egg=azure-cognitiveservices-search-newssearch&subdirectory=azure-cognitiveservices-search-newssearch
+git+https://github.com/Azure/azure-sdk-for-python#egg=azure-cognitiveservices-search-videosearch&subdirectory=azure-cognitiveservices-search-videosearch
 git+https://github.com/Azure/azure-sdk-for-python#egg=azure-cognitiveservices-search-websearch&subdirectory=azure-cognitiveservices-search-websearch
-git+https://github.com/Azure/azure-sdk-for-python#egg=azure-cognitiveservices-search-videosearch&subdirectory=azure-cognitiveservices-search-videosearch