chat-console 0.2.0__py3-none-any.whl → 0.2.5__py3-none-any.whl

app/utils.py

@@ -86,14 +86,12 @@ async def generate_streaming_response(app: 'SimpleChatApp', messages: List[Dict]
     buffer = []
     last_update = time.time()
     update_interval = 0.1  # Update UI every 100ms
+    generation_task = None
     
     try:
+        # The cancellation is now handled by cancelling the asyncio Task in main.py
+        # which will raise CancelledError here, interrupting the loop.
         async for chunk in client.generate_stream(messages, model, style):
-            # Check if generation was cancelled by the app (e.g., via escape key)
-            if not app.is_generating:
-                logger.info("Generation cancelled by app flag.")
-                break # Exit the loop immediately
-
             if chunk:  # Only process non-empty chunks
                 buffer.append(chunk)
                 current_time = time.time()
@@ -102,34 +100,37 @@ async def generate_streaming_response(app: 'SimpleChatApp', messages: List[Dict]
                 if current_time - last_update >= update_interval or len(''.join(buffer)) > 100:
                     new_content = ''.join(buffer)
                     full_response += new_content
-                    # Check again before calling callback, in case it was cancelled during chunk processing
-                    if not app.is_generating:
-                        logger.info("Generation cancelled before UI update.")
-                        break
+                    # No need to check app.is_generating here, rely on CancelledError
                     await callback(full_response)
                     buffer = []
                     last_update = current_time
                     
                     # Small delay to let UI catch up
                     await asyncio.sleep(0.05)
-        
-        # Send any remaining content if generation wasn't cancelled
-        if buffer and app.is_generating:
+
+        # Send any remaining content if the loop finished normally
+        if buffer:
             new_content = ''.join(buffer)
             full_response += new_content
             await callback(full_response)
-        
-        if app.is_generating:
-            logger.info("Streaming response completed normally.")
-        else:
-             logger.info("Streaming response loop exited due to cancellation.")
-             
+
+        logger.info("Streaming response loop finished normally.") # Clarify log message
+        # Add log before returning
+        logger.info(f"generate_streaming_response returning normally. Full response length: {len(full_response)}")
         return full_response
+    except asyncio.CancelledError:
+        # This is expected when the user cancels via Escape
+        logger.info("Streaming response task cancelled.") # Clarify log message
+        # Add log before returning
+        logger.info(f"generate_streaming_response returning after cancellation. Partial response length: {len(full_response)}")
+        # Do not re-raise CancelledError, let the caller handle it
+        return full_response # Return whatever was collected so far (might be partial)
     except Exception as e:
-        logger.error(f"Error in streaming response: {str(e)}")
-        # Ensure the app knows generation stopped on error
-        app.is_generating = False
-        raise
+        logger.error(f"Error during streaming response: {str(e)}") # Clarify log message
+        # Ensure the app knows generation stopped on error ONLY if it wasn't cancelled
+        if not isinstance(e, asyncio.CancelledError):
+             app.is_generating = False # Reset flag on other errors
+        raise # Re-raise other exceptions
 
 def ensure_ollama_running() -> bool:
     """

{chat_console-0.2.0.dist-info → chat_console-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chat-console
-Version: 0.2.0
+Version: 0.2.5
 Summary: A command-line interface for chatting with LLMs, storing chats and (future) rag interactions
 Home-page: https://github.com/wazacraftrfid/chat-console
 Author: Johnathan Greenaway

{chat_console-0.2.0.dist-info → chat_console-0.2.5.dist-info}/RECORD

@@ -1,23 +1,24 @@
-app/__init__.py,sha256=OeqboIrx_Kjea0CY9Be8nLI-No1YWQfqbWIp-4lMOOI,131
+app/__init__.py,sha256=SL20Ng0SdkG6HpNwMI3wEAmSDMvlhYLaAuXs0iAlIL0,130
 app/config.py,sha256=sKNp6Za4ZfW-CZBOvEv0TncAS77AnKi86hTM51C4KQ4,5227
 app/database.py,sha256=nt8CVuDpy6zw8mOYqDcfUmNw611t7Ln7pz22M0b6-MI,9967
-app/main.py,sha256=PMx9DcD2MAVyqeYanqu6mqr43RG4oXA9jFIdBwoQFQY,48174
+app/main.py,sha256=uuh8z__950Rs-U0X5NmgRAupcSZFREyOazsDbK1eFYM,53365
 app/models.py,sha256=4-y9Lytay2exWPFi0FDlVeRL3K2-I7E-jBqNzTfokqY,2644
-app/utils.py,sha256=AgmLrmyikt1Y7KturNmZVK2eC6de-RfRadVbp3HmUAg,8434
+app/utils.py,sha256=6XSIJBcJPOXPIHnvKvRwnttdRnN9BSlodcKVj57RLeM,8861
 app/api/__init__.py,sha256=A8UL84ldYlv8l7O-yKzraVFcfww86SgWfpl4p7R03-w,62
 app/api/anthropic.py,sha256=x5PmBXEKe_ow2NWk8XdqSPR0hLOdCc_ypY5QAySeA78,4234
 app/api/base.py,sha256=-6RSxSpqe-OMwkaq1wVWbu3pVkte-ZYy8rmdvt-Qh48,3953
-app/api/ollama.py,sha256=zFZ3g2sYncvMgcvx92jTCLkigIaDvTuhILcLiCrwisc,11640
+app/api/ollama.py,sha256=NgfETreb7EdFIux9fvkDfIBj77wcJvic77ObUV95TlI,49866
 app/api/openai.py,sha256=1fYgFXXL6yj_7lQ893Yj28RYG4M8d6gt_q1gzhhjcig,3641
 app/ui/__init__.py,sha256=RndfbQ1Tv47qdSiuQzvWP96lPS547SDaGE-BgOtiP_w,55
 app/ui/chat_interface.py,sha256=VwmVvltxS9l18DI9U7kL43t8kSPPNsrkkrrUSoGu16Q,13623
 app/ui/chat_list.py,sha256=WQTYVNSSXlx_gQal3YqILZZKL9UiTjmNMIDX2I9pAMM,11205
+app/ui/model_browser.py,sha256=5h3gVsuGIUrXjYVF-QclZFhYtX2kH14LvT22Ufm9etg,49453
 app/ui/model_selector.py,sha256=Aj1irAs9DQMn8wfcPsFZGxWmx0JTzHjSe7pVdDMwqTQ,13182
 app/ui/search.py,sha256=b-m14kG3ovqW1-i0qDQ8KnAqFJbi5b1FLM9dOnbTyIs,9763
 app/ui/styles.py,sha256=04AhPuLrOd2yenfRySFRestPeuTPeMLzhmMB67NdGvw,5615
-chat_console-0.2.0.dist-info/licenses/LICENSE,sha256=srHZ3fvcAuZY1LHxE7P6XWju2njRCHyK6h_ftEbzxSE,1057
-chat_console-0.2.0.dist-info/METADATA,sha256=DPnX1Q1e7iTfNyyQRhJezaUXuHtq1E9mqb7k7gDe0GI,2921
-chat_console-0.2.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-chat_console-0.2.0.dist-info/entry_points.txt,sha256=kkVdEc22U9PAi2AeruoKklfkng_a_aHAP6VRVwrAD7c,67
-chat_console-0.2.0.dist-info/top_level.txt,sha256=io9g7LCbfmTG1SFKgEOGXmCFB9uMP2H5lerm0HiHWQE,4
-chat_console-0.2.0.dist-info/RECORD,,
+chat_console-0.2.5.dist-info/licenses/LICENSE,sha256=srHZ3fvcAuZY1LHxE7P6XWju2njRCHyK6h_ftEbzxSE,1057
+chat_console-0.2.5.dist-info/METADATA,sha256=SShpyDtmGbwmbUj7wdTmdD4mN1xeIdimyMiiZAC0coQ,2921
+chat_console-0.2.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+chat_console-0.2.5.dist-info/entry_points.txt,sha256=kkVdEc22U9PAi2AeruoKklfkng_a_aHAP6VRVwrAD7c,67
+chat_console-0.2.5.dist-info/top_level.txt,sha256=io9g7LCbfmTG1SFKgEOGXmCFB9uMP2H5lerm0HiHWQE,4
+chat_console-0.2.5.dist-info/RECORD,,