update:优化ha工具获取密钥的方式

main/xiaozhi-server/plugins_func/functions/hass_get_state.py

@@ -17,57 +17,78 @@ hass_get_state_function_desc = {
             "properties": {
                 "entity_id": {
                     "type": "string",
-                    "description": "需要操作的设备id,homeassistant里的entity_id"
+                    "description": "需要操作的设备id,homeassistant里的entity_id",
                 }
             },
-            "required": ["entity_id"]
-        }
-    }
+            "required": ["entity_id"],
+        },
+    },
 }
 
 
 @register_function("hass_get_state", hass_get_state_function_desc, ToolType.SYSTEM_CTL)
-def hass_get_state(conn, entity_id=''):
+def hass_get_state(conn, entity_id=""):
     try:
 
         future = asyncio.run_coroutine_threadsafe(
-            handle_hass_get_state(conn, entity_id),
-            conn.loop
+            handle_hass_get_state(conn, entity_id), conn.loop
         )
         ha_response = future.result()
-        return ActionResponse( Action.REQLLM, ha_response , None )
+        return ActionResponse(Action.REQLLM, ha_response, None)
     except Exception as e:
         logger.bind(tag=TAG).error(f"处理设置属性意图错误: {e}")
 
 
 async def handle_hass_get_state(conn, entity_id):
-    HASS_CACHE = initialize_hass_handler(conn)
-    api_key = HASS_CACHE['api_key']
-    base_url = HASS_CACHE['base_url']
+    ha_config = initialize_hass_handler(conn)
+    api_key = ha_config.get("api_key")
+    base_url = ha_config.get("base_url")
     url = f"{base_url}/api/states/{entity_id}"
-    headers = {
-        "Authorization": f"Bearer {api_key}",
-        "Content-Type": "application/json"
-    }
+    headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
     response = requests.get(url, headers=headers)
     if response.status_code == 200:
-        responsetext = '设备状态:' + response.json()['state'] + ' '
+        responsetext = "设备状态:" + response.json()["state"] + " "
         logger.bind(tag=TAG).info(f"api返回内容: {response.json()}")
 
-        if 'media_title' in response.json()['attributes']:
-            responsetext = responsetext+ '正在播放的是:'+str(response.json()['attributes']['media_title'])+' '
-        if 'volume_level' in response.json()['attributes']:
-            responsetext = responsetext+ '音量是:'+str(response.json()['attributes']['volume_level'])+' '
-        if 'color_temp_kelvin' in response.json()['attributes']:
-            responsetext = responsetext+ '色温是:'+str(response.json()['attributes']['color_temp_kelvin'])+' '
-        if 'rgb_color' in response.json()['attributes']:
-            responsetext = responsetext+ 'rgb颜色是:'+str(response.json()['attributes']['rgb_color'])+' '
-        if 'brightness' in response.json()['attributes']:
-            responsetext = responsetext+ '亮度是:'+str(response.json()['attributes']['brightness'])+' '
+        if "media_title" in response.json()["attributes"]:
+            responsetext = (
+                responsetext
+                + "正在播放的是:"
+                + str(response.json()["attributes"]["media_title"])
+                + " "
+            )
+        if "volume_level" in response.json()["attributes"]:
+            responsetext = (
+                responsetext
+                + "音量是:"
+                + str(response.json()["attributes"]["volume_level"])
+                + " "
+            )
+        if "color_temp_kelvin" in response.json()["attributes"]:
+            responsetext = (
+                responsetext
+                + "色温是:"
+                + str(response.json()["attributes"]["color_temp_kelvin"])
+                + " "
+            )
+        if "rgb_color" in response.json()["attributes"]:
+            responsetext = (
+                responsetext
+                + "rgb颜色是:"
+                + str(response.json()["attributes"]["rgb_color"])
+                + " "
+            )
+        if "brightness" in response.json()["attributes"]:
+            responsetext = (
+                responsetext
+                + "亮度是:"
+                + str(response.json()["attributes"]["brightness"])
+                + " "
+            )
         logger.bind(tag=TAG).info(f"查询返回内容: {responsetext}")
         return responsetext
-        #return response.json()['attributes']
-        #response.attributes
+        # return response.json()['attributes']
+        # response.attributes
 
     else:
         return f"切换失败，错误码: {response.status_code}"