webscout 8.2.8__py3-none-any.whl → 8.2.9__py3-none-any.whl

webscout/Provider/OPENAI/freeaichat.py

@@ -8,7 +8,7 @@ from typing import List, Dict, Optional, Union, Generator, Any
 from .base import OpenAICompatibleProvider, BaseChat, BaseCompletions
 from .utils import (
     ChatCompletionChunk, ChatCompletion, Choice, ChoiceDelta,
-    ChatCompletionMessage, CompletionUsage
+    ChatCompletionMessage, CompletionUsage, count_tokens
 )
 
 # Attempt to import LitAgent, fallback if not available
@@ -84,7 +84,7 @@ class Completions(BaseCompletions):
 
             # Estimate prompt tokens based on message length
             for msg in payload.get("messages", []):
-                prompt_tokens += len(msg.get("content", "").split())
+                prompt_tokens += count_tokens(msg.get("content", ""))
 
             for line in response.iter_lines():
                 if not line:

webscout/Provider/OPENAI/glider.py

@@ -143,8 +143,11 @@ class Completions(BaseCompletions):
                                 system_fingerprint=data.get('system_fingerprint')
                             )
 
-                            # Convert to dict for proper formatting
-                            chunk_dict = chunk.to_dict()
+                            # Convert chunk to dict using Pydantic's API
+                            if hasattr(chunk, "model_dump"):
+                                chunk_dict = chunk.model_dump(exclude_none=True)
+                            else:
+                                chunk_dict = chunk.dict(exclude_none=True)
 
                             # Add usage information to match OpenAI format
                             # Even if we don't have real token counts, include estimated usage

webscout/Provider/OPENAI/groq.py

@@ -137,8 +137,11 @@ class Completions(BaseCompletions):
                                 system_fingerprint=data.get('system_fingerprint')
                             )
 
-                            # Convert to dict for proper formatting
-                            chunk_dict = chunk.to_dict()
+                            # Convert chunk to dict using Pydantic's API
+                            if hasattr(chunk, "model_dump"):
+                                chunk_dict = chunk.model_dump(exclude_none=True)
+                            else:
+                                chunk_dict = chunk.dict(exclude_none=True)
 
                             # Add usage information to match OpenAI format
                             usage_dict = {