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="
|
| 27 |
|
| 28 |
app.add_middleware(
|
| 29 |
CORSMiddleware,
|
|
@@ -85,32 +85,20 @@ def expand_query(query: str) -> List[str]:
|
|
| 85 |
search_terms.add(f"D{w}")
|
| 86 |
return list(search_terms)
|
| 87 |
|
| 88 |
-
def
|
| 89 |
-
|
| 90 |
-
|
| 91 |
-
|
| 92 |
-
"""
|
| 93 |
-
|
| 94 |
-
|
| 95 |
-
|
| 96 |
-
|
| 97 |
-
|
| 98 |
-
line = line.replace("040709_0804060105 (0201080606)", "לוח ראשי (U3)")
|
| 99 |
-
line = line.replace("U3 (TLM-SH_board)", "לוח ראשי (U3)")
|
| 100 |
-
line = line.replace("StudentBoard (0201080606)", "לוח ראשי (U3)")
|
| 101 |
-
line = line.replace("LCD1 (NEXTION)", "מסך (Nextion)")
|
| 102 |
-
line = line.replace("HMI (NEXTION)", "מסך (Nextion)")
|
| 103 |
-
|
| 104 |
-
# 2. תרגום פעלים ומונחים
|
| 105 |
-
line = line.replace("connects to", "מחובר אל")
|
| 106 |
-
line = line.replace("Pin", "פין")
|
| 107 |
-
|
| 108 |
-
return line
|
| 109 |
|
| 110 |
def query_knowledge_base(query: str) -> str:
|
| 111 |
conn = sqlite3.connect(DB_FILE)
|
| 112 |
cursor = conn.cursor()
|
| 113 |
-
|
| 114 |
search_terms = expand_query(query)
|
| 115 |
logger.info(f"🔍 Searching for: {search_terms}")
|
| 116 |
|
|
@@ -127,12 +115,10 @@ def query_knowledge_base(query: str) -> str:
|
|
| 127 |
score += 100
|
| 128 |
elif term.lower() in topic.lower():
|
| 129 |
score += 10
|
| 130 |
-
|
| 131 |
numbers_in_query = [int(s) for s in query.split() if s.isdigit()]
|
| 132 |
for num in numbers_in_query:
|
| 133 |
if str(num) in content:
|
| 134 |
score += 50
|
| 135 |
-
|
| 136 |
results.append((score, content))
|
| 137 |
seen_ids.add(row_id)
|
| 138 |
conn.close()
|
|
@@ -141,25 +127,19 @@ def query_knowledge_base(query: str) -> str:
|
|
| 141 |
|
| 142 |
if results:
|
| 143 |
raw_content = results[0][1]
|
| 144 |
-
|
| 145 |
-
# אם זה שרטוט, נבצע ניקוי ותרגום
|
| 146 |
if "Schematic" in raw_content:
|
| 147 |
lines = raw_content.split('\n')
|
| 148 |
relevant_lines = []
|
| 149 |
target_terms = [t.lower() for t in search_terms if len(t) > 1]
|
| 150 |
-
|
| 151 |
for line in lines:
|
| 152 |
-
# רק שורות שקשורות לרכיב שהמשתמש שאל עליו
|
| 153 |
if "connect" in line.lower() and any(t in line.lower() for t in target_terms):
|
| 154 |
-
|
| 155 |
-
cleaned = clean_schematic_line(line.strip())
|
| 156 |
-
relevant_lines.append(f"- {cleaned}")
|
| 157 |
|
|
|
|
| 158 |
if relevant_lines:
|
| 159 |
-
return "
|
| 160 |
|
| 161 |
return raw_content
|
| 162 |
-
|
| 163 |
return ""
|
| 164 |
|
| 165 |
def save_message(role: str, content: str):
|
|
@@ -178,7 +158,7 @@ class Message(BaseModel):
|
|
| 178 |
class ChatCompletionRequest(BaseModel):
|
| 179 |
messages: List[Message]
|
| 180 |
max_tokens: Optional[int] = 512
|
| 181 |
-
temperature: Optional[float] = 0.
|
| 182 |
stream: Optional[bool] = False
|
| 183 |
|
| 184 |
@app.on_event("startup")
|
|
@@ -220,55 +200,8 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 220 |
|
| 221 |
if context:
|
| 222 |
sys_msg = (
|
| 223 |
-
"תפקידך:
|
| 224 |
-
"הנחיות:\n"
|
| 225 |
-
"1.
|
| 226 |
-
"2.
|
| 227 |
-
"3.
|
| 228 |
-
"4. סכם את המידע: 'המסך מחובר לבקר בפינים...'.\n"
|
| 229 |
-
f"\nמידע מהמערכת:\n{context}"
|
| 230 |
-
)
|
| 231 |
-
else:
|
| 232 |
-
sys_msg = "אתה עוזר חכם לפרויקט תלם. ענה בעברית. אם אין לך מידע, אמור זאת."
|
| 233 |
-
|
| 234 |
-
if request.messages[0].role == "system":
|
| 235 |
-
request.messages[0].content = sys_msg
|
| 236 |
-
else:
|
| 237 |
-
request.messages.insert(0, Message(role="system", content=sys_msg))
|
| 238 |
-
|
| 239 |
-
try:
|
| 240 |
-
conversation = [msg.dict() for msg in request.messages]
|
| 241 |
-
prompt_ids = tokenizer.apply_chat_template(conversation, tokenize=True, add_generation_prompt=True, return_tensors="pt").to(device)
|
| 242 |
-
except: raise HTTPException(400, "Error formatting")
|
| 243 |
-
|
| 244 |
-
gen_kwargs = dict(
|
| 245 |
-
inputs=prompt_ids,
|
| 246 |
-
max_new_tokens=request.max_tokens,
|
| 247 |
-
temperature=0.2,
|
| 248 |
-
top_p=0.9,
|
| 249 |
-
do_sample=True,
|
| 250 |
-
pad_token_id=tokenizer.eos_token_id,
|
| 251 |
-
repetition_penalty=1.2 # מוגבר למניעת לופים
|
| 252 |
-
)
|
| 253 |
-
|
| 254 |
-
if request.stream:
|
| 255 |
-
streamer = TextIteratorStreamer(tokenizer, skip_prompt=True, skip_special_tokens=True)
|
| 256 |
-
gen_kwargs["streamer"] = streamer
|
| 257 |
-
thread = threading.Thread(target=run_generation, args=(model, tokenizer, gen_kwargs))
|
| 258 |
-
thread.start()
|
| 259 |
-
|
| 260 |
-
async def stream_generator():
|
| 261 |
-
full_text = ""
|
| 262 |
-
for text in streamer:
|
| 263 |
-
if text:
|
| 264 |
-
full_text += text
|
| 265 |
-
yield f"data: {json.dumps({'choices': [{'delta': {'content': text}}]}, ensure_ascii=False)}\n\n"
|
| 266 |
-
save_message("assistant", full_text)
|
| 267 |
-
yield "data: [DONE]\n\n"
|
| 268 |
-
|
| 269 |
-
return StreamingResponse(stream_generator(), media_type="text/event-stream; charset=utf-8")
|
| 270 |
-
|
| 271 |
-
return {}
|
| 272 |
-
|
| 273 |
-
if __name__ == "__main__":
|
| 274 |
-
uvicorn.run("server:app", host=HOST, port=PORT, reload=False)
|
|
|
|
| 23 |
logging.basicConfig(level=logging.INFO)
|
| 24 |
logger = logging.getLogger(__name__)
|
| 25 |
|
| 26 |
+
app = FastAPI(title="Hebrew Smart Home Technician", version="11.0.0")
|
| 27 |
|
| 28 |
app.add_middleware(
|
| 29 |
CORSMiddleware,
|
|
|
|
| 85 |
search_terms.add(f"D{w}")
|
| 86 |
return list(search_terms)
|
| 87 |
|
| 88 |
+
def simplify_schematic_text(text: str) -> str:
|
| 89 |
+
# ניקוי אגרסיבי של שמות טכניים כדי שהמודל ידבר עברית
|
| 90 |
+
text = text.replace("ESP32-DEVKITC-32D_ESP32-DEVKITC-30GPIO", "בקר ESP32")
|
| 91 |
+
text = text.replace("BOB_19002", "ממיר רמות")
|
| 92 |
+
text = text.replace("TLM-SH_board", "הלוח הראשי")
|
| 93 |
+
text = text.replace("NEXTION", "המסך")
|
| 94 |
+
text = text.replace("LCD1", "המסך")
|
| 95 |
+
text = text.replace("connects to", "מחובר ל-")
|
| 96 |
+
text = text.replace("Pin", "פין")
|
| 97 |
+
return text
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 98 |
|
| 99 |
def query_knowledge_base(query: str) -> str:
|
| 100 |
conn = sqlite3.connect(DB_FILE)
|
| 101 |
cursor = conn.cursor()
|
|
|
|
| 102 |
search_terms = expand_query(query)
|
| 103 |
logger.info(f"🔍 Searching for: {search_terms}")
|
| 104 |
|
|
|
|
| 115 |
score += 100
|
| 116 |
elif term.lower() in topic.lower():
|
| 117 |
score += 10
|
|
|
|
| 118 |
numbers_in_query = [int(s) for s in query.split() if s.isdigit()]
|
| 119 |
for num in numbers_in_query:
|
| 120 |
if str(num) in content:
|
| 121 |
score += 50
|
|
|
|
| 122 |
results.append((score, content))
|
| 123 |
seen_ids.add(row_id)
|
| 124 |
conn.close()
|
|
|
|
| 127 |
|
| 128 |
if results:
|
| 129 |
raw_content = results[0][1]
|
|
|
|
|
|
|
| 130 |
if "Schematic" in raw_content:
|
| 131 |
lines = raw_content.split('\n')
|
| 132 |
relevant_lines = []
|
| 133 |
target_terms = [t.lower() for t in search_terms if len(t) > 1]
|
|
|
|
| 134 |
for line in lines:
|
|
|
|
| 135 |
if "connect" in line.lower() and any(t in line.lower() for t in target_terms):
|
| 136 |
+
relevant_lines.append(simplify_schematic_text(line.strip()))
|
|
|
|
|
|
|
| 137 |
|
| 138 |
+
# מחזיר טקסט נקי מאוד בעברית
|
| 139 |
if relevant_lines:
|
| 140 |
+
return "\n".join(relevant_lines)
|
| 141 |
|
| 142 |
return raw_content
|
|
|
|
| 143 |
return ""
|
| 144 |
|
| 145 |
def save_message(role: str, content: str):
|
|
|
|
| 158 |
class ChatCompletionRequest(BaseModel):
|
| 159 |
messages: List[Message]
|
| 160 |
max_tokens: Optional[int] = 512
|
| 161 |
+
temperature: Optional[float] = 0.25
|
| 162 |
stream: Optional[bool] = False
|
| 163 |
|
| 164 |
@app.on_event("startup")
|
|
|
|
| 200 |
|
| 201 |
if context:
|
| 202 |
sys_msg = (
|
| 203 |
+
"תפקידך: אתה המדריך של פרויקט 'בית חכם תלם'. עליך לענות בעברית טבעית וברורה.\n"
|
| 204 |
+
"הנחיות לתשובה:\n"
|
| 205 |
+
"1. קרא את רשימת החיבורים הטכנית למטה.\n"
|
| 206 |
+
"2. **אל תעתיק את הרשימה!** במקום זאת, הסבר אותה במילים שלך.\n"
|
| 207 |
+
"3. דוגמה לתשובה טובה: 'המסך מחובר
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|