Merge pull request #130 from plivo/VT-1863-mpc-changes

Vt 1863 mpc changes

Author: huzaif-plivo

.gitignore

@@ -8,4 +8,4 @@ dist/
 *.pyo
 ./tests/htmlcov/
 .tox/
-venv/
+venv*/

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [4.16.0](https://github.com/plivo/plivo-python/tree/v4.16.0) (2021-04-19)
+- Added SDK support for Multiparty Call APIs and XML.
+
 ## [4.15.3](https://github.com/plivo/plivo-python/tree/v4.15.2) (2021-03-10)
 - Add "npanxx" and "local_calling_area" support for Search Phone Number.
 

plivo/base.py

@@ -172,14 +172,13 @@ def delete(self):
         return PlivoGenericResponse(
             self.client.send_request(self.__resource_uri, method='DELETE'))
 
-    def get(self, params=None):
+    def get(self):
         if not self.id:
             raise InvalidRequestError(
                 'Cannot get a {resource_type} resource without an '
                 'identifier'.format(resource_type=self._name))
 
-        self.__resource_json = self.client.send_request(
-            self.__resource_uri, data=params)
+        self.__resource_json = self.client.send_request(self.__resource_uri)
         self.__parse_json()
         return self
 
@@ -200,6 +199,27 @@ def create(self, params):
                 self.__resource_uri, data=params, method='POST'), id_string)
 
 
+class SecondaryPlivoResource(PlivoResource):
+    """
+        SecondaryPlivoResource resource object
+        This provides an interface to deal with resources where identifier is has a mid level parent
+    """
+    _secondary_identifier_string = None
+
+    @property
+    def secondary_id(self):
+        value = self.__dict__.get(self._secondary_identifier_string, None)
+        if not value:
+            raise ValueError('{} must be set'.format(self._secondary_identifier_string))
+        return value
+
+    def __init__(self, client, data):
+        """Sets up the PlivoResource"""
+        super(SecondaryPlivoResource, self).__init__(client, data)
+        self._name = self._name or self.__class__.__name__
+        self.client = client
+
+
 class PlivoResourceInterface(object):
     _iterable = True
 

plivo/resources/__init__.py

@@ -15,3 +15,4 @@
 from .call_feedback import CallFeedback
 from .powerpacks import Powerpacks
 from .lookup import Lookup
+from .multipartycall import MultiPartyCalls, MultiPartyCall, MultiPartyCallParticipant

plivo/resources/multipartycall.py

@@ -14,7 +14,7 @@
 from plivo.resources import (Accounts, Addresses, Applications, Calls,
                              Conferences, Endpoints, Identities,
                              Messages, Powerpacks, Media, Lookup,
-                             Numbers, Pricings, Recordings, Subaccounts, CallFeedback)
+                             Numbers, Pricings, Recordings, Subaccounts, CallFeedback, MultiPartyCalls)
 from plivo.resources.live_calls import LiveCalls
 from plivo.resources.queued_calls import QueuedCalls
 from plivo.resources.regulatory_compliance import EndUsers, ComplianceDocumentTypes, ComplianceDocuments, \
@@ -109,6 +109,7 @@ def __init__(self, auth_id=None, auth_token=None, proxies=None, timeout=5):
         self.compliance_documents = ComplianceDocuments(self)
         self.compliance_requirements = ComplianceRequirements(self)
         self.compliance_applications = ComplianceApplications(self)
+        self.multi_party_calls = MultiPartyCalls(self)
         self.voice_retry_count = 0
 
     def __enter__(self):
@@ -194,7 +195,7 @@ def process_response(self,
                 raise PlivoRestError('Resource at {url} could not be '
                                      'deleted'.format(url=response.url))
 
-        elif response.status_code not in [200, 201, 202, 207]:
+        elif response.status_code not in [200, 201, 202, 204, 207]:
             raise PlivoRestError(
                 'Received status code {status_code} for the HTTP method '
                 '"{method}"'.format(

plivo/rest/client.py

@@ -13,7 +13,6 @@
     from base64 import encodebytes as encode
 
 
-
 def string_format(value):
     if isinstance(value, bytes):
         return ''.join(chr(x) for x in bytearray(value))

plivo/utils/signature_v3.py

@@ -62,16 +62,38 @@ def f(name, value):
     return f
 
 
-def is_in(iterable, message=None, case_sensitive=True):
+def is_in(iterable, message=None, case_sensitive=True, case_type='upper'):
     def f(name, value):
         actual_value = value
         if not case_sensitive:
-            value = str(value).upper()
+            if case_type == 'upper':
+                value = str(value).upper()
+            elif case_type == 'lower':
+                value = str(value).lower()
+            elif case_type == 'title':
+                value = str(value).title()
+
         msg = message or '{} should be in {}'.format(name, iterable)
         if value in iterable:
             return value, []
         else:
             return None, ['{} (actual value: {})'.format(msg, actual_value)]
+    return f
+
+
+def multi_is_in(iterable, message=None, case_sensitive=True, make_lower_case=False, separator=','):
+    def f(name, value):
+        actual_value = value
+        if not case_sensitive:
+            if make_lower_case:
+                value = str(value).lower()
+            else:
+                value = str(value).upper()
+        msg = message or '{} should be among {}. multiple values should be COMMA(,) separated'.format(name, iterable)
+        for val in value.split(separator):
+            if val not in iterable:
+                return None, ['{} (actual value: {})'.format(msg, actual_value)]
+        return value, []
 
     return f
 
@@ -193,3 +215,5 @@ def wrapper(self, *args, **kwargs):
     regex(
         r'(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+|None)'
     ))
+is_proper_date_format = functools.partial(all_of, of_type_exact(str),
+                                          regex(r'^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2}(\.\d{1,6})?)?$'))

plivo/utils/validators.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '4.15.3'
+__version__ = '4.16.0'