Add override for count method in SlicedMessageMeta (nv-morpheus#972)

* Fixes bug(nv-morpheus#970) where the count of a `SlicedMessageMeta` always reflects the total number of rows in the underlying DF not the slice.

Authors:
  - David Gardner (https://github.com/dagardner-nv)

Approvers:
  - Michael Demoret (https://github.com/mdemoret-nv)

URL: nv-morpheus#972

morpheus.code-workspace

@@ -54,7 +54,8 @@
 			"tests"
 		],
 		"python.testing.unittestEnabled": false,
-		"python.testing.pytestEnabled": true
+		"python.testing.pytestEnabled": true,
+		"cmake.format.allowOptionalArgumentIndentation": true
 	},
 	"launch": {
 		"configurations": [
@@ -188,7 +189,7 @@
 					"--model_max_batch_size=1024",
 					"--use_cpp=False",
 					"pipeline-ae",
-                    "--userid_column_name=userIdentitysessionContextsessionIssueruserName",
+					"--userid_column_name=userIdentitysessionContextsessionIssueruserName",
 					"--userid_filter=user123",
 					"from-cloudtrail",
 					"--input_glob=models/datasets/validation-data/dfp-cloudtrail-*-input.csv",

morpheus/_lib/include/morpheus/messages/meta.hpp

@@ -51,11 +51,11 @@ class MessageMeta
 {
   public:
     /**
-     * @brief Get the py table object
+     * @brief Get the row count of the underlying DataFrame
      *
-     * @return pybind11::object
+     * @return TensorIndex
      */
-    TensorIndex count() const;
+    virtual TensorIndex count() const;
 
     /**
      * @brief Get the info object
@@ -132,6 +132,8 @@ class SlicedMessageMeta : public MessageMeta
                       TensorIndex stop                 = -1,
                       std::vector<std::string> columns = {});
 
+    TensorIndex count() const override;
+
     TableInfo get_info() const override;
 
     MutableTableInfo get_mutable_info() const override;

morpheus/_lib/src/messages/meta.cpp

@@ -195,6 +195,11 @@ SlicedMessageMeta::SlicedMessageMeta(std::shared_ptr<MessageMeta> other,
   m_column_names(std::move(columns))
 {}
 
+TensorIndex SlicedMessageMeta::count() const
+{
+    return m_stop - m_start;
+}
+
 TableInfo SlicedMessageMeta::get_info() const
 {
     return this->m_data->get_info().get_slice(m_start, m_stop, m_column_names);

morpheus/_lib/tests/CMakeLists.txt

@@ -24,6 +24,7 @@ add_executable(test_libmorpheus
   io/test_data_loader_registry.cpp
   io/test_loaders.cpp
   messages/test_control_message.cpp
+  messages/test_sliced_message_meta.cpp
   modules/test_data_loader_module.cpp
   test_deserializers.cpp
   test_dev_mem_info.cpp

morpheus/_lib/tests/messages/test_sliced_message_meta.cpp

@@ -0,0 +1,76 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "../test_morpheus.hpp"  // IWYU pragma: associated
+
+#include "morpheus/io/deserializers.hpp"     // for load_table_from_file, prepare_df_index
+#include "morpheus/messages/meta.hpp"        // for MessageMeta and SlicedMessageMeta
+#include "morpheus/objects/table_info.hpp"   // for TableInfo
+#include "morpheus/utilities/cudf_util.hpp"  // for CudfHelper
+
+#include <gtest/gtest.h>
+#include <pybind11/gil.h>       // for gil_scoped_release, gil_scoped_acquire
+#include <pybind11/pybind11.h>  // IWYU pragma: keep
+
+#include <filesystem>  // for std::filesystem::path
+#include <memory>      // for shared_ptr
+#include <utility>     // for move
+
+using namespace morpheus;
+
+class TestSlicedMessageMeta : public morpheus::test::TestWithPythonInterpreter
+{
+  protected:
+    void SetUp() override
+    {
+        morpheus::test::TestWithPythonInterpreter::SetUp();
+        {
+            pybind11::gil_scoped_acquire gil;
+
+            // Initially I ran into an issue bootstrapping cudf, I was able to work-around the issue, details in:
+            // https://github.com/rapidsai/cudf/issues/12862
+            CudfHelper::load();
+        }
+    }
+};
+
+TEST_F(TestSlicedMessageMeta, TestCount)
+{
+    // Test for issue #970
+    auto test_data_dir = test::get_morpheus_root() / "tests/tests_data";
+
+    auto input_file{test_data_dir / "filter_probs.csv"};
+
+    auto table           = load_table_from_file(input_file);
+    auto index_col_count = prepare_df_index(table);
+
+    auto meta = MessageMeta::create_from_cpp(std::move(table), index_col_count);
+    EXPECT_EQ(meta->count(), 20);
+
+    SlicedMessageMeta sliced_meta(meta, 5, 15);
+    EXPECT_EQ(sliced_meta.count(), 10);
+
+    // Ensure the count value matches the table info
+    pybind11::gil_scoped_release no_gil;
+    EXPECT_EQ(sliced_meta.get_info().num_rows(), sliced_meta.count());
+
+    // ensure count is correct when using a pointer to the parent class which is the way Python will use it
+    auto p_sliced_meta = std::make_shared<SlicedMessageMeta>(meta, 5, 15);
+    auto p_meta        = std::dynamic_pointer_cast<MessageMeta>(p_sliced_meta);
+    EXPECT_EQ(p_meta->count(), 10);
+    EXPECT_EQ(p_meta->get_info().num_rows(), p_meta->count());
+}