webscout 8.2.3__py3-none-any.whl → 8.2.5__py3-none-any.whl

webscout/Provider/llmchat.py

@@ -1,4 +1,5 @@
-import requests
+from curl_cffi.requests import Session
+from curl_cffi import CurlError
 import json
 from typing import Union, Any, Dict, Optional, Generator, List
 
@@ -44,7 +45,8 @@ class LLMChat(Provider):
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
-        self.session = requests.Session()
+        # Initialize curl_cffi Session
+        self.session = Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
         self.api_endpoint = "https://llmchat.in/inference/stream"
@@ -56,7 +58,6 @@ class LLMChat(Provider):
         self.headers = {
             "Content-Type": "application/json",
             "Accept": "*/*",
-            "User-Agent": Lit().random(),
             "Origin": "https://llmchat.in",
             "Referer": "https://llmchat.in/"
         }
@@ -79,7 +80,10 @@ class LLMChat(Provider):
             is_conversation, self.max_tokens_to_sample, filepath, update_file
         )
         self.conversation.history_offset = history_offset
-        self.session.proxies = proxies
+
+        # Update curl_cffi session headers and proxies
+        self.session.headers.update(self.headers)
+        self.session.proxies = proxies # Assign proxies directly
 
     def ask(
         self,
@@ -88,7 +92,7 @@ class LLMChat(Provider):
         raw: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
-    ) -> Dict[str, Any]:
+    ) -> Union[Dict[str, Any], Generator[Any, None, None]]: # Corrected return type hint
         """Chat with LLMChat with logging capabilities"""
 
         conversation_prompt = self.conversation.gen_complete_prompt(prompt)
@@ -109,46 +113,79 @@ class LLMChat(Provider):
                 {"role": "user", "content": conversation_prompt}
             ],
             "max_tokens": self.max_tokens_to_sample,
-            "stream": stream
+            "stream": True # API seems to always stream based on endpoint name
         }
 
         def for_stream():
+            full_response = "" # Initialize outside try block
             try:
+                # Use curl_cffi session post with impersonate
+                response = self.session.post(
+                    url, 
+                    json=payload, 
+                    stream=True, 
+                    timeout=self.timeout,
+                    impersonate="chrome110" # Use a common impersonation profile
+                )
+                response.raise_for_status() # Check for HTTP errors
 
-                with requests.post(url, json=payload, headers=self.headers, stream=True, timeout=self.timeout) as response:
-                    response.raise_for_status()
-
-                    full_response = ""
-                    for line in response.iter_lines():
-                        if line:
-                            line = line.decode('utf-8')
+                # Iterate over bytes and decode manually
+                for line_bytes in response.iter_lines():
+                    if line_bytes:
+                        try:
+                            line = line_bytes.decode('utf-8')
                             if line.startswith('data: '):
+                                data_str = line[6:]
+                                if data_str == '[DONE]':
+                                    break
                                 try:
-                                    data = json.loads(line[6:])
+                                    data = json.loads(data_str)
                                     if data.get('response'):
                                         response_text = data['response']
                                         full_response += response_text
-                                        yield response_text if raw else dict(text=response_text)
+                                        resp = dict(text=response_text)
+                                        # Yield dict or raw string chunk
+                                        yield resp if not raw else response_text
                                 except json.JSONDecodeError:
-                                    if line.strip() != 'data: [DONE]':
-                                        continue
-
-                    self.last_response.update(dict(text=full_response))
-                    self.conversation.update_chat_history(
-                        prompt, self.get_message(self.last_response)
-                    )
+                                    continue # Ignore invalid JSON data
+                        except UnicodeDecodeError:
+                            continue # Ignore decoding errors
+
+                # Update history after stream finishes
+                self.last_response = dict(text=full_response)
+                self.conversation.update_chat_history(
+                    prompt, full_response
+                )
 
-            except requests.exceptions.RequestException as e:
-                raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
+            except CurlError as e: # Catch CurlError
+                raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}") from e
+            except Exception as e: # Catch other potential exceptions (like HTTPError)
+                err_text = getattr(e, 'response', None) and getattr(e.response, 'text', '')
+                raise exceptions.FailedToGenerateResponseError(f"Request failed ({type(e).__name__}): {e} - {err_text}") from e
         
         def for_non_stream():
-
-            full_response = ""
-            for line in for_stream():
-                full_response += line['text'] if not raw else line
-
-            return dict(text=full_response)
-
+            # Aggregate the stream using the updated for_stream logic
+            full_response_text = ""
+            try:
+                # Ensure raw=False so for_stream yields dicts
+                for chunk_data in for_stream():
+                    if isinstance(chunk_data, dict) and "text" in chunk_data:
+                        full_response_text += chunk_data["text"]
+                    # Handle raw string case if raw=True was passed
+                    elif raw and isinstance(chunk_data, str):
+                         full_response_text += chunk_data
+            except Exception as e:
+                 # If aggregation fails but some text was received, use it. Otherwise, re-raise.
+                 if not full_response_text:
+                     raise exceptions.FailedToGenerateResponseError(f"Failed to get non-stream response: {str(e)}") from e
+
+            # last_response and history are updated within for_stream
+            # Return the final aggregated response dict or raw string
+            return full_response_text if raw else self.last_response
+
+
+        # Since the API endpoint suggests streaming, always call the stream generator.
+        # The non-stream wrapper will handle aggregation if stream=False.
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -160,23 +197,27 @@ class LLMChat(Provider):
     ) -> Union[str, Generator[str, None, None]]:
         """Generate response with logging capabilities"""
 
-        def for_stream():
-            for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally
-            ):
-                yield self.get_message(response)
-
-        def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt,
-                    False,
-                    optimizer=optimizer,
-                    conversationally=conversationally,
-                )
+        def for_stream_chat():
+            # ask() yields dicts or strings when streaming
+            gen = self.ask(
+                prompt, stream=True, raw=False, # Ensure ask yields dicts
+                optimizer=optimizer, conversationally=conversationally
+            )
+            for response_dict in gen:
+                yield self.get_message(response_dict) # get_message expects dict
+
+        def for_non_stream_chat():
+            # ask() returns dict or str when not streaming
+            response_data = self.ask(
+                prompt,
+                stream=False,
+                raw=False, # Ensure ask returns dict
+                optimizer=optimizer,
+                conversationally=conversationally,
             )
+            return self.get_message(response_data) # get_message expects dict
 
-        return for_stream() if stream else for_non_stream()
+        return for_stream_chat() if stream else for_non_stream_chat()
 
     def get_message(self, response: Dict[str, Any]) -> str:
         """Retrieves message from response with validation"""
@@ -184,6 +225,7 @@ class LLMChat(Provider):
         return response["text"]
 
 if __name__ == "__main__":
+    # Ensure curl_cffi is installed
     print("-" * 80)
     print(f"{'Model':<50} {'Status':<10} {'Response'}")
     print("-" * 80)

webscout/Provider/llmchatco.py

@@ -1,10 +1,11 @@
-import requests
+from curl_cffi.requests import Session
+from curl_cffi import CurlError
 import json
 import uuid
 import re
 from typing import Union, Any, Dict, Optional, Generator, List
 
-from webscout.AIutel import Optimizers
+from webscout.AIutel import Optimizers, sanitize_stream # Import sanitize_stream
 from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts
 from webscout.AIbase import Provider
@@ -37,7 +38,7 @@ class LLMChatCo(Provider):
     def __init__(
         self,
         is_conversation: bool = True,
-        max_tokens: int = 2048,
+        max_tokens: int = 2048, # Note: max_tokens is not used by this API
         timeout: int = 60,
         intro: str = None,
         filepath: str = None,
@@ -55,7 +56,8 @@ class LLMChatCo(Provider):
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
-        self.session = requests.Session()
+        # Initialize curl_cffi Session
+        self.session = Session()
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
         self.api_endpoint = "https://llmchat.co/api/completion"
@@ -64,10 +66,10 @@ class LLMChatCo(Provider):
         self.model = model
         self.system_prompt = system_prompt
         self.thread_id = str(uuid.uuid4())  # Generate a unique thread ID for conversations
-        
-        # Create LitAgent instance for user agent generation
+
+        # Create LitAgent instance (keep if needed for other headers)
         lit_agent = Lit()
-        
+
         # Headers based on the provided request
         self.headers = {
             "Content-Type": "application/json",
@@ -79,7 +81,8 @@ class LLMChatCo(Provider):
             "DNT": "1",
             "Sec-Fetch-Dest": "empty",
             "Sec-Fetch-Mode": "cors",
-            "Sec-Fetch-Site": "same-origin"
+            "Sec-Fetch-Site": "same-origin",
+            # Add sec-ch-ua headers if needed for impersonation consistency
         }
 
         self.__available_optimizers = (
@@ -100,28 +103,22 @@ class LLMChatCo(Provider):
             is_conversation, self.max_tokens_to_sample, filepath, update_file
         )
         self.conversation.history_offset = history_offset
-        self.session.proxies = proxies
+        # Update curl_cffi session headers and proxies
+        self.session.headers.update(self.headers)
+        self.session.proxies = proxies # Assign proxies directly
         # Store message history for conversation context
         self.last_assistant_response = ""
 
-    def parse_sse(self, data):
-        """Parse Server-Sent Events data"""
-        if not data or not data.strip():
-            return None
-            
-        # Check if it's an event line
-        if data.startswith('event:'):
-            return {'event': data[6:].strip()}
-            
-        # Check if it's data
-        if data.startswith('data:'):
-            data_content = data[5:].strip()
-            if data_content:
-                try:
-                    return {'data': json.loads(data_content)}
-                except json.JSONDecodeError:
-                    return {'data': data_content}
-        
+    @staticmethod
+    def _llmchatco_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
+        """Extracts text content from LLMChat.co stream JSON objects."""
+        if isinstance(chunk, dict) and "answer" in chunk:
+            answer = chunk["answer"]
+            # Prefer fullText if available and status is COMPLETED
+            if answer.get("fullText") and answer.get("status") == "COMPLETED":
+                return answer["fullText"]
+            elif "text" in answer:
+                return answer["text"]
         return None
 
     def ask(
@@ -167,85 +164,78 @@ class LLMChatCo(Provider):
         }
 
         def for_stream():
+            full_response = "" # Initialize outside try block
             try:
-                # Set up the streaming request
+                # Use curl_cffi session post with impersonate
                 response = self.session.post(
-                    self.api_endpoint, 
-                    json=payload, 
-                    headers=self.headers, 
-                    stream=True, 
-                    timeout=self.timeout
+                    self.api_endpoint,
+                    json=payload,
+                    # headers are set on the session
+                    stream=True,
+                    timeout=self.timeout,
+                    # proxies are set on the session
+                    impersonate="chrome110" # Use a common impersonation profile
                 )
-                response.raise_for_status()
-                
-                # Process the SSE stream
-                full_response = ""
-                current_event = None
-                buffer = ""
-                
-                # Use a raw read approach to handle SSE
-                for chunk in response.iter_content(chunk_size=1024, decode_unicode=False):
-                    if not chunk:
-                        continue
-                    
-                    # Decode the chunk and add to buffer
-                    buffer += chunk.decode('utf-8')
-                    
-                    # Process complete lines in the buffer
-                    while '\n' in buffer:
-                        line, buffer = buffer.split('\n', 1)
-                        line = line.strip()
-                        
-                        if not line:
-                            continue
-                            
-                        if line.startswith('event:'):
-                            current_event = line[6:].strip()
-                        elif line.startswith('data:'):
-                            data_content = line[5:].strip()
-                            if data_content and current_event == 'answer':
-                                try:
-                                    json_data = json.loads(data_content)
-                                    if "answer" in json_data and "text" in json_data["answer"]:
-                                        text_chunk = json_data["answer"]["text"]
-                                        # If there's a fullText, use it as it's more complete
-                                        if json_data["answer"].get("fullText") and json_data["answer"].get("status") == "COMPLETED":
-                                            text_chunk = json_data["answer"]["fullText"]
-                                            
-                                        # Extract only new content since last chunk
-                                        new_text = text_chunk[len(full_response):]
-                                        if new_text:
-                                            full_response = text_chunk
-                                            yield new_text if raw else dict(text=new_text)
-                                except json.JSONDecodeError:
-                                    continue
-                            elif data_content and current_event == 'done':
-                                break
-                
-                self.last_response.update(dict(text=full_response))
+                response.raise_for_status() # Check for HTTP errors
+
+                # Use sanitize_stream
+                # Note: This won't handle SSE 'event:' lines, only 'data:' lines.
+                # The original code checked for event == 'answer'. We assume relevant data is JSON after 'data:'.
+                processed_stream = sanitize_stream(
+                    data=response.iter_content(chunk_size=None), # Pass byte iterator
+                    intro_value="data:",
+                    to_json=True,     # Stream sends JSON
+                    content_extractor=self._llmchatco_extractor, # Use the specific extractor
+                    yield_raw_on_error=False # Skip non-JSON lines or lines where extractor fails
+                )
+
+                last_yielded_text = ""
+                for current_full_text in processed_stream:
+                    # current_full_text is the full text extracted by _llmchatco_extractor
+                    if current_full_text and isinstance(current_full_text, str):
+                        # Calculate the new part of the text
+                        new_text = current_full_text[len(last_yielded_text):]
+                        if new_text:
+                            full_response = current_full_text # Keep track of the latest full text
+                            last_yielded_text = current_full_text # Update tracker
+                            resp = dict(text=new_text)
+                            # Yield dict or raw string chunk
+                            yield resp if not raw else new_text
+
+                # Update history after stream finishes
+                self.last_response = dict(text=full_response)
                 self.last_assistant_response = full_response
                 self.conversation.update_chat_history(
-                    prompt, self.get_message(self.last_response)
+                    prompt, full_response
                 )
 
-            except requests.exceptions.RequestException as e:
-                raise exceptions.FailedToGenerateResponseError(f"Request failed: {e}")
-            except Exception as e:
-                raise exceptions.FailedToGenerateResponseError(f"Unexpected error: {str(e)}")
-        
+            except CurlError as e: # Catch CurlError
+                raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}") from e
+            except Exception as e: # Catch other potential exceptions (like HTTPError)
+                err_text = getattr(e, 'response', None) and getattr(e.response, 'text', '')
+                raise exceptions.FailedToGenerateResponseError(f"Unexpected error ({type(e).__name__}): {str(e)} - {err_text}") from e
+
         def for_non_stream():
-            full_response = ""
+            # Aggregate the stream using the updated for_stream logic
+            full_response_text = ""
             try:
-                for chunk in for_stream():
-                    if not raw:
-                        full_response += chunk.get('text', '')
-                    else:
-                        full_response += chunk
+                # Ensure raw=False so for_stream yields dicts
+                for chunk_data in for_stream():
+                    if isinstance(chunk_data, dict) and "text" in chunk_data:
+                        full_response_text += chunk_data["text"]
+                    # Handle raw string case if raw=True was passed
+                    elif raw and isinstance(chunk_data, str):
+                         full_response_text += chunk_data
+
             except Exception as e:
-                if not full_response:
-                    raise exceptions.FailedToGenerateResponseError(f"Failed to get response: {str(e)}")
-            
-            return dict(text=full_response)
+                # If aggregation fails but some text was received, use it. Otherwise, re-raise.
+                if not full_response_text:
+                    raise exceptions.FailedToGenerateResponseError(f"Failed to get non-stream response: {str(e)}") from e
+
+            # last_response and history are updated within for_stream
+            # Return the final aggregated response dict or raw string
+            return full_response_text if raw else self.last_response
+
 
         return for_stream() if stream else for_non_stream()
 
@@ -259,25 +249,29 @@ class LLMChatCo(Provider):
     ) -> Union[str, Generator[str, None, None]]:
         """Generate response with streaming capabilities"""
 
-        def for_stream():
-            for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally,
+        def for_stream_chat():
+            # ask() yields dicts or strings when streaming
+            gen = self.ask(
+                prompt, stream=True, raw=False, # Ensure ask yields dicts
+                optimizer=optimizer, conversationally=conversationally,
                 web_search=web_search
-            ):
-                yield self.get_message(response)
+            )
+            for response_dict in gen:
+                yield self.get_message(response_dict) # get_message expects dict
 
-        def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt,
-                    False,
-                    optimizer=optimizer,
-                    conversationally=conversationally,
-                    web_search=web_search
-                )
+        def for_non_stream_chat():
+            # ask() returns dict or str when not streaming
+            response_data = self.ask(
+                prompt,
+                stream=False,
+                raw=False, # Ensure ask returns dict
+                optimizer=optimizer,
+                conversationally=conversationally,
+                web_search=web_search
             )
+            return self.get_message(response_data) # get_message expects dict
 
-        return for_stream() if stream else for_non_stream()
+        return for_stream_chat() if stream else for_non_stream_chat()
 
     def get_message(self, response: Dict[str, Any]) -> str:
         """Retrieves message from response with validation"""
@@ -285,20 +279,21 @@ class LLMChatCo(Provider):
         return response["text"]
 
 if __name__ == "__main__":
+    # Ensure curl_cffi is installed
     print("-" * 80)
     print(f"{'Model':<50} {'Status':<10} {'Response'}")
     print("-" * 80)
-    
+
     # Test all available models
     working = 0
     total = len(LLMChatCo.AVAILABLE_MODELS)
-    
+
     for model in LLMChatCo.AVAILABLE_MODELS:
         try:
             test_ai = LLMChatCo(model=model, timeout=60)
             response = test_ai.chat("Say 'Hello' in one word")
             response_text = response
-            
+
             if response_text and len(response_text.strip()) > 0:
                 status = "✓"
                 # Truncate response if too long
@@ -308,4 +303,4 @@ if __name__ == "__main__":
                 display_text = "Empty or invalid response"
             print(f"{model:<50} {status:<10} {display_text}")
         except Exception as e:
-            print(f"{model:<50} {'✗':<10} {str(e)}")
+            print(f"{model:<50} {'✗':<10} {str(e)}")