refactorings for resource path

examples/onedrive/folders/list_files.py

@@ -7,6 +7,7 @@
 
 client = GraphClient(acquire_token_by_username_password)
 drive = client.me.drive
-file_items = client.me.drive.root.get_files(True).execute_query()
-for file_item in file_items:
+# items = client.me.drive.root.get_files(True).execute_query()
+items = client.sites.root.lists["Documents"].drive.root.get_files(True).execute_query()
+for file_item in items:
     print(file_item.web_url)

office365/entity.py

@@ -72,5 +72,5 @@ def set_property(self, name, value, persist_changes=True):
                         value, self.parent_collection.resource_path
                     )
             else:
-                self._resource_path.patch(value, inplace=True)
+                self._resource_path.patch(value)
         return self

office365/entity_collection.py

@@ -5,6 +5,7 @@
 from office365.runtime.compat import is_string_type
 from office365.runtime.paths.item import ItemPath
 from office365.runtime.paths.resource_path import ResourcePath
+from office365.runtime.paths.v4.entity import EntityPath
 from office365.runtime.queries.create_entity import CreateEntityQuery
 
 if TYPE_CHECKING:
@@ -32,7 +33,7 @@ def __getitem__(self, key):
             return super(EntityCollection, self).__getitem__(key)
         elif is_string_type(key):
             return self.create_typed_object(
-                resource_path=ResourcePath(key, self.resource_path)
+                resource_path=EntityPath(key, self.resource_path)
             )
         else:
             raise ValueError(
@@ -48,6 +49,14 @@ def add(self, **kwargs):
         self.context.add_query(qry)
         return return_type
 
+    def create_typed_object(self, initial_properties=None, resource_path=None):
+        # type: (Optional[dict], Optional[ResourcePath]) -> T
+        if resource_path is None:
+            resource_path = EntityPath(None, self.resource_path)
+        return super(EntityCollection, self).create_typed_object(
+            initial_properties, resource_path
+        )
+
     @property
     def context(self):
         # type: () -> GraphClient

office365/onedrive/driveitems/driveItem.py

@@ -66,7 +66,7 @@ def get_files(self, recursive=False):
         """Retrieves files
         :param bool recursive: Determines whether to enumerate folders recursively
         """
-        return_type = EntityCollection(self.context, DriveItem)
+        return_type = EntityCollection(self.context, DriveItem, self.resource_path)
 
         def _get_files(parent_drive_item):
             # type: (DriveItem) -> None

office365/onedrive/internal/paths/children.py

@@ -13,5 +13,5 @@ def collection(self):
             if isinstance(self.parent, EntityPath):
                 self._collection = self.parent.collection
             else:
-                self._collection = self.parent.parent
+                self._collection = self.parent
         return self._collection

office365/runtime/paths/resource_path.py

@@ -9,11 +9,9 @@ def __init__(self, key=None, parent=None):
         self._key = key
         self._parent = parent
 
-    def patch(self, key, inplace=False, path_type=None):
+    def patch(self, key):
         if self._key is None:
             self._key = key
-            if path_type:
-                self.__class__ = path_type
         return self
 
     def __iter__(self):

office365/runtime/paths/v4/entity.py

@@ -12,23 +12,25 @@ def __init__(self, key=None, parent=None, collection=None):
 
     @property
     def collection(self):
+        from office365.onedrive.internal.paths.children import ChildrenPath
+
+        if self._collection is None:
+            if isinstance(self.parent, ChildrenPath):
+                self._collection = self.parent.collection
+            else:
+                self._collection = self.parent
         return self._collection
 
     @property
     def segment(self):
         return str(self._key or "<key>")
 
-    def patch(self, key, inplace=False):
+    def patch(self, key):
         """
         Patches path
-
         :type key: str or None
-        :type inplace: bool
         """
-        if inplace:
-            self._key = key
-            self._parent = self.collection
-            self.__class__ = ResourcePath
-            return self
-        else:
-            return ResourcePath(key, self.collection)
+        self._key = key
+        self._parent = self.collection
+        self.__class__ = EntityPath
+        return self

office365/sharepoint/entity_collection.py

@@ -2,6 +2,7 @@
 
 from office365.runtime.client_object_collection import ClientObjectCollection
 from office365.runtime.paths.resource_path import ResourcePath
+from office365.runtime.paths.v3.entity import EntityPath
 from office365.sharepoint.entity import Entity
 
 if TYPE_CHECKING:
@@ -21,6 +22,14 @@ def __init__(self, context, item_type, resource_path=None, parent=None):
             context, item_type, resource_path, parent
         )
 
+    def create_typed_object(self, initial_properties=None, resource_path=None):
+        # type: (Optional[dict], Optional[ResourcePath]) -> T
+        if resource_path is None:
+            resource_path = EntityPath(None, self.resource_path)
+        return super(EntityCollection, self).create_typed_object(
+            initial_properties, resource_path
+        )
+
     @property
     def context(self):
         # type: () -> ClientContext

office365/sharepoint/files/versions/version.py

@@ -110,5 +110,5 @@ def set_property(self, key, value, persist_changes=True):
                     value, self.parent_collection.resource_path
                 )
             else:
-                self._resource_path.patch(value, path_type=EntityPath)
+                self._resource_path.patch(value)
         return self

office365/sharepoint/listitems/listitem.py

@@ -563,7 +563,7 @@ def set_property(self, name, value, persist_changes=True):
                     value, self.parent_collection.resource_path
                 )
             else:
-                self._resource_path.patch(value, path_type=EntityPath)
+                self._resource_path.patch(value)
         return self
 
     def _set_taxonomy_field_value(self, name, value):

office365/sharepoint/publishing/pages/metadata.py

@@ -1,7 +1,6 @@
 import datetime
 from typing import TYPE_CHECKING, Optional
 
-from office365.runtime.paths.v3.entity import EntityPath
 from office365.runtime.types.collections import StringCollection
 from office365.sharepoint.entity import Entity
 from office365.sharepoint.publishing.pages.version_info import SitePageVersionInfo
@@ -138,5 +137,5 @@ def set_property(self, name, value, persist_changes=True):
                     value
                 ).resource_path
             else:
-                self._resource_path.patch(value, path_type=EntityPath)
+                self._resource_path.patch(value)
         return super(SitePageMetadata, self).set_property(name, value, persist_changes)

office365/sharepoint/recyclebin/item.py

@@ -67,4 +67,4 @@ def set_property(self, name, value, persist_changes=True):
                     "GetById", [value], self._parent_collection.resource_path
                 )
             else:
-                self._resource_path.patch(value, path_type=EntityPath)
+                self._resource_path.patch(value)

office365/sharepoint/webs/collection.py

@@ -1,5 +1,6 @@
 from office365.runtime.queries.service_operation import ServiceOperationQuery
 from office365.sharepoint.entity_collection import EntityCollection
+from office365.sharepoint.internal.paths.web import WebPath
 from office365.sharepoint.webs.web import Web
 
 
@@ -25,6 +26,13 @@ def add(self, web_creation_information):
         self.context.add_query(qry)
         return return_type
 
+    def create_typed_object(self, initial_properties=None, resource_path=None):
+        if resource_path is None:
+            resource_path = WebPath(self.resource_path)
+        return super(EntityCollection, self).create_typed_object(
+            initial_properties, resource_path
+        )
+
     @property
     def resource_url(self):
         val = super(WebCollection, self).resource_url

office365/sharepoint/webs/web.py

@@ -124,7 +124,7 @@ def __init__(self, context, resource_path=None):
         :type context: office365.sharepoint.client_context.ClientContext
         """
         if resource_path is None:
-            resource_path = ResourcePath("Web")
+            resource_path = WebPath("Web")
         super(Web, self).__init__(context, resource_path)
         self._web_url = None
 
@@ -2452,7 +2452,7 @@ def set_property(self, name, value, persist_changes=True):
         super(Web, self).set_property(name, value, persist_changes)
         if name == "Url":
             self._web_url = value
-            self._resource_path.patch(value, path_type=WebPath)
+            self._resource_path.patch(value)
         return self
 
     @property

tests/test_graph_client.py

@@ -43,13 +43,13 @@ def test5_resolve_drive_url_path(self):
         parent_path = self.client.me.drive.root.resource_path
         path = UrlPath("Sample.docx", UrlPath("2018", UrlPath("archive", parent_path)))
         item_id = uuid.uuid4().hex
-        path.patch(item_id, inplace=True)
+        path.patch(item_id)
         self.assertEqual(f"/me/drive/items/{item_id}", str(path))
 
     def test6_resolve_drive_children_path(self):
         path = self.client.me.drive.root.children.resource_path
         item_id = uuid.uuid4().hex
-        path.patch(item_id, inplace=True)
+        path.patch(item_id)
         self.assertEqual(f"/me/drive/items/{item_id}", str(path))
 
     def test7_build_drive_children_path(self):
@@ -66,7 +66,7 @@ def test8_resolve_site_url_path(self):
     def test9_resolve_drive_root_path(self):
         path = self.client.me.drive.root.resource_path
         item_id = uuid.uuid4().hex
-        path.patch(item_id, inplace=True)
+        path.patch(item_id)
         self.assertEqual(f"/me/drive/items/{item_id}", str(path))
 
     def test_10_build_site_root_path(self):