python-library-lan-router 0.1.0__tar.gz → 0.1.2__tar.gz

python_library_lan_router-0.1.2/.gitignore

@@ -0,0 +1,21 @@
+__pycache__/
+*.pyc
+*.pyo
+*.egg-info/
+dist/
+build/
+.venv/
+.env
+.env.*
+!.env.example
+# packages 示例本地密钥（*.example 为模板，可提交）
+packages/**/examples/**/.env
+!packages/**/examples/**/.env.example
+packages/**/examples/**/mcp.json
+!packages/**/examples/**/mcp.json.example
+packages/**/examples/**/.sandbox/
+.pytest_cache/
+config.yaml
+logs/
+.cursor/
+uv.lock

{python_library_lan_router-0.1.0 → python_library_lan_router-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-library-lan-router
-Version: 0.1.0
+Version: 0.1.2
 Requires-Python: >=3.10
 Requires-Dist: pydantic>=2.0.0
 Requires-Dist: tplinkrouterc6u>=0.1.0

{python_library_lan_router-0.1.0 → python_library_lan_router-0.1.2}/lan_router/device.py

@@ -8,4 +8,6 @@ class Device(BaseModel):
     mac: str
     """设备MAC地址"""
     type: str
-    """设备类型"""
+    """设备类型"""
+    active: bool = True
+    """路由器报告的在线状态；未返回在线字段时视为在线"""

python_library_lan_router-0.1.2/lan_router/tplink.py

@@ -0,0 +1,53 @@
+from tplinkrouterc6u import TPLinkXDRClient
+
+from .base import BaseRouter
+from .device import Device
+
+
+class _TPLinkXDRClientNoProxy(TPLinkXDRClient):
+    """TP-Link 客户端；忽略 HTTP_PROXY 等环境变量，内网路由器应直连。"""
+
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__(*args, **kwargs)
+        self._session.trust_env = False
+
+
+class TPLinkRouter(BaseRouter):
+    _router: TPLinkXDRClient | None = None
+
+    def model_post_init(self, ctx) -> None:
+        self._router = _TPLinkXDRClientNoProxy(
+            self.hostname,
+            self.username,
+            self.password,
+        )
+
+    def login(self):
+        self._router.authorize()
+
+    def logout(self):
+        self._router.logout()
+
+    def scan(self) -> list[Device]:
+        devices = []
+        status = self._router.get_status()
+
+        for data in status.devices:
+            type = getattr(data.type, "value", str(data.type))
+            name = data.hostname or ""
+            ip =  self._show(data.ipaddr)
+            mac = self._show(data.macaddr)
+            device = Device(
+                name=name,
+                ip=ip,
+                mac=mac,
+                type=type,
+                active=data.active,
+            )
+            devices.append(device)
+
+        return devices
+
+    def _show(self, v: str | None) -> str:
+        """显示空值"""
+        return "-" if v is None or v == "" else v

{python_library_lan_router-0.1.0 → python_library_lan_router-0.1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-library-lan-router"
-version = "0.1.0"
+version = "0.1.2"
 requires-python = ">=3.10"
 dependencies = [
     "tplinkrouterc6u>=0.1.0",

python_library_lan_router-0.1.2/tests/test_lan_router.py

@@ -0,0 +1,36 @@
+import unittest
+
+from lan_router import Device, create_router
+
+
+class LanRouterTests(unittest.TestCase):
+    def test_create_router_rejects_unknown_vendor(self) -> None:
+        with self.assertRaises(ValueError) as ctx:
+            create_router("unknown")  # type: ignore[arg-type]
+        self.assertIn("不支持", str(ctx.exception))
+
+    def test_device_model(self) -> None:
+        d = Device(
+            name="n",
+            ip="192.168.0.1",
+            mac="00:00:00:00:00:01",
+            type="wifi",
+            active=False,
+        )
+        self.assertEqual(d.name, "n")
+        self.assertEqual(d.ip, "192.168.0.1")
+        self.assertFalse(d.active)
+
+    def test_tplink_router_ignores_http_proxy_env(self) -> None:
+        router = create_router(
+            "tplink",
+            hostname="192.168.1.1",
+            username="admin",
+            password="secret",
+        )
+        assert router._router is not None
+        self.assertFalse(router._router._session.trust_env)
+
+
+if __name__ == "__main__":
+    unittest.main()

python_library_lan_router-0.1.0/.gitignore

@@ -1,11 +0,0 @@
-__pycache__/
-*.pyc
-*.pyo
-*.egg-info/
-dist/
-build/
-.venv/
-.env
-.pytest_cache/
-config.yaml
-logs/

python_library_lan_router-0.1.0/lan_router/tplink.py

@@ -1,33 +0,0 @@
-from .base import BaseRouter
-from .device import Device
-from tplinkrouterc6u import TPLinkXDRClient
-
-class TPLinkRouter(BaseRouter):
-    _router: TPLinkXDRClient = None
-
-    def model_post_init(self,ctx):
-        self._router = TPLinkXDRClient(self.hostname, self.username, self.password)
-
-    def login(self):
-        self._router.authorize()
-
-    def logout(self):
-        self._router.logout()
-
-    def scan(self) -> list[Device]:
-        devices = []
-        status = self._router.get_status()
-
-        for data in status.devices:
-            type = getattr(data.type, "value", str(data.type))
-            name = data.hostname or ""
-            ip =  self._show(data.ipaddr)
-            mac = self._show(data.macaddr)
-            device = Device(name=name, ip=ip, mac=mac, type=type)
-            devices.append(device)
-
-        return devices
-
-    def _show(self, v: str | None) -> str:
-        """显示空值"""
-        return "-" if v is None or v == "" else v

python_library_lan_router-0.1.0/tests/test_lan_router.py

@@ -1,19 +0,0 @@
-import unittest
-
-from lan_router import Device, create_router
-
-
-class LanRouterTests(unittest.TestCase):
-    def test_create_router_rejects_unknown_vendor(self) -> None:
-        with self.assertRaises(ValueError) as ctx:
-            create_router("unknown")  # type: ignore[arg-type]
-        self.assertIn("不支持", str(ctx.exception))
-
-    def test_device_model(self) -> None:
-        d = Device(name="n", ip="192.168.0.1", mac="00:00:00:00:00:01", type="wifi")
-        self.assertEqual(d.name, "n")
-        self.assertEqual(d.ip, "192.168.0.1")
-
-
-if __name__ == "__main__":
-    unittest.main()