[AutoPR cognitiveservices/data-plane/EntitySearch] typo: cognitiveser…

…vices/data-plane/EntitySearch (#3917)

* Generated from 0f5faf9b3f417c79e23b5360aed6c7d56d5dea91

typo: cognitiveservices/data-plane/EntitySearch

- countr -> country

* Packaging update of azure-cognitiveservices-search-entitysearch

azure-cognitiveservices-search-entitysearch/MANIFEST.in

@@ -1 +1,5 @@
 include *.rst
+include azure/__init__.py
+include azure/cognitiveservices/__init__.py
+include azure/cognitiveservices/search/__init__.py
+

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/__init__.py

@@ -9,10 +9,10 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .entity_search_api import EntitySearchAPI
+from .entity_search_client import EntitySearchClient
 from .version import VERSION
 
-__all__ = ['EntitySearchAPI']
+__all__ = ['EntitySearchClient']
 
 __version__ = VERSION
 

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/entity_search_api.py → azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/entity_search_client.py

@@ -16,52 +16,60 @@
 from . import models
 
 
-class EntitySearchAPIConfiguration(Configuration):
-    """Configuration for EntitySearchAPI
+class EntitySearchClientConfiguration(Configuration):
+    """Configuration for EntitySearchClient
     Note that all parameters used to create this instance are saved as instance
     attributes.
 
+    :param endpoint: Supported Cognitive Services endpoints (protocol and
+     hostname, for example: "https://westus.api.cognitive.microsoft.com",
+     "https://api.cognitive.microsoft.com").
+    :type endpoint: str
     :param credentials: Subscription credentials which uniquely identify
      client subscription.
     :type credentials: None
-    :param str base_url: Service URL
     """
 
     def __init__(
-            self, credentials, base_url=None):
+            self, endpoint, credentials):
 
+        if endpoint is None:
+            raise ValueError("Parameter 'endpoint' must not be None.")
         if credentials is None:
             raise ValueError("Parameter 'credentials' must not be None.")
-        if not base_url:
-            base_url = 'https://api.cognitive.microsoft.com/bing/v7.0'
+        base_url = '{Endpoint}/bing/v7.0'
 
-        super(EntitySearchAPIConfiguration, self).__init__(base_url)
+        super(EntitySearchClientConfiguration, self).__init__(base_url)
 
         self.add_user_agent('azure-cognitiveservices-search-entitysearch/{}'.format(VERSION))
 
+        self.endpoint = endpoint
         self.credentials = credentials
 
 
-class EntitySearchAPI(SDKClient):
+class EntitySearchClient(SDKClient):
     """The Entity Search API lets you send a search query to Bing and get back search results that include entities and places. Place results include restaurants, hotel, or other local businesses. For places, the query can specify the name of the local business or it can ask for a list (for example, restaurants near me). Entity results include persons, places, or things. Place in this context is tourist attractions, states, countries, etc.
 
     :ivar config: Configuration for client.
-    :vartype config: EntitySearchAPIConfiguration
+    :vartype config: EntitySearchClientConfiguration
 
     :ivar entities: Entities operations
     :vartype entities: azure.cognitiveservices.search.entitysearch.operations.EntitiesOperations
 
+    :param endpoint: Supported Cognitive Services endpoints (protocol and
+     hostname, for example: "https://westus.api.cognitive.microsoft.com",
+     "https://api.cognitive.microsoft.com").
+    :type endpoint: str
     :param credentials: Subscription credentials which uniquely identify
      client subscription.
     :type credentials: None
-    :param str base_url: Service URL
     """
 
     def __init__(
-            self, credentials, base_url=None):
+            self, endpoint, credentials):
 
-        self.config = EntitySearchAPIConfiguration(credentials, base_url)
-        super(EntitySearchAPI, self).__init__(self.config.credentials, self.config)
+        self.config = EntitySearchClientConfiguration(endpoint, credentials)
+        super(EntitySearchClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '1.0'

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/__init__.py

@@ -87,7 +87,7 @@
     from .lodging_business import LodgingBusiness
     from .restaurant import Restaurant
     from .hotel import Hotel
-from .entity_search_api_enums import (
+from .entity_search_client_enums import (
     EntityQueryScenario,
     EntityScenario,
     EntityType,

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/airport_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .civic_structure import CivicStructure
+from .civic_structure_py3 import CivicStructure
 
 
 class Airport(CivicStructure):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/answer_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 
 
 class Answer(Response):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/civic_structure_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .place import Place
+from .place_py3 import Place
 
 
 class CivicStructure(Place):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/contractual_rules_attribution_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .contractual_rules_contractual_rule import ContractualRulesContractualRule
+from .contractual_rules_contractual_rule_py3 import ContractualRulesContractualRule
 
 
 class ContractualRulesAttribution(ContractualRulesContractualRule):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/contractual_rules_license_attribution_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .contractual_rules_attribution import ContractualRulesAttribution
+from .contractual_rules_attribution_py3 import ContractualRulesAttribution
 
 
 class ContractualRulesLicenseAttribution(ContractualRulesAttribution):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/contractual_rules_link_attribution_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .contractual_rules_attribution import ContractualRulesAttribution
+from .contractual_rules_attribution_py3 import ContractualRulesAttribution
 
 
 class ContractualRulesLinkAttribution(ContractualRulesAttribution):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/contractual_rules_media_attribution_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .contractual_rules_attribution import ContractualRulesAttribution
+from .contractual_rules_attribution_py3 import ContractualRulesAttribution
 
 
 class ContractualRulesMediaAttribution(ContractualRulesAttribution):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/contractual_rules_text_attribution_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .contractual_rules_attribution import ContractualRulesAttribution
+from .contractual_rules_attribution_py3 import ContractualRulesAttribution
 
 
 class ContractualRulesTextAttribution(ContractualRulesAttribution):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/creative_work_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .thing import Thing
+from .thing_py3 import Thing
 
 
 class CreativeWork(Thing):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/entertainment_business_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .local_business import LocalBusiness
+from .local_business_py3 import LocalBusiness
 
 
 class EntertainmentBusiness(LocalBusiness):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/entities_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .search_results_answer import SearchResultsAnswer
+from .search_results_answer_py3 import SearchResultsAnswer
 
 
 class Entities(SearchResultsAnswer):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/error_response_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 from msrest.exceptions import HttpOperationError
 
 

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/food_establishment_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .local_business import LocalBusiness
+from .local_business_py3 import LocalBusiness
 
 
 class FoodEstablishment(LocalBusiness):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/hotel_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .lodging_business import LodgingBusiness
+from .lodging_business_py3 import LodgingBusiness
 
 
 class Hotel(LodgingBusiness):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/identifiable_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response_base import ResponseBase
+from .response_base_py3 import ResponseBase
 
 
 class Identifiable(ResponseBase):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/image_object_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .media_object import MediaObject
+from .media_object_py3 import MediaObject
 
 
 class ImageObject(MediaObject):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/intangible_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .thing import Thing
+from .thing_py3 import Thing
 
 
 class Intangible(Thing):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/license_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .creative_work import CreativeWork
+from .creative_work_py3 import CreativeWork
 
 
 class License(CreativeWork):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/local_business_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .place import Place
+from .place_py3 import Place
 
 
 class LocalBusiness(Place):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/lodging_business_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .local_business import LocalBusiness
+from .local_business_py3 import LocalBusiness
 
 
 class LodgingBusiness(LocalBusiness):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/media_object_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .creative_work import CreativeWork
+from .creative_work_py3 import CreativeWork
 
 
 class MediaObject(CreativeWork):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/movie_theater_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .entertainment_business import EntertainmentBusiness
+from .entertainment_business_py3 import EntertainmentBusiness
 
 
 class MovieTheater(EntertainmentBusiness):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/organization_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .thing import Thing
+from .thing_py3 import Thing
 
 
 class Organization(Thing):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/place_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .thing import Thing
+from .thing_py3 import Thing
 
 
 class Place(Thing):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/places_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .search_results_answer import SearchResultsAnswer
+from .search_results_answer_py3 import SearchResultsAnswer
 
 
 class Places(SearchResultsAnswer):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/postal_address.py

@@ -68,7 +68,7 @@ class PostalAddress(StructuredValue):
      located. This could be the two-letter ISO code. For example, US, or the
      full name, United States.
     :vartype address_country: str
-    :ivar country_iso: The two letter ISO code of this countr. For example,
+    :ivar country_iso: The two letter ISO code of this country. For example,
      US.
     :vartype country_iso: str
     :ivar neighborhood: The neighborhood where the street address is located.

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/postal_address_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .structured_value import StructuredValue
+from .structured_value_py3 import StructuredValue
 
 
 class PostalAddress(StructuredValue):
@@ -68,7 +68,7 @@ class PostalAddress(StructuredValue):
      located. This could be the two-letter ISO code. For example, US, or the
      full name, United States.
     :vartype address_country: str
-    :ivar country_iso: The two letter ISO code of this countr. For example,
+    :ivar country_iso: The two letter ISO code of this country. For example,
      US.
     :vartype country_iso: str
     :ivar neighborhood: The neighborhood where the street address is located.

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/response_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .identifiable import Identifiable
+from .identifiable_py3 import Identifiable
 
 
 class Response(Identifiable):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/restaurant_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .food_establishment import FoodEstablishment
+from .food_establishment_py3 import FoodEstablishment
 
 
 class Restaurant(FoodEstablishment):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/search_response_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .response import Response
+from .response_py3 import Response
 
 
 class SearchResponse(Response):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/search_results_answer_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .answer import Answer
+from .answer_py3 import Answer
 
 
 class SearchResultsAnswer(Answer):

azure-cognitiveservices-search-entitysearch/azure/cognitiveservices/search/entitysearch/models/structured_value_py3.py

@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .intangible import Intangible
+from .intangible_py3 import Intangible
 
 
 class StructuredValue(Intangible):