diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/CHANGELOG.md b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/CHANGELOG.md index 1d14ea04c7a3..4a93989a294d 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/CHANGELOG.md +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/CHANGELOG.md @@ -1,5 +1,12 @@ # Release History +## 0.3.0 (2020-11-07) + +**Features** + +- `QnAMakerClient` now consolidates both authoring and runtime. +- Support for `5.0.0.preview.1` API version + ## 0.2.0 (2020-03-17) **Features** diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/__init__.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/__init__.py index 2db0affab3be..1b5232d238e3 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/__init__.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/__init__.py @@ -8,7 +8,11 @@ # Changes may cause incorrect behavior and will be lost if the code is # regenerated. # -------------------------------------------------------------------------- + +from .qn_amaker_client import QnAMakerClient from .version import VERSION +__all__ = ['QnAMakerClient'] __version__ = VERSION + diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/__init__.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/__init__.py deleted file mode 100644 index 1b5232d238e3..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from .qn_amaker_client import QnAMakerClient -from .version import VERSION - -__all__ = ['QnAMakerClient'] - -__version__ = VERSION - diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/context_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/context_dto.py deleted file mode 100644 index 5cacb84f39a0..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/context_dto.py +++ /dev/null @@ -1,41 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class ContextDTO(Model): - """Context associated with Qna. - - :param is_context_only: To mark if a prompt is relevant only with a - previous question or not. - true - Do not include this QnA as search result for queries without - context - false - ignores context and includes this QnA in search result - :type is_context_only: bool - :param prompts: List of prompts associated with the answer. - :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTO] - """ - - _validation = { - 'prompts': {'max_items': 20}, - } - - _attribute_map = { - 'is_context_only': {'key': 'isContextOnly', 'type': 'bool'}, - 'prompts': {'key': 'prompts', 'type': '[PromptDTO]'}, - } - - def __init__(self, **kwargs): - super(ContextDTO, self).__init__(**kwargs) - self.is_context_only = kwargs.get('is_context_only', None) - self.prompts = kwargs.get('prompts', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/context_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/context_dto_py3.py deleted file mode 100644 index 78c451d0da9e..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/context_dto_py3.py +++ /dev/null @@ -1,41 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class ContextDTO(Model): - """Context associated with Qna. - - :param is_context_only: To mark if a prompt is relevant only with a - previous question or not. - true - Do not include this QnA as search result for queries without - context - false - ignores context and includes this QnA in search result - :type is_context_only: bool - :param prompts: List of prompts associated with the answer. - :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTO] - """ - - _validation = { - 'prompts': {'max_items': 20}, - } - - _attribute_map = { - 'is_context_only': {'key': 'isContextOnly', 'type': 'bool'}, - 'prompts': {'key': 'prompts', 'type': '[PromptDTO]'}, - } - - def __init__(self, *, is_context_only: bool=None, prompts=None, **kwargs) -> None: - super(ContextDTO, self).__init__(**kwargs) - self.is_context_only = is_context_only - self.prompts = prompts diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error.py deleted file mode 100644 index f6cc50f3a277..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error.py +++ /dev/null @@ -1,61 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class Error(Model): - """The error object. As per Microsoft One API guidelines - - https://github.com/Microsoft/api-guidelines/blob/vNext/Guidelines.md#7102-error-condition-responses. - - All required parameters must be populated in order to send to Azure. - - :param code: Required. One of a server-defined set of error codes. - Possible values include: 'BadArgument', 'Forbidden', 'NotFound', - 'KbNotFound', 'Unauthorized', 'Unspecified', 'EndpointKeysError', - 'QuotaExceeded', 'QnaRuntimeError', 'SKULimitExceeded', - 'OperationNotFound', 'ServiceError', 'ValidationFailure', - 'ExtractionFailure' - :type code: str or - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.ErrorCodeType - :param message: A human-readable representation of the error. - :type message: str - :param target: The target of the error. - :type target: str - :param details: An array of details about specific errors that led to this - reported error. - :type details: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.Error] - :param inner_error: An object containing more specific information than - the current object about the error. - :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.InnerErrorModel - """ - - _validation = { - 'code': {'required': True}, - } - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, - 'details': {'key': 'details', 'type': '[Error]'}, - 'inner_error': {'key': 'innerError', 'type': 'InnerErrorModel'}, - } - - def __init__(self, **kwargs): - super(Error, self).__init__(**kwargs) - self.code = kwargs.get('code', None) - self.message = kwargs.get('message', None) - self.target = kwargs.get('target', None) - self.details = kwargs.get('details', None) - self.inner_error = kwargs.get('inner_error', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_py3.py deleted file mode 100644 index 342925344e20..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_py3.py +++ /dev/null @@ -1,61 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class Error(Model): - """The error object. As per Microsoft One API guidelines - - https://github.com/Microsoft/api-guidelines/blob/vNext/Guidelines.md#7102-error-condition-responses. - - All required parameters must be populated in order to send to Azure. - - :param code: Required. One of a server-defined set of error codes. - Possible values include: 'BadArgument', 'Forbidden', 'NotFound', - 'KbNotFound', 'Unauthorized', 'Unspecified', 'EndpointKeysError', - 'QuotaExceeded', 'QnaRuntimeError', 'SKULimitExceeded', - 'OperationNotFound', 'ServiceError', 'ValidationFailure', - 'ExtractionFailure' - :type code: str or - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.ErrorCodeType - :param message: A human-readable representation of the error. - :type message: str - :param target: The target of the error. - :type target: str - :param details: An array of details about specific errors that led to this - reported error. - :type details: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.Error] - :param inner_error: An object containing more specific information than - the current object about the error. - :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.InnerErrorModel - """ - - _validation = { - 'code': {'required': True}, - } - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, - 'details': {'key': 'details', 'type': '[Error]'}, - 'inner_error': {'key': 'innerError', 'type': 'InnerErrorModel'}, - } - - def __init__(self, *, code, message: str=None, target: str=None, details=None, inner_error=None, **kwargs) -> None: - super(Error, self).__init__(**kwargs) - self.code = code - self.message = message - self.target = target - self.details = details - self.inner_error = inner_error diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response.py deleted file mode 100644 index c14d1afc0f4f..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response.py +++ /dev/null @@ -1,43 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model -from msrest.exceptions import HttpOperationError - - -class ErrorResponse(Model): - """Error response. As per Microsoft One API guidelines - - https://github.com/Microsoft/api-guidelines/blob/vNext/Guidelines.md#7102-error-condition-responses. - - :param error: The error object. - :type error: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.ErrorResponseError - """ - - _attribute_map = { - 'error': {'key': 'error', 'type': 'ErrorResponseError'}, - } - - def __init__(self, **kwargs): - super(ErrorResponse, self).__init__(**kwargs) - self.error = kwargs.get('error', None) - - -class ErrorResponseException(HttpOperationError): - """Server responsed with exception of type: 'ErrorResponse'. - - :param deserialize: A deserializer - :param response: Server response to be deserialized. - """ - - def __init__(self, deserialize, response, *args): - - super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response_error.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response_error.py deleted file mode 100644 index f9cb75c59956..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response_error.py +++ /dev/null @@ -1,55 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from .error import Error - - -class ErrorResponseError(Error): - """The error object. - - All required parameters must be populated in order to send to Azure. - - :param code: Required. One of a server-defined set of error codes. - Possible values include: 'BadArgument', 'Forbidden', 'NotFound', - 'KbNotFound', 'Unauthorized', 'Unspecified', 'EndpointKeysError', - 'QuotaExceeded', 'QnaRuntimeError', 'SKULimitExceeded', - 'OperationNotFound', 'ServiceError', 'ValidationFailure', - 'ExtractionFailure' - :type code: str or - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.ErrorCodeType - :param message: A human-readable representation of the error. - :type message: str - :param target: The target of the error. - :type target: str - :param details: An array of details about specific errors that led to this - reported error. - :type details: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.Error] - :param inner_error: An object containing more specific information than - the current object about the error. - :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.InnerErrorModel - """ - - _validation = { - 'code': {'required': True}, - } - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, - 'details': {'key': 'details', 'type': '[Error]'}, - 'inner_error': {'key': 'innerError', 'type': 'InnerErrorModel'}, - } - - def __init__(self, **kwargs): - super(ErrorResponseError, self).__init__(**kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response_error_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response_error_py3.py deleted file mode 100644 index fb2fe99a622d..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response_error_py3.py +++ /dev/null @@ -1,55 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from .error_py3 import Error - - -class ErrorResponseError(Error): - """The error object. - - All required parameters must be populated in order to send to Azure. - - :param code: Required. One of a server-defined set of error codes. - Possible values include: 'BadArgument', 'Forbidden', 'NotFound', - 'KbNotFound', 'Unauthorized', 'Unspecified', 'EndpointKeysError', - 'QuotaExceeded', 'QnaRuntimeError', 'SKULimitExceeded', - 'OperationNotFound', 'ServiceError', 'ValidationFailure', - 'ExtractionFailure' - :type code: str or - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.ErrorCodeType - :param message: A human-readable representation of the error. - :type message: str - :param target: The target of the error. - :type target: str - :param details: An array of details about specific errors that led to this - reported error. - :type details: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.Error] - :param inner_error: An object containing more specific information than - the current object about the error. - :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.InnerErrorModel - """ - - _validation = { - 'code': {'required': True}, - } - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'message': {'key': 'message', 'type': 'str'}, - 'target': {'key': 'target', 'type': 'str'}, - 'details': {'key': 'details', 'type': '[Error]'}, - 'inner_error': {'key': 'innerError', 'type': 'InnerErrorModel'}, - } - - def __init__(self, *, code, message: str=None, target: str=None, details=None, inner_error=None, **kwargs) -> None: - super(ErrorResponseError, self).__init__(code=code, message=message, target=target, details=details, inner_error=inner_error, **kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response_py3.py deleted file mode 100644 index 489c0bd116cb..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/error_response_py3.py +++ /dev/null @@ -1,43 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model -from msrest.exceptions import HttpOperationError - - -class ErrorResponse(Model): - """Error response. As per Microsoft One API guidelines - - https://github.com/Microsoft/api-guidelines/blob/vNext/Guidelines.md#7102-error-condition-responses. - - :param error: The error object. - :type error: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.ErrorResponseError - """ - - _attribute_map = { - 'error': {'key': 'error', 'type': 'ErrorResponseError'}, - } - - def __init__(self, *, error=None, **kwargs) -> None: - super(ErrorResponse, self).__init__(**kwargs) - self.error = error - - -class ErrorResponseException(HttpOperationError): - """Server responsed with exception of type: 'ErrorResponse'. - - :param deserialize: A deserializer - :param response: Server response to be deserialized. - """ - - def __init__(self, deserialize, response, *args): - - super(ErrorResponseException, self).__init__(deserialize, response, 'ErrorResponse', *args) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/inner_error_model.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/inner_error_model.py deleted file mode 100644 index 41860a511576..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/inner_error_model.py +++ /dev/null @@ -1,37 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class InnerErrorModel(Model): - """An object containing more specific information about the error. As per - Microsoft One API guidelines - - https://github.com/Microsoft/api-guidelines/blob/vNext/Guidelines.md#7102-error-condition-responses. - - :param code: A more specific error code than was provided by the - containing error. - :type code: str - :param inner_error: An object containing more specific information than - the current object about the error. - :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.InnerErrorModel - """ - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'inner_error': {'key': 'innerError', 'type': 'InnerErrorModel'}, - } - - def __init__(self, **kwargs): - super(InnerErrorModel, self).__init__(**kwargs) - self.code = kwargs.get('code', None) - self.inner_error = kwargs.get('inner_error', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/inner_error_model_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/inner_error_model_py3.py deleted file mode 100644 index f61fe5b7ca27..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/inner_error_model_py3.py +++ /dev/null @@ -1,37 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class InnerErrorModel(Model): - """An object containing more specific information about the error. As per - Microsoft One API guidelines - - https://github.com/Microsoft/api-guidelines/blob/vNext/Guidelines.md#7102-error-condition-responses. - - :param code: A more specific error code than was provided by the - containing error. - :type code: str - :param inner_error: An object containing more specific information than - the current object about the error. - :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.InnerErrorModel - """ - - _attribute_map = { - 'code': {'key': 'code', 'type': 'str'}, - 'inner_error': {'key': 'innerError', 'type': 'InnerErrorModel'}, - } - - def __init__(self, *, code: str=None, inner_error=None, **kwargs) -> None: - super(InnerErrorModel, self).__init__(**kwargs) - self.code = code - self.inner_error = inner_error diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto_context.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto_context.py deleted file mode 100644 index 18c258ade783..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto_context.py +++ /dev/null @@ -1,39 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from .context_dto import ContextDTO - - -class QnADTOContext(ContextDTO): - """Context of a QnA. - - :param is_context_only: To mark if a prompt is relevant only with a - previous question or not. - true - Do not include this QnA as search result for queries without - context - false - ignores context and includes this QnA in search result - :type is_context_only: bool - :param prompts: List of prompts associated with the answer. - :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTO] - """ - - _validation = { - 'prompts': {'max_items': 20}, - } - - _attribute_map = { - 'is_context_only': {'key': 'isContextOnly', 'type': 'bool'}, - 'prompts': {'key': 'prompts', 'type': '[PromptDTO]'}, - } - - def __init__(self, **kwargs): - super(QnADTOContext, self).__init__(**kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto_context_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto_context_py3.py deleted file mode 100644 index 16d76fcd39db..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto_context_py3.py +++ /dev/null @@ -1,39 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from .context_dto_py3 import ContextDTO - - -class QnADTOContext(ContextDTO): - """Context of a QnA. - - :param is_context_only: To mark if a prompt is relevant only with a - previous question or not. - true - Do not include this QnA as search result for queries without - context - false - ignores context and includes this QnA in search result - :type is_context_only: bool - :param prompts: List of prompts associated with the answer. - :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTO] - """ - - _validation = { - 'prompts': {'max_items': 20}, - } - - _attribute_map = { - 'is_context_only': {'key': 'isContextOnly', 'type': 'bool'}, - 'prompts': {'key': 'prompts', 'type': '[PromptDTO]'}, - } - - def __init__(self, *, is_context_only: bool=None, prompts=None, **kwargs) -> None: - super(QnADTOContext, self).__init__(is_context_only=is_context_only, prompts=prompts, **kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/version.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/version.py deleted file mode 100644 index 3faab2cb0b4a..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/version.py +++ /dev/null @@ -1,13 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -VERSION = "4.0" - diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/__init__.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/__init__.py similarity index 75% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/__init__.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/__init__.py index 2b0cd8aa1e1f..a4e7ede6eb3b 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/__init__.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/__init__.py @@ -47,6 +47,18 @@ from .alterations_dto_py3 import AlterationsDTO from .word_alterations_dto_py3 import WordAlterationsDTO from .endpoint_keys_dto_py3 import EndpointKeysDTO + from .query_dto_context_py3 import QueryDTOContext + from .query_dto_answer_span_request_py3 import QueryDTOAnswerSpanRequest + from .query_dto_py3 import QueryDTO + from .query_context_dto_py3 import QueryContextDTO + from .qn_asearch_result_context_py3 import QnASearchResultContext + from .qn_asearch_result_answer_span_py3 import QnASearchResultAnswerSpan + from .qn_asearch_result_py3 import QnASearchResult + from .qn_asearch_result_list_py3 import QnASearchResultList + from .feedback_record_dto_py3 import FeedbackRecordDTO + from .feedback_records_dto_py3 import FeedbackRecordsDTO + from .answer_span_request_dto_py3 import AnswerSpanRequestDTO + from .answer_span_response_dto_py3 import AnswerSpanResponseDTO except (SyntaxError, ImportError): from .update_kb_operation_dto_add import UpdateKbOperationDTOAdd from .update_kb_operation_dto_delete import UpdateKbOperationDTODelete @@ -85,9 +97,22 @@ from .alterations_dto import AlterationsDTO from .word_alterations_dto import WordAlterationsDTO from .endpoint_keys_dto import EndpointKeysDTO + from .query_dto_context import QueryDTOContext + from .query_dto_answer_span_request import QueryDTOAnswerSpanRequest + from .query_dto import QueryDTO + from .query_context_dto import QueryContextDTO + from .qn_asearch_result_context import QnASearchResultContext + from .qn_asearch_result_answer_span import QnASearchResultAnswerSpan + from .qn_asearch_result import QnASearchResult + from .qn_asearch_result_list import QnASearchResultList + from .feedback_record_dto import FeedbackRecordDTO + from .feedback_records_dto import FeedbackRecordsDTO + from .answer_span_request_dto import AnswerSpanRequestDTO + from .answer_span_response_dto import AnswerSpanResponseDTO from .qn_amaker_client_enums import ( ErrorCodeType, OperationStateType, + StrictFiltersCompoundOperationType, EnvironmentType, ) @@ -129,7 +154,20 @@ 'AlterationsDTO', 'WordAlterationsDTO', 'EndpointKeysDTO', + 'QueryDTOContext', + 'QueryDTOAnswerSpanRequest', + 'QueryDTO', + 'QueryContextDTO', + 'QnASearchResultContext', + 'QnASearchResultAnswerSpan', + 'QnASearchResult', + 'QnASearchResultList', + 'FeedbackRecordDTO', + 'FeedbackRecordsDTO', + 'AnswerSpanRequestDTO', + 'AnswerSpanResponseDTO', 'ErrorCodeType', 'OperationStateType', + 'StrictFiltersCompoundOperationType', 'EnvironmentType', ] diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/active_learning_settings_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/active_learning_settings_dto.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/active_learning_settings_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/active_learning_settings_dto.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/active_learning_settings_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/active_learning_settings_dto_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/active_learning_settings_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/active_learning_settings_dto_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/alterations_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/alterations_dto.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/alterations_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/alterations_dto.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/alterations_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/alterations_dto_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/alterations_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/alterations_dto_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_request_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_request_dto.py new file mode 100644 index 000000000000..b6cc9a5bf5f3 --- /dev/null +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_request_dto.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AnswerSpanRequestDTO(Model): + """To configure Answer span prediction feature. + + :param enable: Enable or Disable Answer Span prediction. + :type enable: bool + :param score_threshold: Minimum threshold score required to include an + answer span. + :type score_threshold: float + :param top_answers_with_span: Number of Top answers to be considered for + span prediction. + :type top_answers_with_span: int + """ + + _validation = { + 'top_answers_with_span': {'maximum': 10, 'minimum': 1}, + } + + _attribute_map = { + 'enable': {'key': 'enable', 'type': 'bool'}, + 'score_threshold': {'key': 'scoreThreshold', 'type': 'float'}, + 'top_answers_with_span': {'key': 'topAnswersWithSpan', 'type': 'int'}, + } + + def __init__(self, **kwargs): + super(AnswerSpanRequestDTO, self).__init__(**kwargs) + self.enable = kwargs.get('enable', None) + self.score_threshold = kwargs.get('score_threshold', None) + self.top_answers_with_span = kwargs.get('top_answers_with_span', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_request_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_request_dto_py3.py new file mode 100644 index 000000000000..cd0572f26620 --- /dev/null +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_request_dto_py3.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AnswerSpanRequestDTO(Model): + """To configure Answer span prediction feature. + + :param enable: Enable or Disable Answer Span prediction. + :type enable: bool + :param score_threshold: Minimum threshold score required to include an + answer span. + :type score_threshold: float + :param top_answers_with_span: Number of Top answers to be considered for + span prediction. + :type top_answers_with_span: int + """ + + _validation = { + 'top_answers_with_span': {'maximum': 10, 'minimum': 1}, + } + + _attribute_map = { + 'enable': {'key': 'enable', 'type': 'bool'}, + 'score_threshold': {'key': 'scoreThreshold', 'type': 'float'}, + 'top_answers_with_span': {'key': 'topAnswersWithSpan', 'type': 'int'}, + } + + def __init__(self, *, enable: bool=None, score_threshold: float=None, top_answers_with_span: int=None, **kwargs) -> None: + super(AnswerSpanRequestDTO, self).__init__(**kwargs) + self.enable = enable + self.score_threshold = score_threshold + self.top_answers_with_span = top_answers_with_span diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_response_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_response_dto.py new file mode 100644 index 000000000000..4efb90d222a7 --- /dev/null +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_response_dto.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AnswerSpanResponseDTO(Model): + """Answer span object of QnA. + + :param text: Predicted text of answer span. + :type text: str + :param score: Predicted score of answer span. + :type score: float + :param start_index: Start index of answer span in answer. + :type start_index: int + :param end_index: End index of answer span in answer. + :type end_index: int + """ + + _attribute_map = { + 'text': {'key': 'text', 'type': 'str'}, + 'score': {'key': 'score', 'type': 'float'}, + 'start_index': {'key': 'startIndex', 'type': 'int'}, + 'end_index': {'key': 'endIndex', 'type': 'int'}, + } + + def __init__(self, **kwargs): + super(AnswerSpanResponseDTO, self).__init__(**kwargs) + self.text = kwargs.get('text', None) + self.score = kwargs.get('score', None) + self.start_index = kwargs.get('start_index', None) + self.end_index = kwargs.get('end_index', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_response_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_response_dto_py3.py new file mode 100644 index 000000000000..d33f69ad8f29 --- /dev/null +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/answer_span_response_dto_py3.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AnswerSpanResponseDTO(Model): + """Answer span object of QnA. + + :param text: Predicted text of answer span. + :type text: str + :param score: Predicted score of answer span. + :type score: float + :param start_index: Start index of answer span in answer. + :type start_index: int + :param end_index: End index of answer span in answer. + :type end_index: int + """ + + _attribute_map = { + 'text': {'key': 'text', 'type': 'str'}, + 'score': {'key': 'score', 'type': 'float'}, + 'start_index': {'key': 'startIndex', 'type': 'int'}, + 'end_index': {'key': 'endIndex', 'type': 'int'}, + } + + def __init__(self, *, text: str=None, score: float=None, start_index: int=None, end_index: int=None, **kwargs) -> None: + super(AnswerSpanResponseDTO, self).__init__(**kwargs) + self.text = text + self.score = score + self.start_index = start_index + self.end_index = end_index diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/context_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/context_dto.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/context_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/context_dto.py index ec7fafc1a182..b180991fb889 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/context_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/context_dto.py @@ -23,7 +23,7 @@ class ContextDTO(Model): :type is_context_only: bool :param prompts: List of prompts associated with the answer. :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/context_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/context_dto_py3.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/context_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/context_dto_py3.py index 2dea33bb9088..25d2bf7eed66 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/context_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/context_dto_py3.py @@ -23,7 +23,7 @@ class ContextDTO(Model): :type is_context_only: bool :param prompts: List of prompts associated with the answer. :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_dto.py similarity index 74% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_dto.py index 2ecfd2e3a615..06945cdc80d9 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_dto.py @@ -22,12 +22,12 @@ class CreateKbDTO(Model): :param qna_list: List of Q-A (QnADTO) to be added to the knowledgebase. Q-A Ids are assigned by the service and should be omitted. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] :param urls: List of URLs to be used for extracting Q-A. :type urls: list[str] :param files: List of files from which to Extract Q-A. :type files: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.FileDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.FileDTO] :param enable_hierarchical_extraction: Enable hierarchical extraction of Q-A from files and urls. Value to be considered False if this field is not present. @@ -37,14 +37,24 @@ class CreateKbDTO(Model): a hierarchy. Required when EnableHierarchicalExtraction field is set to True. :type default_answer_used_for_extraction: str - :param language: Language of the knowledgebase. + :param language: Language of the knowledgebase. Please find the list of + supported languages here. :type language: str + :param enable_multiple_languages: Set to true to enable creating KBs in + different languages for the same resource. + :type enable_multiple_languages: bool + :param default_answer: Default answer sent to user if no good match is + found in the KB. + :type default_answer: str """ _validation = { 'name': {'required': True, 'max_length': 100, 'min_length': 1}, 'default_answer_used_for_extraction': {'max_length': 300, 'min_length': 1}, 'language': {'max_length': 100, 'min_length': 1}, + 'default_answer': {'max_length': 300, 'min_length': 1}, } _attribute_map = { @@ -55,6 +65,8 @@ class CreateKbDTO(Model): 'enable_hierarchical_extraction': {'key': 'enableHierarchicalExtraction', 'type': 'bool'}, 'default_answer_used_for_extraction': {'key': 'defaultAnswerUsedForExtraction', 'type': 'str'}, 'language': {'key': 'language', 'type': 'str'}, + 'enable_multiple_languages': {'key': 'enableMultipleLanguages', 'type': 'bool'}, + 'default_answer': {'key': 'defaultAnswer', 'type': 'str'}, } def __init__(self, **kwargs): @@ -66,3 +78,5 @@ def __init__(self, **kwargs): self.enable_hierarchical_extraction = kwargs.get('enable_hierarchical_extraction', None) self.default_answer_used_for_extraction = kwargs.get('default_answer_used_for_extraction', None) self.language = kwargs.get('language', None) + self.enable_multiple_languages = kwargs.get('enable_multiple_languages', None) + self.default_answer = kwargs.get('default_answer', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_dto_py3.py similarity index 72% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_dto_py3.py index f65481aa84af..543310a4c7f7 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_dto_py3.py @@ -22,12 +22,12 @@ class CreateKbDTO(Model): :param qna_list: List of Q-A (QnADTO) to be added to the knowledgebase. Q-A Ids are assigned by the service and should be omitted. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] :param urls: List of URLs to be used for extracting Q-A. :type urls: list[str] :param files: List of files from which to Extract Q-A. :type files: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.FileDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.FileDTO] :param enable_hierarchical_extraction: Enable hierarchical extraction of Q-A from files and urls. Value to be considered False if this field is not present. @@ -37,14 +37,24 @@ class CreateKbDTO(Model): a hierarchy. Required when EnableHierarchicalExtraction field is set to True. :type default_answer_used_for_extraction: str - :param language: Language of the knowledgebase. + :param language: Language of the knowledgebase. Please find the list of + supported languages here. :type language: str + :param enable_multiple_languages: Set to true to enable creating KBs in + different languages for the same resource. + :type enable_multiple_languages: bool + :param default_answer: Default answer sent to user if no good match is + found in the KB. + :type default_answer: str """ _validation = { 'name': {'required': True, 'max_length': 100, 'min_length': 1}, 'default_answer_used_for_extraction': {'max_length': 300, 'min_length': 1}, 'language': {'max_length': 100, 'min_length': 1}, + 'default_answer': {'max_length': 300, 'min_length': 1}, } _attribute_map = { @@ -55,9 +65,11 @@ class CreateKbDTO(Model): 'enable_hierarchical_extraction': {'key': 'enableHierarchicalExtraction', 'type': 'bool'}, 'default_answer_used_for_extraction': {'key': 'defaultAnswerUsedForExtraction', 'type': 'str'}, 'language': {'key': 'language', 'type': 'str'}, + 'enable_multiple_languages': {'key': 'enableMultipleLanguages', 'type': 'bool'}, + 'default_answer': {'key': 'defaultAnswer', 'type': 'str'}, } - def __init__(self, *, name: str, qna_list=None, urls=None, files=None, enable_hierarchical_extraction: bool=None, default_answer_used_for_extraction: str=None, language: str=None, **kwargs) -> None: + def __init__(self, *, name: str, qna_list=None, urls=None, files=None, enable_hierarchical_extraction: bool=None, default_answer_used_for_extraction: str=None, language: str=None, enable_multiple_languages: bool=None, default_answer: str=None, **kwargs) -> None: super(CreateKbDTO, self).__init__(**kwargs) self.name = name self.qna_list = qna_list @@ -66,3 +78,5 @@ def __init__(self, *, name: str, qna_list=None, urls=None, files=None, enable_hi self.enable_hierarchical_extraction = enable_hierarchical_extraction self.default_answer_used_for_extraction = default_answer_used_for_extraction self.language = language + self.enable_multiple_languages = enable_multiple_languages + self.default_answer = default_answer diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_input_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_input_dto.py similarity index 89% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_input_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_input_dto.py index b67e9972485a..78bfdf66c66c 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_input_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_input_dto.py @@ -18,12 +18,12 @@ class CreateKbInputDTO(Model): :param qna_list: List of QNA to be added to the index. Ids are generated by the service and should be omitted. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] :param urls: List of URLs to be added to knowledgebase. :type urls: list[str] :param files: List of files to be added to knowledgebase. :type files: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.FileDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.FileDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_input_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_input_dto_py3.py similarity index 89% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_input_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_input_dto_py3.py index 9cc2b68094be..f052f3ba0b3b 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/create_kb_input_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/create_kb_input_dto_py3.py @@ -18,12 +18,12 @@ class CreateKbInputDTO(Model): :param qna_list: List of QNA to be added to the index. Ids are generated by the service and should be omitted. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] :param urls: List of URLs to be added to knowledgebase. :type urls: list[str] :param files: List of files to be added to knowledgebase. :type files: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.FileDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.FileDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/delete_kb_contents_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/delete_kb_contents_dto.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/delete_kb_contents_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/delete_kb_contents_dto.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/delete_kb_contents_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/delete_kb_contents_dto_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/delete_kb_contents_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/delete_kb_contents_dto_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_keys_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_keys_dto.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_keys_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_keys_dto.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_keys_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_keys_dto_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_keys_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_keys_dto_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto.py similarity index 90% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto.py index 8f0074782f2a..4c26ad25d528 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto.py @@ -17,7 +17,7 @@ class EndpointSettingsDTO(Model): :param active_learning: Active Learning settings of the endpoint. :type active_learning: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.EndpointSettingsDTOActiveLearning + ~azure.cognitiveservices.knowledge.qnamaker.models.EndpointSettingsDTOActiveLearning """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto_active_learning.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto_active_learning.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto_active_learning.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto_active_learning.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto_active_learning_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto_active_learning_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto_active_learning_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto_active_learning_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto_py3.py similarity index 90% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto_py3.py index cd59276214d9..16f8253dc071 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/endpoint_settings_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/endpoint_settings_dto_py3.py @@ -17,7 +17,7 @@ class EndpointSettingsDTO(Model): :param active_learning: Active Learning settings of the endpoint. :type active_learning: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.EndpointSettingsDTOActiveLearning + ~azure.cognitiveservices.knowledge.qnamaker.models.EndpointSettingsDTOActiveLearning """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error.py similarity index 90% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error.py index 34b0fec20c98..d54de8f71851 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error.py @@ -25,7 +25,7 @@ class Error(Model): 'OperationNotFound', 'ServiceError', 'ValidationFailure', 'ExtractionFailure' :type code: str or - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.ErrorCodeType + ~azure.cognitiveservices.knowledge.qnamaker.models.ErrorCodeType :param message: A human-readable representation of the error. :type message: str :param target: The target of the error. @@ -33,11 +33,11 @@ class Error(Model): :param details: An array of details about specific errors that led to this reported error. :type details: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.Error] + list[~azure.cognitiveservices.knowledge.qnamaker.models.Error] :param inner_error: An object containing more specific information than the current object about the error. :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.InnerErrorModel + ~azure.cognitiveservices.knowledge.qnamaker.models.InnerErrorModel """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_py3.py similarity index 90% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_py3.py index c8924c169865..81e33305a662 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_py3.py @@ -25,7 +25,7 @@ class Error(Model): 'OperationNotFound', 'ServiceError', 'ValidationFailure', 'ExtractionFailure' :type code: str or - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.ErrorCodeType + ~azure.cognitiveservices.knowledge.qnamaker.models.ErrorCodeType :param message: A human-readable representation of the error. :type message: str :param target: The target of the error. @@ -33,11 +33,11 @@ class Error(Model): :param details: An array of details about specific errors that led to this reported error. :type details: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.Error] + list[~azure.cognitiveservices.knowledge.qnamaker.models.Error] :param inner_error: An object containing more specific information than the current object about the error. :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.InnerErrorModel + ~azure.cognitiveservices.knowledge.qnamaker.models.InnerErrorModel """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response.py index 528a75681f84..c74df96d50e3 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response.py @@ -19,7 +19,7 @@ class ErrorResponse(Model): :param error: The error object. :type error: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.ErrorResponseError + ~azure.cognitiveservices.knowledge.qnamaker.models.ErrorResponseError """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response_error.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response_error.py similarity index 89% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response_error.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response_error.py index 3a5da8c5163a..880ecffb2ed3 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response_error.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response_error.py @@ -24,7 +24,7 @@ class ErrorResponseError(Error): 'OperationNotFound', 'ServiceError', 'ValidationFailure', 'ExtractionFailure' :type code: str or - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.ErrorCodeType + ~azure.cognitiveservices.knowledge.qnamaker.models.ErrorCodeType :param message: A human-readable representation of the error. :type message: str :param target: The target of the error. @@ -32,11 +32,11 @@ class ErrorResponseError(Error): :param details: An array of details about specific errors that led to this reported error. :type details: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.Error] + list[~azure.cognitiveservices.knowledge.qnamaker.models.Error] :param inner_error: An object containing more specific information than the current object about the error. :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.InnerErrorModel + ~azure.cognitiveservices.knowledge.qnamaker.models.InnerErrorModel """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response_error_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response_error_py3.py similarity index 89% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response_error_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response_error_py3.py index 3a2560b88e62..d873ed36878a 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response_error_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response_error_py3.py @@ -24,7 +24,7 @@ class ErrorResponseError(Error): 'OperationNotFound', 'ServiceError', 'ValidationFailure', 'ExtractionFailure' :type code: str or - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.ErrorCodeType + ~azure.cognitiveservices.knowledge.qnamaker.models.ErrorCodeType :param message: A human-readable representation of the error. :type message: str :param target: The target of the error. @@ -32,11 +32,11 @@ class ErrorResponseError(Error): :param details: An array of details about specific errors that led to this reported error. :type details: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.Error] + list[~azure.cognitiveservices.knowledge.qnamaker.models.Error] :param inner_error: An object containing more specific information than the current object about the error. :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.InnerErrorModel + ~azure.cognitiveservices.knowledge.qnamaker.models.InnerErrorModel """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response_py3.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response_py3.py index 8f890e423869..c152b5a58f70 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/error_response_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/error_response_py3.py @@ -19,7 +19,7 @@ class ErrorResponse(Model): :param error: The error object. :type error: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.ErrorResponseError + ~azure.cognitiveservices.knowledge.qnamaker.models.ErrorResponseError """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_record_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_record_dto.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_record_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_record_dto.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_record_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_record_dto_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_record_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_record_dto_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_records_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_records_dto.py similarity index 91% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_records_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_records_dto.py index 62fd82c1bc4b..05b71ff0e084 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_records_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_records_dto.py @@ -17,7 +17,7 @@ class FeedbackRecordsDTO(Model): :param feedback_records: List of feedback records. :type feedback_records: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.FeedbackRecordDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.FeedbackRecordDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_records_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_records_dto_py3.py similarity index 91% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_records_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_records_dto_py3.py index 0c1ab0a961ad..adc98c14d7bc 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/feedback_records_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/feedback_records_dto_py3.py @@ -17,7 +17,7 @@ class FeedbackRecordsDTO(Model): :param feedback_records: List of feedback records. :type feedback_records: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.FeedbackRecordDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.FeedbackRecordDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/file_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/file_dto.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/file_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/file_dto.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/file_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/file_dto_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/file_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/file_dto_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/inner_error_model.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/inner_error_model.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/inner_error_model.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/inner_error_model.py index ba0c00c463ac..1d269d275710 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/inner_error_model.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/inner_error_model.py @@ -23,7 +23,7 @@ class InnerErrorModel(Model): :param inner_error: An object containing more specific information than the current object about the error. :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.InnerErrorModel + ~azure.cognitiveservices.knowledge.qnamaker.models.InnerErrorModel """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/inner_error_model_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/inner_error_model_py3.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/inner_error_model_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/inner_error_model_py3.py index 4b3fbbcf4db4..cfcb2930b969 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/inner_error_model_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/inner_error_model_py3.py @@ -23,7 +23,7 @@ class InnerErrorModel(Model): :param inner_error: An object containing more specific information than the current object about the error. :type inner_error: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.InnerErrorModel + ~azure.cognitiveservices.knowledge.qnamaker.models.InnerErrorModel """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebase_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebase_dto.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebase_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebase_dto.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebase_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebase_dto_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebase_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebase_dto_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebases_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebases_dto.py similarity index 91% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebases_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebases_dto.py index bc8a8fab0514..3fc0f26af401 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebases_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebases_dto.py @@ -17,7 +17,7 @@ class KnowledgebasesDTO(Model): :param knowledgebases: Collection of knowledgebase records. :type knowledgebases: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.KnowledgebaseDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.KnowledgebaseDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebases_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebases_dto_py3.py similarity index 91% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebases_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebases_dto_py3.py index 52ff3e4c7f33..600df122f63e 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/knowledgebases_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/knowledgebases_dto_py3.py @@ -17,7 +17,7 @@ class KnowledgebasesDTO(Model): :param knowledgebases: Collection of knowledgebase records. :type knowledgebases: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.KnowledgebaseDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.KnowledgebaseDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/metadata_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/metadata_dto.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/metadata_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/metadata_dto.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/metadata_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/metadata_dto_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/metadata_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/metadata_dto_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/operation.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/operation.py similarity index 93% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/operation.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/operation.py index 334bdf8ecb9c..2c86977bbe02 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/operation.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/operation.py @@ -18,7 +18,7 @@ class Operation(Model): :param operation_state: Operation state. Possible values include: 'Failed', 'NotStarted', 'Running', 'Succeeded' :type operation_state: str or - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.OperationStateType + ~azure.cognitiveservices.knowledge.qnamaker.models.OperationStateType :param created_timestamp: Timestamp when the operation was created. :type created_timestamp: str :param last_action_timestamp: Timestamp when the current state was @@ -33,7 +33,7 @@ class Operation(Model): :type operation_id: str :param error_response: Error details in case of failures. :type error_response: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.ErrorResponse + ~azure.cognitiveservices.knowledge.qnamaker.models.ErrorResponse """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/operation_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/operation_py3.py similarity index 93% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/operation_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/operation_py3.py index 927e5756a598..2190cc96a8c9 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/operation_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/operation_py3.py @@ -18,7 +18,7 @@ class Operation(Model): :param operation_state: Operation state. Possible values include: 'Failed', 'NotStarted', 'Running', 'Succeeded' :type operation_state: str or - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.OperationStateType + ~azure.cognitiveservices.knowledge.qnamaker.models.OperationStateType :param created_timestamp: Timestamp when the operation was created. :type created_timestamp: str :param last_action_timestamp: Timestamp when the current state was @@ -33,7 +33,7 @@ class Operation(Model): :type operation_id: str :param error_response: Error details in case of failures. :type error_response: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.ErrorResponse + ~azure.cognitiveservices.knowledge.qnamaker.models.ErrorResponse """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto.py similarity index 95% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto.py index d185f305d78c..461b19fe88c2 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto.py @@ -23,8 +23,7 @@ class PromptDTO(Model): :type qna_id: int :param qna: QnADTO - Either QnaId or QnADTO needs to be present in a PromptDTO object - :type qna: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTOQna + :type qna: ~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTOQna :param display_text: Text displayed to represent a follow up question prompt :type display_text: str diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto_py3.py similarity index 95% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto_py3.py index f107ef480943..1b93663b10ca 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto_py3.py @@ -23,8 +23,7 @@ class PromptDTO(Model): :type qna_id: int :param qna: QnADTO - Either QnaId or QnADTO needs to be present in a PromptDTO object - :type qna: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTOQna + :type qna: ~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTOQna :param display_text: Text displayed to represent a follow up question prompt :type display_text: str diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto_qna.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto_qna.py similarity index 82% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto_qna.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto_qna.py index 8b22ae98ce75..fe1b913929d6 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto_qna.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto_qna.py @@ -28,16 +28,19 @@ class PromptDTOQna(QnADTO): :type questions: list[str] :param metadata: List of metadata associated with the answer. :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param context: Context of a QnA :type context: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTOContext + ~azure.cognitiveservices.knowledge.qnamaker.models.QnADTOContext + :param last_updated_timestamp: Timestamp when the QnA was last updated. + :type last_updated_timestamp: str """ _validation = { 'answer': {'required': True, 'max_length': 25000, 'min_length': 1}, 'source': {'max_length': 300}, 'questions': {'required': True}, + 'last_updated_timestamp': {'max_length': 300}, } _attribute_map = { @@ -47,6 +50,7 @@ class PromptDTOQna(QnADTO): 'questions': {'key': 'questions', 'type': '[str]'}, 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, 'context': {'key': 'context', 'type': 'QnADTOContext'}, + 'last_updated_timestamp': {'key': 'lastUpdatedTimestamp', 'type': 'str'}, } def __init__(self, **kwargs): diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto_qna_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto_qna_py3.py similarity index 77% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto_qna_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto_qna_py3.py index 7fa7775eb623..c406e1819adf 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/prompt_dto_qna_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/prompt_dto_qna_py3.py @@ -28,16 +28,19 @@ class PromptDTOQna(QnADTO): :type questions: list[str] :param metadata: List of metadata associated with the answer. :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param context: Context of a QnA :type context: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTOContext + ~azure.cognitiveservices.knowledge.qnamaker.models.QnADTOContext + :param last_updated_timestamp: Timestamp when the QnA was last updated. + :type last_updated_timestamp: str """ _validation = { 'answer': {'required': True, 'max_length': 25000, 'min_length': 1}, 'source': {'max_length': 300}, 'questions': {'required': True}, + 'last_updated_timestamp': {'max_length': 300}, } _attribute_map = { @@ -47,7 +50,8 @@ class PromptDTOQna(QnADTO): 'questions': {'key': 'questions', 'type': '[str]'}, 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, 'context': {'key': 'context', 'type': 'QnADTOContext'}, + 'last_updated_timestamp': {'key': 'lastUpdatedTimestamp', 'type': 'str'}, } - def __init__(self, *, answer: str, questions, id: int=None, source: str=None, metadata=None, context=None, **kwargs) -> None: - super(PromptDTOQna, self).__init__(id=id, answer=answer, source=source, questions=questions, metadata=metadata, context=context, **kwargs) + def __init__(self, *, answer: str, questions, id: int=None, source: str=None, metadata=None, context=None, last_updated_timestamp: str=None, **kwargs) -> None: + super(PromptDTOQna, self).__init__(id=id, answer=answer, source=source, questions=questions, metadata=metadata, context=context, last_updated_timestamp=last_updated_timestamp, **kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adocuments_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adocuments_dto.py similarity index 91% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adocuments_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adocuments_dto.py index 73f1ad7c92fc..a8a77b520f14 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adocuments_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adocuments_dto.py @@ -17,7 +17,7 @@ class QnADocumentsDTO(Model): :param qna_documents: List of answers. :type qna_documents: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adocuments_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adocuments_dto_py3.py similarity index 92% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adocuments_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adocuments_dto_py3.py index 35577d108936..45b0ba89a64e 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adocuments_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adocuments_dto_py3.py @@ -17,7 +17,7 @@ class QnADocumentsDTO(Model): :param qna_documents: List of answers. :type qna_documents: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto.py similarity index 81% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto.py index d248792c62db..c0c5169a6ae3 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto.py @@ -28,16 +28,19 @@ class QnADTO(Model): :type questions: list[str] :param metadata: List of metadata associated with the answer. :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param context: Context of a QnA :type context: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTOContext + ~azure.cognitiveservices.knowledge.qnamaker.models.QnADTOContext + :param last_updated_timestamp: Timestamp when the QnA was last updated. + :type last_updated_timestamp: str """ _validation = { 'answer': {'required': True, 'max_length': 25000, 'min_length': 1}, 'source': {'max_length': 300}, 'questions': {'required': True}, + 'last_updated_timestamp': {'max_length': 300}, } _attribute_map = { @@ -47,6 +50,7 @@ class QnADTO(Model): 'questions': {'key': 'questions', 'type': '[str]'}, 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, 'context': {'key': 'context', 'type': 'QnADTOContext'}, + 'last_updated_timestamp': {'key': 'lastUpdatedTimestamp', 'type': 'str'}, } def __init__(self, **kwargs): @@ -57,3 +61,4 @@ def __init__(self, **kwargs): self.questions = kwargs.get('questions', None) self.metadata = kwargs.get('metadata', None) self.context = kwargs.get('context', None) + self.last_updated_timestamp = kwargs.get('last_updated_timestamp', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto_context.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto_context.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto_context.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto_context.py index 13056894f3aa..278155dad5c7 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto_context.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto_context.py @@ -23,7 +23,7 @@ class QnADTOContext(ContextDTO): :type is_context_only: bool :param prompts: List of prompts associated with the answer. :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto_context_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto_context_py3.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto_context_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto_context_py3.py index 9b7fa5d4e33f..ca63d16dbfbb 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto_context_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto_context_py3.py @@ -23,7 +23,7 @@ class QnADTOContext(ContextDTO): :type is_context_only: bool :param prompts: List of prompts associated with the answer. :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto_py3.py similarity index 78% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto_py3.py index 98c0ed36c5e7..6c59c1959ee4 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_adto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_adto_py3.py @@ -28,16 +28,19 @@ class QnADTO(Model): :type questions: list[str] :param metadata: List of metadata associated with the answer. :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param context: Context of a QnA :type context: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTOContext + ~azure.cognitiveservices.knowledge.qnamaker.models.QnADTOContext + :param last_updated_timestamp: Timestamp when the QnA was last updated. + :type last_updated_timestamp: str """ _validation = { 'answer': {'required': True, 'max_length': 25000, 'min_length': 1}, 'source': {'max_length': 300}, 'questions': {'required': True}, + 'last_updated_timestamp': {'max_length': 300}, } _attribute_map = { @@ -47,9 +50,10 @@ class QnADTO(Model): 'questions': {'key': 'questions', 'type': '[str]'}, 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, 'context': {'key': 'context', 'type': 'QnADTOContext'}, + 'last_updated_timestamp': {'key': 'lastUpdatedTimestamp', 'type': 'str'}, } - def __init__(self, *, answer: str, questions, id: int=None, source: str=None, metadata=None, context=None, **kwargs) -> None: + def __init__(self, *, answer: str, questions, id: int=None, source: str=None, metadata=None, context=None, last_updated_timestamp: str=None, **kwargs) -> None: super(QnADTO, self).__init__(**kwargs) self.id = id self.answer = answer @@ -57,3 +61,4 @@ def __init__(self, *, answer: str, questions, id: int=None, source: str=None, me self.questions = questions self.metadata = metadata self.context = context + self.last_updated_timestamp = last_updated_timestamp diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_amaker_client_enums.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_amaker_client_enums.py similarity index 92% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_amaker_client_enums.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_amaker_client_enums.py index 3d9f996b78b7..d1a82445bb31 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/qn_amaker_client_enums.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_amaker_client_enums.py @@ -38,6 +38,12 @@ class OperationStateType(str, Enum): succeeded = "Succeeded" +class StrictFiltersCompoundOperationType(str, Enum): + + and_enum = "AND" + or_enum = "OR" + + class EnvironmentType(str, Enum): prod = "Prod" diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result.py similarity index 79% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result.py index 7964315961b6..1057e4cf75c7 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result.py @@ -27,10 +27,14 @@ class QnASearchResult(Model): :type source: str :param metadata: List of metadata. :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param context: Context object of the QnA :type context: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QnASearchResultContext + ~azure.cognitiveservices.knowledge.qnamaker.models.QnASearchResultContext + :param answer_span: Answer span object of QnA with respect to user's + question. + :type answer_span: + ~azure.cognitiveservices.knowledge.qnamaker.models.QnASearchResultAnswerSpan """ _attribute_map = { @@ -41,6 +45,7 @@ class QnASearchResult(Model): 'source': {'key': 'source', 'type': 'str'}, 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, 'context': {'key': 'context', 'type': 'QnASearchResultContext'}, + 'answer_span': {'key': 'answerSpan', 'type': 'QnASearchResultAnswerSpan'}, } def __init__(self, **kwargs): @@ -52,3 +57,4 @@ def __init__(self, **kwargs): self.source = kwargs.get('source', None) self.metadata = kwargs.get('metadata', None) self.context = kwargs.get('context', None) + self.answer_span = kwargs.get('answer_span', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_answer_span.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_answer_span.py new file mode 100644 index 000000000000..87d3f3581b57 --- /dev/null +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_answer_span.py @@ -0,0 +1,36 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .answer_span_response_dto import AnswerSpanResponseDTO + + +class QnASearchResultAnswerSpan(AnswerSpanResponseDTO): + """Answer span object of QnA with respect to user's question. + + :param text: Predicted text of answer span. + :type text: str + :param score: Predicted score of answer span. + :type score: float + :param start_index: Start index of answer span in answer. + :type start_index: int + :param end_index: End index of answer span in answer. + :type end_index: int + """ + + _attribute_map = { + 'text': {'key': 'text', 'type': 'str'}, + 'score': {'key': 'score', 'type': 'float'}, + 'start_index': {'key': 'startIndex', 'type': 'int'}, + 'end_index': {'key': 'endIndex', 'type': 'int'}, + } + + def __init__(self, **kwargs): + super(QnASearchResultAnswerSpan, self).__init__(**kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_answer_span_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_answer_span_py3.py new file mode 100644 index 000000000000..c0e593e41b60 --- /dev/null +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_answer_span_py3.py @@ -0,0 +1,36 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .answer_span_response_dto_py3 import AnswerSpanResponseDTO + + +class QnASearchResultAnswerSpan(AnswerSpanResponseDTO): + """Answer span object of QnA with respect to user's question. + + :param text: Predicted text of answer span. + :type text: str + :param score: Predicted score of answer span. + :type score: float + :param start_index: Start index of answer span in answer. + :type start_index: int + :param end_index: End index of answer span in answer. + :type end_index: int + """ + + _attribute_map = { + 'text': {'key': 'text', 'type': 'str'}, + 'score': {'key': 'score', 'type': 'float'}, + 'start_index': {'key': 'startIndex', 'type': 'int'}, + 'end_index': {'key': 'endIndex', 'type': 'int'}, + } + + def __init__(self, *, text: str=None, score: float=None, start_index: int=None, end_index: int=None, **kwargs) -> None: + super(QnASearchResultAnswerSpan, self).__init__(text=text, score=score, start_index=start_index, end_index=end_index, **kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_context.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_context.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_context.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_context.py index 4a58dc097040..a8389973ecb8 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_context.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_context.py @@ -23,7 +23,7 @@ class QnASearchResultContext(ContextDTO): :type is_context_only: bool :param prompts: List of prompts associated with the answer. :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_context_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_context_py3.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_context_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_context_py3.py index 635660459e0e..983fbc6f318a 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_context_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_context_py3.py @@ -23,7 +23,7 @@ class QnASearchResultContext(ContextDTO): :type is_context_only: bool :param prompts: List of prompts associated with the answer. :type prompts: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_list.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_list.py similarity index 91% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_list.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_list.py index 202d3fd5dbaf..35e78006da4f 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_list.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_list.py @@ -17,7 +17,7 @@ class QnASearchResultList(Model): :param answers: Represents Search Result list. :type answers: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QnASearchResult] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnASearchResult] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_list_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_list_py3.py similarity index 91% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_list_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_list_py3.py index ef0a20b5b495..a15b5c08a8cf 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_list_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_list_py3.py @@ -17,7 +17,7 @@ class QnASearchResultList(Model): :param answers: Represents Search Result list. :type answers: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QnASearchResult] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnASearchResult] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_py3.py similarity index 77% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_py3.py index e342f66d11a8..2a4165396958 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_asearch_result_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/qn_asearch_result_py3.py @@ -27,10 +27,14 @@ class QnASearchResult(Model): :type source: str :param metadata: List of metadata. :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param context: Context object of the QnA :type context: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QnASearchResultContext + ~azure.cognitiveservices.knowledge.qnamaker.models.QnASearchResultContext + :param answer_span: Answer span object of QnA with respect to user's + question. + :type answer_span: + ~azure.cognitiveservices.knowledge.qnamaker.models.QnASearchResultAnswerSpan """ _attribute_map = { @@ -41,9 +45,10 @@ class QnASearchResult(Model): 'source': {'key': 'source', 'type': 'str'}, 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, 'context': {'key': 'context', 'type': 'QnASearchResultContext'}, + 'answer_span': {'key': 'answerSpan', 'type': 'QnASearchResultAnswerSpan'}, } - def __init__(self, *, questions=None, answer: str=None, score: float=None, id: int=None, source: str=None, metadata=None, context=None, **kwargs) -> None: + def __init__(self, *, questions=None, answer: str=None, score: float=None, id: int=None, source: str=None, metadata=None, context=None, answer_span=None, **kwargs) -> None: super(QnASearchResult, self).__init__(**kwargs) self.questions = questions self.answer = answer @@ -52,3 +57,4 @@ def __init__(self, *, questions=None, answer: str=None, score: float=None, id: i self.source = source self.metadata = metadata self.context = context + self.answer_span = answer_span diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_context_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_context_dto.py similarity index 92% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_context_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_context_dto.py index 5a96679211d0..ea34543d9c92 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_context_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_context_dto.py @@ -16,13 +16,13 @@ class QueryContextDTO(Model): """Context object with previous QnA's information. :param previous_qna_id: Previous QnA Id - qnaId of the top result. - :type previous_qna_id: str + :type previous_qna_id: int :param previous_user_query: Previous user query. :type previous_user_query: str """ _attribute_map = { - 'previous_qna_id': {'key': 'previousQnaId', 'type': 'str'}, + 'previous_qna_id': {'key': 'previousQnaId', 'type': 'int'}, 'previous_user_query': {'key': 'previousUserQuery', 'type': 'str'}, } diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_context_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_context_dto_py3.py similarity index 87% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_context_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_context_dto_py3.py index fe3b7c9b258b..f1307024fbd0 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_context_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_context_dto_py3.py @@ -16,17 +16,17 @@ class QueryContextDTO(Model): """Context object with previous QnA's information. :param previous_qna_id: Previous QnA Id - qnaId of the top result. - :type previous_qna_id: str + :type previous_qna_id: int :param previous_user_query: Previous user query. :type previous_user_query: str """ _attribute_map = { - 'previous_qna_id': {'key': 'previousQnaId', 'type': 'str'}, + 'previous_qna_id': {'key': 'previousQnaId', 'type': 'int'}, 'previous_user_query': {'key': 'previousUserQuery', 'type': 'str'}, } - def __init__(self, *, previous_qna_id: str=None, previous_user_query: str=None, **kwargs) -> None: + def __init__(self, *, previous_qna_id: int=None, previous_user_query: str=None, **kwargs) -> None: super(QueryContextDTO, self).__init__(**kwargs) self.previous_qna_id = previous_qna_id self.previous_user_query = previous_user_query diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto.py similarity index 67% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto.py index 1cc5c118e0af..3e567eeb02d4 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto.py @@ -26,17 +26,26 @@ class QueryDTO(Model): :type user_id: str :param is_test: Query against the test index. :type is_test: bool - :param score_threshold: Threshold for answers returned based on score. + :param score_threshold: Minimum threshold score for answers. :type score_threshold: float :param context: Context object with previous QnA's information. :type context: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QueryDTOContext + ~azure.cognitiveservices.knowledge.qnamaker.models.QueryDTOContext :param ranker_type: Optional field. Set to 'QuestionOnly' for using a question only Ranker. :type ranker_type: str - :param strict_filters: Find only answers that contain these metadata. + :param strict_filters: Find QnAs that are associated with the given list + of metadata. :type strict_filters: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] + :param strict_filters_compound_operation_type: Optional field. Set to 'OR' + for using OR operation for strict filters. Possible values include: 'AND', + 'OR' + :type strict_filters_compound_operation_type: str or + ~azure.cognitiveservices.knowledge.qnamaker.models.StrictFiltersCompoundOperationType + :param answer_span_request: To configure Answer span prediction feature. + :type answer_span_request: + ~azure.cognitiveservices.knowledge.qnamaker.models.QueryDTOAnswerSpanRequest """ _attribute_map = { @@ -49,6 +58,8 @@ class QueryDTO(Model): 'context': {'key': 'context', 'type': 'QueryDTOContext'}, 'ranker_type': {'key': 'rankerType', 'type': 'str'}, 'strict_filters': {'key': 'strictFilters', 'type': '[MetadataDTO]'}, + 'strict_filters_compound_operation_type': {'key': 'strictFiltersCompoundOperationType', 'type': 'str'}, + 'answer_span_request': {'key': 'answerSpanRequest', 'type': 'QueryDTOAnswerSpanRequest'}, } def __init__(self, **kwargs): @@ -62,3 +73,5 @@ def __init__(self, **kwargs): self.context = kwargs.get('context', None) self.ranker_type = kwargs.get('ranker_type', None) self.strict_filters = kwargs.get('strict_filters', None) + self.strict_filters_compound_operation_type = kwargs.get('strict_filters_compound_operation_type', None) + self.answer_span_request = kwargs.get('answer_span_request', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_answer_span_request.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_answer_span_request.py new file mode 100644 index 000000000000..c6574250e15b --- /dev/null +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_answer_span_request.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .answer_span_request_dto import AnswerSpanRequestDTO + + +class QueryDTOAnswerSpanRequest(AnswerSpanRequestDTO): + """To configure Answer span prediction feature. + + :param enable: Enable or Disable Answer Span prediction. + :type enable: bool + :param score_threshold: Minimum threshold score required to include an + answer span. + :type score_threshold: float + :param top_answers_with_span: Number of Top answers to be considered for + span prediction. + :type top_answers_with_span: int + """ + + _validation = { + 'top_answers_with_span': {'maximum': 10, 'minimum': 1}, + } + + _attribute_map = { + 'enable': {'key': 'enable', 'type': 'bool'}, + 'score_threshold': {'key': 'scoreThreshold', 'type': 'float'}, + 'top_answers_with_span': {'key': 'topAnswersWithSpan', 'type': 'int'}, + } + + def __init__(self, **kwargs): + super(QueryDTOAnswerSpanRequest, self).__init__(**kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_answer_span_request_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_answer_span_request_py3.py new file mode 100644 index 000000000000..d749206e98f5 --- /dev/null +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_answer_span_request_py3.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from .answer_span_request_dto_py3 import AnswerSpanRequestDTO + + +class QueryDTOAnswerSpanRequest(AnswerSpanRequestDTO): + """To configure Answer span prediction feature. + + :param enable: Enable or Disable Answer Span prediction. + :type enable: bool + :param score_threshold: Minimum threshold score required to include an + answer span. + :type score_threshold: float + :param top_answers_with_span: Number of Top answers to be considered for + span prediction. + :type top_answers_with_span: int + """ + + _validation = { + 'top_answers_with_span': {'maximum': 10, 'minimum': 1}, + } + + _attribute_map = { + 'enable': {'key': 'enable', 'type': 'bool'}, + 'score_threshold': {'key': 'scoreThreshold', 'type': 'float'}, + 'top_answers_with_span': {'key': 'topAnswersWithSpan', 'type': 'int'}, + } + + def __init__(self, *, enable: bool=None, score_threshold: float=None, top_answers_with_span: int=None, **kwargs) -> None: + super(QueryDTOAnswerSpanRequest, self).__init__(enable=enable, score_threshold=score_threshold, top_answers_with_span=top_answers_with_span, **kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto_context.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_context.py similarity index 91% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto_context.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_context.py index 3886ef6aab75..99c2426dbc0a 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto_context.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_context.py @@ -16,13 +16,13 @@ class QueryDTOContext(QueryContextDTO): """Context object with previous QnA's information. :param previous_qna_id: Previous QnA Id - qnaId of the top result. - :type previous_qna_id: str + :type previous_qna_id: int :param previous_user_query: Previous user query. :type previous_user_query: str """ _attribute_map = { - 'previous_qna_id': {'key': 'previousQnaId', 'type': 'str'}, + 'previous_qna_id': {'key': 'previousQnaId', 'type': 'int'}, 'previous_user_query': {'key': 'previousUserQuery', 'type': 'str'}, } diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto_context_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_context_py3.py similarity index 87% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto_context_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_context_py3.py index 82ce5244d40d..47affd201ed2 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto_context_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_context_py3.py @@ -16,15 +16,15 @@ class QueryDTOContext(QueryContextDTO): """Context object with previous QnA's information. :param previous_qna_id: Previous QnA Id - qnaId of the top result. - :type previous_qna_id: str + :type previous_qna_id: int :param previous_user_query: Previous user query. :type previous_user_query: str """ _attribute_map = { - 'previous_qna_id': {'key': 'previousQnaId', 'type': 'str'}, + 'previous_qna_id': {'key': 'previousQnaId', 'type': 'int'}, 'previous_user_query': {'key': 'previousUserQuery', 'type': 'str'}, } - def __init__(self, *, previous_qna_id: str=None, previous_user_query: str=None, **kwargs) -> None: + def __init__(self, *, previous_qna_id: int=None, previous_user_query: str=None, **kwargs) -> None: super(QueryDTOContext, self).__init__(previous_qna_id=previous_qna_id, previous_user_query=previous_user_query, **kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_py3.py similarity index 65% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_py3.py index 51134861cc4a..b2f233b3cbc6 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/query_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/query_dto_py3.py @@ -26,17 +26,26 @@ class QueryDTO(Model): :type user_id: str :param is_test: Query against the test index. :type is_test: bool - :param score_threshold: Threshold for answers returned based on score. + :param score_threshold: Minimum threshold score for answers. :type score_threshold: float :param context: Context object with previous QnA's information. :type context: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QueryDTOContext + ~azure.cognitiveservices.knowledge.qnamaker.models.QueryDTOContext :param ranker_type: Optional field. Set to 'QuestionOnly' for using a question only Ranker. :type ranker_type: str - :param strict_filters: Find only answers that contain these metadata. + :param strict_filters: Find QnAs that are associated with the given list + of metadata. :type strict_filters: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] + :param strict_filters_compound_operation_type: Optional field. Set to 'OR' + for using OR operation for strict filters. Possible values include: 'AND', + 'OR' + :type strict_filters_compound_operation_type: str or + ~azure.cognitiveservices.knowledge.qnamaker.models.StrictFiltersCompoundOperationType + :param answer_span_request: To configure Answer span prediction feature. + :type answer_span_request: + ~azure.cognitiveservices.knowledge.qnamaker.models.QueryDTOAnswerSpanRequest """ _attribute_map = { @@ -49,9 +58,11 @@ class QueryDTO(Model): 'context': {'key': 'context', 'type': 'QueryDTOContext'}, 'ranker_type': {'key': 'rankerType', 'type': 'str'}, 'strict_filters': {'key': 'strictFilters', 'type': '[MetadataDTO]'}, + 'strict_filters_compound_operation_type': {'key': 'strictFiltersCompoundOperationType', 'type': 'str'}, + 'answer_span_request': {'key': 'answerSpanRequest', 'type': 'QueryDTOAnswerSpanRequest'}, } - def __init__(self, *, qna_id: str=None, question: str=None, top: int=None, user_id: str=None, is_test: bool=None, score_threshold: float=None, context=None, ranker_type: str=None, strict_filters=None, **kwargs) -> None: + def __init__(self, *, qna_id: str=None, question: str=None, top: int=None, user_id: str=None, is_test: bool=None, score_threshold: float=None, context=None, ranker_type: str=None, strict_filters=None, strict_filters_compound_operation_type=None, answer_span_request=None, **kwargs) -> None: super(QueryDTO, self).__init__(**kwargs) self.qna_id = qna_id self.question = question @@ -62,3 +73,5 @@ def __init__(self, *, qna_id: str=None, question: str=None, top: int=None, user_ self.context = context self.ranker_type = ranker_type self.strict_filters = strict_filters + self.strict_filters_compound_operation_type = strict_filters_compound_operation_type + self.answer_span_request = answer_span_request diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/replace_kb_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/replace_kb_dto.py similarity index 93% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/replace_kb_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/replace_kb_dto.py index dd1bc3932df7..7b8314981fc0 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/replace_kb_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/replace_kb_dto.py @@ -20,7 +20,7 @@ class ReplaceKbDTO(Model): :param qn_alist: Required. List of Q-A (QnADTO) to be added to the knowledgebase. Q-A Ids are assigned by the service and should be omitted. :type qn_alist: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/replace_kb_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/replace_kb_dto_py3.py similarity index 93% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/replace_kb_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/replace_kb_dto_py3.py index bce1679cef4c..722ddc597b5c 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/replace_kb_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/replace_kb_dto_py3.py @@ -20,7 +20,7 @@ class ReplaceKbDTO(Model): :param qn_alist: Required. List of Q-A (QnADTO) to be added to the knowledgebase. Q-A Ids are assigned by the service and should be omitted. :type qn_alist: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_context_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_context_dto.py similarity index 95% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_context_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_context_dto.py index bf80f3e0767c..b9cf40907e80 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_context_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_context_dto.py @@ -20,7 +20,7 @@ class UpdateContextDTO(Model): :type prompts_to_delete: list[int] :param prompts_to_add: List of prompts to be added to the qna. :type prompts_to_add: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] :param is_context_only: To mark if a prompt is relevant only with a previous question or not. true - Do not include this QnA as search result for queries without diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_context_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_context_dto_py3.py similarity index 95% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_context_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_context_dto_py3.py index cd0946e75c84..85b3fd7eadfe 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_context_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_context_dto_py3.py @@ -20,7 +20,7 @@ class UpdateContextDTO(Model): :type prompts_to_delete: list[int] :param prompts_to_add: List of prompts to be added to the qna. :type prompts_to_add: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] :param is_context_only: To mark if a prompt is relevant only with a previous question or not. true - Do not include this QnA as search result for queries without diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_contents_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_contents_dto.py similarity index 76% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_contents_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_contents_dto.py index 0086a6f15a1c..df2550ace647 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_contents_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_contents_dto.py @@ -20,16 +20,24 @@ class UpdateKbContentsDTO(Model): :param qna_list: List of Q-A (UpdateQnaDTO) to be added to the knowledgebase. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTO] :param urls: List of existing URLs to be refreshed. The content will be extracted again and re-indexed. :type urls: list[str] + :param default_answer: Default answer sent to user if no good match is + found in the KB. + :type default_answer: str """ + _validation = { + 'default_answer': {'max_length': 300, 'min_length': 1}, + } + _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'qna_list': {'key': 'qnaList', 'type': '[UpdateQnaDTO]'}, 'urls': {'key': 'urls', 'type': '[str]'}, + 'default_answer': {'key': 'defaultAnswer', 'type': 'str'}, } def __init__(self, **kwargs): @@ -37,3 +45,4 @@ def __init__(self, **kwargs): self.name = kwargs.get('name', None) self.qna_list = kwargs.get('qna_list', None) self.urls = kwargs.get('urls', None) + self.default_answer = kwargs.get('default_answer', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_contents_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_contents_dto_py3.py similarity index 74% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_contents_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_contents_dto_py3.py index d1c60f4977ba..6c5c7b0988ee 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_contents_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_contents_dto_py3.py @@ -20,20 +20,29 @@ class UpdateKbContentsDTO(Model): :param qna_list: List of Q-A (UpdateQnaDTO) to be added to the knowledgebase. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTO] :param urls: List of existing URLs to be refreshed. The content will be extracted again and re-indexed. :type urls: list[str] + :param default_answer: Default answer sent to user if no good match is + found in the KB. + :type default_answer: str """ + _validation = { + 'default_answer': {'max_length': 300, 'min_length': 1}, + } + _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'qna_list': {'key': 'qnaList', 'type': '[UpdateQnaDTO]'}, 'urls': {'key': 'urls', 'type': '[str]'}, + 'default_answer': {'key': 'defaultAnswer', 'type': 'str'}, } - def __init__(self, *, name: str=None, qna_list=None, urls=None, **kwargs) -> None: + def __init__(self, *, name: str=None, qna_list=None, urls=None, default_answer: str=None, **kwargs) -> None: super(UpdateKbContentsDTO, self).__init__(**kwargs) self.name = name self.qna_list = qna_list self.urls = urls + self.default_answer = default_answer diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto.py similarity index 89% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto.py index 8c5a98f88b99..e1d699fec9ab 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto.py @@ -17,13 +17,13 @@ class UpdateKbOperationDTO(Model): :param add: An instance of CreateKbInputDTO for add operation :type add: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateKbOperationDTOAdd + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateKbOperationDTOAdd :param delete: An instance of DeleteKbContentsDTO for delete Operation :type delete: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateKbOperationDTODelete + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateKbOperationDTODelete :param update: An instance of UpdateKbContentsDTO for Update Operation :type update: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateKbOperationDTOUpdate + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateKbOperationDTOUpdate :param enable_hierarchical_extraction: Enable hierarchical extraction of Q-A from files and urls. The value set during KB creation will be used if this field is not present. diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_add.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_add.py similarity index 88% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_add.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_add.py index 1dbe0ac290cc..ac8ec6f8c794 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_add.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_add.py @@ -18,12 +18,12 @@ class UpdateKbOperationDTOAdd(CreateKbInputDTO): :param qna_list: List of QNA to be added to the index. Ids are generated by the service and should be omitted. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] :param urls: List of URLs to be added to knowledgebase. :type urls: list[str] :param files: List of files to be added to knowledgebase. :type files: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.FileDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.FileDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_add_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_add_py3.py similarity index 89% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_add_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_add_py3.py index cca01b6df666..b9c135e727ba 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_add_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_add_py3.py @@ -18,12 +18,12 @@ class UpdateKbOperationDTOAdd(CreateKbInputDTO): :param qna_list: List of QNA to be added to the index. Ids are generated by the service and should be omitted. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] :param urls: List of URLs to be added to knowledgebase. :type urls: list[str] :param files: List of files to be added to knowledgebase. :type files: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.FileDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.FileDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_delete.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_delete.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_delete.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_delete.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_delete_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_delete_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_delete_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_delete_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_py3.py similarity index 89% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_py3.py index 074e8a005b7e..c277f12fb9fb 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_py3.py @@ -17,13 +17,13 @@ class UpdateKbOperationDTO(Model): :param add: An instance of CreateKbInputDTO for add operation :type add: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateKbOperationDTOAdd + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateKbOperationDTOAdd :param delete: An instance of DeleteKbContentsDTO for delete Operation :type delete: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateKbOperationDTODelete + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateKbOperationDTODelete :param update: An instance of UpdateKbContentsDTO for Update Operation :type update: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateKbOperationDTOUpdate + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateKbOperationDTOUpdate :param enable_hierarchical_extraction: Enable hierarchical extraction of Q-A from files and urls. The value set during KB creation will be used if this field is not present. diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_update.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_update.py similarity index 77% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_update.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_update.py index 95441d5bb77f..6a6da6a2cc63 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_update.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_update.py @@ -20,16 +20,24 @@ class UpdateKbOperationDTOUpdate(UpdateKbContentsDTO): :param qna_list: List of Q-A (UpdateQnaDTO) to be added to the knowledgebase. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTO] :param urls: List of existing URLs to be refreshed. The content will be extracted again and re-indexed. :type urls: list[str] + :param default_answer: Default answer sent to user if no good match is + found in the KB. + :type default_answer: str """ + _validation = { + 'default_answer': {'max_length': 300, 'min_length': 1}, + } + _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'qna_list': {'key': 'qnaList', 'type': '[UpdateQnaDTO]'}, 'urls': {'key': 'urls', 'type': '[str]'}, + 'default_answer': {'key': 'defaultAnswer', 'type': 'str'}, } def __init__(self, **kwargs): diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_update_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_update_py3.py similarity index 72% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_update_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_update_py3.py index cab934082291..31e59ccb524b 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_kb_operation_dto_update_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_kb_operation_dto_update_py3.py @@ -20,17 +20,25 @@ class UpdateKbOperationDTOUpdate(UpdateKbContentsDTO): :param qna_list: List of Q-A (UpdateQnaDTO) to be added to the knowledgebase. :type qna_list: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTO] :param urls: List of existing URLs to be refreshed. The content will be extracted again and re-indexed. :type urls: list[str] + :param default_answer: Default answer sent to user if no good match is + found in the KB. + :type default_answer: str """ + _validation = { + 'default_answer': {'max_length': 300, 'min_length': 1}, + } + _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'qna_list': {'key': 'qnaList', 'type': '[UpdateQnaDTO]'}, 'urls': {'key': 'urls', 'type': '[str]'}, + 'default_answer': {'key': 'defaultAnswer', 'type': 'str'}, } - def __init__(self, *, name: str=None, qna_list=None, urls=None, **kwargs) -> None: - super(UpdateKbOperationDTOUpdate, self).__init__(name=name, qna_list=qna_list, urls=urls, **kwargs) + def __init__(self, *, name: str=None, qna_list=None, urls=None, default_answer: str=None, **kwargs) -> None: + super(UpdateKbOperationDTOUpdate, self).__init__(name=name, qna_list=qna_list, urls=urls, default_answer=default_answer, **kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_metadata_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_metadata_dto.py similarity index 87% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_metadata_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_metadata_dto.py index 7d6e8d72d942..de526f59d55f 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_metadata_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_metadata_dto.py @@ -17,10 +17,10 @@ class UpdateMetadataDTO(Model): :param delete: List of Metadata associated with answer to be deleted :type delete: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param add: List of metadata associated with answer to be added :type add: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_metadata_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_metadata_dto_py3.py similarity index 87% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_metadata_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_metadata_dto_py3.py index 79792cc38bf8..50327dff6578 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_metadata_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_metadata_dto_py3.py @@ -17,10 +17,10 @@ class UpdateMetadataDTO(Model): :param delete: List of Metadata associated with answer to be deleted :type delete: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param add: List of metadata associated with answer to be added :type add: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto.py similarity index 88% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto.py index 10baaaebc713..5976530eafef 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto.py @@ -24,13 +24,13 @@ class UpdateQnaDTO(Model): :type source: str :param questions: List of questions associated with the answer. :type questions: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTOQuestions + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTOQuestions :param metadata: List of metadata associated with the answer to be updated :type metadata: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTOMetadata + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTOMetadata :param context: Context associated with Qna to be updated. :type context: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTOContext + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTOContext """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_context.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_context.py similarity index 94% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_context.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_context.py index b74e05d28668..44f951409c08 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_context.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_context.py @@ -20,7 +20,7 @@ class UpdateQnaDTOContext(UpdateContextDTO): :type prompts_to_delete: list[int] :param prompts_to_add: List of prompts to be added to the qna. :type prompts_to_add: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] :param is_context_only: To mark if a prompt is relevant only with a previous question or not. true - Do not include this QnA as search result for queries without diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_context_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_context_py3.py similarity index 95% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_context_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_context_py3.py index 3bc0e057f78f..6520f0d0c019 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_context_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_context_py3.py @@ -20,7 +20,7 @@ class UpdateQnaDTOContext(UpdateContextDTO): :type prompts_to_delete: list[int] :param prompts_to_add: List of prompts to be added to the qna. :type prompts_to_add: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.PromptDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.PromptDTO] :param is_context_only: To mark if a prompt is relevant only with a previous question or not. true - Do not include this QnA as search result for queries without diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_metadata.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_metadata.py similarity index 86% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_metadata.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_metadata.py index 681d67dabc85..ae18bff232e4 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_metadata.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_metadata.py @@ -17,10 +17,10 @@ class UpdateQnaDTOMetadata(UpdateMetadataDTO): :param delete: List of Metadata associated with answer to be deleted :type delete: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param add: List of metadata associated with answer to be added :type add: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_metadata_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_metadata_py3.py similarity index 87% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_metadata_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_metadata_py3.py index 331f518018f3..64d8384af6e4 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_metadata_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_metadata_py3.py @@ -17,10 +17,10 @@ class UpdateQnaDTOMetadata(UpdateMetadataDTO): :param delete: List of Metadata associated with answer to be deleted :type delete: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] :param add: List of metadata associated with answer to be added :type add: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.MetadataDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.MetadataDTO] """ _attribute_map = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_py3.py similarity index 88% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_py3.py index e980c2545661..22ca2653bfe3 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_py3.py @@ -24,13 +24,13 @@ class UpdateQnaDTO(Model): :type source: str :param questions: List of questions associated with the answer. :type questions: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTOQuestions + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTOQuestions :param metadata: List of metadata associated with the answer to be updated :type metadata: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTOMetadata + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTOMetadata :param context: Context associated with Qna to be updated. :type context: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateQnaDTOContext + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateQnaDTOContext """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_questions.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_questions.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_questions.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_questions.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_questions_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_questions_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_qna_dto_questions_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_qna_dto_questions_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_questions_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_questions_dto.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_questions_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_questions_dto.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_questions_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_questions_dto_py3.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/update_questions_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/update_questions_dto_py3.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/word_alterations_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/word_alterations_dto.py similarity index 92% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/word_alterations_dto.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/word_alterations_dto.py index b7e4ffbcec0b..cf28a19ff53f 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/word_alterations_dto.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/word_alterations_dto.py @@ -19,7 +19,7 @@ class WordAlterationsDTO(Model): :param word_alterations: Required. Collection of word alterations. :type word_alterations: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.AlterationsDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.AlterationsDTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/word_alterations_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/word_alterations_dto_py3.py similarity index 92% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/word_alterations_dto_py3.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/word_alterations_dto_py3.py index 5183b48255a2..579706cdbbdf 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/models/word_alterations_dto_py3.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/models/word_alterations_dto_py3.py @@ -19,7 +19,7 @@ class WordAlterationsDTO(Model): :param word_alterations: Required. Collection of word alterations. :type word_alterations: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.AlterationsDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.AlterationsDTO] """ _validation = { diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/__init__.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/__init__.py similarity index 100% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/__init__.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/__init__.py diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/alterations_operations.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/alterations_operations.py similarity index 50% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/alterations_operations.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/alterations_operations.py index 2f292128400f..d9b94ba17b93 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/alterations_operations.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/alterations_operations.py @@ -44,10 +44,10 @@ def get( overrides`. :return: WordAlterationsDTO or ClientRawResponse if raw=true :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.WordAlterationsDTO + ~azure.cognitiveservices.knowledge.qnamaker.models.WordAlterationsDTO or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.get.metadata['url'] @@ -90,7 +90,7 @@ def replace( :param word_alterations: Collection of word alterations. :type word_alterations: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.AlterationsDTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.AlterationsDTO] :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -99,7 +99,7 @@ def replace( :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ word_alterations1 = models.WordAlterationsDTO(word_alterations=word_alterations) @@ -133,3 +133,110 @@ def replace( client_raw_response = ClientRawResponse(None, response) return client_raw_response replace.metadata = {'url': '/alterations'} + + def get_alterations_for_kb( + self, kb_id, custom_headers=None, raw=False, **operation_config): + """Download alterations per Knowledgebase (QnAMaker Managed). + + :param kb_id: Knowledgebase id. + :type kb_id: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: WordAlterationsDTO or ClientRawResponse if raw=true + :rtype: + ~azure.cognitiveservices.knowledge.qnamaker.models.WordAlterationsDTO + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorResponseException` + """ + # Construct URL + url = self.get_alterations_for_kb.metadata['url'] + path_format_arguments = { + 'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True), + 'kbId': self._serialize.url("kb_id", kb_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if custom_headers: + header_parameters.update(custom_headers) + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('WordAlterationsDTO', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get_alterations_for_kb.metadata = {'url': '/alterations/{kbId}'} + + def replace_alterations_for_kb( + self, kb_id, word_alterations, custom_headers=None, raw=False, **operation_config): + """Replace alterations data per Knowledgebase (QnAMaker Managed). + + :param kb_id: Knowledgebase id. + :type kb_id: str + :param word_alterations: Collection of word alterations. + :type word_alterations: + list[~azure.cognitiveservices.knowledge.qnamaker.models.AlterationsDTO] + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorResponseException` + """ + word_alterations1 = models.WordAlterationsDTO(word_alterations=word_alterations) + + # Construct URL + url = self.replace_alterations_for_kb.metadata['url'] + path_format_arguments = { + 'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True), + 'kbId': self._serialize.url("kb_id", kb_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if custom_headers: + header_parameters.update(custom_headers) + + # Construct body + body_content = self._serialize.body(word_alterations1, 'WordAlterationsDTO') + + # Construct and send request + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [204]: + raise models.ErrorResponseException(self._deserialize, response) + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + replace_alterations_for_kb.metadata = {'url': '/alterations/{kbId}'} diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/endpoint_keys_operations.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/endpoint_keys_operations.py similarity index 92% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/endpoint_keys_operations.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/endpoint_keys_operations.py index 9dc374b95219..0112cd1b9cd2 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/endpoint_keys_operations.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/endpoint_keys_operations.py @@ -44,10 +44,10 @@ def get_keys( overrides`. :return: EndpointKeysDTO or ClientRawResponse if raw=true :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.EndpointKeysDTO - or ~msrest.pipeline.ClientRawResponse + ~azure.cognitiveservices.knowledge.qnamaker.models.EndpointKeysDTO or + ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.get_keys.metadata['url'] @@ -97,10 +97,10 @@ def refresh_keys( overrides`. :return: EndpointKeysDTO or ClientRawResponse if raw=true :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.EndpointKeysDTO - or ~msrest.pipeline.ClientRawResponse + ~azure.cognitiveservices.knowledge.qnamaker.models.EndpointKeysDTO or + ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.refresh_keys.metadata['url'] diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/endpoint_settings_operations.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/endpoint_settings_operations.py similarity index 86% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/endpoint_settings_operations.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/endpoint_settings_operations.py index 823ca9d95ad9..f73474708453 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/endpoint_settings_operations.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/endpoint_settings_operations.py @@ -44,10 +44,10 @@ def get_settings( overrides`. :return: EndpointSettingsDTO or ClientRawResponse if raw=true :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.EndpointSettingsDTO + ~azure.cognitiveservices.knowledge.qnamaker.models.EndpointSettingsDTO or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.get_settings.metadata['url'] @@ -90,16 +90,16 @@ def update_settings( :param active_learning: Active Learning settings of the endpoint. :type active_learning: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.EndpointSettingsDTOActiveLearning + ~azure.cognitiveservices.knowledge.qnamaker.models.EndpointSettingsDTOActiveLearning :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: str or ClientRawResponse if raw=true - :rtype: str or ~msrest.pipeline.ClientRawResponse + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ endpoint_settings_payload = models.EndpointSettingsDTO(active_learning=active_learning) @@ -115,7 +115,6 @@ def update_settings( # Construct headers header_parameters = {} - header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if custom_headers: header_parameters.update(custom_headers) @@ -127,17 +126,10 @@ def update_settings( request = self._client.patch(url, query_parameters, header_parameters, body_content) response = self._client.send(request, stream=False, **operation_config) - if response.status_code not in [200]: + if response.status_code not in [204]: raise models.ErrorResponseException(self._deserialize, response) - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('str', response) - if raw: - client_raw_response = ClientRawResponse(deserialized, response) + client_raw_response = ClientRawResponse(None, response) return client_raw_response - - return deserialized update_settings.metadata = {'url': '/endpointSettings'} diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/knowledgebase_operations.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/knowledgebase_operations.py similarity index 72% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/knowledgebase_operations.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/knowledgebase_operations.py index de6afacab71f..6e097c724d44 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/knowledgebase_operations.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/knowledgebase_operations.py @@ -44,10 +44,10 @@ def list_all( overrides`. :return: KnowledgebasesDTO or ClientRawResponse if raw=true :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.KnowledgebasesDTO + ~azure.cognitiveservices.knowledge.qnamaker.models.KnowledgebasesDTO or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.list_all.metadata['url'] @@ -97,10 +97,10 @@ def get_details( overrides`. :return: KnowledgebaseDTO or ClientRawResponse if raw=true :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.KnowledgebaseDTO - or ~msrest.pipeline.ClientRawResponse + ~azure.cognitiveservices.knowledge.qnamaker.models.KnowledgebaseDTO or + ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.get_details.metadata['url'] @@ -152,7 +152,7 @@ def delete( :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.delete.metadata['url'] @@ -197,7 +197,7 @@ def publish( :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.publish.metadata['url'] @@ -237,7 +237,7 @@ def replace( knowledgebase. Q-A Ids are assigned by the service and should be omitted. :type qn_alist: - list[~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADTO] + list[~azure.cognitiveservices.knowledge.qnamaker.models.QnADTO] :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -246,7 +246,7 @@ def replace( :return: None or ClientRawResponse if raw=true :rtype: None or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ replace_kb = models.ReplaceKbDTO(qn_alist=qn_alist) @@ -290,18 +290,17 @@ def update( :type kb_id: str :param update_kb: Post body of the request. :type update_kb: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.UpdateKbOperationDTO + ~azure.cognitiveservices.knowledge.qnamaker.models.UpdateKbOperationDTO :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response :param operation_config: :ref:`Operation configuration overrides`. :return: Operation or ClientRawResponse if raw=true - :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.Operation + :rtype: ~azure.cognitiveservices.knowledge.qnamaker.models.Operation or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.update.metadata['url'] @@ -354,18 +353,17 @@ def create( :param create_kb_payload: Post body of the request. :type create_kb_payload: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.CreateKbDTO + ~azure.cognitiveservices.knowledge.qnamaker.models.CreateKbDTO :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response :param operation_config: :ref:`Operation configuration overrides`. :return: Operation or ClientRawResponse if raw=true - :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.Operation + :rtype: ~azure.cognitiveservices.knowledge.qnamaker.models.Operation or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.create.metadata['url'] @@ -407,7 +405,7 @@ def create( create.metadata = {'url': '/knowledgebases/create'} def download( - self, kb_id, environment, custom_headers=None, raw=False, **operation_config): + self, kb_id, environment, source=None, changed_since=None, custom_headers=None, raw=False, **operation_config): """Download the knowledgebase. :param kb_id: Knowledgebase id. @@ -415,7 +413,12 @@ def download( :param environment: Specifies whether environment is Test or Prod. Possible values include: 'Prod', 'Test' :type environment: str or - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.EnvironmentType + ~azure.cognitiveservices.knowledge.qnamaker.models.EnvironmentType + :param source: The source property filter to apply. + :type source: str + :param changed_since: The last changed status property filter to + apply. + :type changed_since: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -423,10 +426,10 @@ def download( overrides`. :return: QnADocumentsDTO or ClientRawResponse if raw=true :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.QnADocumentsDTO - or ~msrest.pipeline.ClientRawResponse + ~azure.cognitiveservices.knowledge.qnamaker.models.QnADocumentsDTO or + ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.download.metadata['url'] @@ -439,6 +442,10 @@ def download( # Construct parameters query_parameters = {} + if source is not None: + query_parameters['source'] = self._serialize.query("source", source, 'str') + if changed_since is not None: + query_parameters['changedSince'] = self._serialize.query("changed_since", changed_since, 'str') # Construct headers header_parameters = {} @@ -464,3 +471,117 @@ def download( return deserialized download.metadata = {'url': '/knowledgebases/{kbId}/{environment}/qna'} + + def generate_answer( + self, kb_id, generate_answer_payload, custom_headers=None, raw=False, **operation_config): + """GenerateAnswer call to query knowledgebase (QnA Maker Managed). + + :param kb_id: Knowledgebase id. + :type kb_id: str + :param generate_answer_payload: Post body of the request. + :type generate_answer_payload: + ~azure.cognitiveservices.knowledge.qnamaker.models.QueryDTO + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: QnASearchResultList or ClientRawResponse if raw=true + :rtype: + ~azure.cognitiveservices.knowledge.qnamaker.models.QnASearchResultList + or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorResponseException` + """ + # Construct URL + url = self.generate_answer.metadata['url'] + path_format_arguments = { + 'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True), + 'kbId': self._serialize.url("kb_id", kb_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if custom_headers: + header_parameters.update(custom_headers) + + # Construct body + body_content = self._serialize.body(generate_answer_payload, 'QueryDTO') + + # Construct and send request + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + raise models.ErrorResponseException(self._deserialize, response) + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('QnASearchResultList', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + generate_answer.metadata = {'url': '/knowledgebases/{kbId}/generateAnswer'} + + def train( + self, kb_id, feedback_records=None, custom_headers=None, raw=False, **operation_config): + """Train call to add suggestions to knowledgebase (QnAMaker Managed). + + :param kb_id: Knowledgebase id. + :type kb_id: str + :param feedback_records: List of feedback records. + :type feedback_records: + list[~azure.cognitiveservices.knowledge.qnamaker.models.FeedbackRecordDTO] + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse + :raises: + :class:`ErrorResponseException` + """ + train_payload = models.FeedbackRecordsDTO(feedback_records=feedback_records) + + # Construct URL + url = self.train.metadata['url'] + path_format_arguments = { + 'Endpoint': self._serialize.url("self.config.endpoint", self.config.endpoint, 'str', skip_quote=True), + 'kbId': self._serialize.url("kb_id", kb_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if custom_headers: + header_parameters.update(custom_headers) + + # Construct body + body_content = self._serialize.body(train_payload, 'FeedbackRecordsDTO') + + # Construct and send request + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [204]: + raise models.ErrorResponseException(self._deserialize, response) + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + train.metadata = {'url': '/knowledgebases/{kbId}/train'} diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/operations.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/operations.py similarity index 95% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/operations.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/operations.py index b4973f126822..7fc2c8c360dc 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/operations/operations.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/operations/operations.py @@ -45,11 +45,10 @@ def get_details( :param operation_config: :ref:`Operation configuration overrides`. :return: Operation or ClientRawResponse if raw=true - :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.authoring.models.Operation + :rtype: ~azure.cognitiveservices.knowledge.qnamaker.models.Operation or ~msrest.pipeline.ClientRawResponse :raises: - :class:`ErrorResponseException` + :class:`ErrorResponseException` """ # Construct URL url = self.get_details.metadata['url'] diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/qn_amaker_client.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/qn_amaker_client.py similarity index 85% rename from sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/qn_amaker_client.py rename to sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/qn_amaker_client.py index fe0afce73bd7..f3108394750d 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/authoring/qn_amaker_client.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/qn_amaker_client.py @@ -25,8 +25,8 @@ class QnAMakerClientConfiguration(Configuration): 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). + :param endpoint: Supported Cognitive Services endpoint (e.g., https://< + qnamaker-resource-name >.api.cognitiveservices.azure.com). :type endpoint: str :param credentials: Subscription credentials which uniquely identify client subscription. @@ -40,7 +40,7 @@ def __init__( raise ValueError("Parameter 'endpoint' must not be None.") if credentials is None: raise ValueError("Parameter 'credentials' must not be None.") - base_url = '{Endpoint}/qnamaker/v4.0' + base_url = '{Endpoint}/qnamaker/v5.0-preview.1' super(QnAMakerClientConfiguration, self).__init__(base_url) @@ -57,18 +57,18 @@ class QnAMakerClient(SDKClient): :vartype config: QnAMakerClientConfiguration :ivar endpoint_settings: EndpointSettings operations - :vartype endpoint_settings: azure.cognitiveservices.knowledge.qnamaker.authoring.operations.EndpointSettingsOperations + :vartype endpoint_settings: azure.cognitiveservices.knowledge.qnamaker.operations.EndpointSettingsOperations :ivar endpoint_keys: EndpointKeys operations - :vartype endpoint_keys: azure.cognitiveservices.knowledge.qnamaker.authoring.operations.EndpointKeysOperations + :vartype endpoint_keys: azure.cognitiveservices.knowledge.qnamaker.operations.EndpointKeysOperations :ivar alterations: Alterations operations - :vartype alterations: azure.cognitiveservices.knowledge.qnamaker.authoring.operations.AlterationsOperations + :vartype alterations: azure.cognitiveservices.knowledge.qnamaker.operations.AlterationsOperations :ivar knowledgebase: Knowledgebase operations - :vartype knowledgebase: azure.cognitiveservices.knowledge.qnamaker.authoring.operations.KnowledgebaseOperations + :vartype knowledgebase: azure.cognitiveservices.knowledge.qnamaker.operations.KnowledgebaseOperations :ivar operations: Operations operations - :vartype operations: azure.cognitiveservices.knowledge.qnamaker.authoring.operations.Operations + :vartype operations: azure.cognitiveservices.knowledge.qnamaker.operations.Operations - :param endpoint: Supported Cognitive Services endpoints (protocol and - hostname, for example: https://westus.api.cognitive.microsoft.com). + :param endpoint: Supported Cognitive Services endpoint (e.g., https://< + qnamaker-resource-name >.api.cognitiveservices.azure.com). :type endpoint: str :param credentials: Subscription credentials which uniquely identify client subscription. @@ -82,7 +82,7 @@ def __init__( super(QnAMakerClient, 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 = '4.0' + self.api_version = 'v5.0-preview.1' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/__init__.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/__init__.py deleted file mode 100644 index d7ead4eb95b0..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from .qn_amaker_runtime_client import QnAMakerRuntimeClient -from .version import VERSION - -__all__ = ['QnAMakerRuntimeClient'] - -__version__ = VERSION - diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/__init__.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/__init__.py deleted file mode 100644 index eabcdb80fb07..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/__init__.py +++ /dev/null @@ -1,74 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -try: - from .metadata_dto_py3 import MetadataDTO - from .qn_adto_context_py3 import QnADTOContext - from .qn_adto_py3 import QnADTO - from .prompt_dto_qna_py3 import PromptDTOQna - from .prompt_dto_py3 import PromptDTO - from .context_dto_py3 import ContextDTO - from .error_response_error_py3 import ErrorResponseError - from .error_response_py3 import ErrorResponse, ErrorResponseException - from .inner_error_model_py3 import InnerErrorModel - from .error_py3 import Error - from .query_dto_context_py3 import QueryDTOContext - from .query_dto_py3 import QueryDTO - from .query_context_dto_py3 import QueryContextDTO - from .qn_asearch_result_context_py3 import QnASearchResultContext - from .qn_asearch_result_py3 import QnASearchResult - from .qn_asearch_result_list_py3 import QnASearchResultList - from .feedback_record_dto_py3 import FeedbackRecordDTO - from .feedback_records_dto_py3 import FeedbackRecordsDTO -except (SyntaxError, ImportError): - from .metadata_dto import MetadataDTO - from .qn_adto_context import QnADTOContext - from .qn_adto import QnADTO - from .prompt_dto_qna import PromptDTOQna - from .prompt_dto import PromptDTO - from .context_dto import ContextDTO - from .error_response_error import ErrorResponseError - from .error_response import ErrorResponse, ErrorResponseException - from .inner_error_model import InnerErrorModel - from .error import Error - from .query_dto_context import QueryDTOContext - from .query_dto import QueryDTO - from .query_context_dto import QueryContextDTO - from .qn_asearch_result_context import QnASearchResultContext - from .qn_asearch_result import QnASearchResult - from .qn_asearch_result_list import QnASearchResultList - from .feedback_record_dto import FeedbackRecordDTO - from .feedback_records_dto import FeedbackRecordsDTO -from .qn_amaker_runtime_client_enums import ( - ErrorCodeType, -) - -__all__ = [ - 'MetadataDTO', - 'QnADTOContext', - 'QnADTO', - 'PromptDTOQna', - 'PromptDTO', - 'ContextDTO', - 'ErrorResponseError', - 'ErrorResponse', 'ErrorResponseException', - 'InnerErrorModel', - 'Error', - 'QueryDTOContext', - 'QueryDTO', - 'QueryContextDTO', - 'QnASearchResultContext', - 'QnASearchResult', - 'QnASearchResultList', - 'FeedbackRecordDTO', - 'FeedbackRecordsDTO', - 'ErrorCodeType', -] diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/metadata_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/metadata_dto.py deleted file mode 100644 index ad81d7a694a1..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/metadata_dto.py +++ /dev/null @@ -1,39 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class MetadataDTO(Model): - """Name - value pair of metadata. - - All required parameters must be populated in order to send to Azure. - - :param name: Required. Metadata name. - :type name: str - :param value: Required. Metadata value. - :type value: str - """ - - _validation = { - 'name': {'required': True, 'max_length': 100, 'min_length': 1}, - 'value': {'required': True, 'max_length': 500, 'min_length': 1}, - } - - _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(MetadataDTO, self).__init__(**kwargs) - self.name = kwargs.get('name', None) - self.value = kwargs.get('value', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/metadata_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/metadata_dto_py3.py deleted file mode 100644 index da4c1d010f8c..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/metadata_dto_py3.py +++ /dev/null @@ -1,39 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class MetadataDTO(Model): - """Name - value pair of metadata. - - All required parameters must be populated in order to send to Azure. - - :param name: Required. Metadata name. - :type name: str - :param value: Required. Metadata value. - :type value: str - """ - - _validation = { - 'name': {'required': True, 'max_length': 100, 'min_length': 1}, - 'value': {'required': True, 'max_length': 500, 'min_length': 1}, - } - - _attribute_map = { - 'name': {'key': 'name', 'type': 'str'}, - 'value': {'key': 'value', 'type': 'str'}, - } - - def __init__(self, *, name: str, value: str, **kwargs) -> None: - super(MetadataDTO, self).__init__(**kwargs) - self.name = name - self.value = value diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto.py deleted file mode 100644 index 4bdd3b6905c7..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto.py +++ /dev/null @@ -1,49 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class PromptDTO(Model): - """Prompt for an answer. - - :param display_order: Index of the prompt - used in ordering of the - prompts - :type display_order: int - :param qna_id: Qna id corresponding to the prompt - if QnaId is present, - QnADTO object is ignored. - :type qna_id: int - :param qna: QnADTO - Either QnaId or QnADTO needs to be present in a - PromptDTO object - :type qna: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.PromptDTOQna - :param display_text: Text displayed to represent a follow up question - prompt - :type display_text: str - """ - - _validation = { - 'display_text': {'max_length': 200}, - } - - _attribute_map = { - 'display_order': {'key': 'displayOrder', 'type': 'int'}, - 'qna_id': {'key': 'qnaId', 'type': 'int'}, - 'qna': {'key': 'qna', 'type': 'PromptDTOQna'}, - 'display_text': {'key': 'displayText', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(PromptDTO, self).__init__(**kwargs) - self.display_order = kwargs.get('display_order', None) - self.qna_id = kwargs.get('qna_id', None) - self.qna = kwargs.get('qna', None) - self.display_text = kwargs.get('display_text', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto_py3.py deleted file mode 100644 index b6be48cd9d72..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto_py3.py +++ /dev/null @@ -1,49 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class PromptDTO(Model): - """Prompt for an answer. - - :param display_order: Index of the prompt - used in ordering of the - prompts - :type display_order: int - :param qna_id: Qna id corresponding to the prompt - if QnaId is present, - QnADTO object is ignored. - :type qna_id: int - :param qna: QnADTO - Either QnaId or QnADTO needs to be present in a - PromptDTO object - :type qna: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.PromptDTOQna - :param display_text: Text displayed to represent a follow up question - prompt - :type display_text: str - """ - - _validation = { - 'display_text': {'max_length': 200}, - } - - _attribute_map = { - 'display_order': {'key': 'displayOrder', 'type': 'int'}, - 'qna_id': {'key': 'qnaId', 'type': 'int'}, - 'qna': {'key': 'qna', 'type': 'PromptDTOQna'}, - 'display_text': {'key': 'displayText', 'type': 'str'}, - } - - def __init__(self, *, display_order: int=None, qna_id: int=None, qna=None, display_text: str=None, **kwargs) -> None: - super(PromptDTO, self).__init__(**kwargs) - self.display_order = display_order - self.qna_id = qna_id - self.qna = qna - self.display_text = display_text diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto_qna.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto_qna.py deleted file mode 100644 index 7ada0fe375a0..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto_qna.py +++ /dev/null @@ -1,53 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from .qn_adto import QnADTO - - -class PromptDTOQna(QnADTO): - """QnADTO - Either QnaId or QnADTO needs to be present in a PromptDTO object. - - All required parameters must be populated in order to send to Azure. - - :param id: Unique id for the Q-A. - :type id: int - :param answer: Required. Answer text - :type answer: str - :param source: Source from which Q-A was indexed. eg. - https://docs.microsoft.com/en-us/azure/cognitive-services/QnAMaker/FAQs - :type source: str - :param questions: Required. List of questions associated with the answer. - :type questions: list[str] - :param metadata: List of metadata associated with the answer. - :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.MetadataDTO] - :param context: Context of a QnA - :type context: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QnADTOContext - """ - - _validation = { - 'answer': {'required': True, 'max_length': 25000, 'min_length': 1}, - 'source': {'max_length': 300}, - 'questions': {'required': True}, - } - - _attribute_map = { - 'id': {'key': 'id', 'type': 'int'}, - 'answer': {'key': 'answer', 'type': 'str'}, - 'source': {'key': 'source', 'type': 'str'}, - 'questions': {'key': 'questions', 'type': '[str]'}, - 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, - 'context': {'key': 'context', 'type': 'QnADTOContext'}, - } - - def __init__(self, **kwargs): - super(PromptDTOQna, self).__init__(**kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto_qna_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto_qna_py3.py deleted file mode 100644 index 618fa7260f8c..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/prompt_dto_qna_py3.py +++ /dev/null @@ -1,53 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from .qn_adto_py3 import QnADTO - - -class PromptDTOQna(QnADTO): - """QnADTO - Either QnaId or QnADTO needs to be present in a PromptDTO object. - - All required parameters must be populated in order to send to Azure. - - :param id: Unique id for the Q-A. - :type id: int - :param answer: Required. Answer text - :type answer: str - :param source: Source from which Q-A was indexed. eg. - https://docs.microsoft.com/en-us/azure/cognitive-services/QnAMaker/FAQs - :type source: str - :param questions: Required. List of questions associated with the answer. - :type questions: list[str] - :param metadata: List of metadata associated with the answer. - :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.MetadataDTO] - :param context: Context of a QnA - :type context: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QnADTOContext - """ - - _validation = { - 'answer': {'required': True, 'max_length': 25000, 'min_length': 1}, - 'source': {'max_length': 300}, - 'questions': {'required': True}, - } - - _attribute_map = { - 'id': {'key': 'id', 'type': 'int'}, - 'answer': {'key': 'answer', 'type': 'str'}, - 'source': {'key': 'source', 'type': 'str'}, - 'questions': {'key': 'questions', 'type': '[str]'}, - 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, - 'context': {'key': 'context', 'type': 'QnADTOContext'}, - } - - def __init__(self, *, answer: str, questions, id: int=None, source: str=None, metadata=None, context=None, **kwargs) -> None: - super(PromptDTOQna, self).__init__(id=id, answer=answer, source=source, questions=questions, metadata=metadata, context=context, **kwargs) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto.py deleted file mode 100644 index 9854cb76eed5..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto.py +++ /dev/null @@ -1,59 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class QnADTO(Model): - """Q-A object. - - All required parameters must be populated in order to send to Azure. - - :param id: Unique id for the Q-A. - :type id: int - :param answer: Required. Answer text - :type answer: str - :param source: Source from which Q-A was indexed. eg. - https://docs.microsoft.com/en-us/azure/cognitive-services/QnAMaker/FAQs - :type source: str - :param questions: Required. List of questions associated with the answer. - :type questions: list[str] - :param metadata: List of metadata associated with the answer. - :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.MetadataDTO] - :param context: Context of a QnA - :type context: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QnADTOContext - """ - - _validation = { - 'answer': {'required': True, 'max_length': 25000, 'min_length': 1}, - 'source': {'max_length': 300}, - 'questions': {'required': True}, - } - - _attribute_map = { - 'id': {'key': 'id', 'type': 'int'}, - 'answer': {'key': 'answer', 'type': 'str'}, - 'source': {'key': 'source', 'type': 'str'}, - 'questions': {'key': 'questions', 'type': '[str]'}, - 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, - 'context': {'key': 'context', 'type': 'QnADTOContext'}, - } - - def __init__(self, **kwargs): - super(QnADTO, self).__init__(**kwargs) - self.id = kwargs.get('id', None) - self.answer = kwargs.get('answer', None) - self.source = kwargs.get('source', None) - self.questions = kwargs.get('questions', None) - self.metadata = kwargs.get('metadata', None) - self.context = kwargs.get('context', None) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto_py3.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto_py3.py deleted file mode 100644 index f0967bab95fe..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_adto_py3.py +++ /dev/null @@ -1,59 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class QnADTO(Model): - """Q-A object. - - All required parameters must be populated in order to send to Azure. - - :param id: Unique id for the Q-A. - :type id: int - :param answer: Required. Answer text - :type answer: str - :param source: Source from which Q-A was indexed. eg. - https://docs.microsoft.com/en-us/azure/cognitive-services/QnAMaker/FAQs - :type source: str - :param questions: Required. List of questions associated with the answer. - :type questions: list[str] - :param metadata: List of metadata associated with the answer. - :type metadata: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.MetadataDTO] - :param context: Context of a QnA - :type context: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QnADTOContext - """ - - _validation = { - 'answer': {'required': True, 'max_length': 25000, 'min_length': 1}, - 'source': {'max_length': 300}, - 'questions': {'required': True}, - } - - _attribute_map = { - 'id': {'key': 'id', 'type': 'int'}, - 'answer': {'key': 'answer', 'type': 'str'}, - 'source': {'key': 'source', 'type': 'str'}, - 'questions': {'key': 'questions', 'type': '[str]'}, - 'metadata': {'key': 'metadata', 'type': '[MetadataDTO]'}, - 'context': {'key': 'context', 'type': 'QnADTOContext'}, - } - - def __init__(self, *, answer: str, questions, id: int=None, source: str=None, metadata=None, context=None, **kwargs) -> None: - super(QnADTO, self).__init__(**kwargs) - self.id = id - self.answer = answer - self.source = source - self.questions = questions - self.metadata = metadata - self.context = context diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_amaker_runtime_client_enums.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_amaker_runtime_client_enums.py deleted file mode 100644 index c523cb290231..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/models/qn_amaker_runtime_client_enums.py +++ /dev/null @@ -1,30 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from enum import Enum - - -class ErrorCodeType(str, Enum): - - bad_argument = "BadArgument" - forbidden = "Forbidden" - not_found = "NotFound" - kb_not_found = "KbNotFound" - unauthorized = "Unauthorized" - unspecified = "Unspecified" - endpoint_keys_error = "EndpointKeysError" - quota_exceeded = "QuotaExceeded" - qna_runtime_error = "QnaRuntimeError" - sku_limit_exceeded = "SKULimitExceeded" - operation_not_found = "OperationNotFound" - service_error = "ServiceError" - validation_failure = "ValidationFailure" - extraction_failure = "ExtractionFailure" diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/operations/__init__.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/operations/__init__.py deleted file mode 100644 index cf82a2663407..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/operations/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from .runtime_operations import RuntimeOperations - -__all__ = [ - 'RuntimeOperations', -] diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/operations/runtime_operations.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/operations/runtime_operations.py deleted file mode 100644 index 4e2e85a3ac87..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/operations/runtime_operations.py +++ /dev/null @@ -1,148 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.pipeline import ClientRawResponse - -from .. import models - - -class RuntimeOperations(object): - """RuntimeOperations operations. - - :param client: Client for service requests. - :param config: Configuration of service client. - :param serializer: An object model serializer. - :param deserializer: An object model deserializer. - """ - - models = models - - def __init__(self, client, config, serializer, deserializer): - - self._client = client - self._serialize = serializer - self._deserialize = deserializer - - self.config = config - - def generate_answer( - self, kb_id, generate_answer_payload, custom_headers=None, raw=False, **operation_config): - """GenerateAnswer call to query the knowledgebase. - - :param kb_id: Knowledgebase id. - :type kb_id: str - :param generate_answer_payload: Post body of the request. - :type generate_answer_payload: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QueryDTO - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: QnASearchResultList or ClientRawResponse if raw=true - :rtype: - ~azure.cognitiveservices.knowledge.qnamaker.runtime.models.QnASearchResultList - or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` - """ - # Construct URL - url = self.generate_answer.metadata['url'] - path_format_arguments = { - 'RuntimeEndpoint': self._serialize.url("self.config.runtime_endpoint", self.config.runtime_endpoint, 'str', skip_quote=True), - 'kbId': self._serialize.url("kb_id", kb_id, 'str') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - - # Construct headers - header_parameters = {} - header_parameters['Accept'] = 'application/json' - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if custom_headers: - header_parameters.update(custom_headers) - - # Construct body - body_content = self._serialize.body(generate_answer_payload, 'QueryDTO') - - # Construct and send request - request = self._client.post(url, query_parameters, header_parameters, body_content) - response = self._client.send(request, stream=False, **operation_config) - - if response.status_code not in [200]: - raise models.ErrorResponseException(self._deserialize, response) - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('QnASearchResultList', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - generate_answer.metadata = {'url': '/knowledgebases/{kbId}/generateAnswer'} - - def train( - self, kb_id, feedback_records=None, custom_headers=None, raw=False, **operation_config): - """Train call to add suggestions to the knowledgebase. - - :param kb_id: Knowledgebase id. - :type kb_id: str - :param feedback_records: List of feedback records. - :type feedback_records: - list[~azure.cognitiveservices.knowledge.qnamaker.runtime.models.FeedbackRecordDTO] - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse - :raises: - :class:`ErrorResponseException` - """ - train_payload = models.FeedbackRecordsDTO(feedback_records=feedback_records) - - # Construct URL - url = self.train.metadata['url'] - path_format_arguments = { - 'RuntimeEndpoint': self._serialize.url("self.config.runtime_endpoint", self.config.runtime_endpoint, 'str', skip_quote=True), - 'kbId': self._serialize.url("kb_id", kb_id, 'str') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if custom_headers: - header_parameters.update(custom_headers) - - # Construct body - body_content = self._serialize.body(train_payload, 'FeedbackRecordsDTO') - - # Construct and send request - request = self._client.post(url, query_parameters, header_parameters, body_content) - response = self._client.send(request, stream=False, **operation_config) - - if response.status_code not in [204]: - raise models.ErrorResponseException(self._deserialize, response) - - if raw: - client_raw_response = ClientRawResponse(None, response) - return client_raw_response - train.metadata = {'url': '/knowledgebases/{kbId}/train'} diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/qn_amaker_runtime_client.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/qn_amaker_runtime_client.py deleted file mode 100644 index 81acd86f0d79..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/qn_amaker_runtime_client.py +++ /dev/null @@ -1,78 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.service_client import SDKClient -from msrest import Configuration, Serializer, Deserializer -from .version import VERSION -from .operations.runtime_operations import RuntimeOperations -from . import models - - -class QnAMakerRuntimeClientConfiguration(Configuration): - """Configuration for QnAMakerRuntimeClient - Note that all parameters used to create this instance are saved as instance - attributes. - - :param runtime_endpoint: QnA Maker App Service endpoint (for example: - https://{qnaservice-hostname}.azurewebsites.net). - :type runtime_endpoint: str - :param credentials: Subscription credentials which uniquely identify - client subscription. - :type credentials: None - """ - - def __init__( - self, runtime_endpoint, credentials): - - if runtime_endpoint is None: - raise ValueError("Parameter 'runtime_endpoint' must not be None.") - if credentials is None: - raise ValueError("Parameter 'credentials' must not be None.") - base_url = '{RuntimeEndpoint}/qnamaker' - - super(QnAMakerRuntimeClientConfiguration, self).__init__(base_url) - - self.add_user_agent('azure-cognitiveservices-knowledge-qnamaker/{}'.format(VERSION)) - - self.runtime_endpoint = runtime_endpoint - self.credentials = credentials - - -class QnAMakerRuntimeClient(SDKClient): - """An API for QnAMaker runtime - - :ivar config: Configuration for client. - :vartype config: QnAMakerRuntimeClientConfiguration - - :ivar runtime: Runtime operations - :vartype runtime: azure.cognitiveservices.knowledge.qnamaker.runtime.operations.RuntimeOperations - - :param runtime_endpoint: QnA Maker App Service endpoint (for example: - https://{qnaservice-hostname}.azurewebsites.net). - :type runtime_endpoint: str - :param credentials: Subscription credentials which uniquely identify - client subscription. - :type credentials: None - """ - - def __init__( - self, runtime_endpoint, credentials): - - self.config = QnAMakerRuntimeClientConfiguration(runtime_endpoint, credentials) - super(QnAMakerRuntimeClient, 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 = '4.0' - self._serialize = Serializer(client_models) - self._deserialize = Deserializer(client_models) - - self.runtime = RuntimeOperations( - self._client, self.config, self._serialize, self._deserialize) diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/version.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/version.py deleted file mode 100644 index 3faab2cb0b4a..000000000000 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/runtime/version.py +++ /dev/null @@ -1,13 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -VERSION = "4.0" - diff --git a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/version.py b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/version.py index c995f7836cef..fcb88654af0a 100644 --- a/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/version.py +++ b/sdk/cognitiveservices/azure-cognitiveservices-knowledge-qnamaker/azure/cognitiveservices/knowledge/qnamaker/version.py @@ -9,4 +9,4 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "0.2.0" +VERSION = "0.3.0"