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

webscout/Provider/GeminiProxy.py

@@ -14,10 +14,11 @@ class GeminiProxy(Provider):
     AVAILABLE_MODELS = [
         "gemini-2.0-flash-lite",
         "gemini-2.0-flash",
-        "gemini-2.5-pro-preview-06-05",
-        "gemini-2.5-pro-preview-05-06",
         "gemini-2.5-flash-preview-04-17",
         "gemini-2.5-flash-preview-05-20",
+        "gemini-2.5-flash-lite-preview-06-17",
+        "gemini-2.5-pro",
+        "gemini-2.5-flash",
 
     ]
 
@@ -135,6 +136,31 @@ class GeminiProxy(Provider):
             return str(response)
 
 if __name__ == "__main__":
-    ai = GeminiProxy(timeout=30, model="gemini-2.5-flash-preview-05-20")
-    response = ai.chat("write a poem about AI")
-    print(response)
+    # Ensure curl_cffi is installed
+    print("-" * 80)
+    print(f"{'Model':<50} {'Status':<10} {'Response'}")
+    print("-" * 80)
+    
+    # Test all available models
+    working = 0
+    total = len(GeminiProxy.AVAILABLE_MODELS)
+    
+    for model in GeminiProxy.AVAILABLE_MODELS:
+        try:
+            test_ai = GeminiProxy(model=model, timeout=60)
+            response = test_ai.chat("Say 'Hello' in one word", stream=True)
+            response_text = ""
+            for chunk in response:
+                response_text += chunk
+                print(f"\r{model:<50} {'Testing...':<10}", end="", flush=True)
+            
+            if response_text and len(response_text.strip()) > 0:
+                status = "✓"
+                # Truncate response if too long
+                display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
+            else:
+                status = "✗"
+                display_text = "Empty or invalid response"
+            print(f"\r{model:<50} {status:<10} {display_text}")
+        except Exception as e:
+            print(f"\r{model:<50} {'✗':<10} {str(e)}")

webscout/Provider/HeckAI.py

@@ -57,7 +57,7 @@ class HeckAI(Provider):
         proxies: dict = {},
         history_offset: int = 10250,
         act: str = None,
-        model: str = "google/gemini-2.0-flash-001",
+        model: str = "google/gemini-2.5-flash-preview",
         language: str = "English"
     ):
         """
@@ -177,79 +177,73 @@ class HeckAI(Provider):
         def for_stream():
             streaming_text = "" # Initialize outside try block
             try:
-                # Use curl_cffi session post with impersonate
                 response = self.session.post(
                     self.url, 
-                    # headers are set on the session
                     data=json.dumps(payload), 
                     stream=True, 
                     timeout=self.timeout,
-                    impersonate="chrome110" # Use a common impersonation profile
+                    impersonate="chrome110"
                 )
-                response.raise_for_status() # Check for HTTP errors
+                response.raise_for_status()
 
-                # Use sanitize_stream to process the stream
                 processed_stream = sanitize_stream(
-                data=response.iter_content(chunk_size=1024), # Pass byte iterator
-                intro_value="data: ",  # Prefix to remove (note the space)
-                to_json=False,        # Content is text
-                start_marker="data: [ANSWER_START]",
-                end_marker="data: [ANSWER_DONE]",
-                skip_markers=["data: [RELATE_Q_START]", "data: [RELATE_Q_DONE]", "data: [REASON_START]", "data: [REASON_DONE]"],
-                yield_raw_on_error=True,
-                strip_chars=" \n\r\t"  # Strip whitespace characters from chunks
+                    data=response.iter_content(chunk_size=1024),
+                    intro_value="data: ",
+                    to_json=False,
+                    start_marker="data: [ANSWER_START]",
+                    end_marker="data: [ANSWER_DONE]",
+                    skip_markers=["data: [RELATE_Q_START]", "data: [RELATE_Q_DONE]", "data: [REASON_START]", "data: [REASON_DONE]"],
+                    yield_raw_on_error=True,
+                    strip_chars=" \n\r\t",
+                    raw=raw
                 )
 
                 for content_chunk in processed_stream:
-                    # content_chunk is the text between ANSWER_START and ANSWER_DONE
                     if content_chunk and isinstance(content_chunk, str):
-                        streaming_text += content_chunk
-                        yield dict(text=content_chunk) if not raw else content_chunk
+                        content_chunk = content_chunk.replace('\\\\', '\\').replace('\\"', '"')
+                    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
+                            yield dict(text=content_chunk)
                 
                 # Only update history if we received a valid response
                 if streaming_text:
-                    # Update history and previous answer after stream finishes
                     self.previous_answer = streaming_text
-                    # Convert to simple text before updating conversation
                     try:
-                        # Ensure content is valid before updating conversation
                         if streaming_text and isinstance(streaming_text, str):
-                            # Sanitize the content to ensure it's valid
                             sanitized_text = streaming_text.strip()
-                            if sanitized_text:  # Only update if we have non-empty content
+                            if sanitized_text:
                                 self.conversation.update_chat_history(prompt, sanitized_text)
                     except Exception as e:
-                        # If conversation update fails, log but don't crash
                         print(f"Warning: Failed to update conversation history: {str(e)}")
-                    
-            except CurlError as e: # Catch CurlError
+            except CurlError as e:
                 raise exceptions.FailedToGenerateResponseError(f"Request failed (CurlError): {str(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', '')
                 raise exceptions.FailedToGenerateResponseError(f"Request failed ({type(e).__name__}): {str(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):
+                            chunk_data = chunk_data.replace('\\\\', '\\').replace('\\"', '"')
+                            full_text += chunk_data
+                    else:
+                        if isinstance(chunk_data, dict) and "text" in chunk_data:
+                            text = chunk_data["text"].replace('\\\\', '\\').replace('\\"', '"')
+                            full_text += 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
-
-            # Return the final aggregated response dict or raw string
-            self.last_response = {"text": full_text} # Update last_response here
+                if not full_text:
+                    raise exceptions.FailedToGenerateResponseError(f"Failed to get non-stream response: {str(e)}") from e
+            self.last_response = {"text": full_text}
             return full_text if raw else self.last_response
 
-
         return for_stream() if stream else for_non_stream()
 
     @staticmethod
@@ -266,15 +260,15 @@ class HeckAI(Provider):
         if isinstance(text, dict) and "text" in text:
             try:
                 text["text"] = text["text"].encode("latin1").decode("utf-8")
-                return text
+                return text.replace('\\\\', '\\').replace('\\"', '"') # Handle escaped backslashes 
             except (UnicodeError, AttributeError) as e:
-                return text
+                return text.replace('\\\\', '\\').replace('\\"', '"') # Handle escaped backslashes 
         elif isinstance(text, str):
             try:
                 return text.encode("latin1").decode("utf-8")
             except (UnicodeError, AttributeError) as e:
-                return text
-        return text
+                return text.replace('\\\\', '\\').replace('\\"', '"') # Handle escaped backslashes 
+        return text.replace('\\\\', '\\').replace('\\"', '"') # Handle escaped backslashes 
 
     def chat(
         self,
@@ -282,6 +276,7 @@ class HeckAI(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,
     ) -> Union[str, Generator[str, None, None]]:
         """
         Sends a prompt to the HeckAI API and returns only the message text.
@@ -298,18 +293,23 @@ class HeckAI(Provider):
         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
             )
+            if raw:
+                return response_data if isinstance(response_data, str) else str(response_data)
             return self.get_message(response_data) # get_message expects dict
             
         return for_stream_chat() if stream else for_non_stream_chat()
@@ -338,38 +338,43 @@ class HeckAI(Provider):
         # Ensure text is a string
         text = response["text"]
         if not isinstance(text, str):
-            return str(text)
+            text = str(text)
 
-        return text
+        return text.replace('\\\\', '\\').replace('\\"', '"')
 
 if __name__ == "__main__":
-    # Ensure curl_cffi is installed
-    print("-" * 80)
-    print(f"{'Model':<50} {'Status':<10} {'Response'}")
-    print("-" * 80)
-
-    for model in HeckAI.AVAILABLE_MODELS:
-        try:
-            test_ai = HeckAI(model=model, timeout=60)
-            # Use non-streaming mode first to avoid potential streaming issues
-            try:
-                response_text = test_ai.chat("Say 'Hello' in one word", stream=False)
-                print(f"\r{model:<50} {'✓':<10} {response_text.strip()[:50]}")
-            except Exception as e1:
-                # Fall back to streaming if non-streaming fails
-                print(f"\r{model:<50} {'Testing stream...':<10}", end="", flush=True)
-                response = test_ai.chat("Say 'Hello' in one word", stream=True)
-                response_text = ""
-                for chunk in response:
-                    if chunk and isinstance(chunk, str):
-                        response_text += chunk
+    # # Ensure curl_cffi is installed
+    # print("-" * 80)
+    # print(f"{'Model':<50} {'Status':<10} {'Response'}")
+    # print("-" * 80)
+
+    # for model in HeckAI.AVAILABLE_MODELS:
+    #     try:
+    #         test_ai = HeckAI(model=model, timeout=60)
+    #         # Use non-streaming mode first to avoid potential streaming issues
+    #         try:
+    #             response_text = test_ai.chat("Say 'Hello' in one word", stream=False)
+    #             print(f"\r{model:<50} {'✓':<10} {response_text.strip()[:50]}")
+    #         except Exception as e1:
+    #             # Fall back to streaming if non-streaming fails
+    #             print(f"\r{model:<50} {'Testing stream...':<10}", end="", flush=True)
+    #             response = test_ai.chat("Say 'Hello' in one word", stream=True)
+    #             response_text = ""
+    #             for chunk in response:
+    #                 if chunk and isinstance(chunk, str):
+    #                     response_text += chunk
                 
-                if response_text and len(response_text.strip()) > 0:
-                    status = "✓"
-                    # Truncate response if too long
-                    display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
-                    print(f"\r{model:<50} {status:<10} {display_text}")
-                else:
-                    raise ValueError("Empty or invalid response")
-        except Exception as e:
-            print(f"\r{model:<50} {'✗':<10} {str(e)}")
+    #             if response_text and len(response_text.strip()) > 0:
+    #                 status = "✓"
+    #                 # Truncate response if too long
+    #                 display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
+    #                 print(f"\r{model:<50} {status:<10} {display_text}")
+    #             else:
+    #                 raise ValueError("Empty or invalid response")
+    #     except Exception as e:
+    #         print(f"\r{model:<50} {'✗':<10} {str(e)}")
+    from rich import print
+    ai = HeckAI()
+    response = ai.chat("tell me about humans", stream=True, raw=False)
+    for chunk in response:
+        print(chunk, end='', flush=True)

webscout/Provider/Jadve.py

@@ -170,16 +170,20 @@ class JadveOpenAI(Provider):
                     intro_value=None, # No simple prefix
                     to_json=False,    # Content is text after extraction
                     content_extractor=self._jadve_extractor, # Use the specific extractor
-                    # end_marker="e:", # Add if 'e:' reliably marks the end
-                    yield_raw_on_error=True
+                    yield_raw_on_error=True,
+                    raw=raw
                 )
 
                 for content_chunk in processed_stream:
-                    # content_chunk is the string extracted by _jadve_extractor
-                    if content_chunk and isinstance(content_chunk, str):
-                        full_response_text += content_chunk
-                        resp = {"text": content_chunk}
-                        yield resp if not raw else content_chunk
+                    if raw:
+                        if content_chunk and isinstance(content_chunk, str):
+                            full_response_text += content_chunk
+                        yield content_chunk
+                    else:
+                        if content_chunk and isinstance(content_chunk, str):
+                            full_response_text += content_chunk
+                            resp = {"text": content_chunk}
+                            yield resp
 
                 # Update history after stream finishes
                 self.last_response = {"text": full_response_text}
@@ -191,30 +195,22 @@ class JadveOpenAI(Provider):
                 err_text = getattr(e, 'response', None) and getattr(e.response, 'text', '')
                 raise exceptions.FailedToGenerateResponseError(f"Failed to generate response ({type(e).__name__}): {e} - {err_text}") from e
 
-
         def for_non_stream():
-            # Aggregate the stream using the updated for_stream logic
             collected_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:
-                        collected_text += chunk_data["text"]
-                    # Handle raw string case if raw=True was passed
-                    elif raw and isinstance(chunk_data, str):
-                         collected_text += chunk_data
+                    if raw:
+                        if isinstance(chunk_data, str):
+                            collected_text += chunk_data
+                    else:
+                        if isinstance(chunk_data, dict) and "text" in chunk_data:
+                            collected_text += chunk_data["text"]
             except Exception as e:
-                 # If aggregation fails but some text was received, use it. Otherwise, re-raise.
-                 if not collected_text:
-                     raise exceptions.FailedToGenerateResponseError(f"Failed to get non-stream response: {str(e)}") from e
-
+                if not collected_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 collected_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(
@@ -223,6 +219,7 @@ class JadveOpenAI(Provider):
         stream: bool = False,
         optimizer: str = None,
         conversationally: bool = False,
+        raw: bool = False,
     ) -> Union[str, Generator[str, None, None]]:
         """
         Generate a chat response (string). 
@@ -232,25 +229,29 @@ class JadveOpenAI(Provider):
             stream (bool, optional): Flag for streaming response. Defaults to False.
             optimizer (str, optional): Prompt optimizer name. Defaults to None.
             conversationally (bool, optional): Flag for conversational optimization. Defaults to False.
+            raw (bool, optional): Return raw response. Defaults to False.
         Returns:
             str or generator: Generated response string or generator yielding response chunks.
         """
         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()
 
@@ -268,24 +269,29 @@ class JadveOpenAI(Provider):
         return response.get("text", "")
 
 if __name__ == "__main__":
-    # Ensure curl_cffi is installed
-    print("-" * 80)
-    print(f"{'Model':<50} {'Status':<10} {'Response'}")
-    print("-" * 80)
-
-    for model in JadveOpenAI.AVAILABLE_MODELS:
-        try:
-            test_ai = JadveOpenAI(model=model, timeout=60)
-            response = test_ai.chat("Say 'Hello' in one word")
-            response_text = response
+    # # Ensure curl_cffi is installed
+    # print("-" * 80)
+    # print(f"{'Model':<50} {'Status':<10} {'Response'}")
+    # print("-" * 80)
+
+    # for model in JadveOpenAI.AVAILABLE_MODELS:
+    #     try:
+    #         test_ai = JadveOpenAI(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
-                display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
-            else:
-                status = "✗"
-                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)}")
+    #         if response_text and len(response_text.strip()) > 0:
+    #             status = "✓"
+    #             # Truncate response if too long
+    #             display_text = response_text.strip()[:50] + "..." if len(response_text.strip()) > 50 else response_text.strip()
+    #         else:
+    #             status = "✗"
+    #             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)}")
+    from rich import print
+    ai = JadveOpenAI()
+    response = ai.chat("tell me about humans", stream=True, raw=False)
+    for chunk in response:
+        print(chunk, end='', flush=True)

webscout/Provider/LambdaChat.py

@@ -93,49 +93,49 @@ class LambdaChat(Provider):
         self.session.proxies = proxies # Assign proxies directly
 
     def create_conversation(self, model: str):
-        """Create a new conversation with the specified model."""
+        """Create a new conversation with the specified model, using updated headers and cookies."""
         url = f"{self.url}/conversation"
         payload = {
             "model": model,
-            "preprompt": self.system_prompt,
-
+            "preprompt": self.system_prompt
         }
-        
-        # Update referer for this specific request
+
+        # Update headers for this specific request
         headers = self.headers.copy()
-        headers["Referer"] = f"{self.url}/models/{model}"
-        
+        headers["Referer"] = f"{self.url}/"
+        # Add browser-like headers for best compatibility
+        headers["Accept-Encoding"] = "gzip, deflate, br, zstd"
+        headers["Accept-Language"] = "en-US,en;q=0.9,en-IN;q=0.8"
+        headers["Sec-GPC"] = "1"
+        headers["Sec-Ch-Ua"] = '"Not)A;Brand";v="8", "Chromium";v="138", "Microsoft Edge";v="138"'
+        headers["Sec-Ch-Ua-Mobile"] = "?0"
+        headers["Sec-Ch-Ua-Platform"] = '"Windows"'
+        headers["User-Agent"] = LitAgent().random() # Use LitAgent for User-Agent
+        headers["Origin"] = self.url
+        # cookies are handled by curl_cffi session automatically
+
         try:
-            # Use curl_cffi session post with impersonate
             response = self.session.post(
-                url, 
-                json=payload, 
-                headers=headers, # Use updated headers with specific Referer
-                impersonate="chrome110" # Use a common impersonation profile
+                url,
+                json=payload,
+                headers=headers,
+                impersonate="chrome110"
             )
-            
             if response.status_code == 401:
                 raise exceptions.AuthenticationError("Authentication failed.")
-            
-            # Handle other error codes
             if response.status_code != 200:
                 return None
-                
             data = response.json()
             conversation_id = data.get("conversationId")
-            
-            # Store conversation data
             if model not in self._conversation_data:
                 self._conversation_data[model] = {
                     "conversationId": conversation_id,
-                    "messageId": str(uuid.uuid4())  # Initial message ID
+                    "messageId": str(uuid.uuid4())
                 }
-                
             return conversation_id
-        except CurlError as e: # Catch CurlError
-            # Log or handle CurlError specifically if needed
+        except CurlError:
             return None
-        except Exception: # Catch other potential exceptions (like JSONDecodeError, HTTPError)
+        except Exception:
             return None
     
     def fetch_message_id(self, conversation_id: str) -> str:
@@ -230,35 +230,43 @@ class LambdaChat(Provider):
         url = f"{self.url}/conversation/{conversation_id}"
         message_id = self._conversation_data[model]["messageId"]
         
-        # Data to send
+        # Data to send (tools should be empty list by default)
         request_data = {
             "inputs": prompt,
             "id": message_id,
             "is_retry": False,
             "is_continue": False,
             "web_search": web_search,
-            "tools": ["66e85bb396d054c5771bc6cb", "00000000000000000000000a"]
+            "tools": []
         }
-        
+
         # Update headers for this specific request
         headers = self.headers.copy()
         headers["Referer"] = f"{self.url}/conversation/{conversation_id}"
-        
+        headers["Accept-Encoding"] = "gzip, deflate, br, zstd"
+        headers["Accept-Language"] = "en-US,en;q=0.9,en-IN;q=0.8"
+        headers["Sec-GPC"] = "1"
+        headers["Sec-Ch-Ua"] = '"Not)A;Brand";v="8", "Chromium";v="138", "Microsoft Edge";v="138"'
+        headers["Sec-Ch-Ua-Mobile"] = "?0"
+        headers["Sec-Ch-Ua-Platform"] = '"Windows"'
+        headers["User-Agent"] = LitAgent().random() # Use LitAgent for User-Agent
+        headers["Origin"] = self.url
+
         # Create multipart form data
         boundary = self.generate_boundary()
         multipart_headers = headers.copy()
         multipart_headers["Content-Type"] = f"multipart/form-data; boundary={boundary}"
-        
+
         # Serialize the data to JSON
         data_json = json.dumps(request_data, separators=(',', ':'))
-        
+
         # Create the multipart form data body
         body = f"--{boundary}\r\n"
         body += f'Content-Disposition: form-data; name="data"\r\n'
-        body += f"Content-Type: application/json\r\n\r\n"
+        body += f"\r\n"
         body += f"{data_json}\r\n"
         body += f"--{boundary}--\r\n"
-        
+
         multipart_headers["Content-Length"] = str(len(body))
         
         def for_stream():