aient 1.0.59__py3-none-any.whl → 1.0.60__py3-none-any.whl

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/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/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.dist-info → aient-1.0.60.dist-info}/METADATA

@@ -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.dist-info → aient-1.0.60.dist-info}/RECORD

@@ -4,15 +4,15 @@ aient/core/__init__.py,sha256=NxjebTlku35S4Dzr16rdSqSTWUvvwEeACe8KvHJnjPg,34
 aient/core/log_config.py,sha256=kz2_yJv1p-o3lUQOwA3qh-LSc3wMHv13iCQclw44W9c,274
 aient/core/models.py,sha256=_1wYZg_n9kb2A3C8xCboyqleH2iHc9scwOvtx9DPeok,7582
 aient/core/request.py,sha256=oavFyF5P0BL-85cse_lhyfP3UErFzeSdj6kTaSWzQrg,49690
-aient/core/response.py,sha256=xuGpA_0_W3iz-hL3oCoMR0tXSTUlwk_1M1s7nyNZ87I,27968
+aient/core/response.py,sha256=6Fq-EIL7ua1zeT6GMc1fgQeRs_MCP6UST_pL0tM3f3I,27879
 aient/core/utils.py,sha256=DFpFU8Y-8lzgQlhaDUnao8HmviGoh3-oN8jZR3Dha7E,26150
 aient/core/test/test_base_api.py,sha256=CjfFzMG26r8C4xCPoVkKb3Ac6pp9gy5NUCbZJHoSSsM,393
 aient/core/test/test_image.py,sha256=_T4peNGdXKBHHxyQNx12u-NTyFE8TlYI6NvvagsG2LE,319
 aient/core/test/test_payload.py,sha256=8jBiJY1uidm1jzL-EiK0s6UGmW9XkdsuuKFGrwFhFkw,2755
 aient/models/__init__.py,sha256=ouNDNvoBBpIFrLsk09Q_sq23HR0GbLAKfGLIFmfEuXE,219
 aient/models/audio.py,sha256=kRd-8-WXzv4vwvsTGwnstK-WR8--vr9CdfCZzu8y9LA,1934
-aient/models/base.py,sha256=PBfQTQI73OE2OuHvw-XN6vD-_y6k_vLjmT_8J4Gelvo,6813
-aient/models/chatgpt.py,sha256=TRvUpgBsQW0oJpxOpT0__fYooy2hbkMSYVdM7CqusnY,42296
+aient/models/base.py,sha256=vRCDEwabEm0u0RU4J62T2t271xg7YGCPjE3s9HzhtV8,6860
+aient/models/chatgpt.py,sha256=gOLBHWimbg2mbt9EjDXr5Za60Jt0ICqe-Hah95taupc,42217
 aient/models/claude.py,sha256=thK9P8qkaaoUN3OOJ9Shw4KDs-pAGKPoX4FOPGFXva8,28597
 aient/models/duckduckgo.py,sha256=1l7vYCs9SG5SWPCbcl7q6pCcB5AUF_r-a4l9frz3Ogo,8115
 aient/models/gemini.py,sha256=chGLc-8G_DAOxr10HPoOhvVFW1RvMgHd6mt--VyAW98,14730
@@ -35,8 +35,8 @@ aient/prompt/agent.py,sha256=h39WOoafv0_lh2coBCiG9k-VWa3Yi9HRZV0hnvsc4gs,23598
 aient/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 aient/utils/prompt.py,sha256=UcSzKkFE4-h_1b6NofI6xgk3GoleqALRKY8VBaXLjmI,11311
 aient/utils/scripts.py,sha256=n0jR5eXCBIK12W4bIx-xU1FVl1hZ4zDC7hq_BWQHYJU,27537
-aient-1.0.59.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
-aient-1.0.59.dist-info/METADATA,sha256=RV6ienIwh5Di8AZCGBEROc6-MMppQTfhJch7jkqYaDQ,4973
-aient-1.0.59.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-aient-1.0.59.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
-aient-1.0.59.dist-info/RECORD,,
+aient-1.0.60.dist-info/licenses/LICENSE,sha256=XNdbcWldt0yaNXXWB_Bakoqnxb3OVhUft4MgMA_71ds,1051
+aient-1.0.60.dist-info/METADATA,sha256=A78P4-U_ExGyY5oFvV_32VVdgv_ZtjWwMiBUezBHNQc,4973
+aient-1.0.60.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+aient-1.0.60.dist-info/top_level.txt,sha256=3oXzrP5sAVvyyqabpeq8A2_vfMtY554r4bVE-OHBrZk,6
+aient-1.0.60.dist-info/RECORD,,