Skip to content

refactor(spm): use clearer error message when getting data field dtype from dataset #132

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
Puratinamu merged 4 commits into from
Mar 27, 2025
Merged

refactor(spm): use clearer error message when getting data field dtype from dataset #132

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2cbc37c
refactor(spm): use clearer error message when getting data field dtyp…
Puratinamu Mar 26, 2025
8cb5f90
Merge branch 'develop' into clearer-get-data-field-type-errmsg
Puratinamu Mar 27, 2025
1c392f3
fix test cs client args when env present, improve dtype types map
Puratinamu Mar 27, 2025
fcb4d56
use union instead of pipe
Puratinamu Mar 27, 2025
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
5 changes: 3 additions & 2 deletions cryosparc/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from typing import Any, Callable, ClassVar, Dict, Iterator, List, Optional, Tuple, TypedDict, Union

import httpx
from pydantic import BaseModel

from . import registry
from .errors import APIError
Expand Down Expand Up @@ -392,9 +393,9 @@ def _decode_json_response(value: Any, schema: dict):
return model_class(value)
elif model_class and issubclass(model_class, dict): # typed dict
return model_class(**value)
elif model_class: # pydantic model
elif model_class and issubclass(model_class, BaseModel): # pydantic model
# use model_validate in case validator result derives from subtype, e.g., Event model
return model_class.model_validate(value) # type: ignore
return model_class.model_validate(value)
warnings.warn(
f"[API] Warning: Received API response with unregistered schema type {schema['$ref']}. "
"Returning as plain object."
Expand Down
8 changes: 5 additions & 3 deletions cryosparc/dataset/dtype.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@ def get_data_field(data: Data, field: str) -> Field:

def get_data_field_dtype(data: Data, field: str) -> "DTypeLike":
t = data.type(field)
if t == 0 or t not in DSET_TO_TYPE_MAP:
raise KeyError(f"Unknown dataset field {field} or field type {t}")
dt = n.dtype(DSET_TO_TYPE_MAP[t])
if t == 0:
raise KeyError(f"Unknown dataset field {field}")
elif t not in DSET_TO_TYPE_MAP:
raise KeyError(f"Unknown dataset field type {t}")
dt = n.dtype(DSET_TO_TYPE_MAP[t]) # type: ignore
shape = data.getshp(field)
return (dt.str, shape) if shape else dt.str

Expand Down