Update services/location_service.py

services/location_service.py

@@ -1,9 +1,29 @@
-import locationtagger
+# import locationtagger
 from geopy.geocoders import Nominatim
 from geopy.exc import GeocoderTimedOut, GeocoderUnavailable
 from models.location_models import LocationData, Coordinates, ErrorResponse
 
 class LocationService:
+    @staticmethod
+    def extract_location_entities(ner_results):
+        city, state, country = None, None, None
+        
+        for entity in ner_results:
+            word = entity['word'].replace("##", "").strip()
+            
+            if entity['entity_group'] == 'CITY' and word.isalpha():
+                city = word
+            elif entity['entity_group'] == 'STATE' and word.isalpha():
+                state = word
+            elif entity['entity_group'] == 'COUNTRY' and word.isalpha():
+                country = word
+        
+        if city or state or country:
+            return {k: v for k, v in {"city": city, "state": state, "country": country}.items() if v is not None}
+        else:
+            return None
+
+    
     @staticmethod
     def get_coordinates(data:dict) -> Coordinates | ErrorResponse:
         print("Inside get coordinates")
@@ -11,26 +31,26 @@ class LocationService:
         try:
             location = data.get('location')
         except:
-            return Coordinates(latitude=None , longitude=None)
-        location_string=None
-        city=None
-        state=None
-        country=None
+            return Coordinates(latitude=None, longitude=None)
+        
+        city = None
+        state = None
+        country = None
+        
         if location:
-            place_entity = locationtagger.find_locations(text=location)
+            # Assuming `app.nlp` is already initialized elsewhere and accessible
+            ner_results = app.nlp(location)
             
-            extracted_cities = list(place_entity.cities)
-            extracted_regions = list(place_entity.regions)
-            extracted_countries = list(place_entity.countries)
+            # Extract city, state, and country using the logic from extract_location_entities
+            location_entities = LocationService.extract_location_entities(ner_results)
             
-            if extracted_cities:
-                city = extracted_cities[0]
-            if extracted_regions:
-                state = extracted_regions[0]
-            if extracted_countries:
-                country = extracted_countries[0]
+            if location_entities:
+                city = location_entities.get('city')
+                state = location_entities.get('state')
+                country = location_entities.get('country')
             
-            # location_string = ' '.join(filter(None, [city, state, country]))
+            # Create the location string
+            location_string = ' '.join(filter(None, [city, state, country]))
             
             if not location_string:
                 location_string = location