webscout 8.2.2__py3-none-any.whl → 2026.1.19__py3-none-any.whl

webscout/Provider/OPENAI/netwrck.py

@@ -1,30 +1,38 @@
+import json
 import time
 import uuid
+from typing import Any, Dict, Generator, List, Optional, Union, cast
+
 import requests
-import json
-from typing import List, Dict, Optional, Union, Generator, Any
 
-from webscout.Provider.yep import T
-from webscout.litagent import LitAgent
-from .base import BaseChat, BaseCompletions, OpenAICompatibleProvider
-from .utils import (
+from webscout.Provider.OPENAI.base import (
+    BaseChat,
+    BaseCompletions,
+    OpenAICompatibleProvider,
+    SimpleModelList,
+)
+from webscout.Provider.OPENAI.utils import (
     ChatCompletion,
     ChatCompletionChunk,
-    Choice,
     ChatCompletionMessage,
+    Choice,
     ChoiceDelta,
     CompletionUsage,
+    count_tokens,
     format_prompt,
-    get_system_prompt
+    get_system_prompt,
 )
 
+from ...litagent import LitAgent
+
 # ANSI escape codes for formatting
 BOLD = "\033[1m"
 RED = "\033[91m"
 RESET = "\033[0m"
 
+
 class Completions(BaseCompletions):
-    def __init__(self, client: 'Netwrck'):
+    def __init__(self, client: "Netwrck"):
         self._client = client
 
     def create(
@@ -36,7 +44,9 @@ class Completions(BaseCompletions):
         stream: bool = False,
         temperature: Optional[float] = None,
         top_p: Optional[float] = None,
-        **kwargs: Any
+        timeout: Optional[int] = None,
+        proxies: Optional[Dict[str, str]] = None,
+        **kwargs: Any,
     ) -> Union[ChatCompletion, Generator[ChatCompletionChunk, None, None]]:
         """
         Creates a model response for the given chat conversation.
@@ -45,35 +55,43 @@ class Completions(BaseCompletions):
         # Format the messages using the format_prompt utility
         # This creates a conversation in the format: "User: message\nAssistant: response\nUser: message\nAssistant:"
         formatted_prompt = format_prompt(messages, add_special_tokens=True, do_continue=True)
-        
-       
+
         # Prepare the payload for Netwrck API
         payload = {
             "query": formatted_prompt,
             "context": get_system_prompt(messages),
             "examples": [],
             "model_name": self._client.convert_model_name(model),
-            "greeting": self._client.greeting
+            "greeting": self._client.greeting,
         }
 
         request_id = f"chatcmpl-{uuid.uuid4()}"
         created_time = int(time.time())
 
         if stream:
-            return self._create_stream(request_id, created_time, model, payload)
+            return self._create_stream(request_id, created_time, model, payload, timeout, proxies)
         else:
-            return self._create_non_stream(request_id, created_time, model, payload)
+            return self._create_non_stream(
+                request_id, created_time, model, payload, timeout, proxies
+            )
 
     def _create_stream(
-        self, request_id: str, created_time: int, model: str, payload: Dict[str, Any]
+        self,
+        request_id: str,
+        created_time: int,
+        model: str,
+        payload: Dict[str, Any],
+        timeout: Optional[int] = None,
+        proxies: Optional[Dict[str, str]] = None,
     ) -> Generator[ChatCompletionChunk, None, None]:
         try:
             response = self._client.session.post(
                 "https://netwrck.com/api/chatpred_or",
                 json=payload,
                 headers=self._client.headers,
-                timeout=self._client.timeout,
-                stream=True
+                timeout=timeout or self._client.timeout,
+                proxies=proxies or getattr(self._client, "proxies", None),
+                stream=True,
             )
             response.raise_for_status()
 
@@ -84,26 +102,26 @@ class Completions(BaseCompletions):
             for line in response.iter_lines():
                 if not line:
                     continue
-                
+
                 try:
-                    decoded_line = line.decode('utf-8').strip('"')
+                    decoded_line = line.decode("utf-8").strip('"')
                     if decoded_line:
                         # Format the decoded line using the client's formatter
                         formatted_content = self._client.format_text(decoded_line)
                         streaming_text += formatted_content
-                        completion_tokens += len(formatted_content) // 4  # Rough estimate
-                        
+                        completion_tokens += count_tokens(formatted_content)
+
                         # Create a delta object for this chunk
                         delta = ChoiceDelta(content=formatted_content)
                         choice = Choice(index=0, delta=delta, finish_reason=None)
-                        
+
                         chunk = ChatCompletionChunk(
                             id=request_id,
                             choices=[choice],
                             created=created_time,
                             model=model,
                         )
-                        
+
                         yield chunk
                 except Exception:
                     continue
@@ -111,14 +129,14 @@ class Completions(BaseCompletions):
             # Final chunk with finish_reason
             delta = ChoiceDelta(content=None)
             choice = Choice(index=0, delta=delta, finish_reason="stop")
-            
+
             chunk = ChatCompletionChunk(
                 id=request_id,
                 choices=[choice],
                 created=created_time,
                 model=model,
             )
-            
+
             yield chunk
 
         except requests.exceptions.RequestException as e:
@@ -126,46 +144,46 @@ class Completions(BaseCompletions):
             raise IOError(f"Netwrck request failed: {e}") from e
 
     def _create_non_stream(
-        self, request_id: str, created_time: int, model: str, payload: Dict[str, Any]
+        self,
+        request_id: str,
+        created_time: int,
+        model: str,
+        payload: Dict[str, Any],
+        timeout: Optional[int] = None,
+        proxies: Optional[Dict[str, str]] = None,
     ) -> ChatCompletion:
         try:
             response = self._client.session.post(
                 "https://netwrck.com/api/chatpred_or",
                 json=payload,
                 headers=self._client.headers,
-                timeout=self._client.timeout
+                timeout=timeout or self._client.timeout,
+                proxies=proxies or getattr(self._client, "proxies", None),
             )
             response.raise_for_status()
-            
+
             # Process the response
             raw_response = response.text.strip('"')
             # Format the full response using the client's formatter
             full_response = self._client.format_text(raw_response)
 
-            # Create usage statistics (estimated)
-            prompt_tokens = len(payload["query"]) // 4
-            completion_tokens = len(full_response) // 4
+            # Create usage statistics using count_tokens
+            prompt_tokens = count_tokens(payload.get("query", ""))
+            completion_tokens = count_tokens(full_response)
             total_tokens = prompt_tokens + completion_tokens
-            
+
             usage = CompletionUsage(
                 prompt_tokens=prompt_tokens,
                 completion_tokens=completion_tokens,
-                total_tokens=total_tokens
+                total_tokens=total_tokens,
             )
-            
+
             # Create the message object
-            message = ChatCompletionMessage(
-                role="assistant",
-                content=full_response
-            )
-            
+            message = ChatCompletionMessage(role="assistant", content=full_response)
+
             # Create the choice object
-            choice = Choice(
-                index=0,
-                message=message,
-                finish_reason="stop"
-            )
-            
+            choice = Choice(index=0, message=message, finish_reason="stop")
+
             # Create the completion object
             completion = ChatCompletion(
                 id=request_id,
@@ -174,17 +192,19 @@ class Completions(BaseCompletions):
                 model=model,
                 usage=usage,
             )
-            
+
             return completion
 
         except Exception as e:
             print(f"{RED}Error during Netwrck non-stream request: {e}{RESET}")
             raise IOError(f"Netwrck request failed: {e}") from e
 
+
 class Chat(BaseChat):
-    def __init__(self, client: 'Netwrck'):
+    def __init__(self, client: "Netwrck"):
         self.completions = Completions(client)
 
+
 class Netwrck(OpenAICompatibleProvider):
     """
     OpenAI-compatible client for Netwrck API.
@@ -198,17 +218,16 @@ class Netwrck(OpenAICompatibleProvider):
         print(response.choices[0].message.content)
     """
 
+    required_auth = False
+
     AVAILABLE_MODELS = [
-        "neversleep/llama-3-lumimaid-8b:extended",
-        "x-ai/grok-2",
-        "anthropic/claude-3-7-sonnet-20250219",
+        "thedrummer/valkyrie-49b-v1",
+        "thedrummer/skyfall-36b-v2",
         "sao10k/l3-euryale-70b",
-        "openai/gpt-4o-mini",
+        "deepseek/deepseek-chat",
+        "deepseek/deepseek-r1",
         "gryphe/mythomax-l2-13b",
-        "google/gemini-pro-1.5",
         "nvidia/llama-3.1-nemotron-70b-instruct",
-        "deepseek/deepseek-r1",
-        "deepseek/deepseek-chat"
     ]
 
     # Default greeting used by Netwrck
@@ -219,7 +238,7 @@ class Netwrck(OpenAICompatibleProvider):
         timeout: int = 30,
         temperature: float = 0.7,
         top_p: float = 0.8,
-        system_prompt: str = "You are a helpful assistant."
+        system_prompt: str = "You are a helpful assistant.",
     ):
         """
         Initialize the Netwrck client.
@@ -234,23 +253,23 @@ class Netwrck(OpenAICompatibleProvider):
         self.temperature = temperature
         self.top_p = top_p
         self.system_prompt = system_prompt
-        
+
         # Initialize LitAgent for user agent generation
         agent = LitAgent()
-        
+
         self.headers = {
-            'authority': 'netwrck.com',
-            'accept': '*/*',
-            'accept-language': 'en-US,en;q=0.9',
-            'content-type': 'application/json',
-            'origin': 'https://netwrck.com',
-            'referer': 'https://netwrck.com/',
-            'user-agent': agent.random()
+            "authority": "netwrck.com",
+            "accept": "*/*",
+            "accept-language": "en-US,en;q=0.9",
+            "content-type": "application/json",
+            "origin": "https://netwrck.com",
+            "referer": "https://netwrck.com/",
+            "user-agent": agent.random(),
         }
-        
+
         self.session = requests.Session()
         self.session.headers.update(self.headers)
-        
+
         # Initialize the chat interface
         self.chat = Chat(self)
 
@@ -267,12 +286,12 @@ class Netwrck(OpenAICompatibleProvider):
         # Use a more comprehensive approach to handle all escape sequences
         try:
             # First handle double backslashes to avoid issues
-            text = text.replace('\\\\', '\\')
+            text = text.replace("\\\\", "\\")
 
             # Handle common escape sequences
-            text = text.replace('\\n', '\n')
-            text = text.replace('\\r', '\r')
-            text = text.replace('\\t', '\t')
+            text = text.replace("\\n", "\n")
+            text = text.replace("\\r", "\r")
+            text = text.replace("\\t", "\t")
             text = text.replace('\\"', '"')
             text = text.replace("\\'", "'")
 
@@ -298,15 +317,21 @@ class Netwrck(OpenAICompatibleProvider):
         """
         if model in self.AVAILABLE_MODELS:
             return model
-        
+
         # Try to find a matching model
         for available_model in self.AVAILABLE_MODELS:
             if model.lower() in available_model.lower():
                 return available_model
-        
-        # Default to Claude if no match
-        print(f"{BOLD}Warning: Model '{model}' not found, using default model 'anthropic/claude-3-7-sonnet-20250219'{RESET}")
-        return "anthropic/claude-3-7-sonnet-20250219"
+
+        # Default to DeepSeek if no match
+        print(
+            f"{BOLD}Warning: Model '{model}' not found, using default model 'deepseek/deepseek-r1'{RESET}"
+        )
+        return "deepseek/deepseek-r1"
+
+    @property
+    def models(self) -> SimpleModelList:
+        return SimpleModelList(type(self).AVAILABLE_MODELS)
 
 
 # Simple test if run directly
@@ -316,11 +341,7 @@ if __name__ == "__main__":
     print("-" * 80)
 
     # Test a subset of models to avoid excessive API calls
-    test_models = [
-        "anthropic/claude-3-7-sonnet-20250219",
-        "openai/gpt-4o-mini",
-        "deepseek/deepseek-chat"
-    ]
+    test_models = ["deepseek/deepseek-r1", "deepseek/deepseek-chat", "gryphe/mythomax-l2-13b"]
 
     for model in test_models:
         try:
@@ -332,10 +353,15 @@ if __name__ == "__main__":
                     {"role": "system", "content": "You are a helpful assistant."},
                     {"role": "user", "content": "Say 'Hello' in one word"},
                 ],
-                stream=False
+                stream=False,
             )
-            
-            if response and response.choices and response.choices[0].message.content:
+
+            if (
+                isinstance(response, ChatCompletion)
+                and response.choices
+                and response.choices[0].message
+                and response.choices[0].message.content
+            ):
                 status = "✓"
                 # Truncate response if too long
                 display_text = response.choices[0].message.content.strip()