include - exclude

autogen/agentchat/utils.py

@@ -1,5 +1,5 @@
 import re
-from typing import Any, Callable, Dict, List, Tuple, Union
+from typing import Any, Callable, Dict, List, Union
 
 from .agent import Agent
 
@@ -87,8 +87,8 @@ def aggregate_summary(usage_summary: Dict[str, Any], agent_summary: Dict[str, An
 
     for agent in agents:
         if getattr(agent, "client", None):
-            aggregate_summary(usage_excluding_cached_inference, agent.client.total_usage_summary)
-            aggregate_summary(usage_including_cached_inference, agent.client.actual_usage_summary)
+            aggregate_summary(usage_including_cached_inference, agent.client.total_usage_summary)
+            aggregate_summary(usage_excluding_cached_inference, agent.client.actual_usage_summary)
 
     return {
         "usage_including_cached_inference": usage_including_cached_inference,

test/agentchat/test_agent_usage.py

@@ -1,21 +1,18 @@
 #!/usr/bin/env python3 -m pytest
 
 import io
+import os
+import sys
 from contextlib import redirect_stdout
 
 import pytest
-from conftest import skip_openai
 from test_assistant_agent import KEY_LOC, OAI_CONFIG_LIST
 
 import autogen
 from autogen import AssistantAgent, UserProxyAgent, gather_usage_summary
 
-try:
-    import openai
-except ImportError:
-    skip = True
-else:
-    skip = False or skip_openai
+sys.path.append(os.path.join(os.path.dirname(__file__), ".."))
+from conftest import skip_openai as skip  # noqa: E402
 
 
 @pytest.mark.skipif(skip, reason="openai not installed OR requested to skip")