chat-console 0.3.991__py3-none-any.whl → 0.3.995__py3-none-any.whl

app/__init__.py

@@ -3,4 +3,4 @@ Chat CLI
 A command-line interface for chatting with various LLM providers like ChatGPT and Claude.
 """
 
-__version__ = "0.3.991"
+__version__ = "0.3.995"

app/api/base.py

@@ -61,6 +61,26 @@ class BaseModelClient(ABC):
             logger.info(f"Found model in config with provider: {provider}")
         # For custom models, try to infer provider
         else:
+            # Check if this model was selected from a specific provider in the UI
+            # This would be stored in a temporary attribute on the app instance
+            try:
+                from ..main import SimpleChatApp
+                import inspect
+                frame = inspect.currentframe()
+                while frame:
+                    if 'self' in frame.f_locals and isinstance(frame.f_locals['self'], SimpleChatApp):
+                        app_instance = frame.f_locals['self']
+                        if hasattr(app_instance, 'selected_provider'):
+                            provider = app_instance.selected_provider
+                            logger.info(f"Using provider from UI selection: {provider}")
+                            return OllamaClient if provider == "ollama" else (
+                                   OpenAIClient if provider == "openai" else 
+                                   AnthropicClient if provider == "anthropic" else None)
+                    frame = frame.f_back
+            except Exception as e:
+                logger.error(f"Error checking for UI provider selection: {str(e)}")
+            
+            # If we couldn't get the provider from the UI, infer it from the model name
             # Check for common OpenAI model patterns or prefixes
             if (model_name_lower.startswith(("gpt-", "text-", "davinci")) or 
                 "gpt" in model_name_lower or 
@@ -122,34 +142,57 @@ class BaseModelClient(ABC):
                 raise Exception(f"Provider '{provider}' is not available. Please check your configuration.")
         # For custom models, try to infer provider
         else:
-            # Check for common OpenAI model patterns or prefixes
-            if (model_name_lower.startswith(("gpt-", "text-", "davinci")) or 
-                "gpt" in model_name_lower or 
-                model_name_lower in ["04-mini", "04", "04-turbo", "04-vision"]):
-                if not AVAILABLE_PROVIDERS["openai"]:
-                    raise Exception("OpenAI API key not found. Please set OPENAI_API_KEY environment variable.")
-                provider = "openai"
-                logger.info(f"Identified {model_name} as an OpenAI model")
-            # Then check for Anthropic models - these should ALWAYS use Anthropic client
-            elif any(name in model_name_lower for name in ["claude", "anthropic"]):
-                if not AVAILABLE_PROVIDERS["anthropic"]:
-                    raise Exception("Anthropic API key not found. Please set ANTHROPIC_API_KEY environment variable.")
-                provider = "anthropic"
-                logger.info(f"Identified as Anthropic model: {model_name}")
-            # Then try Ollama for known model names or if selected from Ollama UI
-            elif (any(name in model_name_lower for name in ["llama", "mistral", "codellama", "gemma"]) or
-                  model_name in [m["id"] for m in CONFIG.get("ollama_models", [])]):
-                if not AVAILABLE_PROVIDERS["ollama"]:
-                    raise Exception("Ollama server is not running. Please start Ollama and try again.")
-                provider = "ollama"
-                logger.info(f"Identified as Ollama model: {model_name}")
-            else:
-                # Default to Ollama for unknown models
-                if AVAILABLE_PROVIDERS["ollama"]:
+            # Check if this model was selected from a specific provider in the UI
+            provider = None
+            try:
+                from ..main import SimpleChatApp
+                import inspect
+                frame = inspect.currentframe()
+                while frame:
+                    if 'self' in frame.f_locals and isinstance(frame.f_locals['self'], SimpleChatApp):
+                        app_instance = frame.f_locals['self']
+                        if hasattr(app_instance, 'selected_provider'):
+                            provider = app_instance.selected_provider
+                            logger.info(f"Using provider from UI selection: {provider}")
+                            break
+                    frame = frame.f_back
+            except Exception as e:
+                logger.error(f"Error checking for UI provider selection: {str(e)}")
+            
+            # If we couldn't get the provider from the UI, infer it from the model name
+            if not provider:
+                # Check for common OpenAI model patterns or prefixes
+                if (model_name_lower.startswith(("gpt-", "text-", "davinci")) or 
+                    "gpt" in model_name_lower or 
+                    model_name_lower in ["04-mini", "04", "04-turbo", "04-vision"]):
+                    if not AVAILABLE_PROVIDERS["openai"]:
+                        raise Exception("OpenAI API key not found. Please set OPENAI_API_KEY environment variable.")
+                    provider = "openai"
+                    logger.info(f"Identified {model_name} as an OpenAI model")
+                # Then check for Anthropic models - these should ALWAYS use Anthropic client
+                elif any(name in model_name_lower for name in ["claude", "anthropic"]):
+                    if not AVAILABLE_PROVIDERS["anthropic"]:
+                        raise Exception("Anthropic API key not found. Please set ANTHROPIC_API_KEY environment variable.")
+                    provider = "anthropic"
+                    logger.info(f"Identified as Anthropic model: {model_name}")
+                # Then try Ollama for known model names or if selected from Ollama UI
+                elif (any(name in model_name_lower for name in ["llama", "mistral", "codellama", "gemma"]) or
+                      model_name in [m["id"] for m in CONFIG.get("ollama_models", [])]):
+                    if not AVAILABLE_PROVIDERS["ollama"]:
+                        raise Exception("Ollama server is not running. Please start Ollama and try again.")
                     provider = "ollama"
-                    logger.info(f"Unknown model type, defaulting to Ollama: {model_name}")
+                    logger.info(f"Identified as Ollama model: {model_name}")
                 else:
-                    raise Exception(f"Unknown model: {model_name}")
+                    # Default to Ollama for unknown models
+                    if AVAILABLE_PROVIDERS["ollama"]:
+                        provider = "ollama"
+                        logger.info(f"Unknown model type, defaulting to Ollama: {model_name}")
+                    else:
+                        raise Exception(f"Unknown model: {model_name}")
+            
+            # Verify the selected provider is available
+            if provider and not AVAILABLE_PROVIDERS.get(provider, False):
+                raise Exception(f"Provider '{provider}' is not available. Please check your configuration.")
         
         # Return appropriate client
         if provider == "ollama":

app/api/openai.py

@@ -53,12 +53,18 @@ class OpenAIClient(BaseModelClient):
         """Generate a text completion using OpenAI"""
         processed_messages = self._prepare_messages(messages, style)
         
-        response = await self.client.chat.completions.create(
-            model=model,
-            messages=processed_messages,
-            temperature=temperature,
-            max_tokens=max_tokens,
-        )
+        # Create parameters dict, omitting max_tokens if it's None
+        params = {
+            "model": model,
+            "messages": processed_messages,
+            "temperature": temperature,
+        }
+        
+        # Only add max_tokens if it's not None
+        if max_tokens is not None:
+            params["max_tokens"] = max_tokens
+        
+        response = await self.client.chat.completions.create(**params)
         
         return response.choices[0].message.content
     
@@ -113,13 +119,20 @@ class OpenAIClient(BaseModelClient):
             
             while retry_count <= max_retries:
                 try:
-                    stream = await self.client.chat.completions.create(
-                        model=model,
-                        messages=api_messages,
-                        temperature=temperature,
-                        max_tokens=max_tokens,
-                        stream=True,
-                    )
+                    # Create parameters dict, omitting max_tokens if it's None
+                    params = {
+                        "model": model,
+                        "messages": api_messages,
+                        "temperature": temperature,
+                        "stream": True,
+                    }
+                    
+                    # Only add max_tokens if it's not None
+                    if max_tokens is not None:
+                        params["max_tokens"] = max_tokens
+                    
+                    debug_log(f"OpenAI: creating stream with params: {params}")
+                    stream = await self.client.chat.completions.create(**params)
                     
                     # Store the stream for potential cancellation
                     self._active_stream = stream

app/main.py

@@ -1215,9 +1215,16 @@ class SimpleChatApp(App): # Keep SimpleChatApp class definition
             debug_log(f"State change event from unrelated worker: {event.worker.name}")
 
 
-    def on_model_selector_model_selected(self, event: ModelSelector.ModelSelected) -> None: # Keep SimpleChatApp on_model_selector_model_selected
-        """Handle model selection""" # Keep SimpleChatApp on_model_selector_model_selected docstring
-        self.selected_model = event.model_id # Keep SimpleChatApp on_model_selector_model_selected
+    def on_model_selector_model_selected(self, event: ModelSelector.ModelSelected) -> None:
+        """Handle model selection"""
+        self.selected_model = event.model_id
+        
+        # Store the selected provider for use in client resolution
+        model_selector = self.query_one(ModelSelector)
+        if model_selector:
+            self.selected_provider = model_selector.selected_provider
+            log(f"Stored selected provider: {self.selected_provider} for model: {self.selected_model}")
+        
         self.update_app_info()  # Update the displayed model info
 
     def on_style_selector_style_selected(self, event: StyleSelector.StyleSelected) -> None: # Keep SimpleChatApp on_style_selector_style_selected

app/ui/model_selector.py

@@ -251,6 +251,11 @@ class ModelSelector(Container):
             # IMPORTANT: Clear any cached client
             if hasattr(self.app, 'cached_client'):
                 self.app.cached_client = None
+            
+            # Store the selected provider in the app instance for client resolution
+            if hasattr(self.app, 'selected_provider'):
+                self.app.selected_provider = self.selected_provider
+                logger.info(f"Updated app.selected_provider to: {self.selected_provider}")
                 
             # Update model options
             model_select = self.query_one("#model-select", Select)

app/utils.py

@@ -774,6 +774,13 @@ def resolve_model_id(model_id_or_name: str) -> str:
         "o4-vision": "04-vision"
     }
     
+    # Check for more complex typo patterns with dates
+    if input_lower.startswith("o1-") and "-202" in input_lower:
+        corrected = "01" + input_lower[2:]
+        logger.info(f"Converting '{input_lower}' to '{corrected}' (letter 'o' to zero '0')")
+        input_lower = corrected
+        model_id_or_name = corrected
+    
     if input_lower in typo_corrections:
         corrected = typo_corrections[input_lower]
         logger.info(f"Converting '{input_lower}' to '{corrected}' (letter 'o' to zero '0')")

{chat_console-0.3.991.dist-info → chat_console-0.3.995.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chat-console
-Version: 0.3.991
+Version: 0.3.995
 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.3.991.dist-info → chat_console-0.3.995.dist-info}/RECORD

@@ -1,24 +1,24 @@
-app/__init__.py,sha256=ZWMbaTFHYgXqy4qglFzcSE1yk3aIh1w759fHYF8d-K4,132
+app/__init__.py,sha256=7Y7rb5EnGtgcyFHL5Z-6rT9sxtKiZfSrs4YsouTOYNw,132
 app/config.py,sha256=xeRGXcKbNvAdQGkaJJBipM4yHZJTM1y4ZFoW764APOU,7661
 app/database.py,sha256=nt8CVuDpy6zw8mOYqDcfUmNw611t7Ln7pz22M0b6-MI,9967
-app/main.py,sha256=dqQ2kxJL_94jcQFCT6tF5PLIH336tBTVUGkZhK4V8i4,77258
+app/main.py,sha256=WOcMP6yRwoEzftTSHf0e3zVK1aEuBgKMAsNbzHyKgiA,77427
 app/models.py,sha256=4-y9Lytay2exWPFi0FDlVeRL3K2-I7E-jBqNzTfokqY,2644
-app/utils.py,sha256=dDT7iiH-BXPiFhJCK095X05ofb65z97p-YXH-OuOK3k,38830
+app/utils.py,sha256=AfB6USZdSwkUj75TQzGt_WPAUt1K8wlghON4vRVHUbE,39158
 app/api/__init__.py,sha256=A8UL84ldYlv8l7O-yKzraVFcfww86SgWfpl4p7R03-w,62
 app/api/anthropic.py,sha256=uInwNvGLJ_iPUs4BjdwaqXTU6NfmK1SzX7498Pt44fI,10667
-app/api/base.py,sha256=zvlHHfIcaObefkJ3w4er9ZSX7YGZ_MM0H-wrzD8CGAM,7629
+app/api/base.py,sha256=ELHl7K0jn0OuOfub7lVboigIbym0sv1se_-bCLscPJ8,10232
 app/api/ollama.py,sha256=eFG24nI2MlF57z9EHiA97v02NgFJ0kxaPUX26xAXFsg,66154
-app/api/openai.py,sha256=hLPr955tUx_2vwRuLP8Zrl3vu7kQZgUETi4cJuaYnFE,10810
+app/api/openai.py,sha256=vWk8kmA5VWbYcGpXbNp1fk9ZzvxMn6g8nLHHA3CO0vY,11395
 app/ui/__init__.py,sha256=RndfbQ1Tv47qdSiuQzvWP96lPS547SDaGE-BgOtiP_w,55
 app/ui/chat_interface.py,sha256=oSDZi0Jgj_L8WnBh1RuJpIeIcN-RQ38CNejwsXiWTVg,18267
 app/ui/chat_list.py,sha256=WQTYVNSSXlx_gQal3YqILZZKL9UiTjmNMIDX2I9pAMM,11205
 app/ui/model_browser.py,sha256=pdblLVkdyVF0_Bo02bqbErGAtieyH-y6IfhMOPEqIso,71124
-app/ui/model_selector.py,sha256=9fIPpAiqb568idt9pdROAYaxpoqY9czMF-bGdOl4nYk,18861
+app/ui/model_selector.py,sha256=2G0TOXfcNodrXZOhLeaJJ2iG3Nck4c_NN1AvUAmaF3M,19172
 app/ui/search.py,sha256=b-m14kG3ovqW1-i0qDQ8KnAqFJbi5b1FLM9dOnbTyIs,9763
 app/ui/styles.py,sha256=04AhPuLrOd2yenfRySFRestPeuTPeMLzhmMB67NdGvw,5615
-chat_console-0.3.991.dist-info/licenses/LICENSE,sha256=srHZ3fvcAuZY1LHxE7P6XWju2njRCHyK6h_ftEbzxSE,1057
-chat_console-0.3.991.dist-info/METADATA,sha256=LrgZQlvm_Pslv_T4RhVul8rPCfHvL0riJw5p4AsZ-iM,2923
-chat_console-0.3.991.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-chat_console-0.3.991.dist-info/entry_points.txt,sha256=kkVdEc22U9PAi2AeruoKklfkng_a_aHAP6VRVwrAD7c,67
-chat_console-0.3.991.dist-info/top_level.txt,sha256=io9g7LCbfmTG1SFKgEOGXmCFB9uMP2H5lerm0HiHWQE,4
-chat_console-0.3.991.dist-info/RECORD,,
+chat_console-0.3.995.dist-info/licenses/LICENSE,sha256=srHZ3fvcAuZY1LHxE7P6XWju2njRCHyK6h_ftEbzxSE,1057
+chat_console-0.3.995.dist-info/METADATA,sha256=bJfytsa2etmHsB_yjV-SrlBTRXX6X7Omf85_c1miTR4,2923
+chat_console-0.3.995.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+chat_console-0.3.995.dist-info/entry_points.txt,sha256=kkVdEc22U9PAi2AeruoKklfkng_a_aHAP6VRVwrAD7c,67
+chat_console-0.3.995.dist-info/top_level.txt,sha256=io9g7LCbfmTG1SFKgEOGXmCFB9uMP2H5lerm0HiHWQE,4
+chat_console-0.3.995.dist-info/RECORD,,