pycloudedge 0.1.6.dev2__py3-none-any.whl → 0.1.6.dev4__py3-none-any.whl

cloudedge/_version.py

@@ -1,5 +1,6 @@
-# file generated by setuptools-scm
+# file generated by vcs-versioning
 # don't change, don't track in version control
+from __future__ import annotations
 
 __all__ = [
     "__version__",
@@ -10,25 +11,14 @@ __all__ = [
     "commit_id",
 ]
 
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
 version: str
 __version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
 
-__version__ = version = '0.1.6.dev2'
-__version_tuple__ = version_tuple = (0, 1, 6, 'dev2')
+__version__ = version = '0.1.6.dev4'
+__version_tuple__ = version_tuple = (0, 1, 6, 'dev4')
 
 __commit_id__ = commit_id = None

cloudedge/client.py

@@ -37,9 +37,7 @@ from .iot_parameters import (
 )
 from .constants import (
     CA_KEY, CA_SECRET, DEFAULT_HEADERS, DEFAULT_TIMEOUT,
-    REGION_ENDPOINTS, REGION_EU, REGION_US, REGION_AP,
     REDIRECT_URL,
-    region_for_country,
 )
 from .validators import validate_email, validate_country_code, validate_phone_code
 from .logging_config import get_logger
@@ -132,7 +130,6 @@ class CloudEdgeClient:
         session_cache_file: str = ".cloudedge_session_cache",
         enable_network_ping: bool = True,
         ping_timeout: float = 2.0,
-        region: Optional[str] = None,
     ):
         """
         Initialize CloudEdge API client.
@@ -146,10 +143,6 @@ 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", "us", or "ap").
-                When *None* the region is derived automatically from *country_code*:
-                European countries → EU, Asia-Pacific/Oceania/ME/Africa → AP
-                (Singapore), everything else → US.
             
         Raises:
             ValidationError: If input validation fails
@@ -173,17 +166,18 @@ class CloudEdgeClient:
                 details={"field": "phone_code", "value": phone_code}
             )
         
+        normalized_country_code = country_code.upper()
+        if normalized_country_code == "UK":
+            normalized_country_code = "GB"
+
         self.username = username
         self.password = password
-        self.country_code = country_code.upper()
+        self.country_code = normalized_country_code
         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"]
+        # Endpoints are discovered dynamically via _discover_endpoints()
+        self.BASE_URL: Optional[str] = None
+        self.OPENAPI_BASE_URL: Optional[str] = None
         
         # Setup proper logging
         self.logger = get_logger("client")
@@ -557,8 +551,11 @@ class CloudEdgeClient:
         contains the regional ``apiServer`` and ``openapi`` domain that must be
         used for the given account/country.
 
-        On success, ``self.BASE_URL`` and ``self.OPENAPI_BASE_URL`` are updated.
-        On failure the previously configured (static) endpoints are kept.
+        On success, ``self.BASE_URL`` and ``self.OPENAPI_BASE_URL`` are set.
+
+        Raises:
+            NetworkError: If the redirect API call fails or returns an
+                unexpected response and no endpoints were previously set.
         """
         import random
 
@@ -593,9 +590,6 @@ class CloudEdgeClient:
         ).hexdigest()
 
         # X-Ca-Sign: HMAC-SHA1 with CA_SECRET as key
-        # The app builds: "api=/ppstrongs/" + getRealUrl(path) + "|X-Ca-Key=...|..."
-        # getRealUrl("/ppstrongs/redirect") returns "/ppstrongs/redirect" unchanged,
-        # so the full string is "api=/ppstrongs//ppstrongs/redirect|..."
         ca_sign_data = (
             f"api=/ppstrongs//ppstrongs/redirect"
             f"|X-Ca-Key={CA_KEY}"
@@ -620,8 +614,9 @@ class CloudEdgeClient:
             )
             data = resp.json()
             if data.get("resultCode") != "1001":
-                self._log(f"Redirect discovery returned {data.get('resultCode')}")
-                return
+                raise NetworkError(
+                    f"Redirect discovery returned unexpected code: {data.get('resultCode')}"
+                )
 
             result = data.get("result", {})
             api_server = result.get("apiServer") or result.get("gwUrl") or ""
@@ -635,8 +630,15 @@ class CloudEdgeClient:
                 self.OPENAPI_BASE_URL = openapi_domain.rstrip("/")
                 self._log(f"Discovered OpenAPI server: {self.OPENAPI_BASE_URL}")
 
+            if not self.BASE_URL:
+                raise NetworkError(
+                    "Redirect API did not return an apiServer"
+                )
+
+        except NetworkError:
+            raise
         except Exception as exc:
-            self._log(f"Endpoint discovery failed (will use static endpoints): {exc}")
+            raise NetworkError(f"Endpoint discovery failed: {exc}") from exc
 
     def authenticate(self) -> bool:
         """

cloudedge/constants.py

@@ -2,77 +2,11 @@
 Configuration constants for CloudEdge API
 """
 
-# Region identifiers
-REGION_EU = "eu"
-REGION_US = "us"
-REGION_AP = "ap"
-
-# Per-region API endpoints (static fallback when redirect discovery fails)
-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",
-    },
-    REGION_AP: {
-        "base_url": "https://apis-as-singapore.cloudedge360.com",
-        "openapi_base_url": "https://openapi-usce.mearicloud.com",
-    },
-}
-
-# Global redirect endpoint — used to discover the correct regional server
+# Global redirect endpoint — used to discover the correct regional server.
+# This is the single source of truth: the redirect API returns the correct
+# ``apiServer`` and ``openapi`` domain for the given account/country.
 REDIRECT_URL = "https://apis.cloudedge360.com/ppstrongs/redirect"
 
-# 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",
-}
-
-
-# Asia-Pacific / Oceania / Middle East / Africa country codes
-# These are routed through the Singapore gateway
-AP_COUNTRY_CODES = {
-    # East Asia
-    "JP", "KR", "TW", "HK", "MO",
-    # Southeast Asia
-    "SG", "MY", "TH", "VN", "PH", "ID", "MM", "KH", "LA", "BN", "TL",
-    # South Asia
-    "IN", "PK", "BD", "LK", "NP", "BT", "MV",
-    # Oceania
-    "AU", "NZ", "FJ", "PG", "WS", "TO", "VU", "SB", "KI", "MH", "FM",
-    "PW", "NR", "TV", "CK", "NU",
-    # Middle East
-    "AE", "SA", "QA", "KW", "BH", "OM", "JO", "LB", "IQ", "IR", "YE",
-    "SY", "PS", "IL",
-    # Africa
-    "ZA", "EG", "NG", "KE", "GH", "TZ", "UG", "ET", "MA", "DZ", "TN",
-    "SN", "CI", "CM", "AO", "MZ", "ZW", "BW", "NA", "MU", "MG", "RW",
-}
-
-
-def region_for_country(country_code: str) -> str:
-    """Return the region key for a given ISO 3166-1 alpha-2 country code."""
-    cc = country_code.upper()
-    if cc in EU_COUNTRY_CODES:
-        return REGION_EU
-    if cc in AP_COUNTRY_CODES:
-        return REGION_AP
-    return REGION_US
-
 # API Keys (these are public keys from the mobile app)
 CA_KEY = "bc29be30292a4309877807e101afbd51"
 CA_SECRET = "35a69fd1-6527-4566-b190-921f9a651488"

{pycloudedge-0.1.6.dev2.dist-info → pycloudedge-0.1.6.dev4.dist-info}/METADATA

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

{pycloudedge-0.1.6.dev2.dist-info → pycloudedge-0.1.6.dev4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 cloudedge/__init__.py,sha256=l14PmA4B_JcYaFXKWhSxnJMEs3q8eCEoVliY_wlr4fQ,1465
-cloudedge/_version.py,sha256=PLPzXBIkQAXc-mvnIPLNmQqit_i0rmO6w4hdXJlO3xc,717
+cloudedge/_version.py,sha256=p56e4krPARNeSFFB40m4hfghTS7CXpna0hpttVgGTts,533
 cloudedge/cli.py,sha256=E3MWYyjLGsaR8gu8dtesfBsmHuVyKlYFR5fsLRH067w,10318
-cloudedge/client.py,sha256=m2RX_GY_2-wc0hx6nDApPfXEAVNvo3NNOYdX93aLXX8,81018
-cloudedge/constants.py,sha256=gsUMAJhM-fg3J6OIP5jea9rVSOQY0onDXLXSJrkx1TI,3265
+cloudedge/client.py,sha256=muYH2Xbhx4IvkQokt5esYQsDAEwjAB5RZ6H-VqGJBSE,80640
+cloudedge/constants.py,sha256=oaop1OXIHoRhk_qaOPTz7sylmflDvGjrGSBbBqO-fyQ,1127
 cloudedge/exceptions.py,sha256=YlSwhGPfUQyd4vclxURMBT3uh3gMF-PLtEYpNmJO2BM,903
 cloudedge/image_decrypt.py,sha256=Hq6PD4Qm-yBiMXeocD0Z4MmUS5bwHrIxMAJmhEdCekE,3036
 cloudedge/iot_parameters.py,sha256=HtaSwVn6Tqb7Dxwd1IQKNYBlMrq0OuMO8kzbJhxB9us,29122
@@ -10,9 +10,9 @@ cloudedge/logging_config.py,sha256=cLi5K8JnjaiXhbSjdloiUxH6dY-j2nm6C7fFnTiKpAs,1
 cloudedge/mqtt.py,sha256=ha6GeWz5XiPxDULh6XHJcz4WdPH3P16kWcFNBcCuZMg,9423
 cloudedge/utils.py,sha256=zp-GoztdJ3SFsyfKtBBLIn_w0eWDCd2pW67AUdKZYe4,3477
 cloudedge/validators.py,sha256=kGJLODZVr5WQOS7Nsk_NNhQMU8GlJCvluvWLFTj_PdA,2536
-pycloudedge-0.1.6.dev2.dist-info/licenses/LICENSE,sha256=85LbTeXx8Asym2aeMCC4qWMqnQNNTCLqfKmtKp6-I9E,11349
-pycloudedge-0.1.6.dev2.dist-info/METADATA,sha256=Gu3bM690polC2sS56QCbLhKD73q6__qsyKB5iavm8SQ,18618
-pycloudedge-0.1.6.dev2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-pycloudedge-0.1.6.dev2.dist-info/entry_points.txt,sha256=dIzG_xctEzY_c1r5_P532eyR-OzyBZifrwwKE3Af3MQ,49
-pycloudedge-0.1.6.dev2.dist-info/top_level.txt,sha256=1pbXwYPKRdEUABQrlLuTz6IbY1PCofklJ--4eg82UMQ,10
-pycloudedge-0.1.6.dev2.dist-info/RECORD,,
+pycloudedge-0.1.6.dev4.dist-info/licenses/LICENSE,sha256=85LbTeXx8Asym2aeMCC4qWMqnQNNTCLqfKmtKp6-I9E,11349
+pycloudedge-0.1.6.dev4.dist-info/METADATA,sha256=d3UueYgq8SCqXkUjjYsnJCLPwNoYo3SRfhG3pPklAy0,18618
+pycloudedge-0.1.6.dev4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+pycloudedge-0.1.6.dev4.dist-info/entry_points.txt,sha256=dIzG_xctEzY_c1r5_P532eyR-OzyBZifrwwKE3Af3MQ,49
+pycloudedge-0.1.6.dev4.dist-info/top_level.txt,sha256=1pbXwYPKRdEUABQrlLuTz6IbY1PCofklJ--4eg82UMQ,10
+pycloudedge-0.1.6.dev4.dist-info/RECORD,,