webscout 8.3.6__py3-none-any.whl → 8.3.7__py3-none-any.whl

webscout/Provider/TogetherAI.py

@@ -7,13 +7,15 @@ from webscout.AIutel import Conversation
 from webscout.AIutel import AwesomePrompts, sanitize_stream
 from webscout.AIbase import Provider
 from webscout import exceptions
-from webscout.litagent import LitAgent
 
 class TogetherAI(Provider):
     """
     A class to interact with the TogetherAI API.
     """
 
+    required_auth = True
+
+    # Default models list (will be updated dynamically)
     AVAILABLE_MODELS = [
         "NousResearch/Nous-Hermes-2-Mixtral-8x7B-DPO",
         "Qwen/QwQ-32B",
@@ -78,6 +80,53 @@ class TogetherAI(Provider):
         "zai-org/GLM-4.5-Air-FP8"
     ]
 
+    @classmethod
+    def get_models(cls, api_key: str = None):
+        """Fetch available models from TogetherAI API.
+        
+        Args:
+            api_key (str, optional): TogetherAI API key. If not provided, returns default models.
+            
+        Returns:
+            list: List of available model IDs
+        """
+        if not api_key:
+            return cls.AVAILABLE_MODELS
+            
+        try:
+            # Use a temporary curl_cffi session for this class method
+            temp_session = Session()
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {api_key}",
+            }
+            
+            response = temp_session.get(
+                "https://api.together.xyz/v1/models",
+                headers=headers,
+                impersonate="chrome110"
+            )
+            
+            if response.status_code != 200:
+                return cls.AVAILABLE_MODELS
+                
+            data = response.json()
+            if "data" in data and isinstance(data["data"], list):
+                return [model["id"] for model in data["data"]]
+            return cls.AVAILABLE_MODELS
+            
+        except (CurlError, Exception):
+            # Fallback to default models list if fetching fails
+            return cls.AVAILABLE_MODELS
+
+    def update_available_models(self, api_key: str):
+        """Update available models by fetching from TogetherAI API.
+        
+        Args:
+            api_key (str): TogetherAI API key for fetching models.
+        """
+        self.AVAILABLE_MODELS = self.get_models(api_key)
+
     @staticmethod
     def _togetherai_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
         """Extracts content from TogetherAI stream JSON objects."""
@@ -87,6 +136,7 @@ class TogetherAI(Provider):
 
     def __init__(
         self,
+        api_key: str,
         is_conversation: bool = True,
         max_tokens: int = 2049,
         timeout: int = 30,
@@ -98,45 +148,48 @@ class TogetherAI(Provider):
         act: str = None,
         model: str = "meta-llama/Llama-3.1-8B-Instruct-Turbo",
         system_prompt: str = "You are a helpful assistant.",
-        browser: str = "chrome"
     ):
-        """Initializes the TogetherAI API client."""
+        """Initializes the TogetherAI API client.
+
+        Args:
+            api_key (str): TogetherAI API key.
+            is_conversation (bool, optional): Flag for chatting conversationally. Defaults to True.
+            max_tokens (int, optional): Maximum number of tokens to be generated upon completion. Defaults to 2049.
+            timeout (int, optional): Http request timeout. Defaults to 30.
+            intro (str, optional): Conversation introductory prompt. Defaults to None.
+            filepath (str, optional): Path to file containing conversation history. Defaults to None.
+            update_file (bool, optional): Add new prompts and responses to the file. Defaults to True.
+            proxies (dict, optional): Http request proxies. Defaults to {}.
+            history_offset (int, optional): Limit conversation history to this number of last texts. Defaults to 10250.
+            act (str|int, optional): Awesome prompt key or index. (Used as intro). Defaults to None.
+            model (str, optional): LLM model name. Defaults to "meta-llama/Llama-3.1-8B-Instruct-Turbo".
+            system_prompt (str, optional): System prompt to guide the conversation. Defaults to None.
+        """
+        # Update available models from API
+        self.update_available_models(api_key)
+        
+        # Validate model after updating available models
         if model not in self.AVAILABLE_MODELS:
             raise ValueError(f"Invalid model: {model}. Choose from: {self.AVAILABLE_MODELS}")
 
         self.api_endpoint = "https://api.together.xyz/v1/chat/completions"
-        self.activation_endpoint = "https://www.codegeneration.ai/activate-v2"
-
-        # Initialize LitAgent
-        self.agent = LitAgent()
-        self.fingerprint = self.agent.generate_fingerprint(browser)
-
-        # Use the fingerprint for headers
-        self.headers = {
-            "Accept": self.fingerprint["accept"],
-            "Accept-Language": self.fingerprint["accept_language"],
-            "Content-Type": "application/json",
-            "Cache-Control": "no-cache",
-            "Origin": "https://www.codegeneration.ai",
-            "Pragma": "no-cache",
-            "Referer": "https://www.codegeneration.ai/",
-            "Sec-Fetch-Dest": "empty",
-            "Sec-Fetch-Mode": "cors",
-            "Sec-Fetch-Site": "same-site",
-            "User-Agent": self.fingerprint["user_agent"],
-        }
-
-        # Initialize curl_cffi Session
         self.session = Session()
-        self.session.headers.update(self.headers)
-        self.session.proxies = proxies
-        self.system_prompt = system_prompt
         self.is_conversation = is_conversation
         self.max_tokens_to_sample = max_tokens
+        self.api_key = api_key
+        self.model = model
         self.timeout = timeout
         self.last_response = {}
-        self.model = model
-        self._api_key_cache = None
+        self.system_prompt = system_prompt
+        
+        self.headers = {
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {self.api_key}",
+        }
+        
+        # Update curl_cffi session headers
+        self.session.headers.update(self.headers)
+        self.session.proxies = proxies
 
         self.__available_optimizers = (
             method
@@ -156,45 +209,7 @@ class TogetherAI(Provider):
         )
         self.conversation.history_offset = history_offset
 
-    def refresh_identity(self, browser: str = None):
-        """
-        Refreshes the browser identity fingerprint.
-
-        Args:
-            browser: Specific browser to use for the new fingerprint
-        """
-        browser = browser or self.fingerprint.get("browser_type", "chrome")
-        self.fingerprint = self.agent.generate_fingerprint(browser)
-
-        # Update headers with new fingerprint
-        self.headers.update({
-            "Accept": self.fingerprint["accept"],
-            "Accept-Language": self.fingerprint["accept_language"],
-            "User-Agent": self.fingerprint["user_agent"],
-        })
-
-        # Update session headers
-        self.session.headers.update(self.headers)
-
-        return self.fingerprint
 
-    def get_activation_key(self) -> str:
-        """Get API key from activation endpoint"""
-        if self._api_key_cache:
-            return self._api_key_cache
-
-        try:
-            response = self.session.get(
-                self.activation_endpoint,
-                headers={"Accept": "application/json"},
-                timeout=30
-            )
-            response.raise_for_status()
-            activation_data = response.json()
-            self._api_key_cache = activation_data["openAIParams"]["apiKey"]
-            return self._api_key_cache
-        except Exception as e:
-            raise exceptions.FailedToGenerateResponseError(f"Failed to get activation key: {e}")
 
     def ask(
         self,
@@ -215,10 +230,7 @@ class TogetherAI(Provider):
                 )
             else:
                 raise Exception(f"Optimizer is not one of {self.__available_optimizers}")
-        if not self.headers.get("Authorization"):
-            api_key = self.get_activation_key()
-            self.headers["Authorization"] = f"Bearer {api_key}"
-            self.session.headers.update(self.headers)
+
         payload = {
             "model": self.model,
             "messages": [
@@ -339,20 +351,7 @@ if __name__ == "__main__":
 
     for model in TogetherAI.AVAILABLE_MODELS:
         try:
-            test_ai = TogetherAI(model=model, timeout=60)
-            response = test_ai.chat("Say 'Hello' in one word", stream=True)
-            response_text = ""
-            for chunk in response:
-                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 = "✗"
-                display_text = "Empty or invalid response"
-            print(f"\r{model:<50} {status:<10} {display_text}")
+            # Skip testing if no API key is provided
+            print(f"\r{model:<50} {'⚠':<10} Requires API key for testing")
         except Exception as e:
             print(f"\r{model:<50} {'✗':<10} {str(e)}")