Skip to content

fix(document): complete the schema for namedscore #65

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

Merged
hanxiao merged 2 commits into from
Jan 18, 2022
Merged

fix(document): complete the schema for namedscore #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cec82cd
fix(document): complete the schema for namedscore
hanxiao Jan 18, 2022
0b68ad6
fix(document): complete the schema for namedscore
hanxiao Jan 18, 2022
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
11 changes: 9 additions & 2 deletions docarray/document/pydantic_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ def _convert_ndarray_to_list(v: 'ArrayType'):
return to_list(v)


class _NamedScore(BaseModel):
value: Optional[float] = None
op_name: Optional[str] = None
description: Optional[str] = None
ref_id: Optional[str] = None


class PydanticDocument(BaseModel):
id: str
parent_id: Optional[str]
Expand All @@ -36,8 +43,8 @@ class PydanticDocument(BaseModel):
location: Optional[List[float]]
embedding: Optional[Any]
modality: Optional[str]
evaluations: Optional[Dict[str, Dict[str, '_StructValueType']]]
scores: Optional[Dict[str, Dict[str, '_StructValueType']]]
evaluations: Optional[Dict[str, '_NamedScore']]
scores: Optional[Dict[str, '_NamedScore']]
chunks: Optional[List['PydanticDocument']]
matches: Optional[List['PydanticDocument']]

Expand Down
1 change: 1 addition & 0 deletions tests/unit/test_pydantic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def test_match_to_from_pydantic():
dap = da.to_pydantic_model()
da_r = DocumentArray.from_pydantic_model(dap)
assert da_r[0].matches[0].scores['cosine']
assert isinstance(da_r[0].matches[0].scores['cosine'], NamedScore)
assert isinstance(da_r[0].matches[0].scores, defaultdict)
assert isinstance(da_r[0].matches[0].scores['random_score'], NamedScore)

Expand Down