webscout 8.2.4__py3-none-any.whl → 8.2.6__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of webscout might be problematic. Click here for more details.
- webscout/AIauto.py +112 -22
- webscout/AIutel.py +240 -344
- webscout/Extra/autocoder/autocoder.py +66 -5
- webscout/Extra/gguf.py +2 -0
- webscout/Provider/AISEARCH/scira_search.py +3 -5
- webscout/Provider/Aitopia.py +75 -51
- webscout/Provider/AllenAI.py +64 -67
- webscout/Provider/ChatGPTClone.py +33 -34
- webscout/Provider/ChatSandbox.py +342 -0
- webscout/Provider/Cloudflare.py +79 -32
- webscout/Provider/Deepinfra.py +69 -56
- webscout/Provider/ElectronHub.py +48 -39
- webscout/Provider/ExaChat.py +36 -20
- webscout/Provider/GPTWeb.py +24 -18
- webscout/Provider/GithubChat.py +52 -49
- webscout/Provider/GizAI.py +285 -0
- webscout/Provider/Glider.py +39 -28
- webscout/Provider/Groq.py +48 -20
- webscout/Provider/HeckAI.py +18 -36
- webscout/Provider/Jadve.py +30 -37
- webscout/Provider/LambdaChat.py +36 -59
- webscout/Provider/MCPCore.py +18 -21
- webscout/Provider/Marcus.py +23 -14
- webscout/Provider/Nemotron.py +218 -0
- webscout/Provider/Netwrck.py +35 -26
- webscout/Provider/OPENAI/__init__.py +1 -1
- webscout/Provider/OPENAI/exachat.py +4 -0
- webscout/Provider/OPENAI/scirachat.py +3 -4
- webscout/Provider/OPENAI/textpollinations.py +20 -22
- webscout/Provider/OPENAI/toolbaz.py +1 -0
- webscout/Provider/PI.py +22 -13
- webscout/Provider/StandardInput.py +42 -30
- webscout/Provider/TeachAnything.py +24 -12
- webscout/Provider/TextPollinationsAI.py +78 -76
- webscout/Provider/TwoAI.py +120 -88
- webscout/Provider/TypliAI.py +305 -0
- webscout/Provider/Venice.py +24 -22
- webscout/Provider/VercelAI.py +31 -12
- webscout/Provider/WiseCat.py +1 -1
- webscout/Provider/WrDoChat.py +370 -0
- webscout/Provider/__init__.py +11 -13
- webscout/Provider/ai4chat.py +5 -3
- webscout/Provider/akashgpt.py +59 -66
- webscout/Provider/asksteve.py +53 -44
- webscout/Provider/cerebras.py +77 -31
- webscout/Provider/chatglm.py +47 -37
- webscout/Provider/elmo.py +38 -32
- webscout/Provider/freeaichat.py +57 -43
- webscout/Provider/granite.py +24 -21
- webscout/Provider/hermes.py +27 -20
- webscout/Provider/learnfastai.py +25 -20
- webscout/Provider/llmchatco.py +48 -78
- webscout/Provider/multichat.py +13 -3
- webscout/Provider/scira_chat.py +50 -30
- webscout/Provider/scnet.py +27 -21
- webscout/Provider/searchchat.py +16 -24
- webscout/Provider/sonus.py +37 -39
- webscout/Provider/toolbaz.py +24 -46
- webscout/Provider/turboseek.py +37 -41
- webscout/Provider/typefully.py +30 -22
- webscout/Provider/typegpt.py +47 -51
- webscout/Provider/uncovr.py +46 -40
- webscout/__init__.py +0 -1
- webscout/cli.py +256 -0
- webscout/conversation.py +305 -448
- webscout/exceptions.py +3 -0
- webscout/swiftcli/__init__.py +80 -794
- webscout/swiftcli/core/__init__.py +7 -0
- webscout/swiftcli/core/cli.py +297 -0
- webscout/swiftcli/core/context.py +104 -0
- webscout/swiftcli/core/group.py +241 -0
- webscout/swiftcli/decorators/__init__.py +28 -0
- webscout/swiftcli/decorators/command.py +221 -0
- webscout/swiftcli/decorators/options.py +220 -0
- webscout/swiftcli/decorators/output.py +252 -0
- webscout/swiftcli/exceptions.py +21 -0
- webscout/swiftcli/plugins/__init__.py +9 -0
- webscout/swiftcli/plugins/base.py +135 -0
- webscout/swiftcli/plugins/manager.py +262 -0
- webscout/swiftcli/utils/__init__.py +59 -0
- webscout/swiftcli/utils/formatting.py +252 -0
- webscout/swiftcli/utils/parsing.py +267 -0
- webscout/version.py +1 -1
- {webscout-8.2.4.dist-info → webscout-8.2.6.dist-info}/METADATA +166 -45
- {webscout-8.2.4.dist-info → webscout-8.2.6.dist-info}/RECORD +89 -89
- {webscout-8.2.4.dist-info → webscout-8.2.6.dist-info}/WHEEL +1 -1
- webscout-8.2.6.dist-info/entry_points.txt +3 -0
- {webscout-8.2.4.dist-info → webscout-8.2.6.dist-info}/top_level.txt +0 -1
- inferno/__init__.py +0 -6
- inferno/__main__.py +0 -9
- inferno/cli.py +0 -6
- inferno/lol.py +0 -589
- webscout/LLM.py +0 -442
- webscout/Local/__init__.py +0 -12
- webscout/Local/__main__.py +0 -9
- webscout/Local/api.py +0 -576
- webscout/Local/cli.py +0 -516
- webscout/Local/config.py +0 -75
- webscout/Local/llm.py +0 -287
- webscout/Local/model_manager.py +0 -253
- webscout/Local/server.py +0 -721
- webscout/Local/utils.py +0 -93
- webscout/Provider/Chatify.py +0 -175
- webscout/Provider/PizzaGPT.py +0 -228
- webscout/Provider/askmyai.py +0 -158
- webscout/Provider/gaurish.py +0 -244
- webscout/Provider/promptrefine.py +0 -193
- webscout/Provider/tutorai.py +0 -270
- webscout-8.2.4.dist-info/entry_points.txt +0 -5
- {webscout-8.2.4.dist-info → webscout-8.2.6.dist-info}/licenses/LICENSE.md +0 -0
|
@@ -0,0 +1,305 @@
|
|
|
1
|
+
import re
|
|
2
|
+
import json
|
|
3
|
+
import random
|
|
4
|
+
import string
|
|
5
|
+
from typing import Optional, Union, Any, Dict, Generator
|
|
6
|
+
from curl_cffi import CurlError
|
|
7
|
+
from curl_cffi.requests import Session
|
|
8
|
+
# from curl_cffi.const import CurlHttpVersion # Not strictly needed if using default
|
|
9
|
+
from webscout.AIutel import Optimizers
|
|
10
|
+
from webscout.AIutel import Conversation
|
|
11
|
+
from webscout.AIutel import AwesomePrompts, sanitize_stream
|
|
12
|
+
from webscout.AIbase import Provider
|
|
13
|
+
from webscout import exceptions
|
|
14
|
+
from webscout.litagent import LitAgent
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
def generate_random_id(length=16):
|
|
18
|
+
"""Generates a random alphanumeric string."""
|
|
19
|
+
characters = string.ascii_letters + string.digits
|
|
20
|
+
return ''.join(random.choice(characters) for i in range(length))
|
|
21
|
+
|
|
22
|
+
class TypliAI(Provider):
|
|
23
|
+
"""
|
|
24
|
+
A class to interact with the Typli.ai API.
|
|
25
|
+
|
|
26
|
+
Attributes:
|
|
27
|
+
system_prompt (str): The system prompt to define the assistant's role.
|
|
28
|
+
|
|
29
|
+
Examples:
|
|
30
|
+
>>> from lol import TypliAI
|
|
31
|
+
>>> ai = TypliAI()
|
|
32
|
+
>>> response = ai.chat("What's the weather today?")
|
|
33
|
+
>>> print(response)
|
|
34
|
+
'I don't have access to real-time weather information...'
|
|
35
|
+
"""
|
|
36
|
+
AVAILABLE_MODELS = ["free-no-sign-up-chatgpt"]
|
|
37
|
+
|
|
38
|
+
def __init__(
|
|
39
|
+
self,
|
|
40
|
+
is_conversation: bool = True,
|
|
41
|
+
max_tokens: int = 600,
|
|
42
|
+
timeout: int = 30,
|
|
43
|
+
intro: str = None,
|
|
44
|
+
filepath: str = None,
|
|
45
|
+
update_file: bool = True,
|
|
46
|
+
proxies: dict = {},
|
|
47
|
+
history_offset: int = 10250,
|
|
48
|
+
act: str = None,
|
|
49
|
+
system_prompt: str = "You are a helpful assistant.",
|
|
50
|
+
model: str = "free-no-sign-up-chatgpt"
|
|
51
|
+
):
|
|
52
|
+
"""
|
|
53
|
+
Initializes the TypliAI API with given parameters.
|
|
54
|
+
|
|
55
|
+
Args:
|
|
56
|
+
is_conversation (bool): Whether the provider is in conversation mode.
|
|
57
|
+
max_tokens (int): Maximum number of tokens to sample.
|
|
58
|
+
timeout (int): Timeout for API requests.
|
|
59
|
+
intro (str): Introduction message for the conversation.
|
|
60
|
+
filepath (str): Filepath for storing conversation history.
|
|
61
|
+
update_file (bool): Whether to update the conversation history file.
|
|
62
|
+
proxies (dict): Proxies for the API requests.
|
|
63
|
+
history_offset (int): Offset for conversation history.
|
|
64
|
+
act (str): Act for the conversation.
|
|
65
|
+
system_prompt (str): The system prompt to define the assistant's role.
|
|
66
|
+
model (str): The model to use for generation.
|
|
67
|
+
"""
|
|
68
|
+
# Initialize curl_cffi Session instead of requests.Session
|
|
69
|
+
self.session = Session()
|
|
70
|
+
self.is_conversation = is_conversation
|
|
71
|
+
self.max_tokens_to_sample = max_tokens
|
|
72
|
+
self.api_endpoint = "https://typli.ai/api/generators/chat"
|
|
73
|
+
self.timeout = timeout
|
|
74
|
+
self.last_response = {}
|
|
75
|
+
self.system_prompt = system_prompt
|
|
76
|
+
self.model = model
|
|
77
|
+
|
|
78
|
+
# Initialize LitAgent for user agent generation if available
|
|
79
|
+
|
|
80
|
+
self.agent = LitAgent()
|
|
81
|
+
# user_agent = self.agent.random() # Let impersonate handle the user-agent
|
|
82
|
+
self.headers = {
|
|
83
|
+
'accept': '*/*', # Changed from '/' in example, but '*' is safer
|
|
84
|
+
'accept-language': 'en-US,en;q=0.9',
|
|
85
|
+
'content-type': 'application/json',
|
|
86
|
+
'origin': 'https://typli.ai',
|
|
87
|
+
'referer': 'https://typli.ai/free-no-sign-up-chatgpt',
|
|
88
|
+
# Let impersonate handle sec-ch-ua headers
|
|
89
|
+
# 'sec-ch-ua': '"Microsoft Edge";v="135", "Not-A.Brand";v="8", "Chromium";v="135"',
|
|
90
|
+
# 'sec-ch-ua-mobile': '?0',
|
|
91
|
+
# 'sec-ch-ua-platform': '"Windows"',
|
|
92
|
+
'sec-fetch-dest': 'empty',
|
|
93
|
+
'sec-fetch-mode': 'cors',
|
|
94
|
+
'sec-fetch-site': 'same-origin',
|
|
95
|
+
'dnt': '1',
|
|
96
|
+
# 'user-agent': user_agent, # Let impersonate handle this
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
self.__available_optimizers = (
|
|
101
|
+
method
|
|
102
|
+
for method in dir(Optimizers)
|
|
103
|
+
if callable(getattr(Optimizers, method)) and not method.startswith("__")
|
|
104
|
+
)
|
|
105
|
+
# Update curl_cffi session headers and proxies
|
|
106
|
+
self.session.headers.update(self.headers)
|
|
107
|
+
self.session.proxies = proxies
|
|
108
|
+
|
|
109
|
+
Conversation.intro = (
|
|
110
|
+
AwesomePrompts().get_act(
|
|
111
|
+
act, raise_not_found=True, default=None, case_insensitive=True
|
|
112
|
+
)
|
|
113
|
+
if act
|
|
114
|
+
else intro or Conversation.intro
|
|
115
|
+
)
|
|
116
|
+
self.conversation = Conversation(
|
|
117
|
+
is_conversation, self.max_tokens_to_sample, filepath, update_file
|
|
118
|
+
)
|
|
119
|
+
self.conversation.history_offset = history_offset
|
|
120
|
+
|
|
121
|
+
|
|
122
|
+
@staticmethod
|
|
123
|
+
def _typli_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
|
|
124
|
+
"""Extracts content from the Typli.ai stream format '0:"..."'."""
|
|
125
|
+
if isinstance(chunk, str):
|
|
126
|
+
match = re.search(r'0:"(.*?)"', chunk)
|
|
127
|
+
if match:
|
|
128
|
+
# Decode potential unicode escapes like \u00e9
|
|
129
|
+
content = match.group(1).encode().decode('unicode_escape')
|
|
130
|
+
return content.replace('\\\\', '\\').replace('\\"', '"') # Handle escaped backslashes and quotes
|
|
131
|
+
return None
|
|
132
|
+
|
|
133
|
+
def ask(
|
|
134
|
+
self,
|
|
135
|
+
prompt: str,
|
|
136
|
+
stream: bool = False,
|
|
137
|
+
raw: bool = False,
|
|
138
|
+
optimizer: str = None,
|
|
139
|
+
conversationally: bool = False,
|
|
140
|
+
) -> Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]:
|
|
141
|
+
"""
|
|
142
|
+
Sends a prompt to the Typli.ai API and returns the response.
|
|
143
|
+
|
|
144
|
+
Args:
|
|
145
|
+
prompt (str): The prompt to send to the API.
|
|
146
|
+
stream (bool): Whether to stream the response.
|
|
147
|
+
raw (bool): Whether to return the raw response.
|
|
148
|
+
optimizer (str): Optimizer to use for the prompt.
|
|
149
|
+
conversationally (bool): Whether to generate the prompt conversationally.
|
|
150
|
+
|
|
151
|
+
Returns:
|
|
152
|
+
Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]: The API response.
|
|
153
|
+
"""
|
|
154
|
+
|
|
155
|
+
conversation_prompt = self.conversation.gen_complete_prompt(prompt)
|
|
156
|
+
if optimizer:
|
|
157
|
+
if optimizer in self.__available_optimizers:
|
|
158
|
+
conversation_prompt = getattr(Optimizers, optimizer)(
|
|
159
|
+
conversation_prompt if conversationally else prompt
|
|
160
|
+
)
|
|
161
|
+
else:
|
|
162
|
+
raise Exception(
|
|
163
|
+
f"Optimizer is not one of {self.__available_optimizers}"
|
|
164
|
+
)
|
|
165
|
+
|
|
166
|
+
|
|
167
|
+
payload = {
|
|
168
|
+
"id": generate_random_id(),
|
|
169
|
+
"messages": [
|
|
170
|
+
{ # Add the system role message
|
|
171
|
+
"role": "system",
|
|
172
|
+
"content": self.system_prompt
|
|
173
|
+
},
|
|
174
|
+
{
|
|
175
|
+
"role": "user",
|
|
176
|
+
"content": conversation_prompt,
|
|
177
|
+
"parts": [
|
|
178
|
+
{
|
|
179
|
+
"type": "text",
|
|
180
|
+
"text": conversation_prompt
|
|
181
|
+
}
|
|
182
|
+
]
|
|
183
|
+
}
|
|
184
|
+
],
|
|
185
|
+
"slug": self.model
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
def for_stream():
|
|
189
|
+
try:
|
|
190
|
+
# Use curl_cffi session post with updated impersonate and http_version
|
|
191
|
+
response = self.session.post(
|
|
192
|
+
self.api_endpoint,
|
|
193
|
+
headers=self.headers,
|
|
194
|
+
json=payload,
|
|
195
|
+
stream=True,
|
|
196
|
+
timeout=self.timeout,
|
|
197
|
+
impersonate="chrome120", # Switch to a more common profile
|
|
198
|
+
# http_version=CurlHttpVersion.V1_1 # Usually not needed
|
|
199
|
+
)
|
|
200
|
+
if not response.ok:
|
|
201
|
+
error_msg = f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
|
|
202
|
+
raise exceptions.FailedToGenerateResponseError(error_msg)
|
|
203
|
+
|
|
204
|
+
streaming_response = ""
|
|
205
|
+
# Use sanitize_stream with the custom extractor
|
|
206
|
+
processed_stream = sanitize_stream(
|
|
207
|
+
data=response.iter_content(chunk_size=None), # Pass byte iterator
|
|
208
|
+
intro_value=None, # No simple prefix like 'data:'
|
|
209
|
+
to_json=False, # Content is extracted as string, not JSON object per line
|
|
210
|
+
content_extractor=self._typli_extractor, # Use the specific extractor
|
|
211
|
+
skip_markers=["f:{", "e:{", "d:{", "8:[", "2:["] # Skip metadata lines based on observed format
|
|
212
|
+
)
|
|
213
|
+
|
|
214
|
+
for content_chunk in processed_stream:
|
|
215
|
+
if content_chunk and isinstance(content_chunk, str): # Extractor returns string
|
|
216
|
+
streaming_response += content_chunk
|
|
217
|
+
yield content_chunk if raw else dict(text=content_chunk)
|
|
218
|
+
|
|
219
|
+
self.last_response.update(dict(text=streaming_response))
|
|
220
|
+
|
|
221
|
+
self.conversation.update_chat_history(
|
|
222
|
+
prompt, self.get_message(self.last_response)
|
|
223
|
+
)
|
|
224
|
+
|
|
225
|
+
except CurlError as e: # Catch CurlError
|
|
226
|
+
error_msg = f"Request failed (CurlError): {e}"
|
|
227
|
+
raise exceptions.FailedToGenerateResponseError(error_msg)
|
|
228
|
+
|
|
229
|
+
except Exception as e: # Catch other potential exceptions
|
|
230
|
+
# Include the original exception type in the message for clarity
|
|
231
|
+
error_msg = f"An unexpected error occurred ({type(e).__name__}): {e}"
|
|
232
|
+
raise exceptions.FailedToGenerateResponseError(error_msg)
|
|
233
|
+
|
|
234
|
+
|
|
235
|
+
def for_non_stream():
|
|
236
|
+
# This function implicitly uses the updated for_stream
|
|
237
|
+
for _ in for_stream():
|
|
238
|
+
pass
|
|
239
|
+
return self.last_response
|
|
240
|
+
|
|
241
|
+
return for_stream() if stream else for_non_stream()
|
|
242
|
+
|
|
243
|
+
def chat(
|
|
244
|
+
self,
|
|
245
|
+
prompt: str,
|
|
246
|
+
stream: bool = False,
|
|
247
|
+
optimizer: str = None,
|
|
248
|
+
conversationally: bool = False,
|
|
249
|
+
) -> Union[str, Generator[str, None, None]]:
|
|
250
|
+
"""
|
|
251
|
+
Generates a response from the Typli.ai API.
|
|
252
|
+
|
|
253
|
+
Args:
|
|
254
|
+
prompt (str): The prompt to send to the API.
|
|
255
|
+
stream (bool): Whether to stream the response.
|
|
256
|
+
optimizer (str): Optimizer to use for the prompt.
|
|
257
|
+
conversationally (bool): Whether to generate the prompt conversationally.
|
|
258
|
+
|
|
259
|
+
Returns:
|
|
260
|
+
Union[str, Generator[str, None, None]]: The API response.
|
|
261
|
+
"""
|
|
262
|
+
|
|
263
|
+
def for_stream():
|
|
264
|
+
for response in self.ask(
|
|
265
|
+
prompt, True, optimizer=optimizer, conversationally=conversationally
|
|
266
|
+
):
|
|
267
|
+
yield self.get_message(response)
|
|
268
|
+
|
|
269
|
+
def for_non_stream():
|
|
270
|
+
return self.get_message(
|
|
271
|
+
self.ask(
|
|
272
|
+
prompt,
|
|
273
|
+
False,
|
|
274
|
+
optimizer=optimizer,
|
|
275
|
+
conversationally=conversationally,
|
|
276
|
+
)
|
|
277
|
+
)
|
|
278
|
+
|
|
279
|
+
return for_stream() if stream else for_non_stream()
|
|
280
|
+
|
|
281
|
+
def get_message(self, response: dict) -> str:
|
|
282
|
+
"""
|
|
283
|
+
Extracts the message from the API response.
|
|
284
|
+
|
|
285
|
+
Args:
|
|
286
|
+
response (dict): The API response.
|
|
287
|
+
|
|
288
|
+
Returns:
|
|
289
|
+
str: The message content.
|
|
290
|
+
"""
|
|
291
|
+
assert isinstance(response, dict), "Response should be of dict data-type only"
|
|
292
|
+
# Ensure text exists before processing
|
|
293
|
+
return response.get("text", "")
|
|
294
|
+
|
|
295
|
+
|
|
296
|
+
|
|
297
|
+
if __name__ == "__main__":
|
|
298
|
+
from rich import print
|
|
299
|
+
try:
|
|
300
|
+
ai = TypliAI(timeout=60)
|
|
301
|
+
response = ai.chat("Write a short poem about AI", stream=True)
|
|
302
|
+
for chunk in response:
|
|
303
|
+
print(chunk, end="", flush=True)
|
|
304
|
+
except Exception as e:
|
|
305
|
+
print(f"An error occurred: {e}")
|
webscout/Provider/Venice.py
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
from curl_cffi import CurlError
|
|
2
2
|
from curl_cffi.requests import Session # Import Session
|
|
3
3
|
import json
|
|
4
|
-
from typing import Generator, Dict, Any, List, Union
|
|
4
|
+
from typing import Generator, Dict, Any, List, Optional, Union
|
|
5
5
|
from uuid import uuid4
|
|
6
6
|
import random
|
|
7
7
|
|
|
8
8
|
from webscout.AIutel import Optimizers
|
|
9
9
|
from webscout.AIutel import Conversation
|
|
10
|
-
from webscout.AIutel import AwesomePrompts
|
|
10
|
+
from webscout.AIutel import AwesomePrompts, sanitize_stream # Import sanitize_stream
|
|
11
11
|
from webscout.AIbase import Provider
|
|
12
12
|
from webscout import exceptions
|
|
13
13
|
from webscout.litagent import LitAgent
|
|
@@ -104,6 +104,14 @@ class Venice(Provider):
|
|
|
104
104
|
)
|
|
105
105
|
self.conversation.history_offset = history_offset
|
|
106
106
|
|
|
107
|
+
@staticmethod
|
|
108
|
+
def _venice_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
|
|
109
|
+
"""Extracts content from Venice stream JSON objects."""
|
|
110
|
+
if isinstance(chunk, dict) and chunk.get("kind") == "content":
|
|
111
|
+
return chunk.get("content")
|
|
112
|
+
return None
|
|
113
|
+
|
|
114
|
+
|
|
107
115
|
def ask(
|
|
108
116
|
self,
|
|
109
117
|
prompt: str,
|
|
@@ -158,26 +166,20 @@ class Venice(Provider):
|
|
|
158
166
|
)
|
|
159
167
|
|
|
160
168
|
streaming_text = ""
|
|
161
|
-
#
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
# Yield content or dict based on raw flag
|
|
176
|
-
yield content if raw else resp
|
|
177
|
-
except json.JSONDecodeError:
|
|
178
|
-
continue
|
|
179
|
-
except UnicodeDecodeError:
|
|
180
|
-
continue
|
|
169
|
+
# Use sanitize_stream with the custom extractor
|
|
170
|
+
processed_stream = sanitize_stream(
|
|
171
|
+
data=response.iter_content(chunk_size=None), # Pass byte iterator
|
|
172
|
+
intro_value=None, # No simple prefix
|
|
173
|
+
to_json=True, # Each line is JSON
|
|
174
|
+
content_extractor=self._venice_extractor, # Use the specific extractor
|
|
175
|
+
yield_raw_on_error=False # Skip non-JSON lines or lines where extractor fails
|
|
176
|
+
)
|
|
177
|
+
|
|
178
|
+
for content_chunk in processed_stream:
|
|
179
|
+
# content_chunk is the string extracted by _venice_extractor
|
|
180
|
+
if content_chunk and isinstance(content_chunk, str):
|
|
181
|
+
streaming_text += content_chunk
|
|
182
|
+
yield content_chunk if raw else dict(text=content_chunk)
|
|
181
183
|
|
|
182
184
|
# Update history and last response after stream finishes
|
|
183
185
|
self.conversation.update_chat_history(prompt, streaming_text)
|
webscout/Provider/VercelAI.py
CHANGED
|
@@ -7,7 +7,7 @@ import uuid
|
|
|
7
7
|
|
|
8
8
|
from webscout.AIutel import Optimizers
|
|
9
9
|
from webscout.AIutel import Conversation
|
|
10
|
-
from webscout.AIutel import AwesomePrompts
|
|
10
|
+
from webscout.AIutel import AwesomePrompts, sanitize_stream # Import sanitize_stream
|
|
11
11
|
from webscout.AIbase import Provider
|
|
12
12
|
from webscout import exceptions
|
|
13
13
|
from webscout.litagent import LitAgent
|
|
@@ -111,6 +111,17 @@ class VercelAI(Provider):
|
|
|
111
111
|
)
|
|
112
112
|
self.conversation.history_offset = history_offset
|
|
113
113
|
|
|
114
|
+
@staticmethod
|
|
115
|
+
def _vercelai_extractor(chunk: Union[str, Dict[str, Any]]) -> Optional[str]:
|
|
116
|
+
"""Extracts content from the VercelAI stream format '0:"..."'."""
|
|
117
|
+
if isinstance(chunk, str):
|
|
118
|
+
match = re.search(r'0:"(.*?)"(?=,|$)', chunk) # Look for 0:"...", possibly followed by comma or end of string
|
|
119
|
+
if match:
|
|
120
|
+
# Decode potential unicode escapes like \u00e9 and handle escaped quotes/backslashes
|
|
121
|
+
content = match.group(1).encode().decode('unicode_escape')
|
|
122
|
+
return content.replace('\\\\', '\\').replace('\\"', '"')
|
|
123
|
+
return None
|
|
124
|
+
|
|
114
125
|
def ask(
|
|
115
126
|
self,
|
|
116
127
|
prompt: str,
|
|
@@ -153,15 +164,21 @@ class VercelAI(Provider):
|
|
|
153
164
|
error_msg = f"Failed to generate response - ({response.status_code}, {response.reason}) - {response.text}"
|
|
154
165
|
raise exceptions.FailedToGenerateResponseError(error_msg)
|
|
155
166
|
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
167
|
+
streaming_text = ""
|
|
168
|
+
# Use sanitize_stream with the custom extractor
|
|
169
|
+
processed_stream = sanitize_stream(
|
|
170
|
+
data=response.iter_content(chunk_size=None), # Pass byte iterator
|
|
171
|
+
intro_value=None, # No simple prefix
|
|
172
|
+
to_json=False, # Content is not JSON
|
|
173
|
+
content_extractor=self._vercelai_extractor # Use the specific extractor
|
|
174
|
+
)
|
|
175
|
+
|
|
176
|
+
for content_chunk in processed_stream:
|
|
177
|
+
if content_chunk and isinstance(content_chunk, str):
|
|
178
|
+
streaming_text += content_chunk
|
|
179
|
+
yield content_chunk if raw else dict(text=content_chunk)
|
|
180
|
+
|
|
181
|
+
self.last_response.update(dict(text=streaming_text))
|
|
165
182
|
self.conversation.update_chat_history(
|
|
166
183
|
prompt, self.get_message(self.last_response)
|
|
167
184
|
)
|
|
@@ -201,8 +218,10 @@ class VercelAI(Provider):
|
|
|
201
218
|
|
|
202
219
|
def get_message(self, response: dict) -> str:
|
|
203
220
|
"""Retrieves message only from response"""
|
|
204
|
-
assert isinstance(response, dict), "Response should be of dict data-type only"
|
|
205
|
-
|
|
221
|
+
assert isinstance(response, dict), "Response should be of dict data-type only"
|
|
222
|
+
# Formatting is handled by the extractor now
|
|
223
|
+
text = response.get("text", "")
|
|
224
|
+
return text.replace('\\n', '\n').replace('\\n\\n', '\n\n') # Keep newline replacement if needed
|
|
206
225
|
|
|
207
226
|
if __name__ == "__main__":
|
|
208
227
|
print("-" * 80)
|
webscout/Provider/WiseCat.py
CHANGED
|
@@ -33,7 +33,7 @@ class WiseCat(Provider):
|
|
|
33
33
|
proxies: dict = {},
|
|
34
34
|
history_offset: int = 10250,
|
|
35
35
|
act: str = None,
|
|
36
|
-
model: str = "chat-model-
|
|
36
|
+
model: str = "chat-model-small",
|
|
37
37
|
system_prompt: str = "You are a helpful AI assistant."
|
|
38
38
|
):
|
|
39
39
|
"""Initializes the WiseCat API client."""
|