bumb version to release

Added deprecation warning on the old Query
Added `has_filters`, `has_selects`, `has_expands`, `has_search`, `has_order_by` and `clear_filters` to ExperimentalQuery
Fixed Folder and Drive `get_child_folders` to work with new ExperimentalQuery

Author: alejcas

CHANGES.md

@@ -2,11 +2,21 @@
 
 Almost every release features a lot of bugfixes but those are not listed here.
 
+## Version 2.1.3 (2025-06-03)
+- Calendar: Added the recurrence type (Thanks @RogerSelwyn)
+- Calendar: Added the transaction id (Thanks @RogerSelwyn)
+- Calendar: Breaking change! Calendar and Schedule get_events method now requires params start_recurring and end_recurring when include_recurring is True.
+- Calendar: list_calendars method can now use query objects with select, expand and order by.
+- Groups: Added pagination to get_user_groups (Thanks @RogerSelwyn)
+- Tasks: Added support for check list items (Thanks @RogerSelwyn)
+- Removed Office365 protocol
+
+
 ## Version 2.1.2 (2025-04-08)
 - Calendar: list_calendars now allows pagination (Thanks @RogerSelwyn)
 - Query: added new experimental Query object that will replace the current Query object in the future. Available in utils.query.
 - Message: non-draft messages can be saved. This allows to edit non-draft messages.
-- Connection: proxies, verify_ssl and timeout are now honored in the msal http client
+- Connection: proxies, verify_ssl and timeout are now honored in the msal http client.
 - Message: new method `get_eml_as_object` to retrieve attached eml as Message objects.
 
 ## Version 2.1.1 (2025-03-20)

O365/__version__.py

@@ -1 +1 @@
-__version__ = '2.1.2'
+__version__ = '2.1.3'

O365/drive.py

@@ -14,6 +14,8 @@
     ApiComponent,
     OneDriveWellKnowFolderNames,
     Pagination,
+    ExperimentalQuery,
+    CompositeFilter
 )
 
 log = logging.getLogger(__name__)
@@ -1185,9 +1187,14 @@ def get_child_folders(self, limit=None, *, query=None, order_by=None, batch=None
 
         if query:
             if not isinstance(query, str):
-                query = query.on_attribute('folder').unequal(None)
+                if isinstance(query, CompositeFilter):
+                    q = ExperimentalQuery(protocol=self.protocol)
+                    query = query & q.unequal('folder', None)
+                else:
+                    query = query.on_attribute('folder').unequal(None)
         else:
-            query = self.q('folder').unequal(None)
+            q = ExperimentalQuery(protocol=self.protocol)
+            query = q.unequal('folder', None)
 
         return self.get_items(limit=limit, query=query, order_by=order_by, batch=batch)
 
@@ -1584,11 +1591,6 @@ def _base_get_list(self, url, limit=None, *, query=None, order_by=None,
             params['$orderby'] = order_by
 
         if query:
-            # if query.has_filters:
-            #     warnings.warn(
-            #         'Filters are not allowed by the Api Provider '
-            #         'in this method')
-            #     query.clear_filters()
             if isinstance(query, str):
                 params['$filter'] = query
             else:
@@ -1650,11 +1652,16 @@ def get_child_folders(self, limit=None, *, query=None, order_by=None, batch=None
         :return: folder items in this folder
         :rtype: generator of DriveItem or Pagination
         """
-
         if query:
-            query = query.on_attribute('folder').unequal(None)
+            if not isinstance(query, str):
+                if isinstance(query, CompositeFilter):
+                    q = ExperimentalQuery(protocol=self.protocol)
+                    query = query & q.unequal('folder', None)
+                else:
+                    query = query.on_attribute('folder').unequal(None)
         else:
-            query = self.q('folder').unequal(None)
+            q = ExperimentalQuery(protocol=self.protocol)
+            query = q.unequal('folder', None)
 
         return self.get_items(limit=limit, query=query, order_by=order_by, batch=batch)
 

O365/utils/__init__.py

@@ -9,4 +9,4 @@
 from .consent import consent_input_token
 from .casing import to_snake_case, to_pascal_case, to_camel_case
 
-from .query import QueryBuilder as ExperimentalQuery
+from .query import QueryBuilder as ExperimentalQuery, CompositeFilter

O365/utils/query.py

@@ -2,7 +2,7 @@
 
 import datetime as dt
 from abc import ABC, abstractmethod
-from typing import Union, Optional, TYPE_CHECKING, Type, Iterator, Literal, TypeAlias
+from typing import Union, Optional, TYPE_CHECKING, Type, Iterator, TypeAlias
 
 if TYPE_CHECKING:
     from O365.connection import Protocol
@@ -376,6 +376,35 @@ def render(self) -> str:
             f"Expand: {self.expand.render() if self.expand else ''}"
         )
 
+    @property
+    def has_filters(self) -> bool:
+        """ Returns if this CompositeFilter has filters"""
+        return self.filters is not None
+
+    @property
+    def has_selects(self) -> bool:
+        """ Returns if this CompositeFilter has selects"""
+        return self.select is not None
+
+    @property
+    def has_expands(self) -> bool:
+        """ Returns if this CompositeFilter has expands"""
+        return self.expand is not None
+
+    @property
+    def has_search(self) -> bool:
+        """ Returns if this CompositeFilter has search"""
+        return self.search is not None
+
+    @property
+    def has_order_by(self) -> bool:
+        """ Returns if this CompositeFilter has order_by"""
+        return self.order_by is not None
+
+    def clear_filters(self) -> None:
+        """ Removes all filters from the query """
+        self.filters = None
+
     @property
     def has_only_filters(self) -> bool:
         """ Returns true if it only has filters"""

O365/utils/utils.py

@@ -1,5 +1,6 @@
 import datetime as dt
 import logging
+import warnings
 from collections import OrderedDict
 from enum import Enum
 from typing import Dict, Union
@@ -496,6 +497,9 @@ def new_query(self, attribute=None):
         :return: new Query
         :rtype: Query
         """
+        warnings.warn('This method will be deprecated in future releases. A new Query object is finished and will be the only option in future releases. '
+                      'Use `from O365.utils import ExperimentalQuery as Query` instead to prepare for this change. '
+                      'Current docs already explain this change. See O365/utils/query.py for more details.', DeprecationWarning)
         return Query(attribute=attribute, protocol=self.protocol)
 
     q = new_query  # alias for new query

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 dynamic = ["license"]
 name = "o365"
-version = "2.1.2"
+version = "2.1.3"
 description = "O365 - Microsoft Graph and Office 365 API made easy"
 readme = "README.md"
 requires-python = ">=3.9"

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '2.1.2'
+VERSION = '2.1.3'
 
 # Available classifiers: https://pypi.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [