webscout 8.3.2__py3-none-any.whl → 8.3.4__py3-none-any.whl

webscout/Provider/turboseek.py

@@ -136,65 +136,59 @@ class TurboSeek(Provider):
         }
 
         def for_stream():
-            try: # Add try block for CurlError
-                # Use curl_cffi session post with impersonate
+            try:
                 response = self.session.post(
                     self.chat_endpoint, 
                     json=payload, 
                     stream=True, 
                     timeout=self.timeout,
-                    impersonate="chrome120", # Try a different impersonation profile
+                    impersonate="chrome120"
                 )
                 if not response.ok:
                     raise exceptions.FailedToGenerateResponseError(
                         f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                     )
-
                 streaming_text = ""
-                # Use sanitize_stream with the custom extractor
                 processed_stream = sanitize_stream(
-                    data=response.iter_content(chunk_size=None), # Pass byte iterator
+                    data=response.iter_content(chunk_size=None),
                     intro_value="data:",
-                    to_json=True,     # Stream sends JSON
-                    content_extractor=self._turboseek_extractor, # Use the specific extractor
-                    yield_raw_on_error=False # Skip non-JSON lines or lines where extractor fails
+                    to_json=True,
+                    content_extractor=self._turboseek_extractor,
+                    yield_raw_on_error=False,
+                    raw=raw
                 )
-
                 for content_chunk in processed_stream:
-                    # content_chunk is the string extracted by _turboseek_extractor
-                    if content_chunk and isinstance(content_chunk, str):
-                        streaming_text += content_chunk
-                        self.last_response.update(dict(text=streaming_text)) # Update last_response incrementally
-                        yield dict(text=content_chunk) if not raw else content_chunk # Yield dict or raw string
-
-                # Update conversation history after stream finishes
-                if streaming_text: # Only update if content was received
+                    if isinstance(content_chunk, bytes):
+                        content_chunk = content_chunk.decode('utf-8', errors='ignore')
+                    if content_chunk is None:
+                        continue
+                    if raw:
+                        yield content_chunk
+                    else:
+                        if content_chunk and isinstance(content_chunk, str):
+                            streaming_text += content_chunk
+                            self.last_response.update(dict(text=streaming_text))
+                            yield dict(text=content_chunk)
+                if streaming_text:
                     self.conversation.update_chat_history(
-                        prompt, streaming_text # Use the fully aggregated text
+                        prompt, streaming_text
                     )
-            except CurlError as e: # Catch CurlError
+            except CurlError as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
-            except Exception as e: # Catch other potential exceptions
+            except Exception as e:
                 raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred ({type(e).__name__}): {e}")
-
-
         def for_non_stream():
-            # Aggregate the stream using the updated for_stream logic
             full_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_text += chunk_data["text"]
-                    elif isinstance(chunk_data, str): # Handle case where raw=True was passed
+                    elif isinstance(chunk_data, str):
                         full_text += chunk_data
             except Exception as e:
                 raise exceptions.FailedToGenerateResponseError(f"Failed to aggregate non-stream response: {e}") from e
-            # last_response and history are updated within for_stream
-            # Ensure last_response reflects the complete aggregated text
-            self.last_response = {"text": full_text} 
+            self.last_response = {"text": full_text}
             return self.last_response
-
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -203,6 +197,7 @@ class TurboSeek(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> str:
         """Generate response `str`
         Args:
@@ -216,20 +211,24 @@ class TurboSeek(Provider):
 
         def for_stream():
             for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally
+                prompt, True, raw=raw, optimizer=optimizer, conversationally=conversationally
             ):
-                yield self.get_message(response)
-
+                if raw:
+                    yield response
+                else:
+                    yield self.get_message(response)
         def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt,
-                    False,
-                    optimizer=optimizer,
-                    conversationally=conversationally,
-                )
+            result = self.ask(
+                prompt,
+                False,
+                raw=raw,
+                optimizer=optimizer,
+                conversationally=conversationally,
             )
-
+            if raw:
+                return result
+            else:
+                return self.get_message(result)
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: dict) -> str:
@@ -251,7 +250,7 @@ if __name__ == '__main__':
     try: # Add try-except block for testing
         ai = TurboSeek(timeout=60)
         print("[bold blue]Testing Stream:[/bold blue]")
-        response_stream = ai.chat("yooooooooooo", stream=True)
+        response_stream = ai.chat("yooooooooooo", stream=True, raw=False)
         for chunk in response_stream:
             print(chunk, end="", flush=True)
         # Optional: Test non-stream

webscout/Provider/typefully.py

@@ -126,11 +126,19 @@ class TypefullyAI(Provider):
                     intro_value=None,
                     to_json=False,
                     content_extractor=self._typefully_extractor,
+                    raw=raw
                 )
                 for content_chunk in processed_stream:
-                    if content_chunk and isinstance(content_chunk, str):
-                        streaming_text += content_chunk
-                        yield content_chunk if raw else dict(text=content_chunk)
+                    if isinstance(content_chunk, bytes):
+                        content_chunk = content_chunk.decode('utf-8', errors='ignore')
+                    if content_chunk is None:
+                        continue
+                    if raw:
+                        yield content_chunk
+                    else:
+                        if content_chunk and isinstance(content_chunk, str):
+                            streaming_text += content_chunk
+                            yield dict(text=content_chunk)
                 self.last_response.update(dict(text=streaming_text))
                 self.conversation.update_chat_history(
                     prompt, self.get_message(self.last_response)
@@ -151,21 +159,28 @@ class TypefullyAI(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> str:
         def for_stream():
             for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally
+                prompt, True, raw=raw, optimizer=optimizer, conversationally=conversationally
             ):
-                yield self.get_message(response)
+                if raw:
+                    yield response
+                else:
+                    yield self.get_message(response)
         def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt,
-                    False,
-                    optimizer=optimizer,
-                    conversationally=conversationally,
-                )
+            result = self.ask(
+                prompt,
+                False,
+                raw=raw,
+                optimizer=optimizer,
+                conversationally=conversationally,
             )
+            if raw:
+                return result
+            else:
+                return self.get_message(result)
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: dict) -> str:

webscout/Provider/typegpt.py

@@ -17,10 +17,11 @@ class TypeGPT(Provider):
     AVAILABLE_MODELS = [
         # Working Models (based on testing)
         # "gpt-4o-mini-2024-07-18",
+        "gpt-4o-mini",
         "chatgpt-4o-latest",
-        "deepseek-r1",
+        # "deepseek-r1",
         "deepseek-v3",
-        "uncensored-r1",
+        # "uncensored-r1",
         # "Image-Generator",
     ]
 
@@ -106,7 +107,6 @@ class TypeGPT(Provider):
                 raise exceptions.FailedToGenerateResponseError(
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
-
         payload = {
             "messages": [
                 {"role": "system", "content": self.system_prompt},
@@ -120,10 +120,8 @@ class TypeGPT(Provider):
             "top_p": self.top_p,
             "max_tokens": self.max_tokens_to_sample,
         }
-
         def for_stream():
             try:
-                # Use curl_cffi session post with impersonate
                 response = self.session.post(
                     self.api_endpoint, 
                     headers=self.headers, 
@@ -136,36 +134,33 @@ class TypeGPT(Provider):
                 raise exceptions.FailedToGenerateResponseError(
                     f"Network connection failed (CurlError). Check your firewall or antivirus settings. Original error: {ce}"
                 ) from ce
-
             response.raise_for_status() # Check for HTTP errors first
-
             streaming_text = ""
-            # Use sanitize_stream
             processed_stream = sanitize_stream(
                 data=response.iter_content(chunk_size=None), # Pass byte iterator
                 intro_value="data:",
                 to_json=True,     # Stream sends JSON
                 skip_markers=["[DONE]"],
                 content_extractor=lambda chunk: chunk.get('choices', [{}])[0].get('delta', {}).get('content') if isinstance(chunk, dict) else None,
-                yield_raw_on_error=False # Skip non-JSON or lines where extractor fails
+                yield_raw_on_error=False,
+                raw=raw
             )
-
             for content_chunk in processed_stream:
-                # content_chunk is the string extracted by the content_extractor
-                if content_chunk and isinstance(content_chunk, str):
-                    streaming_text += content_chunk
-                    yield dict(text=content_chunk) if not raw else content_chunk
-                    # Update last_response incrementally
-                    self.last_response = dict(text=streaming_text)
-
-            # Update conversation history after stream finishes
-            if streaming_text: # Only update if something was received
+                if isinstance(content_chunk, bytes):
+                    content_chunk = content_chunk.decode('utf-8', errors='ignore')
+                if content_chunk is None:
+                    continue
+                if raw:
+                    yield content_chunk
+                else:
+                    if content_chunk and isinstance(content_chunk, str):
+                        streaming_text += content_chunk
+                        yield dict(text=content_chunk)
+                        self.last_response = dict(text=streaming_text)
+            if streaming_text:
                  self.conversation.update_chat_history(prompt, streaming_text)
-
-
         def for_non_stream():
             try:
-                # Use curl_cffi session post with impersonate
                 response = self.session.post(
                     self.api_endpoint, 
                     headers=self.headers, 
@@ -177,34 +172,32 @@ class TypeGPT(Provider):
                 raise exceptions.FailedToGenerateResponseError(
                     f"Network connection failed (CurlError). Check your firewall or antivirus settings. Original error: {ce}"
                 ) from ce
-
             response.raise_for_status() # Check for HTTP errors
-
             try:
                 response_text = response.text # Get raw text
-
-                # Use sanitize_stream for non-streaming JSON response
                 processed_stream = sanitize_stream(
                     data=response_text,
                     to_json=True, # Parse the whole text as JSON
                     intro_value=None,
-                    # Extractor for non-stream structure
                     content_extractor=lambda chunk: chunk.get('choices', [{}])[0].get('message', {}).get('content') if isinstance(chunk, dict) else None,
-                    yield_raw_on_error=False
+                    yield_raw_on_error=False,
+                    raw=raw
                 )
-
-                # Extract the single result
                 content = ""
                 for extracted_content in processed_stream:
-                    content = extracted_content if isinstance(extracted_content, str) else ""
-
-                self.last_response = {"text": content} # Store in expected format
+                    if isinstance(extracted_content, bytes):
+                        extracted_content = extracted_content.decode('utf-8', errors='ignore')
+                    if extracted_content is None:
+                        continue
+                    if raw:
+                        content += extracted_content
+                    else:
+                        content = extracted_content if isinstance(extracted_content, str) else ""
+                self.last_response = {"text": content}
                 self.conversation.update_chat_history(prompt, content)
-                return self.last_response
-            except (json.JSONDecodeError, Exception) as je: # Catch potential JSON errors or others
+                return self.last_response if not raw else content
+            except (json.JSONDecodeError, Exception) as je:
                  raise exceptions.FailedToGenerateResponseError(f"Failed to decode JSON response: {je} - Response text: {response.text}")
-
-
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -213,25 +206,27 @@ class TypeGPT(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> Union[str, Generator[str, None, None]]:
-        """Generate response string or stream."""
         if stream:
-            # ask() yields dicts or strings when streaming
             gen = self.ask(
-                prompt, stream=True, raw=False, # Ensure ask yields dicts
+                prompt, stream=True, raw=raw, # Ensure ask yields dicts or raw
                 optimizer=optimizer, conversationally=conversationally
             )
-            for chunk_dict in gen:
-                 # get_message expects a dict
-                yield self.get_message(chunk_dict) 
+            for chunk in gen:
+                if raw:
+                    yield chunk
+                else:
+                    yield self.get_message(chunk)
         else:
-            # ask() returns a dict when not streaming
-            response_dict = self.ask(
-                prompt, stream=False, 
+            response = self.ask(
+                prompt, stream=False, raw=raw,
                 optimizer=optimizer, conversationally=conversationally
             )
-            return self.get_message(response_dict)
-
+            if raw:
+                return response
+            else:
+                return self.get_message(response)
     def get_message(self, response: Dict[str, Any]) -> str:
         """Retrieves message from response."""
         if isinstance(response, dict):

webscout/Provider/uncovr.py

@@ -165,8 +165,6 @@ class UncovrAI(Provider):
                 )
             else:
                 raise Exception(f"Optimizer is not one of {self.__available_optimizers}")
-
-        # Prepare the request payload
         payload = {
             "content": conversation_prompt,
             "chatId": self.chat_id,
@@ -180,78 +178,72 @@ class UncovrAI(Provider):
                 "creativity": creativity
             }
         }
-
         def for_stream():
             try:
-                # Use curl_cffi session post with impersonate
                 response = self.session.post(
                     self.url, 
                     json=payload, 
                     stream=True, 
                     timeout=self.timeout,
-                    impersonate=self.fingerprint.get("browser_type", "chrome110") # Use fingerprint browser type
+                    impersonate=self.fingerprint.get("browser_type", "chrome110")
                 )
-                
                 if response.status_code != 200:
-                    # If we get a non-200 response, try refreshing our identity once
                     if response.status_code in [403, 429]:
                         self.refresh_identity()
-                        # Retry with new identity using curl_cffi session
                         retry_response = self.session.post(
                             self.url, 
                             json=payload, 
                             stream=True, 
                             timeout=self.timeout,
-                            impersonate=self.fingerprint.get("browser_type", "chrome110") # Use updated fingerprint
+                            impersonate=self.fingerprint.get("browser_type", "chrome110")
                         )
                         if not retry_response.ok:
                             raise exceptions.FailedToGenerateResponseError(
                                 f"Failed to generate response after identity refresh - ({retry_response.status_code}, {retry_response.reason}) - {retry_response.text}"
                             )
-                        response = retry_response # Use the successful retry response
+                        response = retry_response
                     else:
                         raise exceptions.FailedToGenerateResponseError(
                             f"Request failed with status code {response.status_code} - {response.text}"
                         )
-
                 streaming_text = ""
-                # Use sanitize_stream with the custom extractor
                 processed_stream = sanitize_stream(
-                    data=response.iter_content(chunk_size=None), # Pass byte iterator
-                    intro_value=None, # No simple prefix
-                    to_json=False,    # Content is not JSON
-                    content_extractor=self._uncovr_extractor, # Use the specific extractor
-                    yield_raw_on_error=True # Keep yielding even if extractor fails, for potential error messages? (Adjust if needed)
+                    data=response.iter_content(chunk_size=None),
+                    intro_value=None,
+                    to_json=False,
+                    content_extractor=self._uncovr_extractor,
+                    yield_raw_on_error=True,
+                    raw=raw
                 )
-
                 for content_chunk in processed_stream:
-                    if content_chunk and isinstance(content_chunk, str):
-                        streaming_text += content_chunk
-                        yield dict(text=content_chunk) if not raw else content_chunk
-                
+                    # Always yield as string, even in raw mode
+                    if isinstance(content_chunk, bytes):
+                        content_chunk = content_chunk.decode('utf-8', errors='ignore')
+                    if content_chunk is None:
+                        continue  # Ignore non-content lines
+                    if raw:
+                        yield content_chunk
+                    else:
+                        if content_chunk and isinstance(content_chunk, str):
+                            streaming_text += content_chunk
+                            yield dict(text=content_chunk)
                 self.last_response = {"text": streaming_text}
                 self.conversation.update_chat_history(prompt, streaming_text)
-                    
-            except CurlError as e: # Catch CurlError
+            except CurlError as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
-            except Exception as e: # Catch other potential exceptions
+            except Exception as e:
                 raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred ({type(e).__name__}): {e}")
-
-
         def for_non_stream():
             try:
-                # Use curl_cffi session post with impersonate
                 response = self.session.post(
                     self.url, 
                     json=payload, 
                     timeout=self.timeout,
                     impersonate=self.fingerprint.get("browser_type", "chrome110")
                 )
-                
                 if response.status_code != 200:
                     if response.status_code in [403, 429]:
                         self.refresh_identity()
-                        # Retry with new identity using curl_cffi session
                         response = self.session.post(
                             self.url, 
                             json=payload, 
@@ -266,36 +258,32 @@ class UncovrAI(Provider):
                         raise exceptions.FailedToGenerateResponseError(
                             f"Request failed with status code {response.status_code} - {response.text}"
                         )
-
-                response_text = response.text # Get the full response text
-                
-                # Use sanitize_stream to process the non-streaming text
-                # It won't parse as JSON, but will apply the extractor line by line
+                response_text = response.text
                 processed_stream = sanitize_stream(
-                    data=response_text.splitlines(), # Split into lines first
+                    data=response_text.splitlines(),
                     intro_value=None,
                     to_json=False,
                     content_extractor=self._uncovr_extractor,
-                    yield_raw_on_error=True 
+                    yield_raw_on_error=True,
+                    raw=raw
                 )
-
-                # Aggregate the results from the generator
                 full_response = ""
                 for content in processed_stream:
-                    if content and isinstance(content, str):
+                    if isinstance(content, bytes):
+                        content = content.decode('utf-8', errors='ignore')
+                    if content is None:
+                        continue  # Ignore non-content lines
+                    if raw:
+                        full_response += content
+                    elif content and isinstance(content, str):
                         full_response += content
-
-                # Check if aggregation resulted in empty response (might indicate error not caught by extractor)
                 self.last_response = {"text": full_response}
                 self.conversation.update_chat_history(prompt, full_response)
-                return {"text": full_response}
-                
-            except CurlError as e: # Catch CurlError
+                return {"text": full_response} if not raw else full_response
+            except CurlError as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
-            except Exception as e: # Catch other potential exceptions
+            except Exception as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed ({type(e).__name__}): {e}")
-
-
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -307,23 +295,29 @@ class UncovrAI(Provider):
         temperature: int = 32,
         creativity: str = "medium",
         selected_focus: list = ["web"],
-        selected_tools: list = []
+        selected_tools: list = [],
+        raw: bool = False,  # Added raw parameter
     ) -> Union[str, Generator[str, None, None]]:
         def for_stream():
             for response in self.ask(
-                prompt, True, optimizer=optimizer, conversationally=conversationally,
+                prompt, True, raw=raw, optimizer=optimizer, conversationally=conversationally,
                 temperature=temperature, creativity=creativity,
                 selected_focus=selected_focus, selected_tools=selected_tools
             ):
-                yield self.get_message(response)
+                if raw:
+                    yield response
+                else:
+                    yield self.get_message(response)
         def for_non_stream():
-            return self.get_message(
-                self.ask(
-                    prompt, False, optimizer=optimizer, conversationally=conversationally,
-                    temperature=temperature, creativity=creativity,
-                    selected_focus=selected_focus, selected_tools=selected_tools
-                )
+            result = self.ask(
+                prompt, False, raw=raw, optimizer=optimizer, conversationally=conversationally,
+                temperature=temperature, creativity=creativity,
+                selected_focus=selected_focus, selected_tools=selected_tools
             )
+            if raw:
+                return result
+            else:
+                return self.get_message(result)
         return for_stream() if stream else for_non_stream()
 
     def get_message(self, response: dict) -> str:
@@ -333,36 +327,7 @@ class UncovrAI(Provider):
         return text.replace('\\n', '\n').replace('\\n\\n', '\n\n') # Keep newline replacement
 
 if __name__ == "__main__":
-    # Ensure curl_cffi is installed
-    print("-" * 80)
-    print(f"{'Model':<50} {'Status':<10} {'Response'}")
-    print("-" * 80)
-
-    for model in UncovrAI.AVAILABLE_MODELS:
-        try:
-            test_ai = UncovrAI(model=model, timeout=60)
-            # Test non-stream first as stream logic depends on it
-            response_non_stream = test_ai.chat("Say 'Hello' in one word", stream=False) 
-            
-            if response_non_stream and len(response_non_stream.strip()) > 0:
-                 # Now test stream
-                response_stream = test_ai.chat("Say 'Hi' in one word", stream=True)
-                response_text = ""
-                for chunk in response_stream:
-                    response_text += chunk
-                
-                if response_text and len(response_text.strip()) > 0:
-                    status = "✓"
-                    # Clean and truncate response
-                    clean_text = response_text.strip().encode('utf-8', errors='ignore').decode('utf-8')
-                    display_text = clean_text[:50] + "..." if len(clean_text) > 50 else clean_text
-                else:
-                    status = "✗ (Stream)"
-                    display_text = "Empty or invalid stream response"
-            else:
-                status = "✗ (Non-Stream)"
-                display_text = "Empty or invalid non-stream response"
-                
-            print(f"\r{model:<50} {status:<10} {display_text}")
-        except Exception as e:
-            print(f"\r{model:<50} {'✗':<10} {str(e)}")
+    ai = UncovrAI()
+    response = ai.chat("who is pm of india?", raw=False, stream=True)
+    for chunk in response:
+        print(chunk, end='', flush=True)