aider-ce 0.88.6.dev6__py3-none-any.whl → 0.88.7__py3-none-any.whl

aider/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.88.6.dev"
+__version__ = "0.88.7.dev"
 safe_version = __version__
 
 try:

aider/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.88.6.dev6'
-__version_tuple__ = version_tuple = (0, 88, 6, 'dev6')
+__version__ = version = '0.88.7'
+__version_tuple__ = version_tuple = (0, 88, 7)
 
 __commit_id__ = commit_id = None

aider/coders/base_coder.py

@@ -672,10 +672,6 @@ class Coder:
 
         return True
 
-    def _stop_waiting_spinner(self):
-        """Stop and clear the waiting spinner if it is running."""
-        self.io.stop_spinner()
-
     def get_abs_fnames_content(self):
         for fname in list(self.abs_fnames):
             content = self.io.read_text(fname)
@@ -1281,6 +1277,7 @@ class Coder:
         finally:
             self.run_one_completed = True
             self.compact_context_completed = True
+            self.io.stop_spinner()
 
     def copy_context(self):
         if self.auto_copy_context:
@@ -1994,7 +1991,7 @@ class Coder:
             self.mdstream = None
 
             # Ensure any waiting spinner is stopped
-            self._stop_waiting_spinner()
+            self.io.start_spinner("Processing Answer...")
 
             self.partial_response_content = self.get_multi_response_content_in_progress(True)
             self.remove_reasoning_content()
@@ -2064,7 +2061,13 @@ class Coder:
             try:
                 if self.partial_response_tool_calls:
                     tool_calls = []
+                    tool_id_set = set()
+
                     for tool_call_dict in self.partial_response_tool_calls:
+                        # LLM APIs sometimes return duplicates and that's annoying
+                        if tool_call_dict.get("id") in tool_id_set:
+                            continue
+
                         tool_calls.append(
                             ChatCompletionMessageToolCall(
                                 id=tool_call_dict.get("id"),

aider/io.py

@@ -424,6 +424,7 @@ class InputOutput:
         # Spinner state
         self.spinner_running = False
         self.spinner_text = ""
+        self.last_spinner_text = ""
         self.spinner_frame_index = 0
         self.spinner_last_frame_index = 0
         self.unicode_palette = "░█"
@@ -493,7 +494,7 @@ class InputOutput:
         except Exception:
             return False
 
-    def start_spinner(self, text):
+    def start_spinner(self, text, update_last_text=True):
         """Start the spinner."""
         self.stop_spinner()
 
@@ -501,6 +502,9 @@ class InputOutput:
             self.spinner_running = True
             self.spinner_text = text
             self.spinner_frame_index = self.spinner_last_frame_index
+
+            if update_last_text:
+                self.last_spinner_text = text
         else:
             self.fallback_spinner = Spinner(text)
             self.fallback_spinner.step()
@@ -1115,6 +1119,7 @@ class InputOutput:
             else:
                 # Ring the bell if needed
                 self.ring_bell()
+                self.start_spinner("Awaiting Confirmation...", False)
 
                 while True:
                     try:
@@ -1157,7 +1162,9 @@ class InputOutput:
                         break
                     res = res.lower()
                     good = any(valid_response.startswith(res) for valid_response in valid_responses)
+
                     if good:
+                        self.start_spinner(self.last_spinner_text)
                         break
 
                     error_message = f"Please answer with one of: {', '.join(valid_responses)}"

{aider_ce-0.88.6.dev6.dist-info → aider_ce-0.88.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-ce
-Version: 0.88.6.dev6
+Version: 0.88.7
 Summary: Aider is AI pair programming in your terminal
 Project-URL: Homepage, https://github.com/dwash96/aider-ce
 Classifier: Development Status :: 4 - Beta

{aider_ce-0.88.6.dev6.dist-info → aider_ce-0.88.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
-aider/__init__.py,sha256=ShiJeSj_EA3vHqLbL-zE-RnZh6EeHXx-4-2YtV1hEcw,496
+aider/__init__.py,sha256=vhzC9IDZtPgHCLGDhqDDPaQjUaowYV1Z78_SEz3anac,496
 aider/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
-aider/_version.py,sha256=qLEpNi3hbuA34zKfoh1P9yPnnrXnPbjrXa8tRXEYqj4,719
+aider/_version.py,sha256=0N2B5Xr0AgbKz9T9mh-W1ukO-XeFP5DpEjACmfGt-G0,706
 aider/analytics.py,sha256=c5ujaCcMc3yG-9rz_0oSsqBwmVQRxJnui6iE_yDyY_M,7507
 aider/args.py,sha256=r9xdhB44K4LF2ru-cbOdaoHYzvG6CyViwcw9QRewEKw,33145
 aider/args_formatter.py,sha256=CBRnzHyZk-fFCK0ekAzb6C4PPJOU-VTpWIIsJe3qUhk,6369
@@ -17,7 +17,7 @@ aider/gui.py,sha256=JnHvli1JTCGHAgsOZ8HkAWOKAFxmngbyviZIJeYvjsw,17573
 aider/help.py,sha256=wExA1E9vuJccKBH1VvKmH-zJqFi-vhNc0n3CD3Y-8fI,4432
 aider/help_pats.py,sha256=syn7pSVJdcf8uMKTxnZUZBQu-r8JMAi-rrC-k2er1Fk,376
 aider/history.py,sha256=083Gm7KxNo1PXMFHYiChigxCbRzmLkfNlesODdCC-eY,6067
-aider/io.py,sha256=Hj0AJqsFMTpMzlPS7_ONAJRr72RCIYhIIcL7nTsd_d4,56812
+aider/io.py,sha256=ggm63XfqNCszbhgBRLQ9sHh6KcIP-MUDwZOwAJDcDFY,57089
 aider/linter.py,sha256=t5jwWZ1dvIzRtig1kTSjzl6u1LRfw0e19qwNIen2jAg,7998
 aider/llm.py,sha256=dtT0mavXP1SyR0Zu_ysZXKdbs3y53q2PevvDKBUrs6s,1505
 aider/main.py,sha256=3IE18moiAP2nXs-NY_PJKk8PXS_pdzMvbefoNfT9CnQ,46520
@@ -46,7 +46,7 @@ aider/coders/architect_coder.py,sha256=O5KIf__Ka0bgtCUhYWUmAb08aCS6Nq-CdVWWa-VNK
 aider/coders/architect_prompts.py,sha256=R0_KxZjo-km_yNaeDAquDP9qfp3IdWgrdMirCWe0RIE,1658
 aider/coders/ask_coder.py,sha256=Omk4Ih8-prefkMZ_jnRS3faoW5CQUakHOvZ-s7piM3U,210
 aider/coders/ask_prompts.py,sha256=W6HwDUfzfOLt9q8sl6rw7fN7b5ND90FkxCZrtrWl5vY,1171
-aider/coders/base_coder.py,sha256=fNHPICmmXygdqyQxGrNs6467z0O_OifiiZETGsva_AI,132707
+aider/coders/base_coder.py,sha256=uZuJyDYmkOVnfiOLgMtRhKkIcrvdpD6JTtqXqBWIXKc,132853
 aider/coders/base_prompts.py,sha256=O3bBjhf0hgvtKbQ9QyOMnRy8LrmfLyT9dVAcXxHS_3k,3659
 aider/coders/chat_chunks.py,sha256=8HPet6cmQdgWvaA_tGpinO4ASMst53uTcSEtNVTYDXE,1981
 aider/coders/context_coder.py,sha256=_RSzu6ptHo2lkTN7-e9TpcZKzqbQF2eNX5MkyswGm3s,1577
@@ -264,9 +264,9 @@ aider/website/docs/usage/tutorials.md,sha256=ZKBztbUtucHOiv9h8gvWiWTP6MTSsFyz4mA
 aider/website/docs/usage/voice.md,sha256=BtX7pHRgHRWUmrNbS4JssC-SO8RrJ_OetBCtIYpO0pU,3452
 aider/website/docs/usage/watch.md,sha256=OVF14lGtv1vhSXRE8PpxQ3YW-uXSifarUbmLBjmLRyA,7940
 aider/website/share/index.md,sha256=P51aDw9AT8AVbsU7v6g1tWuMjly7y_plM_ZI1ScaT8Y,3172
-aider_ce-0.88.6.dev6.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-aider_ce-0.88.6.dev6.dist-info/METADATA,sha256=1njZp1Nm8iKoLgVL64UmyNTH2ln0xoVP7SkeM4h5St0,20927
-aider_ce-0.88.6.dev6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aider_ce-0.88.6.dev6.dist-info/entry_points.txt,sha256=qUBEUd84DYNEHFSgZbgsjgsrAABxqwOj-Dwut9pHZx0,45
-aider_ce-0.88.6.dev6.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
-aider_ce-0.88.6.dev6.dist-info/RECORD,,
+aider_ce-0.88.7.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+aider_ce-0.88.7.dist-info/METADATA,sha256=lparlcMnzTUX-cHvoAhXI9ZoAkPdgQC0vRnLcYNJnoM,20922
+aider_ce-0.88.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aider_ce-0.88.7.dist-info/entry_points.txt,sha256=qUBEUd84DYNEHFSgZbgsjgsrAABxqwOj-Dwut9pHZx0,45
+aider_ce-0.88.7.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
+aider_ce-0.88.7.dist-info/RECORD,,