Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Fixed

- model: `Edm.Double` and `Edm.Float` values with more than 7 significant digits (for example `3.141592653589793`) were rounded to 6 decimals in filters, keys and create/update payloads; they now keep every digit

## [1.12.2]

Expand Down
15 changes: 14 additions & 1 deletion pyodata/v2/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import io
import itertools
import logging
import math
import re
import warnings
from abc import ABC, abstractmethod
Expand Down Expand Up @@ -643,7 +644,19 @@ def edm_single():
return EdmFPNumTypTraits(7, 'f', '{:f}')

def to_literal(self, value):
return self.conversion.format(value)
literal = self.conversion.format(value)

if not isinstance(value, float) or not math.isfinite(value) or float(literal) == value:
return literal

# The conversion has a fixed number of digits (6 after the decimal point) and would silently
# change this value, so use the fewest digits that read back as the very same number.
for digits in range(7, 17):
literal = f'{value:.{digits}E}'
if float(literal) == value:
break

return literal

def to_json(self, value):
return self.to_literal(value)
Expand Down
11 changes: 11 additions & 0 deletions tests/test_model_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,17 @@ def test_traits():
assert typ.traits.to_literal(2.0) == '2.000000E+00'
assert typ.traits.to_json(2.0) == '2.000000E+00'

# values which need more than 6 digits must not lose precision
assert typ.traits.to_literal(3.141592653589793) == '3.141592653589793E+00'
assert typ.traits.to_literal(1234567.891) == '1.234567891E+06'
assert typ.traits.to_literal(0.1 + 0.2) == '3.0000000000000004E-01'
assert typ.traits.to_literal(-1.5e-10) == '-1.500000E-10'
assert typ.traits.to_json(1234567.891) == '1.234567891E+06'
assert typ.traits.from_literal(typ.traits.to_literal(1234567.891)) == 1234567.891
assert typ.traits.to_literal(float('inf')) == 'INF'
assert typ.traits.to_literal(float('nan')) == 'NAN'
assert typ.traits.to_literal(34) == '3.400000E+01'

typ = Types.from_name('Edm.Single')
assert repr(typ.traits) == 'EdmFPNumTypTraits(7,f)'
assert typ.traits.from_literal('2.029f') == 2.029
Expand Down
17 changes: 17 additions & 0 deletions tests/test_service_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,23 @@ def test_update_entity(service):
request.execute()


def test_double_values_keep_their_precision(service):
"""Edm.Double values must reach the service, as a payload and in a filter, without losing digits"""

# pylint: disable=redefined-outer-name
request = service.entity_sets.TemperatureMeasurements.update_entity(
Sensor='sensor1',
Date=datetime.datetime(2017, 12, 24, 18, 0, tzinfo=datetime.timezone.utc))
request.set(Value=1234567.891)

assert request._values['Value'] == '1.234567891E+06'

request = service.entity_sets.TemperatureMeasurements.get_entities()

assert (request.Value == 3.141592653589793) == 'Value eq 3.141592653589793E+00'
assert (request.Value >= 1234567.891) == 'Value ge 1.234567891E+06'


@responses.activate
@pytest.mark.parametrize('status', [200, 204])
def test_update_entity_accepts_ok_and_no_content(service, status):
Expand Down