Merge pull request #269 from simonsobs/koopman/bool-support

Add boolean support to feeds
simonsobs · May 26, 2022 · f2433e5 · f2433e5
2 parents bc67d61 + 8098f8f
commit f2433e5
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@
 # A container setup with an installation of ocs.
 
 # Use ubuntu base image
-FROM simonsobs/so3g:v0.1.0-117-g75c1d8d
+FROM simonsobs/so3g:v0.1.3-13-g5471f0d
 
 # Set locale
 ENV LANG C.UTF-8

diff --git a/ocs/ocs_feed.py b/ocs/ocs_feed.py
@@ -248,25 +248,23 @@ def verify_message_data_type(value):
         supported types.
 
         Args:
-            value (list, float, int):
+            value (list, float, int, bool):
                 'data' dictionary value published (see Feed.publish_message for details).
 
         """
-        valid_types = (float, int, str)
+        valid_types = (float, int, str, bool)
 
-        # separate bool checks since bool is a subclass of int
         # multi-sample check
         if isinstance(value, list):
-            if (any(isinstance(x, bool) for x in value)
-                    or not all(isinstance(x, valid_types) for x in value)):
+            if not all(isinstance(x, valid_types) for x in value):
                 type_set = set([type(x) for x in value])
                 invalid_types = type_set.difference(valid_types)
                 raise TypeError("message 'data' block contains invalid data" +
                                 f"types: {invalid_types}")
 
         # single sample check
         else:
-            if isinstance(value, bool) or not isinstance(value, valid_types):
+            if not isinstance(value, valid_types):
                 invalid_type = type(value)
                 raise TypeError("message 'data' block contains invalid " +
                                 f"data type: {invalid_type}")

diff --git a/tests/test_ocs_feed.py b/tests/test_ocs_feed.py
@@ -76,8 +76,7 @@ def test_bool_single_sample_input(self):
             }
         }
 
-        with pytest.raises(TypeError):
-            test_feed.publish_message(test_message)
+        test_feed.publish_message(test_message)
 
     def test_bool_multi_sample_input(self):
         mock_agent = MagicMock()
@@ -91,6 +90,21 @@ def test_bool_multi_sample_input(self):
             }
         }
 
+        test_feed.publish_message(test_message)
+
+    def test_invalid_single_sample_input(self):
+        mock_agent = MagicMock()
+        test_feed = ocs_feed.Feed(mock_agent, 'test_feed', record=True)
+
+        test_message = {
+            'block_name': 'test',
+            'timestamps': time.time(),
+            'data': {
+                'key1': 1.,
+                'key2': None,
+            }
+        }
+
         with pytest.raises(TypeError):
             test_feed.publish_message(test_message)