From e8f45c4072a6987975bed97375f66161e3273c43 Mon Sep 17 00:00:00 2001
From: geekan <geekan@foxmail.com>
Date: Tue, 19 Dec 2023 13:40:54 +0800
Subject: [PATCH] delete utils.py, move function to common.py

---
 metagpt/actions/action.py |  3 +--
 metagpt/utils/common.py   | 18 ++++++++++++++++++
 metagpt/utils/utils.py    | 22 ----------------------
 3 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100644 metagpt/utils/utils.py

diff --git a/metagpt/actions/action.py b/metagpt/actions/action.py
index 1534b1f4d..7bb26ea91 100644
--- a/metagpt/actions/action.py
+++ b/metagpt/actions/action.py
@@ -15,8 +15,7 @@ from metagpt.actions.action_output import ActionOutput
 from metagpt.llm import LLM
 from metagpt.logs import logger
 from metagpt.provider.postprecess.llm_output_postprecess import llm_output_postprecess
-from metagpt.utils.common import OutputParser
-from metagpt.utils.utils import general_after_log
+from metagpt.utils.common import OutputParser, general_after_log
 
 
 class Action(ABC):
diff --git a/metagpt/utils/common.py b/metagpt/utils/common.py
index a9bdd6e2d..e9061d548 100644
--- a/metagpt/utils/common.py
+++ b/metagpt/utils/common.py
@@ -17,8 +17,11 @@ import inspect
 import os
 import platform
 import re
+import typing
 from typing import List, Tuple, Union
 
+from tenacity import _utils
+
 from metagpt.const import MESSAGE_ROUTE_TO_ALL
 from metagpt.logs import logger
 
@@ -363,3 +366,18 @@ def is_subscribed(message, tags):
         if t in message.send_to:
             return True
     return False
+
+
+def general_after_log(logger: "loguru.Logger", sec_format: str = "%0.3f") -> typing.Callable[["RetryCallState"], None]:
+    def log_it(retry_state: "RetryCallState") -> None:
+        if retry_state.fn is None:
+            fn_name = "<unknown>"
+        else:
+            fn_name = _utils.get_callback_name(retry_state.fn)
+        logger.error(
+            f"Finished call to '{fn_name}' after {sec_format % retry_state.seconds_since_start}(s), "
+            f"this was the {_utils.to_ordinal(retry_state.attempt_number)} time calling it. "
+            f"exp: {retry_state.outcome.exception()}"
+        )
+
+    return log_it
diff --git a/metagpt/utils/utils.py b/metagpt/utils/utils.py
deleted file mode 100644
index 5ceed65d9..000000000
--- a/metagpt/utils/utils.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Desc   :
-
-import typing
-
-from tenacity import _utils
-
-
-def general_after_log(logger: "loguru.Logger", sec_format: str = "%0.3f") -> typing.Callable[["RetryCallState"], None]:
-    def log_it(retry_state: "RetryCallState") -> None:
-        if retry_state.fn is None:
-            fn_name = "<unknown>"
-        else:
-            fn_name = _utils.get_callback_name(retry_state.fn)
-        logger.error(
-            f"Finished call to '{fn_name}' after {sec_format % retry_state.seconds_since_start}(s), "
-            f"this was the {_utils.to_ordinal(retry_state.attempt_number)} time calling it. "
-            f"exp: {retry_state.outcome.exception()}"
-        )
-
-    return log_it