Merge pull request #33 from dls-controls/bump

Bump to latest versions and fix NaN issue
DiamondLightSource · Apr 22, 2022 · 56cb10b · 56cb10b
2 parents 0f56812 + 90d4f8e
commit 56cb10b
Show file tree

Hide file tree

Showing 9 changed files with 357 additions and 182 deletions.
diff --git a/.readthedocs.yml b/.readthedocs.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/docs/images/dls-favicon.ico b/docs/images/dls-favicon.ico
diff --git a/docs/images/dls-logo.svg b/docs/images/dls-logo.svg
diff --git a/src/coniql/types.py b/src/coniql/types.py
@@ -54,8 +54,9 @@ def make_number_format_string(
     return "{:.%df}" % precision
 
 
-def return_unchanged(value):
-    return value
+def return_if_number(value):
+    if math.isfinite(value):
+        return value
 
 
 def return_none(*args, **kwargs):
@@ -77,7 +78,7 @@ def for_number(
             to_string=number_format_string.format,
             to_string_with_units=units_format_string.format,
             # number -> float just returns the number
-            to_float=return_unchanged,
+            to_float=return_if_number,
         )
         return formatter
 

diff --git a/tests/soft_records.db b/tests/soft_records.db
@@ -45,4 +45,8 @@ record (mbbi, "$(P)enum") {
     field(THVL, "4")
     field(VAL, "3")
     field(PINI, "YES")
-}
+}
+
+record(ao, "$(P)nan") {
+  field(VAL, "NaN")
+}
diff --git a/tests/test_caplugin.py b/tests/test_caplugin.py
@@ -1,4 +1,5 @@
 import json
+import math
 import random
 import string
 import subprocess
@@ -11,7 +12,7 @@
 from unittest.mock import ANY
 
 import pytest
-from aioca import purge_channel_caches
+from aioca import caget, purge_channel_caches
 from tartiflette import Engine
 
 from coniql.app import make_context
@@ -133,6 +134,26 @@ async def test_get_str_pv(engine: Engine, ioc: Popen):
     assert result == dict(data=dict(getChannel=dict(value=dict(string="longout"))))
 
 
+@pytest.mark.asyncio
+async def test_get_nan_pv(engine: Engine, ioc: Popen):
+    query = (
+        """
+query {
+    getChannel(id: "ca://%snan") {
+        value {
+            float
+        }
+    }
+}
+"""
+        % PV_PREFIX
+    )
+    val = await caget(PV_PREFIX + "nan")
+    assert math.isnan(val)
+    result = await engine.execute(query, context=make_context())
+    assert result == dict(data=dict(getChannel=dict(value=dict(float=None))))
+
+
 @pytest.mark.asyncio
 async def test_get_enum_pv(engine: Engine, ioc: Popen):
     query = (