Merge pull request #18 from DolbyIO/fix

Add the region as option when creating a conference

Author: FabienLavocat

client/src/dolbyio_rest_apis/communications/conference.py

@@ -25,6 +25,7 @@ async def create_conference(
         audio_only: bool=False,
         participants: List[Participant]=None,
         recording_formats: List[str]=None,
+        region: str=None,
     ) -> Conference:
     r"""
     Creates a conference.
@@ -47,6 +48,12 @@ async def create_conference(
         participants: List of the :class:`Participant` object to update the permissions.
         recording_formats: If specified, the default RecordingConfiguration is overridden.
             Specifies the recording format. Valid values are 'mp3' and 'mp4'.
+        region: Dolby.io region where you want the conference to be hosted. Can be one of:
+            - au: Australia
+            - ca: Canada
+            - eu: Europe
+            - in: India
+            - us: United States
 
     Returns:
         A :class:`Conference` object.
@@ -96,7 +103,7 @@ async def create_conference(
     async with CommunicationsHttpContext() as http_context:
         json_response = await http_context.requests_post(
             access_token=access_token,
-            url=f'{get_comms_url_v2()}/conferences/create',
+            url=f'{get_comms_url_v2(region)}/conferences/create',
             payload=payload
         )
 

client/src/dolbyio_rest_apis/communications/internal/urls.py

@@ -5,18 +5,20 @@
 This module contains the URLs to use to call the REST APIs.
 """
 
-API_URL = 'https://api.dolby.io'
-COMMS_URL = 'https://comms.api.dolby.io'
-SESSION_URL = 'https://session.voxeet.com/v1'
+API_URL = 'api.dolby.io'
+COMMS_URL = 'comms.api.dolby.io'
+SESSION_URL = 'session.voxeet.com/v1'
 
 def get_api_url() -> str:
-    return f'{API_URL}/v1'
+    return f'https://{API_URL}/v1'
 
 def get_monitor_url() -> str:
-    return f'{COMMS_URL}/v1/monitor'
+    return f'https://{COMMS_URL}/v1/monitor'
 
-def get_comms_url_v2() -> str:
-    return f'{COMMS_URL}/v2'
+def get_comms_url_v2(region: str = None) -> str:
+    if region is None:
+        return f'https://{COMMS_URL}/v2'
+    return f'https://{region}.{COMMS_URL}/v2'
 
 def get_session_url() -> str:
-    return SESSION_URL
+    return f'https://{SESSION_URL}'

client/src/dolbyio_rest_apis/streaming/models/subscribe_token.py

@@ -28,7 +28,6 @@ def __init__(self, dictionary: dict):
         self.token = get_value_or_default(self, 'token', None)
         self.added_on = get_value_or_default(self, 'addedOn', None)
         self.expires_on = get_value_or_default(self, 'expiresOn', None)
-        self.expires_on = get_value_or_default(self, 'expiresOn', None)
         self.is_active = get_value_or_default(self, 'isActive', None)
         self.streams = []
         for stream in self['streams']: