python-selve-new 2.3.3__tar.gz → 2.3.6__tar.gz

python_selve_new-2.3.6/.github/workflows/python-publish.yml

@@ -0,0 +1,82 @@
+# This workflow will upload a Python Package using Twine when a release is created
+# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+
+name: Test and Publish Python Package
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - 'v*'  # Trigger on version tags
+  pull_request:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+    
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0  # Fetch all history for setuptools_scm
+    
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools-scm
+        pip install -e .
+        pip install pytest pytest-cov pytest-asyncio
+    
+    - name: Run tests
+      run: |
+        pytest -m "not integration" --cov=selve --cov-report=xml --cov-report=html --junitxml=test-results.xml
+    
+    - name: Upload test results
+      uses: actions/upload-artifact@v4
+      if: always() && matrix.python-version == '3.11'
+      with:
+        name: test-results
+        path: |
+          test-results.xml
+          htmlcov/
+          coverage.xml
+
+  deploy:
+    needs: test
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/v')  # Only run on version tags
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0  # Fetch all history for setuptools_scm
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install build setuptools-scm
+    - name: Build package
+      run: |
+        python -m build
+    - name: Publish package
+      if: startsWith(github.ref, 'refs/tags/v')
+      uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}

{python_selve_new-2.3.3/python_selve_new.egg-info → python_selve_new-2.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-selve-new
-Version: 2.3.3
+Version: 2.3.6
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer
@@ -12,16 +12,11 @@ Classifier: Intended Audience :: Information Technology
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests

python_selve_new-2.3.6/debug_response.py

@@ -0,0 +1,56 @@
+#!/usr/bin/env python3
+
+from unittest.mock import Mock, patch
+from selve import Selve
+from selve.util import CommeoServiceCommand, CommeoParamCommand
+
+# Test what happens when we create a response
+selve = Selve(logger=Mock())
+
+print("=== Testing ServiceGetVersionResponse ===")
+mock_array = Mock()
+mock_array.string = [Mock() for _ in range(7)]
+mock_array.string[0].cdata = "12345"
+mock_array.string[1].cdata = "1"
+mock_array.string[2].cdata = "0"
+mock_array.string[3].cdata = "0"
+mock_array.string[4].cdata = "2"
+mock_array.string[5].cdata = "1"
+mock_array.string[6].cdata = "100"
+
+# Mock hasattr properly to only return True for 'string'
+def mock_hasattr_func(obj, attr):
+    return attr == 'string'
+
+try:
+    with patch('builtins.hasattr', side_effect=mock_hasattr_func):
+        response = selve._create_response(mock_array, "selve.GW." + str(CommeoServiceCommand.GETVERSION.value))
+        print(f"Response created: {response}")
+        print(f"Response type: {type(response)}")
+        print(f"Response attributes: {[a for a in dir(response) if not a.startswith('_')]}")
+        if hasattr(response, 'serial'):
+            print(f"Serial: {response.serial}")
+        if hasattr(response, 'version'):
+            print(f"Version: {response.version}")
+except Exception as e:
+    print(f"Error: {e}")
+    import traceback
+    traceback.print_exc()
+
+print("\n=== Testing ParamGetForwardResponse ===")
+mock_array2 = Mock()
+mock_array2.string = [Mock()]
+mock_array2.string[0].cdata = "1"  # forwarding value
+
+try:
+    with patch('builtins.hasattr', side_effect=mock_hasattr_func):
+        response2 = selve._create_response(mock_array2, "selve.GW." + str(CommeoParamCommand.GETFORWARD.value))
+        print(f"Response created: {response2}")
+        print(f"Response type: {type(response2)}")
+        print(f"Response attributes: {[a for a in dir(response2) if not a.startswith('_')]}")
+        if hasattr(response2, 'forwarding'):
+            print(f"Forwarding: {response2.forwarding}")
+except Exception as e:
+    print(f"Error: {e}")
+    import traceback
+    traceback.print_exc()

python_selve_new-2.3.6/debug_test.bat

@@ -0,0 +1,61 @@
+@echo off
+echo =============================================
+echo Python-Selve Debug Test with Real Hardware
+echo =============================================
+echo WARNING: This test requires actual Selve hardware connected!
+echo.
+
+:: Check if Python is installed and get the Python command
+python --version > nul 2>&1
+if %ERRORLEVEL% NEQ 0 (
+    py --version > nul 2>&1
+    if %ERRORLEVEL% NEQ 0 (
+        echo Python is not installed or not in PATH. Please install Python first.
+        exit /b 1
+    ) else (
+        set PYTHON_CMD=py
+    )
+) else (
+    set PYTHON_CMD=python
+)
+
+:: Check if virtual environment exists
+if not exist venv (
+    echo Creating virtual environment...
+    %PYTHON_CMD% -m venv venv
+) else (
+    echo Found existing virtual environment.
+)
+
+:: Activate virtual environment
+echo Activating virtual environment...
+call venv\Scripts\activate
+
+:: Install requirements if needed
+echo Installing required packages...
+%PYTHON_CMD% -m pip install --upgrade pip
+%PYTHON_CMD% -m pip install -e .
+
+:: Ask for COM port
+echo.
+set /p COM_PORT=Enter COM port number (e.g., '16' for COM16): 
+
+:: Edit the test_com16.py file to use the specified COM port
+echo.
+echo Setting up test for COM%COM_PORT%...
+powershell -Command "(Get-Content test_com16.py) | ForEach-Object { $_ -replace 'COM\d+', 'COM%COM_PORT%' } | Set-Content test_com16.py"
+
+:: Run the debug test
+echo.
+echo Running debug test with COM%COM_PORT%...
+%PYTHON_CMD% test_com16.py
+
+:: Deactivate virtual environment
+echo.
+echo Deactivating virtual environment...
+call venv\Scripts\deactivate
+
+echo.
+echo Debug test completed.
+echo.
+pause

python_selve_new-2.3.6/direct_hardware_test.bat

@@ -0,0 +1,70 @@
+@echo off
+echo =============================================
+echo Python-Selve Direct Hardware Test
+echo =============================================
+echo This script will run a direct hardware test with interactive controls.
+echo.
+
+:: Check if Python is installed and get the Python command
+python --version > nul 2>&1
+if %ERRORLEVEL% NEQ 0 (
+    py --version > nul 2>&1
+    if %ERRORLEVEL% NEQ 0 (
+        echo Python is not installed or not in PATH. Please install Python first.
+        exit /b 1
+    ) else (
+        set PYTHON_CMD=py
+    )
+) else (
+    set PYTHON_CMD=python
+)
+
+:: Check if virtual environment exists
+if not exist venv (
+    echo Creating virtual environment...
+    %PYTHON_CMD% -m venv venv
+) else (
+    echo Found existing virtual environment.
+)
+
+:: Activate virtual environment
+echo Activating virtual environment...
+call venv\Scripts\activate
+
+:: Install requirements if needed
+echo Installing required packages...
+%PYTHON_CMD% -m pip install --upgrade pip
+%PYTHON_CMD% -m pip install -e .
+
+:: Ask for test mode
+echo.
+echo Choose test mode:
+echo 1. Auto-discover port (recommended)
+echo 2. Specify COM port
+echo.
+set /p TEST_MODE=Enter choice (1 or 2): 
+
+if "%TEST_MODE%"=="1" (
+    echo.
+    echo Running direct hardware test with auto-discovery...
+    %PYTHON_CMD% direct_hardware_test.py --discover --verbose
+) else if "%TEST_MODE%"=="2" (
+    echo.
+    set /p COM_PORT=Enter COM port number (e.g., '3' for COM3): 
+    echo.
+    echo Running direct hardware test with COM%COM_PORT%...
+    %PYTHON_CMD% direct_hardware_test.py --port COM%COM_PORT% --verbose
+) else (
+    echo Invalid choice. Using auto-discovery...
+    %PYTHON_CMD% direct_hardware_test.py --discover --verbose
+)
+
+:: Deactivate virtual environment
+echo.
+echo Deactivating virtual environment...
+call venv\Scripts\deactivate
+
+echo.
+echo Test completed.
+echo.
+pause

python_selve_new-2.3.6/direct_hardware_test.py

@@ -0,0 +1,236 @@
+import logging
+import sys
+import asyncio
+import os
+import argparse
+from serial.tools import list_ports
+
+# Add the project root directory to the path so we can import the selve package
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '.')))
+
+# Import the selve package
+from selve import Selve
+from selve.util.protocol import ServiceState, DeviceType, SelveTypes
+
+
+async def direct_hardware_test(port=None, discover=True):
+    """Direct hardware test with the Selve gateway."""
+    # Set up logging
+    logger = logging.getLogger("DirectHardwareTestLogger")
+    logger.setLevel(logging.DEBUG)
+    handler = logging.StreamHandler(sys.stdout)
+    handler.setLevel(logging.DEBUG)
+    formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+    
+    # Create a new event loop
+    loop = asyncio.get_event_loop()
+    
+    try:
+        # Check for available ports
+        available_ports = []
+        for port_info in list_ports.comports():
+            available_ports.append(port_info.device)
+        
+        print(f"Available COM ports: {available_ports}")
+        
+        # Create the Selve instance
+        print(f"Creating Selve instance with port={port}, discover={discover}")
+        selve_instance = Selve(port=port, discover=discover, develop=True, logger=logger, loop=loop)
+        
+        # Setup the connection
+        print("Setting up connection...")
+        await selve_instance.setup()
+        
+        # Test ping
+        print("\nTesting ping...")
+        result = await selve_instance.pingGatewayFromWorker()
+        print(f"Ping result: {result}")
+        
+        if not result:
+            print("Failed to ping gateway. Check connection and try again.")
+            await selve_instance.stopWorker()
+            return
+        
+        # Get gateway state
+        print("\nGetting gateway state...")
+        state = await selve_instance.gatewayState()
+        print(f"Gateway state: {state}")
+        
+        # Check if gateway is ready
+        print("\nChecking if gateway is ready...")
+        is_ready = await selve_instance.gatewayReady()
+        print(f"Gateway ready: {is_ready}")
+        
+        # Get gateway version
+        print("\nGetting gateway version...")
+        version = await selve_instance.getGatewayFirmwareVersion()
+        print(f"Gateway firmware version: {version}")
+        
+        # Get gateway serial number
+        print("\nGetting gateway serial number...")
+        serial = await selve_instance.getGatewaySerial()
+        print(f"Gateway serial number: {serial}")
+        
+        # Discover devices
+        print("\nDiscovering devices...")
+        await selve_instance.discover()
+        
+        # Print discovered devices
+        devices = getattr(selve_instance, 'devices', {})
+        
+        if 'device' in devices and devices['device']:
+            print(f"\nFound {len(devices['device'])} devices:")
+            for device_id, device in devices['device'].items():
+                print(f"  Device {device_id}: {device}")
+                print(f"    Name: {device.name}")
+                print(f"    Type: {device.device_type.name}")
+                print(f"    Sub-type: {device.device_sub_type.name}")
+                print(f"    State: {device.state}")
+                print(f"    Value: {device.value}")
+                print(f"    Target: {device.targetValue}")
+            
+            # Ask if user wants to control a device
+            print("\nDo you want to control a device? (y/n)")
+            choice = input().strip().lower()
+            if choice == 'y':
+                # Ask which device to control
+                print("\nEnter the device ID to control:")
+                device_id_str = input().strip()
+                try:
+                    device_id = int(device_id_str)
+                    if device_id in devices['device']:
+                        device = devices['device'][device_id]
+                        print(f"Controlling device {device_id}: {device.name}")
+                        
+                        # Control loop
+                        while True:
+                            print("\nActions:")
+                            print("1. Move Up")
+                            print("2. Move Down")
+                            print("3. Stop")
+                            print("4. Get Device Info")
+                            print("5. Back to main menu")
+                            
+                            action = input("Select action (1-5): ").strip()
+                            
+                            if action == '1':
+                                print("Moving up...")
+                                await selve_instance.moveDeviceUp(device)
+                            elif action == '2':
+                                print("Moving down...")
+                                await selve_instance.moveDeviceDown(device)
+                            elif action == '3':
+                                print("Stopping...")
+                                await selve_instance.moveDeviceStop(device)
+                            elif action == '4':
+                                print("\nDevice Info:")
+                                print(f"  Name: {device.name}")
+                                print(f"  Type: {device.device_type.name}")
+                                print(f"  Sub-type: {device.device_sub_type.name}")
+                                print(f"  State: {device.state}")
+                                print(f"  Value: {device.value}")
+                                print(f"  Target: {device.targetValue}")
+                            elif action == '5':
+                                break
+                            else:
+                                print("Invalid choice. Please try again.")
+                    else:
+                        print(f"No device with ID {device_id} found.")
+                except ValueError:
+                    print("Invalid device ID. Please enter a number.")
+        else:
+            print("\nNo devices found.")
+        
+        if 'group' in devices and devices['group']:
+            print(f"\nFound {len(devices['group'])} groups:")
+            for group_id, group in devices['group'].items():
+                print(f"  Group {group_id}: {group}")
+                print(f"    Name: {group.name}")
+            
+            # Ask if user wants to control a group
+            print("\nDo you want to control a group? (y/n)")
+            choice = input().strip().lower()
+            if choice == 'y':
+                # Ask which group to control
+                print("\nEnter the group ID to control:")
+                group_id_str = input().strip()
+                try:
+                    group_id = int(group_id_str)
+                    if group_id in devices['group']:
+                        group = devices['group'][group_id]
+                        print(f"Controlling group {group_id}: {group.name}")
+                        
+                        # Control loop
+                        while True:
+                            print("\nActions:")
+                            print("1. Move Up")
+                            print("2. Move Down")
+                            print("3. Stop")
+                            print("4. Get Group Info")
+                            print("5. Back to main menu")
+                            
+                            action = input("Select action (1-5): ").strip()
+                            
+                            if action == '1':
+                                print("Moving up...")
+                                await selve_instance.moveGroupUp(group)
+                            elif action == '2':
+                                print("Moving down...")
+                                await selve_instance.moveGroupDown(group)
+                            elif action == '3':
+                                print("Stopping...")
+                                await selve_instance.moveGroupStop(group)
+                            elif action == '4':
+                                print("\nGroup Info:")
+                                print(f"  Name: {group.name}")
+                                print(f"  Type: {group.device_type.name}")
+                                print(f"  Sub-type: {group.device_sub_type.name}")
+                            elif action == '5':
+                                break
+                            else:
+                                print("Invalid choice. Please try again.")
+                    else:
+                        print(f"No group with ID {group_id} found.")
+                except ValueError:
+                    print("Invalid group ID. Please enter a number.")
+        else:
+            print("\nNo groups found.")
+        
+        # Clean up
+        print("\nCleaning up...")
+        await selve_instance.stopWorker()
+        
+    except Exception as e:
+        print(f"Error: {e}")
+        import traceback
+        traceback.print_exc()
+        
+    print("\nTest completed!")
+
+
+if __name__ == "__main__":
+    # Parse command line arguments
+    parser = argparse.ArgumentParser(description='Direct hardware test with the Selve gateway.')
+    parser.add_argument('-p', '--port', help='COM port to use (e.g., COM3)')
+    parser.add_argument('-d', '--discover', action='store_true', help='Enable auto-discovery of port')
+    parser.add_argument('-v', '--verbose', action='store_true', help='Enable verbose logging')
+    
+    args = parser.parse_args()
+    
+    # Configure logging
+    log_level = logging.DEBUG if args.verbose else logging.INFO
+    logging.basicConfig(level=log_level)
+    
+    try:
+        # Use port if specified, otherwise use auto-discovery
+        port = args.port
+        discover = True if port is None or args.discover else False
+        
+        asyncio.run(direct_hardware_test(port, discover))
+    except KeyboardInterrupt:
+        print("Test interrupted by user.")
+    except Exception as e:
+        print(f"Test failed with error: {e}")
+        sys.exit(1)

{python_selve_new-2.3.3 → python_selve_new-2.3.6}/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 description = "Python library for interfacing with selve devices using the USB-RF controller. Written completely new."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 keywords = ["selve", "blind", "awning", "shutter", "usb", "rf"]
 license = {text = "GNU General Public License v2 or later (GPLv2+)"}
 classifiers = [
@@ -23,11 +23,6 @@ classifiers = [
     # Specify the Python versions you support here. In particular, ensure
     # that you indicate whether you support Python 2, Python 3 or both.
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.4",
-    "Programming Language :: Python :: 3.5",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -47,4 +42,23 @@ dynamic = ["version"]
 my-script = "my_package.module:function"
 
 # ... other project metadata fields as listed in:
-#     https://packaging.python.org/en/latest/guides/writing-pyproject-toml/
+#     https://packaging.python.org/en/latest/guides/writing-pyproject-toml/
+
+[tool.setuptools_scm]
+write_to = "selve/_version.py"
+version_scheme = "post-release"
+local_scheme = "no-local-version"
+
+[tool.pytest.ini_options]
+minversion = "6.0"
+addopts = "-ra -q --strict-markers"
+testpaths = [
+    "tests",
+]
+markers = [
+    "asyncio: marks tests as async tests",
+    "integration: marks tests as integration tests",
+    "unit: marks tests as unit tests",
+]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"

{python_selve_new-2.3.3 → python_selve_new-2.3.6/python_selve_new.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-selve-new
-Version: 2.3.3
+Version: 2.3.6
 Summary: Python library for interfacing with selve devices using the USB-RF controller. Written completely new.
 Home-page: https://github.com/Kannix2005/python-selve-new
 Author: Stefan Altheimer
@@ -12,16 +12,11 @@ Classifier: Intended Audience :: Information Technology
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.4
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests