Skip to content

Commit 2292dfc

Browse files
author
Vinothini Dharmaraj
committed
Addressed azure comments
1 parent 5caf874 commit 2292dfc

File tree

7 files changed

+58
-34
lines changed

7 files changed

+58
-34
lines changed

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_generated/models/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
from ._enums import RecordingKind
122122
from ._enums import RecordingState
123123
from ._enums import RecordingStorageKind
124-
from ._enums import TranscriptionResultType
124+
from ._enums import TranscriptionResultState
125125
from ._enums import TranscriptionStatus
126126
from ._enums import TranscriptionStatusDetails
127127
from ._enums import TranscriptionSubscriptionState
@@ -246,7 +246,7 @@
246246
"RecordingKind",
247247
"RecordingState",
248248
"RecordingStorageKind",
249-
"TranscriptionResultType",
249+
"TranscriptionResultState",
250250
"TranscriptionStatus",
251251
"TranscriptionStatusDetails",
252252
"TranscriptionSubscriptionState",

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_generated/models/_enums.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ class RecordingStorageKind(str, Enum, metaclass=CaseInsensitiveEnumMeta):
208208
"""Storage managed by provided Azure blob"""
209209

210210

211-
class TranscriptionResultType(str, Enum, metaclass=CaseInsensitiveEnumMeta):
212-
"""TranscriptionResultType."""
211+
class TranscriptionResultState(str, Enum, metaclass=CaseInsensitiveEnumMeta):
212+
"""TranscriptionResultState."""
213213

214214
FINAL = "final"
215215
INTERMEDIATE = "intermediate"

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_generated/models/_models.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4580,7 +4580,7 @@ class TranscriptionSubscription(_serialization.Model):
45804580
~azure.communication.callautomation.models.TranscriptionSubscriptionState
45814581
:ivar subscribed_result_types: Subscribed transcription result types.
45824582
:vartype subscribed_result_types: list[str or
4583-
~azure.communication.callautomation.models.TranscriptionResultType]
4583+
~azure.communication.callautomation.models.TranscriptionResultState]
45844584
"""
45854585

45864586
_attribute_map = {
@@ -4594,7 +4594,7 @@ def __init__(
45944594
*,
45954595
id: Optional[str] = None, # pylint: disable=redefined-builtin
45964596
state: Optional[Union[str, "_models.TranscriptionSubscriptionState"]] = None,
4597-
subscribed_result_types: Optional[List[Union[str, "_models.TranscriptionResultType"]]] = None,
4597+
subscribed_result_types: Optional[List[Union[str, "_models.TranscriptionResultState"]]] = None,
45984598
**kwargs: Any
45994599
) -> None:
46004600
"""
@@ -4606,7 +4606,7 @@ def __init__(
46064606
~azure.communication.callautomation.models.TranscriptionSubscriptionState
46074607
:keyword subscribed_result_types: Subscribed transcription result types.
46084608
:paramtype subscribed_result_types: list[str or
4609-
~azure.communication.callautomation.models.TranscriptionResultType]
4609+
~azure.communication.callautomation.models.TranscriptionResultState]
46104610
"""
46114611
super().__init__(**kwargs)
46124612
self.id = id

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_models.py

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
MediaStreamingAudioChannelType,
4141
TranscriptionTransportType,
4242
TranscriptionSubscriptionState,
43-
TranscriptionResultType,
43+
TranscriptionResultState,
4444
CallConnectionState,
4545
RecordingState,
4646
RecordingKind,
@@ -512,22 +512,22 @@ class TranscriptionSubscription:
512512
~azure.communication.callautomation.models.TranscriptionSubscriptionState
513513
:keyword subscribed_result_types: Subscribed transcription result types.
514514
:paramtype subscribed_result_types: list[str or
515-
~azure.communication.callautomation.models.TranscriptionResultType]
515+
~azure.communication.callautomation.models.TranscriptionResultState]
516516
"""
517517

518518
id: Optional[str]
519519
"""subscription id."""
520520
state: Optional[Union[str, 'TranscriptionSubscriptionState']]
521521
"""transcription subscription state."""
522-
subscribed_result_types: Optional[List[Union[str, 'TranscriptionResultType']]]
523-
"""subscribed transcription result types."""
522+
subscribed_result_states: Optional[List[Union[str, 'TranscriptionResultState']]]
523+
"""subscribed transcription result states."""
524524

525525
def __init__(
526526
self,
527527
*,
528528
id: Optional[str] = None, # pylint: disable=redefined-builtin
529529
state: Optional[Union[str, "TranscriptionSubscriptionState"]] = None,
530-
subscribed_result_types: Optional[List[Union[str, "TranscriptionResultType"]]] = None
530+
subscribed_result_states: Optional[List[Union[str, "TranscriptionResultState"]]] = None
531531
) -> None:
532532
"""
533533
:keyword id: Subscription Id.
@@ -536,20 +536,20 @@ def __init__(
536536
"active".
537537
:paramtype state: str or
538538
~azure.communication.callautomation.models.TranscriptionSubscriptionState
539-
:keyword subscribed_result_types: Subscribed transcription result types.
540-
:paramtype subscribed_result_types: list[str or
541-
~azure.communication.callautomation.models.TranscriptionResultType]
539+
:keyword subscribed_result_states: Subscribed transcription result types.
540+
:paramtype subscribed_result_states: list[str or
541+
~azure.communication.callautomation.models.TranscriptionResultState]
542542
"""
543543

544544
self.id = id
545545
self.state = state
546-
self.subscribed_result_types = subscribed_result_types
546+
self.subscribed_result_states = subscribed_result_states
547547

548548
def _to_generated(self):
549549
return TranscriptionSubscriptionInternal(
550550
id=self.id,
551551
state=self.state ,
552-
subscribed_result_types=self.subscribed_result_types
552+
subscribed_result_types=self.subscribed_result_states
553553
)
554554

555555
class CallConnectionProperties: # pylint: disable=too-many-instance-attributes
@@ -943,7 +943,7 @@ def _from_generated(cls, cancel_add_participant_operation_result_generated: 'Can
943943
operation_context=cancel_add_participant_operation_result_generated.operation_context
944944
)
945945

946-
class ResultStatus(Enum):
946+
class ResultState(Enum):
947947
"""
948948
The status of the result of transcription.
949949
"""
@@ -995,15 +995,21 @@ class TranscriptionMetadata:
995995
""" Transcription Subscription Id. """
996996
locale: str
997997
""" The target locale in which the translated text needs to be. """
998-
callConnection_id: str
998+
call_connection_id: str
999999
""" call connection Id. """
10001000
correlation_id: str
10011001
""" correlation Id. """
10021002

1003-
def __init__(self, subscription_id: str, locale: str, callConnection_id: str, correlation_id: str):
1004-
self.subscriptionId = subscription_id
1003+
def __init__(
1004+
self,
1005+
*,
1006+
subscription_id: str,
1007+
locale: str,
1008+
call_connection_id: str,
1009+
correlation_id: str):
1010+
self.subscription_id = subscription_id
10051011
self.locale = locale
1006-
self.callConnection_id = callConnection_id
1012+
self.call_connection_id = call_connection_id
10071013
self.correlation_id = correlation_id
10081014

10091015
class TranscriptionData:
@@ -1023,8 +1029,9 @@ class TranscriptionData:
10231029
:paramtype words: List[WordData]
10241030
:keyword participant: The identified speaker based on participant raw ID.
10251031
:paramtype participant: CommunicationIdentifier
1026-
:keyword resultStatus: Status of the result of transcription.
1027-
:paramtype resultStatus: ResultStatus
1032+
:keyword result_state: Status of the result of transcription.
1033+
:paramtype result_state: str or
1034+
~azure.communication.callautomation.models.TranscriptionResultState
10281035
"""
10291036
text: str
10301037
""" The display form of the recognized word. """
@@ -1040,16 +1047,25 @@ class TranscriptionData:
10401047
""" The result for each word of the phrase. """
10411048
participant: CommunicationIdentifier
10421049
""" The identified speaker based on participant raw ID. """
1043-
result_status: ResultStatus
1044-
""" Status of the result of transcription. """
1050+
result_state: 'TranscriptionResultState'
1051+
""" State of the result of transcription. """
10451052

1046-
def __init__(self, text: str, format: TextFormat, confidence: float, offset: int, duration: int,
1047-
words: List[WordData], participant: CommunicationIdentifier, result_status: ResultStatus):
1053+
def __init__(
1054+
self,
1055+
*,
1056+
text: str,
1057+
format: TextFormat,
1058+
confidence: float,
1059+
offset: int,
1060+
duration: int,
1061+
words: List[WordData],
1062+
participant: CommunicationIdentifier,
1063+
result_state: 'TranscriptionResultState'):
10481064
self.text = text
10491065
self.format = format
10501066
self.confidence = confidence
10511067
self.offset = offset
10521068
self.duration = duration
10531069
self.words = words
10541070
self.participant = participant
1055-
self.result_status = result_status
1071+
self.result_state = result_state

sdk/communication/azure-communication-callautomation/azure/communication/callautomation/_streaming_data_parser.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ def parse(packet_data: Union[str, bytes]) -> Union[TranscriptionMetadata, Transc
3131
kind = json_object['kind']
3232

3333
if kind == 'TranscriptionMetadata':
34-
transcription_metadata = TranscriptionMetadata(**json_object['transcriptionMetadata'])
34+
transcription_metadata = TranscriptionMetadata(
35+
subscription_id=json_object['transcriptionMetadata']['subscriptionId'],
36+
locale=json_object['transcriptionMetadata']['locale'],
37+
call_connection_id=json_object['transcriptionMetadata']['callConnectionId'],
38+
correlation_id=json_object['transcriptionMetadata']['correlationId'])
3539
return transcription_metadata
3640
if kind == 'TranscriptionData':
3741
participant = identifier_from_raw_id(json_object['transcriptionData']['participantRawID'])
@@ -45,7 +49,7 @@ def parse(packet_data: Union[str, bytes]) -> Union[TranscriptionMetadata, Transc
4549
duration=json_object['transcriptionData']['duration'],
4650
words=words,
4751
participant=participant,
48-
result_status=json_object['transcriptionData']['resultStatus']
52+
result_state=json_object['transcriptionData']['resultStatus']
4953
)
5054
return transcription_data
5155
raise ValueError(string_json)

sdk/communication/azure-communication-callautomation/swagger/SWAGGER.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ directive:
4343
where: $.definitions.RecordingContentType.x-ms-enum
4444
transform: >
4545
$["name"] = "RecordingContent";
46+
- from: swagger-document
47+
where: $.definitions.TranscriptionResultType.x-ms-enum
48+
transform: >
49+
$["name"] = "TranscriptionResultState";
4650
- from: swagger-document
4751
where: $.definitions.RecordingChannelType.x-ms-enum
4852
transform: >

sdk/communication/azure-communication-callautomation/tests/test_streaming_data_parser.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import json
88
import unittest
9-
from azure.communication.callautomation._models import (TranscriptionMetadata,TranscriptionData,WordData,TextFormat,ResultStatus)
9+
from azure.communication.callautomation._models import (TranscriptionMetadata,TranscriptionData,WordData,TextFormat,ResultState)
1010
from azure.communication.callautomation._streaming_data_parser import StreamingDataParser
1111

1212
class TestStreamDataParser(unittest.TestCase):
@@ -40,12 +40,12 @@ def validate_transcription_metadata(self, transcriptionMetadata):
4040
self.assertEqual(transcriptionMetadata.subscription_id, "0000a000-9999-5555-ae00-cd00e0bc0000")
4141
self.assertEqual(transcriptionMetadata.locale, "en-US")
4242
self.assertEqual(transcriptionMetadata.correlation_id, "6d09449c-6677-4f91-8cb7-012c338e6ec1")
43-
self.assertEqual(transcriptionMetadata.callConnection_id, "6d09449c-6677-4f91-8cb7-012c338e6ec1")
43+
self.assertEqual(transcriptionMetadata.call_connection_id, "6d09449c-6677-4f91-8cb7-012c338e6ec1")
4444

4545
def validate_transcription_data(self, transcriptionData):
4646
self.assertEqual(transcriptionData.text, "Is everything fine.")
4747
self.assertEqual(transcriptionData.format, "display")
48-
self.assertEqual(transcriptionData.result_status, "Final")
48+
self.assertEqual(transcriptionData.result_state, "Final")
4949
self.assertAlmostEqual(transcriptionData.confidence, 0.8138430714607239)
5050
self.assertEqual(transcriptionData.offset, 868464674)
5151
self.assertEqual(transcriptionData.duration, 11600000)

0 commit comments

Comments
 (0)