onvif-python 0.1.4__tar.gz → 0.1.6__tar.gz

{onvif_python-0.1.4/onvif_python.egg-info → onvif_python-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: onvif-python
-Version: 0.1.4
+Version: 0.1.6
 Summary: A comprehensive and developer-friendly Python library for working with ONVIF-compliant devices
 Author-email: Nirsimetri Technologies® <open@nirsimetri.com>
 Maintainer: Kaburagi
@@ -38,9 +38,9 @@ Dynamic: license-file
 
 # ONVIF Python
 
-[![License](https://img.shields.io/badge/License-MIT-blue)](https://github.com/nirsimetri/onvif-python?tab=MIT-1-ov-file)
+[![Codacy grade](https://img.shields.io/codacy/grade/bff08a94e4d447b690cea49c6594826d?label=Project%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.1.4-orange?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.1.6-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)
@@ -92,9 +92,29 @@ pip install .
 > [!TIP]
 > You can view the complete documentation automatically generated by DeepWiki via the [onvif-python AI Wiki](https://deepwiki.com/nirsimetri/onvif-python) link. We currently do not have an official documentation site. Help us create more examples and helpful documentation by [contributing](https://github.com/nirsimetri/onvif-python?tab=contributing-ov-file).
 
-Below are simple examples to help you get started with the ONVIF Python library. These demonstrate how to connect to an ONVIF-compliant device and retrieve basic device information.
+Below are simple examples to help you get started with the ONVIF Python library. These demonstrate how to discover and connect to ONVIF-compliant devices and retrieve basic device information.
 
-**1. Initialize the ONVIFClient**
+**1. Discover ONVIF Devices (Optional)**
+
+Use `ONVIFDiscovery` (applied at [`>=v0.1.6`](https://github.com/nirsimetri/onvif-python/releases/tag/v0.1.6)) to automatically find ONVIF devices on your local network:
+
+```python
+from onvif import ONVIFDiscovery
+
+# Create discovery instance
+discovery = ONVIFDiscovery(timeout=5)
+
+# Discover devices
+devices = discovery.discover()
+
+# Display discovered devices
+for device in devices:
+    print(f"Found device at {device['host']}:{device['port']}")
+    print(f"  Scopes: {device.get('scopes', [])}")
+    print(f"  XAddrs: {device['xaddrs']}")
+```
+
+**2. Initialize the ONVIFClient**
 
 Create an instance of `ONVIFClient` by providing your device's IP address, port, username, and password:
 
@@ -111,7 +131,7 @@ client = ONVIFClient(
 )
 ```
 
-**2. Create Service Instance**
+**3. Create Service Instance**
 
 `ONVIFClient` provides several main services that can be accessed via the following methods:
 
@@ -130,7 +150,7 @@ device = client.devicemgmt()      # Device Management (Core)
 media = client.media()            # Media
 ```
 
-**3. Get Device Information**
+**4. Get Device Information**
 
 Retrieve basic information about the device, such as manufacturer, model, firmware version, and serial number using `devicemgmt()` service:
 
@@ -140,7 +160,7 @@ print(info)
 # Example output: {'Manufacturer': '..', 'Model': '..', 'FirmwareVersion': '..', 'SerialNumber': '..'}
 ```
 
-**4. Get RTSP URL**
+**5. Get RTSP URL**
 
 Retrieve the RTSP stream URL for live video streaming from the device using `media()` service:
 
@@ -173,6 +193,7 @@ This library includes a powerful command-line interface (CLI) for interacting wi
 
 ### Features
 
+- **Device Discovery:** Automatic ONVIF device discovery on local network using WS-Discovery protocol.
 - **Interactive Shell:** A user-friendly shell with tab completion, command history, and colorized output.
 - **Direct Command Execution:** Run ONVIF commands directly from the terminal for scripting and automation.
 - **Automatic Discovery:** Automatically detects available services on the device.
@@ -212,10 +233,10 @@ This library includes a powerful command-line interface (CLI) for interacting wi
 
 ```bash
 usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password PASSWORD] [--discover] [--timeout TIMEOUT] [--https] [--no-verify]
-             [--no-patch] [--interactive] [--debug] [--wsdl WSDL] [--cache {all,db,mem,none}] [--version]
+             [--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.1.4
+ONVIF Terminal Client — v0.1.6
 https://github.com/nirsimetri/onvif-python
 
 positional arguments:
@@ -241,6 +262,8 @@ options:
   --wsdl WSDL           Custom WSDL directory path
   --cache {all,db,mem,none}
                         Caching mode for ONVIFClient (default: all). 'all': memory+disk, 'db': disk-only, 'mem': memory-only, 'none': disabled.
+  --health-check-interval HEALTH_CHECK_INTERVAL, -hci HEALTH_CHECK_INTERVAL
+                        Health check interval in seconds for interactive mode (default: 10)
   --version, -v         Show ONVIF CLI version and exit
 
 Examples:
@@ -270,7 +293,7 @@ Examples:
 <summary><b>2. Interactive Shell</b></summary> 
 
 ```bash
-ONVIF Interactive Shell Commands - v0.1.4
+ONVIF Interactive Shell Commands - v0.1.6
 https://github.com/nirsimetri/onvif-python
 
 Basic Commands:
@@ -282,6 +305,7 @@ Basic Commands:
 
 Navigation Commands:
   <service>                - Enter service mode (e.g., devicemgmt, media)
+  <service> <argument>     - Enter service mode with argument (e.g. pullpoint SubscriptionRef=<value>)
   cd <service>             - Enter service mode (alias)
   ls                       - List commands/services/methods in grid format
   up                       - Exit current service mode (go up one level)
@@ -301,6 +325,7 @@ Method Execution:
 Data Management:
   store <name>             - Store last result with a name
   show <name>              - Show stored data
+  show <name>[0]           - Show element at index (for lists)
   show <name>.attribute    - Show specific attribute
   show                     - List all stored data
   rm <name>                - Remove stored data by name
@@ -368,6 +393,27 @@ If you omit the username or password, you will be prompted to enter them securel
 > [!IMPORTANT]
 > You can see all the other commands available in the interactive shell by trying it out directly. The interactive shell runs periodic background health checks to detect connection loss. It uses silent TCP pings to avoid interrupting your work and will automatically exit if the device is unreachable, similar to an SSH session.
 
+**Command Chaining with `&&`:**
+
+The CLI supports chaining multiple commands in a single line using the `&&` operator, allowing you to execute sequential operations efficiently:
+
+```bash
+# Enter service and execute method in one line
+192.168.1.17:8000 > media && GetProfiles && store profiles
+
+# Chain multiple method calls
+192.168.1.17:8000 > devicemgmt && GetDeviceInformation && store device_info
+
+# Complex workflow
+192.168.1.17:8000 > media && GetProfiles && store profiles && up && imaging && GetImagingSettings VideoSourceToken=$profiles[0].VideoSourceConfiguration.SourceToken
+```
+
+This feature is particularly useful for:
+- Quick operations without entering service mode
+- Scripting repetitive tasks
+- Testing workflows
+- Automating multi-step procedures
+
 **2. Device Discovery (WS-Discovery)**
 
 The CLI includes automatic ONVIF device discovery using the WS-Discovery protocol. This feature allows you to find all ONVIF-compliant devices on your local network without knowing their IP addresses beforehand.
@@ -491,7 +537,7 @@ The `ONVIFClient` class provides various configuration options to customize the
 
 | Parameter | Type | Required | Default | Description |
 |-----------|------|----------|---------|-------------|
-| `cache` | `CacheMode` | ❌ No | `CacheMode.ALL` | WSDL caching strategy (see [Cache Modes](#cache-modes) below) |
+| `cache` | `CacheMode` | ❌ No | `CacheMode.ALL` | WSDL caching strategy (see **Cache Modes** below) |
 
 </details>
 

{onvif_python-0.1.4 → onvif_python-0.1.6}/README.md

@@ -1,8 +1,8 @@
 # ONVIF Python
 
-[![License](https://img.shields.io/badge/License-MIT-blue)](https://github.com/nirsimetri/onvif-python?tab=MIT-1-ov-file)
+[![Codacy grade](https://img.shields.io/codacy/grade/bff08a94e4d447b690cea49c6594826d?label=Project%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.1.4-orange?logo=archive)](https://pypi.org/project/onvif-python/)
+[![PyPI](https://img.shields.io/badge/PyPI-0.1.6-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)
@@ -54,9 +54,29 @@ pip install .
 > [!TIP]
 > You can view the complete documentation automatically generated by DeepWiki via the [onvif-python AI Wiki](https://deepwiki.com/nirsimetri/onvif-python) link. We currently do not have an official documentation site. Help us create more examples and helpful documentation by [contributing](https://github.com/nirsimetri/onvif-python?tab=contributing-ov-file).
 
-Below are simple examples to help you get started with the ONVIF Python library. These demonstrate how to connect to an ONVIF-compliant device and retrieve basic device information.
+Below are simple examples to help you get started with the ONVIF Python library. These demonstrate how to discover and connect to ONVIF-compliant devices and retrieve basic device information.
 
-**1. Initialize the ONVIFClient**
+**1. Discover ONVIF Devices (Optional)**
+
+Use `ONVIFDiscovery` (applied at [`>=v0.1.6`](https://github.com/nirsimetri/onvif-python/releases/tag/v0.1.6)) to automatically find ONVIF devices on your local network:
+
+```python
+from onvif import ONVIFDiscovery
+
+# Create discovery instance
+discovery = ONVIFDiscovery(timeout=5)
+
+# Discover devices
+devices = discovery.discover()
+
+# Display discovered devices
+for device in devices:
+    print(f"Found device at {device['host']}:{device['port']}")
+    print(f"  Scopes: {device.get('scopes', [])}")
+    print(f"  XAddrs: {device['xaddrs']}")
+```
+
+**2. Initialize the ONVIFClient**
 
 Create an instance of `ONVIFClient` by providing your device's IP address, port, username, and password:
 
@@ -73,7 +93,7 @@ client = ONVIFClient(
 )
 ```
 
-**2. Create Service Instance**
+**3. Create Service Instance**
 
 `ONVIFClient` provides several main services that can be accessed via the following methods:
 
@@ -92,7 +112,7 @@ device = client.devicemgmt()      # Device Management (Core)
 media = client.media()            # Media
 ```
 
-**3. Get Device Information**
+**4. Get Device Information**
 
 Retrieve basic information about the device, such as manufacturer, model, firmware version, and serial number using `devicemgmt()` service:
 
@@ -102,7 +122,7 @@ print(info)
 # Example output: {'Manufacturer': '..', 'Model': '..', 'FirmwareVersion': '..', 'SerialNumber': '..'}
 ```
 
-**4. Get RTSP URL**
+**5. Get RTSP URL**
 
 Retrieve the RTSP stream URL for live video streaming from the device using `media()` service:
 
@@ -135,6 +155,7 @@ This library includes a powerful command-line interface (CLI) for interacting wi
 
 ### Features
 
+- **Device Discovery:** Automatic ONVIF device discovery on local network using WS-Discovery protocol.
 - **Interactive Shell:** A user-friendly shell with tab completion, command history, and colorized output.
 - **Direct Command Execution:** Run ONVIF commands directly from the terminal for scripting and automation.
 - **Automatic Discovery:** Automatically detects available services on the device.
@@ -174,10 +195,10 @@ This library includes a powerful command-line interface (CLI) for interacting wi
 
 ```bash
 usage: onvif [-h] [--host HOST] [--port PORT] [--username USERNAME] [--password PASSWORD] [--discover] [--timeout TIMEOUT] [--https] [--no-verify]
-             [--no-patch] [--interactive] [--debug] [--wsdl WSDL] [--cache {all,db,mem,none}] [--version]
+             [--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.1.4
+ONVIF Terminal Client — v0.1.6
 https://github.com/nirsimetri/onvif-python
 
 positional arguments:
@@ -203,6 +224,8 @@ options:
   --wsdl WSDL           Custom WSDL directory path
   --cache {all,db,mem,none}
                         Caching mode for ONVIFClient (default: all). 'all': memory+disk, 'db': disk-only, 'mem': memory-only, 'none': disabled.
+  --health-check-interval HEALTH_CHECK_INTERVAL, -hci HEALTH_CHECK_INTERVAL
+                        Health check interval in seconds for interactive mode (default: 10)
   --version, -v         Show ONVIF CLI version and exit
 
 Examples:
@@ -232,7 +255,7 @@ Examples:
 <summary><b>2. Interactive Shell</b></summary> 
 
 ```bash
-ONVIF Interactive Shell Commands - v0.1.4
+ONVIF Interactive Shell Commands - v0.1.6
 https://github.com/nirsimetri/onvif-python
 
 Basic Commands:
@@ -244,6 +267,7 @@ Basic Commands:
 
 Navigation Commands:
   <service>                - Enter service mode (e.g., devicemgmt, media)
+  <service> <argument>     - Enter service mode with argument (e.g. pullpoint SubscriptionRef=<value>)
   cd <service>             - Enter service mode (alias)
   ls                       - List commands/services/methods in grid format
   up                       - Exit current service mode (go up one level)
@@ -263,6 +287,7 @@ Method Execution:
 Data Management:
   store <name>             - Store last result with a name
   show <name>              - Show stored data
+  show <name>[0]           - Show element at index (for lists)
   show <name>.attribute    - Show specific attribute
   show                     - List all stored data
   rm <name>                - Remove stored data by name
@@ -330,6 +355,27 @@ If you omit the username or password, you will be prompted to enter them securel
 > [!IMPORTANT]
 > You can see all the other commands available in the interactive shell by trying it out directly. The interactive shell runs periodic background health checks to detect connection loss. It uses silent TCP pings to avoid interrupting your work and will automatically exit if the device is unreachable, similar to an SSH session.
 
+**Command Chaining with `&&`:**
+
+The CLI supports chaining multiple commands in a single line using the `&&` operator, allowing you to execute sequential operations efficiently:
+
+```bash
+# Enter service and execute method in one line
+192.168.1.17:8000 > media && GetProfiles && store profiles
+
+# Chain multiple method calls
+192.168.1.17:8000 > devicemgmt && GetDeviceInformation && store device_info
+
+# Complex workflow
+192.168.1.17:8000 > media && GetProfiles && store profiles && up && imaging && GetImagingSettings VideoSourceToken=$profiles[0].VideoSourceConfiguration.SourceToken
+```
+
+This feature is particularly useful for:
+- Quick operations without entering service mode
+- Scripting repetitive tasks
+- Testing workflows
+- Automating multi-step procedures
+
 **2. Device Discovery (WS-Discovery)**
 
 The CLI includes automatic ONVIF device discovery using the WS-Discovery protocol. This feature allows you to find all ONVIF-compliant devices on your local network without knowing their IP addresses beforehand.
@@ -453,7 +499,7 @@ The `ONVIFClient` class provides various configuration options to customize the
 
 | Parameter | Type | Required | Default | Description |
 |-----------|------|----------|---------|-------------|
-| `cache` | `CacheMode` | ❌ No | `CacheMode.ALL` | WSDL caching strategy (see [Cache Modes](#cache-modes) below) |
+| `cache` | `CacheMode` | ❌ No | `CacheMode.ALL` | WSDL caching strategy (see **Cache Modes** below) |
 
 </details>
 

{onvif_python-0.1.4 → onvif_python-0.1.6}/onvif/__init__.py

@@ -2,7 +2,13 @@
 
 from .client import ONVIFClient
 from .operator import ONVIFOperator, CacheMode
-from .utils import ONVIFWSDL, ONVIFOperationException, ONVIFErrorHandler, ZeepPatcher
+from .utils import (
+    ONVIFWSDL,
+    ONVIFOperationException,
+    ONVIFErrorHandler,
+    ZeepPatcher,
+    ONVIFDiscovery,
+)
 from .cli import main as ONVIFCLI
 
 __all__ = [
@@ -14,4 +20,5 @@ __all__ = [
     "ONVIFErrorHandler",
     "ZeepPatcher",
     "ONVIFCLI",
+    "ONVIFDiscovery",
 ]

{onvif_python-0.1.4 → onvif_python-0.1.6}/onvif/cli/interactive.py

@@ -18,6 +18,7 @@ from ..utils.exceptions import ONVIFOperationException
 from .utils import (
     parse_json_params,
     get_service_methods,
+    get_service_required_args,
     get_device_available_services,
     colorize,
     format_capabilities_as_services,
@@ -172,6 +173,13 @@ class InteractiveShell(cmd.Cmd):
         if hasattr(args, "no_patch") and args.no_patch:
             options_info.append(f"  ZeepPatcher   : {colorize('Disabled', 'red')}")
 
+        if (
+            hasattr(args, "health_check_interval") and args.health_check_interval != 10
+        ):  # 10 is default
+            options_info.append(
+                f"  Health Check  : every {colorize(f'{args.health_check_interval}s', 'yellow')}"
+            )
+
         # Format options info
         options_display = ""
         if options_info:
@@ -183,7 +191,7 @@ class InteractiveShell(cmd.Cmd):
             "  / __ \\/ | / / |  / /  _/ ____/",
             " / / / /  |/ /| | / // // /_    ",
             "/ /_/ / /|  / | |/ // // __/    ",
-            "\\____/_/ |_/  |___/___/_/  v0.1.4",
+            "\\____/_/ |_/  |___/___/_/  v0.1.6",
             "                                ",
         ]
 
@@ -223,30 +231,36 @@ class InteractiveShell(cmd.Cmd):
 
     def _periodic_health_check(self):
         """Periodically checks device connection using TCP or TLS depending on mode."""
+        # Get health check interval from args, default to 10 seconds
+        health_check_interval = getattr(self.args, "health_check_interval", 10)
+
         # Wait before first check to allow intro to finish
-        self._stop_health_check.wait(10.0)
+        self._stop_health_check.wait(health_check_interval)
 
         while not self._stop_health_check.is_set():
             sock = None
             try:
-                sock = socket.create_connection(
-                    (self.args.host, self.args.port), timeout=5.0
-                )
-
-                # If HTTPS, perform a short TLS handshake check
+                # For HTTPS, use ssl.create_connection for proper TLS handling
                 if getattr(self.args, "https", False):
                     context = ssl.create_default_context()
+                    context.minimum_version = ssl.TLSVersion.TLSv1_2
                     context.check_hostname = False
                     context.verify_mode = ssl.CERT_NONE
 
-                    with context.wrap_socket(
-                        sock, server_hostname=self.args.host
-                    ) as ssock:
-                        ssock.settimeout(5)
-                        # Try a minimal handshake
-                        ssock.do_handshake()
+                    # Use ssl.create_connection instead of wrapping existing socket
+                    sock = context.wrap_socket(
+                        socket.socket(socket.AF_INET, socket.SOCK_STREAM),
+                        server_hostname=self.args.host,
+                    )
+                    sock.settimeout(5.0)
+                    sock.connect((self.args.host, self.args.port))
+                else:
+                    # For HTTP, simple TCP connection check
+                    sock = socket.create_connection(
+                        (self.args.host, self.args.port), timeout=5.0
+                    )
 
-                # If we reach here, the connection (and TLS if applicable) succeeded
+                # Connection successful
                 pass
 
             except (
@@ -279,7 +293,7 @@ class InteractiveShell(cmd.Cmd):
                     sock.close()
 
             # Wait before next check or stop signal
-            self._stop_health_check.wait(5.0)  # Check every 5 seconds
+            self._stop_health_check.wait(health_check_interval)
 
     def _handle_connection_error(self, e):
         """Handle connection errors by notifying the user and exiting."""
@@ -356,7 +370,7 @@ class InteractiveShell(cmd.Cmd):
 
         return parts
 
-    def _display_grid(self, items, force_recalc=False):
+    def _display_grid(self, items):
         """Display items in grid format matching TAB completion (vertical layout)"""
         if not items:
             return
@@ -381,7 +395,7 @@ class InteractiveShell(cmd.Cmd):
 
         # Column width calculation: use same algorithm as cmd.Cmd.columnize()
         # Python's columnize uses: maxlen + 2 if maxlen > 0 else 2
-        col_width = longest_length + 1 if longest_length > 0 else 2
+        col_width = longest_length + 2 if longest_length > 0 else 2
 
         # Calculate number of columns that fit
         num_cols = max(1, term_width // col_width)
@@ -549,8 +563,17 @@ class InteractiveShell(cmd.Cmd):
 
     def default(self, line):
         """Handle unknown commands"""
-        # Check if it's a service call using device-specific services
-        if line in get_device_available_services(self.client):
+        available_services = get_device_available_services(self.client)
+
+        # Check if it's a service call (with or without arguments)
+        # Extract first word to check if it's a service name
+        first_word = line.split()[0] if line.split() else line
+
+        if first_word in available_services:
+            return self.do_enter_service(line)
+
+        # Check if the whole line (without arguments) is a service
+        if line in available_services:
             return self.do_enter_service(line)
 
         # Check if it's a method call in service context
@@ -640,28 +663,17 @@ class InteractiveShell(cmd.Cmd):
                     print("^C")
                     line = ""
 
-            # Handle TAB completion on empty line
-            if line == "\t":
-                print()  # Newline before grid
-                if self.current_service:
-                    self._display_grid(get_service_methods(self.current_service))
-                else:
-                    services = get_device_available_services(self.client)
-                    commands = self.base_commands
-                    self._display_grid(services + commands)
-                line = ""  # Reset line to show prompt again
-
             line = self.precmd(line)
             stop = self.onecmd(line)
             stop = self.postcmd(stop, line)
 
-    def columnize(self, list, displaywidth=80):
+    def columnize(self, items, displaywidth=80):
         """Override columnize to use grid format for TAB completion"""
-        if not list:
+        if not items:
             return
 
         # Use our grid display for TAB completion with coloring enabled
-        self._display_grid(list, force_recalc=True)
+        self._display_grid(items)
 
     def print_topics(self, header, cmds, cmdlen, maxcol):
         """Override print_topics to use grid format for TAB completion"""
@@ -673,7 +685,7 @@ class InteractiveShell(cmd.Cmd):
             self.stdout.write("%s\n" % str(header))
 
         # Use our grid display for TAB completion with coloring enabled
-        self._display_grid(cmds, force_recalc=True)
+        self._display_grid(cmds)
 
     def do_capabilities(self, line):
         """Show device capabilities in service format"""
@@ -721,8 +733,13 @@ class InteractiveShell(cmd.Cmd):
             else:
                 print(f"{colorize('Error:', 'red')} {e}")
 
-    def do_enter_service(self, service_name):
-        """Enter service mode"""
+    def do_enter_service(self, line):
+        """Enter service mode with optional arguments for services that require them"""
+        # Parse service name and arguments
+        parts = line.split(None, 1)
+        service_name = parts[0] if parts else ""
+        args_str = parts[1] if len(parts) > 1 else ""
+
         available_services = get_device_available_services(self.client)
         if service_name not in available_services:
             print(f"{colorize('Error:', 'red')} Unknown service '{service_name}'")
@@ -731,7 +748,63 @@ class InteractiveShell(cmd.Cmd):
             return
 
         try:
-            service = getattr(self.client, service_name)()
+            # Check if this service requires arguments
+            required_args = get_service_required_args(service_name)
+
+            if required_args:
+                # Service requires arguments
+                if not args_str:
+                    # No arguments provided, show help
+                    print(
+                        f"{colorize('Error:', 'red')} Service '{service_name}' requires arguments"
+                    )
+                    print(
+                        f"{colorize('Usage:', 'yellow')} {service_name} {' '.join([f'{arg}=<value>' for arg in required_args])}"
+                    )
+                    print(
+                        f"{colorize('Example:', 'yellow')} {service_name} {required_args[0]}=$subscription"
+                    )
+                    return
+
+                # Parse arguments
+                try:
+                    parsed_args = parse_json_params(args_str)
+                except Exception as e:
+                    print(f"{colorize('Error parsing arguments:', 'red')} {e}")
+                    return
+
+                # Check if all required arguments are provided
+                missing_args = [arg for arg in required_args if arg not in parsed_args]
+                if missing_args:
+                    print(
+                        f"{colorize('Error:', 'red')} Missing required arguments: {', '.join(missing_args)}"
+                    )
+                    print(
+                        f"{colorize('Usage:', 'yellow')} {service_name} {' '.join([f'{arg}=<value>' for arg in required_args])}"
+                    )
+                    return
+
+                # Resolve stored references in arguments
+                for arg_name in required_args:
+                    arg_value = parsed_args[arg_name]
+                    if isinstance(arg_value, str) and arg_value.startswith("$"):
+                        # Resolve stored reference
+                        reference = arg_value[1:]  # Remove $ prefix
+                        resolved_value = self._resolve_stored_reference(reference)
+                        if resolved_value is None:
+                            print(
+                                f"{colorize('Error:', 'red')} Could not resolve reference '{arg_value}'"
+                            )
+                            return
+                        parsed_args[arg_name] = resolved_value
+
+                # Call service method with arguments
+                service_method = getattr(self.client, service_name)
+                service = service_method(**parsed_args)
+            else:
+                # Service doesn't require arguments
+                service = getattr(self.client, service_name)()
+
             self.current_service = service
             self.current_service_name = service_name
             self.update_prompt()
@@ -756,6 +829,10 @@ class InteractiveShell(cmd.Cmd):
 
         except Exception as e:
             print(f"{colorize('Error entering service:', 'red')} {e}")
+            if self.args.debug:
+                import traceback
+
+                traceback.print_exc()
 
     def do_ls(self, line):
         """List available commands/services like TAB completion"""
@@ -843,11 +920,11 @@ class InteractiveShell(cmd.Cmd):
             print(
                 f"{colorize('Error:', 'red')} You must be in a service mode to use 'type'."
             )
-            print(f"Enter a service first (e.g., {colorize('d', 'yellow')})")
+            print(f"Enter a service first (e.g., {colorize('devicemgmt', 'yellow')})")
             return
 
         if not operation_name:
-            print(f"Usage: {colorize('type <operation_name>', 'yellow')}")
+            print("Usage: type <operation_name>")
             return
 
         if not hasattr(self.current_service, operation_name):
@@ -1191,6 +1268,14 @@ class InteractiveShell(cmd.Cmd):
         if hasattr(self.args, "no_patch") and self.args.no_patch:
             options_info.append(f"  ZeepPatcher   : {colorize('Disabled', 'red')}")
 
+        if (
+            hasattr(self.args, "health_check_interval")
+            and self.args.health_check_interval != 10
+        ):  # 10 is default
+            options_info.append(
+                f"  Health Check  : every {colorize(f'{self.args.health_check_interval}s', 'yellow')}"
+            )
+
         # Format options info
         options_display = ""
         if options_info:
@@ -1300,7 +1385,7 @@ class InteractiveShell(cmd.Cmd):
             super().do_help(line)
         else:
             help_text = f"""
-{colorize('ONVIF Interactive Shell Commands - v0.1.4', 'cyan')}\n{colorize('https://github.com/nirsimetri/onvif-python', 'white')}
+{colorize('ONVIF Interactive Shell Commands - v0.1.6', 'cyan')}\n{colorize('https://github.com/nirsimetri/onvif-python', 'white')}
 
 {colorize('Basic Commands:', 'yellow')}
   capabilities, caps       - Show device capabilities
@@ -1311,6 +1396,7 @@ class InteractiveShell(cmd.Cmd):
 
 {colorize('Navigation Commands:', 'yellow')}
   <service>                - Enter service mode (e.g., devicemgmt, media)
+  <service> <argument>     - Enter service mode with argument (e.g. pullpoint SubscriptionRef=<value>)
   cd <service>             - Enter service mode (alias)
   ls                       - List commands/services/methods in grid format
   up                       - Exit current service mode (go up one level)