Spaces:
Sleeping
Sleeping
Update server.py
Browse files
server.py
CHANGED
|
@@ -23,7 +23,7 @@ JSON_SOURCE = "database.json"
|
|
| 23 |
logging.basicConfig(level=logging.INFO)
|
| 24 |
logger = logging.getLogger(__name__)
|
| 25 |
|
| 26 |
-
app = FastAPI(title="Hebrew Smart Home Technician", version="9.
|
| 27 |
|
| 28 |
app.add_middleware(
|
| 29 |
CORSMiddleware,
|
|
@@ -37,12 +37,13 @@ model = None
|
|
| 37 |
tokenizer = None
|
| 38 |
device = "cpu"
|
| 39 |
|
| 40 |
-
# --- מילון מונחים
|
| 41 |
SEARCH_MAP = {
|
| 42 |
"בקר": ["ESP32", "U2", "Controller"],
|
| 43 |
"מסך": ["Nextion", "LCD1", "HMI", "Display"],
|
| 44 |
"שרטוט": ["Schematic", "Connections", "Pin", "Net"],
|
| 45 |
"חיבור": ["Connect", "Wire", "Signal"],
|
|
|
|
| 46 |
"תקלה": ["Error", "Problem", "Fix", "Issue"],
|
| 47 |
"לא עובד": ["Power", "Voltage", "GND", "Disconnect"],
|
| 48 |
"זרם": ["ACS712", "Sensor", "Current"],
|
|
@@ -90,10 +91,26 @@ def expand_query(query: str) -> List[str]:
|
|
| 90 |
search_terms.add(f"Pin {w}")
|
| 91 |
return list(search_terms)
|
| 92 |
|
| 93 |
-
def
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 94 |
conn = sqlite3.connect(DB_FILE)
|
| 95 |
cursor = conn.cursor()
|
| 96 |
-
|
| 97 |
search_terms = expand_query(query)
|
| 98 |
logger.info(f"🔍 Searching for: {search_terms}")
|
| 99 |
|
|
@@ -107,13 +124,14 @@ def query_knowledge_base(query: str) -> str:
|
|
| 107 |
if row_id not in seen_ids:
|
| 108 |
score = 1
|
| 109 |
|
| 110 |
-
|
| 111 |
-
|
|
|
|
|
|
|
| 112 |
score += 100
|
| 113 |
elif term.lower() in topic.lower():
|
| 114 |
score += 10
|
| 115 |
|
| 116 |
-
# בונוס למספרים (למשל פין 18)
|
| 117 |
numbers_in_query = [int(s) for s in query.split() if s.isdigit()]
|
| 118 |
for num in numbers_in_query:
|
| 119 |
if str(num) in content:
|
|
@@ -121,15 +139,17 @@ def query_knowledge_base(query: str) -> str:
|
|
| 121 |
|
| 122 |
results.append((score, content))
|
| 123 |
seen_ids.add(row_id)
|
| 124 |
-
|
| 125 |
conn.close()
|
| 126 |
|
| 127 |
results.sort(key=lambda x: x[0], reverse=True)
|
| 128 |
|
| 129 |
-
# מחזיר רק את התוצאה הכי טובה כדי לא לבלבל את המודל עם עודף מידע
|
| 130 |
if results:
|
| 131 |
-
|
| 132 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 133 |
|
| 134 |
def save_message(role: str, content: str):
|
| 135 |
try:
|
|
@@ -147,7 +167,7 @@ class Message(BaseModel):
|
|
| 147 |
class ChatCompletionRequest(BaseModel):
|
| 148 |
messages: List[Message]
|
| 149 |
max_tokens: Optional[int] = 512
|
| 150 |
-
temperature: Optional[float] = 0.
|
| 151 |
stream: Optional[bool] = False
|
| 152 |
|
| 153 |
@app.on_event("startup")
|
|
@@ -185,21 +205,21 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 185 |
context = ""
|
| 186 |
if last_user_msg:
|
| 187 |
save_message("user", last_user_msg.content)
|
| 188 |
-
context = query_knowledge_base(last_user_msg.content)
|
| 189 |
|
| 190 |
-
# --- הנחיה ק
|
| 191 |
if context:
|
| 192 |
sys_msg = (
|
| 193 |
-
"
|
| 194 |
-
"הנחיות
|
| 195 |
-
"1.
|
| 196 |
-
"2.
|
| 197 |
-
"3. א
|
| 198 |
-
"4. א
|
| 199 |
-
f"\nמידע טכני מ
|
| 200 |
)
|
| 201 |
else:
|
| 202 |
-
sys_msg = "אתה עוזר חכם לפרויקט תלם. ענה בעברית בלבד.
|
| 203 |
|
| 204 |
if request.messages[0].role == "system":
|
| 205 |
request.messages[0].content = sys_msg
|
|
@@ -214,11 +234,11 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 214 |
gen_kwargs = dict(
|
| 215 |
inputs=prompt_ids,
|
| 216 |
max_new_tokens=request.max_tokens,
|
| 217 |
-
temperature=0.
|
| 218 |
-
top_p=0.
|
| 219 |
do_sample=True,
|
| 220 |
pad_token_id=tokenizer.eos_token_id,
|
| 221 |
-
repetition_penalty=1.
|
| 222 |
)
|
| 223 |
|
| 224 |
if request.stream:
|
|
|
|
| 23 |
logging.basicConfig(level=logging.INFO)
|
| 24 |
logger = logging.getLogger(__name__)
|
| 25 |
|
| 26 |
+
app = FastAPI(title="Hebrew Smart Home Technician", version="9.7.0")
|
| 27 |
|
| 28 |
app.add_middleware(
|
| 29 |
CORSMiddleware,
|
|
|
|
| 37 |
tokenizer = None
|
| 38 |
device = "cpu"
|
| 39 |
|
| 40 |
+
# --- מילון מונחים ותיקון שגיאות ---
|
| 41 |
SEARCH_MAP = {
|
| 42 |
"בקר": ["ESP32", "U2", "Controller"],
|
| 43 |
"מסך": ["Nextion", "LCD1", "HMI", "Display"],
|
| 44 |
"שרטוט": ["Schematic", "Connections", "Pin", "Net"],
|
| 45 |
"חיבור": ["Connect", "Wire", "Signal"],
|
| 46 |
+
"חיבןר": ["Connect", "Wire", "Signal"], # תיקון שגיאת כתיב נפוצה
|
| 47 |
"תקלה": ["Error", "Problem", "Fix", "Issue"],
|
| 48 |
"לא עובד": ["Power", "Voltage", "GND", "Disconnect"],
|
| 49 |
"זרם": ["ACS712", "Sensor", "Current"],
|
|
|
|
| 91 |
search_terms.add(f"Pin {w}")
|
| 92 |
return list(search_terms)
|
| 93 |
|
| 94 |
+
def filter_schematic_context(full_context: str, query_terms: List[str]) -> str:
|
| 95 |
+
lines = full_context.split('\n')
|
| 96 |
+
relevant_lines = []
|
| 97 |
+
|
| 98 |
+
target_terms = [t.lower() for t in query_terms if len(t) > 1]
|
| 99 |
+
|
| 100 |
+
for line in lines:
|
| 101 |
+
line_lower = line.lower()
|
| 102 |
+
# אם השורה מכילה את הרכיב המבוקש וגם מילת קישור
|
| 103 |
+
if "connect" in line_lower and any(t in line_lower for t in target_terms):
|
| 104 |
+
relevant_lines.append(line.strip())
|
| 105 |
+
|
| 106 |
+
if not relevant_lines:
|
| 107 |
+
return full_context
|
| 108 |
+
|
| 109 |
+
return "רשימת חיבורים רלוונטית:\n" + "\n".join(relevant_lines)
|
| 110 |
+
|
| 111 |
+
def query_knowledge_base(query: str) -> Tuple[str, List[str]]:
|
| 112 |
conn = sqlite3.connect(DB_FILE)
|
| 113 |
cursor = conn.cursor()
|
|
|
|
| 114 |
search_terms = expand_query(query)
|
| 115 |
logger.info(f"🔍 Searching for: {search_terms}")
|
| 116 |
|
|
|
|
| 124 |
if row_id not in seen_ids:
|
| 125 |
score = 1
|
| 126 |
|
| 127 |
+
is_schematic = "Schematic" in content or "Connections" in content
|
| 128 |
+
is_tech_query = any(x in query for x in ["שרטוט", "חיבור", "פין", "לאן", "מחובר", "מסך"])
|
| 129 |
+
|
| 130 |
+
if is_schematic and is_tech_query:
|
| 131 |
score += 100
|
| 132 |
elif term.lower() in topic.lower():
|
| 133 |
score += 10
|
| 134 |
|
|
|
|
| 135 |
numbers_in_query = [int(s) for s in query.split() if s.isdigit()]
|
| 136 |
for num in numbers_in_query:
|
| 137 |
if str(num) in content:
|
|
|
|
| 139 |
|
| 140 |
results.append((score, content))
|
| 141 |
seen_ids.add(row_id)
|
|
|
|
| 142 |
conn.close()
|
| 143 |
|
| 144 |
results.sort(key=lambda x: x[0], reverse=True)
|
| 145 |
|
|
|
|
| 146 |
if results:
|
| 147 |
+
best_content = results[0][1]
|
| 148 |
+
if "Schematic" in best_content:
|
| 149 |
+
filtered = filter_schematic_context(best_content, search_terms)
|
| 150 |
+
return filtered, search_terms
|
| 151 |
+
return best_content, search_terms
|
| 152 |
+
return "", search_terms
|
| 153 |
|
| 154 |
def save_message(role: str, content: str):
|
| 155 |
try:
|
|
|
|
| 167 |
class ChatCompletionRequest(BaseModel):
|
| 168 |
messages: List[Message]
|
| 169 |
max_tokens: Optional[int] = 512
|
| 170 |
+
temperature: Optional[float] = 0.2
|
| 171 |
stream: Optional[bool] = False
|
| 172 |
|
| 173 |
@app.on_event("startup")
|
|
|
|
| 205 |
context = ""
|
| 206 |
if last_user_msg:
|
| 207 |
save_message("user", last_user_msg.content)
|
| 208 |
+
context, _ = query_knowledge_base(last_user_msg.content)
|
| 209 |
|
| 210 |
+
# --- הנחיה מתוקנת לסיכום ודיוק ---
|
| 211 |
if context:
|
| 212 |
sys_msg = (
|
| 213 |
+
"תפקידך: טכנאי מומחה המסביר על מערכת 'בית חכם'.\n"
|
| 214 |
+
"הנחיות לתשובה:\n"
|
| 215 |
+
"1. **ענה בעברית בלבד**. אל תשתמש במילים באנגלית (כמו crucial, utilize).\n"
|
| 216 |
+
"2. **סיכום:** אל תקריא את הרשימה הטכנית! קרא אותה, הבן לאן הרכיב מחובר, וכתוב משפט אחד שמסכם זאת.\n"
|
| 217 |
+
"3. דוגמה: אם כתוב ש-LCD1 מחובר ל-U4, תגיד: 'המסך מחובר לבקר דרך מתאם U4 בפינים של תקשורת'.\n"
|
| 218 |
+
"4. אם שואלים על חיבור ספציפי, ציין את מספרי הפינים.\n"
|
| 219 |
+
f"\nמידע טכני גולמי לשימושך:\n{context}"
|
| 220 |
)
|
| 221 |
else:
|
| 222 |
+
sys_msg = "אתה עוזר חכם לפרויקט תלם. ענה בעברית בלבד."
|
| 223 |
|
| 224 |
if request.messages[0].role == "system":
|
| 225 |
request.messages[0].content = sys_msg
|
|
|
|
| 234 |
gen_kwargs = dict(
|
| 235 |
inputs=prompt_ids,
|
| 236 |
max_new_tokens=request.max_tokens,
|
| 237 |
+
temperature=0.2,
|
| 238 |
+
top_p=0.9,
|
| 239 |
do_sample=True,
|
| 240 |
pad_token_id=tokenizer.eos_token_id,
|
| 241 |
+
repetition_penalty=1.2 # ענישה חזקה יותר כדי למנוע את הלופ "המגמת החשמל..."
|
| 242 |
)
|
| 243 |
|
| 244 |
if request.stream:
|