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

webscout/Provider/VercelAI.py

@@ -141,7 +141,6 @@ class VercelAI(Provider):
                 raise Exception(
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
-
         payload = {
             "id": "guest",
             "messages": [
@@ -155,7 +154,6 @@ class VercelAI(Provider):
             ],
             "selectedChatModelId": self.model
         }
-
         def for_stream():
             response = self.session.post(
                 self.api_endpoint, headers=self.headers, json=payload, stream=True, timeout=self.timeout
@@ -163,31 +161,32 @@ class VercelAI(Provider):
             if not response.ok:
                 error_msg = f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                 raise exceptions.FailedToGenerateResponseError(error_msg)
-
             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._vercelai_extractor # Use the specific extractor
+                content_extractor=self._vercelai_extractor, # Use the specific 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)
-
+                # Always yield as string, even in raw mode
+                if isinstance(content_chunk, bytes):
+                    content_chunk = content_chunk.decode('utf-8', errors='ignore')
+                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)
             )
-
         def for_non_stream():
             for _ in for_stream():
                 pass
             return self.last_response
-
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -196,24 +195,28 @@ class VercelAI(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> str:
-        """Generate response `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/WiseCat.py

@@ -106,7 +106,6 @@ class WiseCat(Provider):
                 raise Exception(
                     f"Optimizer is not one of {self.__available_optimizers}"
                 )
-
         payload = {
             "id": "ephemeral",
             "messages": [
@@ -121,52 +120,49 @@ class WiseCat(Provider):
             ],
             "selectedChatModel": self.model
         }
-
         def for_stream():
-            try: # Add try block for CurlError
-                # Use curl_cffi session post with impersonate
+            try:
                 response = self.session.post(
                     self.api_endpoint, 
                     headers=self.headers, 
                     json=payload, 
                     stream=True, 
                     timeout=self.timeout,
-                    impersonate="chrome120" # Add impersonate
+                    impersonate="chrome120"
                 )
                 if not response.ok:
                     error_msg = f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
                     raise exceptions.FailedToGenerateResponseError(error_msg)
-
                 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 remove here
-                    to_json=False,    # Content is not JSON
-                    content_extractor=self._wisecat_extractor # Use the specific extractor
+                    data=response.iter_content(chunk_size=None),
+                    intro_value=None,
+                    to_json=False,
+                    content_extractor=self._wisecat_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)
-
-                self.last_response.update(dict(text=streaming_text)) # Use streaming_text here
+                    # Always yield as string, even in raw mode
+                    if isinstance(content_chunk, bytes):
+                        content_chunk = content_chunk.decode('utf-8', errors='ignore')
+                    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)
                 )
-            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():
-            # This function implicitly uses the updated for_stream
             for _ in for_stream():
                 pass
             return self.last_response
-
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -175,24 +171,28 @@ class WiseCat(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> str:
-        """Generate response `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/WrDoChat.py

@@ -244,7 +244,6 @@ class WrDoChat(Provider):
         def for_stream():
             try:
                 self.headers["referer"] = f"https://oi.wr.do/chat/{chat_id}"
-                
                 response = self.session.post(
                     self.api_endpoint,
                     json=payload,
@@ -252,31 +251,27 @@ class WrDoChat(Provider):
                     timeout=self.timeout,
                     impersonate="chrome110"
                 )
-                
                 if response.status_code == 401:
                     raise exceptions.AuthenticationError("Authentication failed. Please check your cookies.")
-                
                 response.raise_for_status()
-                
                 streaming_response = ""
                 has_content = False
-                
-                # Use sanitize_stream with the custom extractor
                 processed_stream = sanitize_stream(
                     data=response.iter_lines(),
                     intro_value=None,  # No intro to remove
                     to_json=False,     # Response is not JSON
                     content_extractor=self._wrdo_extractor,
-                    yield_raw_on_error=False
+                    yield_raw_on_error=False,
+                    raw=raw
                 )
-
                 for content in processed_stream:
+                    # Always yield as string, even in raw mode
+                    if isinstance(content, bytes):
+                        content = content.decode('utf-8', errors='ignore')
                     if content and isinstance(content, str):
                         streaming_response += content
                         has_content = True
-                        yield {"text": content} if not raw else content
-
-                # Only update conversation history if we received content
+                        yield content if raw else {"text": content}
                 if has_content:
                     self.last_response = {"text": streaming_response}
                     self.conversation.update_chat_history(
@@ -286,12 +281,10 @@ class WrDoChat(Provider):
                     raise exceptions.FailedToGenerateResponseError(
                         "No content received from API"
                     )
-
             except CurlError as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {e}")
             except Exception as e:
                 raise exceptions.FailedToGenerateResponseError(f"An error occurred: {str(e)}")
-
         def for_non_stream():
             response_text = ""
             try:
@@ -303,9 +296,7 @@ class WrDoChat(Provider):
             except Exception as e:
                 if not response_text:
                     raise exceptions.FailedToGenerateResponseError(f"Failed to get response: {str(e)}")
-
             return response_text if raw else {"text": response_text}
-
         return for_stream() if stream else for_non_stream()
 
     def chat(
@@ -314,6 +305,7 @@ class WrDoChat(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> Union[str, Generator[str, None, None]]:
         """
         Generate a response to a prompt.
@@ -329,20 +321,24 @@ class WrDoChat(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:

webscout/Provider/WritingMate.py

@@ -178,13 +178,20 @@ class WritingMate(Provider):
                     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._writingmate_extractor # Use the specific extractor
+                    content_extractor=self._writingmate_extractor, # Use the specific 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)
+                    # Always yield as string, even in raw mode
+                    if isinstance(content_chunk, bytes):
+                        content_chunk = content_chunk.decode('utf-8', errors='ignore')
+                    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(
@@ -196,12 +203,10 @@ class WritingMate(Provider):
                 raise exceptions.FailedToGenerateResponseError(f"An unexpected error occurred ({type(e).__name__}): {e}")
 
         def for_non_stream():
-            # This function implicitly uses the updated for_stream
             for _ in for_stream():
                 pass
             return self.last_response
 
-        # Ensure stream defaults to True if not provided, matching original behavior
         effective_stream = stream if stream is not None else True 
         return for_stream() if effective_stream else for_non_stream()
 
@@ -210,36 +215,35 @@ class WritingMate(Provider):
         prompt: str,
         stream: bool = False, # Default stream to False as per original chat method
         optimizer: str = None,
-        conversationally: bool = False
+        conversationally: bool = False,
+        raw: bool = False,  # Added raw parameter
     ) -> Union[str, Generator[str,None,None]]:
         if stream:
-            # yield decoded text chunks
             def text_stream():
-                # Call ask with stream=True, raw=False to get dicts
-                for response_dict in self.ask(
-                    prompt, stream=True, raw=False,
+                for response in self.ask(
+                    prompt, stream=True, raw=raw,
                     optimizer=optimizer, conversationally=conversationally
                 ):
-                    # Extract text from dict
-                    yield self.get_message(response_dict) 
+                    if raw:
+                        yield response
+                    else:
+                        yield self.get_message(response)
             return text_stream()
-        else: # non‐stream: return aggregated text
-            # Call ask with stream=False, raw=False
+        else:
             response_data = self.ask(
                 prompt,
                 stream=False,
-                raw=False,
+                raw=raw,
                 optimizer=optimizer,
                 conversationally=conversationally,
             )
-            # Ensure response_data is a dict before passing to get_message
+            if raw:
+                return response_data
             if isinstance(response_data, dict):
-                 return self.get_message(response_data)
+                return self.get_message(response_data)
             else:
-                 # Handle unexpected generator case if ask(stream=False) behaves differently
-                 # This part might need adjustment based on actual behavior
-                 full_text = "".join(self.get_message(chunk) for chunk in response_data if isinstance(chunk, dict))
-                 return full_text
+                full_text = "".join(self.get_message(chunk) for chunk in response_data if isinstance(chunk, dict))
+                return full_text
 
 
     def get_message(self, response: dict) -> str:

webscout/Provider/__init__.py

@@ -68,7 +68,6 @@ from .ExaAI import ExaAI
 from .OpenGPT import OpenGPT
 from .scira_chat import *
 from .StandardInput import *
-from .Writecream import Writecream
 from .toolbaz import Toolbaz
 from .scnet import SCNet
 from .WritingMate import WritingMate
@@ -87,8 +86,10 @@ from .XenAI import XenAI
 from .deepseek_assistant import DeepSeekAssistant
 from .GeminiProxy import GeminiProxy
 from .TogetherAI import TogetherAI
+from .MiniMax import MiniMax
 __all__ = [
     'SCNet',
+    'MiniMax',
     'GeminiProxy',
     'TogetherAI',
     'oivscode',
@@ -173,7 +174,6 @@ __all__ = [
     'AskSteve',
     'Aitopia',
     'SearchChatAI',
-    'Writecream',
     'Toolbaz',
     'MCPCore',
     'TypliAI',

webscout/Provider/granite.py

@@ -83,10 +83,12 @@ class IBMGranite(Provider):
         self.conversation.history_offset = history_offset
 
     @staticmethod
-    def _granite_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
-        """Extracts content from IBM Granite stream JSON lists [3, "text"]."""
-        if isinstance(chunk, list) and len(chunk) == 2 and chunk[0] == 3 and isinstance(chunk[1], str):
-            return chunk[1]
+    def _granite_extractor(chunk: Union[str, Dict[str, Any], list]) -> Optional[str]:
+        """Extracts content from IBM Granite stream JSON lists [6, "text"] or [3, "text"]."""
+        # Accept both [3, str] and [6, str] as content chunks
+        if isinstance(chunk, list) and len(chunk) == 2 and isinstance(chunk[1], str):
+            if chunk[0] in (3, 6):
+                return chunk[1]
         return None
 
     @staticmethod
@@ -157,73 +159,60 @@ class IBMGranite(Provider):
             payload["thinking"] = True
 
         def for_stream():
-            streaming_text = "" # Initialize outside try block
+            streaming_text = ""
             try:
-                # Use curl_cffi session post with impersonate
                 response = self.session.post(
                     self.api_endpoint, 
-                    # headers are set on the session
                     json=payload, 
                     stream=True, 
                     timeout=self.timeout,
-                    impersonate="chrome110" # Use a common impersonation profile
+                    impersonate="chrome110"
                 )
-                response.raise_for_status() # Check for HTTP errors
-
-                # Use sanitize_stream
+                response.raise_for_status()
                 processed_stream = sanitize_stream(
-                    data=response.iter_content(chunk_size=None), # Pass byte iterator
-                    intro_value=None, # No prefix
-                    to_json=True,     # Stream sends JSON lines (which are lists)
-                    content_extractor=self._granite_extractor, # Use the specific extractor
-                    yield_raw_on_error=False # Skip non-JSON lines or lines where extractor fails
+                    data=response.iter_content(chunk_size=None),
+                    intro_value=None,
+                    to_json=True,
+                    content_extractor=self._granite_extractor,
+                    yield_raw_on_error=False,
+                    raw=raw
                 )
-
                 for content_chunk in processed_stream:
-                    # content_chunk is the string extracted by _granite_extractor
-                    if content_chunk and isinstance(content_chunk, str):
-                        streaming_text += content_chunk
-                        resp = dict(text=content_chunk)
-                        yield resp if not raw else content_chunk
-                
-                # Update history after stream finishes
+                    if raw:
+                        if content_chunk and isinstance(content_chunk, str):
+                            streaming_text += content_chunk
+                        yield content_chunk
+                    else:
+                        if content_chunk and isinstance(content_chunk, str):
+                            streaming_text += content_chunk
+                            resp = dict(text=content_chunk)
+                            yield resp
                 self.last_response = dict(text=streaming_text)
                 self.conversation.update_chat_history(prompt, streaming_text)
-                
-            except CurlError as e: # Catch CurlError
+            except CurlError as e:
                 raise exceptions.ProviderConnectionError(f"Request failed (CurlError): {e}") from e
-            except json.JSONDecodeError as e: # Keep specific JSON error handling
+            except json.JSONDecodeError as e:
                 raise exceptions.InvalidResponseError(f"Failed to decode JSON response: {e}") from e
-            except Exception as e: # Catch other potential exceptions (like HTTPError)
+            except Exception as e:
                 err_text = getattr(e, 'response', None) and getattr(e.response, 'text', '')
-                # Use specific exception type if available, otherwise generic
                 ex_type = exceptions.FailedToGenerateResponseError if not isinstance(e, exceptions.ProviderConnectionError) else type(e)
                 raise ex_type(f"An unexpected error occurred ({type(e).__name__}): {e} - {err_text}") from 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"]
-                    # Handle raw string case if raw=True was passed
-                    elif raw and isinstance(chunk_data, str):
-                         full_text += chunk_data
+                    if raw:
+                        if isinstance(chunk_data, str):
+                            full_text += chunk_data
+                    else:
+                        if isinstance(chunk_data, dict) and "text" in chunk_data:
+                            full_text += chunk_data["text"]
             except Exception as e:
-                 # If aggregation fails but some text was received, use it. Otherwise, re-raise.
-                 if not full_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
+                if not full_text:
+                    raise exceptions.FailedToGenerateResponseError(f"Failed to get non-stream response: {str(e)}") from e
             return full_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(
@@ -232,25 +221,27 @@ class IBMGranite(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,
     ) -> Union[str, Generator[str, None, None]]:
         """Generate response as a string using chat method"""
         def for_stream_chat():
-            # ask() yields dicts or strings when streaming
             gen = self.ask(
-                prompt, stream=True, raw=False, # Ensure ask yields dicts
+                prompt, stream=True, raw=raw,
                 optimizer=optimizer, conversationally=conversationally
             )
-            for response_dict in gen:
-                yield self.get_message(response_dict) # get_message expects dict
-
+            for response in gen:
+                if raw:
+                    yield response
+                else:
+                    yield self.get_message(response)
         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
+                prompt, stream=False, raw=raw,
                 optimizer=optimizer, conversationally=conversationally
             )
-            return self.get_message(response_data) # get_message expects dict
-
+            if raw:
+                return response_data if isinstance(response_data, str) else str(response_data)
+            return self.get_message(response_data)
         return for_stream_chat() if stream else for_non_stream_chat()
 
     def get_message(self, response: dict) -> str:
@@ -265,6 +256,6 @@ if __name__ == "__main__":
     ai = IBMGranite(
         thinking=True,
     )
-    response = ai.chat("How many r in strawberry", stream=True)
+    response = ai.chat("How many r in strawberry", stream=True, raw=False)
     for chunk in response:
-        print(chunk, end="", flush=True)
+        print(chunk, end="", flush=True)  # Print each chunk without newline