pycloudedge 0.1.3__tar.gz → 0.1.4.dev2__tar.gz

{pycloudedge-0.1.3 → pycloudedge-0.1.4.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycloudedge
-Version: 0.1.3
+Version: 0.1.4.dev2
 Summary: Python library for CloudEdge cameras
 Home-page: https://github.com/fradaloisio/pycloudedge
 Author: Francesco D'Aloisio

{pycloudedge-0.1.3 → pycloudedge-0.1.4.dev2}/cloudedge/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.3'
-__version_tuple__ = version_tuple = (0, 1, 3)
+__version__ = version = '0.1.4.dev2'
+__version_tuple__ = version_tuple = (0, 1, 4, 'dev2')
 
-__commit_id__ = commit_id = 'gdbaa3a14a'
+__commit_id__ = commit_id = 'gf40c10343'

{pycloudedge-0.1.3 → pycloudedge-0.1.4.dev2}/cloudedge/client.py

@@ -35,11 +35,63 @@ from .iot_parameters import (
     get_parameter_code_by_name, 
     format_parameter_value
 )
-from .constants import CA_KEY, DEFAULT_HEADERS, DEFAULT_TIMEOUT
+from .constants import (
+    CA_KEY, DEFAULT_HEADERS, DEFAULT_TIMEOUT,
+    REGION_ENDPOINTS, REGION_EU, REGION_US,
+    region_for_country,
+)
 from .validators import validate_email, validate_country_code, validate_phone_code
 from .logging_config import get_logger
 from .utils import retry_on_failure
 
+# API list keys → readable product type when deviceTypeName is a CDN image URL
+_DEVICE_LIST_CATEGORY_LABELS = {
+    "snap": "Camera",
+    "ipc": "Camera",
+    "nvr": "NVR",
+    "doorbell": "Doorbell",
+    "chime": "Chime",
+}
+
+
+def _device_icon_url_from_type_name(device_type_name: Any) -> Optional[str]:
+    """Return URL if deviceTypeName is an http(s) icon URL (Meari/OSS), else None."""
+    if not isinstance(device_type_name, str):
+        return None
+    s = device_type_name.strip()
+    if s.startswith(("http://", "https://")):
+        return s
+    return None
+
+
+def _human_type_and_icon_url(
+    device: Dict[str, Any],
+    list_category: Optional[str] = None,
+) -> tuple[str, Optional[str]]:
+    """
+    CloudEdge often puts a product image URL in deviceTypeName instead of a label.
+    Return a human-readable type for UIs (e.g. Home Assistant model) and optional icon URL.
+    """
+    raw = device.get("deviceTypeName")
+    icon_url = _device_icon_url_from_type_name(raw)
+    if icon_url is not None:
+        label = _DEVICE_LIST_CATEGORY_LABELS.get(list_category or "", "SmartEye Camera")
+        lower = icon_url.lower()
+        if "doorbell" in lower:
+            label = "Doorbell"
+        elif "chime" in lower:
+            label = "Chime"
+        elif "nvr" in lower:
+            label = "NVR"
+        elif "snap" in lower or "ipc" in lower:
+            label = "Camera"
+        return label, icon_url
+    if raw is not None and str(raw).strip():
+        return str(raw).strip(), None
+    if list_category:
+        return _DEVICE_LIST_CATEGORY_LABELS.get(list_category, "Unknown"), None
+    return "Unknown", None
+
 
 class CloudEdgeClient:
     """
@@ -64,9 +116,6 @@ class CloudEdgeClient:
         ...     print(f"Device: {device['name']} - Status: {device['online']}")
     """
     
-    BASE_URL = "https://apis-eu-frankfurt.cloudedge360.com"
-    OPENAPI_BASE_URL = "https://openapi-euce.mearicloud.com"
-    
     def __init__(
         self, 
         username: str, 
@@ -76,7 +125,8 @@ class CloudEdgeClient:
         debug: bool = False,
         session_cache_file: str = ".cloudedge_session_cache",
         enable_network_ping: bool = True,
-        ping_timeout: float = 2.0
+        ping_timeout: float = 2.0,
+        region: Optional[str] = None,
     ):
         """
         Initialize CloudEdge API client.
@@ -90,6 +140,9 @@ class CloudEdgeClient:
             session_cache_file (str): Path to session cache file
             enable_network_ping (bool): Enable ping-based online status when on same network
             ping_timeout (float): Ping timeout in seconds
+            region (str, optional): Force a specific region ("eu" or "us").
+                When *None* the region is derived automatically from *country_code*:
+                European countries use the EU endpoints, everything else uses US.
             
         Raises:
             ValidationError: If input validation fails
@@ -118,6 +171,13 @@ class CloudEdgeClient:
         self.country_code = country_code.upper()
         self.phone_code = phone_code if phone_code.startswith('+') else f'+{phone_code}'
         
+        # Resolve region and endpoints
+        resolved_region = region if region in REGION_ENDPOINTS else region_for_country(self.country_code)
+        endpoints = REGION_ENDPOINTS[resolved_region]
+        self.region = resolved_region
+        self.BASE_URL = endpoints["base_url"]
+        self.OPENAPI_BASE_URL = endpoints["openapi_base_url"]
+        
         # Setup proper logging
         self.logger = get_logger("client")
         if debug:
@@ -775,15 +835,19 @@ class CloudEdgeClient:
                         device_list = response_data[device_type]
                         if isinstance(device_list, list):
                             for device in device_list:
+                                type_str, icon_url = _human_type_and_icon_url(
+                                    device, list_category=device_type
+                                )
                                 device_dict = {
                                     'device_id': device.get('deviceID'),
                                     'serial_number': device.get('snNum'),
                                     'name': device.get('deviceName', 'Unnamed'),
-                                    'type': device.get('deviceTypeName', 'Unknown'),
+                                    'type': type_str,
                                     'type_id': device.get('devTypeID'),
                                     'host_key': device.get('hostKey'),
                                     'online': device.get('devStatus') == 1,  # Store original API status
-                                    'home_id': home_id
+                                    'home_id': home_id,
+                                    'device_icon_url': icon_url,
                                 }
                                 
                                 # Get enhanced online status
@@ -908,43 +972,54 @@ class CloudEdgeClient:
                     import json
                     self._log(f"API Response structure: {json.dumps(response_data, indent=2)}")
                 
-                devices = []
-                
-                # Check for devices in different device type keys (working format)
                 device_types = ['nvr', 'ipc', 'chime', 'doorbell', 'snap']
-                
-                for device_type in device_types:
-                    if device_type in response_data and response_data[device_type]:
-                        device_list = response_data[device_type]
-                        if isinstance(device_list, list):
-                            self._log(f"Found {len(device_list)} devices under '{device_type}' key")
-                            devices.extend(device_list)
-                
-                # Fallback: check for devices in result.deviceList (older format)
-                if not devices:
-                    device_list = response_data.get("result", {}).get("deviceList", [])
-                    if isinstance(device_list, list) and device_list:
-                        self._log(f"Found {len(device_list)} devices under 'result.deviceList' key")
-                        devices.extend(device_list)
-                
-                # Convert to standardized format
                 standardized_devices = []
-                for device in devices:
-                    device_dict = {
-                        'device_id': device.get('deviceID'),
-                        'serial_number': device.get('snNum'),
-                        'name': device.get('deviceName', 'Unnamed'),
-                        'type': device.get('deviceTypeName', 'Unknown'),
-                        'type_id': device.get('devTypeID'),
-                        'host_key': device.get('hostKey'),
-                        'online': device.get('onLine') == 1  # Store original API status
-                    }
-                    
-                    # Get enhanced online status
-                    device_dict['online'] = self._get_enhanced_device_status(device_dict)
-                    
-                    standardized_devices.append(device_dict)
-                    
+
+                # Modern API: devices grouped by category key
+                for device_type in device_types:
+                    device_list = response_data.get(device_type)
+                    if not isinstance(device_list, list) or not device_list:
+                        continue
+                    self._log(f"Found {len(device_list)} devices under '{device_type}' key")
+                    for device in device_list:
+                        type_str, icon_url = _human_type_and_icon_url(
+                            device, list_category=device_type
+                        )
+                        device_dict = {
+                            'device_id': device.get('deviceID'),
+                            'serial_number': device.get('snNum'),
+                            'name': device.get('deviceName', 'Unnamed'),
+                            'type': type_str,
+                            'type_id': device.get('devTypeID'),
+                            'host_key': device.get('hostKey'),
+                            'online': device.get('onLine') == 1,
+                            'device_icon_url': icon_url,
+                        }
+                        device_dict['online'] = self._get_enhanced_device_status(device_dict)
+                        standardized_devices.append(device_dict)
+
+                # Older API fallback: devices under result.deviceList
+                if not standardized_devices:
+                    fallback_list = response_data.get("result", {}).get("deviceList", [])
+                    if isinstance(fallback_list, list) and fallback_list:
+                        self._log(f"Found {len(fallback_list)} devices under 'result.deviceList' key")
+                        for device in fallback_list:
+                            type_str, icon_url = _human_type_and_icon_url(
+                                device, list_category=None
+                            )
+                            device_dict = {
+                                'device_id': device.get('deviceID'),
+                                'serial_number': device.get('snNum'),
+                                'name': device.get('deviceName', 'Unnamed'),
+                                'type': type_str,
+                                'type_id': device.get('devTypeID'),
+                                'host_key': device.get('hostKey'),
+                                'online': device.get('onLine') == 1,
+                                'device_icon_url': icon_url,
+                            }
+                            device_dict['online'] = self._get_enhanced_device_status(device_dict)
+                            standardized_devices.append(device_dict)
+
                 return standardized_devices
             else:
                 error_msg = response_data.get('resultMsg', 'Unknown error')

pycloudedge-0.1.4.dev2/cloudedge/constants.py

@@ -0,0 +1,68 @@
+"""
+Configuration constants for CloudEdge API
+"""
+
+# Region identifiers
+REGION_EU = "eu"
+REGION_US = "us"
+
+# Per-region API endpoints
+REGION_ENDPOINTS = {
+    REGION_EU: {
+        "base_url": "https://apis-eu-frankfurt.cloudedge360.com",
+        "openapi_base_url": "https://openapi-euce.mearicloud.com",
+    },
+    REGION_US: {
+        "base_url": "https://apis-us-west.cloudedge360.com",
+        "openapi_base_url": "https://openapi-uswe.mearicloud.com",
+    },
+}
+
+# Default endpoints (EU) – kept for backward compatibility
+BASE_URL = REGION_ENDPOINTS[REGION_EU]["base_url"]
+OPENAPI_BASE_URL = REGION_ENDPOINTS[REGION_EU]["openapi_base_url"]
+
+# European country codes (ISO 3166-1 alpha-2)
+EU_COUNTRY_CODES = {
+    "AT", "BE", "BG", "HR", "CY", "CZ", "DK", "EE", "FI", "FR",
+    "DE", "GR", "HU", "IE", "IT", "LV", "LT", "LU", "MT", "NL",
+    "PL", "PT", "RO", "SK", "SI", "ES", "SE",
+    # EEA + EFTA + UK
+    "IS", "LI", "NO", "CH", "GB",
+    # Other European countries
+    "AL", "AD", "AM", "AZ", "BA", "BY", "GE", "GI", "XK", "MD",
+    "MC", "ME", "MK", "RS", "RU", "SM", "TR", "UA", "VA",
+}
+
+
+def region_for_country(country_code: str) -> str:
+    """Return the region key for a given ISO 3166-1 alpha-2 country code."""
+    if country_code.upper() in EU_COUNTRY_CODES:
+        return REGION_EU
+    return REGION_US
+
+# API Keys (these are public keys from the mobile app)
+CA_KEY = "bc29be30292a4309877807e101afbd51"
+
+# Default Headers
+DEFAULT_HEADERS = {
+    "Accept-Language": "en-US,en;q=0.8",
+    "User-Agent": "Mozilla/5.0 (Linux; U; Android 10; en-us; Android SDK built for arm64 Build/QSR1.211112.002) AppleWebKit/533.1 (KHTML, like Gecko) Version/5.0 Mobile Safari/533.1",
+    "Content-Type": "application/x-www-form-urlencoded",
+    "Accept-Encoding": "gzip, deflate, br"
+}
+
+# API Constants
+PHONE_TYPE = "a"
+SOURCE_APP = "8"
+APP_VERSION = "5.5.1"
+IOT_TYPE = "4"
+APP_VERSION_CODE = "551"
+DEFAULT_LANGUAGE = "en"
+
+# Timeout values (seconds)
+DEFAULT_TIMEOUT = 30
+PING_TIMEOUT = 2.0
+
+# Cache settings
+DEFAULT_CACHE_FILE = ".cloudedge_session_cache"

{pycloudedge-0.1.3 → pycloudedge-0.1.4.dev2}/pycloudedge.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycloudedge
-Version: 0.1.3
+Version: 0.1.4.dev2
 Summary: Python library for CloudEdge cameras
 Home-page: https://github.com/fradaloisio/pycloudedge
 Author: Francesco D'Aloisio

pycloudedge-0.1.3/cloudedge/constants.py

@@ -1,33 +0,0 @@
-"""
-Configuration constants for CloudEdge API
-"""
-
-# API Endpoints
-BASE_URL = "https://apis-eu-frankfurt.cloudedge360.com"
-OPENAPI_BASE_URL = "https://openapi-euce.mearicloud.com"
-
-# API Keys (these are public keys from the mobile app)
-CA_KEY = "bc29be30292a4309877807e101afbd51"
-
-# Default Headers
-DEFAULT_HEADERS = {
-    "Accept-Language": "en-US,en;q=0.8",
-    "User-Agent": "Mozilla/5.0 (Linux; U; Android 10; en-us; Android SDK built for arm64 Build/QSR1.211112.002) AppleWebKit/533.1 (KHTML, like Gecko) Version/5.0 Mobile Safari/533.1",
-    "Content-Type": "application/x-www-form-urlencoded",
-    "Accept-Encoding": "gzip, deflate, br"
-}
-
-# API Constants
-PHONE_TYPE = "a"
-SOURCE_APP = "8"
-APP_VERSION = "5.5.1"
-IOT_TYPE = "4"
-APP_VERSION_CODE = "551"
-DEFAULT_LANGUAGE = "en"
-
-# Timeout values (seconds)
-DEFAULT_TIMEOUT = 30
-PING_TIMEOUT = 2.0
-
-# Cache settings
-DEFAULT_CACHE_FILE = ".cloudedge_session_cache"