drb 2.3.1__tar.gz → 2.3.3__tar.gz

{drb-2.3.1/drb.egg-info → drb-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drb
-Version: 2.3.1
+Version: 2.3.3
 Summary: Data Request Broker
 Author: GAEL Systems
 Author-email: drb-python@gael.fr

{drb-2.3.1 → drb-2.3.3}/drb/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2026-06-18T09:34:25+0000",
+ "date": "2026-06-18T15:45:35+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "e6f4d6fca99c2213d3faef7f3ff905d2bda4f6fb",
- "version": "2.3.1"
+ "full-revisionid": "eee66f5c219c052a2465479e0be57a251647a9fd",
+ "version": "2.3.3"
 }
 '''  # END VERSION_JSON
 

{drb-2.3.1 → drb-2.3.3}/drb/nodes/abstract_node.py

@@ -61,6 +61,31 @@ class AbstractNode(DrbNode, abc.ABC):
             return DrbNodeList(children)
         raise TypeError(f"{type(item)} type not supported.")
 
+    def descendant(self, path: str) -> DrbNode:
+        """Navigate to a descendant node by a relative path.
+
+        Each non-empty segment of the '/'-separated ``path`` is resolved as
+        a direct child by name, equivalent to chaining ``node[segment]``.
+        Leading, trailing and repeated separators are ignored, so ``a/b/c``,
+        ``/a/b/c`` and ``a//b/c/`` are equivalent; an empty path returns the
+        node itself. Names that contain a literal ``/`` cannot be expressed
+        here -- use ``__getitem__`` per segment for those.
+
+        Parameters:
+            path: relative path whose segments are direct child names.
+
+        Returns:
+            DrbNode: the node reached after descending every segment.
+
+        Raises:
+            KeyError: if a segment matches no child (from ``__getitem__``).
+        """
+        node = self
+        for segment in path.split('/'):
+            if segment:
+                node = node[segment]
+        return node
+
     def __setitem__(self, key, value):
         if key is None:
             self._browse_children().append(value)

{drb-2.3.1 → drb-2.3.3}/drb/xquery/drb_xquery_visitor.py

@@ -1,3 +1,5 @@
+import re
+
 from antlr4 import InputStream, CommonTokenStream
 from antlr4.error.ErrorListener import ErrorListener
 from antlr4.tree.Tree import TerminalNodeImpl
@@ -1351,6 +1353,16 @@ class DrbQueryVisitor(XQueryParserVisitor):
                 elif exp.getText() == '//':
                     step_nav = NavigationStep.DESCENDANT_OR_SELF
             elif isinstance(exp, XQueryParser.StepExprContext):
+                # A path step whose whole text is digits is parsed as a numeric
+                # literal because an NCName cannot start with a digit; in
+                # path-step position it is a name test (e.g. /2026/01/15).
+                # Resolve it as such (TICKET-006).
+                if re.fullmatch(r'\d+', exp.getText()):
+                    self.list_context = self._numeric_name_step(
+                        exp.getText(), step_nav)
+                    result = self.list_context
+                    continue
+
                 result = []
                 index = 0
                 for node in self.list_context:
@@ -1373,6 +1385,36 @@ class DrbQueryVisitor(XQueryParserVisitor):
                 self.list_context = result
         return result
 
+    def _numeric_name_step(self, name, step_nav):
+        """Resolve a numeric path step as a name test (TICKET-006).
+
+        Selects, from the current context, the children named exactly
+        ``name`` (CHILD navigation) or any such descendant ('//' navigation).
+        """
+        result = []
+        for ctx_node in self.list_context:
+            node = ctx_node.node \
+                if isinstance(ctx_node, DynamicContext) else ctx_node
+            if not isinstance(node, DrbNode):
+                continue
+            if step_nav == NavigationStep.DESCENDANT_OR_SELF:
+                candidates = self._all_descendants(node)
+            else:
+                candidates = node._browse_children()
+            for child in candidates:
+                if child.name == name:
+                    result.append(DynamicContext(
+                        child, position=len(result) + 1))
+        return result
+
+    @staticmethod
+    def _all_descendants(node):
+        result = []
+        for child in node._browse_children():
+            result.append(child)
+            result.extend(DrbQueryVisitor._all_descendants(child))
+        return result
+
         # Visit a parse tree produced by XQueryParser#enclosedContentExpr.
 
     def visitEnclosedExpression(self,

{drb-2.3.1 → drb-2.3.3/drb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drb
-Version: 2.3.1
+Version: 2.3.3
 Summary: Data Request Broker
 Author: GAEL Systems
 Author-email: drb-python@gael.fr

{drb-2.3.1 → drb-2.3.3}/drb.egg-info/SOURCES.txt

@@ -84,6 +84,7 @@ tests/test_implementation_manager.py
 tests/test_keyring_bitwarden.py
 tests/test_logical_node.py
 tests/test_manager_dao.py
+tests/test_node_descendant.py
 tests/test_path.py
 tests/test_rdf_dao.py
 tests/test_rdf_dao_multi_url.py

drb-2.3.3/tests/test_node_descendant.py

@@ -0,0 +1,52 @@
+import unittest
+
+from drb.exceptions.core import DrbException
+from drb.nodes.logical_node import DrbLogicalNode
+
+
+class TestDescendant(unittest.TestCase):
+    """Path navigation via DrbNode.descendant (TICKET-005)."""
+
+    @classmethod
+    def setUpClass(cls):
+        # root / MSI / L1C / 2026 / S2C.zip
+        cls.root = DrbLogicalNode('root')
+        msi = DrbLogicalNode('MSI')
+        l1c = DrbLogicalNode('L1C')
+        year = DrbLogicalNode('2026')
+        leaf = DrbLogicalNode('S2C.zip')
+        year.append_child(leaf)
+        l1c.append_child(year)
+        msi.append_child(l1c)
+        cls.root.append_child(msi)
+
+    def test_deep_path(self):
+        node = self.root.descendant('MSI/L1C/2026/S2C.zip')
+        self.assertEqual('S2C.zip', node.name)
+
+    def test_equivalent_to_chained_getitem(self):
+        # __getitem__ resolves children via the topic resolver, returning a
+        # fresh node each call, so compare by name/type, not identity.
+        chained = self.root['MSI']['L1C']['2026']['S2C.zip']
+        viapath = self.root.descendant('MSI/L1C/2026/S2C.zip')
+        self.assertEqual(chained.name, viapath.name)
+        self.assertEqual(type(chained), type(viapath))
+
+    def test_intermediate_node(self):
+        self.assertEqual('2026', self.root.descendant('MSI/L1C/2026').name)
+
+    def test_separators_are_normalised(self):
+        for path in ('/MSI/L1C', 'MSI/L1C/', 'MSI//L1C'):
+            self.assertEqual('L1C', self.root.descendant(path).name)
+
+    def test_empty_path_returns_self(self):
+        self.assertIs(self.root, self.root.descendant(''))
+        self.assertIs(self.root, self.root.descendant('/'))
+
+    def test_missing_segment_raises(self):
+        with self.assertRaises(KeyError):
+            self.root.descendant('MSI/NOPE/2026')
+
+
+if __name__ == '__main__':
+    unittest.main()