drb 2.7.2__tar.gz → 2.8.0__tar.gz

{drb-2.7.2/drb.egg-info → drb-2.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drb
-Version: 2.7.2
+Version: 2.8.0
 Summary: Data Request Broker
 Author: GAEL Systems
 Author-email: drb-python@gael.fr
@@ -12,8 +12,6 @@ Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENCE.txt
 Requires-Dist: importlib-metadata>=4.11.4
-Requires-Dist: jsonschema==4.17.0
-Requires-Dist: PyYaml~=6.0.2
 Requires-Dist: click==8.1.3
 Requires-Dist: keyring<26,>=25.7.0
 Requires-Dist: requests<3,>=2.33.0

{drb-2.7.2 → drb-2.8.0}/drb/core/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2026-07-07T13:58:00+0000",
+ "date": "2026-07-10T13:20:21+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "0ca7a30d2606890cfee27aa9c615247cf1a7be67",
- "version": "2.7.2"
+ "full-revisionid": "dad4a706c920e704103cb0a1c83b0bfbdf97a204",
+ "version": "2.8.0"
 }
 '''  # END VERSION_JSON
 

{drb-2.7.2 → drb-2.8.0}/drb/core/impls.py

@@ -26,15 +26,15 @@ class ImplementationManager:
 
     def __find_impl(self, impl: type, identifier: Optional[str]) \
             -> List[Tuple[type, Optional[str]]]:
+        # keys are iterated in registration order so that a multi-match
+        # lookup stays deterministic (first registered wins in get_impl)
         if identifier is None:
             if (impl, None) in self.__impls.keys():
                 return [(impl, None)]
-            keys = set(self.__impls.keys())
+            keys = self.__impls.keys()
         else:
-            keys = set(
-                filter(lambda x: x[1] == identifier, self.__impls.keys())
-            )
-        return list(filter(lambda x: issubclass(x[0], impl), keys))
+            keys = filter(lambda x: x[1] == identifier, self.__impls.keys())
+        return [key for key in keys if issubclass(key[0], impl)]
 
     def has_impl(self, impl: type, identifier: str = None) -> bool:
         """
@@ -62,14 +62,17 @@ class ImplementationManager:
                               specify from which add-on retrieve the
                               implementation (default: ``None``)
         Return:
-            Callable: the expected implementation.
+            Callable: the expected implementation. When several registered
+            implementations match, the first registered one is returned,
+            keeping ``get_impl`` consistent with ``has_impl``.
         Raises:
             KeyError: if the given interface is not found
         """
         keys = self.__find_impl(impl, identifier)
-        if len(keys) == 1:
+        if keys:
             return self.__impls[keys[0]]
-        raise KeyError
+        raise KeyError(f'No implementation ({impl.__name__}, {identifier}) '
+                       'found')
 
     def get_capabilities(self) -> List[Tuple[type, str]]:
         """

{drb-2.7.2 → drb-2.8.0}/drb/nodes/abstract_node.py

@@ -112,8 +112,10 @@ class AbstractNode(DrbNode, abc.ABC):
     def __setitem__(self, key, value):
         if key is None:
             self._browse_children().append(value)
+            return
         if isinstance(key, int):
             self._browse_children()[key] = value
+            return
         try:
             if isinstance(key, str):
                 self._browse_children()[
@@ -122,23 +124,24 @@ class AbstractNode(DrbNode, abc.ABC):
                 key = get_name_namespace_index(key)
                 self._browse_children()[self._get_named_child_index(
                     *key)] = value
+            else:
+                raise KeyError(f'Invalid key {key}')
         except (DrbException, IndexError, TypeError) as ex:
             raise KeyError(f'Invalid key {key}') from ex
 
     def __delitem__(self, key):
         if isinstance(key, int):
             del self._browse_children()[key]
+            return
         try:
             if isinstance(key, str):
                 del self._browse_children()[self._get_named_child_index(key)]
-            elif isinstance(key, tuple):
-                if len(key) == 2:
-                    key = get_name_namespace_index(key)
-                    del self._browse_children()[self._get_named_child_index(
-                        *key)]
-                    raise KeyError(f"Invalid key {key}.")
-                else:
-                    raise KeyError(f'Invalid key {key}')
+            elif isinstance(key, tuple) and len(key) == 2:
+                key = get_name_namespace_index(key)
+                del self._browse_children()[self._get_named_child_index(
+                    *key)]
+            else:
+                raise KeyError(f'Invalid key {key}')
         except (DrbException, IndexError, TypeError) as ex:
             raise KeyError(f'Invalid key {key}') from ex
 
@@ -162,14 +165,14 @@ class AbstractNode(DrbNode, abc.ABC):
         occ = occurrence
         cpt = 0
         if self.namespace_aware or namespace_uri is not None:
-            for x in self._browse_children():
+            for x in self.children_unresolved:
                 if x.name == name and x.namespace_uri == namespace_uri:
                     if occ <= 0:
                         return cpt
                     occ -= 1
                 cpt += 1
         else:
-            for x in self._browse_children():
+            for x in self.children_unresolved:
                 if x.name == name:
                     return cpt
                 cpt += 1
@@ -199,12 +202,16 @@ class AbstractNode(DrbNode, abc.ABC):
             IndexError: if item is out of range of found children
             DrbException: if no child following given criteria is found
         """
+        # Match unresolved children and let the caller resolve only the
+        # selected node: a targeted named lookup must not resolve unrelated
+        # siblings (contract: the driver owns optimized access; the core
+        # resolves only when necessary). drb-testbench#21.
         if self.namespace_aware or namespace_uri is not None:
-            named_children = [x for x in self._browse_children()
+            named_children = [x for x in self.children_unresolved
                               if x.name == name
                               and x.namespace_uri == namespace_uri]
         else:
-            named_children = [x for x in self._browse_children()
+            named_children = [x for x in self.children_unresolved
                               if x.name == name]
         if len(named_children) <= 0:
             raise DrbException(f'No child found having name: {name} and'
@@ -225,13 +232,13 @@ class AbstractNode(DrbNode, abc.ABC):
 
         result = []
         if name is not None and namespace is not None:
-            result = [x for x in self._browse_children()
+            result = [x for x in self.children_unresolved
                       if x.name == name and x.namespace_uri == namespace]
         if name is None:
-            result = [x for x in self._browse_children()
+            result = [x for x in self.children_unresolved
                       if x.namespace_uri == namespace]
         if namespace is None:
-            result = [x for x in self._browse_children() if x.name == name]
+            result = [x for x in self.children_unresolved if x.name == name]
 
         return len(result) > 0
 

{drb-2.7.2 → drb-2.8.0}/drb/nodes/logical_node.py

@@ -139,6 +139,7 @@ class WrappedNode(MutableNode):
 
     def __imatmul__(self, other):
         self._wrapped.__imatmul__(other)
+        return self
 
     def __matmul__(self, other):
         return self._wrapped.__matmul__(other)

{drb-2.7.2 → drb-2.8.0}/drb/nodes/url_node.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 import io
-import keyring
 import requests
-from requests.auth import AuthBase, HTTPBasicAuth
+from requests.auth import AuthBase
 from typing import Any, Optional, List, Dict, Tuple, Union
+from urllib.parse import urlparse
 
+from drb.core.auth import credential_to_authbase, resolve_credential
 from drb.core.node import DrbNode
 from drb.core.path import ParsedPath, Path, parse_path
 from drb.exceptions.core import DrbException
@@ -107,11 +108,13 @@ class UrlNode(DrbNode):
         raise DrbException('UrlNode has no child')
 
     def _find_credential(self, url: str):
+        # explicit auth wins; otherwise resolve through the drb.core.auth
+        # provider chain (injected > keyring > env > anonymous),
+        # host-scoped like every transport driver
         if self._auth is not None:
             return self._auth
 
-        credential = keyring.get_credential(url, None)
-        if credential is not None:
-            return HTTPBasicAuth(credential.username, credential.password)
-
-        return None
+        parsed = urlparse(url)
+        credential = resolve_credential(self._context, parsed.scheme,
+                                        parsed.hostname or '')
+        return credential_to_authbase(credential)

{drb-2.7.2 → drb-2.8.0}/drb/topics/dao/manager_dao.py

@@ -8,7 +8,6 @@ import os
 import logging
 import importlib
 import drb.utils.plugins
-from jsonschema.exceptions import ValidationError
 from drb.utils.url_security import validate_url
 
 from .topic_dao import DrbTopicDao
@@ -86,8 +85,10 @@ def _load_all_drb_topic_dao() -> Dict[uuid.UUID, DrbTopicDao]:
         return result
 
     # One merged graph across all descriptors (cross-package resolution).
+    # skip_invalid: one broken descriptor is logged and skipped instead of
+    # aborting topic loading for every installed package.
     try:
-        dao = RDFDao(paths)
+        dao = RDFDao(paths, skip_invalid=True)
         for topic in dao.read_all():
             if not _implementation_available(topic):
                 logger.warning(
@@ -97,8 +98,8 @@ def _load_all_drb_topic_dao() -> Dict[uuid.UUID, DrbTopicDao]:
                     topic.label, topic.uri, topic.factory)
                 continue
             result[topic.id] = dao
-    except (FileNotFoundError, ValidationError) as ex:
-        logger.warning(f'Invalid topic description(s): {ex}')
+    except Exception as ex:
+        logger.error(f'Topic loading failed: {ex}')
 
     return result
 
@@ -245,9 +246,14 @@ class ManagerDao:
             return False
 
         for parent_id in actual.subClassOf:
-
-            return self.is_subclass(self.get_drb_topic(parent_id),
-                                    expected)
+            try:
+                parent = self.get_drb_topic(parent_id)
+            except DrbException:
+                # dangling parent reference: cannot match, try the next one
+                continue
+            if self.is_subclass(parent, expected):
+                return True
+        return False
 
     def get_parents(self, topic: DrbTopic) -> List[DrbTopic]:
 
@@ -259,7 +265,7 @@ class ManagerDao:
         for parent in topic.subClassOf:
 
             if parent in self.__topic_dao.keys():
-                dao = self.__topic_dao[topic.id]
+                dao = self.__topic_dao[parent]
                 parents.append(dao.read(parent))
 
         return parents

{drb-2.7.2 → drb-2.8.0}/drb/topics/dao/rdf_dao.py

@@ -22,6 +22,8 @@ _DRB_ITEM_URI_LEGACY = "http://www.gael.fr/drb/item"
 # Default (connect, read) timeout in seconds for outbound HTTP requests.
 _HTTP_TIMEOUT = (10, 60)
 
+logger = logging.getLogger(__name__)
+
 
 def _rdf_bool(literal) -> bool:
     """Coerce an RDF literal to bool.
@@ -52,21 +54,33 @@ class RDFDao(DrbTopicDao):
         self,
         path: Union[str, List[str]],
         auth: Optional[tuple] = None,
+        skip_invalid: bool = False,
     ):
         """
         Load RDF from a single path/URL or from a list of URLs (e.g. Graph
         Store), merging into one graph. Optional auth is (user, password)
-        for HTTP Basic when loading from http/https URLs.
+        for HTTP Basic when loading from http/https URLs. With
+        ``skip_invalid`` an unreadable/unparsable source is logged and
+        skipped instead of aborting the whole load (used by the merged
+        entry-point loading, so one broken descriptor cannot take every
+        other package down).
         """
         self.graph = rdflib.Graph()
-        if isinstance(path, list):
-            for url in path:
-                u = url.strip()
-                if u:
-                    self._parse_one(u, auth)
-        else:
-            self._parse_one(path, auth)
+        sources = path if isinstance(path, list) else [path]
+        for source in sources:
+            src = source.strip() if isinstance(source, str) else source
+            if not src:
+                continue
+            if skip_invalid:
+                try:
+                    self._parse_one(src, auth)
+                except Exception as ex:
+                    logger.error(
+                        'Skipping invalid topic descriptor %s: %s', src, ex)
+            else:
+                self._parse_one(src, auth)
         self.__result = self.__query_rdf_file()
+        self._warn_undiscoverable_topics()
 
     def _parse_one(self, path_or_url: str, auth: Optional[tuple]) -> None:
         """Parse one path or URL into self.graph."""
@@ -138,6 +152,43 @@ class RDFDao(DrbTopicDao):
 
         return result
 
+    def _warn_undiscoverable_topics(self) -> None:
+        """Warn about topic-like subjects discovery will silently drop.
+
+        Discovery only selects classes reaching ``drb:item`` through
+        ``rdfs:subClassOf+``; a topic whose parent package is not loaded
+        (or whose parent URI is mistyped) simply vanishes. Surface those
+        here instead of leaving the user to wonder why a topic does not
+        resolve.
+        """
+        result = self.graph.query(f"""
+                PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+                PREFIX drb: <http://www.gael.fr/drb#>
+                SELECT DISTINCT ?Class
+                (GROUP_CONCAT(DISTINCT STR(?parent); separator=", ")
+                 AS ?parents)
+                WHERE {{
+                {{ ?Class drb:id ?mark . }}
+                UNION {{ ?Class drb:signature ?mark . }}
+                UNION {{ ?Class drb:implementationIdentifier ?mark . }}
+                OPTIONAL {{ ?Class rdfs:subClassOf ?parent . }}
+                FILTER NOT EXISTS {{
+                    ?Class rdfs:subClassOf+ <{DRB_ITEM_URI}> . }}
+                FILTER NOT EXISTS {{
+                    ?Class rdfs:subClassOf+ <{_DRB_ITEM_URI_LEGACY}> . }}
+                FILTER (?Class != <{DRB_ITEM_URI}>
+                        && ?Class != <{_DRB_ITEM_URI_LEGACY}>)
+                }}
+                GROUP BY ?Class
+                """)
+        for row in result:
+            parents = str(row.parents) if row.parents else None
+            logger.warning(
+                "Topic '%s' is not discoverable: its rdfs:subClassOf chain "
+                "does not reach drb:item (direct parents: %s). Check the "
+                "parent URI and that the parent package is installed.",
+                row.Class.toPython(), parents or 'none')
+
     def get_topic_signature(self, topic: DrbTopic):
 
         result = self.graph.query(f'''
@@ -281,7 +332,7 @@ class RDFDao(DrbTopicDao):
 
             continue
 
-        raise DrbException
+        raise DrbException(f'No topic found for identifier: {identifier}')
 
     def find(self, search: str) -> List[DrbTopic]:
         """
@@ -312,7 +363,12 @@ class RDFDao(DrbTopicDao):
                 topic = self.__generate_topic_from_rdf(r)
                 topics.append(topic)
 
-            except TypeError:
+            except (TypeError, ValueError) as ex:
+                # e.g. a non-UUID drb:id or an unknown drb:category: skip
+                # the row but say so, a silent drop is undebuggable
+                logger.warning(
+                    "Skipping malformed topic row '%s': %s",
+                    r.Class.toPython(), ex)
                 continue
 
         return topics

{drb-2.7.2 → drb-2.8.0}/drb/topics/resolver.py

@@ -94,6 +94,31 @@ def _topic_by_factory(name: str):
     return None
 
 
+def _driver_topic(topic: DrbTopic) -> Optional[DrbTopic]:
+    """Nearest topic in the ``subClassOf`` chain (``topic`` first) that
+    declares a driver ``factory``.
+
+    A semantic refinement (e.g. a mission-specific container/formatting topic
+    such as ``Sentinel-2 …: Zip``) may declare no ``factory`` of its own; the
+    node must still be built by the driver of the nearest ancestor that has
+    one -- the refinement only relabels it, it does not rebuild it. Returns
+    ``None`` when no topic in the chain declares a factory.
+    """
+    by_id = {t.id: t for t in ManagerDao().get_all_drb_topics()}
+    seen = set()
+    queue = [topic]
+    while queue:
+        current = queue.pop(0)
+        if current is None or current.id in seen:
+            continue
+        seen.add(current.id)
+        if current.factory is not None:
+            return current
+        for parent_id in (current.subClassOf or []):
+            queue.append(by_id.get(parent_id))
+    return None
+
+
 def _topic_by_scheme_any(scheme: str):
     """The topic (any category) declaring ``scheme`` in its ``drb:scheme``.
 
@@ -477,13 +502,16 @@ class _DrbFactoryResolver(DrbFactory):
                     node = _create_via_factory(protocol, node)
 
             container, node = self.__retrieve_container(node)
-            if container is not None and container.factory is not None:
-                node = _create_via_factory(container, node)
+            if container is not None:
+                driver = _driver_topic(container)
+                if driver is not None:
+                    node = _create_via_factory(driver, node)
 
             formatting = self.__retrieve_formatting(node)
             if formatting is not None:
-                if formatting.factory is not None:
-                    node = _create_via_factory(formatting, node)
+                driver = _driver_topic(formatting)
+                if driver is not None:
+                    node = _create_via_factory(driver, node)
                 t, n = self.__finest_drb_topic(node, formatting)
             elif container is not None:
                 t, n = container, node

drb-2.8.0/drb/utils/plugins.py

@@ -0,0 +1,9 @@
+from typing import Iterable
+import importlib.metadata
+
+
+def get_entry_points(name: str) -> Iterable[importlib.metadata.EntryPoint]:
+    eps = importlib.metadata.entry_points()
+    if name in eps.groups:
+        return eps.select(group=name)
+    return []

{drb-2.7.2 → drb-2.8.0/drb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drb
-Version: 2.7.2
+Version: 2.8.0
 Summary: Data Request Broker
 Author: GAEL Systems
 Author-email: drb-python@gael.fr
@@ -12,8 +12,6 @@ Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENCE.txt
 Requires-Dist: importlib-metadata>=4.11.4
-Requires-Dist: jsonschema==4.17.0
-Requires-Dist: PyYaml~=6.0.2
 Requires-Dist: click==8.1.3
 Requires-Dist: keyring<26,>=25.7.0
 Requires-Dist: requests<3,>=2.33.0

{drb-2.7.2 → drb-2.8.0}/drb.egg-info/SOURCES.txt

@@ -51,8 +51,6 @@ drb/topics/dao/__init__.py
 drb/topics/dao/manager_dao.py
 drb/topics/dao/rdf_dao.py
 drb/topics/dao/topic_dao.py
-drb/topics/dao/topic_schema.yml
-drb/topics/dao/xml_dao.py
 drb/topics/file/__init__.py
 drb/topics/file/cortex.ttl
 drb/topics/xml/__init__.py
@@ -96,6 +94,7 @@ tests/test_keyring_bitwarden.py
 tests/test_logical_node.py
 tests/test_manager_dao.py
 tests/test_manager_get_dao.py
+tests/test_named_child_no_sibling_resolution.py
 tests/test_node_context.py
 tests/test_node_context_manager.py
 tests/test_node_descendant.py
@@ -103,9 +102,11 @@ tests/test_path.py
 tests/test_protocol_dispatch.py
 tests/test_rdf_dao.py
 tests/test_rdf_dao_multi_url.py
+tests/test_rdf_dao_robustness.py
 tests/test_rdf_dao_scheme.py
 tests/test_rdf_dao_signatures.py
 tests/test_resolver_auth.py
+tests/test_resolver_factoryless_refinement.py
 tests/test_resolver_format_alias.py
 tests/test_resolver_implicit_file.py
 tests/test_resolver_recursion_guard.py
@@ -121,5 +122,4 @@ tests/test_topic_descriptor_discovery.py
 tests/test_topic_merge_crosspackage.py
 tests/test_url_node.py
 tests/test_url_security.py
-tests/test_xml_dao.py
 tests/test_xml_xquery_import_order.py

{drb-2.7.2 → drb-2.8.0}/drb.egg-info/requires.txt

@@ -1,6 +1,4 @@
 importlib-metadata>=4.11.4
-jsonschema==4.17.0
-PyYaml~=6.0.2
 click==8.1.3
 keyring<26,>=25.7.0
 requests<3,>=2.33.0

{drb-2.7.2 → drb-2.8.0}/requirements.txt

@@ -1,6 +1,4 @@
 importlib-metadata>=4.11.4
-jsonschema==4.17.0
-PyYaml~=6.0.2
 click==8.1.3
 keyring>=25.7.0,<26
 requests>=2.33.0,<3

{drb-2.7.2 → drb-2.8.0}/setup.cfg

@@ -42,11 +42,8 @@ drb.signature =
 	parentIsSubClassTest = drb.signatures.hierarchy:ParentIsSubClassTestSignature
 	parentClassMatch = drb.signatures.hierarchy:ParentClassMatchSignature
 	parentIsSubClassMatch = drb.signatures.hierarchy:ParentIsSubClassMatchSignature
-drb.auth = 
 
 [options.package_data]
-drb.topics.dao = 
-	topic_schema.yml
 drb.topics.xml = 
 	cortex.ttl
 drb.topics.file = 

{drb-2.7.2 → drb-2.8.0}/tests/test_abstract_node.py

@@ -178,6 +178,35 @@ class TestDrbNode(unittest.TestCase):
             del node['Test_0']
         self.assertEqual(len(node), 0)
 
+    def test_delitem_name_namespace_tuple(self):
+        # drb-testbench#23: deleting by (name, namespace) raised KeyError
+        # AFTER the child was actually removed
+        node = DrbLogicalNode('container')
+        node.append_child(DrbLogicalNode('child', namespace_uri='ns'))
+        node.append_child(DrbLogicalNode('other'))
+
+        del node[('child', 'ns')]
+
+        self.assertEqual(1, len(node))
+        self.assertEqual('other', node[0].name)
+
+    def test_delitem_invalid_key_type(self):
+        # drb-testbench#23: an unsupported key type was silently ignored
+        node = DrbLogicalNode('container')
+        node.append_child(DrbLogicalNode('child'))
+
+        with self.assertRaises(KeyError):
+            del node[1.5]
+        self.assertEqual(1, len(node))
+
+    def test_setitem_invalid_key_type(self):
+        # drb-testbench#23: an unsupported key type was silently ignored
+        node = DrbLogicalNode('container')
+
+        with self.assertRaises(KeyError):
+            node[1.5] = DrbLogicalNode('x')
+        self.assertEqual(0, len(node))
+
     def test_namespace_11(self):
         # Case 1.1: node with ns / user access with ns / aware = True
         root = DrbLogicalNode("root")

{drb-2.7.2 → drb-2.8.0}/tests/test_implementation_manager.py

@@ -66,6 +66,16 @@ class TestImplManager(unittest.TestCase):
         with self.assertRaises(KeyError):
             mng.get_impl(dict)
 
+    def test_get_impl_ambiguous_returns_first_registered(self):
+        # drb-testbench#24: has_impl answered True but get_impl raised
+        # KeyError when several impls matched; first registered now wins
+        mng = ImplementationManager()
+        mng.add_impl(str, 'a', function_1)
+        mng.add_impl(str, 'b', function_2)
+
+        self.assertTrue(mng.has_impl(str))
+        self.assertEqual(function_1, mng.get_impl(str))
+
     def test_get_capabilities(self):
         mng = ImplementationManager()
         self.assertEqual([], mng.get_capabilities())

{drb-2.7.2 → drb-2.8.0}/tests/test_logical_node.py

@@ -6,7 +6,7 @@ import operator
 from functools import partial
 from drb.core import DrbNode, Predicate, ParsedPath
 from drb.core.path import parse_path
-from drb.nodes.logical_node import DrbLogicalNode
+from drb.nodes.logical_node import DrbLogicalNode, WrappedNode
 from drb.exceptions.core import DrbException
 
 
@@ -295,6 +295,14 @@ class TestLogicalNode(unittest.TestCase):
         node = DrbLogicalNode(source)
         node.close()
 
+    def test_wrapped_node_imatmul_returns_node(self):
+        # drb-testbench#23: WrappedNode.__imatmul__ returned None, so
+        # `wrapped @= ...` rebound the variable to None
+        wrapped = WrappedNode(DrbLogicalNode('base'))
+        wrapped @= ('attr', 'value')
+        self.assertIsNotNone(wrapped)
+        self.assertEqual('value', wrapped @ 'attr')
+
     def test_impl(self):
         source = "/path/to/data/node"
         node = DrbLogicalNode(source)