onvif-python 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

onvif/cli/helpers/discovery.py

@@ -63,7 +63,7 @@ def select_device_interactive(devices: list) -> tuple[str, int, bool] | None:
             else colorize("HTTP", "white")
         )
         print(
-            f"\n{colorize(f"[{idx}]", "yellow")} {colorize(host_port, 'yellow')} ({protocol_indicator})"
+            f"\n{colorize(f'[{idx}]', 'yellow')} {colorize(host_port, 'yellow')} ({protocol_indicator})"
         )
 
         # Remove uuid: or urn:uuid: prefix from EPR

onvif/cli/helpers/messages.py

@@ -70,7 +70,7 @@ def print_interactive_intro(args, device_info_text) -> str:
         f"{repo_info}\n"
         f"{terminal_header}\n"
         f"  Connected to  : {colorize(f'{args.host}:{args.port}', 'yellow')}\n"
-        f"  Auth Method   : {colorize(f'{'HTTP Digest' if args.digest else 'WS-UsernameToken'}', 'yellow')}"
+        f"  Auth Method   : {colorize('HTTP Digest' if args.digest else 'WS-UsernameToken', 'yellow')}"
         f"{options_display}{device_info_text}\n\n"
         f"{colorize('[Quick Start]', 'green')}\n"
         f"  - Type {colorize('dev', 'yellow')} + {colorize('TAB', 'yellow')} to see `devicemgmt` suggestion\n"

onvif/cli/helpers/products.py

@@ -81,7 +81,7 @@ def search_products(search_term: str, page: int = 1, per_page: int = 20) -> None
         )
         print(
             f"Showing {colorize(f'{offset + 1}-{min(offset + per_page, total_count)}', 'cyan')} "
-            f"of {colorize(f"{total_count} results", 'cyan')}"
+            f"of {colorize(f'{total_count} results', 'cyan')}"
         )
         print()
 

onvif/cli/interactive.py

@@ -90,7 +90,7 @@ class InteractiveShell(cmd.Cmd):
             import readline
 
             # Set completer to this instance
-            readline.set_completer(self.complete)  # type: ignore[attr-defined]
+            readline.set_completer(self.complete)  # type: ignore[attr-defined, arg-type]
             readline.set_completer_delims(" \t\n`!@#$%^&*()=+[{]}\\|;:'\",<>?")  # type: ignore[attr-defined]
 
             # Enable tab completion, making it compatible with both GNU readline and libedit
@@ -124,30 +124,34 @@ class InteractiveShell(cmd.Cmd):
             serial = getattr(self.device_data, "SerialNumber", "Unknown")
             hardware_id = getattr(self.device_data, "HardwareId", "Unknown")
 
-            # Get ONVIF version
-            services = self.client.devicemgmt().GetServices(IncludeCapability=False)
-            devicemgmt_service = next(
-                (
-                    s
-                    for s in services
-                    if hasattr(s, "Namespace")
-                    and s.Namespace == "http://www.onvif.org/ver10/device/wsdl"
-                ),
-                None,
-            )
-            if devicemgmt_service and hasattr(devicemgmt_service, "Version"):
-                version = devicemgmt_service.Version
-                major = getattr(version, "Major", "")
-                minor = getattr(version, "Minor", "")
-                if major and minor:
-                    onvif_version = f"{major}.{minor}"
-                elif major:
-                    onvif_version = str(major)
-        except ONVIFOperationException as e:
-            if isinstance(e.original_exception, (RequestException, TransportError)):
-                self._handle_connection_error()
+            # Get latest supported ONVIF version
+            supported_versions = self.client.devicemgmt().GetCapabilities(
+                Category="All"
+            )["Device"]["System"]["SupportedVersions"]
+            if supported_versions:
+                latest_version = max(
+                    supported_versions,
+                    key=lambda version: (
+                        getattr(version, "Major", 0),
+                        getattr(version, "Minor", 0),
+                    ),
+                )
+
+                major = getattr(latest_version, "Major", "")
+                minor = getattr(latest_version, "Minor", "")
+
+                if major != "":
+                    onvif_version = (
+                        f"{major}.{minor} {colorize('[Latest]', 'green')}"
+                        if minor != ""
+                        else str(major)
+                    )
+        except (ONVIFOperationException, KeyError, AttributeError) as e:
+            if isinstance(e, ONVIFOperationException):
+                if isinstance(e.original_exception, (RequestException, TransportError)):
+                    self._handle_connection_error()
             else:
-                # For other errors (e.g., GetServices not supported), we can still proceed
+                # For other errors (e.g., GetCapabilities not supported), we can still proceed
                 # with basic device info if GetDeviceInformation succeeded.
                 pass
 
@@ -1164,8 +1168,10 @@ class InteractiveShell(cmd.Cmd):
 
     def do_clear(self, _line):
         """Clear terminal screen."""
-        # Clear screen for both Windows and Unix-like systems
-        os.system("cls" if os.name == "nt" else "clear")
+        if sys.platform == "win32":
+            print("\033[2J\033[3J\033[H", end="")
+        else:
+            print("\033[2J\033[H", end="")
 
     def do_cls(self, _line):
         """Clear stored data."""
@@ -1221,7 +1227,7 @@ class InteractiveShell(cmd.Cmd):
             f"\n  Connected to  : "
             f"{colorize(f'{self.args.host}:{self.args.port}', 'yellow')}"
             f"\n  Auth Method   : "
-            f"{colorize(f'{'HTTP Digest' if self.args.digest else 'WS-UsernameToken'}', 'yellow')}"
+            f"{colorize('HTTP Digest' if self.args.digest else 'WS-UsernameToken', 'yellow')}"
             f"{options_display}{self.device_info_text}"
         )
         print()  # Extra newline for spacing

onvif/cli/utils.py

@@ -230,7 +230,7 @@ def _colors_enabled() -> bool:
 
     try:
         # Enable ANSI escape sequences
-        kernel32 = ctypes.windll.kernel32
+        kernel32 = ctypes.windll.kernel32  # type: ignore[attr-defined]
         h_stdout = kernel32.GetStdHandle(-11)
 
         # Get current console mode

onvif/meta.py

@@ -2,5 +2,5 @@
 
 from typing import Final
 
-__version__: Final[str] = "0.4.1"
+__version__: Final[str] = "0.4.2"
 __repository__: Final[str] = "https://github.com/nirsimetri/onvif-python"

onvif/utils/wsdl.py

@@ -717,7 +717,10 @@ class ONVIFWSDL:
     def get_wsdl_map(cls) -> dict[str, dict[str, Any]]:
         """Get the complete WSDL map for all services."""
         cls._ensure_wsdl_map_initialized()
-        assert cls.WSDL_MAP is not None
+
+        if cls.WSDL_MAP is None:
+            raise RuntimeError("WSDL map was not initialized")
+
         return cls.WSDL_MAP
 
     @classmethod

{onvif_python-0.4.1.dist-info → onvif_python-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onvif-python
-Version: 0.4.1
+Version: 0.4.2
 Summary: A modern Python library for ONVIF-compliant devices
 Author-email: Nirsimetri Technologies® <open@nirsimetri.com>
 Maintainer: Kaburagi
@@ -42,6 +42,9 @@ Requires-Dist: mypy; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: docformatter; extra == "dev"
+Requires-Dist: lxml-stubs; extra == "dev"
+Requires-Dist: types-setuptools; extra == "dev"
+Requires-Dist: types-requests; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: mkdocs-material; extra == "docs"
 Requires-Dist: mkdocstrings[python]; extra == "docs"
@@ -52,7 +55,7 @@ Dynamic: license-file
 
 <div align="center">
 <a href="https://app.codacy.com/gh/nirsimetri/onvif-python/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade"><img src="https://img.shields.io/codacy/grade/bff08a94e4d447b690cea49c6594826d?style=plastic&logo=codacy&label=Code%20Quality"/></a>
-<a href="https://pypi.org/project/onvif-python/"><img alt="PyPI Version" src="https://img.shields.io/badge/Version-0.4.1-orange?logo=python&logoColor=white&color=yellow&style=plastic"></a>
+<a href="https://pypi.org/project/onvif-python/"><img alt="PyPI Version" src="https://img.shields.io/badge/Version-0.4.2-orange?logo=python&logoColor=white&color=yellow&style=plastic"></a>
 <a href="https://pepy.tech/projects/onvif-python"><img alt="Pepy Total Downloads" src="https://img.shields.io/pepy/dt/onvif-python?logo=pypi&logoColor=white&label=Downloads&color=red&style=plastic"></a>
 <br>
 <a href="https://github.com/nirsimetri/onvif-python/actions/workflows/python-app.yml"><img alt="Build" src="https://github.com/nirsimetri/onvif-python/actions/workflows/python-app.yml/badge.svg?branch=main"></a>

{onvif_python-0.4.1.dist-info → onvif_python-0.4.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
 onvif/__init__.py,sha256=48s-ZSvUgrVdXW7SiMGooXAH3y-4lypSb_EVzDdtUIA,577
 onvif/client.py,sha256=mAokhWVNujje7FytlOdGPFRqd5k8Y_yF8W6E-jV-7xE,34200
-onvif/meta.py,sha256=GrhGTn_R0zSzgLvALnoF-AdobKS1j0okiCn5SLtdOpc,218
+onvif/meta.py,sha256=fhSoQ2Flwc4K6HsO-AFcBTanX2yCfJg5o8MQgV-9WLI,218
 onvif/operator.py,sha256=LhxJ86bW_yuXdWFCYQggIbFpdNnBL6R2Upa-AcH1Lb0,17173
 onvif/cli/__init__.py,sha256=VVDBEJxI9VzfiHdbWYzDwS7TTsggInr4fVWgRJ5QOuE,70
 onvif/cli/__main__.py,sha256=QnY-Aty8PlzAgVmom8HEqA9fbVu6wY4kF-WNXYNPvAg,148
-onvif/cli/interactive.py,sha256=2O7gX8PhPBaZ-n8BWPBJF2PbtjIvYUEvgTpaOwobA78,53059
+onvif/cli/interactive.py,sha256=_aVR3Udou4mVEbddzH25FFJa5II7RU10mvlYT7EZln8,53246
 onvif/cli/main.py,sha256=im9omOhRS_FPcpw4TRGhacRe5wpKnIEkqvB3wEbUc7U,11133
-onvif/cli/utils.py,sha256=CFXF90AOhRMyn-eosJj0Icc3SHre7YEVb1ILQ9mGufI,21061
+onvif/cli/utils.py,sha256=De-6TbcijrRWXJNwEtdrtmK764KAK28-tGHO9Hgp_ec,21091
 onvif/cli/helpers/__init__.py,sha256=Pr9LsULlezfUM3bGlP7t6zKYR5Qqy-F5oNXDcjnB0rY,640
-onvif/cli/helpers/discovery.py,sha256=z1WZk9l7JZKR800rQLS2PpRbZUJWoBmuEXNU42ryDRg,6062
+onvif/cli/helpers/discovery.py,sha256=XMP6NQpqZxcbtSAqO1q_YPetY0sTsBjOk6LutpQFXE0,6062
 onvif/cli/helpers/execution.py,sha256=abcFpc2Ui7HGBfaL4AuusWfVLcGWbuo9cfwZMIH7bOw,1692
 onvif/cli/helpers/files.py,sha256=Bgzqln4xGPBp_yR7AoclJO6rABoLB7eG9xY2RzDOWLk,7383
-onvif/cli/helpers/messages.py,sha256=z5Xt_hp-xWa4cSPxY95H5XdD-FK2EV5znfXf60KEyWw,9743
-onvif/cli/helpers/products.py,sha256=QIpdYXLocArEr3QWtDto5HwS48-X7ycNcBT81qb4B5Q,11124
+onvif/cli/helpers/messages.py,sha256=304NtPojpHGsglecB39S2HqfMjp3qpuK0k1PQxjA99s,9738
+onvif/cli/helpers/products.py,sha256=vqork9Fjqba0jkHMaTEd4TCjDTclC-dj_FRLY57T4JE,11124
 onvif/cli/helpers/wsdl_parser.py,sha256=0BqA0_lNFt_ZkDdSNgBqBvfu4S5HbG6BV9We1us8s34,36222
 onvif/db/companies.db,sha256=yJ8bSHfGpxNnA5NRBhYOFS_1Pix-KgH8GnUFV3ytzPo,270336
 onvif/db/products.db,sha256=4BVPfy6i6pLMLQyfue238uRp6_NIDodu4QXd9iCoooY,81559552
@@ -63,7 +63,7 @@ onvif/utils/error_handlers.py,sha256=X2Sbt7NQM310IvjpnrMU2f87THaAShHN_n-KYUqeMas
 onvif/utils/exceptions.py,sha256=NvV0YS8s_Unak9l0x2Sls4YMSGAG5AoXj1VGtntz24I,8258
 onvif/utils/plugins.py,sha256=U08es6mfzLE1SLA5WCy-KoKD5g-TUKw9yEKaU7JXO7U,18571
 onvif/utils/service.py,sha256=aEFkMWOfmUErfzJS7M8q3k9BpiW2Sa4orXoMipmwiZk,15019
-onvif/utils/wsdl.py,sha256=JrvW_IJZt-DbKZ3P-Reqwj_8dz9uhoIfWcGEaXe15ZQ,29646
+onvif/utils/wsdl.py,sha256=fDjbhCDByFUFWR3hcB077wfCPvMgWZaJ0GeNftOoECA,29704
 onvif/utils/zeep.py,sha256=LU1esNhEqbxo73yjIOt5fERuwnP2Pmfy-YKxjBmt908,28734
 onvif/wsdl/LICENSE.md,sha256=O0J5vlcNSuEulS5rESOZWYy-IEnH4QeJkQ4ebZZNkSQ,16439
 onvif/wsdl/schema/common/b-2.xsd,sha256=KRP2rKG4dhHQ0pe1v7O_wuzlYki6cD-x4TWvtAqk6Ww,22705
@@ -136,9 +136,9 @@ onvif/wsdl/ver20/util/federated_search_documentation.html,sha256=GR6a4SPBsRDisaW
 onvif/wsdl/ver20/util/fedsearch-docu-viewer.xsl,sha256=8eP-uMZgsTtuU5WaVyCzs_DJZqWIFD7iRz_5-3ComPg,325
 onvif/wsdl/ver20/util/onvif-wsdl-viewer.xsl,sha256=Emauxs6rh69IxlxlU3k_LEH_i3SsRbwIKUk-VcMlVgk,94525
 onvif/wsdl/ver20/util/operationIndex.html,sha256=mUsAGgNUFCIQjVV9Rx_O5YUNW3EdWNhUkAbBY-xVMhQ,39290
-onvif_python-0.4.1.dist-info/licenses/LICENSE.md,sha256=5FDlvvnRA-PzNEK40VBwMQ9Kjzwe8tdMCA9bhEmx04k,1096
-onvif_python-0.4.1.dist-info/METADATA,sha256=ZTEOA-SdegwEFe0JhRjYyYum-9yAckqornlGwPlcyIU,6033
-onvif_python-0.4.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-onvif_python-0.4.1.dist-info/entry_points.txt,sha256=7xUdI64yzWh7YfNPQDKCW9cT8XIgWuNCloikP9-yjqY,46
-onvif_python-0.4.1.dist-info/top_level.txt,sha256=MqCi1uJmIvtVFJDz2IxLbpwq6FwDtWhqrWQtKwLaQg4,6
-onvif_python-0.4.1.dist-info/RECORD,,
+onvif_python-0.4.2.dist-info/licenses/LICENSE.md,sha256=5FDlvvnRA-PzNEK40VBwMQ9Kjzwe8tdMCA9bhEmx04k,1096
+onvif_python-0.4.2.dist-info/METADATA,sha256=LgmtyeLC8XZtTkomALoq4G_PCo8t3jt919neRwdGFjU,6169
+onvif_python-0.4.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+onvif_python-0.4.2.dist-info/entry_points.txt,sha256=7xUdI64yzWh7YfNPQDKCW9cT8XIgWuNCloikP9-yjqY,46
+onvif_python-0.4.2.dist-info/top_level.txt,sha256=MqCi1uJmIvtVFJDz2IxLbpwq6FwDtWhqrWQtKwLaQg4,6
+onvif_python-0.4.2.dist-info/RECORD,,