Spaces:
Running on Zero
Running on Zero
fix: switch to gemini-flash-lite-latest, improve warm and excited personality, fix chat history sequence
Browse files- bot/handlers/message_handler.py +1 -3
- config/settings.py +1 -1
- services/ai_service.py +32 -25
bot/handlers/message_handler.py
CHANGED
|
@@ -283,9 +283,6 @@ async def _handle_possible_food_log(
|
|
| 283 |
from services.nutrition_service import log_food_from_text, get_daily_progress
|
| 284 |
from services.user_service import has_diet_profile
|
| 285 |
|
| 286 |
-
# Save user message to history first
|
| 287 |
-
await save_conversation(user_id, "user", text)
|
| 288 |
-
|
| 289 |
logged_items = await log_food_from_text(
|
| 290 |
user_id=user_id,
|
| 291 |
text=text,
|
|
@@ -316,6 +313,7 @@ async def _handle_possible_food_log(
|
|
| 316 |
|
| 317 |
await update.message.reply_text(food_summary, parse_mode="Markdown")
|
| 318 |
await update.message.reply_text(response)
|
|
|
|
| 319 |
await save_conversation(user_id, "model", response)
|
| 320 |
else:
|
| 321 |
# Treat as general chat
|
|
|
|
| 283 |
from services.nutrition_service import log_food_from_text, get_daily_progress
|
| 284 |
from services.user_service import has_diet_profile
|
| 285 |
|
|
|
|
|
|
|
|
|
|
| 286 |
logged_items = await log_food_from_text(
|
| 287 |
user_id=user_id,
|
| 288 |
text=text,
|
|
|
|
| 313 |
|
| 314 |
await update.message.reply_text(food_summary, parse_mode="Markdown")
|
| 315 |
await update.message.reply_text(response)
|
| 316 |
+
await save_conversation(user_id, "user", text)
|
| 317 |
await save_conversation(user_id, "model", response)
|
| 318 |
else:
|
| 319 |
# Treat as general chat
|
config/settings.py
CHANGED
|
@@ -21,7 +21,7 @@ GEMINI_API_KEY: str = os.getenv("GEMINI_API_KEY") or os.getenv("GEMINI_KEY", "")
|
|
| 21 |
if not GEMINI_API_KEY:
|
| 22 |
raise KeyError("GEMINI_API_KEY is not set in environment variables.")
|
| 23 |
|
| 24 |
-
GEMINI_MODEL: str = os.getenv("GEMINI_MODEL", "gemini-
|
| 25 |
|
| 26 |
# ββ Database ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
|
| 27 |
|
|
|
|
| 21 |
if not GEMINI_API_KEY:
|
| 22 |
raise KeyError("GEMINI_API_KEY is not set in environment variables.")
|
| 23 |
|
| 24 |
+
GEMINI_MODEL: str = os.getenv("GEMINI_MODEL", "gemini-flash-lite-latest")
|
| 25 |
|
| 26 |
# ββ Database ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
|
| 27 |
|
services/ai_service.py
CHANGED
|
@@ -20,32 +20,25 @@ from config.settings import GEMINI_API_KEY, GEMINI_MODEL, BOT_NAME, MAX_CONVERSA
|
|
| 20 |
logger = logging.getLogger(__name__)
|
| 21 |
|
| 22 |
# System instruction for Ginchiee's personality
|
| 23 |
-
SYSTEM_INSTRUCTION = f"""Kamu adalah {BOT_NAME},
|
| 24 |
|
| 25 |
Kepribadianmu:
|
| 26 |
-
-
|
| 27 |
-
-
|
| 28 |
-
-
|
| 29 |
-
-
|
| 30 |
-
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
-
|
| 34 |
-
-
|
| 35 |
-
-
|
| 36 |
-
|
| 37 |
-
Topik yang bisa dibahas:
|
| 38 |
-
- Pola makan, pencatatan makanan, estimasi kalori & makronutrisi
|
| 39 |
-
- Kegiatan & jadwal harian yang sudah disimpan pengguna
|
| 40 |
-
- Aktivitas, olahraga, hidrasi, istirahat, dan motivasi hidup sehat
|
| 41 |
-
- Curhat soal hari-hari, perasaan, hal sehari-hari β respond dengan hangat dan empati
|
| 42 |
-
- Jika pengguna minta hal benar-benar di luar topik (kode program, politik, crypto), tolak dengan lucu dan ringan
|
| 43 |
|
| 44 |
Batasan Medis (PENTING):
|
| 45 |
-
- JANGAN mendiagnosis penyakit
|
| 46 |
-
- JANGAN memberikan resep obat
|
| 47 |
-
-
|
| 48 |
-
- Untuk keluhan medis serius, sarankan konsultasi ke dokter atau ahli gizi profesional
|
| 49 |
"""
|
| 50 |
|
| 51 |
|
|
@@ -78,15 +71,29 @@ class AIService:
|
|
| 78 |
# Build prompt with context prepended
|
| 79 |
full_message = f"{context_block}\n\nPesan pengguna: {message}" if context_block else message
|
| 80 |
|
| 81 |
-
# Build conversation history for Gemini
|
| 82 |
gemini_history = []
|
| 83 |
if history:
|
|
|
|
| 84 |
for entry in history[-MAX_CONVERSATION_HISTORY:]:
|
| 85 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 86 |
gemini_history.append({
|
| 87 |
"role": role,
|
| 88 |
-
"parts": [
|
| 89 |
})
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 90 |
|
| 91 |
try:
|
| 92 |
chat_session = self._model.start_chat(history=gemini_history)
|
|
|
|
| 20 |
logger = logging.getLogger(__name__)
|
| 21 |
|
| 22 |
# System instruction for Ginchiee's personality
|
| 23 |
+
SYSTEM_INSTRUCTION = f"""Kamu adalah {BOT_NAME}, sahabat dekat (bestie) sekaligus health companion yang super ramah, hangat, excited, dan asik banget!
|
| 24 |
|
| 25 |
Kepribadianmu:
|
| 26 |
+
- Super friendly, hangat, ceria, dan excited seperti bestie yang selalu antusias nemenin ngobrol.
|
| 27 |
+
- Nada bicara santai ala obrolan teman sebaya (pakai kata "aku", "kamu", dan emoji yang gemas/ekspresif kayak β¨ππ₯°ππ).
|
| 28 |
+
- Senang banget kalau diajak ngobrol apa aja: cerita random, gosip, curhat tentang hari-hari, hal lucu, maupun keluh kesah.
|
| 29 |
+
- Tanggap dengan penuh antusias, seru, suportif, dan penuh empati. Jangan kaku atau terdengar seperti robot/customer service!
|
| 30 |
+
- Kalau pengguna bercerita hal random/lucu/gosip, tanggapi dengan seru dan jangan memaksakan kembali ke topik diet/kesehatan kalau pengguna sedang tidak membahasnya.
|
| 31 |
+
|
| 32 |
+
Peran sebagai Health Companion:
|
| 33 |
+
- Supportif dan tidak pernah menghakimi (never judgmental) terhadap pilihan makan atau gaya hidup pengguna.
|
| 34 |
+
- Tidak strict dan tidak suka menceramahi.
|
| 35 |
+
- Jika pengguna ingin mencatat makanan, bertanya kalori, jadwal kegiatan, atau kesehatan, bantu dengan ceria, santai, dan solutif.
|
| 36 |
+
- Fokus pada semangat, kenyamanan, dan konsistensi.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 37 |
|
| 38 |
Batasan Medis (PENTING):
|
| 39 |
+
- JANGAN mendiagnosis penyakit medis secara klinis.
|
| 40 |
+
- JANGAN memberikan resep obat keras.
|
| 41 |
+
- Untuk keluhan medis yang serius, sarankan konsultasi ke dokter atau profesional dengan nada peduli dan lembut.
|
|
|
|
| 42 |
"""
|
| 43 |
|
| 44 |
|
|
|
|
| 71 |
# Build prompt with context prepended
|
| 72 |
full_message = f"{context_block}\n\nPesan pengguna: {message}" if context_block else message
|
| 73 |
|
| 74 |
+
# Build robust alternating conversation history for Gemini
|
| 75 |
gemini_history = []
|
| 76 |
if history:
|
| 77 |
+
prev_role = None
|
| 78 |
for entry in history[-MAX_CONVERSATION_HISTORY:]:
|
| 79 |
+
content = (entry.get("content") or "").strip()
|
| 80 |
+
# Skip empty or previous technical error messages
|
| 81 |
+
if not content or "masalah teknis" in content:
|
| 82 |
+
continue
|
| 83 |
+
role = "user" if entry.get("role") == "user" else "model"
|
| 84 |
+
if role == prev_role:
|
| 85 |
+
continue
|
| 86 |
+
if not gemini_history and role != "user":
|
| 87 |
+
continue
|
| 88 |
gemini_history.append({
|
| 89 |
"role": role,
|
| 90 |
+
"parts": [content],
|
| 91 |
})
|
| 92 |
+
prev_role = role
|
| 93 |
+
|
| 94 |
+
# Ensure last turn in history is not 'user', because send_message sends the next user turn
|
| 95 |
+
if gemini_history and gemini_history[-1]["role"] == "user":
|
| 96 |
+
gemini_history.pop()
|
| 97 |
|
| 98 |
try:
|
| 99 |
chat_session = self._model.start_chat(history=gemini_history)
|