Spaces:
Sleeping
Sleeping
Update server.py
Browse files
server.py
CHANGED
|
@@ -16,13 +16,13 @@ MODEL_ID = "meta-llama/Meta-Llama-3-8B-Instruct"
|
|
| 16 |
PORT = int(os.environ.get("PORT", 8000))
|
| 17 |
HOST = "0.0.0.0"
|
| 18 |
DB_FILE = "chatbot.db"
|
| 19 |
-
JSON_SOURCE = "database.json"
|
| 20 |
HF_TOKEN = os.environ.get("HF_TOKEN")
|
| 21 |
|
| 22 |
logging.basicConfig(level=logging.INFO)
|
| 23 |
logger = logging.getLogger(__name__)
|
| 24 |
|
| 25 |
-
app = FastAPI(title="Hebrew Smart Home Technician", version="10.
|
| 26 |
|
| 27 |
app.add_middleware(
|
| 28 |
CORSMiddleware,
|
|
@@ -34,10 +34,12 @@ app.add_middleware(
|
|
| 34 |
|
| 35 |
client = InferenceClient(model=MODEL_ID, token=HF_TOKEN)
|
| 36 |
|
| 37 |
-
# --- מילון מונחים לחיפוש ---
|
| 38 |
SEARCH_MAP = {
|
| 39 |
-
"בקר": ["ESP32", "
|
| 40 |
-
"מסך": ["Nextion", "
|
|
|
|
|
|
|
| 41 |
"שרטוט": ["Schematic", "Connections", "Pin", "Net"],
|
| 42 |
"חיבור": ["Connect", "Wire", "Signal", "RX", "TX", "HV", "LV"],
|
| 43 |
"תקלה": ["Error", "Problem", "Fix"],
|
|
@@ -83,34 +85,36 @@ def expand_query(query: str) -> List[str]:
|
|
| 83 |
return list(search_terms)
|
| 84 |
|
| 85 |
def simplify_schematic_text(text: str) -> str:
|
| 86 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
| 87 |
text = re.sub(r'\([A-Za-z0-9_\-]+\)', '', text)
|
| 88 |
|
| 89 |
-
# 2. פישוט שמות פינים
|
| 90 |
text = text.replace("D16_or_RX2", "RX2")
|
| 91 |
text = text.replace("D17_or_TX2", "TX2")
|
| 92 |
text = text.replace("3V3", "3.3V")
|
| 93 |
|
| 94 |
-
# 3. תרגום
|
| 95 |
replacements = {
|
| 96 |
-
"
|
| 97 |
-
"
|
| 98 |
-
"
|
| 99 |
-
"
|
| 100 |
-
"TLM-SH_board": "לוח ראשי",
|
| 101 |
-
"StudentBoard": "לוח תלמיד",
|
| 102 |
"connects to": "--- מחובר אל --->",
|
| 103 |
-
"Pin": "פין"
|
|
|
|
|
|
|
| 104 |
}
|
| 105 |
|
| 106 |
for eng, heb in replacements.items():
|
| 107 |
-
|
|
|
|
| 108 |
|
| 109 |
-
# 4.
|
| 110 |
-
text =
|
| 111 |
-
|
| 112 |
-
# 5. ניקוי
|
| 113 |
-
text = text.replace("Pin Pin", "פין")
|
| 114 |
text = text.replace("פין פין", "פין")
|
| 115 |
text = re.sub(r'\s+', ' ', text).strip()
|
| 116 |
|
|
@@ -123,14 +127,13 @@ def query_knowledge_base(query: str) -> str:
|
|
| 123 |
search_terms = expand_query(query)
|
| 124 |
logger.info(f"🔍 Searching for: {search_terms}")
|
| 125 |
|
| 126 |
-
# בדיקה האם זו שאלה כללית על חיבורים
|
| 127 |
is_general_schematic_query = any(x in query for x in ["הכל", "כל החיבורים", "שרטוט", "מה מחובר", "לאן", "פינים"])
|
| 128 |
|
| 129 |
results = []
|
| 130 |
seen_ids = set()
|
| 131 |
|
| 132 |
for term in search_terms:
|
| 133 |
-
# שליפה רחבה יותר
|
| 134 |
cursor.execute("SELECT id, content, topic FROM knowledge WHERE content LIKE ? OR topic LIKE ?", (f'%{term}%', f'%{term}%'))
|
| 135 |
rows = cursor.fetchall()
|
| 136 |
for row_id, content, topic in rows:
|
|
@@ -143,7 +146,7 @@ def query_knowledge_base(query: str) -> str:
|
|
| 143 |
results.append((score, content))
|
| 144 |
seen_ids.add(row_id)
|
| 145 |
|
| 146 |
-
# אם לא נמצא כלום בחיפוש הספציפי אבל המשתמש שאל על שרטוט
|
| 147 |
if not results and is_general_schematic_query:
|
| 148 |
cursor.execute("SELECT id, content, topic FROM knowledge WHERE content LIKE '%Schematic%'")
|
| 149 |
row = cursor.fetchone()
|
|
@@ -161,7 +164,7 @@ def query_knowledge_base(query: str) -> str:
|
|
| 161 |
lines = raw_content.split('\n')
|
| 162 |
relevant_lines = []
|
| 163 |
|
| 164 |
-
# אם זו שאלה כללית - תביא את הכל
|
| 165 |
if is_general_schematic_query:
|
| 166 |
for line in lines:
|
| 167 |
if "connect" in line.lower():
|
|
|
|
| 16 |
PORT = int(os.environ.get("PORT", 8000))
|
| 17 |
HOST = "0.0.0.0"
|
| 18 |
DB_FILE = "chatbot.db"
|
| 19 |
+
JSON_SOURCE = "database.json"
|
| 20 |
HF_TOKEN = os.environ.get("HF_TOKEN")
|
| 21 |
|
| 22 |
logging.basicConfig(level=logging.INFO)
|
| 23 |
logger = logging.getLogger(__name__)
|
| 24 |
|
| 25 |
+
app = FastAPI(title="Hebrew Smart Home Technician", version="10.1.0")
|
| 26 |
|
| 27 |
app.add_middleware(
|
| 28 |
CORSMiddleware,
|
|
|
|
| 34 |
|
| 35 |
client = InferenceClient(model=MODEL_ID, token=HF_TOKEN)
|
| 36 |
|
| 37 |
+
# --- מילון מונחים לחיפוש (מעודכן לנתונים החדשים) ---
|
| 38 |
SEARCH_MAP = {
|
| 39 |
+
"בקר": ["ESP32", "Controller", "Main Board", "DevKit"],
|
| 40 |
+
"מסך": ["Nextion", "Display", "Screen", "HMI", "Nextion Screen"],
|
| 41 |
+
"ממיר": ["Level Shifter", "LevelConvertor", "BOB", "Converter"],
|
| 42 |
+
"לוח": ["Student Board", "PCB", "Board"],
|
| 43 |
"שרטוט": ["Schematic", "Connections", "Pin", "Net"],
|
| 44 |
"חיבור": ["Connect", "Wire", "Signal", "RX", "TX", "HV", "LV"],
|
| 45 |
"תקלה": ["Error", "Problem", "Fix"],
|
|
|
|
| 85 |
return list(search_terms)
|
| 86 |
|
| 87 |
def simplify_schematic_text(text: str) -> str:
|
| 88 |
+
"""
|
| 89 |
+
Cleans up the English schematic text and translates key terms to Hebrew
|
| 90 |
+
for better readability in the chat.
|
| 91 |
+
"""
|
| 92 |
+
# 1. ניקוי רעשים בסיסי (הסרת סוגריים אם נותרו)
|
| 93 |
text = re.sub(r'\([A-Za-z0-9_\-]+\)', '', text)
|
| 94 |
|
| 95 |
+
# 2. פישוט שמות פינים טכניים
|
| 96 |
text = text.replace("D16_or_RX2", "RX2")
|
| 97 |
text = text.replace("D17_or_TX2", "TX2")
|
| 98 |
text = text.replace("3V3", "3.3V")
|
| 99 |
|
| 100 |
+
# 3. תרגום לעברית (מותאם ל-DEVICE_MAP החדש ב-GUI)
|
| 101 |
replacements = {
|
| 102 |
+
"Level Shifter": "ממיר רמות",
|
| 103 |
+
"Student Board": "לוח תלמיד",
|
| 104 |
+
"Nextion Screen": "מסך Nextion",
|
| 105 |
+
"ESP32": "בקר ESP32",
|
|
|
|
|
|
|
| 106 |
"connects to": "--- מחובר אל --->",
|
| 107 |
+
"Pin": "פין",
|
| 108 |
+
"GND": "הארקה (GND)",
|
| 109 |
+
"VIN": "מתח כניסה (VIN)"
|
| 110 |
}
|
| 111 |
|
| 112 |
for eng, heb in replacements.items():
|
| 113 |
+
# שימוש ב-Regex כדי להחליף מילים שלמות בלבד
|
| 114 |
+
text = re.sub(r'\b' + re.escape(eng) + r'\b', heb, text)
|
| 115 |
|
| 116 |
+
# 4. ניקוי סופי
|
| 117 |
+
text = text.replace("Pin Pin", "פין") # Fix double pins just in case
|
|
|
|
|
|
|
|
|
|
| 118 |
text = text.replace("פין פין", "פין")
|
| 119 |
text = re.sub(r'\s+', ' ', text).strip()
|
| 120 |
|
|
|
|
| 127 |
search_terms = expand_query(query)
|
| 128 |
logger.info(f"🔍 Searching for: {search_terms}")
|
| 129 |
|
| 130 |
+
# בדיקה האם זו שאלה כללית על חיבורים
|
| 131 |
is_general_schematic_query = any(x in query for x in ["הכל", "כל החיבורים", "שרטוט", "מה מחובר", "לאן", "פינים"])
|
| 132 |
|
| 133 |
results = []
|
| 134 |
seen_ids = set()
|
| 135 |
|
| 136 |
for term in search_terms:
|
|
|
|
| 137 |
cursor.execute("SELECT id, content, topic FROM knowledge WHERE content LIKE ? OR topic LIKE ?", (f'%{term}%', f'%{term}%'))
|
| 138 |
rows = cursor.fetchall()
|
| 139 |
for row_id, content, topic in rows:
|
|
|
|
| 146 |
results.append((score, content))
|
| 147 |
seen_ids.add(row_id)
|
| 148 |
|
| 149 |
+
# אם לא נמצא כלום בחיפוש הספציפי אבל המשתמש שאל על שרטוט
|
| 150 |
if not results and is_general_schematic_query:
|
| 151 |
cursor.execute("SELECT id, content, topic FROM knowledge WHERE content LIKE '%Schematic%'")
|
| 152 |
row = cursor.fetchone()
|
|
|
|
| 164 |
lines = raw_content.split('\n')
|
| 165 |
relevant_lines = []
|
| 166 |
|
| 167 |
+
# אם זו שאלה כללית - תביא את הכל
|
| 168 |
if is_general_schematic_query:
|
| 169 |
for line in lines:
|
| 170 |
if "connect" in line.lower():
|