webscout 8.2.8__py3-none-any.whl → 8.2.9__py3-none-any.whl

webscout/Provider/OPENAI/chatsandbox.py

@@ -10,7 +10,8 @@ from .utils import (
     ChatCompletionMessage,
     ChoiceDelta,
     CompletionUsage,
-    format_prompt
+    format_prompt,
+    count_tokens
 )
 import requests
 
@@ -124,8 +125,8 @@ class Completions(BaseCompletions):
                     content = data.get("reasoning_content", text)
                 except Exception:
                     content = text
-                prompt_tokens = len(question) // 4
-                completion_tokens = len(content) // 4
+                prompt_tokens = count_tokens(question)
+                completion_tokens = count_tokens(content)
                 total_tokens = prompt_tokens + completion_tokens
                 usage = CompletionUsage(
                     prompt_tokens=prompt_tokens,

webscout/Provider/OPENAI/copilot.py

@@ -0,0 +1,242 @@
+import json
+import uuid
+import time
+from typing import List, Dict, Optional, Union, Generator, Any
+from urllib.parse import quote
+from curl_cffi.requests import Session, CurlWsFlag
+
+# Import base classes and utility structures
+from .base import OpenAICompatibleProvider, BaseChat, BaseCompletions
+from .utils import (
+    ChatCompletionChunk, ChatCompletion, Choice, ChoiceDelta,
+    ChatCompletionMessage, CompletionUsage, format_prompt, count_tokens
+)
+
+# Attempt to import LitAgent, fallback if not available
+try:
+    from webscout.litagent import LitAgent
+except ImportError:
+    pass
+
+# --- Microsoft Copilot Client ---
+
+class Completions(BaseCompletions):
+    def __init__(self, client: 'Copilot'):
+        self._client = client
+
+    def create(
+        self,
+        *,
+        model: str,
+        messages: List[Dict[str, str]],
+        max_tokens: Optional[int] = None,
+        stream: bool = False,
+        temperature: Optional[float] = None,
+        top_p: Optional[float] = None,
+        **kwargs: Any
+    ) -> Union[ChatCompletion, Generator[ChatCompletionChunk, None, None]]:
+        """
+        Creates a model response for the given chat conversation.
+        Mimics openai.chat.completions.create
+        """
+        # Format the entire conversation using the utility function
+        formatted_prompt = format_prompt(messages, add_special_tokens=True, include_system=True, do_continue=True)
+        
+        request_id = f"chatcmpl-{uuid.uuid4()}"
+        created_time = int(time.time())
+
+        # Handle image if provided
+        image = kwargs.get("image")
+
+        if stream:
+            return self._create_stream(request_id, created_time, model, formatted_prompt, image)
+        else:
+            return self._create_non_stream(request_id, created_time, model, formatted_prompt, image)
+
+    def _create_stream(
+        self, request_id: str, created_time: int, model: str, prompt_text: str, image: Optional[bytes] = None
+    ) -> Generator[ChatCompletionChunk, None, None]:
+        try:
+            s = self._client.session
+            # Create a new conversation if needed
+            r = s.post(self._client.conversation_url)
+            if r.status_code != 200:
+                raise RuntimeError(f"Failed to create conversation: {r.text}")
+            conv_id = r.json().get("id")
+
+            # Handle image upload if provided
+            images = []
+            if image:
+                r = s.post(
+                    f"{self._client.url}/c/api/attachments",
+                    headers={"content-type": "image/jpeg"},
+                    data=image
+                )
+                if r.status_code != 200:
+                    raise RuntimeError(f"Image upload failed: {r.text}")
+                images.append({"type": "image", "url": r.json().get("url")})
+
+            # Connect to websocket
+            ws = s.ws_connect(self._client.websocket_url)
+
+            # Use model to set mode ("reasoning" for Think Deeper)
+            mode = "reasoning" if "Think" in model else "chat"
+
+            # Send the message to Copilot
+            ws.send(json.dumps({
+                "event": "send",
+                "conversationId": conv_id,
+                "content": images + [{"type": "text", "text": prompt_text}],
+                "mode": mode
+            }).encode(), CurlWsFlag.TEXT)
+
+            # Track token usage using count_tokens
+            prompt_tokens = count_tokens(prompt_text)
+            completion_tokens = 0
+            total_tokens = prompt_tokens
+
+            started = False
+            while True:
+                try:
+                    msg = json.loads(ws.recv()[0])
+                except Exception:
+                    break
+
+                if msg.get("event") == "appendText":
+                    started = True
+                    content = msg.get("text", "")
+                    
+                    # Update token counts using count_tokens
+                    content_tokens = count_tokens(content)
+                    completion_tokens += content_tokens
+                    total_tokens = prompt_tokens + completion_tokens
+
+                    # Create the delta object
+                    delta = ChoiceDelta(
+                        content=content,
+                        role="assistant"
+                    )
+
+                    # Create the choice object
+                    choice = Choice(
+                        index=0,
+                        delta=delta,
+                        finish_reason=None
+                    )
+
+                    # Create the chunk object
+                    chunk = ChatCompletionChunk(
+                        id=request_id,
+                        choices=[choice],
+                        created=created_time,
+                        model=model
+                    )
+
+                    yield chunk
+                elif msg.get("event") == "done":
+                    # Final chunk with finish_reason
+                    delta = ChoiceDelta(
+                        content=None,
+                        role=None
+                    )
+
+                    choice = Choice(
+                        index=0,
+                        delta=delta,
+                        finish_reason="stop"
+                    )
+
+                    chunk = ChatCompletionChunk(
+                        id=request_id,
+                        choices=[choice],
+                        created=created_time,
+                        model=model
+                    )
+
+                    yield chunk
+                    break
+                elif msg.get("event") == "error":
+                    raise RuntimeError(f"Copilot error: {msg}")
+
+            ws.close()
+
+            if not started:
+                raise RuntimeError("No response received from Copilot")
+
+        except Exception as e:
+            raise RuntimeError(f"Stream error: {e}") from e
+
+    def _create_non_stream(
+        self, request_id: str, created_time: int, model: str, prompt_text: str, image: Optional[bytes] = None
+    ) -> ChatCompletion:
+        result = ""
+        for chunk in self._create_stream(request_id, created_time, model, prompt_text, image):
+            if hasattr(chunk, 'choices') and chunk.choices and hasattr(chunk.choices[0], 'delta') and chunk.choices[0].delta.content:
+                result += chunk.choices[0].delta.content
+
+        # Create the message object
+        message = ChatCompletionMessage(
+            role="assistant",
+            content=result
+        )
+
+        # Create the choice object
+        choice = Choice(
+            index=0,
+            message=message,
+            finish_reason="stop"
+        )
+
+        # Estimate token usage using count_tokens
+        prompt_tokens = count_tokens(prompt_text)
+        completion_tokens = count_tokens(result)
+        total_tokens = prompt_tokens + completion_tokens
+
+        # Create usage object
+        usage = CompletionUsage(
+            prompt_tokens=prompt_tokens,
+            completion_tokens=completion_tokens,
+            total_tokens=total_tokens
+        )
+
+        # Create the completion object
+        completion = ChatCompletion(
+            id=request_id,
+            choices=[choice],
+            created=created_time,
+            model=model,
+            usage=usage
+        )
+
+        return completion
+
+class Chat(BaseChat):
+    def __init__(self, client: 'Copilot'):
+        self.completions = Completions(client)
+
+class Copilot(OpenAICompatibleProvider):
+    
+    url = "https://copilot.microsoft.com"
+    conversation_url = f"{url}/c/api/conversations"
+    websocket_url = "wss://copilot.microsoft.com/c/api/chat?api-version=2"
+    
+    AVAILABLE_MODELS = ["Copilot", "Think Deeper"]
+
+    def __init__(self, timeout: int = 900, browser: str = "chrome", tools: Optional[List] = None, **kwargs):
+        self.timeout = timeout
+        self.session = Session(timeout=timeout, impersonate=browser)
+
+        # Initialize tools
+        self.available_tools = {}
+        if tools:
+            self.register_tools(tools)
+            
+        # Set up the chat interface
+        self.chat = Chat(self)
+
+    @property
+    def models(self):
+        class _ModelList:
+            def list(inner_self):
+                return self.AVAILABLE_MODELS
+        return _ModelList()

webscout/Provider/OPENAI/deepinfra.py

@@ -125,8 +125,11 @@ class Completions(BaseCompletions):
                                 system_fingerprint=data.get('system_fingerprint')
                             )
 
-                            # Convert to dict for proper formatting
-                            chunk_dict = chunk.to_dict()
+                            # Convert chunk to dict using Pydantic's API
+                            if hasattr(chunk, "model_dump"):
+                                chunk_dict = chunk.model_dump(exclude_none=True)
+                            else:
+                                chunk_dict = chunk.dict(exclude_none=True)
 
                             # Add usage information to match OpenAI format
                             # Even if we don't have real token counts, include estimated usage

webscout/Provider/OPENAI/e2b.py

@@ -11,7 +11,7 @@ import requests  # For bypassing Cloudflare protection
 from .base import OpenAICompatibleProvider, BaseChat, BaseCompletions
 from .utils import (
     ChatCompletionChunk, ChatCompletion, Choice, ChoiceDelta,
-    ChatCompletionMessage, CompletionUsage, format_prompt
+    ChatCompletionMessage, CompletionUsage, count_tokens
 )
 
 # Attempt to import LitAgent, fallback if not available
@@ -899,7 +899,65 @@ MODEL_PROMPT = {
                 }
             }
         }
-    }
+    },
+    "claude-opus-4-20250514": {
+        "apiUrl": "https://fragments.e2b.dev/api/chat",
+        "id": "claude-opus-4-20250514",
+        "name": "Claude Opus 4 (2025-05-14)",
+        "Knowledge": "2025-05",
+        "provider": "Anthropic",
+        "providerId": "anthropic",
+        "multiModal": True,
+        "templates": {
+            "system": {
+                "intro": "You are Claude Opus 4, a large language model trained by Anthropic",
+                "principles": ["honesty", "ethics", "diligence"],
+                "latex": {
+                    "inline": "$x^2$",
+                    "block": "$e=mc^2$"
+                }
+            }
+        },
+        "requestConfig": {
+            "template": {
+                "txt": {
+                    "name": "chat with users and start role-playing, Above of all: Follow the latest news from users",
+                    "lib": [""],
+                    "file": "pages/ChatWithUsers.txt",
+                    "port": 3000
+                }
+            }
+        }
+    },
+    "claude-sonnet-4": {
+        "apiUrl": "https://fragments.e2b.dev/api/chat",
+        "id": "claude-sonnet-4",
+        "name": "Claude Sonnet 4",
+        "Knowledge": "2025-05",
+        "provider": "Anthropic",
+        "providerId": "anthropic",
+        "multiModal": True,
+        "templates": {
+            "system": {
+                "intro": "You are Claude Sonnet 4, a large language model trained by Anthropic",
+                "principles": ["honesty", "ethics", "diligence"],
+                "latex": {
+                    "inline": "$x^2$",
+                    "block": "$e=mc^2$"
+                }
+            }
+        },
+        "requestConfig": {
+            "template": {
+                "txt": {
+                    "name": "chat with users and start role-playing, Above of all: Follow the latest news from users",
+                    "lib": [""],
+                    "file": "pages/ChatWithUsers.txt",
+                    "port": 3000
+                }
+            }
+        }
+    },
 }
 
 class Completions(BaseCompletions):
@@ -1039,9 +1097,9 @@ class Completions(BaseCompletions):
             model_config = self._client.MODEL_PROMPT[model_id]
             full_response_text = self._send_request(request_body, model_config)
 
-            # Estimate token counts
-            prompt_tokens = sum(len(msg.get("content", [{"text": ""}])[0].get("text", "")) for msg in request_body.get("messages", [])) // 4
-            completion_tokens = len(full_response_text) // 4
+            # Estimate token counts using count_tokens
+            prompt_tokens = count_tokens([msg.get("content", [{"text": ""}])[0].get("text", "") for msg in request_body.get("messages", [])])
+            completion_tokens = count_tokens(full_response_text)
             total_tokens = prompt_tokens + completion_tokens
 
             message = ChatCompletionMessage(role="assistant", content=full_response_text)