tapo-py: Surface Rust logs in Python

CHANGELOG.md

@@ -25,6 +25,7 @@ file. This change log follows the conventions of
 ### Added
 
 - Added support for the P300 and P304 power strips.
+- Python logs can now capture entries from the underlying Rust library.
 
 ### Changed
 

tapo-py/Cargo.toml

@@ -15,12 +15,14 @@ default = []
 [dependencies]
 anyhow = { workspace = true }
 chrono = { workspace = true, default-features = false }
+log = { version = "0.4", default-features = false }
 pyo3 = { workspace = true, features = [
     "chrono",
     "experimental-async",
     "extension-module",
     "py-clone",
 ] }
+pyo3-log = { version = "0.11" }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tokio = { workspace = true, default-features = false, features = [

tapo-py/src/lib.rs

@@ -3,6 +3,7 @@ mod errors;
 mod handlers;
 mod runtime;
 
+use log::LevelFilter;
 use pyo3::prelude::*;
 
 use api_client::PyApiClient;
@@ -13,6 +14,7 @@ use handlers::{
     PyT300Handler, PyT31XHandler, TriggerLogsS200BResult, TriggerLogsT100Result,
     TriggerLogsT110Result, TriggerLogsT300Result,
 };
+use pyo3_log::{Caching, Logger};
 use tapo::requests::Color;
 use tapo::responses::{
     AutoOffStatus, ColorLightState, CurrentPowerResult, DefaultBrightnessState,
@@ -30,6 +32,11 @@ use tapo::responses::{
 #[pymodule]
 #[pyo3(name = "tapo")]
 fn tapo_py(py: Python, module: &Bound<'_, PyModule>) -> PyResult<()> {
+    Logger::new(py, Caching::LoggersAndLevels)?
+        .filter(LevelFilter::Trace)
+        .install()
+        .expect("Failed to install the logger");
+
     let requests = PyModule::new_bound(py, "tapo.requests")?;
     let responses = PyModule::new_bound(py, "tapo.responses")?;
 

tapo/src/api/protocol/klap_protocol.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 
 use async_trait::async_trait;
-use log::{debug, warn};
+use log::{debug, trace, warn};
 use rand::rngs::StdRng;
 use rand::{RngCore, SeedableRng};
 use reqwest::header::COOKIE;
@@ -84,13 +84,13 @@ impl TapoProtocolExt for KlapProtocol {
         let response_body = response.bytes().await.map_err(anyhow::Error::from)?;
 
         let response_decrypted = cipher.decrypt(seq, response_body.to_vec())?;
-        debug!("Device responded with: {response_decrypted:?}");
+        trace!("Device responded with (raw): {response_decrypted}");
 
-        let inner_response: TapoResponse<R> = serde_json::from_str(&response_decrypted)?;
-        debug!("Device inner response: {inner_response:?}");
+        let response: TapoResponse<R> = serde_json::from_str(&response_decrypted)?;
+        debug!("Device responded with: {response:?}");
 
-        validate_response(&inner_response)?;
-        let result = inner_response.result;
+        validate_response(&response)?;
+        let result = response.result;
 
         Ok(result)
     }

tapo/src/api/protocol/passthrough_protocol.rs

@@ -2,7 +2,7 @@ use std::fmt;
 
 use async_trait::async_trait;
 use base64::{engine::general_purpose, Engine as _};
-use log::debug;
+use log::{debug, trace};
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 use reqwest::header::COOKIE;
@@ -112,7 +112,7 @@ impl TapoProtocolExt for PassthroughProtocol {
 
         let inner_response_decrypted = session.cipher.decrypt(&inner_response_encrypted)?;
 
-        debug!("Device inner response decrypted: {inner_response_decrypted}");
+        trace!("Device inner response (raw): {inner_response_decrypted}");
 
         let inner_response: TapoResponse<R> = serde_json::from_str(&inner_response_decrypted)?;