onvif-python 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

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/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/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/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/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.dist-info → onvif_python-0.0.2.dist-info}/METADATA

@@ -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.dist-info → onvif_python-0.0.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
-onvif/__init__.py,sha256=paiszXL_-uJRVH2l5EIUwJQMwWNTnfE1uKLnbmvBLxo,287
-onvif/client.py,sha256=8xllz9bJc7LfdpRFL97rYO4na66UCkbuLzfcQjYAMmY,13929
+onvif/__init__.py,sha256=HKu0PTXn3sLwS6EzyfgnPsrtP8_02MhUGnn6JDgRK8w,339
+onvif/client.py,sha256=0ENBKyzqzBMncUZrN219kdQPOBYVNJkOlBKfzmmof-4,14713
 onvif/operator.py,sha256=DawfvCMvQIvNREvYazonhauvE66bdV93iMn586WKrk8,4756
 onvif/services/__init__.py,sha256=1sxD3pbUOSXu27GBeLn3CW_VA9JRfiG7dVjFpfFyQME,2050
 onvif/services/accesscontrol.py,sha256=uGqMHErBS8fHPMWKhDyxBs9ueCCoDjRFsdBMGtndL7M,3804
@@ -10,7 +10,7 @@ onvif/services/appmgmt.py,sha256=5ytUiNPr6FtZChXLIzVWQ_vr3lbqE4mSxNhqaClf-QA,129
 onvif/services/authenticationbehavior.py,sha256=uUMHu4DBCUAoG-0eQeZFgBs5PmXXqsIh2COY3FdGniY,3278
 onvif/services/credential.py,sha256=e2W4IJInmuw5OdOkUt1uQ_LpUQcgGVOFgJcZqeGxLKw,5590
 onvif/services/deviceio.py,sha256=mB5GFh5u6pmjb3Ss0U-nJdMfmewh30PK30ao3mqGXbg,5922
-onvif/services/devicemgmt.py,sha256=BYZb32wAzkwZdUFlO5eQlMzyfAPzdN4gGea3qOM9Sqs,14543
+onvif/services/devicemgmt.py,sha256=LmizOoZwfNLtTEOEdk2ialEmrNyC2FvduND9iHeP3U4,14519
 onvif/services/display.py,sha256=QNq4FSh9_x6nwizansShaF4O3A0TwGbc84Q62FW-FLk,2218
 onvif/services/doorcontrol.py,sha256=4-gPizy84-e79JhU44AWcaVlvikkT7NHLo9ZgN3sKFs,2981
 onvif/services/imaging.py,sha256=aSukKYZVA1aHV958hVX75TLT5zvLVqAwkb3oXuo69Jw,2268
@@ -22,7 +22,7 @@ onvif/services/receiver.py,sha256=f83D5MudSN1muFoS1-EhbzrrzDJSYcsthCb7X5AiJgg,15
 onvif/services/recording.py,sha256=clnfF0LlZA7vO2WBOz62_7LtnOjo9UBZEBRFF-QDDz0,4764
 onvif/services/replay.py,sha256=wydnAp-qjN-fn-YkILA9G4Gf700FGBZjBMM17NrXdOk,1022
 onvif/services/schedule.py,sha256=u59qFBDMmSjcq6vgn15mUkKm3RLBplkT_bI6O-9TB4c,3006
-onvif/services/search.py,sha256=VfrHkKftGyjBRrbJylga9cnzwIrCCF1aCxQEXcH4aBk,4438
+onvif/services/search.py,sha256=KQ_Y95lSMc3JfgbekEnZyNhRtYOlI77gOPbFM5mIQI8,4447
 onvif/services/thermal.py,sha256=HgJTnTAUvRSaQeyOtMhQw0SSb7QNTnCwPGxs5C95fMw,1887
 onvif/services/uplink.py,sha256=OJmZEk45xBDrPyzxJjGD0poGMxmF86ub4c0VaRIME1U,904
 onvif/services/analytics/analytics.py,sha256=NHPxQ7HlCGNU2CqA_n7nmqQIr-9HyRDul7v6ACv9_fc,2150
@@ -41,6 +41,7 @@ onvif/services/security/tlsserver.py,sha256=R8gTkC-tb1mtI5bke_UxIkNyNqoWnXpdCH4J
 onvif/utils/__init__.py,sha256=x8iQY4t74l5HgZVjNHUy9WlRX5cixtKXW9-L5VrBs5g,132
 onvif/utils/exceptions.py,sha256=SlK9hG6K41lpXL0cglundpZ2ZlzBlgl6_fDZVv2IzEs,1173
 onvif/utils/wsdl.py,sha256=V_Y1ucWeE_-VEtq7h3mJftSRD7NNFaBZgAR_QW4NyK8,11550
+onvif/utils/zeep.py,sha256=v3XZc4HXS_dLKdrA7VwB4ilifeaUKK3dlxZMY09Lb-Y,1807
 onvif/wsdl/ver10/actionengine.wsdl,sha256=9jiO9RtEh4lXKioIoOdE39IPLqp7DeKhdXTg559rOck,57027
 onvif/wsdl/ver10/analyticsdevice.wsdl,sha256=nMXy58xWSpOxlngK3LHTDXripg3QkAykMBTouALMjaY,31708
 onvif/wsdl/ver10/deviceio.wsdl,sha256=OHtJzBAoCtV9Lxi3z-vJsT4EOS9wZX5d22PP92Op0Zk,66199
@@ -99,8 +100,8 @@ onvif/wsdl/ver20/util/federated_search_documentation.html,sha256=RD6iCgduQnUL86k
 onvif/wsdl/ver20/util/fedsearch-docu-viewer.xsl,sha256=kaP8PWD59IR46I6N2IM0axn1iUug9v1TRA79vQWTcDM,333
 onvif/wsdl/ver20/util/onvif-wsdl-viewer.xsl,sha256=Ciq_EXijn4nYeSn5XfbdroC2xHG_zgcspw1k1JhKjh0,97104
 onvif/wsdl/ver20/util/operationIndex.html,sha256=OuioH1LERO_278IKcMvaekQqg7MwbZzU_OxpIlG5d0I,39387
-onvif_python-0.0.1.dist-info/licenses/LICENSE.md,sha256=HWZa5heRH0HmiUM5aYDE2KNRV8zJso4KzGYEuMagr14,1111
-onvif_python-0.0.1.dist-info/METADATA,sha256=betVMvUvtCmvWZ_iM22CJQwJR5i3UkTZPG0igyuT0Pc,29898
-onvif_python-0.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-onvif_python-0.0.1.dist-info/top_level.txt,sha256=MqCi1uJmIvtVFJDz2IxLbpwq6FwDtWhqrWQtKwLaQg4,6
-onvif_python-0.0.1.dist-info/RECORD,,
+onvif_python-0.0.2.dist-info/licenses/LICENSE.md,sha256=HWZa5heRH0HmiUM5aYDE2KNRV8zJso4KzGYEuMagr14,1111
+onvif_python-0.0.2.dist-info/METADATA,sha256=yWdJko41tBQuA3m2QNn6c94T4J7annzpup9vg1bLun8,29802
+onvif_python-0.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+onvif_python-0.0.2.dist-info/top_level.txt,sha256=MqCi1uJmIvtVFJDz2IxLbpwq6FwDtWhqrWQtKwLaQg4,6
+onvif_python-0.0.2.dist-info/RECORD,,