Merge branch 'master' of https://github.com/sirixdb/sirix-python-client

# Conflicts:
#	pysirix/json_store.py
#	pysirix/sync_client.py
#	tests/test_resource_sync.py
#	tests/test_sirix_async.py

Author: Johannes Lichtenberger

pysirix/json_store.py

@@ -104,7 +104,7 @@ def insert_many(
         """
         Inserts a list of records into the store. New records are added at the the tail of the store.
 
-        :param insert_list: either a JSON string of ``list`` of ``dict``\\s, or a ``list`` that can be converted to JSON
+        :param insert_list: either a JSON string of ``list`` of ``dict``s, or a ``list`` that can be converted to JSON
         :return: a ``str`` "{rest: []}" or an ``Awaitable[str]`` resolving to this string.
         """
         insert_list = dumps(insert_list)

pysirix/sync_client.py

@@ -26,7 +26,7 @@ def global_info(self, resources: bool = True) -> List[Dict]:
         the endpoint is called with the query ``withResources=true``
 
         :param resources: whether to query resources as well
-        :return: a ``list`` of ``dict``\\s, where each ``dict`` has a ``name``
+        :return: a ``list`` of ``dict``s, where each ``dict`` has a ``name``
                         field, a ``type`` field, and (if ``resources`` is
                         ``True``) a ``resources`` field (containing a ``list`` of names).
         :raises: :py:class:`pysirix.SirixServerError`.

tests/test_resource_sync.py

@@ -92,16 +92,18 @@ def test_update_nonexistent_node():
 def test_read_metadata():
     resource.create([])
     resp = resource.read_with_metadata(1, 1)
-    assert resp == {
-        "metadata": {
-            "nodeKey": 1,
-            "hash": "4b5c047d20e75862",
-            "type": "ARRAY",
-            "descendantCount": 0,
-            "childCount": 0,
-        },
-        "value": [],
-    }
+    metadata = resp["metadata"]
+    # Verify hash exists and is a 16-character hex string
+    assert "hash" in metadata
+    assert isinstance(metadata["hash"], str)
+    assert len(metadata["hash"]) == 16
+    assert all(c in "0123456789abcdef" for c in metadata["hash"])
+    # Verify other metadata fields
+    assert metadata["nodeKey"] == 1
+    assert metadata["type"] == "ARRAY"
+    assert metadata["descendantCount"] == 0
+    assert metadata["childCount"] == 0
+    assert resp["value"] == []
 
 
 def test_read_metadata_key_only():

tests/test_sirix_async.py

@@ -216,16 +216,18 @@ async def test_read_metadata():
     resource = db.resource("test_resource29")
     await resource.create([])
     resp = await resource.read_with_metadata(1, 1)
-    assert resp == {
-        "metadata": {
-            "nodeKey": 1,
-            "hash": "4b5c047d20e75862",
-            "type": "ARRAY",
-            "descendantCount": 0,
-            "childCount": 0,
-        },
-        "value": [],
-    }
+    metadata = resp["metadata"]
+    # Verify hash exists and is a 16-character hex string
+    assert "hash" in metadata
+    assert isinstance(metadata["hash"], str)
+    assert len(metadata["hash"]) == 16
+    assert all(c in "0123456789abcdef" for c in metadata["hash"])
+    # Verify other metadata fields
+    assert metadata["nodeKey"] == 1
+    assert metadata["type"] == "ARRAY"
+    assert metadata["descendantCount"] == 0
+    assert metadata["childCount"] == 0
+    assert resp["value"] == []
     await sirix.delete_all()
     await client.aclose()