kodexa 7.4.415329037666__py3-none-any.whl → 7.4.415475692281__py3-none-any.whl

kodexa/model/model.py

@@ -1847,10 +1847,10 @@ class ContentNode(object):
           bool: True if this node is the first child of its parent or if this node has no parent; else, False;
 
         """
-        if not self.parent:
+        if not self.get_parent():
             return True
 
-        return self.index == 0
+        return self.index == self.get_parent().get_first_child_index()
 
     def is_last_child(self):
         """Determines if this node is the last child of its parent or has no parent.
@@ -1865,6 +1865,23 @@ class ContentNode(object):
 
         return self.index == self.get_parent().get_last_child_index()
 
+    def get_first_child_index(self):
+        """Returns the min index value for the children of this node. If the node has no children, returns None.
+
+        Returns:
+            int or None: The min index of the children of this node, or None if there are no children.
+
+        """
+        if not self.get_children():
+            return None
+
+        min_index = None
+        for child in self.get_children():
+            if min_index is None or child.index < min_index:
+                min_index = child.index
+
+        return min_index
+
     def get_last_child_index(self):
         """Returns the max index value for the children of this node. If the node has no children, returns None.
 
@@ -1899,6 +1916,7 @@ class ContentNode(object):
 
         """
         if self.get_children():
+            # TODO -  is this what we want? Should it return None?
             if index < self.get_children()[0].index:
                 virtual_node = self.document.create_node(
                     node_type=self.get_children()[0].node_type,
@@ -2007,7 +2025,6 @@ class ContentNode(object):
                         if potential_next_node:
                             return potential_next_node
                     except Exception:
-
                         # traverse additional layer
                         potential_next_node = (
                             self.get_parent()
@@ -2019,6 +2036,7 @@ class ContentNode(object):
                         )
                         if potential_next_node:
                             return potential_next_node
+                        
                 return node
 
             if compiled_node_type_re.match(node.node_type) and (
@@ -2052,9 +2070,17 @@ class ContentNode(object):
           ContentNode or None: The previous node or None, if no node exists
 
         """
-
         # TODO: implement/differentiate traverse logic for CHILDREN and SIBLING
-        if self.index == 0:
+
+        parent = self.get_parent()
+        parent_first_child_index = 0
+        
+        if parent:
+            parent_first_child_index = parent.get_first_child_index()
+
+        # TODO - the first item in the list does not always have an index property of 0
+        # TODO - should this be in the loop?
+        if self.index == parent_first_child_index:
             if (
                     traverse == traverse.ALL
                     or traverse == traverse.PARENT
@@ -2071,6 +2097,8 @@ class ContentNode(object):
         compiled_node_type_re = re.compile(node_type_re)
 
         while True:
+            # This creates a virtual node if the index is not found
+            # and the index is not greater than the last child index
             node = self.get_parent().get_node_at_index(search_index)
 
             if not node:
@@ -2084,6 +2112,8 @@ class ContentNode(object):
 
             search_index -= 1
 
+            if traverse == traverse.SIBLING and search_index < 0:               
+                return None
 
 class ContentFeature(object):
     """

kodexa/model/objects.py

@@ -1550,6 +1550,7 @@ class Session(BaseModel):
     updated_on: Optional[StandardDateTime] = Field(None, alias="updatedOn")
     token: Optional[str] = None
     last_accessed: Optional[StandardDateTime] = Field(None, alias="lastAccessed")
+    organization: Optional[Organization] = None
 
 
 class Status4(Enum):

{kodexa-7.4.415329037666.dist-info → kodexa-7.4.415475692281.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kodexa
-Version: 7.4.415329037666
+Version: 7.4.415475692281
 Summary: Python SDK for the Kodexa Platform
 Author: Austin Redenbaugh
 Author-email: austin@kodexa.com

{kodexa-7.4.415329037666.dist-info → kodexa-7.4.415475692281.dist-info}/RECORD

@@ -12,8 +12,8 @@ kodexa/model/entities/check_response.py,sha256=eqBHxO6G2OAziL3p9bHGI-oiPkAG82H6C
 kodexa/model/entities/product.py,sha256=StUhTEeLXmc05cj6XnZppQfeJsqCPbX1jdhsysHH--Q,5787
 kodexa/model/entities/product_group.py,sha256=540fRGyUf34h1BzAN1DiWu6rGgvaj3xDFhZ2k-RvSFY,3617
 kodexa/model/entities/product_subscription.py,sha256=UcmWR-qgLfdV7VCtJNwzgkanoS8nBSL6ngVuxQUK1M8,3810
-kodexa/model/model.py,sha256=q3zEm6pPOB-xPCKbOxmTMqLALzmQr2Ppam8knApoSEE,119645
-kodexa/model/objects.py,sha256=j-EmVUkpvGjl7YdjI_2NM9ILaQkwYteVy889MBWXkRc,201068
+kodexa/model/model.py,sha256=o93SDgw8mj28LWbwJB78PF_Oim8qeCTH1a9x_GDc7yg,120895
+kodexa/model/objects.py,sha256=jmid2pcUgl3wyUxWns7AuY18Gnw2d02dlH18MHE5quA,201116
 kodexa/model/persistence.py,sha256=jUgQ8xwsAFIoZ_bEynxCDEWhUII42eN0e0Mum0dkQPg,72043
 kodexa/model/utils.py,sha256=YEG3f8YzBil06D0P3_dfx2S9GnHREzyrjnlWwQ7oPlU,3038
 kodexa/pipeline/__init__.py,sha256=sA7f5D6qkdMrpp2xTIeefnrUBI6xxEEWostvxfX_1Cs,236
@@ -45,7 +45,7 @@ kodexa/testing/test_utils.py,sha256=v44p__gE7ia67W7WeHN2HBFCWSCUrCZt7G4xBNCmwf8,
 kodexa/training/__init__.py,sha256=xs2L62YpRkIRfslQwtQZ5Yxjhm7sLzX2TrVX6EuBnZQ,52
 kodexa/training/train_utils.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kodexa/utils/__init__.py,sha256=Pnim1o9_db5YEnNvDTxpM7HG-qTlL6n8JwFwOafU9wo,5928
-kodexa-7.4.415329037666.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-kodexa-7.4.415329037666.dist-info/METADATA,sha256=bway5CMdQqfM-2mfSPIsxL1vv4CYx-I6qgU2X6MNCCY,2916
-kodexa-7.4.415329037666.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-kodexa-7.4.415329037666.dist-info/RECORD,,
+kodexa-7.4.415475692281.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+kodexa-7.4.415475692281.dist-info/METADATA,sha256=wcKOpNbsYh8YZ1VzM8W96eExXUfhVdlYlJ9fL184A1s,2916
+kodexa-7.4.415475692281.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+kodexa-7.4.415475692281.dist-info/RECORD,,