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,
|
|
@@ -83,12 +83,34 @@ def expand_query(query: str) -> List[str]:
|
|
| 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 89 |
conn = sqlite3.connect(DB_FILE)
|
| 90 |
cursor = conn.cursor()
|
| 91 |
-
|
| 92 |
search_terms = expand_query(query)
|
| 93 |
logger.info(f"🔍 Searching for: {search_terms}")
|
| 94 |
|
|
@@ -101,17 +123,33 @@ def query_knowledge_base(query: str) -> str:
|
|
| 101 |
for row_id, content, topic in rows:
|
| 102 |
if row_id not in seen_ids:
|
| 103 |
score = 1
|
| 104 |
-
|
| 105 |
-
|
|
|
|
|
|
|
|
|
|
| 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 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 115 |
|
| 116 |
def save_message(role: str, content: str):
|
| 117 |
try:
|
|
@@ -129,7 +167,7 @@ class Message(BaseModel):
|
|
| 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,21 +205,20 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 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 |
-
"
|
| 176 |
-
"הנחיות
|
| 177 |
-
"1.
|
| 178 |
-
"2. **
|
| 179 |
-
"3.
|
| 180 |
-
"4.
|
| 181 |
-
f"\nמידע טכני
|
| 182 |
)
|
| 183 |
else:
|
| 184 |
-
sys_msg = "אתה עוזר חכם לפרויקט תלם. ענה בעברית.
|
| 185 |
|
| 186 |
if request.messages[0].role == "system":
|
| 187 |
request.messages[0].content = sys_msg
|
|
@@ -196,11 +233,11 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 196 |
gen_kwargs = dict(
|
| 197 |
inputs=prompt_ids,
|
| 198 |
max_new_tokens=request.max_tokens,
|
| 199 |
-
temperature=0.
|
| 200 |
top_p=0.9,
|
| 201 |
do_sample=True,
|
| 202 |
pad_token_id=tokenizer.eos_token_id,
|
| 203 |
-
repetition_penalty=1.
|
| 204 |
)
|
| 205 |
|
| 206 |
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.2.0")
|
| 27 |
|
| 28 |
app.add_middleware(
|
| 29 |
CORSMiddleware,
|
|
|
|
| 83 |
for key, values in SEARCH_MAP.items():
|
| 84 |
if key in root:
|
| 85 |
search_terms.update(values)
|
| 86 |
+
if w.isdigit():
|
| 87 |
+
search_terms.add(w)
|
| 88 |
+
search_terms.add(f"D{w}")
|
| 89 |
+
search_terms.add(f"GPIO{w}")
|
| 90 |
+
search_terms.add(f"Pin {w}")
|
| 91 |
return list(search_terms)
|
| 92 |
|
| 93 |
+
def filter_schematic_context(full_context: str, query_terms: List[str]) -> str:
|
| 94 |
+
lines = full_context.split('\n')
|
| 95 |
+
relevant_lines = []
|
| 96 |
+
header_terms = ["Schematic Connections", "connects to"]
|
| 97 |
+
target_terms = [t.lower() for t in query_terms if len(t) > 1]
|
| 98 |
+
|
| 99 |
+
for line in lines:
|
| 100 |
+
line_lower = line.lower()
|
| 101 |
+
if any(h.lower() in line_lower for h in header_terms) and len(line) < 50:
|
| 102 |
+
relevant_lines.append(line)
|
| 103 |
+
continue
|
| 104 |
+
if any(t in line_lower for t in target_terms):
|
| 105 |
+
relevant_lines.append(line)
|
| 106 |
+
|
| 107 |
+
if not relevant_lines:
|
| 108 |
+
return full_context
|
| 109 |
+
return "\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 |
|
|
|
|
| 123 |
for row_id, content, topic in rows:
|
| 124 |
if row_id not in seen_ids:
|
| 125 |
score = 1
|
| 126 |
+
is_schematic = "Schematic" in content or "Connections" in content
|
| 127 |
+
is_tech_query = any(x in query for x in ["שרטוט", "חיבור", "פין", "לאן", "מחובר"])
|
| 128 |
+
|
| 129 |
+
if is_schematic and is_tech_query:
|
| 130 |
+
score += 100
|
| 131 |
elif term.lower() in topic.lower():
|
| 132 |
score += 10
|
| 133 |
|
| 134 |
+
# Check for numbers
|
| 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:
|
| 138 |
+
score += 50
|
| 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.3
|
| 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 |
if context:
|
| 211 |
sys_msg = (
|
| 212 |
+
"תפקידך: טכנאי מומחה לפרויקט 'בית חכם תלם'.\n"
|
| 213 |
+
"הנחיות קריטיות:\n"
|
| 214 |
+
"1. דבר בעברית טבעית בלבד.\n"
|
| 215 |
+
"2. **אל תקריא רשימות!** אם יש רשימת חיבורים, סכם אותה. דוגמה: 'המסך מחובר לפינים 7 ו-8 ולמתח'.\n"
|
| 216 |
+
"3. אל תחזור על משפטים פעמיים.\n"
|
| 217 |
+
"4. הסבר את ההיגיון: ה-RX (קליטה) של המסך מחובר ל-TX (שידור) של הבקר.\n"
|
| 218 |
+
f"\nמידע טכני:\n{context}"
|
| 219 |
)
|
| 220 |
else:
|
| 221 |
+
sys_msg = "אתה עוזר חכם לפרויקט תלם. ענה בעברית."
|
| 222 |
|
| 223 |
if request.messages[0].role == "system":
|
| 224 |
request.messages[0].content = sys_msg
|
|
|
|
| 233 |
gen_kwargs = dict(
|
| 234 |
inputs=prompt_ids,
|
| 235 |
max_new_tokens=request.max_tokens,
|
| 236 |
+
temperature=0.3,
|
| 237 |
top_p=0.9,
|
| 238 |
do_sample=True,
|
| 239 |
pad_token_id=tokenizer.eos_token_id,
|
| 240 |
+
repetition_penalty=1.1 # התיקון ללופים: ענישה עדינה
|
| 241 |
)
|
| 242 |
|
| 243 |
if request.stream:
|