onvif-python 0.0.1__tar.gz → 0.0.2__tar.gz

{onvif_python-0.0.1/onvif_python.egg-info → onvif_python-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onvif-python
-Version: 0.0.1
+Version: 0.0.2
 Summary: A comprehensive and developer-friendly Python library for working with ONVIF-compliant devices
 Author-email: Nirsimetri Technologies® <open@nirsimetri.com>
 Maintainer: Kaburagi
@@ -44,7 +44,7 @@ Dynamic: license-file
 [![Release](https://img.shields.io/badge/Release-v0.0.1-green?logo=archive)](https://github.com/nirsimetri/onvif-python/releases)
 <br>
 [![PyPI](https://img.shields.io/badge/PyPI-0.0.1-yellow?logo=archive)](https://pypi.org/project/onvif-python/)
-[![Downloads](https://img.shields.io/pypi/dm/onvif-python?label=PyPI%20Downloads)](https://pypi.org/project/onvif-python/)
+[![Downloads](https://img.shields.io/pypi/dd/onvif-python?label=PyPI%20Downloads&color=white)](https://pypi.org/project/onvif-python/)
 
 Are you having trouble finding a Python ONVIF library that supports your device?  
 Are you confused about the compatibility of the various ONVIF versions, which are updated every six months?
@@ -108,11 +108,8 @@ client = ONVIFClient("192.168.1.17", 8000, "admin", "admin123")
 - `client.events()` — Events
 - `client.imaging()` — Imaging
 - `client.media()` — Media
-- `client.media2()` — Media 2
 - `client.ptz()` — PTZ (Pan-Tilt-Zoom)
-- `client.deviceio()` — Device IO
 - `client.analytics()` — Analytics
-- `client.recording()` — Recording
 
 and so on, check [Implemented ONVIF Services](https://github.com/nirsimetri/onvif-python?tab=readme-ov-file#implemented-onvif-services) for more details
 
@@ -200,7 +197,7 @@ This library fully supports all major ONVIF Profiles listed below. Each profile
 | Profile_T | [Document](https://www.onvif.org/wp-content/uploads/2018/09/ONVIF_Profile_T_Specification_v1-0.pdf) | Advanced video streaming (H.265, analytics metadata, motion detection) | Modern cameras and clients | ✅ Yes |
 | Profile_C | [Document](https://www.onvif.org/wp-content/uploads/2017/01/2013_12_ONVIF_Profile_C_Specification_v1-0.pdf) | Access control, door monitoring | Door controllers, access systems | ✅ Yes |
 | Profile_A | [Document](https://www.onvif.org/wp-content/uploads/2017/06/ONVIF_Profile_A_Specification_v1-0.pdf) | Advanced access control configuration, credential management | Access control clients and devices | ✅ Yes |
-| Profile_D | [Document](https://www.onvif.org/wp-content/uploads/2017/06/ONVIF_Profile_D_Specification_v1-0.pdf) | Access control peripherals (locks, sensors, relays) | Peripheral devices for access control | ✅ Yes |
+| Profile_D | [Document](https://www.onvif.org/wp-content/uploads/2021/06/onvif-profile-d-specification-v1-0.pdf) | Access control peripherals (locks, sensors, relays) | Peripheral devices for access control | ✅ Yes |
 | Profile_M | [Document](https://www.onvif.org/wp-content/uploads/2024/04/onvif-profile-m-specification-v1-1.pdf) | Metadata, analytics events, object detection | Analytics devices, metadata clients | ✅ Yes |
 
 For a full description of each profile and its features, visit [ONVIF Profiles](https://www.onvif.org/profiles/).

{onvif_python-0.0.1 → onvif_python-0.0.2}/README.md

@@ -5,7 +5,7 @@
 [![Release](https://img.shields.io/badge/Release-v0.0.1-green?logo=archive)](https://github.com/nirsimetri/onvif-python/releases)
 <br>
 [![PyPI](https://img.shields.io/badge/PyPI-0.0.1-yellow?logo=archive)](https://pypi.org/project/onvif-python/)
-[![Downloads](https://img.shields.io/pypi/dm/onvif-python?label=PyPI%20Downloads)](https://pypi.org/project/onvif-python/)
+[![Downloads](https://img.shields.io/pypi/dd/onvif-python?label=PyPI%20Downloads&color=white)](https://pypi.org/project/onvif-python/)
 
 Are you having trouble finding a Python ONVIF library that supports your device?  
 Are you confused about the compatibility of the various ONVIF versions, which are updated every six months?
@@ -69,11 +69,8 @@ client = ONVIFClient("192.168.1.17", 8000, "admin", "admin123")
 - `client.events()` — Events
 - `client.imaging()` — Imaging
 - `client.media()` — Media
-- `client.media2()` — Media 2
 - `client.ptz()` — PTZ (Pan-Tilt-Zoom)
-- `client.deviceio()` — Device IO
 - `client.analytics()` — Analytics
-- `client.recording()` — Recording
 
 and so on, check [Implemented ONVIF Services](https://github.com/nirsimetri/onvif-python?tab=readme-ov-file#implemented-onvif-services) for more details
 
@@ -161,7 +158,7 @@ This library fully supports all major ONVIF Profiles listed below. Each profile
 | Profile_T | [Document](https://www.onvif.org/wp-content/uploads/2018/09/ONVIF_Profile_T_Specification_v1-0.pdf) | Advanced video streaming (H.265, analytics metadata, motion detection) | Modern cameras and clients | ✅ Yes |
 | Profile_C | [Document](https://www.onvif.org/wp-content/uploads/2017/01/2013_12_ONVIF_Profile_C_Specification_v1-0.pdf) | Access control, door monitoring | Door controllers, access systems | ✅ Yes |
 | Profile_A | [Document](https://www.onvif.org/wp-content/uploads/2017/06/ONVIF_Profile_A_Specification_v1-0.pdf) | Advanced access control configuration, credential management | Access control clients and devices | ✅ Yes |
-| Profile_D | [Document](https://www.onvif.org/wp-content/uploads/2017/06/ONVIF_Profile_D_Specification_v1-0.pdf) | Access control peripherals (locks, sensors, relays) | Peripheral devices for access control | ✅ Yes |
+| Profile_D | [Document](https://www.onvif.org/wp-content/uploads/2021/06/onvif-profile-d-specification-v1-0.pdf) | Access control peripherals (locks, sensors, relays) | Peripheral devices for access control | ✅ Yes |
 | Profile_M | [Document](https://www.onvif.org/wp-content/uploads/2024/04/onvif-profile-m-specification-v1-1.pdf) | Metadata, analytics events, object detection | Analytics devices, metadata clients | ✅ Yes |
 
 For a full description of each profile and its features, visit [ONVIF Profiles](https://www.onvif.org/profiles/).

{onvif_python-0.0.1 → onvif_python-0.0.2}/onvif/__init__.py

@@ -3,6 +3,7 @@
 from .client import ONVIFClient
 from .operator import ONVIFOperator, CacheMode
 from .utils import ONVIFWSDL, ONVIFOperationException
+from .utils.zeep import apply_patch
 
 __all__ = [
     "ONVIFClient",
@@ -11,3 +12,5 @@ __all__ = [
     "ONVIFWSDL",
     "ONVIFOperationException",
 ]
+
+apply_patch()

{onvif_python-0.0.1 → onvif_python-0.0.2}/onvif/client.py

@@ -130,32 +130,45 @@ class ONVIFClient:
         self._authorizationserver = None
         self._mediasigning = None
 
+
     def _get_xaddr(self, service_name: str, service_path: str):
         """
         Resolve XAddr from GetCapabilities. Fallback to default if not present.
+        Now supports nested Extension with _value_1 dict (after normalized parsing).
         """
         svc = getattr(self.capabilities, service_name, None)
-        if svc and hasattr(svc, "XAddr") and svc.XAddr:
-            parsed = urlparse(svc.XAddr)
 
+        # Step 1: check direct attribute (e.g. capabilities.Media)
+        if svc and hasattr(svc, "XAddr"):
+            xaddr = svc.XAddr
+        else:
+            # Step 2: try legacy Extension.service_name
+            ext = getattr(self.capabilities, "Extension", None)
+            if ext and hasattr(ext, service_name):
+                svc = getattr(ext, service_name, None)
+                xaddr = getattr(svc, "XAddr", None) if svc else None
+            else:
+                # Step 3: try new-style _value_1 dict inside Extension
+                ext_dict = getattr(ext, "_value_1", {})
+                xaddr = ext_dict.get(service_name, {}).get("XAddr") if isinstance(ext_dict, dict) else None
+
+        if xaddr:
+            parsed = urlparse(xaddr)
             # Host/port from device
             device_host = parsed.hostname
             device_port = parsed.port
-
             # Host/port from connection
             connect_host = self.common_args["host"]
             connect_port = self.common_args["port"]
-
             # if host/port differ, rewrite XAddr to use connection values
             if (device_host != connect_host) or (device_port != connect_port):
-                protocol = parsed.scheme
+                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
 
-            return svc.XAddr
-
-        # fallback (legacy style)
+        # Fallback default
         protocol = "https" if self.common_args["use_https"] else "http"
         return f"{protocol}://{self.common_args['host']}:{self.common_args['port']}/onvif/{service_path}"
 

{onvif_python-0.0.1 → onvif_python-0.0.2}/onvif/services/devicemgmt.py

@@ -16,9 +16,7 @@ class Device:
         )
 
     def GetServices(self, IncludeCapability):
-        return self.operator.call(
-            "GetServices", IncludeCapability=IncludeCapability
-        )
+        return self.operator.call("GetServices", IncludeCapability=IncludeCapability)
 
     def GetServiceCapabilities(self):
         return self.operator.call("GetServiceCapabilities")

{onvif_python-0.0.1 → onvif_python-0.0.2}/onvif/services/search.py

@@ -10,7 +10,7 @@ class Search:
         self.operator = ONVIFOperator(
             definition["path"],
             binding=f"{{{definition['namespace']}}}{definition['binding']}",
-            service_path="Search",  # fallback
+            service_path="SearchRecording",  # fallback
             xaddr=xaddr,
             **kwargs,
         )

onvif_python-0.0.2/onvif/utils/zeep.py

@@ -0,0 +1,49 @@
+# onvif/utils/zeep.py
+
+from lxml.etree import QName
+from zeep.xsd.elements.any import Any
+from zeep.xsd.utils import max_occurs_iter
+
+
+def patched_parse_xmlelements(self, xmlelements, schema, name=None, context=None):
+    """Patched version of parse_xmlelements for <xsd:any> to support child parsing."""
+    parsed_result = {}
+
+    for _ in max_occurs_iter(self.max_occurs):
+        if not xmlelements:
+            break
+
+        xmlelement = xmlelements.popleft()
+        tag_name = QName(xmlelement.tag).localname
+        children = list(xmlelement)
+
+        if children and schema:
+            child_result = {}
+            for child in children:
+                child_qname = QName(child.tag)
+                try:
+                    xsd_el = schema.get_element(child_qname)
+                    val = xsd_el.parse_xmlelement(
+                        child, schema=schema, allow_none=True, context=context
+                    )
+                    child_result[child_qname.localname] = val
+                except Exception:
+                    if list(child):  # has nested children
+                        nested = {
+                            QName(sub.tag).localname: sub.text or sub
+                            for sub in child
+                        }
+                        child_result[child_qname.localname] = nested
+                    else:
+                        child_result[child_qname.localname] = child.text or child
+
+            parsed_result[tag_name] = child_result
+        else:
+            parsed_result[tag_name] = xmlelement.text or xmlelement
+
+    return parsed_result
+
+
+def apply_patch():
+    """Inject the custom parse_xmlelements method into zeep.xsd.elements.any.Any."""
+    Any.parse_xmlelements = patched_parse_xmlelements

{onvif_python-0.0.1 → onvif_python-0.0.2/onvif_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onvif-python
-Version: 0.0.1
+Version: 0.0.2
 Summary: A comprehensive and developer-friendly Python library for working with ONVIF-compliant devices
 Author-email: Nirsimetri Technologies® <open@nirsimetri.com>
 Maintainer: Kaburagi
@@ -44,7 +44,7 @@ Dynamic: license-file
 [![Release](https://img.shields.io/badge/Release-v0.0.1-green?logo=archive)](https://github.com/nirsimetri/onvif-python/releases)
 <br>
 [![PyPI](https://img.shields.io/badge/PyPI-0.0.1-yellow?logo=archive)](https://pypi.org/project/onvif-python/)
-[![Downloads](https://img.shields.io/pypi/dm/onvif-python?label=PyPI%20Downloads)](https://pypi.org/project/onvif-python/)
+[![Downloads](https://img.shields.io/pypi/dd/onvif-python?label=PyPI%20Downloads&color=white)](https://pypi.org/project/onvif-python/)
 
 Are you having trouble finding a Python ONVIF library that supports your device?  
 Are you confused about the compatibility of the various ONVIF versions, which are updated every six months?
@@ -108,11 +108,8 @@ client = ONVIFClient("192.168.1.17", 8000, "admin", "admin123")
 - `client.events()` — Events
 - `client.imaging()` — Imaging
 - `client.media()` — Media
-- `client.media2()` — Media 2
 - `client.ptz()` — PTZ (Pan-Tilt-Zoom)
-- `client.deviceio()` — Device IO
 - `client.analytics()` — Analytics
-- `client.recording()` — Recording
 
 and so on, check [Implemented ONVIF Services](https://github.com/nirsimetri/onvif-python?tab=readme-ov-file#implemented-onvif-services) for more details
 
@@ -200,7 +197,7 @@ This library fully supports all major ONVIF Profiles listed below. Each profile
 | Profile_T | [Document](https://www.onvif.org/wp-content/uploads/2018/09/ONVIF_Profile_T_Specification_v1-0.pdf) | Advanced video streaming (H.265, analytics metadata, motion detection) | Modern cameras and clients | ✅ Yes |
 | Profile_C | [Document](https://www.onvif.org/wp-content/uploads/2017/01/2013_12_ONVIF_Profile_C_Specification_v1-0.pdf) | Access control, door monitoring | Door controllers, access systems | ✅ Yes |
 | Profile_A | [Document](https://www.onvif.org/wp-content/uploads/2017/06/ONVIF_Profile_A_Specification_v1-0.pdf) | Advanced access control configuration, credential management | Access control clients and devices | ✅ Yes |
-| Profile_D | [Document](https://www.onvif.org/wp-content/uploads/2017/06/ONVIF_Profile_D_Specification_v1-0.pdf) | Access control peripherals (locks, sensors, relays) | Peripheral devices for access control | ✅ Yes |
+| Profile_D | [Document](https://www.onvif.org/wp-content/uploads/2021/06/onvif-profile-d-specification-v1-0.pdf) | Access control peripherals (locks, sensors, relays) | Peripheral devices for access control | ✅ Yes |
 | Profile_M | [Document](https://www.onvif.org/wp-content/uploads/2024/04/onvif-profile-m-specification-v1-1.pdf) | Metadata, analytics events, object detection | Analytics devices, metadata clients | ✅ Yes |
 
 For a full description of each profile and its features, visit [ONVIF Profiles](https://www.onvif.org/profiles/).

{onvif_python-0.0.1 → onvif_python-0.0.2}/onvif_python.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ onvif/services/security/tlsserver.py
 onvif/utils/__init__.py
 onvif/utils/exceptions.py
 onvif/utils/wsdl.py
+onvif/utils/zeep.py
 onvif/wsdl/ver10/actionengine.wsdl
 onvif/wsdl/ver10/analyticsdevice.wsdl
 onvif/wsdl/ver10/deviceio.wsdl

{onvif_python-0.0.1 → onvif_python-0.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "onvif-python"
-version = "0.0.1"
+version = "0.0.2"
 description = "A comprehensive and developer-friendly Python library for working with ONVIF-compliant devices"
 readme = "README.md"
 requires-python = ">=3.9"