support for advanced query capabilities & update unit tests

Author: vgrem

examples/onedrive/bundles/create.py

@@ -1,5 +1,8 @@
+from configparser import ConfigParser
+
 from generator import load_settings
 from generator.builders.type_builder import TypeBuilder
+from office365.runtime.odata.model import ODataModel
 from office365.runtime.odata.v3.metadata_reader import ODataV3Reader
 from office365.runtime.odata.v4.metadata_reader import ODataV4Reader
 

generator/generate_model.py

@@ -1,3 +1,5 @@
+from requests import Response
+
 from office365.delta_collection import DeltaCollection
 from office365.runtime.client_object import T
 from office365.runtime.client_result import ClientResult
@@ -18,6 +20,14 @@ def _construct_request(request):
             request.headers.pop("Accept", None)
             request.ensure_header("ConsistencyLevel", "eventual")
 
-        qry = FunctionQuery(self, "$count", None, return_type)
-        self.context.add_query(qry).before_execute(_construct_request)
+        def _process_response(response):
+            # type: (Response) -> None
+            response.raise_for_status()
+            value = int(response.content.decode("utf-8"))
+            return_type.set_property("__value", value)
+
+        qry = FunctionQuery(self, "$count")
+        self.context.add_query(qry).before_execute(_construct_request).after_execute(
+            _process_response
+        )
         return return_type

office365/count_collection.py

@@ -1,9 +1,9 @@
-from office365.delta_collection import DeltaCollection
+from office365.count_collection import CountCollection
 from office365.directory.applications.application import Application
 from office365.runtime.paths.appid import AppIdPath
 
 
-class ApplicationCollection(DeltaCollection[Application]):
+class ApplicationCollection(CountCollection[Application]):
     """DirectoryObject's collection"""
 
     def __init__(self, context, resource_path=None):

office365/directory/applications/collection.py

@@ -1,10 +1,10 @@
-from office365.delta_collection import DeltaCollection
+from office365.count_collection import CountCollection
 from office365.directory.applications.application import Application
 from office365.directory.serviceprincipals.service_principal import ServicePrincipal
 from office365.runtime.paths.appid import AppIdPath
 
 
-class ServicePrincipalCollection(DeltaCollection[ServicePrincipal]):
+class ServicePrincipalCollection(CountCollection[ServicePrincipal]):
     """Service Principal's collection"""
 
     def __init__(self, context, resource_path=None):

office365/directory/serviceprincipals/collection.py

@@ -43,19 +43,9 @@ def set_property(self, key, value, persist_changes=False):
         elif isinstance(self._value, dict):
             self._value[key] = value
         else:
-            self._value = self._try_cast(value)
+            self._value = value
         return self
 
-    def _try_cast(self, value):
-        # type: (Any) -> Optional[T]
-
-        if isinstance(self._value, (int, float)) and isinstance(value, bytes):
-            try:
-                return type(self._value)(value.decode("utf-8"))
-            except (UnicodeDecodeError, ValueError):
-                return None
-        return value
-
     @property
     def value(self):
         """Returns the value"""

office365/runtime/client_result.py

@@ -199,8 +199,10 @@ def _process_response(response):
             return_type.set_property("__value", response.content)
 
         qry = ClientQuery(self)
-        self.add_query(qry).before_execute(_construct_request).after_execute(
-            _process_response
+        (
+            self.add_query(qry)
+            .before_execute(_construct_request)
+            .after_execute(_process_response)
         )
         return return_type
 

office365/runtime/client_runtime_context.py

@@ -21,16 +21,20 @@ def test2_create_app(self):
         self.assertIsNotNone(new_app.resource_path)
         self.__class__.target_app = new_app
 
-    def test3_add_password(self):
+    def test3_get_apps_count(self):
+        result = self.client.applications.count().execute_query()
+        self.assertIsNotNone(result.value)
+
+    def test4_add_password(self):
         result = self.__class__.target_app.add_password("New password").execute_query()
         self.assertIsNotNone(result.value.secretText)
         self.__class__.target_password = result.value
 
-    def test4_remove_password(self):
+    def test5_remove_password(self):
         self.__class__.target_app.remove_password(
             self.__class__.target_password.keyId
         ).execute_query()
 
-    def test5_delete_app(self):
+    def test6_delete_app(self):
         app_to_del = self.__class__.target_app
         app_to_del.delete_object(True).execute_query()

tests/directory/test_application.py

@@ -2,6 +2,7 @@
 
 from office365.graph_client import GraphClient
 from tests import test_client_id, test_client_secret, test_tenant
+from tests.decorators import requires_app_permission
 
 
 class TestIdentity(TestCase):
@@ -11,6 +12,9 @@ def setUpClass(cls):
             test_client_id, test_client_secret
         )
 
+    @requires_app_permission(
+        "IdentityProvider.Read.All", "IdentityProvider.ReadWrite.All"
+    )
     def test1_list_identity_providers(self):
         result = self.client.identity.identity_providers.get().execute_query()
         self.assertIsNotNone(result.resource_path)

tests/directory/test_identity.py

@@ -2,6 +2,7 @@
 
 from office365.graph_client import GraphClient
 from tests import test_client_id, test_client_secret, test_tenant
+from tests.decorators import requires_app_permission
 
 
 class TestInvitations(TestCase):
@@ -11,6 +12,9 @@ def setUpClass(cls):
             test_client_id, test_client_secret
         )
 
+    @requires_app_permission(
+        "User.Invite.All", "Directory.ReadWrite.All", "User.ReadWrite.All"
+    )
     def test1_create_invitation(self):
         invitation = self.client.invitations.create(
             "[email protected]", "https://myapp.contoso.com"