diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/action.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/action.py index b92cf4fe2fd1..be8213c708f7 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/action.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/action.py @@ -13,7 +13,7 @@ class Action(CreativeWork): - """Action. + """Defines an action. You probably want to use the sub-classes and not this class directly. Known sub-classes are: ImageAction diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/action_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/action_py3.py index 00069c4f2626..d7bd005fe6a7 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/action_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/action_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .creative_work import CreativeWork +from .creative_work_py3 import CreativeWork class Action(CreativeWork): - """Action. + """Defines an action. You probably want to use the sub-classes and not this class directly. Known sub-classes are: ImageAction diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/aggregate_offer_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/aggregate_offer_py3.py index 5565960ea1b5..b1e0618c0bb3 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/aggregate_offer_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/aggregate_offer_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .offer import Offer +from .offer_py3 import Offer class AggregateOffer(Offer): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/aggregate_rating_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/aggregate_rating_py3.py index ec4fe8aec9f7..bdd901e708ea 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/aggregate_rating_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/aggregate_rating_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .rating import Rating +from .rating_py3 import Rating class AggregateRating(Rating): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/creative_work_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/creative_work_py3.py index 791ce86983b5..c27b2c8d2e01 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/creative_work_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/creative_work_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .thing import Thing +from .thing_py3 import Thing class CreativeWork(Thing): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/error_response_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/error_response_py3.py index ae22ba3899d1..9f6e61658b3b 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/error_response_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/error_response_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .response import Response +from .response_py3 import Response from msrest.exceptions import HttpOperationError diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/identifiable_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/identifiable_py3.py index c87dc0347e3d..2d24a2c45775 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/identifiable_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/identifiable_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .response_base import ResponseBase +from .response_base_py3 import ResponseBase class Identifiable(ResponseBase): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_action.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_action.py index 6cefee2ed482..ae3d56957457 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_action.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_action.py @@ -13,7 +13,7 @@ class ImageAction(Action): - """ImageAction. + """Defines an image action. You probably want to use the sub-classes and not this class directly. Known sub-classes are: ImageEntityAction, ImageModuleAction, ImageRecipesAction, diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_action_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_action_py3.py index 0ff2485500aa..535a934682ee 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_action_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_action_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .action import Action +from .action_py3 import Action class ImageAction(Action): - """ImageAction. + """Defines an image action. You probably want to use the sub-classes and not this class directly. Known sub-classes are: ImageEntityAction, ImageModuleAction, ImageRecipesAction, diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_entity_action.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_entity_action.py index 1cb297790789..4a7a7dedcc31 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_entity_action.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_entity_action.py @@ -13,7 +13,7 @@ class ImageEntityAction(ImageAction): - """ImageEntityAction. + """Defines an entity action. Variables are only populated by the server, and will be ignored when sending a request. @@ -67,8 +67,6 @@ class ImageEntityAction(ImageAction): :vartype service_url: str :ivar action_type: A string representing the type of action. :vartype action_type: str - :ivar data: Information about the entity. - :vartype data: ~azure.cognitiveservices.search.visualsearch.models.Thing """ _validation = { @@ -91,7 +89,6 @@ class ImageEntityAction(ImageAction): 'is_top_action': {'readonly': True}, 'service_url': {'readonly': True}, 'action_type': {'readonly': True}, - 'data': {'readonly': True}, } _attribute_map = { @@ -114,10 +111,8 @@ class ImageEntityAction(ImageAction): 'is_top_action': {'key': 'isTopAction', 'type': 'bool'}, 'service_url': {'key': 'serviceUrl', 'type': 'str'}, 'action_type': {'key': 'actionType', 'type': 'str'}, - 'data': {'key': 'data', 'type': 'Thing'}, } def __init__(self, **kwargs): super(ImageEntityAction, self).__init__(**kwargs) - self.data = None self._type = 'ImageEntityAction' diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_entity_action_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_entity_action_py3.py index 88ad26e6db15..c6fcb4cf8dc8 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_entity_action_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_entity_action_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .image_action import ImageAction +from .image_action_py3 import ImageAction class ImageEntityAction(ImageAction): - """ImageEntityAction. + """Defines an entity action. Variables are only populated by the server, and will be ignored when sending a request. @@ -67,8 +67,6 @@ class ImageEntityAction(ImageAction): :vartype service_url: str :ivar action_type: A string representing the type of action. :vartype action_type: str - :ivar data: Information about the entity. - :vartype data: ~azure.cognitiveservices.search.visualsearch.models.Thing """ _validation = { @@ -91,7 +89,6 @@ class ImageEntityAction(ImageAction): 'is_top_action': {'readonly': True}, 'service_url': {'readonly': True}, 'action_type': {'readonly': True}, - 'data': {'readonly': True}, } _attribute_map = { @@ -114,10 +111,8 @@ class ImageEntityAction(ImageAction): 'is_top_action': {'key': 'isTopAction', 'type': 'bool'}, 'service_url': {'key': 'serviceUrl', 'type': 'str'}, 'action_type': {'key': 'actionType', 'type': 'str'}, - 'data': {'key': 'data', 'type': 'Thing'}, } def __init__(self, **kwargs) -> None: super(ImageEntityAction, self).__init__(**kwargs) - self.data = None self._type = 'ImageEntityAction' diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_knowledge.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_knowledge.py index 18ec46ba7eaf..fc10954325c9 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_knowledge.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_knowledge.py @@ -13,7 +13,7 @@ class ImageKnowledge(Response): - """ImageKnowledge. + """Defines a visual search API response. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_knowledge_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_knowledge_py3.py index 637dc7e91a51..4148b7ded186 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_knowledge_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_knowledge_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .response import Response +from .response_py3 import Response class ImageKnowledge(Response): - """ImageKnowledge. + """Defines a visual search API response. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_module_action.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_module_action.py index 7c4103aaedc2..b0235cef8087 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_module_action.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_module_action.py @@ -13,7 +13,7 @@ class ImageModuleAction(ImageAction): - """ImageModuleAction. + """Defines an image list action. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_module_action_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_module_action_py3.py index 2b258fc7f593..46982a59e63a 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_module_action_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_module_action_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .image_action import ImageAction +from .image_action_py3 import ImageAction class ImageModuleAction(ImageAction): - """ImageModuleAction. + """Defines an image list action. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object_py3.py index 7f9ea4eb226a..76c7c9f42e2c 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_object_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .media_object import MediaObject +from .media_object_py3 import MediaObject class ImageObject(MediaObject): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_recipes_action.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_recipes_action.py index 360fccbcf6e2..eb7eb7696fe5 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_recipes_action.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_recipes_action.py @@ -13,7 +13,7 @@ class ImageRecipesAction(ImageAction): - """ImageRecipesAction. + """Defines an recipe action. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_recipes_action_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_recipes_action_py3.py index 42b4b87cc25d..e077892ca5a6 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_recipes_action_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_recipes_action_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .image_action import ImageAction +from .image_action_py3 import ImageAction class ImageRecipesAction(ImageAction): - """ImageRecipesAction. + """Defines an recipe action. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_related_searches_action.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_related_searches_action.py index 53ff3dc895d6..79324a221026 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_related_searches_action.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_related_searches_action.py @@ -13,7 +13,7 @@ class ImageRelatedSearchesAction(ImageAction): - """ImageRelatedSearchesAction. + """Defines an related search action. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_related_searches_action_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_related_searches_action_py3.py index 83c2a527a509..da9fe87fa241 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_related_searches_action_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_related_searches_action_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .image_action import ImageAction +from .image_action_py3 import ImageAction class ImageRelatedSearchesAction(ImageAction): - """ImageRelatedSearchesAction. + """Defines an related search action. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_shopping_sources_action.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_shopping_sources_action.py index 14e101a740c4..74d6f083538c 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_shopping_sources_action.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_shopping_sources_action.py @@ -13,7 +13,7 @@ class ImageShoppingSourcesAction(ImageAction): - """ImageShoppingSourcesAction. + """Defines a shopping sources action. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_shopping_sources_action_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_shopping_sources_action_py3.py index 0647c7ca9c35..3d7bd526b8e5 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_shopping_sources_action_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_shopping_sources_action_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .image_action import ImageAction +from .image_action_py3 import ImageAction class ImageShoppingSourcesAction(ImageAction): - """ImageShoppingSourcesAction. + """Defines a shopping sources action. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag.py index 93cc9dff48a2..8d6dba99732f 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag.py @@ -13,7 +13,7 @@ class ImageTag(Thing): - """ImageTag. + """A visual search tag. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_py3.py index c23391843572..31d34196bb68 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .thing import Thing +from .thing_py3 import Thing class ImageTag(Thing): - """ImageTag. + """A visual search tag. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_region.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_region.py index 5f2e6b9f6fd8..6ddf0148ff89 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_region.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_region.py @@ -13,7 +13,7 @@ class ImageTagRegion(Model): - """ImageTagRegion. + """Defines an image region relevant to the ImageTag. All required parameters must be populated in order to send to Azure. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_region_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_region_py3.py index 3e77b58e698d..ee7b2a63f8aa 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_region_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/image_tag_region_py3.py @@ -13,7 +13,7 @@ class ImageTagRegion(Model): - """ImageTagRegion. + """Defines an image region relevant to the ImageTag. All required parameters must be populated in order to send to Azure. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/intangible_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/intangible_py3.py index 7c09fc43e1ea..0d2fb83e1249 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/intangible_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/intangible_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .thing import Thing +from .thing_py3 import Thing class Intangible(Thing): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object_py3.py index 2cdec85cd450..1892863a64c1 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/media_object_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .creative_work import CreativeWork +from .creative_work_py3 import CreativeWork class MediaObject(CreativeWork): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/normalized_quadrilateral_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/normalized_quadrilateral_py3.py index fadb4501ee22..6b9724e70a04 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/normalized_quadrilateral_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/normalized_quadrilateral_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .structured_value import StructuredValue +from .structured_value_py3 import StructuredValue class NormalizedQuadrilateral(StructuredValue): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/offer_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/offer_py3.py index ef3da614f4df..5db668bb878a 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/offer_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/offer_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .thing import Thing +from .thing_py3 import Thing class Offer(Thing): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/organization_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/organization_py3.py index 5e4a71a21be6..9a2876594144 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/organization_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/organization_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .thing import Thing +from .thing_py3 import Thing class Organization(Thing): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/person_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/person_py3.py index edbfcd02eba4..0a499b58e07f 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/person_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/person_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .thing import Thing +from .thing_py3 import Thing class Person(Thing): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/point2_d.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/point2_d.py index 81e055b8b859..e05d298f56ed 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/point2_d.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/point2_d.py @@ -13,7 +13,7 @@ class Point2D(StructuredValue): - """Point2D. + """Defines a 2D point with X and Y coordinates. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/point2_d_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/point2_d_py3.py index 31e9b2bdcb97..3657c7c9eee8 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/point2_d_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/point2_d_py3.py @@ -9,11 +9,11 @@ # regenerated. # -------------------------------------------------------------------------- -from .structured_value import StructuredValue +from .structured_value_py3 import StructuredValue class Point2D(StructuredValue): - """Point2D. + """Defines a 2D point with X and Y coordinates. Variables are only populated by the server, and will be ignored when sending a request. diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/rating_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/rating_py3.py index cf4b1a32eec8..e7334a8e6913 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/rating_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/rating_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .properties_item import PropertiesItem +from .properties_item_py3 import PropertiesItem class Rating(PropertiesItem): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/recipe_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/recipe_py3.py index 1c2472adb1a6..c66c538c0d59 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/recipe_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/recipe_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .creative_work import CreativeWork +from .creative_work_py3 import CreativeWork class Recipe(CreativeWork): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/response_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/response_py3.py index e202a78acf5b..022dbc952da3 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/response_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/response_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .identifiable import Identifiable +from .identifiable_py3 import Identifiable class Response(Identifiable): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/structured_value_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/structured_value_py3.py index f1eaf66ea44e..e5db5c6ec567 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/structured_value_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/structured_value_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .intangible import Intangible +from .intangible_py3 import Intangible class StructuredValue(Intangible): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/thing_py3.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/thing_py3.py index e09fc32c6394..ba7e7f40d474 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/thing_py3.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/models/thing_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .response import Response +from .response_py3 import Response class Thing(Response): diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/__init__.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/__init__.py index 5dbea237465e..2bfc3b8933ba 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/__init__.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/__init__.py @@ -9,8 +9,8 @@ # regenerated. # -------------------------------------------------------------------------- -from .images_operations import ImagesOperations +from .bing_operations import BingOperations __all__ = [ - 'ImagesOperations', + 'BingOperations', ] diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/images_operations.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/bing_operations.py similarity index 90% rename from azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/images_operations.py rename to azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/bing_operations.py index b1afdf230891..98357fca02c0 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/images_operations.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/operations/bing_operations.py @@ -14,8 +14,8 @@ from .. import models -class ImagesOperations(object): - """ImagesOperations operations. +class BingOperations(object): + """BingOperations operations. :param client: Client for service requests. :param config: Configuration of service client. @@ -35,8 +35,8 @@ def __init__(self, client, config, serializer, deserializer): self.config = config self.x_bing_apis_sdk = "true" - def visual_search( - self, accept_language=None, content_type=None, user_agent=None, client_id=None, client_ip=None, location=None, knowledge_request=None, image=None, custom_headers=None, raw=False, **operation_config): + def visual_search_v7( + self, accept_language=None, content_type=None, user_agent=None, client_id=None, client_ip=None, location=None, market=None, knowledge_request=None, image=None, custom_headers=None, raw=False, **operation_config): """Visual Search API lets you discover insights about an image such as visually similar images, shopping sources, and related searches. The API can also perform text recognition, identify entities (people, @@ -176,6 +176,21 @@ def visual_search( you should include this header and the X-MSEdge-ClientIP header, but at a minimum, you should include this header. :type location: str + :param market: The market where the results come from. Typically, mkt + is the country where the user is making the request from. However, it + could be a different country if the user is not located in a country + where Bing delivers results. The market must be in the form -. For example, en-US. The string is case + insensitive. For a list of possible market values, see [Market + Codes](https://docs.microsoft.com/en-us/azure/cognitive-services/bing-visual-search/supported-countries-markets). + NOTE: If known, you are encouraged to always specify the market. + Specifying the market helps Bing route the request and return an + appropriate and optimal response. If you specify a market that is not + listed in [Market + Codes](https://docs.microsoft.com/en-us/azure/cognitive-services/bing-visual-search/supported-countries-markets), + Bing uses a best fit market code based on an internal mapping that is + subject to change. + :type market: str :param knowledge_request: The form data is a JSON object that identifies the image using an insights token or URL to the image. The object may also include an optional crop area that identifies an area @@ -207,10 +222,12 @@ def visual_search( :class:`ErrorResponseException` """ # Construct URL - url = self.visual_search.metadata['url'] + url = self.visual_search_v7.metadata['url'] # Construct parameters query_parameters = {} + if market is not None: + query_parameters['mkt'] = self._serialize.query("market", market, 'str') # Construct headers header_parameters = {} @@ -255,4 +272,4 @@ def visual_search( return client_raw_response return deserialized - visual_search.metadata = {'url': '/images/visualsearch'} + visual_search_v7.metadata = {'url': '/images/visualsearch'} diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/version.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/version.py index e7efe25ea7e0..63d89bfb54fa 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/version.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.1.1" +VERSION = "1.0" diff --git a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/visual_search_api.py b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/visual_search_api.py index fcdeafdf97fa..36581b39899f 100644 --- a/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/visual_search_api.py +++ b/azure-cognitiveservices-search-visualsearch/azure/cognitiveservices/search/visualsearch/visual_search_api.py @@ -12,7 +12,7 @@ from msrest.service_client import SDKClient from msrest import Configuration, Serializer, Deserializer from .version import VERSION -from .operations.images_operations import ImagesOperations +from .operations.bing_operations import BingOperations from . import models @@ -48,8 +48,8 @@ class VisualSearchAPI(SDKClient): :ivar config: Configuration for client. :vartype config: VisualSearchAPIConfiguration - :ivar images: Images operations - :vartype images: azure.cognitiveservices.search.visualsearch.operations.ImagesOperations + :ivar bing: Bing operations + :vartype bing: azure.cognitiveservices.search.visualsearch.operations.BingOperations :param credentials: Subscription credentials which uniquely identify client subscription. @@ -68,5 +68,5 @@ def __init__( self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) - self.images = ImagesOperations( + self.bing = BingOperations( self._client, self.config, self._serialize, self._deserialize)