Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: change order of JSON Schema to search mapper transformations #32

Merged
merged 3 commits into from
Sep 26, 2024
Merged

fix: change order of JSON Schema to search mapper transformations #32

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43f8f9e
fix: change order of JSON Schema to search mapper transformations
ceberam Sep 25, 2024
94dccbc
build: update dependencies
ceberam Sep 25, 2024
3ee6c90
chore: improve verbose in JSON Schema to search mapper test
ceberam Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions docling_core/search/json_schema_to_search_mapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from copy import deepcopy
from typing import Any, Optional, Pattern, Tuple, TypedDict

from jsonref import JsonRef
from jsonref import replace_refs


class SearchIndexDefinition(TypedDict):
Expand Down Expand Up @@ -95,7 +95,11 @@ def get_index_definition(self, schema: dict) -> SearchIndexDefinition:
which define the fields, their data types, and other specifications to index
JSON documents into a Lucene index.
"""
mapping = JsonRef.replace_refs(schema)
mapping = deepcopy(schema)

mapping = self._suppress(mapping, self._suppress_key)

mapping = replace_refs(mapping)

mapping = self._merge_unions(mapping)

Expand All @@ -105,8 +109,6 @@ def get_index_definition(self, schema: dict) -> SearchIndexDefinition:

mapping = self._remove_keys(mapping, self._rm_keys)

mapping = self._suppress(mapping, self._suppress_key)

mapping = self._translate_keys_re(mapping)

mapping = self._clean(mapping)
Expand Down
6 changes: 1 addition & 5 deletions docs/Document.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,7 @@
"type": "string"
},
"bounding_box": {
"allOf": [
{
"$ref": "#/$defs/BoundingBoxContainer"
}
],
"$ref": "#/$defs/BoundingBoxContainer",
"x-es-suppress": true
},
"prov": {
Expand Down
2 changes: 1 addition & 1 deletion docs/Document.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6052,7 +6052,7 @@ Must be one of:
| **Type** | `object` |
| **Required** | Yes |
| **Additional properties** | [[Any type: allowed]](# "Additional Properties of any type are allowed.") |
| **Defined in** | |
| **Defined in** | #/$defs/BoundingBoxContainer |

**Description:** Bounding box container.

Expand Down
6 changes: 1 addition & 5 deletions docs/Generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,7 @@
"x-es-type": "text"
},
"file-info": {
"allOf": [
{
"$ref": "#/$defs/FileInfoObject"
}
],
"$ref": "#/$defs/FileInfoObject",
"description": "Minimal identification information of the document within a collection.",
"title": "Document information"
}
Expand Down
2 changes: 1 addition & 1 deletion docs/Generic.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
| **Type** | `object` |
| **Required** | Yes |
| **Additional properties** | [[Any type: allowed]](# "Additional Properties of any type are allowed.") |
| **Defined in** | |
| **Defined in** | #/$defs/FileInfoObject |

**Description:** Minimal identification information of the document within a collection.

Expand Down
1,055 changes: 579 additions & 476 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/test_json_schema_to_search_mapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def test_json_schema_to_search_mapper_0():
index_ref = _load(filename)

diff = jsondiff.diff(index_ref, index_def)
print(json.dumps(index_def, indent=2))
# print(json.dumps(index_def, indent=2))
print(diff)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we comment out the diff

assert index_def == index_ref
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a proper error message in case this assert fails

assert index_def == index_ref, "assert index_def != index_ref"

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case of assertion failure, pytest should already provide enough context information but nevertheless I added a commit with more verbose, including the difference.


Expand Down
Loading