support for advanced query capabilities

vgrem · vgrem · commit e6a1329ba9b3 · 2025-06-13T20:47:46.000+03:00
diff --git a/examples/directory/roles/for_user.py b/examples/directory/roles/for_user.py
@@ -10,13 +10,20 @@
 client = GraphClient(tenant=test_tenant).with_username_and_password(
     test_client_id, test_username, test_password
 )
-result = client.me.member_of.get().execute_query()
-role_template_ids = [
-    o.properties.get("roleTemplateId", None)
-    for o in result
-    if o.properties.get("roleTemplateId", None)
-]
-result = client.directory_roles.get().execute_query()
-for role in result:
-    if role.properties.get("roleTemplateId", None) in role_template_ids:
-        print(role)
+
+directory_roles = client.directory_roles.get().execute_query()
+role_template_map = {
+    role.properties.get("roleTemplateId"): role for role in directory_roles
+}
+
+memberships = client.me.member_of.get().execute_query()
+user_roles = []
+for item in memberships:
+    role_id = item.properties.get("roleTemplateId")
+    if role_id and role_id in role_template_map:
+        user_roles.append(role_template_map[role_id])
+
+
+# Print roles the user is assigned to
+for role in user_roles:
+    print(f"User has role: {role.display_name}")
diff --git a/generator/import_metadata.py b/generator/import_metadata.py
@@ -26,13 +26,13 @@ def export_to_file(path, content):
     "--endpoint",
     dest="endpoint",
     help="Import metadata endpoint",
-    default="sharepoint",
+    default="graph",
 )
 parser.add_argument(
     "-p",
     "--path",
     dest="path",
-    default="./metadata/SharePoint.xml",
+    default="./metadata/Graph.xml",
     help="Import metadata endpoint",
 )
 
diff --git a/office365/communications/calls/transcript.py b/office365/communications/calls/transcript.py
@@ -0,0 +1,5 @@
+from office365.entity import Entity
+
+
+class CallTranscript(Entity):
+    """Represents a transcript associated with an online meeting."""
diff --git a/office365/communications/onlinemeetings/base.py b/office365/communications/onlinemeetings/base.py
@@ -0,0 +1,5 @@
+from office365.entity import Entity
+
+
+class OnlineMeetingBase(Entity):
+    """Represents a base online meeting. The base type of onlineMeeting and virtualEventSession."""
diff --git a/office365/communications/onlinemeetings/online_meeting.py b/office365/communications/onlinemeetings/online_meeting.py
@@ -1,9 +1,9 @@
 from datetime import datetime
 from typing import AnyStr, Optional
 
+from office365.communications.onlinemeetings.base import OnlineMeetingBase
 from office365.communications.onlinemeetings.participants import MeetingParticipants
 from office365.communications.onlinemeetings.recordings.call import CallRecording
-from office365.entity import Entity
 from office365.entity_collection import EntityCollection
 from office365.outlook.mail.item_body import ItemBody
 from office365.runtime.client_result import ClientResult
@@ -12,7 +12,7 @@
 from office365.runtime.types.collections import StringCollection
 
 
-class OnlineMeeting(Entity):
+class OnlineMeeting(OnlineMeetingBase):
     """
     Contains information about a meeting, including the URL used to join a meeting,
     the attendees list, and the description.
diff --git a/office365/communications/virtualevents/presenter.py b/office365/communications/virtualevents/presenter.py
@@ -0,0 +1,5 @@
+from office365.entity import Entity
+
+
+class VirtualEventPresenter(Entity):
+    """Represents information about a presenter of a virtual event."""
diff --git a/office365/communications/virtualevents/session.py b/office365/communications/virtualevents/session.py
@@ -0,0 +1,5 @@
+from office365.communications.onlinemeetings.base import OnlineMeetingBase
+
+
+class VirtualEventSession(OnlineMeetingBase):
+    """Represents a session in a virtualEvent."""
diff --git a/office365/communications/virtualevents/virtual_event.py b/office365/communications/virtualevents/virtual_event.py
@@ -1,6 +1,43 @@
+from typing import Optional
+
+from office365.communications.virtualevents.presenter import VirtualEventPresenter
+from office365.communications.virtualevents.session import VirtualEventSession
 from office365.entity import Entity
+from office365.entity_collection import EntityCollection
+from office365.outlook.mail.item_body import ItemBody
+from office365.runtime.paths.resource_path import ResourcePath
 
 
 class VirtualEvent(Entity):
     """Represents an abstract base type for a virtual event.
     Base type of virtualEventTownhall and virtualEventWebinar."""
+
+    @property
+    def description(self):
+        # type: () -> Optional[str]
+        """A description of the virtual event."""
+        return self.properties.get("Description", ItemBody())
+
+    @property
+    def presenters(self):
+        """The virtual event presenters."""
+        return self.properties.get(
+            "presenters",
+            EntityCollection(
+                self.context,
+                VirtualEventPresenter,
+                ResourcePath("presenters", self.resource_path),
+            ),
+        )
+
+    @property
+    def sessions(self):
+        """The virtual event presenters."""
+        return self.properties.get(
+            "sessions",
+            EntityCollection(
+                self.context,
+                VirtualEventSession,
+                ResourcePath("sessions", self.resource_path),
+            ),
+        )
diff --git a/office365/copilot/root.py b/office365/copilot/root.py
@@ -1,6 +1,7 @@
 from office365.copilot.admin import CopilotAdmin
 from office365.runtime.paths.resource_path import ResourcePath
 from office365.sharepoint.entity import Entity
+from office365.teams.aiinteractions.history import AIInteractionHistory
 
 
 class CopilotRoot(Entity):
@@ -13,3 +14,13 @@ def admin(self):
             "admin",
             CopilotAdmin(self.context, ResourcePath("admin", self.resource_path)),
         )
+
+    @property
+    def interaction_history(self):
+        """The history of interactions between AI agents and users."""
+        return self.properties.get(
+            "interactionHistory",
+            AIInteractionHistory(
+                self.context, ResourcePath("interactionHistory", self.resource_path)
+            ),
+        )
diff --git a/office365/count_collection.py b/office365/count_collection.py
@@ -0,0 +1,23 @@
+from office365.delta_collection import DeltaCollection
+from office365.runtime.client_object import T
+from office365.runtime.client_result import ClientResult
+from office365.runtime.http.request_options import RequestOptions
+from office365.runtime.queries.function import FunctionQuery
+
+
+class CountCollection(DeltaCollection[T]):
+    """Collection with support for OData $count operation"""
+
+    def count(self):
+        # type: () -> ClientResult[int]
+        """Executes a $count query to get the number of items in the collection"""
+        return_type = ClientResult(self.context, int())
+
+        def _construct_request(request):
+            # type: (RequestOptions) -> None
+            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)
+        return return_type
diff --git a/office365/directory/administrative_unit.py b/office365/directory/administrative_unit.py
@@ -14,6 +14,9 @@ class AdministrativeUnit(DirectoryObject):
     departmental administrator. This resource is an open type that allows other properties to be passed in.
     """
 
+    def __str__(self):
+        return self.display_name or self.entity_type_name
+
     @property
     def display_name(self):
         # type: () -> Optional[str]
diff --git a/office365/directory/authentication/methods/fido.py b/office365/directory/authentication/methods/fido.py
@@ -1,11 +1,33 @@
+from datetime import datetime
 from typing import Optional
 
 from office365.directory.authentication.methods.method import AuthenticationMethod
+from office365.runtime.types.collections import StringCollection
 
 
 class Fido2AuthenticationMethod(AuthenticationMethod):
     """Representation of a FIDO2 security key registered to a user. FIDO2 is a sign-in authentication method."""
 
+    def __str__(self):
+        return self.display_name or self.entity_type_name
+
+    @property
+    def attestation_certificates(self):
+        # type: () -> StringCollection
+        """The attestation certificate(s) attached to this security key."""
+        return self.properties.get("attestationCertificates", StringCollection())
+
+    @property
+    def created_datetime(self):
+        """The timestamp when this key was registered to the user."""
+        return self.properties.get("createdDateTime", datetime.min)
+
+    @property
+    def display_name(self):
+        # type: () -> Optional[str]
+        """The display name of the key as given by the user."""
+        return self.properties.get("displayName", None)
+
     @property
     def model(self):
         # type: () -> Optional[str]
diff --git a/office365/directory/groups/collection.py b/office365/directory/groups/collection.py
@@ -1,10 +1,10 @@
-from office365.delta_collection import DeltaCollection
+from office365.count_collection import CountCollection
 from office365.directory.groups.group import Group
 from office365.directory.groups.profile import GroupProfile
 from office365.runtime.queries.create_entity import CreateEntityQuery
 
 
-class GroupCollection(DeltaCollection[Group]):
+class GroupCollection(CountCollection[Group]):
     """Group's collection"""
 
     def __init__(self, context, resource_path=None):
diff --git a/office365/directory/identitygovernance/workflow/custom_callout_extension.py b/office365/directory/identitygovernance/workflow/custom_callout_extension.py
@@ -6,6 +6,9 @@
 class CustomCalloutExtension(Entity):
     """An abstract type that defines the configuration for apps that can extend the customer's identity flows."""
 
+    def __str__(self):
+        return self.display_name or self.entity_type_name
+
     @property
     def display_name(self):
         # type: () -> Optional[str]
diff --git a/office365/directory/object_collection.py b/office365/directory/object_collection.py
@@ -1,14 +1,14 @@
 from typing_extensions import Self
 
-from office365.delta_collection import DeltaCollection
+from office365.count_collection import CountCollection
 from office365.directory.object import DirectoryObject
 from office365.entity_collection import EntityCollection
 from office365.runtime.http.http_method import HttpMethod
 from office365.runtime.http.request_options import RequestOptions
 from office365.runtime.queries.service_operation import ServiceOperationQuery
 
 
-class DirectoryObjectCollection(DeltaCollection[DirectoryObject]):
+class DirectoryObjectCollection(CountCollection[DirectoryObject]):
     """DirectoryObject's collection"""
 
     def __init__(self, context, resource_path=None):
diff --git a/office365/directory/security/alerts/alert.py b/office365/directory/security/alerts/alert.py
@@ -11,6 +11,12 @@ class Alert(Entity):
     representing potential security issues within a customer's tenant that Microsoft 365 Defender,
     or a security provider integrated with Microsoft 365 Defender, has identified."""
 
+    @property
+    def activity_group_name(self):
+        # type: () -> Optional[str]
+        """"""
+        return self.properties.get("activityGroupName", None)
+
     @property
     def actor_display_name(self):
         # type: () -> Optional[str]
diff --git a/office365/directory/users/collection.py b/office365/directory/users/collection.py
@@ -1,10 +1,10 @@
-from office365.delta_collection import DeltaCollection
+from office365.count_collection import CountCollection
 from office365.directory.users.user import User
 from office365.runtime.paths.resource_path import ResourcePath
 from office365.runtime.queries.create_entity import CreateEntityQuery
 
 
-class UserCollection(DeltaCollection[User]):
+class UserCollection(CountCollection[User]):
     """User's collection"""
 
     def __init__(self, context, resource_path=None):
diff --git a/office365/onedrive/recyclebin/item.py b/office365/onedrive/recyclebin/item.py
@@ -1,6 +1,36 @@
+from datetime import datetime
+from typing import Optional
+
 from office365.onedrive.base_item import BaseItem
 
 
 class RecycleBinItem(BaseItem):
     """Represents information about a deleted item in a recycleBin of a SharePoint site or a SharePoint
     Embedded fileStorageContainer."""
+
+    @property
+    def deleted_datetime(self):
+        # type: () -> Optional[datetime]
+        """Date and time when the item was deleted. The timestamp type represents date and time information using
+        ISO 8601 format and is always in UTC."""
+        return self.properties.get("deletedDateTime", datetime.min)
+
+    @property
+    def deleted_from_location(self):
+        # type: () -> Optional[str]
+        """Relative URL of the list or folder that originally contained the item."""
+        return self.properties.get("deletedFromLocation", None)
+
+    @property
+    def size(self):
+        # type: () -> Optional[int]
+        """Size of the item in bytes."""
+        return self.properties.get("size", None)
+
+    def get_property(self, name, default_value=None):
+        if default_value is None:
+            property_mapping = {
+                "deletedDateTime": self.deleted_datetime,
+            }
+            default_value = property_mapping.get(name, None)
+        return super(BaseItem, self).get_property(name, default_value)
diff --git a/office365/onedrive/sitepages/webparts/standard.py b/office365/onedrive/sitepages/webparts/standard.py
@@ -7,8 +7,21 @@
 class StandardWebPart(WebPart):
     """Represents a standard web part instance on a SharePoint page."""
 
+    @property
+    def container_text_web_part_id(self):
+        # type: () -> Optional[str]
+        """The instance identifier of the container text webPart. It only works for inline standard webPart in
+        rich text webParts."""
+        return self.properties.get("containerTextWebPartId", None)
+
     @property
     def data(self):
         # type: () -> Optional[WebPartData]
         """Data of the webPart."""
         return self.properties.get("data", WebPartData())
+
+    @property
+    def web_part_type(self):
+        # type: () -> Optional[str]
+        """A Guid that indicates the webPart type."""
+        return self.properties.get("webPartType", None)
diff --git a/office365/runtime/client_result.py b/office365/runtime/client_result.py
@@ -1,5 +1,5 @@
 import copy
-from typing import TYPE_CHECKING, Callable, Generic, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, Generic, Optional, TypeVar, Union
 
 from typing_extensions import Self
 
@@ -10,7 +10,7 @@
     from office365.runtime.client_runtime_context import ClientRuntimeContext  # noqa
     from office365.runtime.client_value import ClientValue  # noqa
 
-T = TypeVar("T")
+T = TypeVar("T", bound=Union[int, bool, str, bytes, float, "ClientValue"])
 
 
 class ClientResult(Generic[T]):
@@ -35,17 +35,27 @@ def after_execute(self, action, execute_first=False, include_response=False):
         return self
 
     def set_property(self, key, value, persist_changes=False):
-        # type: (str, T, bool) -> Self
+        # type: (str, Any, bool) -> Self
         from office365.runtime.client_value import ClientValue  # noqa
 
         if isinstance(self._value, ClientValue):
             self._value.set_property(key, value, persist_changes)
         elif isinstance(self._value, dict):
             self._value[key] = value
         else:
-            self._value = value
+            self._value = self._try_cast(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"""
diff --git a/tests/directory/test_directory.py b/tests/directory/test_directory.py
diff --git a/tests/directory/test_group.py b/tests/directory/test_group.py
diff --git a/tests/directory/test_user.py b/tests/directory/test_user.py
diff --git a/tests/search/test_search.py b/tests/search/test_search.py
diff --git a/tests/sharepoint/test_search.py b/tests/sharepoint/test_search.py
