Merge pull request #20 from run-ai/omer/fix-test-encoded-buffer

Fix FileStreamer output encoded

.github/workflows/on-pr.yaml

@@ -17,7 +17,7 @@ jobs:
       uses: devcontainers/[email protected]
       with:
         runCmd: |
-          make test
+          make test && \
           PACKAGE_VERSION=${{ env.PACKAGE_VERSION }} make build
 
     - name: Set package file names

Makefile

@@ -1,16 +1,16 @@
 .PHONY: build test install
 
 build:
-	make -C cpp clean
-	make -C py clean
-	make -C cpp build
+	make -C cpp clean && \
+	make -C py clean && \
+	make -C cpp build && \
 	make -C py build
 
 install: build
 	make -C py install
 
 test: install
-	make -C cpp test
-	make -C py test
+	make -C cpp test && \
+	make -C py test && \
 	make -C tests all
 

cpp/Makefile

@@ -1,7 +1,7 @@
 .PHONY: build build_mock test
 
 build:
-	bazel build streamer:libstreamer.so
+	bazel build streamer:libstreamer.so && \
 	bazel build --define USE_SYSTEM_LIBS=${USE_SYSTEM_LIBS} s3:libstreamers3.so
 
 build_mock:

py/runai_model_streamer/runai_model_streamer/file_streamer/tests/test_file_streamer.py

@@ -30,7 +30,7 @@ def test_runai_library(self):
             for id, dst, offset in fs.get_chunks():
                 self.assertEqual(offset, id_to_results[id]["expected_offset"])
                 self.assertEqual(
-                    dst[offset : offset + request_sizes[id]].decode("utf-8"),
+                    dst[offset : offset + request_sizes[id]].tobytes().decode("utf-8"),
                     id_to_results[id]["expected_text"],
                 )
 
@@ -63,7 +63,7 @@ def test_min_memory_cap(self, mock_get_memory_mode):
             for id, dst, offset in fs.get_chunks():
                 self.assertEqual(offset, id_to_results[id]["expected_offset"])
                 self.assertEqual(
-                    dst[offset : offset + request_sizes[id]].decode("utf-8"),
+                    dst[offset : offset + request_sizes[id]].tobytes().decode("utf-8"),
                     id_to_results[id]["expected_text"],
                 )
 
@@ -95,7 +95,7 @@ def test_limited_memory_cap(self, mock_get_memory_mode, mock_getenv):
             for id, dst, offset in fs.get_chunks():
                 self.assertEqual(offset, id_to_results[id]["expected_offset"])
                 self.assertEqual(
-                    dst[offset : offset + request_sizes[id]].decode("utf-8"),
+                    dst[offset : offset + request_sizes[id]].tobytes().decode("utf-8"),
                     id_to_results[id]["expected_text"],
                 )
 

tests/fuzzing/test_file_streamer.py

@@ -69,7 +69,7 @@ def test_file_streamer(self):
             for id, dst, offset in fs.get_chunks():
                 self.assertEqual(offset, expected_id_to_results[id]["expected_offset"])
                 self.assertEqual(
-                    dst[offset : offset + request_sizes[id]],
+                    dst[offset : offset + request_sizes[id]].tobytes(),
                     expected_id_to_results[id]["expected_content"],
                 )