drb 2.7.0__tar.gz → 2.7.2__tar.gz

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

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

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2026-07-04T08:23:09+0000",
+ "date": "2026-07-07T13:58:00+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "41b7207a532b8d24d4a0edac7129dff08e02d789",
- "version": "2.7.0"
+ "full-revisionid": "0ca7a30d2606890cfee27aa9c615247cf1a7be67",
+ "version": "2.7.2"
 }
 '''  # END VERSION_JSON
 

drb-2.7.2/drb/drivers/xml/factory.py

@@ -0,0 +1,39 @@
+from drb.core.node import DrbNode
+from drb.nodes.logical_node import DrbLogicalNode
+from drb.core.factory import DrbFactory
+from drb.exceptions.core import DrbFactoryException
+from .node import XmlBaseNode, XmlNode
+from io import BufferedIOBase, StringIO
+from typing import Union
+from xml.etree.ElementTree import ParseError
+import os
+
+
+class XmlNodeFactory(DrbFactory):
+    def _create(self, node: DrbNode) -> DrbNode:
+        if isinstance(node, XmlNode):
+            return node
+        if node.has_impl(BufferedIOBase):
+            try:
+                return XmlBaseNode(node, node.get_impl(BufferedIOBase))
+            except ParseError as ex:
+                # The node was matched as XML (e.g. by a .xml name) but its
+                # content is not well-formed. Surface this as a factory
+                # failure so the resolver falls back to the raw node instead
+                # of aborting a whole listing on a single bad file.
+                raise DrbFactoryException(
+                    f'Not well-formed XML: {node.name}') from ex
+        raise DrbFactoryException(f'Invalid node: {type(node)}')
+
+    def create(self, source: Union[DrbNode, str]) -> DrbNode:
+        if isinstance(source, str):
+            base_node = DrbLogicalNode("/")
+            try:
+                if os.path.exists(source):
+                    return XmlBaseNode(base_node, source)[0]
+                return XmlBaseNode(base_node, StringIO(source))[0]
+            except ParseError as ex:
+                raise DrbFactoryException('Not well-formed XML') from ex
+        elif isinstance(source, DrbNode):
+            return self._create(source)
+        raise DrbFactoryException(f'Invalid parameter type: {type(source)}')

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

@@ -55,13 +55,20 @@ def _implementation_available(topic: DrbTopic) -> bool:
 
 def _load_all_drb_topic_dao() -> Dict[uuid.UUID, DrbTopicDao]:
     """
-    Loads topics defined in the Python context
+    Loads topics defined in the Python context.
+
+    All installed ``drb.topic`` descriptors are merged into a single RDF graph
+    before discovery, so a topic whose ``rdfs:subClassOf`` chain to
+    ``drb:item`` crosses a package/file boundary still resolves -- matching the
+    Java classpath, which loads every ``*-topics.ttl`` into one model. See
+    drb-testbench#19.
     """
     entry_point_group = 'drb.topic'
-    result = {}
+    result: Dict[uuid.UUID, DrbTopicDao] = {}
 
+    # Collect every installed descriptor path first.
+    paths: List[str] = []
     for ep in drb.utils.plugins.get_entry_points(entry_point_group):
-        # load module
         try:
             module = importlib.import_module(ep.value)
         except ModuleNotFoundError as ex:
@@ -73,29 +80,26 @@ def _load_all_drb_topic_dao() -> Dict[uuid.UUID, DrbTopicDao]:
             logger.warning(
                 f'No topic descriptor (cortex.ttl/.owl) for {ep.name}')
             continue
+        paths.append(path)
+
+    if not paths:
+        return result
+
+    # One merged graph across all descriptors (cross-package resolution).
+    try:
+        dao = RDFDao(paths)
+        for topic in dao.read_all():
+            if not _implementation_available(topic):
+                logger.warning(
+                    "Topic %s (%s) skipped: no installed driver "
+                    "implementation '%s' (drb.driver). Descriptor present "
+                    "but implementation required.",
+                    topic.label, topic.uri, topic.factory)
+                continue
+            result[topic.id] = dao
+    except (FileNotFoundError, ValidationError) as ex:
+        logger.warning(f'Invalid topic description(s): {ex}')
 
-        try:
-            dao = DaoFactory().create(path)
-            topics = dao.read_all()
-            for topic in topics:
-                if not _implementation_available(topic):
-                    logger.warning(
-                        "Topic %s (%s) skipped: no installed driver "
-                        "implementation '%s' (drb.driver). Descriptor present "
-                        "but implementation required.",
-                        topic.label, topic.uri, topic.factory)
-                    continue
-                if topic.id in result:
-                    logger.warning(
-                        f'Topic definition conflict: id ({topic.id}) defined '
-                        f'in {result[topic.id]} and {dao}')
-                else:
-                    result[topic.id] = dao
-
-        except (FileNotFoundError, ValidationError) as ex:
-            logger.warning(
-                f'Invalid topic description(s) from {ep.name}: {ex.msg}')
-            continue
     return result
 
 

{drb-2.7.0 → drb-2.7.2}/drb/xquery/drb_xquery_res_to_string.py

@@ -32,7 +32,7 @@ class XQueryResToString:
                 prefix = 'ns' + str(index_ns)
 
             dynamic_context.add_namespace(static_context=context,
-                                          prefix=prefix_ret,
+                                          prefix=prefix,
                                           namespace_full=namespace_uri)
         if prefix is None or len(prefix) == 0:
             namespace_def = ' xmlns' + '="' \

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

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

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

@@ -118,6 +118,7 @@ tests/test_signature_inline_flags.py
 tests/test_signatures.py
 tests/test_topic.py
 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

{drb-2.7.0 → drb-2.7.2}/tests/test_factory.py

@@ -44,7 +44,12 @@ class TestFactoryLoader(unittest.TestCase):
             'zip',
         ]
         factories = loader.get_factories()
-        self.assertEqual(13, len(factories))
+        # The test mock distribution declares 13 ``drb.driver`` entry points.
+        # Assert that baseline is present without pinning an exact total: a
+        # venv with extra ``drb-driver-*`` packages installed (http, swift,
+        # webdav, ...) legitimately loads more factories, and an exact-count
+        # assertion would spuriously fail there (drb-testbench).
+        self.assertGreaterEqual(len(factories), 13)
         expected = all(
             map(
                 lambda x: isinstance(x, DrbFactory),

{drb-2.7.0 → drb-2.7.2}/tests/test_implementation_coupling.py

@@ -39,7 +39,7 @@ class TestLoadSkipsTopicsWithoutImplementation(unittest.TestCase):
                           return_value=MagicMock(__path__=['/tmp'])), \
              patch.object(md, '_find_topic_descriptor',
                           return_value='/tmp/cortex.ttl'), \
-             patch.object(md.DaoFactory, 'create', return_value=dao):
+             patch.object(md, 'RDFDao', return_value=dao):
             result = md._load_all_drb_topic_dao()
         self.assertIn(present.id, result)
         self.assertNotIn(absent.id, result)

drb-2.7.2/tests/test_topic_merge_crosspackage.py

@@ -0,0 +1,62 @@
+"""Cross-package descriptor merge at topic discovery (drb-testbench#19).
+
+A dependent topic whose ``rdfs:subClassOf`` chain to ``drb:item`` runs through
+a parent class defined in a *separate* descriptor must still be discovered
+when both descriptors are installed -- matching the Java classpath, which
+merges all ``*-topics.ttl`` into one model. ``_load_all_drb_topic_dao`` now
+builds a single merged ``RDFDao`` over every installed descriptor; these tests
+pin the merge semantics it relies on.
+"""
+import os
+import tempfile
+import unittest
+
+from drb.topics.dao.rdf_dao import RDFDao
+
+_PARENT_TTL = """\
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix drb: <http://www.gael.fr/drb#> .
+@prefix ex: <http://example.org/drb-test#> .
+
+ex:parent a owl:Class ; rdfs:subClassOf drb:item ; rdfs:label "Test Parent" .
+"""
+
+_CHILD_TTL = """\
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix ex: <http://example.org/drb-test#> .
+
+ex:child a owl:Class ; rdfs:subClassOf ex:parent ; rdfs:label "Test Child" .
+"""
+
+
+class TestCrossPackageMerge(unittest.TestCase):
+    def setUp(self):
+        self.dir = tempfile.mkdtemp()
+        self.parent = os.path.join(self.dir, 'parent.ttl')
+        self.child = os.path.join(self.dir, 'child.ttl')
+        with open(self.parent, 'w') as f:
+            f.write(_PARENT_TTL)
+        with open(self.child, 'w') as f:
+            f.write(_CHILD_TTL)
+
+    @staticmethod
+    def _labels(dao):
+        return {t.label for t in dao.read_all()}
+
+    def test_child_absent_when_parent_in_separate_graph(self):
+        # Per-file: the child's chain to drb:item is broken because its parent
+        # lives in another descriptor -> it must NOT be discovered alone.
+        self.assertNotIn('Test Child', self._labels(RDFDao(self.child)))
+
+    def test_child_surfaces_when_descriptors_merged(self):
+        # Merged graph (what _load_all_drb_topic_dao now does): the chain
+        # child -> parent -> drb:item resolves, so the child is discovered.
+        labels = self._labels(RDFDao([self.parent, self.child]))
+        self.assertIn('Test Child', labels)
+        self.assertIn('Test Parent', labels)
+
+
+if __name__ == '__main__':
+    unittest.main()

drb-2.7.0/drb/drivers/xml/factory.py

@@ -1,27 +0,0 @@
-from drb.core.node import DrbNode
-from drb.nodes.logical_node import DrbLogicalNode
-from drb.core.factory import DrbFactory
-from drb.exceptions.core import DrbFactoryException
-from .node import XmlBaseNode, XmlNode
-from io import BufferedIOBase, StringIO
-from typing import Union
-import os
-
-
-class XmlNodeFactory(DrbFactory):
-    def _create(self, node: DrbNode) -> DrbNode:
-        if isinstance(node, XmlNode):
-            return node
-        if node.has_impl(BufferedIOBase):
-            return XmlBaseNode(node, node.get_impl(BufferedIOBase))
-        raise DrbFactoryException(f'Invalid node: {type(node)}')
-
-    def create(self, source: Union[DrbNode, str]) -> DrbNode:
-        if isinstance(source, str):
-            base_node = DrbLogicalNode("/")
-            if os.path.exists(source):
-                return XmlBaseNode(base_node, source)[0]
-            return XmlBaseNode(base_node, StringIO(source))[0]
-        elif isinstance(source, DrbNode):
-            return self._create(source)
-        raise DrbFactoryException(f'Invalid parameter type: {type(source)}')