Fix tests

This commit is contained in:
Cyber MacGeddon 2026-04-21 13:32:24 +01:00
parent c89e5dd1d8
commit bc1a7c1c44
2 changed files with 12 additions and 24 deletions

View file

@ -285,7 +285,7 @@ class TestRowEmbeddingsProcessor(IsolatedAsyncioTestCase):
} }
processor = Processor(**config) processor = Processor(**config)
processor.known_collections[('test_user', 'test_collection')] = {} processor.known_collections[('default', 'test_collection')] = {}
# No schemas registered # No schemas registered
metadata = MagicMock() metadata = MagicMock()
@ -322,7 +322,7 @@ class TestRowEmbeddingsProcessor(IsolatedAsyncioTestCase):
} }
processor = Processor(**config) processor = Processor(**config)
processor.known_collections[('test_user', 'test_collection')] = {} processor.known_collections[('default', 'test_collection')] = {}
# Set up schema # Set up schema
processor.schemas["default"] = { processor.schemas["default"] = {

View file

@ -36,7 +36,6 @@ def _ge_response_dict():
"metadata": { "metadata": {
"id": "doc-1", "id": "doc-1",
"root": "", "root": "",
"user": "alice",
"collection": "testcoll", "collection": "testcoll",
}, },
"entities": [ "entities": [
@ -59,7 +58,6 @@ def _triples_response_dict():
"metadata": { "metadata": {
"id": "doc-1", "id": "doc-1",
"root": "", "root": "",
"user": "alice",
"collection": "testcoll", "collection": "testcoll",
}, },
"triples": [ "triples": [
@ -73,9 +71,9 @@ def _triples_response_dict():
} }
def _make_request(id_="doc-1", user="alice"): def _make_request(id_="doc-1", workspace="alice"):
request = Mock() request = Mock()
request.query = {"id": id_, "user": user} request.query = {"id": id_, "workspace": workspace}
return request return request
@ -149,12 +147,8 @@ class TestCoreExportWireFormat:
msg_type, payload = items[0] msg_type, payload = items[0]
assert msg_type == "ge" assert msg_type == "ge"
# Metadata envelope: only id/user/collection — no stale `m["m"]`. # Metadata envelope: only id/collection — no stale `m["m"]`.
assert payload["m"] == { assert payload["m"] == {"i": "doc-1", "c": "testcoll"}
"i": "doc-1",
"u": "alice",
"c": "testcoll",
}
# Entities: each carries the *singular* `v` and the term envelope # Entities: each carries the *singular* `v` and the term envelope
assert len(payload["e"]) == 2 assert len(payload["e"]) == 2
@ -202,11 +196,7 @@ class TestCoreExportWireFormat:
msg_type, payload = items[0] msg_type, payload = items[0]
assert msg_type == "t" assert msg_type == "t"
assert payload["m"] == { assert payload["m"] == {"i": "doc-1", "c": "testcoll"}
"i": "doc-1",
"u": "alice",
"c": "testcoll",
}
assert len(payload["t"]) == 1 assert len(payload["t"]) == 1
@ -240,7 +230,7 @@ class TestCoreImportWireFormat:
payload = msgpack.packb(( payload = msgpack.packb((
"ge", "ge",
{ {
"m": {"i": "doc-1", "u": "alice", "c": "testcoll"}, "m": {"i": "doc-1", "c": "testcoll"},
"e": [ "e": [
{ {
"e": {"t": "i", "i": "http://example.org/alice"}, "e": {"t": "i", "i": "http://example.org/alice"},
@ -266,7 +256,7 @@ class TestCoreImportWireFormat:
req = captured[0] req = captured[0]
assert req["operation"] == "put-kg-core" assert req["operation"] == "put-kg-core"
assert req["user"] == "alice" assert req["workspace"] == "alice"
assert req["id"] == "doc-1" assert req["id"] == "doc-1"
ge = req["graph-embeddings"] ge = req["graph-embeddings"]
@ -275,7 +265,6 @@ class TestCoreImportWireFormat:
assert "metadata" not in ge["metadata"] assert "metadata" not in ge["metadata"]
assert ge["metadata"] == { assert ge["metadata"] == {
"id": "doc-1", "id": "doc-1",
"user": "alice",
"collection": "default", "collection": "default",
} }
@ -302,7 +291,7 @@ class TestCoreImportWireFormat:
payload = msgpack.packb(( payload = msgpack.packb((
"t", "t",
{ {
"m": {"i": "doc-1", "u": "alice", "c": "testcoll"}, "m": {"i": "doc-1", "c": "testcoll"},
"t": [ "t": [
{ {
"s": {"t": "i", "i": "http://example.org/alice"}, "s": {"t": "i", "i": "http://example.org/alice"},
@ -407,11 +396,10 @@ class TestCoreImportExportRoundTrip:
original = _ge_response_dict()["graph-embeddings"] original = _ge_response_dict()["graph-embeddings"]
ge = req["graph-embeddings"] ge = req["graph-embeddings"]
# The import side overrides id/user from the URL query (intentional), # The import side overrides id from the URL query (intentional),
# so we only round-trip the entity payload itself. # so we only round-trip the entity payload itself.
assert ge["metadata"]["id"] == original["metadata"]["id"] assert ge["metadata"]["id"] == original["metadata"]["id"]
assert ge["metadata"]["user"] == original["metadata"]["user"]
assert len(ge["entities"]) == len(original["entities"]) assert len(ge["entities"]) == len(original["entities"])
for got, want in zip(ge["entities"], original["entities"]): for got, want in zip(ge["entities"], original["entities"]):
assert got["vector"] == want["vector"] assert got["vector"] == want["vector"]