wb/Antrophic-Qwen3.6-Proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add web search functionality and update dependencies in noThinkProxy

Browse Source
This commit is contained in:
Wolf G. Beckmann
2026-05-10 19:13:06 +02:00
parent af75920edc
commit 4fad0f22c7
4 changed files with 411 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

466
app.js
View File

@@ -1,10 +1,14 @@
const express = require('express');
const express = require('express');
const TurndownService = require('turndown');
const { parse: parseHtml } = require('node-html-parser');
const app = express();
const OLLAMA_URL = process.env.OLLAMA_URL || 'https://ollama.aquantico.de/api/chat';
const OLLAMA_MODEL = process.env.OLLAMA_MODEL || 'qwen3.6:35b-a3b-q4_K_M';
const OLLAMA_AUTH = process.env.OLLAMA_AUTH || '324GF44-50AA-4B57-9386-K435DLJ764DFR';
const PORT = parseInt(process.env.PORT || '11435', 10);
const OLLAMA_URL = process.env.OLLAMA_URL || 'https://ollama.aquantico.de/api/chat';
const OLLAMA_MODEL = process.env.OLLAMA_MODEL || 'qwen3.6:35b-a3b-q4_K_M';
const OLLAMA_AUTH = process.env.OLLAMA_AUTH || '324GF44-50AA-4B57-9386-K435DLJ764DFR';
const GOOGLE_API_KEY = process.env.GOOGLE_API_KEY || 'AIzaSyChzsz8ZN8iHRqMUVFnxJXwyXWP_XwWy6g';
const GOOGLE_CX = process.env.GOOGLE_CX || '2331819c76d874bcc';
const PORT = parseInt(process.env.PORT || '11435', 10);
const colors = {
reset: '\x1b[0m',
@@ -43,12 +47,11 @@ app.get('/', (req, res) => {
table{width:100%;border-collapse:collapse;margin:.5rem 0 1rem}
td,th{border:1px solid #333;padding:.4rem .8rem;text-align:left}
th{background:#1e1e2e;color:#7dd3fc}
.copy-btn{cursor:pointer;background:#2d2d4e;border:1px solid #555;color:#cba6f7;padding:.2rem .6rem;border-radius:.25rem;font-size:.75rem;margin-left:.5rem}
</style>
</head>
<body>
<h1>noThinkProxy <span class="badge">v1.0</span></h1>
<p>Anthropic-API → Ollama-Proxy · Think-Modus deaktiviert · Modell-Substitution aktiv</p>
<p>Anthropic-API → Ollama-Proxy · Think-Modus deaktiviert · Web-Suche aktiv</p>
<h2>Aktuelle Konfiguration</h2>
<table>
@@ -57,6 +60,7 @@ app.get('/', (req, res) => {
<tr><td>Modell</td><td><code>${OLLAMA_MODEL}</code></td></tr>
<tr><td>Kontext</td><td><code>262144 Token (256k)</code></td></tr>
<tr><td>Think</td><td><code>false</code></td></tr>
<tr><td>Web-Suche</td><td><code>Google Custom Search</code></td></tr>
<tr><td>Proxy-URL</td><td><code>${host}</code></td></tr>
</table>
@@ -70,7 +74,7 @@ app.get('/', (req, res) => {
<h2>API-Endpunkt</h2>
<pre><code>POST ${host}/v1/messages</code></pre>
<p>Kompatibel mit dem Anthropic SDK. Alle <code>claude-*</code> Modellnamen werden automatisch auf <code>${OLLAMA_MODEL}</code> umgeleitet.</p>
<p>Alle <code>claude-*</code> Modellnamen werden auf <code>${OLLAMA_MODEL}</code> umgeleitet.</p>
</body>
</html>`);
});
@@ -131,26 +135,108 @@ echo ""
`);
});
// ── Web Search ────────────────────────────────────────────────────────────────
const WEB_SEARCH_TOOL = {
type: 'function',
function: {
name: 'web_search',
description: 'Searches the internet for current information. Use this when you need up-to-date facts, recent news, or information you are not certain about.',
parameters: {
type: 'object',
properties: {
query: { type: 'string', description: 'The search query' }
},
required: ['query']
}
}
};
const READ_URL_TOOL = {
type: 'function',
function: {
name: 'read_url',
description: 'Fetches a URL and returns the page content as Markdown. Use this to read articles, documentation, or any web page in detail.',
parameters: {
type: 'object',
properties: {
url: { type: 'string', description: 'The URL to fetch' }
},
required: ['url']
}
}
};
async function executeReadUrl(url) {
console.log(`${colors.cyan}[Read URL] ${url}${colors.reset}`);
try {
const resp = await fetch(url, {
headers: { 'User-Agent': 'Mozilla/5.0 (compatible; noThinkProxy/1.0)' },
signal: AbortSignal.timeout(15000)
});
if (!resp.ok) return `Error fetching ${url}: HTTP ${resp.status}`;
const html = await resp.text();
const root = parseHtml(html, { blockTextElements: { script: false, style: false } });
// Rauschen entfernen
for (const sel of ['script', 'style', 'nav', 'header', 'footer', 'aside', 'iframe', 'noscript']) {
root.querySelectorAll(sel).forEach(el => el.remove());
}
const title = root.querySelector('title')?.text.trim()
|| root.querySelector('h1')?.text.trim()
|| '';
// Hauptinhalt extrahieren
const mainEl = root.querySelector('main, article, [role="main"], #content, #main, .content, .post');
const contentHtml = mainEl ? mainEl.innerHTML : (root.querySelector('body')?.innerHTML || html);
const td = new TurndownService({ headingStyle: 'atx', codeBlockStyle: 'fenced' });
let markdown = `# ${title}\n\n${td.turndown(contentHtml)}`;
if (markdown.length > 12000) {
markdown = markdown.substring(0, 12000) + '\n\n[... content truncated ...]';
}
console.log(`${colors.cyan}[Read URL] ${markdown.length} Zeichen${colors.reset}`);
return markdown;
} catch (e) {
return `Error fetching ${url}: ${e.message}`;
}
}
async function executeWebSearch(query) {
const url = `https://www.googleapis.com/customsearch/v1?key=${GOOGLE_API_KEY}&cx=${GOOGLE_CX}&q=${encodeURIComponent(query)}&num=5`;
console.log(`${colors.cyan}[Web Search] "${query}"${colors.reset}`);
try {
const resp = await fetch(url);
const data = await resp.json();
if (data.error) return `Search error: ${data.error.message}`;
if (!data.items?.length) return `No results found for "${query}".`;
const results = data.items
.map((item, i) => `[${i + 1}] ${item.title}\n${item.link}\n${item.snippet}`)
.join('\n\n');
console.log(`${colors.cyan}[Web Search] ${data.items.length} Ergebnisse${colors.reset}`);
return results;
} catch (e) {
return `Search error: ${e.message}`;
}
}
// ── Hilfsfunktionen ───────────────────────────────────────────────────────────
function sanitizeToolSchema(schema) {
if (!schema || typeof schema !== 'object') {
return { type: 'object', properties: {} };
}
if (!schema || typeof schema !== 'object') return { type: 'object', properties: {} };
const clean = JSON.parse(JSON.stringify(schema));
if (!clean.type) clean.type = 'object';
if (!clean.properties) clean.properties = {};
return clean;
}
function convertAnthropicTools(anthropicTools) {
if (!anthropicTools || anthropicTools.length === 0) return [];
const validTools = [];
for (const tool of anthropicTools) {
try {
const ollamaTool = {
@@ -161,30 +247,24 @@ function convertAnthropicTools(anthropicTools) {
parameters: sanitizeToolSchema(tool.input_schema)
}
};
JSON.stringify(ollamaTool);
validTools.push(ollamaTool);
} catch (e) {
console.error(`${colors.red}[Tool Schema Error] ${e.message}${colors.reset}`);
}
}
return validTools;
}
function stringifyToolResultContent(content) {
if (Array.isArray(content)) {
return content
.map(c => {
if (typeof c === 'string') return c;
if (c?.text) return c.text;
return JSON.stringify(c);
})
.join('\n');
return content.map(c => {
if (typeof c === 'string') return c;
if (c?.text) return c.text;
return JSON.stringify(c);
}).join('\n');
}
if (typeof content === 'string') return content;
return JSON.stringify(content);
}
@@ -194,10 +274,9 @@ function convertAnthropicToOllama(anthropicBody) {
if (anthropicBody.system) {
ollamaMessages.push({
role: 'system',
content:
typeof anthropicBody.system === 'string'
? anthropicBody.system
: JSON.stringify(anthropicBody.system)
content: typeof anthropicBody.system === 'string'
? anthropicBody.system
: JSON.stringify(anthropicBody.system)
});
}
@@ -206,35 +285,23 @@ function convertAnthropicToOllama(anthropicBody) {
ollamaMessages.push({ role: msg.role, content: msg.content });
continue;
}
if (!Array.isArray(msg.content)) continue;
if (msg.role === 'assistant') {
const textParts = [];
const toolCalls = [];
for (const item of msg.content) {
if (item.type === 'text') {
textParts.push(item.text || '');
} else if (item.type === 'tool_use') {
toolCalls.push({
function: {
name: item.name,
arguments: item.input || {}
}
});
if (item.type === 'text') textParts.push(item.text || '');
else if (item.type === 'tool_use') {
toolCalls.push({ function: { name: item.name, arguments: item.input || {} } });
}
}
const assistantMsg = { role: 'assistant', content: textParts.join('\n\n') };
if (toolCalls.length > 0) {
assistantMsg.tool_calls = toolCalls;
}
if (toolCalls.length > 0) assistantMsg.tool_calls = toolCalls;
ollamaMessages.push(assistantMsg);
} else {
const pendingText = [];
for (const item of msg.content) {
if (item.type === 'text') {
pendingText.push(item.text || '');
@@ -243,16 +310,12 @@ function convertAnthropicToOllama(anthropicBody) {
ollamaMessages.push({ role: 'user', content: pendingText.join('\n\n') });
pendingText.length = 0;
}
const resultText = stringifyToolResultContent(item.content);
console.log(`${colors.blue}📥 Tool Result ${item.tool_use_id}:${colors.reset}`);
console.log(`${colors.blue}${resultText}${colors.reset}`);
console.log('');
console.log(`${colors.blue}${resultText}${colors.reset}\n`);
ollamaMessages.push({ role: 'tool', content: resultText });
}
}
if (pendingText.length > 0) {
ollamaMessages.push({ role: 'user', content: pendingText.join('\n\n') });
}
@@ -271,55 +334,39 @@ function convertAnthropicToOllama(anthropicBody) {
}
};
if (anthropicBody.tools && anthropicBody.tools.length > 0) {
const validTools = convertAnthropicTools(anthropicBody.tools);
if (validTools.length > 0) {
ollamaBody.tools = validTools;
}
}
// Anthropic-Tools konvertieren + interne Tools voranstellen
const convertedTools = convertAnthropicTools(anthropicBody.tools || []);
ollamaBody.tools = [WEB_SEARCH_TOOL, READ_URL_TOOL, ...convertedTools];
return ollamaBody;
}
function parseToolArguments(args) {
if (!args) return {};
if (typeof args === 'string') {
try {
return JSON.parse(args);
} catch (e) {
console.error(`${colors.red}[Tool Args Parse Error] ${e.message}${colors.reset}`);
return {};
}
try { return JSON.parse(args); } catch (e) { return {}; }
}
if (typeof args === 'object') return args;
return {};
}
function makeToolDedupeKey(tc) {
const name = tc.function?.name || '';
const args = tc.function?.arguments || {};
const argsString = typeof args === 'string' ? args : JSON.stringify(args);
return `${name}:${argsString}`;
return `${name}:${typeof args === 'string' ? args : JSON.stringify(args)}`;
}
// ── Response-Handler ──────────────────────────────────────────────────────────
// ── Response-Handler mit Web-Search-Loop ──────────────────────────────────────
async function handleResponse(response, anthropicBody, res, requestNum) {
async function handleResponse(initialResponse, anthropicBody, res, requestNum, ollamaBody) {
res.setHeader('Content-Type', 'text/event-stream');
res.setHeader('Cache-Control', 'no-cache');
res.setHeader('Connection', 'keep-alive');
const messageId = 'msg_' + requestNum;
res.write(`event: message_start\ndata: ${JSON.stringify({
type: 'message_start',
message: {
id: messageId,
id: 'msg_' + requestNum,
type: 'message',
role: 'assistant',
content: [],
@@ -330,153 +377,171 @@ async function handleResponse(response, anthropicBody, res, requestNum) {
}
})}\n\n`);
const reader = response.body.getReader();
const decoder = new TextDecoder();
let contentBlocks = [];
let currentBlockIndex = 0;
const seenToolCalls = new Set();
let emittedToolUse = false;
let messageFinished = false;
let buffer = '';
const seenToolCalls = new Set();
let currentResponse = initialResponse;
function processChunk(data) {
if (messageFinished) return;
for (let searchIteration = 0; searchIteration < 5; searchIteration++) {
const reader = currentResponse.body.getReader();
const decoder = new TextDecoder();
let buffer = '';
let textBlockOpen = false;
let evalCount = 0;
if (data.message?.tool_calls && data.message.tool_calls.length > 0) {
for (const tc of data.message.tool_calls) {
const dedupeKey = makeToolDedupeKey(tc);
// Gesammelt pro Iteration für eventuelle Web-Search-Fortsetzung
let iterContent = '';
let iterAllToolCalls = [];
let iterWebSearches = [];
if (seenToolCalls.has(dedupeKey)) {
console.log(`${colors.yellow}[Duplicate Tool Call skipped] ${dedupeKey}${colors.reset}`);
continue;
function processChunk(data) {
// Tool Calls
if (data.message?.tool_calls?.length) {
for (const tc of data.message.tool_calls) {
iterAllToolCalls.push(tc);
// Proxy-eigene Tools + Claude Code Web-Tools intern abfangen
const INTERNAL = new Set(['web_search', 'read_url', 'WebSearch', 'web_fetch', 'WebFetch']);
if (INTERNAL.has(tc.function?.name)) {
iterWebSearches.push(tc);
continue; // intern verarbeiten, nicht an Client senden
}
const key = makeToolDedupeKey(tc);
if (seenToolCalls.has(key)) {
console.log(`${colors.yellow}[Duplicate Tool Call skipped] ${key}${colors.reset}`);
continue;
}
seenToolCalls.add(key);
emittedToolUse = true;
const toolName = tc.function?.name;
const toolInput = parseToolArguments(tc.function?.arguments);
const toolUseId = `toolu_${requestNum}_${currentBlockIndex}`;
console.log(`${colors.magenta}[Tool Use: ${toolName}] ${JSON.stringify(toolInput)}${colors.reset}`);
res.write(`event: content_block_start\ndata: ${JSON.stringify({
type: 'content_block_start', index: currentBlockIndex,
content_block: { type: 'tool_use', id: toolUseId, name: toolName, input: {} }
})}\n\n`);
res.write(`event: content_block_delta\ndata: ${JSON.stringify({
type: 'content_block_delta', index: currentBlockIndex,
delta: { type: 'input_json_delta', partial_json: JSON.stringify(toolInput) }
})}\n\n`);
res.write(`event: content_block_stop\ndata: ${JSON.stringify({
type: 'content_block_stop', index: currentBlockIndex
})}\n\n`);
currentBlockIndex++;
}
}
// Text
if (data.message?.content) {
const text = data.message.content;
iterContent += text;
if (!textBlockOpen) {
res.write(`event: content_block_start\ndata: ${JSON.stringify({
type: 'content_block_start', index: currentBlockIndex,
content_block: { type: 'text', text: '' }
})}\n\n`);
textBlockOpen = true;
}
seenToolCalls.add(dedupeKey);
emittedToolUse = true;
const toolName = tc.function?.name;
const toolInput = parseToolArguments(tc.function?.arguments);
const toolUseId = `toolu_${requestNum}_${currentBlockIndex}`;
console.log(`${colors.yellow}[Raw Tool Call] ${JSON.stringify(tc)}${colors.reset}`);
console.log(`${colors.magenta}[Sending Tool Use: ${toolName}]${colors.reset}`);
console.log(`${colors.magenta}Input: ${JSON.stringify(toolInput)}${colors.reset}`);
res.write(`event: content_block_start\ndata: ${JSON.stringify({
type: 'content_block_start',
index: currentBlockIndex,
content_block: { type: 'tool_use', id: toolUseId, name: toolName, input: {} }
})}\n\n`);
process.stdout.write(`${colors.green}${text}${colors.reset}`);
res.write(`event: content_block_delta\ndata: ${JSON.stringify({
type: 'content_block_delta',
index: currentBlockIndex,
delta: { type: 'input_json_delta', partial_json: JSON.stringify(toolInput) }
type: 'content_block_delta', index: currentBlockIndex,
delta: { type: 'text_delta', text }
})}\n\n`);
}
res.write(`event: content_block_stop\ndata: ${JSON.stringify({
type: 'content_block_stop',
index: currentBlockIndex
})}\n\n`);
currentBlockIndex++;
// Done
if (data.done) {
evalCount = data.eval_count || 0;
if (textBlockOpen) {
res.write(`event: content_block_stop\ndata: ${JSON.stringify({
type: 'content_block_stop', index: currentBlockIndex
})}\n\n`);
currentBlockIndex++;
textBlockOpen = false;
}
}
}
if (data.message?.content) {
const text = data.message.content;
if (contentBlocks[currentBlockIndex] === undefined) {
res.write(`event: content_block_start\ndata: ${JSON.stringify({
type: 'content_block_start',
index: currentBlockIndex,
content_block: { type: 'text', text: '' }
})}\n\n`);
contentBlocks[currentBlockIndex] = '';
// Stream lesen
while (true) {
const { done, value } = await reader.read();
if (done) break;
buffer += decoder.decode(value, { stream: true });
const lines = buffer.split('\n');
buffer = lines.pop() || '';
for (const line of lines) {
const trimmed = line.trim();
if (!trimmed) continue;
try { processChunk(JSON.parse(trimmed)); }
catch (e) { console.error(`${colors.red}[Parse Error] ${e.message}${colors.reset}`); }
}
}
if (buffer.trim()) {
try { processChunk(JSON.parse(buffer.trim())); }
catch (e) { console.error(`${colors.red}[Final Buffer Error] ${e.message}${colors.reset}`); }
}
process.stdout.write(`${colors.green}${text}${colors.reset}`);
res.write(`event: content_block_delta\ndata: ${JSON.stringify({
type: 'content_block_delta',
index: currentBlockIndex,
delta: { type: 'text_delta', text }
// Offenen Text-Block schließen falls Ollama keinen done:true geschickt hat
if (textBlockOpen) {
res.write(`event: content_block_stop\ndata: ${JSON.stringify({
type: 'content_block_stop', index: currentBlockIndex
})}\n\n`);
contentBlocks[currentBlockIndex] += text;
currentBlockIndex++;
textBlockOpen = false;
}
if (data.done) {
messageFinished = true;
if (contentBlocks[currentBlockIndex] !== undefined) {
res.write(`event: content_block_stop\ndata: ${JSON.stringify({
type: 'content_block_stop',
index: currentBlockIndex
})}\n\n`);
}
// Keine Web-Suchen → finale Events senden
if (iterWebSearches.length === 0) {
res.write(`event: message_delta\ndata: ${JSON.stringify({
type: 'message_delta',
delta: { stop_reason: emittedToolUse ? 'tool_use' : 'end_turn' },
usage: { output_tokens: data.eval_count || 0 }
usage: { output_tokens: evalCount }
})}\n\n`);
res.write(`event: message_stop\ndata: ${JSON.stringify({ type: 'message_stop' })}\n\n`);
console.log(`${colors.green}✓${colors.reset}\n`);
break;
}
}
while (true) {
const { done, value } = await reader.read();
if (done) break;
// Web-Suchen ausführen und Ergebnisse in Messages einbauen
ollamaBody.messages.push({
role: 'assistant',
content: iterContent,
tool_calls: iterAllToolCalls
});
buffer += decoder.decode(value, { stream: true });
const lines = buffer.split('\n');
buffer = lines.pop() || '';
for (const line of lines) {
const trimmed = line.trim();
if (!trimmed) continue;
try {
processChunk(JSON.parse(trimmed));
} catch (e) {
console.error(`${colors.red}[Stream Parse Error] ${e.message}${colors.reset}`);
console.error(`${colors.red}${line}${colors.reset}`);
for (const tc of iterWebSearches) {
const args = parseToolArguments(tc.function?.arguments);
let result;
const name = tc.function?.name;
if (name === 'web_search' || name === 'WebSearch') {
result = await executeWebSearch(args?.query || args?.q || '');
} else if (name === 'read_url' || name === 'web_fetch' || name === 'WebFetch') {
result = await executeReadUrl(args?.url || '');
}
}
}
if (buffer.trim()) {
try {
processChunk(JSON.parse(buffer.trim()));
} catch (e) {
console.error(`${colors.red}[Final Buffer Parse Error] ${e.message}${colors.reset}`);
console.error(buffer);
}
}
if (!messageFinished) {
if (contentBlocks[currentBlockIndex] !== undefined) {
res.write(`event: content_block_stop\ndata: ${JSON.stringify({
type: 'content_block_stop',
index: currentBlockIndex
})}\n\n`);
ollamaBody.messages.push({ role: 'tool', content: result ?? `Tool '${name}' returned no result.` });
}
res.write(`event: message_delta\ndata: ${JSON.stringify({
type: 'message_delta',
delta: { stop_reason: emittedToolUse ? 'tool_use' : 'end_turn' },
usage: { output_tokens: 0 }
})}\n\n`);
// Neuer Ollama-Request (weiter streamen)
currentResponse = await fetch(OLLAMA_URL, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'Authorization': `Bearer ${OLLAMA_AUTH}`
},
body: JSON.stringify(ollamaBody)
});
res.write(`event: message_stop\ndata: ${JSON.stringify({ type: 'message_stop' })}\n\n`);
if (!currentResponse.ok) {
const errText = await currentResponse.text();
throw new Error(`Ollama: ${currentResponse.status} ${errText}`);
}
}
res.end();
@@ -486,7 +551,6 @@ async function handleResponse(response, anthropicBody, res, requestNum) {
app.post('/v1/messages', async (req, res) => {
const requestNum = Date.now();
console.log(`${colors.magenta}━━━ #${requestNum} ━━━${colors.reset}`);
try {
@@ -499,7 +563,7 @@ app.post('/v1/messages', async (req, res) => {
const ollamaBody = convertAnthropicToOllama(anthropicBody);
console.log(
`${colors.magenta}[msgs=${ollamaBody.messages.length}, tools=${ollamaBody.tools?.length || 0}, ctx=256k, think=false, model=${OLLAMA_MODEL}]${colors.reset}`
`${colors.magenta}[msgs=${ollamaBody.messages.length}, tools=${ollamaBody.tools.length}, ctx=256k, think=false]${colors.reset}`
);
const response = await fetch(OLLAMA_URL, {
@@ -513,14 +577,13 @@ app.post('/v1/messages', async (req, res) => {
if (!response.ok) {
const errorText = await response.text();
console.error(`${colors.red}${errorText}${colors.reset}`);
throw new Error(`Ollama: ${response.status}`);
throw new Error(`Ollama: ${response.status} ${errorText}`);
}
return handleResponse(response, anthropicBody, res, requestNum);
return handleResponse(response, anthropicBody, res, requestNum, ollamaBody);
} catch (error) {
console.error(`${colors.red}${error.message}${colors.reset}`);
if (!res.headersSent) {
res.status(500).json({
type: 'error',
@@ -534,7 +597,8 @@ app.post('/v1/messages', async (req, res) => {
app.listen(PORT, () => {
console.log(`${colors.magenta}noThinkProxy: localhost:${PORT}${colors.reset}`);
console.log(`${colors.cyan} Ollama : ${OLLAMA_URL}${colors.reset}`);
console.log(`${colors.cyan} Modell : ${OLLAMA_MODEL}${colors.reset}`);
console.log(`${colors.cyan} Ctx : 256k Think: false${colors.reset}\n`);
console.log(`${colors.cyan} Ollama : ${OLLAMA_URL}${colors.reset}`);
console.log(`${colors.cyan} Modell : ${OLLAMA_MODEL}${colors.reset}`);
console.log(`${colors.cyan} Ctx : 256k Think: false${colors.reset}`);
console.log(`${colors.cyan} Search : Google Custom Search${colors.reset}\n`);
});