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,
|
|
@@ -39,14 +39,14 @@ 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"],
|
| 49 |
-
"מתח": ["3.3V", "5V", "VIN", "Power"
|
| 50 |
"ממסר": ["Relay", "Switch"],
|
| 51 |
"אפליקציה": ["App", "Mobile"]
|
| 52 |
}
|
|
@@ -75,52 +75,17 @@ def init_db():
|
|
| 75 |
conn.close()
|
| 76 |
|
| 77 |
def expand_query(query: str) -> List[str]:
|
| 78 |
-
"""מפרק את השאילתה, מוסיף מונחים טכניים ווריאציות למספרים"""
|
| 79 |
words = re.sub(r'[^\w\s]', '', query).split()
|
| 80 |
search_terms = set(words)
|
| 81 |
-
|
| 82 |
for w in words:
|
| 83 |
root = w[1:] if len(w) > 3 and w.startswith('ה') else w
|
| 84 |
search_terms.add(root)
|
| 85 |
-
|
| 86 |
for key, values in SEARCH_MAP.items():
|
| 87 |
if key in root:
|
| 88 |
search_terms.update(values)
|
| 89 |
-
|
| 90 |
-
if w.isdigit():
|
| 91 |
-
search_terms.add(w)
|
| 92 |
-
search_terms.add(f"D{w}")
|
| 93 |
-
search_terms.add(f"GPIO{w}")
|
| 94 |
-
search_terms.add(f"Pin {w}")
|
| 95 |
-
|
| 96 |
return list(search_terms)
|
| 97 |
|
| 98 |
-
def
|
| 99 |
-
"""
|
| 100 |
-
מסנן את השרטוט: משאיר רק שורות שרלוונטיות לשאלה.
|
| 101 |
-
"""
|
| 102 |
-
lines = full_context.split('\n')
|
| 103 |
-
relevant_lines = []
|
| 104 |
-
|
| 105 |
-
header_terms = ["Schematic Connections", "connects to"]
|
| 106 |
-
target_terms = [t.lower() for t in query_terms if len(t) > 1]
|
| 107 |
-
|
| 108 |
-
for line in lines:
|
| 109 |
-
line_lower = line.lower()
|
| 110 |
-
|
| 111 |
-
if any(h.lower() in line_lower for h in header_terms) and len(line) < 50:
|
| 112 |
-
relevant_lines.append(line)
|
| 113 |
-
continue
|
| 114 |
-
|
| 115 |
-
if any(t in line_lower for t in target_terms):
|
| 116 |
-
relevant_lines.append(line)
|
| 117 |
-
|
| 118 |
-
if not relevant_lines:
|
| 119 |
-
return full_context
|
| 120 |
-
|
| 121 |
-
return "\n".join(relevant_lines)
|
| 122 |
-
|
| 123 |
-
def query_knowledge_base(query: str) -> Tuple[str, List[str]]:
|
| 124 |
conn = sqlite3.connect(DB_FILE)
|
| 125 |
cursor = conn.cursor()
|
| 126 |
|
|
@@ -136,36 +101,17 @@ def query_knowledge_base(query: str) -> Tuple[str, List[str]]:
|
|
| 136 |
for row_id, content, topic in rows:
|
| 137 |
if row_id not in seen_ids:
|
| 138 |
score = 1
|
| 139 |
-
|
| 140 |
-
|
| 141 |
-
is_tech_query = any(x in query for x in ["שרטוט", "חיבור", "פין", "לאן", "מחובר"])
|
| 142 |
-
|
| 143 |
-
if is_schematic and is_tech_query:
|
| 144 |
-
score += 100
|
| 145 |
elif term.lower() in topic.lower():
|
| 146 |
score += 10
|
| 147 |
-
|
| 148 |
-
numbers_in_query = [int(s) for s in query.split() if s.isdigit()]
|
| 149 |
-
for num in numbers_in_query:
|
| 150 |
-
if str(num) in content:
|
| 151 |
-
score += 50
|
| 152 |
|
| 153 |
results.append((score, content))
|
| 154 |
seen_ids.add(row_id)
|
| 155 |
|
| 156 |
conn.close()
|
| 157 |
-
|
| 158 |
results.sort(key=lambda x: x[0], reverse=True)
|
| 159 |
-
|
| 160 |
-
if results:
|
| 161 |
-
best_content = results[0][1]
|
| 162 |
-
if "Schematic" in best_content:
|
| 163 |
-
filtered = filter_schematic_context(best_content, search_terms)
|
| 164 |
-
logger.info(f"📉 Filtered context from {len(best_content)} to {len(filtered)} chars")
|
| 165 |
-
return filtered, search_terms
|
| 166 |
-
return best_content, search_terms
|
| 167 |
-
|
| 168 |
-
return "", search_terms
|
| 169 |
|
| 170 |
def save_message(role: str, content: str):
|
| 171 |
try:
|
|
@@ -183,7 +129,7 @@ class Message(BaseModel):
|
|
| 183 |
class ChatCompletionRequest(BaseModel):
|
| 184 |
messages: List[Message]
|
| 185 |
max_tokens: Optional[int] = 512
|
| 186 |
-
temperature: Optional[float] = 0.3
|
| 187 |
stream: Optional[bool] = False
|
| 188 |
|
| 189 |
@app.on_event("startup")
|
|
@@ -221,20 +167,21 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 221 |
context = ""
|
| 222 |
if last_user_msg:
|
| 223 |
save_message("user", last_user_msg.content)
|
| 224 |
-
context
|
| 225 |
|
|
|
|
| 226 |
if context:
|
| 227 |
sys_msg = (
|
| 228 |
-
"ת
|
| 229 |
-
"הנחיות:\n"
|
| 230 |
-
"1. ענה אך ורק בעברית
|
| 231 |
-
"2.
|
| 232 |
-
"3.
|
| 233 |
-
"4.
|
| 234 |
-
f"\nמידע טכני (Context):\n{context}"
|
| 235 |
)
|
| 236 |
else:
|
| 237 |
-
sys_msg = "אתה עוזר חכם לפרויקט תלם. ענה בעברית. אם אין מידע, ציי
|
| 238 |
|
| 239 |
if request.messages[0].role == "system":
|
| 240 |
request.messages[0].content = sys_msg
|
|
@@ -249,11 +196,11 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 249 |
gen_kwargs = dict(
|
| 250 |
inputs=prompt_ids,
|
| 251 |
max_new_tokens=request.max_tokens,
|
| 252 |
-
temperature=0.
|
| 253 |
top_p=0.9,
|
| 254 |
do_sample=True,
|
| 255 |
pad_token_id=tokenizer.eos_token_id,
|
| 256 |
-
repetition_penalty=1.
|
| 257 |
)
|
| 258 |
|
| 259 |
if request.stream:
|
|
|
|
| 23 |
logging.basicConfig(level=logging.INFO)
|
| 24 |
logger = logging.getLogger(__name__)
|
| 25 |
|
| 26 |
+
app = FastAPI(title="Hebrew Smart Home Technician", version="8.2.0")
|
| 27 |
|
| 28 |
app.add_middleware(
|
| 29 |
CORSMiddleware,
|
|
|
|
| 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"],
|
| 49 |
+
"מתח": ["3.3V", "5V", "VIN", "Power"],
|
| 50 |
"ממסר": ["Relay", "Switch"],
|
| 51 |
"אפליקציה": ["App", "Mobile"]
|
| 52 |
}
|
|
|
|
| 75 |
conn.close()
|
| 76 |
|
| 77 |
def expand_query(query: str) -> List[str]:
|
|
|
|
| 78 |
words = re.sub(r'[^\w\s]', '', query).split()
|
| 79 |
search_terms = set(words)
|
|
|
|
| 80 |
for w in words:
|
| 81 |
root = w[1:] if len(w) > 3 and w.startswith('ה') else w
|
| 82 |
search_terms.add(root)
|
|
|
|
| 83 |
for key, values in SEARCH_MAP.items():
|
| 84 |
if key in root:
|
| 85 |
search_terms.update(values)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 86 |
return list(search_terms)
|
| 87 |
|
| 88 |
+
def query_knowledge_base(query: str) -> str:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 89 |
conn = sqlite3.connect(DB_FILE)
|
| 90 |
cursor = conn.cursor()
|
| 91 |
|
|
|
|
| 101 |
for row_id, content, topic in rows:
|
| 102 |
if row_id not in seen_ids:
|
| 103 |
score = 1
|
| 104 |
+
if "Schematic" in content and any(x in query for x in ["שרטוט", "חיבור", "לא עובד", "תקלה", "פין"]):
|
| 105 |
+
score += 50
|
|
|
|
|
|
|
|
|
|
|
|
|
| 106 |
elif term.lower() in topic.lower():
|
| 107 |
score += 10
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 108 |
|
| 109 |
results.append((score, content))
|
| 110 |
seen_ids.add(row_id)
|
| 111 |
|
| 112 |
conn.close()
|
|
|
|
| 113 |
results.sort(key=lambda x: x[0], reverse=True)
|
| 114 |
+
return "\n---\n".join([r[1] for r in results[:2]])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 115 |
|
| 116 |
def save_message(role: str, content: str):
|
| 117 |
try:
|
|
|
|
| 129 |
class ChatCompletionRequest(BaseModel):
|
| 130 |
messages: List[Message]
|
| 131 |
max_tokens: Optional[int] = 512
|
| 132 |
+
temperature: Optional[float] = 0.3
|
| 133 |
stream: Optional[bool] = False
|
| 134 |
|
| 135 |
@app.on_event("startup")
|
|
|
|
| 167 |
context = ""
|
| 168 |
if last_user_msg:
|
| 169 |
save_message("user", last_user_msg.content)
|
| 170 |
+
context = query_knowledge_base(last_user_msg.content)
|
| 171 |
|
| 172 |
+
# --- הנחיית מערכת משודרגת לטכנאי מאבחן ---
|
| 173 |
if context:
|
| 174 |
sys_msg = (
|
| 175 |
+
"אתה מהנדס בכיר ומומחה למערכת 'בית חכם תלם'.\n"
|
| 176 |
+
"הנחיות לתשובה:\n"
|
| 177 |
+
"1. **שפה טבעית:** ענה אך ורק בעברית תקנית וזורמת. אל תשתמש במשפטים שבורים או בתרגום מילולי מאנגלית.\n"
|
| 178 |
+
"2. **הבנת השרטוט:** המידע למטה מכיל רשימת חיבורים ('Pin X connects to Pin Y'). אל תקריא את הרשימה! במקום זאת, הסבר את הלוגיקה. לדוגמה, במקום להגיד 'פין RX מחובר לפין 7', אמור 'המסך מקבל תקשורת דרך פין ה-RX המחובר לממיר'.\n"
|
| 179 |
+
"3. **פתרון תקלות (Troubleshooting):** אם המשתמש מתאר בעיה (למשל 'המסך לא עובד'), אל תגיד סתם 'תבדוק חיבורים'. הסתכל בשרטוט, מצא את הפינים הספציפיים של אותו רכיב (במיוחד 5V, GND, RX, TX) והנחה את המשתמש לבדוק אותם ספציפית בעזרת רב-מודד או ויזואלית.\n"
|
| 180 |
+
"4. **זיהוי רכיבים:** U2=ESP32, LCD1=מסך Nextion, U4=ממיר רמות (Logic Converter), U3=הלוח הראשי.\n"
|
| 181 |
+
f"\nמידע טכני מהשרטוט (Context):\n{context}"
|
| 182 |
)
|
| 183 |
else:
|
| 184 |
+
sys_msg = "אתה עוזר חכם לפרויקט תלם. ענה בעברית. אם אין לך מידע על השאלה, נסה להציע בדיקה כללית או אמור שאינך יודע."
|
| 185 |
|
| 186 |
if request.messages[0].role == "system":
|
| 187 |
request.messages[0].content = sys_msg
|
|
|
|
| 196 |
gen_kwargs = dict(
|
| 197 |
inputs=prompt_ids,
|
| 198 |
max_new_tokens=request.max_tokens,
|
| 199 |
+
temperature=0.35, # עלייה קלה כדי לאפשר ניסוח משפטים טבעיים יותר
|
| 200 |
top_p=0.9,
|
| 201 |
do_sample=True,
|
| 202 |
pad_token_id=tokenizer.eos_token_id,
|
| 203 |
+
repetition_penalty=1.05 # ענישה מינימלית
|
| 204 |
)
|
| 205 |
|
| 206 |
if request.stream:
|