diff --git a/phable/kinds.py b/phable/kinds.py index ba48786..0b1aedd 100644 --- a/phable/kinds.py +++ b/phable/kinds.py @@ -71,7 +71,7 @@ class Number: [here](https://project-haystack.org/doc/docHaystack/Kinds#number). Parameters: - val: Integer or floating point value. + val: Floating point value. unit: Optional unit of measurement defined in Project Haystack's standard unit database [here](https://project-haystack.org/doc/docHaystack/Units). @@ -79,7 +79,7 @@ class Number: **Note**: Phable does not validate a defined unit at this time. """ - val: int | float + val: float unit: str | None = None def __str__(self): diff --git a/phable/parsers/json.py b/phable/parsers/json.py index a6c7beb..bae9f7a 100644 --- a/phable/parsers/json.py +++ b/phable/parsers/json.py @@ -80,7 +80,7 @@ def _dict_to_json(row: dict[str, Any]) -> dict[str, Any]: return parsed_row -def _number_to_json(num: Number) -> int | float | dict[str, str | float]: +def _number_to_json(num: Number) -> float | dict[str, str | float]: if num.unit is None: return num.val return {"_kind": "number", "val": num.val, "unit": num.unit} @@ -169,9 +169,6 @@ def _parse_number(d: dict[str, str]) -> Number: unit = d.get("unit", None) num = float(d["val"]) - if num % 1 == 0: - num = int(num) - return Number(num, unit)