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,
|
|
@@ -45,9 +45,7 @@ SEARCH_MAP = {
|
|
| 45 |
"חיבור": ["Connect", "Wire", "Signal"],
|
| 46 |
"תקלה": ["Error", "Problem", "Fix"],
|
| 47 |
"זרם": ["ACS712", "Sensor"],
|
| 48 |
-
"מתח": ["3.3V", "5V", "VIN", "Power"]
|
| 49 |
-
"ממיר": ["LevelConvertor", "BOB_19002", "U4", "Shifter", "Level"], # הוספתי מונחים לממיר
|
| 50 |
-
"שלב": ["LevelConvertor", "BOB_19002", "U4", "Shifter"]
|
| 51 |
}
|
| 52 |
|
| 53 |
def init_db():
|
|
@@ -88,29 +86,19 @@ def expand_query(query: str) -> List[str]:
|
|
| 88 |
return list(search_terms)
|
| 89 |
|
| 90 |
def simplify_schematic_text(text: str) -> str:
|
| 91 |
-
|
| 92 |
-
|
| 93 |
-
"""
|
| 94 |
-
|
| 95 |
-
text = text.replace("
|
| 96 |
-
text = text.replace("
|
| 97 |
-
text = text.replace("LevelConvertor (BOB_19002)", "ממיר רמות (U4)")
|
| 98 |
-
text = text.replace("BOB_19002", "ממיר רמות (U4)")
|
| 99 |
-
text = text.replace("StudentBoard (0201080606)", "לוח ראשי (U3)")
|
| 100 |
-
text = text.replace("0201080606", "לוח ראשי (U3)")
|
| 101 |
-
text = text.replace("LCD1 (NEXTION)", "מסך (Nextion)")
|
| 102 |
-
text = text.replace("HMI (NEXTION)", "מסך (Nextion)")
|
| 103 |
-
|
| 104 |
-
# החלפת מילות קישור
|
| 105 |
text = text.replace("connects to", "מחובר אל")
|
| 106 |
text = text.replace("Pin", "פין")
|
| 107 |
-
|
| 108 |
return text
|
| 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 |
|
|
@@ -123,18 +111,14 @@ def query_knowledge_base(query: str) -> str:
|
|
| 123 |
for row_id, content, topic in rows:
|
| 124 |
if row_id not in seen_ids:
|
| 125 |
score = 1
|
| 126 |
-
|
| 127 |
-
# בונוס לחיפוש טכני בשרטוט
|
| 128 |
-
if "Schematic" in content and any(x in query for x in ["שרטוט", "חיבור", "פין", "לאן", "מחובר", "מסך", "ממיר", "בקר"]):
|
| 129 |
score += 100
|
| 130 |
elif term.lower() in topic.lower():
|
| 131 |
score += 10
|
| 132 |
-
|
| 133 |
numbers_in_query = [int(s) for s in query.split() if s.isdigit()]
|
| 134 |
for num in numbers_in_query:
|
| 135 |
if str(num) in content:
|
| 136 |
score += 50
|
| 137 |
-
|
| 138 |
results.append((score, content))
|
| 139 |
seen_ids.add(row_id)
|
| 140 |
conn.close()
|
|
@@ -143,25 +127,21 @@ def query_knowledge_base(query: str) -> str:
|
|
| 143 |
|
| 144 |
if results:
|
| 145 |
raw_content = results[0][1]
|
| 146 |
-
|
| 147 |
-
# אם זה שרטוט, נבצע ניקוי והתמקדות
|
| 148 |
if "Schematic" in raw_content:
|
| 149 |
lines = raw_content.split('\n')
|
| 150 |
relevant_lines = []
|
| 151 |
-
|
| 152 |
-
# חיפוש מורחב: אם שואלים על "ממיר", נחפש גם U4, BOB, LevelConvertor
|
| 153 |
target_terms = [t.lower() for t in search_terms if len(t) > 1]
|
| 154 |
-
|
| 155 |
for line in lines:
|
| 156 |
-
|
| 157 |
-
|
| 158 |
-
|
|
|
|
| 159 |
|
| 160 |
if relevant_lines:
|
| 161 |
-
|
|
|
|
| 162 |
|
| 163 |
return raw_content
|
| 164 |
-
|
| 165 |
return ""
|
| 166 |
|
| 167 |
def save_message(role: str, content: str):
|
|
@@ -180,7 +160,7 @@ class Message(BaseModel):
|
|
| 180 |
class ChatCompletionRequest(BaseModel):
|
| 181 |
messages: List[Message]
|
| 182 |
max_tokens: Optional[int] = 512
|
| 183 |
-
temperature: Optional[float] = 0.
|
| 184 |
stream: Optional[bool] = False
|
| 185 |
|
| 186 |
@app.on_event("startup")
|
|
@@ -222,17 +202,15 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 222 |
|
| 223 |
if context:
|
| 224 |
sys_msg = (
|
| 225 |
-
"
|
| 226 |
"הנחיות:\n"
|
| 227 |
-
"1.
|
| 228 |
-
"2. המידע
|
| 229 |
-
"3.
|
| 230 |
-
"
|
| 231 |
-
"5. דוגמה: 'ממיר הרמות (U4) מחובר למסך בפינים של התקשורת ולבקר בפינים תואמים'.\n"
|
| 232 |
-
f"\nהקשר (מידע טכני):\n{context}"
|
| 233 |
)
|
| 234 |
else:
|
| 235 |
-
sys_msg = "אתה עוזר חכם לפרויקט תלם. ענה בעברית.
|
| 236 |
|
| 237 |
if request.messages[0].role == "system":
|
| 238 |
request.messages[0].content = sys_msg
|
|
@@ -247,11 +225,11 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 247 |
gen_kwargs = dict(
|
| 248 |
inputs=prompt_ids,
|
| 249 |
max_new_tokens=request.max_tokens,
|
| 250 |
-
temperature=0.
|
| 251 |
top_p=0.9,
|
| 252 |
do_sample=True,
|
| 253 |
pad_token_id=tokenizer.eos_token_id,
|
| 254 |
-
repetition_penalty=1.
|
| 255 |
)
|
| 256 |
|
| 257 |
if request.stream:
|
|
|
|
| 23 |
logging.basicConfig(level=logging.INFO)
|
| 24 |
logger = logging.getLogger(__name__)
|
| 25 |
|
| 26 |
+
app = FastAPI(title="Hebrew Smart Home Technician", version="11.1.0")
|
| 27 |
|
| 28 |
app.add_middleware(
|
| 29 |
CORSMiddleware,
|
|
|
|
| 45 |
"חיבור": ["Connect", "Wire", "Signal"],
|
| 46 |
"תקלה": ["Error", "Problem", "Fix"],
|
| 47 |
"זרם": ["ACS712", "Sensor"],
|
| 48 |
+
"מתח": ["3.3V", "5V", "VIN", "Power"]
|
|
|
|
|
|
|
| 49 |
}
|
| 50 |
|
| 51 |
def init_db():
|
|
|
|
| 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 |
|
|
|
|
| 111 |
for row_id, content, topic in rows:
|
| 112 |
if row_id not in seen_ids:
|
| 113 |
score = 1
|
| 114 |
+
if "Schematic" in content and any(x in query for x in ["שרטוט", "חיבור", "פין", "לאן", "מחובר", "מסך"]):
|
|
|
|
|
|
|
| 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 |
+
# לוגיקה משופרת: אם חיפשנו רכיב (כמו מסך), נביא את כל החיבורים שלו
|
| 136 |
+
line_lower = line.lower()
|
| 137 |
+
if "connect" in line_lower and any(t in line_lower for t in target_terms):
|
| 138 |
+
relevant_lines.append(simplify_schematic_text(line.strip()))
|
| 139 |
|
| 140 |
if relevant_lines:
|
| 141 |
+
# הופך את הרשימה לפסקה קריאה יותר
|
| 142 |
+
return "הנה החיבורים שנמצאו:\n" + "\n".join(relevant_lines)
|
| 143 |
|
| 144 |
return raw_content
|
|
|
|
| 145 |
return ""
|
| 146 |
|
| 147 |
def save_message(role: str, content: str):
|
|
|
|
| 160 |
class ChatCompletionRequest(BaseModel):
|
| 161 |
messages: List[Message]
|
| 162 |
max_tokens: Optional[int] = 512
|
| 163 |
+
temperature: Optional[float] = 0.4 # הועלה כדי לאפשר שפה טבעית יותר
|
| 164 |
stream: Optional[bool] = False
|
| 165 |
|
| 166 |
@app.on_event("startup")
|
|
|
|
| 202 |
|
| 203 |
if context:
|
| 204 |
sys_msg = (
|
| 205 |
+
"אתה עוזר חכם לפרויקט 'בית חכם תלם' ומדבר עברית שוטפת וטבעית.\n"
|
| 206 |
"הנחיות:\n"
|
| 207 |
+
"1. השתמש במידע המצורף כדי לענות.\n"
|
| 208 |
+
"2. אם המידע הוא רשימת חיבורים, אל תקריא אותה כמו רובוט. הסבר אותה במשפט פשוט.\n"
|
| 209 |
+
"3. דוגמה: במקום 'פין 1 מחובר לפין 2', תגיד: 'המסך מתחבר לבקר בפיני התקשורת וכן למתח'.\n"
|
| 210 |
+
f"\nמידע טכני:\n{context}"
|
|
|
|
|
|
|
| 211 |
)
|
| 212 |
else:
|
| 213 |
+
sys_msg = "אתה עוזר חכם לפרויקט תלם. ענה בעברית."
|
| 214 |
|
| 215 |
if request.messages[0].role == "system":
|
| 216 |
request.messages[0].content = sys_msg
|
|
|
|
| 225 |
gen_kwargs = dict(
|
| 226 |
inputs=prompt_ids,
|
| 227 |
max_new_tokens=request.max_tokens,
|
| 228 |
+
temperature=0.4, # יותר חופש = שפה טבעית יותר
|
| 229 |
top_p=0.9,
|
| 230 |
do_sample=True,
|
| 231 |
pad_token_id=tokenizer.eos_token_id,
|
| 232 |
+
repetition_penalty=1.05 # ענישה מינימלית, רק למנוע לופים קשים
|
| 233 |
)
|
| 234 |
|
| 235 |
if request.stream:
|