openmpf · brosenberg42 · Nov 14, 2023 · Feb 6, 2023 · Feb 7, 2023 · Feb 9, 2023
diff --git a/trunk/detection/executor/cpp/batch/CppComponentHandle.cpp b/trunk/detection/executor/cpp/batch/CppComponentHandle.cpp
@@ -51,10 +51,6 @@ namespace MPF::COMPONENT {
         return component_->Init();
     }
 
-    std::string CppComponentHandle::GetDetectionType() {
-        return component_->GetDetectionType();
-    }
-
     bool CppComponentHandle::Supports(MPFDetectionDataType data_type) {
         return component_->Supports(data_type);
     }

diff --git a/trunk/detection/executor/cpp/batch/CppComponentHandle.h b/trunk/detection/executor/cpp/batch/CppComponentHandle.h
@@ -47,8 +47,6 @@ namespace MPF::COMPONENT {
 
         bool Init();
 
-        std::string GetDetectionType();
-
         bool Supports(MPFDetectionDataType data_type);
 
         std::vector<MPFVideoTrack> GetDetections(const MPFVideoJob &job);

diff --git a/trunk/detection/executor/cpp/batch/MPFDetectionBuffer.cpp b/trunk/detection/executor/cpp/batch/MPFDetectionBuffer.cpp
@@ -202,7 +202,6 @@ std::vector<unsigned char> MPFDetectionBuffer::PackVideoResponse(
         const MPFDetectionDataType data_type,
         const int start_frame,
         const int stop_frame,
-        const string &detection_type,
         const MPFDetectionError error,
         const std::string &error_message) const {
 
@@ -212,7 +211,6 @@ std::vector<unsigned char> MPFDetectionBuffer::PackVideoResponse(
     DetectionResponse_VideoResponse *video_response = detection_response.add_video_responses();
     video_response->set_start_frame(start_frame);
     video_response->set_stop_frame(stop_frame);
-    video_response->set_detection_type(detection_type);
 
     for (vector<MPFVideoTrack>::const_iterator tracks_iter = tracks.begin(); tracks_iter != tracks.end(); tracks_iter++) {
         MPFVideoTrack track = *tracks_iter;
@@ -258,7 +256,6 @@ std::vector<unsigned char> MPFDetectionBuffer::PackAudioResponse(
         const MPFDetectionDataType data_type,
         const int start_time,
         const int stop_time,
-        const string &detection_type,
         const MPFDetectionError error,
         const std::string &error_message) const {
 
@@ -268,7 +265,6 @@ std::vector<unsigned char> MPFDetectionBuffer::PackAudioResponse(
     DetectionResponse_AudioResponse *audio_response = detection_response.add_audio_responses();
     audio_response->set_start_time(start_time);
     audio_response->set_stop_time(stop_time);
-    audio_response->set_detection_type(detection_type);
 
     for (vector<MPFAudioTrack>::const_iterator tracks_iter = tracks.begin(); tracks_iter != tracks.end(); tracks_iter++) {
         MPFAudioTrack track = *tracks_iter;
@@ -290,15 +286,13 @@ std::vector<unsigned char> MPFDetectionBuffer::PackImageResponse(
         const vector<MPFImageLocation> &locations,
         const MPFMessageMetadata &msg_metadata,
         const MPFDetectionDataType data_type,
-        const string &detection_type,
         const MPFDetectionError error,
         const std::string &error_message) const {
 
     DetectionResponse detection_response;
     PackCommonFields(msg_metadata, data_type, error, error_message, detection_response);
 
     DetectionResponse_ImageResponse *image_response = detection_response.add_image_responses();
-    image_response->set_detection_type(detection_type);
 
     for (vector<MPFImageLocation>::const_iterator locations_iter = locations.begin(); locations_iter != locations.end(); locations_iter++) {
         MPFImageLocation detection = *(locations_iter);
@@ -323,15 +317,13 @@ std::vector<unsigned char> MPFDetectionBuffer::PackGenericResponse(
         const vector<MPFGenericTrack> &tracks,
         const MPFMessageMetadata &msg_metadata,
         const MPFDetectionDataType data_type,
-        const string &detection_type,
         const MPFDetectionError error,
         const std::string &error_message) const {
 
     DetectionResponse detection_response;
     PackCommonFields(msg_metadata, data_type, error, error_message, detection_response);
 
     DetectionResponse_GenericResponse *generic_response = detection_response.add_generic_responses();
-    generic_response->set_detection_type(detection_type);
 
     for (vector<MPFGenericTrack>::const_iterator tracks_iter = tracks.begin(); tracks_iter != tracks.end(); tracks_iter++) {
         MPFGenericTrack track = *tracks_iter;

diff --git a/trunk/detection/executor/cpp/batch/MPFDetectionBuffer.h b/trunk/detection/executor/cpp/batch/MPFDetectionBuffer.h
@@ -135,7 +135,6 @@ class MPFDetectionBuffer {
             const MPFDetectionDataType data_type,
             const int start_frame,
             const int stop_frame,
-            const string &detection_type,
             const MPFDetectionError error,
             const std::string &error_message) const;
 
@@ -145,23 +144,20 @@ class MPFDetectionBuffer {
             const MPFDetectionDataType data_type,
             const int start_time,
             const int stop_time,
-            const string &detection_type,
             const MPFDetectionError error,
             const std::string &error_message) const;
 
     std::vector<unsigned char> PackImageResponse(
             const vector<MPFImageLocation> &locations,
             const MPFMessageMetadata &msg_metadata,
             const MPFDetectionDataType data_type,
-            const string &detection_type,
             const MPFDetectionError error,
             const std::string &error_message) const;
 
     std::vector<unsigned char> PackGenericResponse(
             const vector<MPFGenericTrack> &tracks,
             const MPFMessageMetadata &msg_metadata,
             const MPFDetectionDataType data_type,
-            const string &detection_type,
             const MPFDetectionError error,
             const std::string &error_message) const;
 

diff --git a/trunk/detection/executor/cpp/batch/PythonComponentHandle.cpp b/trunk/detection/executor/cpp/batch/PythonComponentHandle.cpp
@@ -441,7 +441,6 @@ namespace MPF::COMPONENT {
 
 
         struct ComponentAttrs {
-            std::string detection_type;
             py::function get_detections_from_image_method;
             py::function get_detections_from_video_method;
             py::function get_detections_from_audio_method;
@@ -454,8 +453,7 @@ namespace MPF::COMPONENT {
             }
 
             explicit ComponentAttrs(py::object &&component_instance)
-                : detection_type(GetDetectionType(component_instance))
-                , get_detections_from_image_method(get_method(component_instance, "get_detections_from_image"))
+                : get_detections_from_image_method(get_method(component_instance, "get_detections_from_image"))
                 , get_detections_from_video_method(get_method(component_instance, "get_detections_from_video"))
                 , get_detections_from_audio_method(get_method(component_instance, "get_detections_from_audio"))
                 , get_detections_from_generic_method(get_method(component_instance, "get_detections_from_generic"))
@@ -471,14 +469,6 @@ namespace MPF::COMPONENT {
                             "or get_detections_from_generic.");
                 }
             }
-
-        private:
-            static std::string GetDetectionType(py::handle obj) {
-                if (!py::hasattr(obj, "detection_type")) {
-                    throw ComponentLoadError("The Python component does not contain a field named \"detection_type\".");
-                }
-                return to_std_string(obj.attr("detection_type"));
-            }
         };
 
         struct LoggerAttrs {
@@ -562,11 +552,6 @@ namespace MPF::COMPONENT {
             }
         }
 
-        std::string GetDetectionType() const {
-            return component_.detection_type;
-        }
-
-
         std::vector<MPFVideoTrack> GetDetections(const MPFVideoJob &job) {
             try {
                 if (component_.get_detections_from_video_method.is_none()) {
@@ -732,11 +717,6 @@ namespace MPF::COMPONENT {
     }
 
 
-    std::string PythonComponentHandle::GetDetectionType() {
-        return impl_->GetDetectionType();
-    }
-
-
     bool PythonComponentHandle::Supports(MPFDetectionDataType data_type) {
         return impl_->Supports(data_type);
     }

diff --git a/trunk/detection/executor/cpp/batch/PythonComponentHandle.h b/trunk/detection/executor/cpp/batch/PythonComponentHandle.h
@@ -52,8 +52,6 @@ namespace MPF::COMPONENT {
 
         bool Init();
 
-        std::string GetDetectionType();
-
         bool Supports(MPFDetectionDataType data_type);
 
         std::vector<MPFVideoTrack> GetDetections(const MPFVideoJob &job);

diff --git a/trunk/detection/executor/cpp/batch/main.cpp b/trunk/detection/executor/cpp/batch/main.cpp
@@ -371,8 +371,6 @@ int run_jobs(Logger &logger, const std::string &broker_uri, const std::string &r
                 auto ctx = logger.GetJobContext(job_name);
                 logger.Info("Processing message on ", service_name, '.');
 
-                string detection_type = detection_engine.GetDetectionType();
-
                 if (detection_engine.Supports(data_type)) {
                     MPFDetectionError rc = MPF_DETECTION_SUCCESS;
                     std::string error_message;
@@ -424,7 +422,7 @@ int run_jobs(Logger &logger, const std::string &broker_uri, const std::string &r
                         detection_response_body = detection_buf.PackVideoResponse(
                                 tracks, msg_metadata, data_type,
                                 video_request.start_frame, video_request.stop_frame,
-                                detection_type, rc, error_message);
+                                rc, error_message);
 
                     } else if (data_type == MPFDetectionDataType::AUDIO) {
                         vector <MPFAudioTrack> tracks;
@@ -474,7 +472,7 @@ int run_jobs(Logger &logger, const std::string &broker_uri, const std::string &r
                         detection_response_body = detection_buf.PackAudioResponse(
                                 tracks, msg_metadata, data_type,
                                 audio_request.start_time, audio_request.stop_time,
-                                detection_type, rc, error_message);
+                                rc, error_message);
 
                     } else if (data_type == MPFDetectionDataType::IMAGE) {
                         vector <MPFImageLocation> locations;
@@ -518,7 +516,7 @@ int run_jobs(Logger &logger, const std::string &broker_uri, const std::string &r
 
                         // Pack image response
                         detection_response_body = detection_buf.PackImageResponse(
-                                locations, msg_metadata, data_type, detection_type, rc, error_message);
+                                locations, msg_metadata, data_type, rc, error_message);
 
                     } else {
                         vector <MPFGenericTrack> tracks;
@@ -563,7 +561,7 @@ int run_jobs(Logger &logger, const std::string &broker_uri, const std::string &r
 
                         // Pack generic response
                         detection_response_body = detection_buf.PackGenericResponse(
-                                tracks, msg_metadata, data_type, detection_type, rc, error_message);
+                                tracks, msg_metadata, data_type, rc, error_message);
                     }
 
                 } else {

diff --git a/trunk/detection/executor/cpp/batch/test/test_batch_executor.cpp b/trunk/detection/executor/cpp/batch/test/test_batch_executor.cpp
@@ -145,8 +145,6 @@ void assert_has_echo_properties(const Properties &properties) {
 
 TEST(PythonComponentHandleTest, TestImageJob) {
     PythonComponentHandle py_component = get_test_component();
-    ASSERT_EQ(py_component.GetDetectionType(), "TEST DETECTION TYPE");
-
     MPFImageJob job("Test Job Name", "path/to/media",
                     { { "job prop 1" , "job val 1" }, job_echo_pair },
                     { { "media prop 1" , "media val 1" }, media_echo_pair });

diff --git a/trunk/detection/executor/cpp/batch/test/test_python_components/generic_only_component.py b/trunk/detection/executor/cpp/batch/test/test_python_components/generic_only_component.py
@@ -32,8 +32,6 @@
 
 
 class GenericTestComponent(object):
-    detection_type = 'TEST GENERIC DETECTION TYPE'
-
 
     @staticmethod
     def get_detections_from_generic(generic_job):

diff --git a/trunk/detection/executor/cpp/batch/test/test_python_components/test_component.py b/trunk/detection/executor/cpp/batch/test/test_python_components/test_component.py
@@ -31,7 +31,6 @@
 logger = logging.getLogger('TestComponent')
 
 class TestComponent(object):
-    detection_type = 'TEST DETECTION TYPE'
 
     def __init__(self):
         logger.info('Creating instance of TestComponent')

diff --git a/trunk/detection/executor/cpp/cli-runner/MpfCppSdkPythonBindings.cpp b/trunk/detection/executor/cpp/cli-runner/MpfCppSdkPythonBindings.cpp
@@ -173,9 +173,6 @@ PYBIND11_MODULE(mpf_cpp_sdk, m) {
             .def("Close",
                     [](CppComponent& c) { return c->Close(); },
                     call_guard_t())
-            .def("GetDetectionType",
-                    [](CppComponent& c) { return c->GetDetectionType();  },
-                    call_guard_t())
             .def("Supports",
                     [](CppComponent& c, MPFDetectionDataType type) { return c->Supports(type); },
                     "data_type"_a,

diff --git a/trunk/detection/executor/cpp/streaming/BasicAmqMessageSender.cpp b/trunk/detection/executor/cpp/streaming/BasicAmqMessageSender.cpp
@@ -97,7 +97,6 @@ namespace MPF { namespace COMPONENT {
 
 
     void BasicAmqMessageSender::SendSummaryReport(int frame_number,
-                                                  const std::string &detection_type,
                                                   const std::vector<MPFVideoTrack> &tracks,
                                                   const std::unordered_map<int, long> &frame_timestamps,
                                                   const std::string &error_message) {
@@ -107,7 +106,6 @@ namespace MPF { namespace COMPONENT {
         protobuf_response.set_segment_number(segment_number);
         protobuf_response.set_segment_start_frame(segment_size_ * segment_number);
         protobuf_response.set_segment_stop_frame(frame_number);
-        protobuf_response.set_detection_type(detection_type);
         if (!error_message.empty())  {
             protobuf_response.set_error(error_message);
         }

diff --git a/trunk/detection/executor/cpp/streaming/BasicAmqMessageSender.h b/trunk/detection/executor/cpp/streaming/BasicAmqMessageSender.h
@@ -58,7 +58,7 @@ namespace MPF { namespace COMPONENT {
         void SendActivityAlert(int frame_number, long timestamp);
 
         void SendSummaryReport(
-                int frame_number, const std::string &detection_type,
+                int frame_number,
                 const std::vector<MPF::COMPONENT::MPFVideoTrack> &tracks,
                 const std::unordered_map<int, long> &frame_timestamps,
                 const std::string &error_message = {});

diff --git a/trunk/detection/executor/cpp/streaming/MessageUtils/MPFAMQMessage.h b/trunk/detection/executor/cpp/streaming/MessageUtils/MPFAMQMessage.h
@@ -69,7 +69,6 @@ class AMQSegmentSummaryConverter : public AMQMessageConverter<MPFSegmentSummaryM
         int seg_num = -1;
         int start_frame = -1;
         int stop_frame = -1;
-        std::string detection_type;
         MPF::COMPONENT::MPFDetectionError err = MPF::COMPONENT::MPFDetectionError::MPF_DETECTION_SUCCESS;
 
         const cms::BytesMessage &bytes_msg = dynamic_cast<const cms::BytesMessage&>(msg);
@@ -82,7 +81,6 @@ class AMQSegmentSummaryConverter : public AMQMessageConverter<MPFSegmentSummaryM
             seg_num = response.segment_number();
             start_frame = response.start_frame();
             stop_frame = response.stop_frame();
-            detection_type = response.detection_type();
             err = translateProtobufError(response.error());
             for (auto &msg_track : response.video_tracks()) {
                 MPF::COMPONENT::MPFVideoTrack mpf_track;
@@ -117,8 +115,7 @@ class AMQSegmentSummaryConverter : public AMQMessageConverter<MPFSegmentSummaryM
         return MPFSegmentSummaryMessage(msg.getStringProperty("JOB_NAME"),
                                         msg.getIntProperty("JOB_ID"),
                                         seg_num, start_frame, stop_frame,
-                                        detection_type, err,
-                                        mpfTracks);
+                                        err, mpfTracks);
     }
 
     virtual void toCMSMessage(const MPFSegmentSummaryMessage &mpfMsg, cms::Message &msg) override {
@@ -132,7 +129,6 @@ class AMQSegmentSummaryConverter : public AMQMessageConverter<MPFSegmentSummaryM
         response.set_segment_number(mpfMsg.segment_number_);
         response.set_start_frame(mpfMsg.segment_start_frame_);
         response.set_stop_frame(mpfMsg.segment_stop_frame_);
-        response.set_detection_type(mpfMsg.detection_type_);
         response.set_error(translateMPFDetectionError(mpfMsg.segment_error_));
 
         for (auto &track : mpfMsg.tracks_) {

diff --git a/trunk/detection/executor/cpp/streaming/MessageUtils/MPFMessage.h b/trunk/detection/executor/cpp/streaming/MessageUtils/MPFMessage.h
@@ -51,7 +51,6 @@ struct MPFSegmentSummaryMessage : MPFMessage {
     int segment_number_;
     int segment_start_frame_;
     int segment_stop_frame_;
-    std::string detection_type_;  // such as: "FACE", "PERSON", "MOTION"
     MPF::COMPONENT::MPFDetectionError segment_error_;
     std::vector<MPF::COMPONENT::MPFVideoTrack> tracks_;
     MPFSegmentSummaryMessage() = default;
@@ -60,14 +59,12 @@ struct MPFSegmentSummaryMessage : MPFMessage {
                              const int seg_num,
                              const int start_frame,
                              const int stop_frame,
-                             const std::string type,
                              MPF::COMPONENT::MPFDetectionError error,
                              const std::vector<MPF::COMPONENT::MPFVideoTrack> &tracks)
             : MPFMessage(job_name, job_number),
               segment_number_(seg_num),
               segment_start_frame_(start_frame),
               segment_stop_frame_(stop_frame),
-              detection_type_(type),
               segment_error_(error),
               tracks_(tracks) {}
     ~MPFSegmentSummaryMessage() = default;

diff --git a/trunk/detection/executor/cpp/streaming/MessageUtils/test/test_messenger.cpp b/trunk/detection/executor/cpp/streaming/MessageUtils/test/test_messenger.cpp
@@ -244,7 +244,6 @@ TEST_F(AMQMessengerTest, TestSegmentSummaryMessage) {
     EXPECT_EQ(seg_num, dst_msg.segment_number_);
     EXPECT_EQ(start_frame, dst_msg.segment_start_frame_);
     EXPECT_EQ(stop_frame, dst_msg.segment_stop_frame_);
-    EXPECT_EQ(type, dst_msg.detection_type_);
     EXPECT_EQ(err, dst_msg.segment_error_);
 
     // Check the segment summary tracks