daybetter-services-python 1.0.5__tar.gz → 1.0.7__tar.gz

{daybetter_services_python-1.0.5/daybetter_services_python.egg-info → daybetter_services_python-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: daybetter-services-python
-Version: 1.0.5
+Version: 1.0.7
 Summary: Python client for DayBetter devices and services
 Home-page: https://github.com/THDayBetter/daybetter-python
 Author: THDayBetter
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE

{daybetter_services_python-1.0.5 → daybetter_services_python-1.0.7}/daybetter_python/__init__.py

@@ -3,5 +3,5 @@
 from .client import DayBetterClient
 from .exceptions import DayBetterError, AuthenticationError, APIError
 
-__version__ = "1.0.5"
+__version__ = "1.0.7"
 __all__ = ["DayBetterClient", "DayBetterError", "AuthenticationError", "APIError"]

{daybetter_services_python-1.0.5 → daybetter_services_python-1.0.7}/daybetter_python/client.py

@@ -2,7 +2,7 @@
 
 import aiohttp
 import logging
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple, Type
 
 from .exceptions import DayBetterError, AuthenticationError, APIError
 
@@ -12,19 +12,40 @@ _LOGGER = logging.getLogger(__name__)
 class DayBetterClient:
     """DayBetter API client."""
     
+    # 测试环境URL
+    TEST_BASE_URL = "https://cloud.v2.dbiot.link/daybetter/hass/api/v1.0/"
+    # 正式环境URL
+    PROD_BASE_URL = "https://a.dbiot.org/daybetter/hass/api/v1.0/"
+    
     def __init__(
         self, 
         token: str, 
-        base_url: str = "https://cloud.v2.dbiot.link/daybetter/hass/api/v1.0/"
+        base_url: Optional[str] = None,
+        hass_code: Optional[str] = None
     ):
         """Initialize the client.
         
         Args:
             token: Authentication token
-            base_url: Base URL for the API
+            base_url: Base URL for the API (optional, will be determined by hass_code if not provided)
+            hass_code: Home Assistant integration code (optional, if provided and starts with "db-", 
+                      will use production environment)
         """
         self.token = token
-        self.base_url = base_url
+        
+        # 根据 hass_code 或 base_url 确定使用的环境
+        if base_url is not None:
+            # 如果明确指定了 base_url，使用指定的 URL
+            self.base_url = base_url
+        elif hass_code is not None and hass_code.startswith("db-"):
+            # 如果 hass_code 以 "db-" 开头，使用正式环境
+            self.base_url = self.PROD_BASE_URL
+            _LOGGER.debug("Using production environment based on hass_code")
+        else:
+            # 默认使用测试环境
+            self.base_url = self.TEST_BASE_URL
+            _LOGGER.debug("Using test environment")
+        
         self._session: Optional[aiohttp.ClientSession] = None
         self._auth_valid = True
         self._devices: List[Dict[str, Any]] = []
@@ -35,7 +56,12 @@ class DayBetterClient:
         self._session = aiohttp.ClientSession()
         return self
     
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
+    async def __aexit__(
+        self,
+        exc_type: Optional[Type[BaseException]],
+        exc_val: Optional[BaseException],
+        exc_tb: Optional[Any],
+    ) -> None:
         """Async context manager exit."""
         if self._session:
             await self._session.close()
@@ -306,6 +332,24 @@ class DayBetterClient:
         Raises:
             APIError: If API request fails
         """
+        # 根据 hass_code 动态更新 base_url（如果之前没有明确指定）
+        # 如果 hass_code 以 "db-" 开头，切换到正式环境
+        if hass_code.startswith("db-") and self.base_url != self.PROD_BASE_URL:
+            old_url = self.base_url
+            self.base_url = self.PROD_BASE_URL
+            _LOGGER.info(
+                "Switching to production environment based on hass_code. "
+                "URL changed from %s to %s", old_url, self.base_url
+            )
+        elif not hass_code.startswith("db-") and self.base_url != self.TEST_BASE_URL:
+            # 如果 hass_code 不以 "db-" 开头，且当前不是测试环境，切换到测试环境
+            old_url = self.base_url
+            self.base_url = self.TEST_BASE_URL
+            _LOGGER.info(
+                "Switching to test environment based on hass_code. "
+                "URL changed from %s to %s", old_url, self.base_url
+            )
+        
         try:
             session = self._get_session()
             url = f"{self.base_url}hass/integrate"
@@ -415,7 +459,7 @@ class DayBetterClient:
         _LOGGER.debug("Fetched %d sensor devices", len(merged))
         return merged
     
-    async def close(self):
+    async def close(self) -> None:
         """Close the client session."""
         if self._session:
             await self._session.close()

daybetter_services_python-1.0.7/daybetter_python/exceptions.py

@@ -0,0 +1,38 @@
+"""DayBetter client exceptions."""
+
+
+class DayBetterError(Exception):
+    """Base exception for DayBetter client."""
+    
+    def __init__(self, message: str) -> None:
+        """Initialize the exception.
+        
+        Args:
+            message: Error message
+        """
+        super().__init__(message)
+        self.message = message
+
+
+class AuthenticationError(DayBetterError):
+    """Authentication failed."""
+    
+    def __init__(self, message: str = "Authentication failed") -> None:
+        """Initialize the authentication error.
+        
+        Args:
+            message: Error message
+        """
+        super().__init__(message)
+
+
+class APIError(DayBetterError):
+    """API request failed."""
+    
+    def __init__(self, message: str) -> None:
+        """Initialize the API error.
+        
+        Args:
+            message: Error message
+        """
+        super().__init__(message)

{daybetter_services_python-1.0.5 → daybetter_services_python-1.0.7/daybetter_services_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: daybetter-services-python
-Version: 1.0.5
+Version: 1.0.7
 Summary: Python client for DayBetter devices and services
 Home-page: https://github.com/THDayBetter/daybetter-python
 Author: THDayBetter
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Typing :: Typed
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE

{daybetter_services_python-1.0.5 → daybetter_services_python-1.0.7}/daybetter_services_python.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ setup.py
 daybetter_python/__init__.py
 daybetter_python/client.py
 daybetter_python/exceptions.py
+daybetter_python/py.typed
 daybetter_services_python.egg-info/PKG-INFO
 daybetter_services_python.egg-info/SOURCES.txt
 daybetter_services_python.egg-info/dependency_links.txt

{daybetter_services_python-1.0.5 → daybetter_services_python-1.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "daybetter-services-python"
-version = "1.0.5"
+version = "1.0.7"
 description = "Python client for DayBetter devices and services"
 readme = "README.md"
 license = "MIT"
@@ -25,6 +25,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Typing :: Typed",
 ]
 requires-python = ">=3.8"
 dependencies = [
@@ -55,3 +56,6 @@ target-version = ['py38']
 [tool.isort]
 profile = "black"
 line_length = 88
+
+[tool.setuptools.package-data]
+daybetter_python = ["py.typed"]

{daybetter_services_python-1.0.5 → daybetter_services_python-1.0.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="daybetter-services-python",
-    version="1.0.5",
+    version="1.0.7",
     author="THDayBetter",
     author_email="chenp2368@163.com",
     description="Python client for DayBetter devices and services",
@@ -13,6 +13,9 @@ setup(
     long_description_content_type="text/markdown",
     url="https://github.com/THDayBetter/daybetter-python",
     packages=find_packages(),
+    package_data={
+        "daybetter_python": ["py.typed"],
+    },
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
@@ -23,6 +26,7 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Typing :: Typed",
     ],
     python_requires=">=3.8",
     install_requires=["aiohttp>=3.8.0"],

daybetter_services_python-1.0.5/daybetter_python/exceptions.py

@@ -1,13 +0,0 @@
-"""DayBetter client exceptions."""
-
-
-class DayBetterError(Exception):
-    """Base exception for DayBetter client."""
-
-
-class AuthenticationError(DayBetterError):
-    """Authentication failed."""
-
-
-class APIError(DayBetterError):
-    """API request failed."""