onvif-python 0.0.8__tar.gz → 0.0.9__tar.gz

{onvif_python-0.0.8/onvif_python.egg-info → onvif_python-0.0.9}/PKG-INFO

@@ -1,14 +1,11 @@
 Metadata-Version: 2.4
 Name: onvif-python
-Version: 0.0.8
+Version: 0.0.9
 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: Issues, https://github.com/nirsimetri/onvif-python/issues
 Project-URL: Documentation, https://deepwiki.com/nirsimetri/onvif-python
-Project-URL: Repository, https://github.com/nirsimetri/onvif-python.git
 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
 Classifier: Development Status :: 5 - Production/Stable
@@ -43,9 +40,9 @@ Dynamic: license-file
 
 [![License](https://img.shields.io/badge/License-MIT-blue)](https://github.com/nirsimetri/onvif-python?tab=MIT-1-ov-file)
 [![DeepWiki](https://img.shields.io/badge/DeepWiki-AI%20Wiki-orange)](https://deepwiki.com/nirsimetri/onvif-python)
-[![Release](https://img.shields.io/badge/Release-v0.0.8-red?logo=archive)](https://github.com/nirsimetri/onvif-python/releases)
+[![Release](https://img.shields.io/badge/Release-v0.0.9-red?logo=archive)](https://github.com/nirsimetri/onvif-python/releases)
 <br>
-[![PyPI](https://img.shields.io/badge/PyPI-0.0.8-yellow?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.0.9-yellow?logo=archive)](https://pypi.org/project/onvif-python/)
 [![Downloads](https://img.shields.io/pypi/dm/onvif-python?label=PyPI%20Downloads)](https://clickpy.clickhouse.com/dashboard/onvif-python)
 
 **This project provides a comprehensive and developer-friendly Python library for working with ONVIF-compliant devices.** It is designed to be reliable, easy to integrate, and flexible enough to support a wide range of ONVIF profiles and services.  
@@ -354,7 +351,7 @@ client = ONVIFClient(
 ## Service Discovery: Understanding Device Capabilities
 
 > [!WARNING]
-> Before performing any operations on an ONVIF device, it is highly recommended to discover which services are available and supported by the device. This library automatically uses `GetServices` during initialization to discover service endpoints, but you can also query services manually for detailed information including capabilities.
+> Before performing any operations on an ONVIF device, it is highly recommended to discover which services are available and supported by the device. This library automatically performs comprehensive service discovery during initialization using a robust fallback mechanism.
 
 **Why discover device services?**
 
@@ -365,50 +362,84 @@ client = ONVIFClient(
 
 **How service discovery works in this library:**
 
-The `ONVIFClient` automatically calls `GetServices` during initialization to build a service map. This map is used internally to resolve service endpoints:
+The `ONVIFClient` uses a **3-tier discovery approach** to maximize device compatibility:
+
+1. **GetServices (Preferred)** - Tries `GetServices` first for detailed service information
+2. **GetCapabilities (Fallback)** - Falls back to `GetCapabilities` if `GetServices` is not supported
+3. **Default URLs (Final Fallback)** - Uses standard ONVIF URLs as last resort
 
 ```python
 from onvif import ONVIFClient
 
 client = ONVIFClient("192.168.1.17", 8000, "admin", "admin123")
 
-# Access the discovered services
-print(client.services)
-# Example output: [{'Namespace': 'http://www.onvif.org/ver10/device/wsdl', 'XAddr': '...', 'Version': {...}}, ...]
-
-# Check the service map (namespace -> XAddr mapping)
-print(client._service_map)
-# Example output: {'http://www.onvif.org/ver10/media/wsdl': 'http://192.168.1.17:8000/onvif/Media', ...}
+# Check what discovery method was used
+if client.services:
+    print("Service discovery: GetServices (preferred)")
+    print("Discovered services:", len(client.services))
+    print("Service map:", client._service_map)
+elif client.capabilities:
+    print("Service discovery: GetCapabilities (fallback)")
+    print("Available capabilities:", client.capabilities)
+else:
+    print("Service discovery: Using default URLs")
 ```
 
-**Get detailed service information with capabilities:**
+**Why this approach?**
+
+- **GetServices** provides the most accurate and detailed service information, but it's **optional** in the ONVIF specification
+- **GetCapabilities** is **mandatory** for all ONVIF-compliant devices, ensuring broader compatibility
+- **Default URLs** guarantee basic connectivity even with non-compliant devices
 
-If you need detailed capability information for each service, call `GetServices` with `IncludeCapability=True`:
+**Get detailed service information:**
+
+If you need comprehensive service details, you can manually call `GetServices` with capabilities:
 
 ```python
 device = client.devicemgmt()
-services = device.GetServices(IncludeCapability=True)
-
-for service in services:
-    print(f"Service: {service.Namespace}")
-    print(f"Endpoint: {service.XAddr}")
-    print(f"Version: {service.Version.Major}.{service.Version.Minor}")
-    if hasattr(service, 'Capabilities') and service.Capabilities:
-        print(f"Capabilities: {service.Capabilities}")
+
+try:
+    # Try to get detailed service information
+    services = device.GetServices(IncludeCapability=True)
+    for service in services:
+        print(f"Service: {service.Namespace}")
+        print(f"XAddr: {service.XAddr}")
+        if hasattr(service, 'Capabilities'):
+            print(f"Capabilities: {service.Capabilities}")
+except Exception:
+    # Fallback to GetCapabilities for legacy devices
+    capabilities = device.GetCapabilities()
+    print("Capabilities:", capabilities)
 ```
 
-**Alternative: Use GetCapabilities for legacy compatibility:**
+**Access capabilities information:**
 
-For backward compatibility or when you need a quick overview of major service categories, you can still use `GetCapabilities`:
+When using `GetCapabilities` fallback, you can access capability information:
 
 ```python
-capabilities = client.devicemgmt().GetCapabilities()
-print(capabilities)
-# Example output: {'Media': {'XAddr': '...', ...}, 'PTZ': {...}, 'Events': {...}, ...}
+device = client.devicemgmt()
+
+try:
+    # Get capabilities information from device
+    capabilities = device.GetCapabilities()
+    
+    # Main services (always available)
+    print("Media XAddr:", getattr(capabilities.Media, 'XAddr', 'Not available'))
+    print("PTZ XAddr:", getattr(capabilities.PTZ, 'XAddr', 'Not available'))
+    
+    # Extension services (device-dependent)
+    ext = getattr(capabilities, 'Extension', None)
+    if ext:
+        print("DeviceIO XAddr:", getattr(ext.DeviceIO, 'XAddr', 'Not available'))
+        print("Recording XAddr:", getattr(ext.Recording, 'XAddr', 'Not available'))
+        print("Search XAddr:", getattr(ext.Search, 'XAddr', 'Not available'))
+        print("Replay XAddr:", getattr(ext.Replay, 'XAddr', 'Not available'))
+except Exception as e:
+    print(f"Error getting capabilities: {e}")
 ```
 
 > [!TIP]
-> The library handles service discovery automatically, so you typically don't need to call `GetServices` manually unless you need detailed capability information or want to refresh the service list after device configuration changes.
+> The library handles service discovery automatically with intelligent fallback. You typically don't need to call discovery methods manually unless you need detailed capability information or want to refresh the service list after device configuration changes.
 
 ## Tested Devices
 

{onvif_python-0.0.8 → onvif_python-0.0.9}/README.md

@@ -2,9 +2,9 @@
 
 [![License](https://img.shields.io/badge/License-MIT-blue)](https://github.com/nirsimetri/onvif-python?tab=MIT-1-ov-file)
 [![DeepWiki](https://img.shields.io/badge/DeepWiki-AI%20Wiki-orange)](https://deepwiki.com/nirsimetri/onvif-python)
-[![Release](https://img.shields.io/badge/Release-v0.0.8-red?logo=archive)](https://github.com/nirsimetri/onvif-python/releases)
+[![Release](https://img.shields.io/badge/Release-v0.0.9-red?logo=archive)](https://github.com/nirsimetri/onvif-python/releases)
 <br>
-[![PyPI](https://img.shields.io/badge/PyPI-0.0.8-yellow?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.0.9-yellow?logo=archive)](https://pypi.org/project/onvif-python/)
 [![Downloads](https://img.shields.io/pypi/dm/onvif-python?label=PyPI%20Downloads)](https://clickpy.clickhouse.com/dashboard/onvif-python)
 
 **This project provides a comprehensive and developer-friendly Python library for working with ONVIF-compliant devices.** It is designed to be reliable, easy to integrate, and flexible enough to support a wide range of ONVIF profiles and services.  
@@ -313,7 +313,7 @@ client = ONVIFClient(
 ## Service Discovery: Understanding Device Capabilities
 
 > [!WARNING]
-> Before performing any operations on an ONVIF device, it is highly recommended to discover which services are available and supported by the device. This library automatically uses `GetServices` during initialization to discover service endpoints, but you can also query services manually for detailed information including capabilities.
+> Before performing any operations on an ONVIF device, it is highly recommended to discover which services are available and supported by the device. This library automatically performs comprehensive service discovery during initialization using a robust fallback mechanism.
 
 **Why discover device services?**
 
@@ -324,50 +324,84 @@ client = ONVIFClient(
 
 **How service discovery works in this library:**
 
-The `ONVIFClient` automatically calls `GetServices` during initialization to build a service map. This map is used internally to resolve service endpoints:
+The `ONVIFClient` uses a **3-tier discovery approach** to maximize device compatibility:
+
+1. **GetServices (Preferred)** - Tries `GetServices` first for detailed service information
+2. **GetCapabilities (Fallback)** - Falls back to `GetCapabilities` if `GetServices` is not supported
+3. **Default URLs (Final Fallback)** - Uses standard ONVIF URLs as last resort
 
 ```python
 from onvif import ONVIFClient
 
 client = ONVIFClient("192.168.1.17", 8000, "admin", "admin123")
 
-# Access the discovered services
-print(client.services)
-# Example output: [{'Namespace': 'http://www.onvif.org/ver10/device/wsdl', 'XAddr': '...', 'Version': {...}}, ...]
-
-# Check the service map (namespace -> XAddr mapping)
-print(client._service_map)
-# Example output: {'http://www.onvif.org/ver10/media/wsdl': 'http://192.168.1.17:8000/onvif/Media', ...}
+# Check what discovery method was used
+if client.services:
+    print("Service discovery: GetServices (preferred)")
+    print("Discovered services:", len(client.services))
+    print("Service map:", client._service_map)
+elif client.capabilities:
+    print("Service discovery: GetCapabilities (fallback)")
+    print("Available capabilities:", client.capabilities)
+else:
+    print("Service discovery: Using default URLs")
 ```
 
-**Get detailed service information with capabilities:**
+**Why this approach?**
+
+- **GetServices** provides the most accurate and detailed service information, but it's **optional** in the ONVIF specification
+- **GetCapabilities** is **mandatory** for all ONVIF-compliant devices, ensuring broader compatibility
+- **Default URLs** guarantee basic connectivity even with non-compliant devices
 
-If you need detailed capability information for each service, call `GetServices` with `IncludeCapability=True`:
+**Get detailed service information:**
+
+If you need comprehensive service details, you can manually call `GetServices` with capabilities:
 
 ```python
 device = client.devicemgmt()
-services = device.GetServices(IncludeCapability=True)
-
-for service in services:
-    print(f"Service: {service.Namespace}")
-    print(f"Endpoint: {service.XAddr}")
-    print(f"Version: {service.Version.Major}.{service.Version.Minor}")
-    if hasattr(service, 'Capabilities') and service.Capabilities:
-        print(f"Capabilities: {service.Capabilities}")
+
+try:
+    # Try to get detailed service information
+    services = device.GetServices(IncludeCapability=True)
+    for service in services:
+        print(f"Service: {service.Namespace}")
+        print(f"XAddr: {service.XAddr}")
+        if hasattr(service, 'Capabilities'):
+            print(f"Capabilities: {service.Capabilities}")
+except Exception:
+    # Fallback to GetCapabilities for legacy devices
+    capabilities = device.GetCapabilities()
+    print("Capabilities:", capabilities)
 ```
 
-**Alternative: Use GetCapabilities for legacy compatibility:**
+**Access capabilities information:**
 
-For backward compatibility or when you need a quick overview of major service categories, you can still use `GetCapabilities`:
+When using `GetCapabilities` fallback, you can access capability information:
 
 ```python
-capabilities = client.devicemgmt().GetCapabilities()
-print(capabilities)
-# Example output: {'Media': {'XAddr': '...', ...}, 'PTZ': {...}, 'Events': {...}, ...}
+device = client.devicemgmt()
+
+try:
+    # Get capabilities information from device
+    capabilities = device.GetCapabilities()
+    
+    # Main services (always available)
+    print("Media XAddr:", getattr(capabilities.Media, 'XAddr', 'Not available'))
+    print("PTZ XAddr:", getattr(capabilities.PTZ, 'XAddr', 'Not available'))
+    
+    # Extension services (device-dependent)
+    ext = getattr(capabilities, 'Extension', None)
+    if ext:
+        print("DeviceIO XAddr:", getattr(ext.DeviceIO, 'XAddr', 'Not available'))
+        print("Recording XAddr:", getattr(ext.Recording, 'XAddr', 'Not available'))
+        print("Search XAddr:", getattr(ext.Search, 'XAddr', 'Not available'))
+        print("Replay XAddr:", getattr(ext.Replay, 'XAddr', 'Not available'))
+except Exception as e:
+    print(f"Error getting capabilities: {e}")
 ```
 
 > [!TIP]
-> The library handles service discovery automatically, so you typically don't need to call `GetServices` manually unless you need detailed capability information or want to refresh the service list after device configuration changes.
+> The library handles service discovery automatically with intelligent fallback. You typically don't need to call discovery methods manually unless you need detailed capability information or want to refresh the service list after device configuration changes.
 
 ## Tested Devices
 

{onvif_python-0.0.8 → onvif_python-0.0.9}/onvif/client.py

@@ -58,8 +58,6 @@ class ONVIFClient:
         apply_patch=True,
         capture_xml=False,
     ):
-        self.apply_patch = apply_patch
-
         # Apply or remove zeep patch based on user preference
         if apply_patch:
             ZeepPatcher.apply_patch()
@@ -81,22 +79,37 @@ class ONVIFClient:
             "cache": cache,
             "use_https": use_https,
             "verify_ssl": verify_ssl,
-            "apply_flatten": apply_patch,
+            "apply_patch": apply_patch,
             "plugins": [self.xml_plugin] if self.xml_plugin else None,
         }
 
         # Device Management (Core) service is always available
         self._devicemgmt = Device(**self.common_args)
 
-        # Retrieve device services once and create namespace -> XAddr mapping
-        self.services = self._devicemgmt.GetServices(IncludeCapability=False)
+        # Try to retrieve device services and create namespace -> XAddr mapping
+        self.services = None
         self._service_map = {}
-        for service in self.services:
-            namespace = getattr(service, "Namespace", None)
-            xaddr = getattr(service, "XAddr", None)
+        
+        # Temporary variable to hold capabilities
+        self.capabilities = None
+
+        try:
+            # Try GetServices first (preferred method)
+            self.services = self._devicemgmt.GetServices(IncludeCapability=False)
+            for service in self.services:
+                namespace = getattr(service, "Namespace", None)
+                xaddr = getattr(service, "XAddr", None)
 
-            if namespace and xaddr:
-                self._service_map[namespace] = xaddr
+                if namespace and xaddr:
+                    self._service_map[namespace] = xaddr
+
+        except Exception:
+            # Fallback to GetCapabilities if GetServices is not supported on device
+            try:
+                self.capabilities = self._devicemgmt.GetCapabilities(Category="All")
+            except Exception:
+                # If both fail, we'll use default URLs
+                pass
 
         # Lazy init for other services
 
@@ -158,49 +171,106 @@ class ONVIFClient:
 
     def _get_xaddr(self, service_name: str, service_path: str):
         """
-        Resolve XAddr from GetServices based on namespace mapping.
-        Falls back to default URL if service not found.
+        Resolve XAddr for ONVIF services using a comprehensive 3-tier discovery approach.
+
+        1. GetServices: Try to resolve from GetServices response using namespace mapping
+        2. GetCapabilities: Fall back to GetCapabilities response with multiple lookup strategies:
+           - Direct capabilities.service_path
+           - Extension capabilities.Extension.service_path
+           - Nested Extension capabilities.Extension.Extension.service_path
+        3. Default URL: Generate default ONVIF URL as final fallback
+
+        Args:
+            service_name: Internal service name (e.g., 'imaging', 'media', 'deviceio')
+            service_path: ONVIF service path (e.g., 'Imaging', 'Media', 'DeviceIO')
+
+        Returns:
+            str: The resolved XAddr URL for the service
+
+        Notes:
+            - GetServices is the preferred method as it provides the most accurate service endpoints.
+              But not all devices implement it because it's optional in the ONVIF spec.
+            - GetCapabilities lookup tries multiple strategies to maximize chances of finding the XAddr.
+              And GetCapabilities is mandatory for ONVIF devices, so it's more widely supported.
+            - Fallback to default URL ensures basic connectivity even if the device lacks proper service discovery.
         """
-        # Get the namespace for this service from WSDL_MAP
-        try:
-            # Try to get the service definition from WSDL_MAP
-            # Most services use ver10, some use ver20
-            wsdl_def = None
 
-            # Try ver10 first, then ver20
-            if service_name in ONVIFWSDL.WSDL_MAP:
-                if "ver10" in ONVIFWSDL.WSDL_MAP[service_name]:
-                    wsdl_def = ONVIFWSDL.WSDL_MAP[service_name]["ver10"]
-                elif "ver20" in ONVIFWSDL.WSDL_MAP[service_name]:
-                    wsdl_def = ONVIFWSDL.WSDL_MAP[service_name]["ver20"]
+        # First try to get from GetServices mapping
+        if self.services:
+            # Get the namespace for this service from WSDL_MAP
+            try:
+                # Try to get the service definition from WSDL_MAP
+                # Most services use ver10, some use ver20
+                wsdl_def = None
+
+                # Try ver10 first, then ver20
+                if service_name in ONVIFWSDL.WSDL_MAP:
+                    if "ver10" in ONVIFWSDL.WSDL_MAP[service_name]:
+                        wsdl_def = ONVIFWSDL.WSDL_MAP[service_name]["ver10"]
+                    elif "ver20" in ONVIFWSDL.WSDL_MAP[service_name]:
+                        wsdl_def = ONVIFWSDL.WSDL_MAP[service_name]["ver20"]
+
+                if wsdl_def:
+                    namespace = wsdl_def["namespace"]
+                    xaddr = self._service_map.get(namespace)
+
+                    if xaddr:
+                        # Rewrite host/port if needed
+                        rewritten = self._rewrite_xaddr_if_needed(xaddr)
+                        return rewritten
+            except Exception:
+                pass
 
-            if wsdl_def:
-                namespace = wsdl_def["namespace"]
-                xaddr = self._service_map.get(namespace)
+        # If not found in service map and we have capabilities, try to get it dynamically from GetCapabilities
+        if self.capabilities:
+            try:
+                svc = getattr(self.capabilities, service_path, None)
+                # Step 1: check direct attribute capabilities.service_path (e.g. capabilities.Media)
+                if svc and hasattr(svc, "XAddr"):
+                    xaddr = svc.XAddr
+                else:
+                    # Step 2: try capabilities.Extension.service_path (e.g. capabilities.Extension.DeviceIO)
+                    ext = getattr(self.capabilities, "Extension", None)
+                    if ext and hasattr(ext, service_path):
+                        svc = getattr(ext, service_path, None)
+                        xaddr = getattr(svc, "XAddr", None) if svc else None
+                    else:
+                        # Step 3: try capabilities.Extension.Extension.service_path (e.g. capabilities.Extension.Extension.Provisioning)
+                        ext_ext = getattr(ext, "Extension", None)
+                        if ext_ext and hasattr(ext_ext, service_path):
+                            svc = getattr(ext_ext, service_path, None)
+                            xaddr = getattr(svc, "XAddr", None) if svc else None
 
                 if xaddr:
                     # Rewrite host/port if needed
-                    parsed = urlparse(xaddr)
-                    device_host = parsed.hostname
-                    device_port = parsed.port
-                    connect_host = self.common_args["host"]
-                    connect_port = self.common_args["port"]
-
-                    if (device_host != connect_host) or (device_port != connect_port):
-                        protocol = "https" if self.common_args["use_https"] else "http"
-                        new_netloc = f"{connect_host}:{connect_port}"
-                        rewritten = urlunparse(
-                            (protocol, new_netloc, parsed.path, "", "", "")
-                        )
-                        return rewritten
-                    return xaddr
-        except Exception:
-            pass
+                    rewritten = self._rewrite_xaddr_if_needed(xaddr)
+                    return rewritten
+            except Exception:
+                pass
 
         # Fallback to default URL
         protocol = "https" if self.common_args["use_https"] else "http"
         return f"{protocol}://{self.common_args['host']}:{self.common_args['port']}/onvif/{service_path}"
 
+    def _rewrite_xaddr_if_needed(self, xaddr: str):
+        """
+        Rewrite XAddr to use client's host/port if different from device's.
+        """
+        try:
+            parsed = urlparse(xaddr)
+            device_host = parsed.hostname
+            device_port = parsed.port
+            connect_host = self.common_args["host"]
+            connect_port = self.common_args["port"]
+
+            if (device_host != connect_host) or (device_port != connect_port):
+                protocol = "https" if self.common_args["use_https"] else "http"
+                new_netloc = f"{connect_host}:{connect_port}"
+                return urlunparse((protocol, new_netloc, parsed.path, "", "", ""))
+            return xaddr
+        except Exception:
+            return xaddr
+
     # Core (Device Management)
 
     def devicemgmt(self):
@@ -459,7 +529,7 @@ class ONVIFClient:
     def search(self):
         if self._search is None:
             self._search = Search(
-                xaddr=self._get_xaddr("search", "SearchRecording"),
+                xaddr=self._get_xaddr("search", "Search"),
                 **self.common_args,
             )
         return self._search

{onvif_python-0.0.8 → onvif_python-0.0.9}/onvif/operator.py

@@ -51,7 +51,7 @@ class ONVIFOperator:
         cache_path: str = None,
         use_https: bool = False,
         verify_ssl: bool = True,
-        apply_flatten: bool = True,
+        apply_patch: bool = True,
         plugins: list = None,
     ):
         self.wsdl_path = wsdl_path
@@ -60,7 +60,7 @@ class ONVIFOperator:
         self.username = username
         self.password = password
         self.timeout = timeout
-        self.apply_flatten = apply_flatten
+        self.apply_patch = apply_patch
 
         if xaddr:
             self.address = xaddr
@@ -127,7 +127,7 @@ class ONVIFOperator:
         try:
             result = func(*args, **kwargs)
             # Post-process to flatten xsd:any fields if enabled (> v0.0.4 patch)
-            if self.apply_flatten:
+            if self.apply_patch:
                 return ZeepPatcher.flatten_xsd_any_fields(result)
             return result
         except Fault as e:

{onvif_python-0.0.8 → onvif_python-0.0.9}/onvif/services/uplink.py

@@ -30,4 +30,4 @@ class Uplink:
         return self.operator.call("SetUplink", Configuration=Configuration)
 
     def DeleteUplink(self, RemoteAddress):
-        return self.operator.call("SetUplink", RemoteAddress=RemoteAddress)
+        return self.operator.call("DeleteUplink", RemoteAddress=RemoteAddress)

{onvif_python-0.0.8 → onvif_python-0.0.9/onvif_python.egg-info}/PKG-INFO

@@ -1,14 +1,11 @@
 Metadata-Version: 2.4
 Name: onvif-python
-Version: 0.0.8
+Version: 0.0.9
 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: Issues, https://github.com/nirsimetri/onvif-python/issues
 Project-URL: Documentation, https://deepwiki.com/nirsimetri/onvif-python
-Project-URL: Repository, https://github.com/nirsimetri/onvif-python.git
 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
 Classifier: Development Status :: 5 - Production/Stable
@@ -43,9 +40,9 @@ Dynamic: license-file
 
 [![License](https://img.shields.io/badge/License-MIT-blue)](https://github.com/nirsimetri/onvif-python?tab=MIT-1-ov-file)
 [![DeepWiki](https://img.shields.io/badge/DeepWiki-AI%20Wiki-orange)](https://deepwiki.com/nirsimetri/onvif-python)
-[![Release](https://img.shields.io/badge/Release-v0.0.8-red?logo=archive)](https://github.com/nirsimetri/onvif-python/releases)
+[![Release](https://img.shields.io/badge/Release-v0.0.9-red?logo=archive)](https://github.com/nirsimetri/onvif-python/releases)
 <br>
-[![PyPI](https://img.shields.io/badge/PyPI-0.0.8-yellow?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.0.9-yellow?logo=archive)](https://pypi.org/project/onvif-python/)
 [![Downloads](https://img.shields.io/pypi/dm/onvif-python?label=PyPI%20Downloads)](https://clickpy.clickhouse.com/dashboard/onvif-python)
 
 **This project provides a comprehensive and developer-friendly Python library for working with ONVIF-compliant devices.** It is designed to be reliable, easy to integrate, and flexible enough to support a wide range of ONVIF profiles and services.  
@@ -354,7 +351,7 @@ client = ONVIFClient(
 ## Service Discovery: Understanding Device Capabilities
 
 > [!WARNING]
-> Before performing any operations on an ONVIF device, it is highly recommended to discover which services are available and supported by the device. This library automatically uses `GetServices` during initialization to discover service endpoints, but you can also query services manually for detailed information including capabilities.
+> Before performing any operations on an ONVIF device, it is highly recommended to discover which services are available and supported by the device. This library automatically performs comprehensive service discovery during initialization using a robust fallback mechanism.
 
 **Why discover device services?**
 
@@ -365,50 +362,84 @@ client = ONVIFClient(
 
 **How service discovery works in this library:**
 
-The `ONVIFClient` automatically calls `GetServices` during initialization to build a service map. This map is used internally to resolve service endpoints:
+The `ONVIFClient` uses a **3-tier discovery approach** to maximize device compatibility:
+
+1. **GetServices (Preferred)** - Tries `GetServices` first for detailed service information
+2. **GetCapabilities (Fallback)** - Falls back to `GetCapabilities` if `GetServices` is not supported
+3. **Default URLs (Final Fallback)** - Uses standard ONVIF URLs as last resort
 
 ```python
 from onvif import ONVIFClient
 
 client = ONVIFClient("192.168.1.17", 8000, "admin", "admin123")
 
-# Access the discovered services
-print(client.services)
-# Example output: [{'Namespace': 'http://www.onvif.org/ver10/device/wsdl', 'XAddr': '...', 'Version': {...}}, ...]
-
-# Check the service map (namespace -> XAddr mapping)
-print(client._service_map)
-# Example output: {'http://www.onvif.org/ver10/media/wsdl': 'http://192.168.1.17:8000/onvif/Media', ...}
+# Check what discovery method was used
+if client.services:
+    print("Service discovery: GetServices (preferred)")
+    print("Discovered services:", len(client.services))
+    print("Service map:", client._service_map)
+elif client.capabilities:
+    print("Service discovery: GetCapabilities (fallback)")
+    print("Available capabilities:", client.capabilities)
+else:
+    print("Service discovery: Using default URLs")
 ```
 
-**Get detailed service information with capabilities:**
+**Why this approach?**
+
+- **GetServices** provides the most accurate and detailed service information, but it's **optional** in the ONVIF specification
+- **GetCapabilities** is **mandatory** for all ONVIF-compliant devices, ensuring broader compatibility
+- **Default URLs** guarantee basic connectivity even with non-compliant devices
 
-If you need detailed capability information for each service, call `GetServices` with `IncludeCapability=True`:
+**Get detailed service information:**
+
+If you need comprehensive service details, you can manually call `GetServices` with capabilities:
 
 ```python
 device = client.devicemgmt()
-services = device.GetServices(IncludeCapability=True)
-
-for service in services:
-    print(f"Service: {service.Namespace}")
-    print(f"Endpoint: {service.XAddr}")
-    print(f"Version: {service.Version.Major}.{service.Version.Minor}")
-    if hasattr(service, 'Capabilities') and service.Capabilities:
-        print(f"Capabilities: {service.Capabilities}")
+
+try:
+    # Try to get detailed service information
+    services = device.GetServices(IncludeCapability=True)
+    for service in services:
+        print(f"Service: {service.Namespace}")
+        print(f"XAddr: {service.XAddr}")
+        if hasattr(service, 'Capabilities'):
+            print(f"Capabilities: {service.Capabilities}")
+except Exception:
+    # Fallback to GetCapabilities for legacy devices
+    capabilities = device.GetCapabilities()
+    print("Capabilities:", capabilities)
 ```
 
-**Alternative: Use GetCapabilities for legacy compatibility:**
+**Access capabilities information:**
 
-For backward compatibility or when you need a quick overview of major service categories, you can still use `GetCapabilities`:
+When using `GetCapabilities` fallback, you can access capability information:
 
 ```python
-capabilities = client.devicemgmt().GetCapabilities()
-print(capabilities)
-# Example output: {'Media': {'XAddr': '...', ...}, 'PTZ': {...}, 'Events': {...}, ...}
+device = client.devicemgmt()
+
+try:
+    # Get capabilities information from device
+    capabilities = device.GetCapabilities()
+    
+    # Main services (always available)
+    print("Media XAddr:", getattr(capabilities.Media, 'XAddr', 'Not available'))
+    print("PTZ XAddr:", getattr(capabilities.PTZ, 'XAddr', 'Not available'))
+    
+    # Extension services (device-dependent)
+    ext = getattr(capabilities, 'Extension', None)
+    if ext:
+        print("DeviceIO XAddr:", getattr(ext.DeviceIO, 'XAddr', 'Not available'))
+        print("Recording XAddr:", getattr(ext.Recording, 'XAddr', 'Not available'))
+        print("Search XAddr:", getattr(ext.Search, 'XAddr', 'Not available'))
+        print("Replay XAddr:", getattr(ext.Replay, 'XAddr', 'Not available'))
+except Exception as e:
+    print(f"Error getting capabilities: {e}")
 ```
 
 > [!TIP]
-> The library handles service discovery automatically, so you typically don't need to call `GetServices` manually unless you need detailed capability information or want to refresh the service list after device configuration changes.
+> The library handles service discovery automatically with intelligent fallback. You typically don't need to call discovery methods manually unless you need detailed capability information or want to refresh the service list after device configuration changes.
 
 ## Tested Devices
 

{onvif_python-0.0.8 → onvif_python-0.0.9}/pyproject.toml

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