diff --git a/templates/index.html b/templates/index.html
index 9e394da..d2cbdf8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -656,11 +656,11 @@
📤
-
Bild oder PDF
+
Bild hochladen
Drag & Drop
![]()
-
+
@@ -835,51 +835,55 @@ Falls ein Feld nicht erkennbar ist, setze den Wert auf null.
async function _checkOllamaStatus() {
ollamaStatusDiv.style.display = 'block';
ollamaStatusDiv.className = 'ollama-status loading';
- ollamaStatusDiv.textContent = 'Verbinde mit Ollama...';
+ ollamaStatusDiv.textContent = 'Prüfe Ollama-Verbindung...';
try {
- const response = await fetch(`/api/ollama/status?url=${encodeURIComponent(ollamaUrl.value)}`);
- const result = await response.json();
-
- if (result.connected) {
- ollamaStatusDiv.className = 'ollama-status success';
-
- // PowerOn Modelle in Dropdown laden (nur wenn Backend-Modell verfügbar)
- modelName.innerHTML = '';
-
- const availableModels = result.models || [];
- const availablePowerOnModels = POWERON_MODELS.filter(pm =>
- availableModels.some(m => m.startsWith(pm.ollamaModel.split(':')[0]))
- );
-
- if (availablePowerOnModels.length > 0) {
- const optGroup = document.createElement('optgroup');
- optGroup.label = 'PowerOn Modelle';
- availablePowerOnModels.forEach(model => {
- const opt = document.createElement('option');
- opt.value = model.name;
- opt.textContent = `${model.displayName}`;
- opt.title = model.description;
- optGroup.appendChild(opt);
- });
- modelName.appendChild(optGroup);
-
- // Erstes Modell auswählen
- modelName.value = availablePowerOnModels[0].name;
- }
-
- ollamaStatusDiv.innerHTML = `✓ Verbunden - ${availablePowerOnModels.length} PowerOn Modelle verfügbar`;
-
- // Button-Status nach Modell-Laden aktualisieren
- _updateAnalyzeButtonState();
- } else {
- ollamaStatusDiv.className = 'ollama-status error';
- ollamaStatusDiv.textContent = `✗ ${result.error}`;
- modelName.innerHTML = '';
+ // Direkt Ollama API abfragen (ohne Auth)
+ const response = await fetch(`${ollamaUrl.value}/api/tags`, {
+ method: 'GET',
+ headers: { 'Accept': 'application/json' }
+ });
+
+ if (!response.ok) {
+ throw new Error(`Ollama antwortet mit Status ${response.status}`);
}
+
+ const result = await response.json();
+ const availableModels = (result.models || []).map(m => m.name);
+
+ ollamaStatusDiv.className = 'ollama-status success';
+
+ // PowerOn Modelle in Dropdown laden (nur wenn Backend-Modell verfügbar)
+ modelName.innerHTML = '';
+
+ const availablePowerOnModels = POWERON_MODELS.filter(pm =>
+ availableModels.some(m => m.startsWith(pm.ollamaModel.split(':')[0]))
+ );
+
+ if (availablePowerOnModels.length > 0) {
+ const optGroup = document.createElement('optgroup');
+ optGroup.label = 'PowerOn Modelle';
+ availablePowerOnModels.forEach(model => {
+ const opt = document.createElement('option');
+ opt.value = model.name;
+ opt.textContent = `${model.displayName}`;
+ opt.title = model.description;
+ optGroup.appendChild(opt);
+ });
+ modelName.appendChild(optGroup);
+
+ // Erstes Modell auswählen
+ modelName.value = availablePowerOnModels[0].name;
+ }
+
+ ollamaStatusDiv.innerHTML = `✓ Verbunden - ${availablePowerOnModels.length} PowerOn Modelle verfügbar`;
+
+ // Button-Status nach Modell-Laden aktualisieren
+ _updateAnalyzeButtonState();
} catch (error) {
ollamaStatusDiv.className = 'ollama-status error';
- ollamaStatusDiv.textContent = `✗ Fehler: ${error.message}`;
+ ollamaStatusDiv.textContent = `✗ Keine Verbindung zu Ollama: ${error.message}`;
+ modelName.innerHTML = '';
}
}
@@ -1100,9 +1104,15 @@ Falls ein Feld nicht erkennbar ist, setze den Wert auf null.
promptInput.value = DEFAULT_PROMPT;
});
- // Analysis - using Python backend with CORS
+ // Analysis - direct Ollama API call
analyzeBtn.addEventListener('click', _analyzeDocument);
+ // Map PowerOn model names to Ollama model names
+ function _getOllamaModelName(powerOnName) {
+ const model = POWERON_MODELS.find(m => m.name === powerOnName);
+ return model ? model.ollamaModel : powerOnName;
+ }
+
async function _analyzeDocument() {
const isVision = _isVisionModel(modelName.value);
@@ -1129,37 +1139,65 @@ Falls ein Feld nicht erkennbar ist, setze den Wert auf null.
_hideError();
try {
- // Request-Body erstellen
+ // Get Ollama model name from PowerOn name
+ const ollamaModelName = _getOllamaModelName(modelName.value);
+
+ // Model-specific context lengths
+ const modelContextLengths = {
+ 'deepseek-ocr': 8192,
+ 'qwen2.5vl:7b': 32768,
+ 'granite3.2-vision': 16000
+ };
+ const numCtx = modelContextLengths[ollamaModelName] || 8192;
+
+ // Request-Body für Ollama erstellen
const requestBody = {
+ model: ollamaModelName,
prompt: promptInput.value,
- ollamaUrl: ollamaUrl.value,
- modelName: modelName.value
+ stream: false,
+ options: {
+ num_ctx: numCtx
+ }
};
// Bild nur hinzufügen wenn vorhanden
if (currentImageBase64) {
- requestBody.imageBase64 = currentImageBase64;
+ requestBody.images = [currentImageBase64];
}
- // Call Python backend API (has CORS enabled)
- const response = await fetch('/api/analyze', {
+ // Call Ollama API directly
+ const response = await fetch(`${ollamaUrl.value}/api/generate`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(requestBody)
});
- const result = await response.json();
-
if (!response.ok) {
- throw new Error(result.error || `HTTP ${response.status}`);
+ const errorText = await response.text();
+ throw new Error(`Ollama Fehler: ${response.status} - ${errorText.substring(0, 200)}`);
}
- if (!result.success) {
- throw new Error(result.error || 'Unbekannter Fehler');
+ const result = await response.json();
+ const responseText = result.response || '';
+
+ // Try to extract JSON from response
+ let extractedData = null;
+ const jsonMatch = responseText.match(/\{[\s\S]*\}/);
+
+ if (jsonMatch) {
+ try {
+ extractedData = JSON.parse(jsonMatch[0]);
+ } catch (e) {
+ extractedData = null;
+ }
+ }
+
+ // Wrap plain text response in JSON object
+ if (extractedData === null) {
+ extractedData = { response: responseText.trim() };
}
- extractedData = result.data;
- _displayResults(extractedData, result.rawResponse);
+ _displayResults(extractedData, responseText);
_setStatus('success', 'Erfolgreich extrahiert');
} catch (error) {