Skip to content

Reduce logging of validation errors from unpacking messages #233

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

Open
PeterC-DLS wants to merge 1 commit into
base: update-dev-dependencies
Choose a base branch
from
+10 −7
Open

Reduce logging of validation errors from unpacking messages #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions server/davidia/server/fastapi_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,15 @@ async def root_request(payload: MyModel) -> OtherModel:

def _instantiate_obj(model_class, obj):
if isinstance(model_class, UnionType):
excs = {}
for m in get_args(model_class):
try:
return m.model_validate(obj)
except ValidationError:
logger.warning(
"Could not validate as %s: %s", m, obj, exc_info=True
)
except ValidationError as e:
excs[m] = e
logger.error("No valid models for", obj)
for m,e in excs.items():
logger.error("%s: %s", m, e)
return None

if isinstance(obj, BaseModel):
Expand Down
8 changes: 5 additions & 3 deletions server/demos/simple.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from davidia.models.selections import AnySelection
from time import sleep

import numpy as np
Expand Down Expand Up @@ -179,8 +180,7 @@ def table_demo(p):


def regions_demo(p):
region(
selections=[
selections: list[AnySelection] = [
RectangularSelection(
start=(3.5, 6.5),
lengths=(3.2, 2.0),
Expand All @@ -191,7 +191,9 @@ def regions_demo(p):
LinearSelection(
start=(6.9, 10.5), length=2.0, angle=1.1, colour="cyan", alpha=0.6
),
],
]
region(
selections=selections,
plot_id=f"plot_{p}",
)
rs = region(plot_id=f"plot_{p}")
Expand Down