onvif-python 0.1.6__tar.gz → 0.1.7__tar.gz

{onvif_python-0.1.6/onvif_python.egg-info → onvif_python-0.1.7}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: onvif-python
-Version: 0.1.6
+Version: 0.1.7
 Summary: A comprehensive and developer-friendly Python library for working with ONVIF-compliant devices
 Author-email: Nirsimetri Technologies® <open@nirsimetri.com>
 Maintainer: Kaburagi
 License-Expression: MIT
+Project-URL: Homepage, https://github.com/nirsimetri/onvif-python
 Project-URL: Documentation, https://deepwiki.com/nirsimetri/onvif-python
 Project-URL: Changelog, https://github.com/nirsimetri/onvif-python/releases
 Keywords: onvif,Camera,onvif-python,ip-camera,cctv,soap,surveillance,cctv cameras,soap-client,onvif-client,onvif-library,onvif-specifications
@@ -40,7 +41,7 @@ Dynamic: license-file
 
 [![Codacy grade](https://img.shields.io/codacy/grade/bff08a94e4d447b690cea49c6594826d?label=Project%20Quality&logo=codacy)](https://app.codacy.com/gh/nirsimetri/onvif-python/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/nirsimetri/onvif-python)
-[![PyPI](https://img.shields.io/badge/PyPI-0.1.6-orange?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.1.7-orange?logo=archive)](https://pypi.org/project/onvif-python/)
 [![Downloads](https://img.shields.io/pypi/dm/onvif-python?label=Downloads&color=red)](https://clickpy.clickhouse.com/dashboard/onvif-python)
 <br>
 [![Build](https://github.com/nirsimetri/onvif-python/actions/workflows/python-app.yml/badge.svg?branch=main)](https://github.com/nirsimetri/onvif-python/actions/workflows/python-app.yml)
@@ -107,6 +108,10 @@ discovery = ONVIFDiscovery(timeout=5)
 # Discover devices
 devices = discovery.discover()
 
+# Or with
+# Discover with search filter by types or scopes (case-insensitive substring match)
+devices = discovery.discover(search="Profile/Streaming")
+
 # Display discovered devices
 for device in devices:
     print(f"Found device at {device['host']}:{device['port']}")
@@ -232,11 +237,12 @@ This library includes a powerful command-line interface (CLI) for interacting wi
 <summary><b>1. Direct CLI</b></summary> 
 
 ```bash
-usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password PASSWORD] [--discover] [--timeout TIMEOUT] [--https] [--no-verify]
-             [--no-patch] [--interactive] [--debug] [--wsdl WSDL] [--cache {all,db,mem,none}] [--health-check-interval HEALTH_CHECK_INTERVAL] [--version]
+usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password PASSWORD] [--discover] [--search SEARCH] [--timeout TIMEOUT] [--https]
+             [--no-verify] [--no-patch] [--interactive] [--debug] [--wsdl WSDL] [--cache {all,db,mem,none}]
+             [--health-check-interval HEALTH_CHECK_INTERVAL] [--version]
              [service] [method] [params ...]
 
-ONVIF Terminal Client — v0.1.6
+ONVIF Terminal Client — v0.1.7
 https://github.com/nirsimetri/onvif-python
 
 positional arguments:
@@ -253,6 +259,8 @@ options:
   --password PASSWORD, -p PASSWORD
                         Password for authentication
   --discover, -d        Discover ONVIF devices on the network using WS-Discovery
+  --search SEARCH, -s SEARCH
+                        Filter discovered devices by types or scopes (case-insensitive substring match)
   --timeout TIMEOUT     Connection timeout in seconds (default: 10)
   --https               Use HTTPS instead of HTTP
   --no-verify           Disable SSL certificate verification
@@ -272,6 +280,11 @@ Examples:
   onvif media GetProfiles --discover --username admin
   onvif -d -i
 
+  # Discover with filtering
+  onvif --discover --search ptz --interactive
+  onvif -d -s "C210" -i
+  onvif -d -s "audio_encoder" -u admin -p admin123 -i
+
   # Direct command execution
   onvif devicemgmt GetCapabilities Category=All --host 192.168.1.17 --port 8000 --username admin --password admin123
   onvif ptz ContinuousMove ProfileToken=Profile_1 Velocity={"PanTilt": {"x": -0.1, "y": 0}} --host 192.168.1.17 --port 8000 --username admin --password admin123
@@ -293,7 +306,7 @@ Examples:
 <summary><b>2. Interactive Shell</b></summary> 
 
 ```bash
-ONVIF Interactive Shell Commands - v0.1.6
+ONVIF Interactive Shell — v0.1.7
 https://github.com/nirsimetri/onvif-python
 
 Basic Commands:
@@ -426,6 +439,10 @@ onvif --discover --username admin --password admin123 --interactive
 # Short form
 onvif -d -u admin -p admin123 -i
 
+# Discover with search filter
+onvif --discover --search "C210" --interactive
+onvif -d -s ptz -u admin -p admin123 -i
+
 # Discover and interactive (will prompt for credentials)
 onvif -d -i
 ```

{onvif_python-0.1.6 → onvif_python-0.1.7}/README.md

@@ -2,7 +2,7 @@
 
 [![Codacy grade](https://img.shields.io/codacy/grade/bff08a94e4d447b690cea49c6594826d?label=Project%20Quality&logo=codacy)](https://app.codacy.com/gh/nirsimetri/onvif-python/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/nirsimetri/onvif-python)
-[![PyPI](https://img.shields.io/badge/PyPI-0.1.6-orange?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.1.7-orange?logo=archive)](https://pypi.org/project/onvif-python/)
 [![Downloads](https://img.shields.io/pypi/dm/onvif-python?label=Downloads&color=red)](https://clickpy.clickhouse.com/dashboard/onvif-python)
 <br>
 [![Build](https://github.com/nirsimetri/onvif-python/actions/workflows/python-app.yml/badge.svg?branch=main)](https://github.com/nirsimetri/onvif-python/actions/workflows/python-app.yml)
@@ -69,6 +69,10 @@ discovery = ONVIFDiscovery(timeout=5)
 # Discover devices
 devices = discovery.discover()
 
+# Or with
+# Discover with search filter by types or scopes (case-insensitive substring match)
+devices = discovery.discover(search="Profile/Streaming")
+
 # Display discovered devices
 for device in devices:
     print(f"Found device at {device['host']}:{device['port']}")
@@ -194,11 +198,12 @@ This library includes a powerful command-line interface (CLI) for interacting wi
 <summary><b>1. Direct CLI</b></summary> 
 
 ```bash
-usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password PASSWORD] [--discover] [--timeout TIMEOUT] [--https] [--no-verify]
-             [--no-patch] [--interactive] [--debug] [--wsdl WSDL] [--cache {all,db,mem,none}] [--health-check-interval HEALTH_CHECK_INTERVAL] [--version]
+usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password PASSWORD] [--discover] [--search SEARCH] [--timeout TIMEOUT] [--https]
+             [--no-verify] [--no-patch] [--interactive] [--debug] [--wsdl WSDL] [--cache {all,db,mem,none}]
+             [--health-check-interval HEALTH_CHECK_INTERVAL] [--version]
              [service] [method] [params ...]
 
-ONVIF Terminal Client — v0.1.6
+ONVIF Terminal Client — v0.1.7
 https://github.com/nirsimetri/onvif-python
 
 positional arguments:
@@ -215,6 +220,8 @@ options:
   --password PASSWORD, -p PASSWORD
                         Password for authentication
   --discover, -d        Discover ONVIF devices on the network using WS-Discovery
+  --search SEARCH, -s SEARCH
+                        Filter discovered devices by types or scopes (case-insensitive substring match)
   --timeout TIMEOUT     Connection timeout in seconds (default: 10)
   --https               Use HTTPS instead of HTTP
   --no-verify           Disable SSL certificate verification
@@ -234,6 +241,11 @@ Examples:
   onvif media GetProfiles --discover --username admin
   onvif -d -i
 
+  # Discover with filtering
+  onvif --discover --search ptz --interactive
+  onvif -d -s "C210" -i
+  onvif -d -s "audio_encoder" -u admin -p admin123 -i
+
   # Direct command execution
   onvif devicemgmt GetCapabilities Category=All --host 192.168.1.17 --port 8000 --username admin --password admin123
   onvif ptz ContinuousMove ProfileToken=Profile_1 Velocity={"PanTilt": {"x": -0.1, "y": 0}} --host 192.168.1.17 --port 8000 --username admin --password admin123
@@ -255,7 +267,7 @@ Examples:
 <summary><b>2. Interactive Shell</b></summary> 
 
 ```bash
-ONVIF Interactive Shell Commands - v0.1.6
+ONVIF Interactive Shell — v0.1.7
 https://github.com/nirsimetri/onvif-python
 
 Basic Commands:
@@ -388,6 +400,10 @@ onvif --discover --username admin --password admin123 --interactive
 # Short form
 onvif -d -u admin -p admin123 -i
 
+# Discover with search filter
+onvif --discover --search "C210" --interactive
+onvif -d -s ptz -u admin -p admin123 -i
+
 # Discover and interactive (will prompt for credentials)
 onvif -d -i
 ```

{onvif_python-0.1.6 → onvif_python-0.1.7}/onvif/cli/interactive.py

@@ -191,7 +191,7 @@ class InteractiveShell(cmd.Cmd):
             "  / __ \\/ | / / |  / /  _/ ____/",
             " / / / /  |/ /| | / // // /_    ",
             "/ /_/ / /|  / | |/ // // __/    ",
-            "\\____/_/ |_/  |___/___/_/  v0.1.6",
+            "\\____/_/ |_/  |___/___/_/  v0.1.7",
             "                                ",
         ]
 
@@ -1385,7 +1385,7 @@ class InteractiveShell(cmd.Cmd):
             super().do_help(line)
         else:
             help_text = f"""
-{colorize('ONVIF Interactive Shell Commands - v0.1.6', 'cyan')}\n{colorize('https://github.com/nirsimetri/onvif-python', 'white')}
+{colorize('ONVIF Interactive Shell — v0.1.7', 'cyan')}\n{colorize('https://github.com/nirsimetri/onvif-python', 'white')}
 
 {colorize('Basic Commands:', 'yellow')}
   capabilities, caps       - Show device capabilities

{onvif_python-0.1.6 → onvif_python-0.1.7}/onvif/cli/main.py

@@ -17,7 +17,7 @@ def create_parser():
     """Create argument parser for ONVIF CLI"""
     parser = argparse.ArgumentParser(
         prog="onvif",
-        description=f"{colorize('ONVIF Terminal Client', 'yellow')} — v0.1.6\nhttps://github.com/nirsimetri/onvif-python",
+        description=f"{colorize('ONVIF Terminal Client', 'yellow')} — v0.1.7\nhttps://github.com/nirsimetri/onvif-python",
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog=f"""
 Examples:
@@ -26,6 +26,11 @@ Examples:
   {colorize('onvif', 'yellow')} media GetProfiles --discover --username admin
   {colorize('onvif', 'yellow')} -d -i
 
+  # Discover with filtering
+  {colorize('onvif', 'yellow')} --discover --search ptz --interactive
+  {colorize('onvif', 'yellow')} -d -s "C210" -i
+  {colorize('onvif', 'yellow')} -d -s "audio_encoder" -u admin -p admin123 -i
+
   # Direct command execution
   {colorize('onvif', 'yellow')} devicemgmt GetCapabilities Category=All --host 192.168.1.17 --port 8000 --username admin --password admin123
   {colorize('onvif', 'yellow')} ptz ContinuousMove ProfileToken=Profile_1 Velocity={{"PanTilt": {{"x": -0.1, "y": 0}}}} --host 192.168.1.17 --port 8000 --username admin --password admin123
@@ -61,6 +66,11 @@ Examples:
         action="store_true",
         help="Discover ONVIF devices on the network using WS-Discovery",
     )
+    parser.add_argument(
+        "--search",
+        "-s",
+        help="Filter discovered devices by types or scopes (case-insensitive substring match)",
+    )
 
     # Connection options
     parser.add_argument(
@@ -139,7 +149,7 @@ def main():
 
     # Show ONVIF CLI version
     if args.version:
-        print(colorize("0.1.6", "yellow"))
+        print(colorize("0.1.7", "yellow"))
         sys.exit(0)
 
     # Validate arguments early (before discovery)
@@ -155,11 +165,18 @@ def main():
                 f"{colorize('--discover', 'white')} cannot be used with {colorize('--host', 'white')}"
             )
 
-        # Discover devices (pass --https flag to prioritize HTTPS XAddrs)
-        devices = discover_devices(timeout=4, prefer_https=args.https)
+        # Discover devices (pass --https flag to prioritize HTTPS XAddrs and search term)
+        devices = discover_devices(
+            timeout=4, prefer_https=args.https, search=args.search
+        )
 
         if not devices:
-            print(colorize("No ONVIF devices discovered. Exiting.", "red"))
+            if args.search:
+                print(
+                    f"{colorize('No devices found matching search:', 'red')} {colorize(args.search, 'white')}"
+                )
+            else:
+                print(colorize("No ONVIF devices discovered. Exiting.", "red"))
             sys.exit(1)
 
         # Let user select a device
@@ -278,34 +295,31 @@ def execute_command(
     return method(**params)
 
 
-def discover_devices(timeout: int = 4, prefer_https: bool = False) -> list:
+def discover_devices(
+    timeout: int = 4, prefer_https: bool = False, search: Optional[str] = None
+) -> list:
     """Discover ONVIF devices on the network using WS-Discovery.
 
     Args:
         timeout: Discovery timeout in seconds
         prefer_https: If True, prioritize HTTPS XAddrs when available
+        search: Optional search term to filter devices by types or scopes
 
     Returns:
         List of discovered devices with connection info
     """
-    # Get local network interface for display
-    try:
-        import socket
 
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        s.connect(("8.8.8.8", 80))
-        local_ip = s.getsockname()[0]
-        s.close()
-    except Exception:
-        local_ip = "0.0.0.0"
+    # Use ONVIFDiscovery class
+    discovery = ONVIFDiscovery(timeout=timeout)
 
     print(f"\n{colorize('Discovering ONVIF devices on network...', 'yellow')}")
-    print(f"Network interface: {colorize(local_ip, 'white')}")
-    print(f"Timeout: {timeout}s\n")
+    print(f"Network interface: {colorize(discovery._get_local_ip(), 'white')}")
+    print(f"Timeout: {timeout}s")
+    if search:
+        print(f"Filter: {colorize(search, 'yellow')}")
+    print()
 
-    # Use ONVIFDiscovery class
-    discovery = ONVIFDiscovery(timeout=timeout)
-    devices = discovery.discover(prefer_https=prefer_https)
+    devices = discovery.discover(prefer_https=prefer_https, search=search)
 
     return devices
 

{onvif_python-0.1.6 → onvif_python-0.1.7}/onvif/cli/utils.py

@@ -4,7 +4,7 @@ import json
 import os
 import inspect
 from typing import Any, Dict, Optional
-import xml.etree.ElementTree as ET
+from lxml import etree
 import re
 
 
@@ -231,10 +231,17 @@ def get_method_documentation(service_obj, method_name: str) -> Optional[Dict[str
     try:
         # 1. Get documentation from WSDL (existing logic)
         wsdl_path = service_obj.operator.wsdl_path
-        tree = ET.parse(wsdl_path)
+
+        # Use secure lxml parser
+        parser = etree.XMLParser(
+            resolve_entities=False,
+            no_network=True,
+            remove_blank_text=True,
+        )
+        tree = etree.parse(wsdl_path, parser)
         root = tree.getroot()
         namespaces = {
-            node[0]: node[1] for node in ET.iterparse(wsdl_path, events=["start-ns"])
+            node[0]: node[1] for node in etree.iterparse(wsdl_path, events=["start-ns"])
         }
         namespaces["wsdl"] = "http://schemas.xmlsoap.org/wsdl/"
         namespaces["xs"] = "http://www.w3.org/2001/XMLSchema"
@@ -321,7 +328,7 @@ def get_method_documentation(service_obj, method_name: str) -> Optional[Dict[str
 
         return {"doc": doc_text, "required": required_args, "optional": optional_args}
 
-    except (ET.ParseError, FileNotFoundError, AttributeError, ValueError):
+    except (etree.ParseError, FileNotFoundError, AttributeError, ValueError):
         # Fallback in case of any error, still try to get params
         try:
             method = getattr(service_obj, method_name)
@@ -709,14 +716,19 @@ def get_operation_type_info(
     Returns a dictionary with 'input' and 'output' keys containing message details.
     """
     try:
-        import os
-
         wsdl_path = service_obj.operator.wsdl_path
-        tree = ET.parse(wsdl_path)
+
+        # Use secure lxml parser
+        parser = etree.XMLParser(
+            resolve_entities=False,
+            no_network=True,
+            remove_blank_text=True,
+        )
+        tree = etree.parse(wsdl_path, parser)
         root = tree.getroot()
 
         namespaces = {
-            node[0]: node[1] for node in ET.iterparse(wsdl_path, events=["start-ns"])
+            node[0]: node[1] for node in etree.iterparse(wsdl_path, events=["start-ns"])
         }
         namespaces["wsdl"] = "http://schemas.xmlsoap.org/wsdl/"
         namespaces["xs"] = "http://www.w3.org/2001/XMLSchema"
@@ -773,7 +785,6 @@ def _load_imported_schemas(root, schema_context: dict, namespaces: dict):
     """
     Recursively load all imported and included schemas into the schema context.
     """
-    import os
 
     # Find all xs:import and xs:include in xs:schema elements
     for schema in root.findall(".//xs:schema", namespaces):
@@ -787,7 +798,13 @@ def _load_imported_schemas(root, schema_context: dict, namespaces: dict):
 
                 if os.path.exists(schema_path):
                     try:
-                        imported_tree = ET.parse(schema_path)
+                        # Use secure parser for imported schemas
+                        parser = etree.XMLParser(
+                            resolve_entities=False,
+                            no_network=True,
+                            remove_blank_text=True,
+                        )
+                        imported_tree = etree.parse(schema_path, parser)
                         imported_root = imported_tree.getroot()
 
                         # Add to context if not already present
@@ -817,7 +834,13 @@ def _load_imported_schemas(root, schema_context: dict, namespaces: dict):
 
                 if os.path.exists(schema_path):
                     try:
-                        included_tree = ET.parse(schema_path)
+                        # Use secure parser for included schemas
+                        parser = etree.XMLParser(
+                            resolve_entities=False,
+                            no_network=True,
+                            remove_blank_text=True,
+                        )
+                        included_tree = etree.parse(schema_path, parser)
                         included_root = included_tree.getroot()
 
                         # Add to context if not already present

{onvif_python-0.1.6 → onvif_python-0.1.7}/onvif/services/accesscontrol.py

@@ -98,6 +98,17 @@ class AccessControl:
     def DisableAccessPoint(self, Token):
         return self.operator.call("DisableAccessPoint", Token=Token)
 
+    def Feedback(
+        self, AccessPointToken, FeedbackType, RecognitionType=None, TextMessage=None
+    ):
+        return self.operator.call(
+            "Feedback",
+            AccessPointToken=AccessPointToken,
+            FeedbackType=FeedbackType,
+            RecognitionType=RecognitionType,
+            TextMessage=TextMessage,
+        )
+
     def ExternalAuthorization(
         self, AccessPointToken, Decision, CredentialToken=None, Reason=None
     ):

{onvif_python-0.1.6 → onvif_python-0.1.7}/onvif/services/security/tlsserver.py

@@ -57,7 +57,7 @@ class TLSServer:
         return self.operator.call("GetClientAuthenticationRequired")
 
     def SetCnMapsToUser(self, cnMapsToUser):
-        return self.operator.call("SetCnMapsToUsername", cnMapsToUser=cnMapsToUser)
+        return self.operator.call("SetCnMapsToUser", cnMapsToUser=cnMapsToUser)
 
     def GetCnMapsToUser(self):
         return self.operator.call("GetCnMapsToUser")

{onvif_python-0.1.6 → onvif_python-0.1.7}/onvif/utils/discovery.py

@@ -2,8 +2,8 @@
 
 import socket
 import uuid
-import xml.etree.ElementTree as ET
 import struct
+from lxml import etree
 from typing import List, Dict, Any, Optional
 
 
@@ -92,11 +92,14 @@ class ONVIFDiscovery:
 
         return self._local_ip
 
-    def discover(self, prefer_https: bool = False) -> List[Dict[str, Any]]:
+    def discover(
+        self, prefer_https: bool = False, search: Optional[str] = None
+    ) -> List[Dict[str, Any]]:
         """Discover ONVIF devices on the network.
 
         Args:
             prefer_https: If True, prioritize HTTPS XAddrs when available
+            search: Optional search term to filter devices by types or scopes (case-insensitive)
 
         Returns:
             List of discovered devices with connection information.
@@ -114,6 +117,10 @@ class ONVIFDiscovery:
             >>> devices = discovery.discover()
             >>> for device in devices:
             ...     print(f"{device['host']}:{device['port']}")
+
+            >>> # Filter devices by search term
+            >>> devices = discovery.discover(search="ptz")
+            >>> devices = discovery.discover(search="Hong Kong")
         """
         local_ip = self._get_local_ip()
 
@@ -158,7 +165,13 @@ class ONVIFDiscovery:
             return []
 
         # Parse responses
-        return self._parse_responses(responses, prefer_https)
+        devices = self._parse_responses(responses, prefer_https)
+
+        # Apply search filter if provided
+        if search:
+            devices = self._filter_devices(devices, search)
+
+        return devices
 
     def _parse_responses(
         self, responses: List[Dict[str, str]], prefer_https: bool = False
@@ -185,6 +198,41 @@ class ONVIFDiscovery:
 
         return devices
 
+    def _filter_devices(
+        self, devices: List[Dict[str, Any]], search_term: str
+    ) -> List[Dict[str, Any]]:
+        """Filter devices based on search term in types or scopes.
+
+        Args:
+            devices: List of discovered devices
+            search_term: Search string to match against types/scopes (case-insensitive)
+
+        Returns:
+            Filtered list of devices matching the search term
+        """
+        if not search_term:
+            return devices
+
+        search_lower = search_term.lower()
+        filtered = []
+
+        for device in devices:
+            # Check types
+            types_match = any(
+                search_lower in t.lower() for t in device.get("types", [])
+            )
+
+            # Check scopes
+            scopes_match = any(
+                search_lower in s.lower() for s in device.get("scopes", [])
+            )
+
+            # Include device if match found in types or scopes
+            if types_match or scopes_match:
+                filtered.append(device)
+
+        return filtered
+
     def _parse_single_response(
         self, xml_data: str, prefer_https: bool = False
     ) -> Optional[Dict[str, Any]]:
@@ -198,10 +246,17 @@ class ONVIFDiscovery:
             Device information dictionary or None if parsing fails
         """
         try:
-            root = ET.fromstring(xml_data)
-            probe_match = root.find(".//d:ProbeMatch", self.NAMESPACES) or root.find(
-                ".//wsd:ProbeMatch", self.NAMESPACES
+            # Use lxml's secure parser that prevents XXE attacks
+            parser = etree.XMLParser(
+                resolve_entities=False,  # Disable entity resolution
+                no_network=True,  # Disable network access
+                remove_blank_text=True,
             )
+            root = etree.fromstring(xml_data.encode("utf-8"), parser)
+
+            probe_match = probe_match = root.find(".//d:ProbeMatch", self.NAMESPACES)
+            if probe_match is None:
+                probe_match = root.find(".//wsd:ProbeMatch", self.NAMESPACES)
 
             if probe_match is None:
                 return None
@@ -220,27 +275,27 @@ class ONVIFDiscovery:
             epr = probe_match.find(
                 ".//wsa:EndpointReference/wsa:Address", self.NAMESPACES
             )
-            if epr is not None:
+            if epr is not None and epr.text:
                 device_info["epr"] = epr.text
 
             # Extract Types
-            types_elem = probe_match.find(
-                ".//d:Types", self.NAMESPACES
-            ) or probe_match.find(".//wsd:Types", self.NAMESPACES)
+            types_elem = probe_match.find(".//d:Types", self.NAMESPACES)
+            if types_elem is None:
+                types_elem = probe_match.find(".//wsd:Types", self.NAMESPACES)
             if types_elem is not None and types_elem.text:
                 device_info["types"] = types_elem.text.split()
 
             # Extract Scopes
-            scopes_elem = probe_match.find(
-                ".//d:Scopes", self.NAMESPACES
-            ) or probe_match.find(".//wsd:Scopes", self.NAMESPACES)
+            scopes_elem = probe_match.find(".//d:Scopes", self.NAMESPACES)
+            if scopes_elem is None:
+                scopes_elem = probe_match.find(".//wsd:Scopes", self.NAMESPACES)
             if scopes_elem is not None and scopes_elem.text:
                 device_info["scopes"] = scopes_elem.text.split()
 
             # Extract XAddrs
-            xaddrs_elem = probe_match.find(
-                ".//d:XAddrs", self.NAMESPACES
-            ) or probe_match.find(".//wsd:XAddrs", self.NAMESPACES)
+            xaddrs_elem = probe_match.find(".//d:XAddrs", self.NAMESPACES)
+            if xaddrs_elem is None:
+                xaddrs_elem = probe_match.find(".//wsd:XAddrs", self.NAMESPACES)
             if xaddrs_elem is not None and xaddrs_elem.text:
                 device_info["xaddrs"] = xaddrs_elem.text.split()
 

{onvif_python-0.1.6 → onvif_python-0.1.7}/onvif/utils/xml_capture.py

@@ -2,7 +2,6 @@
 
 from zeep import Plugin
 from lxml import etree
-from xml.dom import minidom
 
 
 class XMLCapturePlugin(Plugin):
@@ -38,7 +37,7 @@ class XMLCapturePlugin(Plugin):
 
     def _format_xml(self, element):
         """
-        Format XML element with proper indentation using minidom.
+        Format XML element with proper indentation using lxml.
 
         Args:
             element: lxml Element to format
@@ -47,21 +46,24 @@ class XMLCapturePlugin(Plugin):
             str: Pretty-printed XML string
         """
         try:
-            # Convert lxml element to string
-            xml_string = etree.tostring(element, encoding="unicode")
-            # Parse with minidom and pretty print
-            dom = minidom.parseString(xml_string)
-            # Use toprettyxml with proper indentation
-            pretty_xml = dom.toprettyxml(indent="  ", encoding=None)
-            # Remove extra blank lines and XML declaration
-            lines = [line for line in pretty_xml.split("\n") if line.strip()]
-            # Remove XML declaration line if present
-            if lines and lines[0].startswith("<?xml"):
-                lines = lines[1:]
-            return "\n".join(lines)
+            # Convert element to string first
+            xml_bytes = etree.tostring(element, encoding="utf-8")
+
+            # Re-parse with parser that removes blank text
+            # This is safe as we control the input (it's from zeep)
+            parser = etree.XMLParser(
+                remove_blank_text=True, resolve_entities=False, no_network=True
+            )
+            reparsed = etree.fromstring(xml_bytes, parser)
+
+            # Now pretty print the cleaned tree
+            xml_string = etree.tostring(
+                reparsed, pretty_print=True, encoding="unicode", xml_declaration=False
+            )
+            return xml_string.strip()
         except Exception:
-            # Fallback to lxml if minidom fails
-            return etree.tostring(element, pretty_print=True, encoding="unicode")
+            # Fallback to non-pretty printed version
+            return etree.tostring(element, pretty_print=False, encoding="unicode")
 
     def egress(self, envelope, http_headers, operation, binding_options):
         """Called before sending the SOAP request"""

{onvif_python-0.1.6 → onvif_python-0.1.7/onvif_python.egg-info}/PKG-INFO

@@ -1,10 +1,11 @@
 Metadata-Version: 2.4
 Name: onvif-python
-Version: 0.1.6
+Version: 0.1.7
 Summary: A comprehensive and developer-friendly Python library for working with ONVIF-compliant devices
 Author-email: Nirsimetri Technologies® <open@nirsimetri.com>
 Maintainer: Kaburagi
 License-Expression: MIT
+Project-URL: Homepage, https://github.com/nirsimetri/onvif-python
 Project-URL: Documentation, https://deepwiki.com/nirsimetri/onvif-python
 Project-URL: Changelog, https://github.com/nirsimetri/onvif-python/releases
 Keywords: onvif,Camera,onvif-python,ip-camera,cctv,soap,surveillance,cctv cameras,soap-client,onvif-client,onvif-library,onvif-specifications
@@ -40,7 +41,7 @@ Dynamic: license-file
 
 [![Codacy grade](https://img.shields.io/codacy/grade/bff08a94e4d447b690cea49c6594826d?label=Project%20Quality&logo=codacy)](https://app.codacy.com/gh/nirsimetri/onvif-python/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
 [![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/nirsimetri/onvif-python)
-[![PyPI](https://img.shields.io/badge/PyPI-0.1.6-orange?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.1.7-orange?logo=archive)](https://pypi.org/project/onvif-python/)
 [![Downloads](https://img.shields.io/pypi/dm/onvif-python?label=Downloads&color=red)](https://clickpy.clickhouse.com/dashboard/onvif-python)
 <br>
 [![Build](https://github.com/nirsimetri/onvif-python/actions/workflows/python-app.yml/badge.svg?branch=main)](https://github.com/nirsimetri/onvif-python/actions/workflows/python-app.yml)
@@ -107,6 +108,10 @@ discovery = ONVIFDiscovery(timeout=5)
 # Discover devices
 devices = discovery.discover()
 
+# Or with
+# Discover with search filter by types or scopes (case-insensitive substring match)
+devices = discovery.discover(search="Profile/Streaming")
+
 # Display discovered devices
 for device in devices:
     print(f"Found device at {device['host']}:{device['port']}")
@@ -232,11 +237,12 @@ This library includes a powerful command-line interface (CLI) for interacting wi
 <summary><b>1. Direct CLI</b></summary> 
 
 ```bash
-usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password PASSWORD] [--discover] [--timeout TIMEOUT] [--https] [--no-verify]
-             [--no-patch] [--interactive] [--debug] [--wsdl WSDL] [--cache {all,db,mem,none}] [--health-check-interval HEALTH_CHECK_INTERVAL] [--version]
+usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password PASSWORD] [--discover] [--search SEARCH] [--timeout TIMEOUT] [--https]
+             [--no-verify] [--no-patch] [--interactive] [--debug] [--wsdl WSDL] [--cache {all,db,mem,none}]
+             [--health-check-interval HEALTH_CHECK_INTERVAL] [--version]
              [service] [method] [params ...]
 
-ONVIF Terminal Client — v0.1.6
+ONVIF Terminal Client — v0.1.7
 https://github.com/nirsimetri/onvif-python
 
 positional arguments:
@@ -253,6 +259,8 @@ options:
   --password PASSWORD, -p PASSWORD
                         Password for authentication
   --discover, -d        Discover ONVIF devices on the network using WS-Discovery
+  --search SEARCH, -s SEARCH
+                        Filter discovered devices by types or scopes (case-insensitive substring match)
   --timeout TIMEOUT     Connection timeout in seconds (default: 10)
   --https               Use HTTPS instead of HTTP
   --no-verify           Disable SSL certificate verification
@@ -272,6 +280,11 @@ Examples:
   onvif media GetProfiles --discover --username admin
   onvif -d -i
 
+  # Discover with filtering
+  onvif --discover --search ptz --interactive
+  onvif -d -s "C210" -i
+  onvif -d -s "audio_encoder" -u admin -p admin123 -i
+
   # Direct command execution
   onvif devicemgmt GetCapabilities Category=All --host 192.168.1.17 --port 8000 --username admin --password admin123
   onvif ptz ContinuousMove ProfileToken=Profile_1 Velocity={"PanTilt": {"x": -0.1, "y": 0}} --host 192.168.1.17 --port 8000 --username admin --password admin123
@@ -293,7 +306,7 @@ Examples:
 <summary><b>2. Interactive Shell</b></summary> 
 
 ```bash
-ONVIF Interactive Shell Commands - v0.1.6
+ONVIF Interactive Shell — v0.1.7
 https://github.com/nirsimetri/onvif-python
 
 Basic Commands:
@@ -426,6 +439,10 @@ onvif --discover --username admin --password admin123 --interactive
 # Short form
 onvif -d -u admin -p admin123 -i
 
+# Discover with search filter
+onvif --discover --search "C210" --interactive
+onvif -d -s ptz -u admin -p admin123 -i
+
 # Discover and interactive (will prompt for credentials)
 onvif -d -i
 ```

{onvif_python-0.1.6 → onvif_python-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "onvif-python"
-version = "0.1.6"
+version = "0.1.7"
 description = "A comprehensive and developer-friendly Python library for working with ONVIF-compliant devices"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -69,5 +69,6 @@ extend-exclude = '''
 '''
 
 [project.urls]
+Homepage = "https://github.com/nirsimetri/onvif-python"
 Documentation = "https://deepwiki.com/nirsimetri/onvif-python"
 Changelog = "https://github.com/nirsimetri/onvif-python/releases"