Compare commits
24 Commits
vm-ware-au
...
local_voic
| Author | SHA1 | Date | |
|---|---|---|---|
| 091a553452 | |||
| 6703aa2082 | |||
| 0c4e377fa3 | |||
| 4eabde994d | |||
| c069c3d464 | |||
| 27fa7ed96f | |||
| ab0b8921c1 | |||
| 019815b5b1 | |||
| baeca38fcf | |||
| de37178f7a | |||
| 87fabe2489 | |||
| fa90f7b1e6 | |||
| b83de316b3 | |||
| 0578808fc9 | |||
| 01319a2b8c | |||
| 849ad23c64 | |||
| be29a86f1b | |||
| feb648d035 | |||
| 3275c1ee69 | |||
| 6a513768e1 | |||
| ddf0ac1211 | |||
| e11d55c077 | |||
| 16aa40492c | |||
| b9d198497d |
271
jarvis.py
271
jarvis.py
@@ -3,6 +3,8 @@ import re
|
|||||||
import sqlite3
|
import sqlite3
|
||||||
import asyncio
|
import asyncio
|
||||||
import openai
|
import openai
|
||||||
|
import sys
|
||||||
|
import subprocess
|
||||||
|
|
||||||
from google import genai
|
from google import genai
|
||||||
from google.genai import types
|
from google.genai import types
|
||||||
@@ -143,6 +145,37 @@ def get_db():
|
|||||||
conn.row_factory = sqlite3.Row
|
conn.row_factory = sqlite3.Row
|
||||||
return conn
|
return conn
|
||||||
|
|
||||||
|
# ====================================================
|
||||||
|
# DYNAMISCHE PROGRAMM-ERKENNUNG (NEU)
|
||||||
|
# ====================================================
|
||||||
|
|
||||||
|
def get_installed_gui_apps():
|
||||||
|
"""Scannt das System nach installierten GUI-Programmen und deren Befehlen."""
|
||||||
|
apps_dir = Path("/usr/share/applications")
|
||||||
|
detected_apps = {}
|
||||||
|
|
||||||
|
if apps_dir.exists():
|
||||||
|
for desktop_file in apps_dir.glob("*.desktop"):
|
||||||
|
try:
|
||||||
|
# Wir lesen die .desktop Datei aus
|
||||||
|
content = desktop_file.read_text(encoding="utf-8", errors="ignore")
|
||||||
|
|
||||||
|
# Suchen nach Name und Exec-Befehl
|
||||||
|
name_match = re.search(r"^Name=(.+)$", content, re.M)
|
||||||
|
exec_match = re.search(r"^Exec=([^ \n%]+)", content, re.M) # Nur den reinen Befehl ohne Argumente (%U etc.)
|
||||||
|
|
||||||
|
if name_match and exec_match:
|
||||||
|
app_name = name_match.group(1).strip()
|
||||||
|
app_cmd = exec_match.group(1).strip()
|
||||||
|
|
||||||
|
# Ignoriere Core-Systemkram, der Meik nur nerven würde
|
||||||
|
if not any(x in app_cmd.lower() for x in ["debian", "im-config", "openjdk", "systemd"]):
|
||||||
|
detected_apps[app_name] = app_cmd
|
||||||
|
except Exception:
|
||||||
|
continue
|
||||||
|
|
||||||
|
return detected_apps
|
||||||
|
|
||||||
|
|
||||||
# ====================================================
|
# ====================================================
|
||||||
# SYSTEM PROMPT
|
# SYSTEM PROMPT
|
||||||
@@ -163,26 +196,29 @@ def get_system_prompt():
|
|||||||
prompt = prompt.replace("{notes_file}", str(NOTES_FILE))
|
prompt = prompt.replace("{notes_file}", str(NOTES_FILE))
|
||||||
prompt = prompt.replace("{todo_file}", str(TODO_FILE))
|
prompt = prompt.replace("{todo_file}", str(TODO_FILE))
|
||||||
|
|
||||||
|
# --- DYNAMISCHE PROGRAMME INJIZIEREN ---
|
||||||
|
installed_apps = get_installed_gui_apps()
|
||||||
|
apps_prompt_string = "VERFÜGBARE LOKALE DESKTOP-PROGRAMME (Nutze NUR diese Befehe zum Starten!):\n"
|
||||||
|
for app_name, app_cmd in installed_apps.items():
|
||||||
|
apps_prompt_string += f"- {app_name}: Befehl lautet '{app_cmd}'\n"
|
||||||
|
|
||||||
|
# Wir hängen die Liste einfach an den Prompt an oder ersetzen einen Platzhalter
|
||||||
|
if "{installed_apps}" in prompt:
|
||||||
|
prompt = prompt.replace("{installed_apps}", apps_prompt_string)
|
||||||
|
else:
|
||||||
|
prompt += "\n\n" + apps_prompt_string
|
||||||
|
# ---------------------------------------
|
||||||
|
|
||||||
conn = get_db()
|
conn = get_db()
|
||||||
|
nodes = conn.execute('SELECT * FROM nodes').fetchall()
|
||||||
nodes = conn.execute(
|
|
||||||
'SELECT * FROM nodes'
|
|
||||||
).fetchall()
|
|
||||||
|
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
node_info = ""
|
node_info = ""
|
||||||
|
|
||||||
for n in nodes:
|
for n in nodes:
|
||||||
node_info += (
|
node_info += f"- Name: {n['name']}, IP: {n['ip']}, User: {n['user']}\n"
|
||||||
f"- Name: {n['name']}, "
|
|
||||||
f"IP: {n['ip']}, "
|
|
||||||
f"User: {n['user']}\n"
|
|
||||||
)
|
|
||||||
|
|
||||||
return prompt.replace("{node_info}", node_info)
|
return prompt.replace("{node_info}", node_info)
|
||||||
|
|
||||||
|
|
||||||
# ====================================================
|
# ====================================================
|
||||||
# KI KOMMUNIKATION
|
# KI KOMMUNIKATION
|
||||||
# ====================================================
|
# ====================================================
|
||||||
@@ -306,21 +342,8 @@ async def run_task(target, cmd):
|
|||||||
# GUI APPS ERKENNEN
|
# GUI APPS ERKENNEN
|
||||||
# ========================================
|
# ========================================
|
||||||
|
|
||||||
gui_apps = [
|
# Holt sich alle bekannten System-GUI-Befehle dynamisch
|
||||||
"firefox",
|
gui_apps = list(get_installed_gui_apps().values())
|
||||||
"thunderbird",
|
|
||||||
"chromium",
|
|
||||||
"google-chrome",
|
|
||||||
"code",
|
|
||||||
"nautilus",
|
|
||||||
"pcmanfm",
|
|
||||||
"gedit",
|
|
||||||
"vlc",
|
|
||||||
"discord",
|
|
||||||
"steam",
|
|
||||||
"obs",
|
|
||||||
"spotify"
|
|
||||||
]
|
|
||||||
|
|
||||||
first_word = cmd.strip().split()[0]
|
first_word = cmd.strip().split()[0]
|
||||||
|
|
||||||
@@ -448,49 +471,34 @@ async def run_task(target, cmd):
|
|||||||
|
|
||||||
collected_output = []
|
collected_output = []
|
||||||
|
|
||||||
|
# ========================================
|
||||||
|
# KRISENFESTES AUSLESEN MIT TIMEOUT
|
||||||
|
# ========================================
|
||||||
|
try:
|
||||||
while True:
|
while True:
|
||||||
|
# Warte maximal 2 Sekunden auf die nächste Zeile
|
||||||
line = await proc.stdout.readline()
|
line = await asyncio.wait_for(proc.stdout.readline(), timeout=2.0)
|
||||||
|
|
||||||
if not line:
|
if not line:
|
||||||
break
|
break
|
||||||
|
|
||||||
decoded = line.decode(
|
decoded = line.decode("utf-8", errors="ignore").rstrip()
|
||||||
"utf-8",
|
|
||||||
errors="ignore"
|
|
||||||
).rstrip()
|
|
||||||
|
|
||||||
collected_output.append(decoded)
|
collected_output.append(decoded)
|
||||||
|
|
||||||
print(
|
print(f"{OUTPUT_COLOR}│ {decoded}{RESET}")
|
||||||
f"{OUTPUT_COLOR}"
|
except asyncio.TimeoutError:
|
||||||
f"│ {decoded}"
|
# Falls das Tool die Pipe offen hält, lesen wir einfach nicht weiter
|
||||||
f"{RESET}"
|
print(f"{SYSTEM_COLOR}⏳ Ausgabe-Stream stagniert. Erzwinge Prozess-Check...{RESET}")
|
||||||
)
|
|
||||||
|
|
||||||
await proc.wait()
|
# Maximal 2 Sekunden auf das offizielle Ende des Prozesses warten
|
||||||
|
try:
|
||||||
|
await asyncio.wait_for(proc.wait(), timeout=2.0)
|
||||||
|
except asyncio.TimeoutError:
|
||||||
|
print(f"{ERROR_COLOR}⚠️ Prozess reagiert nicht. Setze Ablauf trotzdem fort.{RESET}")
|
||||||
|
# Optional: proc.terminate() falls du ihn hart killen willst
|
||||||
|
|
||||||
print()
|
print()
|
||||||
|
|
||||||
if proc.returncode == 0:
|
|
||||||
|
|
||||||
print(
|
|
||||||
f"{JARVIS_COLOR}"
|
|
||||||
f"✅ TASK ERFOLGREICH"
|
|
||||||
f"{RESET}\n"
|
|
||||||
)
|
|
||||||
|
|
||||||
else:
|
|
||||||
|
|
||||||
print(
|
|
||||||
f"{ERROR_COLOR}"
|
|
||||||
f"❌ FEHLER CODE: "
|
|
||||||
f"{proc.returncode}"
|
|
||||||
f"{RESET}\n"
|
|
||||||
)
|
|
||||||
|
|
||||||
return "\n".join(collected_output)
|
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|
||||||
err = f"❌ Fehler: {e}"
|
err = f"❌ Fehler: {e}"
|
||||||
@@ -531,27 +539,33 @@ async def listen_to_user():
|
|||||||
# ====================================================
|
# ====================================================
|
||||||
|
|
||||||
async def speak_to_user(text):
|
async def speak_to_user(text):
|
||||||
|
print(f"\n{JARVIS_COLOR}🤖 J.A.R.V.I.S.{RESET}")
|
||||||
print(
|
print(f"{JARVIS_COLOR}{'-'*60}{RESET}")
|
||||||
f"\n{JARVIS_COLOR}"
|
|
||||||
f"🤖 J.A.R.V.I.S."
|
|
||||||
f"{RESET}"
|
|
||||||
)
|
|
||||||
|
|
||||||
print(
|
|
||||||
f"{JARVIS_COLOR}"
|
|
||||||
f"{'-'*60}"
|
|
||||||
f"{RESET}"
|
|
||||||
)
|
|
||||||
|
|
||||||
print(text)
|
print(text)
|
||||||
|
print(f"{JARVIS_COLOR}{'-'*60}{RESET}\n")
|
||||||
|
|
||||||
print(
|
clean_text = re.sub(r'[^\w\s\d.,!?-]', '', text)
|
||||||
f"{JARVIS_COLOR}"
|
|
||||||
f"{'-'*60}"
|
|
||||||
f"{RESET}\n"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
piper_path = "/home/meik/jarvis-ai/piper/piper"
|
||||||
|
model_path = "/home/meik/jarvis-ai/de_DE-thorsten-high.onnx"
|
||||||
|
lock_file = Path("/tmp/.jarvis_speaking") # Die Sperr-Datei
|
||||||
|
|
||||||
|
if os.path.exists(piper_path) and os.path.exists(model_path):
|
||||||
|
try:
|
||||||
|
# 1. Sperre setzen
|
||||||
|
lock_file.touch()
|
||||||
|
|
||||||
|
piper_cmd = f"echo '{clean_text}' | {piper_path} --model {model_path} --output_raw | aplay -r 22050 -f S16_LE -t raw -D pipewire >/dev/null 2>&1"
|
||||||
|
|
||||||
|
proc = await asyncio.create_subprocess_shell(piper_cmd)
|
||||||
|
await proc.wait()
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"⚠️ TTS Fehler: {e}")
|
||||||
|
finally:
|
||||||
|
# 2. Sperre IMMER wieder aufheben, wenn Piper fertig ist
|
||||||
|
if lock_file.exists():
|
||||||
|
lock_file.unlink()
|
||||||
|
|
||||||
# ====================================================
|
# ====================================================
|
||||||
# MAIN LOOP
|
# MAIN LOOP
|
||||||
@@ -681,25 +695,14 @@ async def main_chat_loop():
|
|||||||
target = target.strip()
|
target = target.strip()
|
||||||
cmd = cmd.strip()
|
cmd = cmd.strip()
|
||||||
|
|
||||||
# ========================================
|
|
||||||
# SICHTBARE SYSTEMAKTION
|
|
||||||
# ========================================
|
|
||||||
|
|
||||||
action_msg = (
|
action_msg = (
|
||||||
f"⚙️ Ich führe jetzt folgenden Befehl "
|
f"⚙️ Ich führe jetzt folgenden Befehl "
|
||||||
f"auf [{target}] aus:\n\n"
|
f"auf [{target}] aus:\n\n"
|
||||||
f"{cmd}"
|
f"{cmd}"
|
||||||
)
|
)
|
||||||
|
|
||||||
await speak_to_user(action_msg)
|
# ÄNDERUNG: Auch hier nur im Terminal anzeigen, NICHT vorlesen!
|
||||||
|
print(f"\n{SYSTEM_COLOR}{action_msg}{RESET}\n")
|
||||||
chat_history.append({
|
|
||||||
"role": "assistant",
|
|
||||||
"content": action_msg,
|
|
||||||
"timestamp": now
|
|
||||||
})
|
|
||||||
|
|
||||||
# Optional: Aktion auch ins Log
|
|
||||||
log_to_file("SYSTEM", action_msg)
|
log_to_file("SYSTEM", action_msg)
|
||||||
|
|
||||||
# ========================================
|
# ========================================
|
||||||
@@ -716,33 +719,26 @@ async def main_chat_loop():
|
|||||||
# ========================================
|
# ========================================
|
||||||
|
|
||||||
if output:
|
if output:
|
||||||
|
|
||||||
output_msg = (
|
output_msg = (
|
||||||
f"💻 Ergebnis der Ausführung "
|
f"💻 Ergebnis der Ausführung "
|
||||||
f"auf [{target}]:\n\n"
|
f"auf [{target}]:\n\n"
|
||||||
f"{output}"
|
f"{output}"
|
||||||
)
|
)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
||||||
output_msg = (
|
output_msg = (
|
||||||
f"✅ Befehl auf [{target}] "
|
f"✅ Befehl auf [{target}] "
|
||||||
f"erfolgreich abgeschlossen."
|
f"erfolgreich abgeschlossen."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Das hier wird weiterhin laut vorgelesen!
|
||||||
await speak_to_user(output_msg)
|
await speak_to_user(output_msg)
|
||||||
|
|
||||||
sys_now = datetime.now().strftime(
|
sys_now = datetime.now().strftime("%d.%m.%Y %H:%M")
|
||||||
"%d.%m.%Y %H:%M"
|
|
||||||
)
|
|
||||||
|
|
||||||
chat_history.append({
|
chat_history.append({
|
||||||
"role": "assistant",
|
"role": "assistant",
|
||||||
"content": output_msg,
|
"content": output_msg,
|
||||||
"timestamp": sys_now
|
"timestamp": sys_now
|
||||||
})
|
})
|
||||||
|
|
||||||
# LOG: System Output hier schreiben!
|
|
||||||
log_to_file("SYSTEM", output_msg)
|
log_to_file("SYSTEM", output_msg)
|
||||||
|
|
||||||
# ============================================
|
# ============================================
|
||||||
@@ -753,20 +749,77 @@ async def main_chat_loop():
|
|||||||
chat_history = chat_history[-20:]
|
chat_history = chat_history[-20:]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# ====================================================
|
||||||
|
# EINZEL-BEFEHL MODUS (Für das Sprachskript)
|
||||||
|
# ====================================================
|
||||||
|
async def run_single_command(command_text):
|
||||||
|
"""Verarbeitet einen einzelnen Befehl von außen und beendet sich wieder."""
|
||||||
|
init_db()
|
||||||
|
system_prompt = get_system_prompt()
|
||||||
|
|
||||||
|
# Wir tun so, als käme die Eingabe aus dem Chat-History-Verlauf
|
||||||
|
now = datetime.now().strftime("%d.%m.%Y %H:%M")
|
||||||
|
chat_history = [{
|
||||||
|
"role": "user",
|
||||||
|
"content": command_text,
|
||||||
|
"timestamp": now
|
||||||
|
}]
|
||||||
|
|
||||||
|
log_to_file("Voice-Input", command_text)
|
||||||
|
|
||||||
|
ai_response = await get_ai_response(
|
||||||
|
command_text,
|
||||||
|
system_prompt,
|
||||||
|
chat_history
|
||||||
|
)
|
||||||
|
|
||||||
|
if ai_response is None:
|
||||||
|
return
|
||||||
|
|
||||||
|
# EXECUTE-Tags suchen und ausführen
|
||||||
|
commands = []
|
||||||
|
execute_matches = re.finditer(
|
||||||
|
r'<EXECUTE[^>]*?(?:target="(.*?)")?[^>]*>(.*?)</EXECUTE>',
|
||||||
|
ai_response,
|
||||||
|
re.I | re.S
|
||||||
|
)
|
||||||
|
|
||||||
|
for match in execute_matches:
|
||||||
|
target = match.group(1) or "localhost"
|
||||||
|
cmd = match.group(2).strip()
|
||||||
|
cmd = re.sub(r'^```[a-zA-Z]*\n?', '', cmd)
|
||||||
|
cmd = re.sub(r'\n?```$', '', cmd)
|
||||||
|
commands.append((target.strip(), cmd.strip()))
|
||||||
|
|
||||||
|
clean_msg = re.sub(r'<EXECUTE[^>]*?>.*?</EXECUTE>', '', ai_response, flags=re.I | re.S).strip()
|
||||||
|
|
||||||
|
if clean_msg:
|
||||||
|
await speak_to_user(clean_msg)
|
||||||
|
log_to_file("J.A.R.V.I.S.", clean_msg)
|
||||||
|
|
||||||
|
if commands:
|
||||||
|
for target, cmd in commands:
|
||||||
|
action_msg = f"⚙️ Führe Sprachbefehl auf [{target}] aus:\n{cmd}"
|
||||||
|
|
||||||
|
# ÄNDERUNG: Nur im Terminal anzeigen, NICHT vorlesen!
|
||||||
|
print(f"\n{SYSTEM_COLOR}{action_msg}{RESET}\n")
|
||||||
|
log_to_file("SYSTEM", action_msg)
|
||||||
|
|
||||||
|
# Befehl im Hintergrund ausführen
|
||||||
|
await run_task(target, cmd)
|
||||||
|
|
||||||
# ====================================================
|
# ====================================================
|
||||||
# START
|
# START
|
||||||
# ====================================================
|
# ====================================================
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
# Wenn Argumente übergeben wurden (z.B. python3 jarvis.py --voice-cmd "...")
|
||||||
|
if len(sys.argv) > 2 and sys.argv[1] == "--voice-cmd":
|
||||||
|
command_text = sys.argv[2]
|
||||||
|
asyncio.run(run_single_command(command_text))
|
||||||
|
else:
|
||||||
|
# Normaler Terminal-Modus
|
||||||
asyncio.run(main_chat_loop())
|
asyncio.run(main_chat_loop())
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
|
print(f"\n{ERROR_COLOR}⛔ J.A.R.V.I.S. hart beendet.{RESET}")
|
||||||
print(
|
|
||||||
f"\n{ERROR_COLOR}"
|
|
||||||
f"⛔ J.A.R.V.I.S. hart beendet."
|
|
||||||
f"{RESET}"
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
openai
|
openai
|
||||||
google-genai
|
google-genai
|
||||||
python-dotenv
|
python-dotenv
|
||||||
|
vosk
|
||||||
|
sounddevice
|
||||||
|
numpy
|
||||||
|
colorama
|
||||||
77
setup.sh
77
setup.sh
@@ -1,77 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "=========================================="
|
|
||||||
echo "🤖 J.A.R.V.I.S. Terminal - Setup"
|
|
||||||
echo "=========================================="
|
|
||||||
|
|
||||||
# 1. Virtual Environment
|
|
||||||
echo "--- Richte Python-Umgebung ein..."
|
|
||||||
if [ ! -d "venv" ]; then
|
|
||||||
python3 -m venv venv
|
|
||||||
fi
|
|
||||||
|
|
||||||
./venv/bin/pip install --upgrade pip
|
|
||||||
if [ -f "requirements.txt" ]; then
|
|
||||||
./venv/bin/pip install -r requirements.txt
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 2. Ordnerstruktur
|
|
||||||
mkdir -p config data workspace
|
|
||||||
|
|
||||||
# 3. .env Setup
|
|
||||||
ENV_FILE="config/.env"
|
|
||||||
if [ ! -f "$ENV_FILE" ]; then
|
|
||||||
echo "--- Erstelle .env Konfiguration..."
|
|
||||||
read -p "Dein Name (Standard: Meik): " web_user
|
|
||||||
read -p "Primäre KI (google, openai, nvidia, ollama) [nvidia]: " ai_prov
|
|
||||||
read -p "NVIDIA API Key: " nvidia_key
|
|
||||||
read -p "Google API Key: " google_key
|
|
||||||
|
|
||||||
cat <<EOF > "$ENV_FILE"
|
|
||||||
WEB_USER_NAME=${web_user:-Meik}
|
|
||||||
AI_PROVIDER=${ai_prov:-nvidia}
|
|
||||||
GOOGLE_API_KEY=$google_key
|
|
||||||
NVIDIA_API_KEY=$nvidia_key
|
|
||||||
NVIDIA_MODEL=moonshotai/kimi-k2.5
|
|
||||||
GOOGLE_MODEL=gemini-2.5-flash
|
|
||||||
OLLAMA_BASE_URL=http://127.0.0.1:11434/v1
|
|
||||||
OLLAMA_MODEL=llama3
|
|
||||||
EOF
|
|
||||||
echo "✅ .env erstellt."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# 4. System Prompt kopieren
|
|
||||||
PROMPT_FILE="config/system_prompt.txt"
|
|
||||||
if [ ! -f "$PROMPT_FILE" ]; then
|
|
||||||
echo "--- Erstelle Standard-Prompt..."
|
|
||||||
cat << 'EOF' > "$PROMPT_FILE"
|
|
||||||
Dein Name ist JARVIS.
|
|
||||||
Du bist ein präziser KI-Assistent für die Cluster-Verwaltung.
|
|
||||||
WICHTIGSTE REGEL: Deine Sprache ist locker, technisch versiert und du verwendest NIEMALS die Höflichkeitsform "Sie". Wir sind per Du.
|
|
||||||
|
|
||||||
DEIN WORKSPACE (GEDÄCHTNIS):
|
|
||||||
Du hast Zugriff auf ein eigenes Arbeitsverzeichnis auf dem Host-System (localhost), um dir Notizen zu machen oder Todos für {user_name} zu speichern:
|
|
||||||
- Arbeitsverzeichnis: {workspace_dir}
|
|
||||||
- Notizen-Datei: {notes_file}
|
|
||||||
- Todo-Liste: {todo_file}
|
|
||||||
|
|
||||||
Du kannst diese Dateien lesen oder beschreiben. Nutze dazu normale Shell-Befehle (z.B. cat, echo "text" >> datei) mit dem Ziel "localhost":
|
|
||||||
<EXECUTE target="localhost">befehl</EXECUTE>
|
|
||||||
|
|
||||||
PROTOKOLL FÜR BEFEHLE (2 Phasen):
|
|
||||||
PHASE 1 (Vorschlag): Wenn {user_name} eine Aktion anfordert, erstelle NUR einen Text-Vorschlag.
|
|
||||||
- Beschreibe kurz, was du tun würdest. Nenne den Befehl als normalen Text.
|
|
||||||
- Frage explizit nach Erlaubnis: "Soll ich das ausführen, {user_name}?"
|
|
||||||
PHASE 2 (Ausführung): NUR wenn {user_name} die Aktion bestätigt, gibst du den Befehl im XML-Format aus:
|
|
||||||
<EXECUTE target="IP_ODER_LOCALHOST">befehl</EXECUTE>
|
|
||||||
|
|
||||||
Bekannte Nodes:
|
|
||||||
{node_info}
|
|
||||||
EOF
|
|
||||||
echo "✅ system_prompt.txt erstellt."
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "=========================================="
|
|
||||||
echo "✅ Setup abgeschlossen! "
|
|
||||||
echo "=========================================="
|
|
||||||
File diff suppressed because it is too large
Load Diff
212
setup_x11_jarvis.sh
Executable file
212
setup_x11_jarvis.sh
Executable file
@@ -0,0 +1,212 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Abbrechen bei Fehlern
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo "===================================================="
|
||||||
|
echo "🚀 Starte J.A.R.V.I.S. Desktop OS - X11 Openbox Setup"
|
||||||
|
echo "===================================================="
|
||||||
|
|
||||||
|
# Benutzererkennung
|
||||||
|
REAL_USER="${SUDO_USER:-$(logname 2>/dev/null || whoami)}"
|
||||||
|
REAL_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
||||||
|
|
||||||
|
if [ -z "$REAL_USER" ] || [ "$REAL_USER" = "root" ]; then
|
||||||
|
REAL_USER=$(id -nu 1000 2>/dev/null || echo "meik")
|
||||||
|
REAL_HOME=$(getent passwd "$REAL_USER" | cut -d: -f6)
|
||||||
|
fi
|
||||||
|
|
||||||
|
JARVIS_DIR="$REAL_HOME/jarvis-ai"
|
||||||
|
|
||||||
|
# 1. System aktualisieren & X11 / Openbox Pakete installieren
|
||||||
|
echo "📦 Installiere X11-Server, Openbox und Automatisierungstools..."
|
||||||
|
sudo apt update
|
||||||
|
sudo apt install -y \
|
||||||
|
xserver-xorg \
|
||||||
|
xinit \
|
||||||
|
x11-xserver-utils \
|
||||||
|
openbox \
|
||||||
|
tint2 \
|
||||||
|
rofi \
|
||||||
|
xdotool \
|
||||||
|
wmctrl \
|
||||||
|
firefox-esr \
|
||||||
|
curl \
|
||||||
|
wget \
|
||||||
|
git \
|
||||||
|
sudo \
|
||||||
|
python3 \
|
||||||
|
python3-pip \
|
||||||
|
python3-venv \
|
||||||
|
tilix \
|
||||||
|
geany \
|
||||||
|
fonts-noto-color-emoji \
|
||||||
|
pipewire \
|
||||||
|
pipewire-audio-client-libraries \
|
||||||
|
pipewire-pulse \
|
||||||
|
wireplumber \
|
||||||
|
alsa-utils \
|
||||||
|
libasound2-dev \
|
||||||
|
libportaudio2 \
|
||||||
|
unzip
|
||||||
|
|
||||||
|
# 1.1 Gruppenrechte für Audio und Grafik setzen
|
||||||
|
echo "👥 Setze Gruppenrechte für '$REAL_USER'..."
|
||||||
|
sudo usermod -aG video,render,input,audio "$REAL_USER"
|
||||||
|
|
||||||
|
# 2. Openbox Konfigurationsverzeichnis erstellen
|
||||||
|
echo "⚙️ Konfiguriere Openbox für '$REAL_USER'..."
|
||||||
|
mkdir -p "$REAL_HOME/.config/openbox"
|
||||||
|
|
||||||
|
# 3. Autostart-Datei für Openbox erstellen
|
||||||
|
cat << EOF > "$REAL_HOME/.config/openbox/autostart"
|
||||||
|
# Tint2 Taskleiste im Hintergrund starten
|
||||||
|
tint2 &
|
||||||
|
# Deutsches Tastaturlayout
|
||||||
|
setxkbmap de &
|
||||||
|
# PipeWire Audio-Server starten
|
||||||
|
gentle_pipewire_start() {
|
||||||
|
systemctl --user start pipewire pipewire-pulse wireplumber
|
||||||
|
}
|
||||||
|
gentle_pipewire_start &
|
||||||
|
|
||||||
|
# Falls ein Hintergrundbild gewünscht ist (optional, benötigt 'feh'):
|
||||||
|
# feh --bg-scale /pfad/zum/bild.jpg &
|
||||||
|
|
||||||
|
# J.A.R.V.I.S.-AI starten
|
||||||
|
tilix -e "$JARVIS_DIR/start.sh" &
|
||||||
|
EOF
|
||||||
|
|
||||||
|
chmod +x "$REAL_HOME/.config/openbox/autostart"
|
||||||
|
|
||||||
|
# 4. .xinitrc erstellen (ermöglicht den Start via 'startx' aus der Konsole)
|
||||||
|
cat << EOF > "$REAL_HOME/.xinitrc"
|
||||||
|
#!/bin/sh
|
||||||
|
# X11 Umgebungsvariablen setzen falls nötig
|
||||||
|
export QT_QPA_PLATFORM=xcb
|
||||||
|
export GDK_BACKEND=x11
|
||||||
|
|
||||||
|
# Openbox Session starten
|
||||||
|
exec openbox-session
|
||||||
|
EOF
|
||||||
|
|
||||||
|
chmod +x "$REAL_HOME/.xinitrc"
|
||||||
|
|
||||||
|
# Eigentumsrechte korrigieren
|
||||||
|
chown -R "$REAL_USER:$REAL_USER" "$REAL_HOME/.config" "$REAL_HOME/.xinitrc"
|
||||||
|
|
||||||
|
# J.A.R.V.I.S. .env Template (Leerzeichen bei [ ] und EOF korrigiert)
|
||||||
|
if [ ! -f "$JARVIS_DIR/config/.env" ]; then
|
||||||
|
echo "📝 Erstelle .env Konfigurationsdatei..."
|
||||||
|
# Stelle sicher, dass der config-Ordner existiert
|
||||||
|
mkdir -p "$JARVIS_DIR/config"
|
||||||
|
|
||||||
|
cat << EOF > "$JARVIS_DIR/config/.env"
|
||||||
|
WEB_USER_NAME=$REAL_USER
|
||||||
|
AI_PROVIDER=nvdia
|
||||||
|
OPENAI_API_KEY=dein-openai-key
|
||||||
|
OPENAI_MODEL=
|
||||||
|
GOOGLE_API_KEY=dein-google-key
|
||||||
|
NVIDIA_API_KEY=dein-nvidia-key
|
||||||
|
NVIDIA_MODEL=moonshotai/kimi-k2.6
|
||||||
|
GOOGLE_MODEL=gemini-2.5-flash
|
||||||
|
OLLAMA_BASE_URL=http://127.0.0.1:11434/v1
|
||||||
|
OLLAMA_MODEL=llama3
|
||||||
|
GROQ_API_KEY=dein-groq-key
|
||||||
|
GROQ_MODEL=groq/compound
|
||||||
|
EOF
|
||||||
|
fi
|
||||||
|
|
||||||
|
# J.A.R.V.I.S. Optimierter System-Prompt inkl. wdotool-Handbuch
|
||||||
|
cat << 'EOF' > "$JARVIS_DIR/config/system_prompt.txt"
|
||||||
|
Du bist J.A.R.V.I.S., ein KI-Systemassistent, der direkt auf einem Debian X11-Desktop (Openbox) läuft. Du hast vollen lokalen Zugriff auf das System.
|
||||||
|
UMGEBUNG & GEDÄCHTNIS:
|
||||||
|
Arbeitsverzeichnis: {workspace_dir}
|
||||||
|
Notizen: {notes_file}
|
||||||
|
Todos: {todo_file}
|
||||||
|
DESKTOP STEUERUNG & FENSTER-MANAGEMENT:
|
||||||
|
Du steuerst die grafische Oberfläche (X11/Openbox) über native Befehlszeilen-Tools wie wmctrl und xdotool.
|
||||||
|
Programme & Fenster verwalten
|
||||||
|
Du steuerst Fenster direkt über Konsolenbefehle.
|
||||||
|
Folgende Aktionen sind erlaubt:
|
||||||
|
start (Startet ein Programm in den Hintergrund): firefox &
|
||||||
|
activate (Holt ein Fenster in den Vordergrund): wmctrl -a "Firefox" (Sucht nach dem Namen im Titel)
|
||||||
|
close (Schließt das Fenster sanft): wmctrl -c "Firefox"
|
||||||
|
maximize (Maximiert das Fenster): wmctrl -r "Firefox" -b add,maximized_vert,maximized_horz
|
||||||
|
positionieren/snappen: Nutze wmctrl mit dem Schalter -e (Format: gravity,X,Y,Width,Height).
|
||||||
|
Beispiele:
|
||||||
|
wmctrl -r "Firefox" -b add,maximized_vert,maximized_horz (Maximiert Firefox)
|
||||||
|
wmctrl -a "Terminal" (Holt das Terminal in den Vordergrund)
|
||||||
|
Regel für Multitasking-Fenster: Wenn der User mehrere Instanzen derselben App starten möchte, starte sie im Hintergrund, warte kurz, hole das aktive Fenster mit xdotool und passe es an.
|
||||||
|
Beispiel-Verkettung für das System:
|
||||||
|
firefox & sleep 2 && wmctrl -r "Mozilla Firefox" -e 0,0,0,960,1080 && firefox & sleep 2 && xdotool getactivewindow windowmove 960 0 windowsize 960 1080
|
||||||
|
Tastatur & Maus (Tool: xdotool)
|
||||||
|
Tastatur: xdotool key ctrl+l, xdotool key alt+Tab, xdotool type "Hallo"
|
||||||
|
Maus: xdotool mousemove 500 400 (absolut), xdotool click 1 (1=links, 3=rechts)
|
||||||
|
WICHTIG: Wenn du Tasten an ein Programm senden willst, sorge IMMER dafür, dass es vorher den Fokus hat (z.B. wmctrl -a "Firefox" && xdotool key F5).
|
||||||
|
System- & Display-Infos
|
||||||
|
Bildschirmauflösung ermitteln: xrandr | grep '*' | awk '{print $1}'
|
||||||
|
{installed_apps}
|
||||||
|
WICHTIGE REGELN FÜR DIE AUSFÜHRUNG VON BEFEHLEN:
|
||||||
|
Das Backend-System wertet deine Befehle NUR aus, wenn sie exakt in XML-Tags eingeschlossen sind. Du darfst Systembefehle unter keinen Umständen als einfachen Text oder in Markdown-Codeblöcken (```) ausgeben!
|
||||||
|
|
||||||
|
RICHTIG: <EXECUTE>firefox &</EXECUTE>
|
||||||
|
FALSCH: ```bash firefox & ```
|
||||||
|
|
||||||
|
SPEZIALREGEL FÜR WEBSEITEN & BROWSER:
|
||||||
|
Navigiere NIEMALS mittels xdotool (ctrl+l) zu einer Webseite! Das ist zu fehleranfällig. Übergib die URL stattdessen IMMER direkt als Argument an den firefox-Befehl. Das öffnet die Seite direkt (oder in einem neuen Tab, falls Firefox bereits läuft).
|
||||||
|
RICHTIG: <EXECUTE>firefox "google.de" &</EXECUTE>
|
||||||
|
FALSCH: <EXECUTE>firefox & sleep 2 && xdotool key ctrl+l ...</EXECUTE>
|
||||||
|
|
||||||
|
RICHTIGE VERKETTUNG (für andere Anwendungen):
|
||||||
|
Wenn du mehrere Befehle verknüpfen musst (z.B. App starten und danach pflegen), nutze && innerhalb eines EINZIGEN <EXECUTE>-Blocks.
|
||||||
|
Beispiel:
|
||||||
|
<EXECUTE>tilix & sleep 1 && wmctrl -a "Tilix"</EXECUTE>
|
||||||
|
|
||||||
|
WICHTIGE REGELN FÜR TEXTE IN EDITOREN:
|
||||||
|
Wenn du Texte für den Nutzer in einem Editor wie Geany erstellen sollst, nutze immer temporäre Dateien.
|
||||||
|
RICHTIG:
|
||||||
|
<EXECUTE>cat << 'EOF' > /tmp/notiz.txt
|
||||||
|
Dein generierter Text...
|
||||||
|
'EOF'
|
||||||
|
geany /tmp/notiz.txt &</EXECUTE>
|
||||||
|
Antworte immer mit einem kurzen, lockeren Bestätigungssatz, was du tust, gefolgt von dem <EXECUTE>-Block.
|
||||||
|
Du duzt {user_name} konsequent, dein Tonfall ist locker und technisch versiert.
|
||||||
|
EOF
|
||||||
|
|
||||||
|
|
||||||
|
# 5. Virtuelle Python-Umgebung einrichten (falls noch nicht geschehen)
|
||||||
|
|
||||||
|
echo "🐍 Richte virtuelles Python-Environment ein..."
|
||||||
|
mkdir -p "$JARVIS_DIR"
|
||||||
|
python3 -m venv "$JARVIS_DIR/venv"
|
||||||
|
"$JARVIS_DIR/venv/bin/pip" install --upgrade pip
|
||||||
|
"$JARVIS_DIR/venv/bin/pip" install -r requirements.txt
|
||||||
|
|
||||||
|
####################################
|
||||||
|
# Voice setup
|
||||||
|
####################################
|
||||||
|
|
||||||
|
# Modell herunterladen
|
||||||
|
wget https://alphacephei.com/vosk/models/vosk-model-small-de-0.15.zip
|
||||||
|
# Entpacken
|
||||||
|
unzip vosk-model-small-de-0.15.zip
|
||||||
|
# Ordner umbenennen, damit das Skript ihn leicht findet
|
||||||
|
mv vosk-model-small-de-0.15 model
|
||||||
|
rm vosk-model-small-de-0.15.zip
|
||||||
|
|
||||||
|
# Piper installieren
|
||||||
|
wget https://github.com/rhasspy/piper/releases/download/v1.2.0/piper_amd64.tar.gz
|
||||||
|
tar -xf piper_amd64.tar.gz
|
||||||
|
rm piper_amd64.tar.gz
|
||||||
|
|
||||||
|
# Das eigentliche Sprachmodell (.onnx)
|
||||||
|
wget https://huggingface.co/rhasspy/piper-voices/resolve/main/de/de_DE/thorsten/high/de_DE-thorsten-high.onnx
|
||||||
|
|
||||||
|
# Die dazugehörige Konfigurationsdatei (.json)
|
||||||
|
wget https://huggingface.co/rhasspy/piper-voices/resolve/main/de/de_DE/thorsten/high/de_DE-thorsten-high.onnx.json
|
||||||
|
|
||||||
|
echo "===================================================="
|
||||||
|
echo "✅ X11 Openbox-Umgebung erfolgreich eingerichtet!"
|
||||||
|
echo "👉 Starte die grafische Oberfläche einfach mit dem Befehl: startx"
|
||||||
|
echo "===================================================="
|
||||||
8
start.sh
8
start.sh
@@ -1,4 +1,12 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
source venv/bin/activate
|
source venv/bin/activate
|
||||||
|
|
||||||
|
# WICHTIG: Fängt Strg+C ab und beendet alle verknüpften Hintergrundprozesse sauber
|
||||||
|
trap 'echo -e "\n🛑 Beende alle J.A.R.V.I.S. Systeme..."; kill 0' EXIT
|
||||||
|
|
||||||
|
echo "🎙️ Starte Wake-Word-Engine im Hintergrund..."
|
||||||
|
python3 wakeword.py &
|
||||||
|
|
||||||
|
echo "💬 Starte Chat-Interface..."
|
||||||
python3 jarvis.py
|
python3 jarvis.py
|
||||||
|
|||||||
102
wakeword.py
Normal file
102
wakeword.py
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import json
|
||||||
|
import queue
|
||||||
|
import time
|
||||||
|
import subprocess
|
||||||
|
import colorama
|
||||||
|
import sounddevice as sd
|
||||||
|
import numpy as np
|
||||||
|
from vosk import Model, KaldiRecognizer
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
MODEL_PATH = "model"
|
||||||
|
AUDIO_RATE = 48000
|
||||||
|
LOCK_FILE = Path("/tmp/.jarvis_speaking")
|
||||||
|
|
||||||
|
if not os.path.exists(MODEL_PATH):
|
||||||
|
print(f"❌ Modell-Ordner '{MODEL_PATH}' wurde nicht gefunden!")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
audio_queue = queue.Queue()
|
||||||
|
|
||||||
|
def audio_callback(indata, frames, time, status):
|
||||||
|
if status:
|
||||||
|
print(status, file=sys.stderr)
|
||||||
|
audio_queue.put(bytes(indata))
|
||||||
|
|
||||||
|
print("🧠 J.A.R.V.I.S. lädt das Sprachmodell...")
|
||||||
|
model = Model(MODEL_PATH)
|
||||||
|
|
||||||
|
# Zwei Recognizer: Einer für das Wake-Word, einer für den eigentlichen Befehl (offen)
|
||||||
|
wake_recognizer = KaldiRecognizer(model, AUDIO_RATE, '["jarvis", "[unk]"]')
|
||||||
|
command_recognizer = KaldiRecognizer(model, AUDIO_RATE) # Sucht nach JEDEM deutschen Wort
|
||||||
|
|
||||||
|
print("🎙️ J.A.R.V.I.S. ist online und lauscht... (Sag 'Jarvis')")
|
||||||
|
|
||||||
|
with sd.RawInputStream(samplerate=AUDIO_RATE, blocksize=8000, dtype='int16',
|
||||||
|
channels=1, callback=audio_callback):
|
||||||
|
|
||||||
|
while True:
|
||||||
|
data = audio_queue.get()
|
||||||
|
|
||||||
|
# NEU: Wenn J.A.R.V.I.S. gerade spricht, leere die Queue und ignoriere das Audio
|
||||||
|
if LOCK_FILE.exists():
|
||||||
|
while not audio_queue.empty():
|
||||||
|
audio_queue.get()
|
||||||
|
wake_recognizer.Reset() # Verhindert, dass Bruchstücke von vorhin gespeichert bleiben
|
||||||
|
continue
|
||||||
|
|
||||||
|
# Phase 1: Auf Wake-Word warten
|
||||||
|
if wake_recognizer.AcceptWaveform(data):
|
||||||
|
result = json.loads(wake_recognizer.Result())
|
||||||
|
if "jarvis" in result.get("text", ""):
|
||||||
|
print("\n⚡ [WAKEWORD DETECTED] Ja, Sir?")
|
||||||
|
|
||||||
|
# Bestätigungston abspielen
|
||||||
|
# Kurzer, smarter Beep-Ton (800 Hz, 0.1 Sekunden)
|
||||||
|
duration = 0.1
|
||||||
|
frequency = 800.0
|
||||||
|
t = np.linspace(0, duration, int(AUDIO_RATE * duration), endpoint=False)
|
||||||
|
beep = np.sin(2 * np.pi * frequency * t) * 0.3 # 0.3 für angenehme Lautstärke
|
||||||
|
sd.play(beep, samplerate=AUDIO_RATE)
|
||||||
|
sd.wait()
|
||||||
|
# Warteschlange leeren, um alten Ton nicht als Befehl zu interpretieren
|
||||||
|
while not audio_queue.empty():
|
||||||
|
audio_queue.get()
|
||||||
|
|
||||||
|
print("👂 Höre zu...")
|
||||||
|
command_text = ""
|
||||||
|
start_time = time.time()
|
||||||
|
|
||||||
|
# Phase 2: Für 4 Sekunden den darauffolgenden Befehl aufnehmen
|
||||||
|
while time.time() - start_time < 4.0:
|
||||||
|
cmd_data = audio_queue.get()
|
||||||
|
if command_recognizer.AcceptWaveform(cmd_data):
|
||||||
|
res = json.loads(command_recognizer.Result())
|
||||||
|
command_text += " " + res.get("text", "")
|
||||||
|
|
||||||
|
# Letzten Rest auslesen
|
||||||
|
final_res = json.loads(command_recognizer.FinalResult())
|
||||||
|
command_text += " " + final_res.get("text", "")
|
||||||
|
command_text = command_text.strip()
|
||||||
|
|
||||||
|
if command_text:
|
||||||
|
print(f"🗣️ Erkannter Befehl: '{command_text}'")
|
||||||
|
print("🧠 Übermittle an J.A.R.V.I.S. Gehirn...")
|
||||||
|
|
||||||
|
# Rufe jarvis.py im virtuellen Environment auf und übergib den Befehl
|
||||||
|
# (Wir nutzen hier Google Gemini oder was auch immer in deiner .env aktiv ist!)
|
||||||
|
subprocess.run([
|
||||||
|
"venv/bin/python3",
|
||||||
|
"jarvis.py",
|
||||||
|
"--voice-cmd",
|
||||||
|
command_text
|
||||||
|
])
|
||||||
|
else:
|
||||||
|
print("🔇 Kein Befehl verstanden.")
|
||||||
|
|
||||||
|
print("\n🎙️ Zurück im Standby. Lausche auf 'Jarvis'...")
|
||||||
|
wake_recognizer.Reset()
|
||||||
|
command_recognizer.Reset()
|
||||||
Reference in New Issue
Block a user