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="8.4.
|
| 27 |
|
| 28 |
app.add_middleware(
|
| 29 |
CORSMiddleware,
|
|
@@ -90,7 +90,7 @@ def expand_query(query: str) -> List[str]:
|
|
| 90 |
|
| 91 |
# טיפול מיוחד במספרים (למשל: 18 -> D18, GPIO18, Pin 18)
|
| 92 |
if w.isdigit():
|
| 93 |
-
search_terms.add(w)
|
| 94 |
search_terms.add(f"D{w}")
|
| 95 |
search_terms.add(f"GPIO{w}")
|
| 96 |
search_terms.add(f"Pin {w}")
|
|
@@ -108,28 +108,27 @@ def query_knowledge_base(query: str) -> str:
|
|
| 108 |
seen_ids = set()
|
| 109 |
|
| 110 |
for term in search_terms:
|
| 111 |
-
# חיפוש בתוכן ובכותרת
|
| 112 |
cursor.execute("SELECT id, content, topic FROM knowledge WHERE content LIKE ? OR topic LIKE ?", (f'%{term}%', f'%{term}%'))
|
| 113 |
rows = cursor.fetchall()
|
| 114 |
for row_id, content, topic in rows:
|
| 115 |
if row_id not in seen_ids:
|
| 116 |
score = 1
|
| 117 |
|
| 118 |
-
# תעדוף
|
| 119 |
is_schematic = "Schematic" in content or "Connections" in content
|
| 120 |
is_tech_query = any(x in query for x in ["שרטוט", "חיבור", "פין", "לאן", "מחובר"])
|
| 121 |
|
| 122 |
if is_schematic and is_tech_query:
|
| 123 |
-
score += 100
|
| 124 |
|
| 125 |
-
#
|
| 126 |
numbers_in_query = [int(s) for s in query.split() if s.isdigit()]
|
| 127 |
for num in numbers_in_query:
|
| 128 |
if str(num) in content:
|
| 129 |
score += 50
|
| 130 |
|
| 131 |
-
# תו
|
| 132 |
-
|
| 133 |
score += 10
|
| 134 |
|
| 135 |
results.append((score, content))
|
|
@@ -137,7 +136,6 @@ def query_knowledge_base(query: str) -> str:
|
|
| 137 |
|
| 138 |
conn.close()
|
| 139 |
|
| 140 |
-
# מיון: הציון הגבוה ביותר ראשון
|
| 141 |
results.sort(key=lambda x: x[0], reverse=True)
|
| 142 |
|
| 143 |
if results:
|
|
@@ -201,7 +199,6 @@ async def chat_completions(request: ChatCompletionRequest):
|
|
| 201 |
save_message("user", last_user_msg.content)
|
| 202 |
context = query_knowledge_base(last_user_msg.content)
|
| 203 |
|
| 204 |
-
# --- הנחיית מערכת חכמה ---
|
| 205 |
if context:
|
| 206 |
sys_msg = (
|
| 207 |
"תפקידך: טכנאי מומחה לפרויקט 'בית חכם תלם'.\n"
|
|
|
|
| 23 |
logging.basicConfig(level=logging.INFO)
|
| 24 |
logger = logging.getLogger(__name__)
|
| 25 |
|
| 26 |
+
app = FastAPI(title="Hebrew Smart Home Technician", version="8.4.2")
|
| 27 |
|
| 28 |
app.add_middleware(
|
| 29 |
CORSMiddleware,
|
|
|
|
| 90 |
|
| 91 |
# טיפול מיוחד במספרים (למשל: 18 -> D18, GPIO18, Pin 18)
|
| 92 |
if w.isdigit():
|
| 93 |
+
search_terms.add(w)
|
| 94 |
search_terms.add(f"D{w}")
|
| 95 |
search_terms.add(f"GPIO{w}")
|
| 96 |
search_terms.add(f"Pin {w}")
|
|
|
|
| 108 |
seen_ids = set()
|
| 109 |
|
| 110 |
for term in search_terms:
|
|
|
|
| 111 |
cursor.execute("SELECT id, content, topic FROM knowledge WHERE content LIKE ? OR topic LIKE ?", (f'%{term}%', f'%{term}%'))
|
| 112 |
rows = cursor.fetchall()
|
| 113 |
for row_id, content, topic in rows:
|
| 114 |
if row_id not in seen_ids:
|
| 115 |
score = 1
|
| 116 |
|
| 117 |
+
# 1. תעדוף שרטוטים
|
| 118 |
is_schematic = "Schematic" in content or "Connections" in content
|
| 119 |
is_tech_query = any(x in query for x in ["שרטוט", "חיבור", "פין", "לאן", "מחובר"])
|
| 120 |
|
| 121 |
if is_schematic and is_tech_query:
|
| 122 |
+
score += 100
|
| 123 |
|
| 124 |
+
# 2. תעדוף מספרים (בנפרד מה-IF הקודם כדי למנוע שגיאת תחביר)
|
| 125 |
numbers_in_query = [int(s) for s in query.split() if s.isdigit()]
|
| 126 |
for num in numbers_in_query:
|
| 127 |
if str(num) in content:
|
| 128 |
score += 50
|
| 129 |
|
| 130 |
+
# 3. תעדוף נושא (Topic match)
|
| 131 |
+
if term.lower() in topic.lower():
|
| 132 |
score += 10
|
| 133 |
|
| 134 |
results.append((score, content))
|
|
|
|
| 136 |
|
| 137 |
conn.close()
|
| 138 |
|
|
|
|
| 139 |
results.sort(key=lambda x: x[0], reverse=True)
|
| 140 |
|
| 141 |
if results:
|
|
|
|
| 199 |
save_message("user", last_user_msg.content)
|
| 200 |
context = query_knowledge_base(last_user_msg.content)
|
| 201 |
|
|
|
|
| 202 |
if context:
|
| 203 |
sys_msg = (
|
| 204 |
"תפקידך: טכנאי מומחה לפרויקט 'בית חכם תלם'.\n"
|