aient 1.0.59__tar.gz → 1.0.60__tar.gz

{aient-1.0.59/src/aient.egg-info → aient-1.0.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.0.59
+Version: 1.0.60
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE

{aient-1.0.59 → aient-1.0.60}/setup.py

@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="aient",
-    version="1.0.59",
+    version="1.0.60",
     description="Aient: The Awakening of Agent.",
     long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
     long_description_content_type="text/markdown",

{aient-1.0.59 → aient-1.0.60}/src/aient/core/response.py

@@ -191,7 +191,7 @@ async def fetch_gpt_response_stream(client, url, headers, payload):
             while "\n" in buffer:
                 line, buffer = buffer.split("\n", 1)
                 # logger.info("line: %s", repr(line))
-                if line and line != "data: " and line != "data:" and not line.startswith(": ") and (result:=line.lstrip("data: ").strip()):
+                if line and not line.startswith(": ") and (result:=line.lstrip("data: ").strip()):
                     if result.strip() == "[DONE]":
                         break
                     line = json.loads(result)
@@ -298,8 +298,7 @@ async def fetch_azure_response_stream(client, url, headers, payload):
             while "\n" in buffer:
                 line, buffer = buffer.split("\n", 1)
                 # logger.info("line: %s", repr(line))
-                if line and line != "data: " and line != "data:" and not line.startswith(": "):
-                    result = line.lstrip("data: ")
+                if line and not line.startswith(": ") and (result:=line.lstrip("data: ").strip()):
                     if result.strip() == "[DONE]":
                         break
                     line = json.loads(result)

{aient-1.0.59 → aient-1.0.60}/src/aient/models/base.py

@@ -82,6 +82,7 @@ class BaseLLM:
             ],
         }
         self.tokens_usage = defaultdict(int)
+        self.current_tokens = defaultdict(int)
         self.function_calls_counter = {}
         self.function_call_max_loop = 10
         self.use_plugins = use_plugins

{aient-1.0.59 → aient-1.0.60}/src/aient/models/chatgpt.py

@@ -207,6 +207,7 @@ class chatgpt(BaseLLM):
                     history_len = history_len - 1
 
         if total_tokens:
+            self.current_tokens[convo_id] = total_tokens
             self.tokens_usage[convo_id] += total_tokens
 
     def truncate_conversation(self, convo_id: str = "default") -> None:
@@ -215,25 +216,17 @@ class chatgpt(BaseLLM):
         """
         while True:
             if (
-                self.tokens_usage[convo_id] > self.truncate_limit
+                self.current_tokens[convo_id] > self.truncate_limit
                 and len(self.conversation[convo_id]) > 1
             ):
                 # Don't remove the first message
                 mess = self.conversation[convo_id].pop(1)
+                string_mess = json.dumps(mess, ensure_ascii=False)
+                self.current_tokens[convo_id] -= len(string_mess) / 4
                 print("Truncate message:", mess)
             else:
                 break
 
-    def extract_values(self, obj):
-        if isinstance(obj, dict):
-            for value in obj.values():
-                yield from self.extract_values(value)
-        elif isinstance(obj, list):
-            for item in obj:
-                yield from self.extract_values(item)
-        else:
-            yield obj
-
     async def get_post_body(
         self,
         prompt: str,
@@ -789,6 +782,7 @@ class chatgpt(BaseLLM):
             {"role": "system", "content": self.system_prompt},
         ]
         self.tokens_usage[convo_id] = 0
+        self.current_tokens[convo_id] = 0
 
     def save(self, file: str, *keys: str) -> None:
         """

{aient-1.0.59 → aient-1.0.60/src/aient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aient
-Version: 1.0.59
+Version: 1.0.60
 Summary: Aient: The Awakening of Agent.
 Description-Content-Type: text/markdown
 License-File: LICENSE