Update app.py

app.py

@@ -1,37 +1,24 @@
 from fastapi import FastAPI
 import spacy
-from spacy.language import Language
-from spacy.tokens import Span
 import json
+import difflib
 
 app = FastAPI()
 
 # Ladda svensk spaCy-modell
 nlp = spacy.load("sv_core_news_sm")
 
-# Ladda entitetslistor från JSON (för skalbarhet)
+# Ladda entiteter från entities.json
 with open("entities.json") as f:
     entities = json.load(f)
 ITEMS = set(entities["items"])
 COLORS = set(entities["colors"])
 PRICES = set(entities["prices"])
 
-# Regelbaserad matcher för entiteter
-@Language.component("custom_matcher")
-def custom_matcher(doc):
-    spans = []
-    for token in doc:
-        text = token.text.lower()
-        if text in ITEMS:
-            spans.append(Span(doc, token.i, token.i + 1, label="VARA"))
-        elif text in COLORS:
-            spans.append(Span(doc, token.i, token.i + 1, label="FÄRG"))
-        elif text in PRICES:
-            spans.append(Span(doc, token.i, token.i + 1, label="PRIS"))
-    doc.ents = spans
-    return doc
-
-nlp.add_pipe("custom_matcher")
+def correct_spelling(word, valid_words, threshold=0.8):
+    """Korrigera stavfel genom att hitta närmaste match i valid_words."""
+    matches = difflib.get_close_matches(word, valid_words, n=1, cutoff=threshold)
+    return matches[0] if matches else word
 
 @app.post("/parse")
 async def parse_user_request(request: str):
@@ -40,9 +27,24 @@ async def parse_user_request(request: str):
     try:
         # Analysera text med spaCy
         doc = nlp(request)
-        entities = {ent.label_: ent.text.lower() for ent in doc.ents}
         
-        # Om ingen vara hittades, returnera fel
+        # Extrahera entiteter
+        entities = {}
+        for token in doc:
+            text = token.text.lower()
+            # Prioritera definierade varor med stavfelskorrigering
+            corrected_text = correct_spelling(text, ITEMS)
+            if corrected_text in ITEMS:
+                entities["VARA"] = corrected_text
+            elif token.pos_ == "NOUN" and not entities.get("VARA"):
+                entities["VARA"] = corrected_text
+            # Identifiera färger och priser
+            elif text in COLORS:
+                entities["FÄRG"] = text
+            elif text in PRICES:
+                entities["PRIS"] = text
+        
+        # Om ingen vara hittades
         if "VARA" not in entities:
             return {"result": "error:ingen vara"}