matrice 1.0.99217__py3-none-any.whl → 1.0.99219__py3-none-any.whl

matrice/deploy/utils/post_processing/config.py

@@ -44,9 +44,10 @@ APP_NAME_TO_USECASE = {
     "drowsy_driver_detection": "drowsy_driver_detection",
     "waterbody_segmentation": "waterbody_segmentation",
     "litter_detection" : "litter_detection",
-    "human_activity_recognition": "human_activity_recognition",
     "leak_detection": "leak_detection",
     "fire_smoke_detection": "fire_smoke_detection",
+    "human_activity": "human_activity",
+    "gas_leak_detection": "gas_leak_detection",
 }
 
 APP_NAME_TO_CATEGORY = {
@@ -95,9 +96,10 @@ APP_NAME_TO_CATEGORY = {
     "drowsy_driver_detection": "automobile",
     "waterbody_segmentation": "agriculture",
     "litter_detection" : "litter_detection",
-    "human_activity_recognition": "general",
     "leak_detection": "oil_gas",
     "fire_smoke_detection": "hazard",
+    "human_activity": "general",
+    "gas_leak_detection": "oil_gas",
 }
 
 def get_usecase_from_app_name(app_name: str) -> str:

matrice/deploy/utils/post_processing/core/config.py

@@ -327,63 +327,6 @@ class PeopleCountingConfig(BaseConfig):
         
         return errors
     
-@dataclass
-class HumanActivityConfig(BaseConfig):
-    """Configuration for Human Activity use case."""
-    
-    # Smoothing configuration
-    enable_smoothing: bool = True
-    smoothing_algorithm: str = "observability"  # "window" or "observability"
-    smoothing_window_size: int = 20
-    smoothing_cooldown_frames: int = 5
-    smoothing_confidence_range_factor: float = 0.5
-    
-    # Zone configuration
-    zone_config: Optional[ZoneConfig] = None
-    
-    # Counting parameters
-    enable_unique_counting: bool = True
-    time_window_minutes: int = 60
-    
-    # Category mapping
-    activity_categories: List[str] = field(
-        default_factory=lambda: ["barbequing", "bartending", "breading or flooring", "celebrating",
-                                "clapping", "cleaning floor", "cleaning gutters", "cleaning toilet",
-                                "cleaning windows", "climbing ladder", "cooking chicken", "cooking egg",
-                                "cooking sausages", "counting money", "cutting pineapple", "cutting watermelon",
-                                "dining", "drinking", "drinking beer", "drinking shots", "eating burger", "eating cake",
-                                "eating carrots", "eating chips", "eating doughnuts", "eating hotdog", "eating ice cream",
-                                "eating spaghetti", "eating watermelon", "flipping pancake", "frying vegetables", "garbage collecting",
-                                "making a cake", "making a sandwich", "making pizza making sushi", "making tea",
-                                "mopping floor", "moving furniture", "peeling apples", "peeling potatos", "picking fruit",
-                                "reading book", "reading newspaper", "setting table", "shaking hands", "smoking", "smoking hookah",
-                                "sweeping floor", "tasting beer", "tasting food", "tossing salad", "washing hands",
-                                "washing dishes", "texting", "using computer"]
-        )
-    index_to_category: Optional[Dict[int, str]] = None
-    
-    # Alert configuration
-    alert_config: Optional[AlertConfig] = None
-    
-    def validate(self) -> List[str]:
-        """Validate human activity configuration."""
-        errors = super().validate()
-        
-        if self.time_window_minutes <= 0:
-            errors.append("time_window_minutes must be positive")
-        
-        if not self.activity_categories:
-            errors.append("activity_categories cannot be empty")
-        
-        # Validate nested configurations
-        if self.zone_config:
-            errors.extend(self.zone_config.validate())
-        
-        if self.alert_config:
-            errors.extend(self.alert_config.validate())
-        
-        return errors
-    
 
 
 @dataclass  
@@ -463,7 +406,6 @@ class ConfigManager:
             "people_counting": PeopleCountingConfig,
             "customer_service": CustomerServiceConfig,
             "advanced_customer_service": CustomerServiceConfig,
-            "human_activity_recognition": HumanActivityConfig,
             "basic_counting_tracking": None,  # Will be set later to avoid circular import
             "license_plate_detection": None,  # Will be set later to avoid circular import
             "ppe_compliance_detection": None,
@@ -514,6 +456,8 @@ class ConfigManager:
             'waterbody_segmentation': None,
             'litter_detection':None,
             'leak_detection': None,
+            'human_activity': None,
+            'gas_leak_detection': None,
 
             #Put all image based usecases here::
             'blood_cancer_detection_img': None,
@@ -926,6 +870,22 @@ class ConfigManager:
         except ImportError:
             return None
     
+    def human_activity_config_class(self):
+        """Register a configuration class for a use case."""
+        try:
+            from ..usecases.human_activity import HumanActivityRecognitionConfig
+            return HumanActivityRecognitionConfig
+        except ImportError:
+            return None
+    
+    def gas_leak_detection_config_class(self):
+        """Register a configuration class for a use case."""
+        try:
+            from ..usecases.gas_leak_detection import GasLeakConfig
+            return GasLeakConfig
+        except ImportError:
+            return None
+    
     #put all image based usecases here::
     def blood_cancer_detection_config_class(self):
         """Register a configuration class for a use case."""
@@ -1016,23 +976,6 @@ class ConfigManager:
                 alert_config=alert_config,
                 **kwargs
             )
-        elif usecase == "human_activity_recognition":
-            # Handle nested configurations
-            zone_config = kwargs.pop("zone_config", None)
-            if zone_config and isinstance(zone_config, dict):
-                zone_config = ZoneConfig(**zone_config)
-
-            alert_config = kwargs.pop("alert_config", None)
-            if alert_config and isinstance(alert_config, dict):
-                alert_config = AlertConfig(**alert_config)
-
-            config = HumanActivityConfig(
-                category=category or "general",
-                usecase=usecase,
-                zone_config=zone_config,
-                alert_config=alert_config,
-                **kwargs
-            )
         elif usecase == "basic_counting_tracking":
             # Import here to avoid circular import
             from ..usecases.basic_counting_tracking import BasicCountingTrackingConfig
@@ -1910,7 +1853,38 @@ class ConfigManager:
                 alert_config=alert_config,
                 **kwargs
             )
+        
+        elif usecase == "human_activity":
+            # Import here to avoid circular import
+            from ..usecases.human_activity import HumanActivityRecognitionConfig
+
+            alert_config = kwargs.pop("alert_config", None)
+            if alert_config and isinstance(alert_config, dict):
+                alert_config = AlertConfig(**alert_config)
+
+            config = HumanActivityRecognitionConfig(
+                category=category or "general",
+                usecase=usecase,
+                zone_config=zone_config,
+                alert_config=alert_config,
+                **kwargs
+            )
+            
+        elif usecase == "gas_leak_detection":
+            # Import here to avoid circular import
+            from ..usecases.gas_leak_detection import GasLeakConfig
 
+            # Handle nested configurations
+            alert_config = kwargs.pop("alert_config", None)
+            if alert_config and isinstance(alert_config, dict):
+                alert_config = AlertConfig(**alert_config)
+
+            config = GasLeakConfig(
+                category=category or "oil_gas",
+                usecase=usecase,
+                alert_config=alert_config,
+                **kwargs
+            )
         
         #Add IMAGE based usecases here::
         elif usecase == "blood_cancer_detection_img":
@@ -2367,6 +2341,16 @@ class ConfigManager:
             from ..usecases.leak_detection import LeakDetectionConfig
             default_config = LeakDetectionConfig()
             return default_config.to_dict()
+        elif usecase == "human_activity":
+            # Import here to avoid circular import
+            from ..usecases.human_activity import HumanActivityRecognitionConfig
+            default_config = HumanActivityRecognitionConfig()
+            return default_config.to_dict()
+        elif usecase == "gas_leak_detection":
+            # Import here to avoid circular import
+            from ..usecases.gas_leak_detection import GasLeakConfig
+            default_config = GasLeakConfig()
+            return default_config.to_dict()
 
         #Add all image based usecases here
         elif usecase == "blood_cancer_detection_img":

matrice/deploy/utils/post_processing/processor.py

@@ -31,7 +31,6 @@ from .usecases import (
     PeopleCountingUseCase,
     CustomerServiceUseCase,
     AdvancedCustomerServiceUseCase,
-    HumanActivityUseCase,
     LicensePlateUseCase,
     ColorDetectionUseCase,
     PotholeSegmentationUseCase,
@@ -62,6 +61,8 @@ from .usecases import (
     LaneDetectionUseCase,
     LitterDetectionUseCase,
     LeakDetectionUseCase,
+    HumanActivityRecognitionUseCase,
+    GasLeakUseCase,
 
 
     AgeDetectionUseCase,
@@ -222,8 +223,9 @@ class PostProcessor:
         registry.register_use_case("automobile", "drowsy_driver_detection", DrowsyDriverUseCase)
         registry.register_use_case("agriculture", "waterbody_segmentation", WaterBodyUseCase)
         registry.register_use_case("litter_detection", "litter_detection", LitterDetectionUseCase)
-        registry.register_use_case("general", "human_activity_recognition", HumanActivityUseCase)
         registry.register_use_case("oil_gas", "leak_detection", LeakDetectionUseCase)
+        registry.register_use_case("general", "human_activity", HumanActivityRecognitionUseCase)
+        registry.register_use_case("oil_gas", "gas_leak_detection", GasLeakUseCase)
 
         #Put all IMAGE based usecases here
         registry.register_use_case("healthcare", "bloodcancer_img_detection", BloodCancerDetectionUseCase)
@@ -398,6 +400,10 @@ class PostProcessor:
                 result = use_case.process(data, parsed_config, context, stream_info)
             elif isinstance(use_case, LeakDetectionUseCase):
                 result = use_case.process(data, parsed_config, context, stream_info)
+            elif isinstance(use_case, HumanActivityRecognitionUseCase):
+                result = use_case.process(data, parsed_config, context, stream_info)
+            elif isinstance(use_case, GasLeakUseCase):
+                result = use_case.process(data, parsed_config, context, stream_info)
             
             #Put all IMAGE based usecases here
             elif isinstance(use_case, BloodCancerDetectionUseCase):

matrice/deploy/utils/post_processing/usecases/__init__.py

@@ -8,7 +8,6 @@ post-processing scenarios.
 from .people_counting import PeopleCountingUseCase, PeopleCountingConfig
 from .customer_service import CustomerServiceUseCase, CustomerServiceConfig
 from .advanced_customer_service import AdvancedCustomerServiceUseCase
-from .human_activity_recognition import HumanActivityUseCase, HumanActivityConfig
 from .basic_counting_tracking import BasicCountingTrackingUseCase
 from .license_plate_detection import LicensePlateUseCase, LicensePlateConfig
 from .color_detection import ColorDetectionUseCase, ColorDetectionConfig
@@ -70,6 +69,8 @@ from .drowsy_driver_detection import DrowsyDriverUseCase, DrowsyDriverUseCase
 from .waterbody_segmentation import WaterBodyConfig, WaterBodyUseCase
 from .litter_monitoring import LitterDetectionConfig,LitterDetectionUseCase
 from .leak_detection import LeakDetectionConfig, LeakDetectionUseCase
+from .human_activity import HumanActivityRecognitionConfig, HumanActivityRecognitionUseCase
+from .gas_leak_detection import GasLeakConfig, GasLeakUseCase
 
 #Put all IMAGE based usecases here
 from .blood_cancer_detection_img import BloodCancerDetectionConfig, BloodCancerDetectionUseCase
@@ -82,7 +83,6 @@ __all__ = [
     'PeopleCountingUseCase',
     'CustomerServiceUseCase',
     'AdvancedCustomerServiceUseCase',
-    'HumanActivityUseCase',
     'BasicCountingTrackingUseCase',
     'LicensePlateUseCase',
     'ColorDetectionUseCase',
@@ -137,6 +137,8 @@ __all__ = [
     'WaterBodyUseCase',
     'LitterDetectionUseCase',
     'LeakDetectionUseCase',
+    'HumanActivityRecognitionUseCase',
+    'GasLeakUseCase',
 
     #Put all IMAGE based usecases here
     'BloodCancerDetectionUseCase',
@@ -151,7 +153,6 @@ __all__ = [
     'ParkingSpaceConfig',
     'CustomerServiceConfig',
     'AdvancedCustomerServiceConfig',
-    'HumanActivityConfig',
     'PPEComplianceConfig',
     'LicensePlateConfig',
     'PotholeConfig',
@@ -204,6 +205,8 @@ __all__ = [
     'WaterBodyConfig',
     'LitterDetectionConfig',
     'LeakDetectionConfig',
+    'HumanActivityRecognitionConfig',
+    'GasLeakConfig',
 
 
     #Put all IMAGE based usecase CONFIGS here