onvif-python 0.2.0__tar.gz → 0.2.2__tar.gz

{onvif_python-0.2.0/onvif_python.egg-info → onvif_python-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onvif-python
-Version: 0.2.0
+Version: 0.2.2
 Summary: A modern Python library for ONVIF-compliant devices
 Author-email: Nirsimetri Technologies® <open@nirsimetri.com>
 Maintainer: Kaburagi
@@ -47,7 +47,7 @@ Dynamic: license-file
 	
 [![Codacy grade](https://img.shields.io/codacy/grade/bff08a94e4d447b690cea49c6594826d?label=Code%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.2.0-orange?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.2.2-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)
@@ -356,7 +356,7 @@ usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password
              [--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.2.0
+ONVIF Terminal Client — v0.2.2
 https://github.com/nirsimetri/onvif-python
 
 positional arguments:
@@ -429,7 +429,7 @@ Examples:
 <summary><b>2. Interactive Shell</b></summary> 
 
 ```bash
-ONVIF Interactive Shell — v0.2.0
+ONVIF Interactive Shell — v0.2.2
 https://github.com/nirsimetri/onvif-python
 
 Basic Commands:
@@ -1108,9 +1108,9 @@ Some ONVIF services have multiple bindings in the same WSDL. These typically inc
 2. **Security (Advanced Security)**
    - **Root:** `AdvancedSecurityServiceBinding`
    - **Sub-bindings:**
+     - `JWTBinding`
      - `AuthorizationServerBinding`
      - `KeystoreBinding`
-     - `JWTBinding`
      - `Dot1XBinding`
      - `TLSServerBinding`
      - `MediaSigningBinding`
@@ -1118,9 +1118,9 @@ Some ONVIF services have multiple bindings in the same WSDL. These typically inc
    Usage in library:
    ```python
    client.security()                  # root binding
+   client.jwt()                       # sub-binding accessor
    client.authorizationserver(xaddr)  # sub-binding accessor (requires xAddr)
    client.keystore(xaddr)             # ..
-   client.jwt(xaddr)
    client.dot1x(xaddr)
    client.tlsserver(xaddr)
    client.mediasigning(xaddr)

{onvif_python-0.2.0 → onvif_python-0.2.2}/README.md

@@ -4,7 +4,7 @@
 	
 [![Codacy grade](https://img.shields.io/codacy/grade/bff08a94e4d447b690cea49c6594826d?label=Code%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.2.0-orange?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.2.2-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)
@@ -313,7 +313,7 @@ usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password
              [--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.2.0
+ONVIF Terminal Client — v0.2.2
 https://github.com/nirsimetri/onvif-python
 
 positional arguments:
@@ -386,7 +386,7 @@ Examples:
 <summary><b>2. Interactive Shell</b></summary> 
 
 ```bash
-ONVIF Interactive Shell — v0.2.0
+ONVIF Interactive Shell — v0.2.2
 https://github.com/nirsimetri/onvif-python
 
 Basic Commands:
@@ -1065,9 +1065,9 @@ Some ONVIF services have multiple bindings in the same WSDL. These typically inc
 2. **Security (Advanced Security)**
    - **Root:** `AdvancedSecurityServiceBinding`
    - **Sub-bindings:**
+     - `JWTBinding`
      - `AuthorizationServerBinding`
      - `KeystoreBinding`
-     - `JWTBinding`
      - `Dot1XBinding`
      - `TLSServerBinding`
      - `MediaSigningBinding`
@@ -1075,9 +1075,9 @@ Some ONVIF services have multiple bindings in the same WSDL. These typically inc
    Usage in library:
    ```python
    client.security()                  # root binding
+   client.jwt()                       # sub-binding accessor
    client.authorizationserver(xaddr)  # sub-binding accessor (requires xAddr)
    client.keystore(xaddr)             # ..
-   client.jwt(xaddr)
    client.dot1x(xaddr)
    client.tlsserver(xaddr)
    client.mediasigning(xaddr)

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/__init__.py

@@ -8,6 +8,7 @@ from .utils import (
     ONVIFErrorHandler,
     ZeepPatcher,
     ONVIFDiscovery,
+    ONVIFParser,
 )
 from .cli import main as ONVIFCLI
 
@@ -21,4 +22,5 @@ __all__ = [
     "ZeepPatcher",
     "ONVIFCLI",
     "ONVIFDiscovery",
+    "ONVIFParser",
 ]

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/cli/interactive.py

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

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/cli/main.py

@@ -21,7 +21,7 @@ def create_parser():
     """Create argument parser for ONVIF CLI"""
     parser = argparse.ArgumentParser(
         prog="onvif",
-        description=f"{colorize('ONVIF Terminal Client', 'yellow')} — v0.2.0\nhttps://github.com/nirsimetri/onvif-python",
+        description=f"{colorize('ONVIF Terminal Client', 'yellow')} — v0.2.2\nhttps://github.com/nirsimetri/onvif-python",
         formatter_class=argparse.RawDescriptionHelpFormatter,
         epilog=f"""
 Examples:
@@ -198,10 +198,14 @@ def search_products(search_term: str, page: int = 1, per_page: int = 20) -> None
         WHERE LOWER(model) LIKE LOWER(?)
            OR LOWER(post_title) LIKE LOWER(?)
            OR LOWER(company_name) LIKE LOWER(?)
+           OR LOWER(product_category) LIKE LOWER(?)
         """
 
         search_pattern = f"%{search_term}%"
-        cursor.execute(count_query, (search_pattern, search_pattern, search_pattern))
+        cursor.execute(
+            count_query,
+            (search_pattern, search_pattern, search_pattern, search_pattern),
+        )
         total_count = cursor.fetchone()[0]
 
         if total_count == 0:
@@ -229,12 +233,21 @@ def search_products(search_term: str, page: int = 1, per_page: int = 20) -> None
         WHERE LOWER(model) LIKE LOWER(?)
            OR LOWER(post_title) LIKE LOWER(?)
            OR LOWER(company_name) LIKE LOWER(?)
+           OR LOWER(product_category) LIKE LOWER(?)
         ORDER BY test_date DESC
         LIMIT ? OFFSET ?
         """
 
         cursor.execute(
-            query, (search_pattern, search_pattern, search_pattern, per_page, offset)
+            query,
+            (
+                search_pattern,
+                search_pattern,
+                search_pattern,
+                search_pattern,
+                per_page,
+                offset,
+            ),
         )
         results = cursor.fetchall()
 
@@ -448,7 +461,7 @@ def main():
 
     # Show ONVIF CLI version
     if args.version:
-        print(colorize("0.2.0", "yellow"))
+        print(colorize("0.2.2", "yellow"))
         sys.exit(0)
 
     # Handle product search

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/cli/utils.py

@@ -618,7 +618,7 @@ def get_device_available_services(client) -> list:
                     # Security namespace has multiple bindings
                     available_services.extend(
                         [
-                            "advancedsecurity",
+                            "security",
                             "jwt",
                             "keystore",
                             "tlsserver",
@@ -628,6 +628,100 @@ def get_device_available_services(client) -> list:
                         ]
                     )
 
+    # Additional check: Try to call security.GetServiceCapabilities() to verify availability
+    # This is necessary because Security service might not be reported in GetServices/GetCapabilities
+    # Use caching to avoid calling GetServiceCapabilities repeatedly
+    if "security" not in available_services:
+        # Check if we've already tried to get security capabilities
+        if not hasattr(client, "_security_capabilities_checked"):
+            client._security_capabilities_checked = False
+            client._security_capabilities = None
+
+        if not client._security_capabilities_checked:
+            # First time check - call GetServiceCapabilities and cache result
+            try:
+                security_service = client.security()
+                # Try to call GetServiceCapabilities to verify the service is actually available
+                caps = security_service.GetServiceCapabilities()
+
+                # Cache the capabilities for future use
+                client._security_capabilities = caps
+                client._security_capabilities_checked = True
+
+            except Exception:
+                # Security service not available, mark as checked
+                client._security_capabilities_checked = True
+                client._security_capabilities = None
+
+        # Use cached capabilities
+        if client._security_capabilities is not None:
+            caps = client._security_capabilities
+
+            # If successful, add main security service
+            available_services.append("security")
+
+            # Check each sub-service capability to determine availability
+            # Only add sub-services if their corresponding capability is not None
+            if (
+                hasattr(caps, "KeystoreCapabilities")
+                and caps.KeystoreCapabilities is not None
+            ):
+                available_services.append("keystore")
+
+            if (
+                hasattr(caps, "TLSServerCapabilities")
+                and caps.TLSServerCapabilities is not None
+            ):
+                available_services.append("tlsserver")
+
+            if (
+                hasattr(caps, "Dot1XCapabilities")
+                and caps.Dot1XCapabilities is not None
+            ):
+                available_services.append("dot1x")
+
+            if (
+                hasattr(caps, "AuthorizationServer")
+                and caps.AuthorizationServer is not None
+            ):
+                available_services.append("authorizationserver")
+
+            if hasattr(caps, "MediaSigning") and caps.MediaSigning is not None:
+                available_services.append("mediasigning")
+
+    # Additional check for JWT service: Try to call jwt.GetJWTConfiguration()
+    # JWT doesn't have a capability in GetServiceCapabilities, so we need to test it directly
+    if "jwt" not in available_services:
+        # Check if we've already tried to get JWT availability
+        if not hasattr(client, "_jwt_checked"):
+            client._jwt_checked = False
+            client._jwt_available = None
+
+        if not client._jwt_checked:
+            # First time check - try to call GetJWTConfiguration and cache result
+            try:
+                # JWT service requires xaddr from security service
+                # Try to construct xaddr from security service endpoint
+                protocol = "https" if client.common_args["use_https"] else "http"
+                default_xaddr = f"{protocol}://{client.common_args['host']}:{client.common_args['port']}/onvif/AdvancedSecurity"
+
+                # Try to call GetJWTConfiguration to verify JWT is available
+                jwt_service = client.jwt(xaddr=default_xaddr)
+                jwt_service.GetJWTConfiguration()
+
+                # If successful, JWT is available
+                client._jwt_available = True
+                client._jwt_checked = True
+
+            except Exception:
+                # JWT service not available, mark as checked
+                client._jwt_checked = True
+                client._jwt_available = False
+
+        # Use cached JWT availability
+        if client._jwt_available:
+            available_services.append("jwt")
+
     return sorted(list(set(available_services)))  # Remove duplicates and sort
 
 

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/client.py

@@ -111,6 +111,7 @@ class ONVIFClient:
         apply_patch: bool = True,
         capture_xml: bool = False,
         wsdl_dir: str = None,
+        plugins: list = None,
     ):
         logger.info(f"Initializing ONVIF client for {host}:{port}")
         logger.debug(
@@ -131,6 +132,15 @@ class ONVIFClient:
             logger.debug("Enabling XML capture plugin")
             self.xml_plugin = XMLCapturePlugin()
 
+        # Merge user plugins with xml_plugin
+        all_plugins = []
+        if plugins:
+            logger.debug(f"Adding {len(plugins)} user-provided plugins")
+            all_plugins.extend(plugins)
+        if self.xml_plugin:
+            logger.debug("Adding XML capture plugin")
+            all_plugins.append(self.xml_plugin)
+
         # Store custom WSDL directory if provided
         self.wsdl_dir = wsdl_dir
         if wsdl_dir:
@@ -148,7 +158,7 @@ class ONVIFClient:
             "use_https": use_https,
             "verify_ssl": verify_ssl,
             "apply_patch": apply_patch,
-            "plugins": [self.xml_plugin] if self.xml_plugin else None,
+            "plugins": all_plugins if all_plugins else None,
         }
 
         # Device Management (Core) service is always available
@@ -162,6 +172,14 @@ class ONVIFClient:
         # Temporary variable to hold capabilities
         self.capabilities = None
 
+        # Cache for security service capabilities (lazy loaded)
+        self._security_capabilities = None
+        self._security_capabilities_checked = False
+
+        # Cache for JWT service availability (lazy loaded)
+        self._jwt_available = None
+        self._jwt_checked = False
+
         try:
             # Try GetServices first (preferred method)
             logger.debug("Attempting GetServices call for service discovery")
@@ -722,17 +740,15 @@ class ONVIFClient:
         if self._security is None:
             logger.debug("Initializing Security service")
             self._security = AdvancedSecurity(
-                xaddr=self._get_xaddr("advancedsecurity", "Security"),
                 **self.common_args,
             )
         return self._security
 
     @service
-    def jwt(self, xaddr):
+    def jwt(self):
         if self._jwt is None:
             logger.debug("Initializing JWT service")
-            xaddr = self._rewrite_xaddr_if_needed(xaddr)
-            self._jwt = JWT(xaddr=xaddr, **self.common_args)
+            self._jwt = JWT(**self.common_args)
         return self._jwt
 
     @service

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/operator.py

@@ -15,6 +15,7 @@ from zeep.wsse.username import UsernameToken
 from .utils import ONVIFOperationException, ZeepPatcher
 
 logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
 
 
 class CacheMode(Enum):
@@ -194,7 +195,6 @@ class ONVIFOperator:
         try:
             func = getattr(self.service, method)
         except AttributeError as e:
-            logger.error(f"Method {method} not found in {self.service_name} service")
             raise ONVIFOperationException(operation=method, original_exception=e)
 
         try:
@@ -207,10 +207,8 @@ class ONVIFOperator:
             return result
 
         except Fault as e:
-            logger.error(f"SOAP Fault in {self.service_name}.{method}: {e}")
             raise ONVIFOperationException(operation=method, original_exception=e)
         except Exception as e:
-            logger.error(f"ONVIF call error in {self.service_name}.{method}: {e}")
             raise ONVIFOperationException(operation=method, original_exception=e)
 
     def create_type(self, type_name: str):

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/services/security/advancedsecurity.py

@@ -15,7 +15,7 @@ class AdvancedSecurity(ONVIFService):
         self.operator = ONVIFOperator(
             definition["path"],
             binding=f"{{{definition['namespace']}}}{definition['binding']}",
-            service_path="Security",  # fallback
+            service_path="device_service",  # fallback
             xaddr=xaddr,
             **kwargs,
         )

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/utils/__init__.py

@@ -7,6 +7,7 @@ from .xml_capture import XMLCapturePlugin
 from .error_handlers import ONVIFErrorHandler
 from .discovery import ONVIFDiscovery
 from .service import ONVIFService
+from .parser import ONVIFParser
 
 
 __all__ = [
@@ -17,4 +18,5 @@ __all__ = [
     "ONVIFErrorHandler",
     "ONVIFDiscovery",
     "ONVIFService",
+    "ONVIFParser",
 ]

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/utils/discovery.py

@@ -8,6 +8,7 @@ from lxml import etree
 from typing import List, Dict, Any, Optional
 
 logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
 
 
 class ONVIFDiscovery:

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/utils/error_handlers.py

@@ -5,6 +5,7 @@ from zeep.exceptions import Fault
 from .exceptions import ONVIFOperationException
 
 logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
 
 
 class ONVIFErrorHandler:

onvif_python-0.2.2/onvif/utils/parser.py

@@ -0,0 +1,136 @@
+# onvif/utils/parser.py
+
+import logging
+from typing import List, Dict, Optional
+from zeep import Plugin
+
+logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
+
+
+class ONVIFParser(Plugin):
+    """
+    Lightweight Zeep plugin to extract XML elements from SOAP responses using XPath.
+
+    This plugin extracts specific XML elements from raw SOAP responses before zeep
+    parses them into Python objects. This is useful for extracting data that zeep
+    doesn't parse correctly, such as simpleContent elements with attributes (e.g., Topic).
+
+    Unlike XMLCapturePlugin which stores full XML history in memory, ONVIFParser only
+    extracts and caches specified element texts from the last response.
+
+    Usage Example 1 - Extract Topic from event notifications:
+        >>> from onvif import ONVIFClient
+        >>> from onvif.utils import ONVIFParser
+        >>>
+        >>> # Create parser to extract Topic elements
+        >>> parser = ONVIFParser(extract_xpaths={
+        ...     'topic': './/{http://docs.oasis-open.org/wsn/b-2}Topic'
+        ... })
+        >>>
+        >>> # Pass parser to client as plugin
+        >>> client = ONVIFClient(host, port, user, pass, plugins=[parser])
+        >>>
+        >>> # Make SOAP call
+        >>> pullpoint = client.pullpoint(subscription)
+        >>> msgs = pullpoint.PullMessages(Timeout="PT5S", MessageLimit=10)
+        >>>
+        >>> # Extract topic texts (cache auto-cleared on next SOAP call)
+        >>> topics = parser.get_extracted_texts('topic', count=10)
+        >>> for topic in topics:
+        ...     print(f"Topic: {topic}")
+
+    Usage Example 2 - Extract multiple elements:
+        >>> parser = ONVIFParser(extract_xpaths={
+        ...     'topic': './/{http://docs.oasis-open.org/wsn/b-2}Topic',
+        ...     'custom': './/ns:CustomElement'
+        ... })
+        >>> client = ONVIFClient(host, port, user, pass, plugins=[parser])
+        >>>
+        >>> # After SOAP call
+        >>> topics = parser.get_extracted_texts('topic', count=5)
+        >>> customs = parser.get_extracted_texts('custom', count=5)
+
+    Notes:
+        - Uses ingress() hook to access raw XML before zeep parsing
+        - Cache automatically cleared on each SOAP response
+        - Thread-safe for single client usage
+        - Works with any XPath expression
+    """
+
+    def __init__(self, extract_xpaths: Dict[str, str]):
+        """
+        Initialize XML element parser.
+
+        Args:
+            extract_xpaths: Dictionary mapping names to XPath expressions. XPath expressions will be used to find elements in SOAP response.
+            Example: {
+                'topic': './/{http://docs.oasis-open.org/wsn/b-2}Topic',
+                'custom': './/ns:CustomElement'
+            }
+        """
+        self.extract_xpaths = extract_xpaths
+        self._extracted_elements = {}
+
+        logger.debug(
+            f"ONVIFParser initialized with XPaths: {list(extract_xpaths.keys())}"
+        )
+
+    def ingress(self, envelope, http_headers, operation):
+        """
+        Zeep plugin hook - called when SOAP response is received.
+
+        Extracts element texts from raw XML envelope using configured XPath expressions.
+        The envelope at this stage is an lxml Element tree, allowing XPath queries.
+
+        Cache is automatically cleared before extracting new elements to prevent memory accumulation.
+
+        Args:
+            envelope: lxml Element representing SOAP envelope
+            http_headers: HTTP response headers
+            operation: Zeep operation being executed
+
+        Returns:
+            Tuple of (envelope, http_headers) to pass to next plugin
+        """
+        # Auto-clear cache from previous response
+        self._extracted_elements = {}
+
+        try:
+            # Extract elements using XPath from raw XML envelope
+            for name, xpath in self.extract_xpaths.items():
+                elements = envelope.findall(xpath)
+
+                # Extract text content from found elements
+                texts = [elem.text for elem in elements if elem.text]
+
+                if texts:
+                    self._extracted_elements[name] = texts
+                    logger.debug(
+                        f"ONVIFParser: Extracted {len(texts)} '{name}' elements"
+                    )
+
+        except Exception as e:
+            logger.warning(f"ONVIFParser: Failed to extract elements: {e}")
+
+        return envelope, http_headers
+
+    def get_extracted_texts(self, name: str, count: int) -> List[Optional[str]]:
+        """
+        Get extracted element texts by name.
+
+        Args:
+            name: Name of the extracted elements (key from extract_xpaths dict)
+            count: Number of elements to return
+
+        Returns:
+            List of element text values, padded with None if fewer elements were found.
+            Example: If 3 elements found but count=5, returns [text1, text2, text3, None, None]
+        """
+        texts = self._extracted_elements.get(name, [])[:count]
+
+        # Pad with None if not enough elements
+        while len(texts) < count:
+            texts.append(None)
+
+        return texts

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/utils/service.py

@@ -4,6 +4,7 @@ import logging
 from .exceptions import ONVIFOperationException
 
 logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
 
 
 def _is_zeep_object(obj):
@@ -40,13 +41,6 @@ class ONVIFService:
         3. Is not a private method (doesn't start with underscore)
         4. Is not an internal attribute (like 'operator')
 
-    Benefits:
-        1. **DRY Principle**: No need to repeat error handling in every method
-        2. **Consistency**: All ONVIF operations behave the same way
-        3. **Maintainability**: Error handling logic in one place
-        4. **Debuggability**: Always know which operation failed
-        5. **Transparency**: No boilerplate code in service implementations
-
     Notes:
         - This is an abstract base class - don't instantiate directly
         - Subclasses must implement their own __init__ and ONVIF methods
@@ -113,11 +107,13 @@ class ONVIFService:
                 return result
             except ONVIFOperationException as oe:
                 # Re-raise ONVIF exceptions as-is
-                logger.error(f"ONVIF operation exception in {name}: {oe}")
+                service_name = getattr(self.operator, "service_name", "Unknown")
+                logger.error(f"{service_name}.{name}: {oe}")
                 raise
             except Exception as e:
                 # Convert any other exception (including TypeError) to ONVIFOperationException
-                logger.error(f"ONVIF operation exception in {name}: {e}")
+                service_name = getattr(self.operator, "service_name", "Unknown")
+                logger.error(f"{service_name}.{name}: {e}")
                 raise ONVIFOperationException(name, e)
 
         return wrapped_method

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/utils/wsdl.py

@@ -4,6 +4,7 @@ import os
 import logging
 
 logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
 
 
 class ONVIFWSDL:

{onvif_python-0.2.0 → onvif_python-0.2.2}/onvif/utils/xml_capture.py

@@ -5,6 +5,7 @@ from zeep import Plugin
 from lxml import etree
 
 logger = logging.getLogger(__name__)
+logger.addHandler(logging.NullHandler())
 
 
 class XMLCapturePlugin(Plugin):
@@ -21,15 +22,6 @@ class XMLCapturePlugin(Plugin):
         - Operation names for context
         - Complete history of all transactions
 
-    Key Features:
-        - Pretty-printed XML with proper indentation
-        - Last request/response quick access
-        - Full transaction history storage
-        - HTTP header capture
-        - Operation name tracking
-        - File export capability
-        - Secure XML parsing (XXE protection)
-
     Use Cases:
         1. **Debugging**: See exact SOAP messages being sent/received
         2. **Learning**: Understand ONVIF protocol structure