update amenity_dataset and conflicts

GoogleCloudPlatform · Oct 23, 2023 · c876920 · c876920
1 parent 674ddd4
commit c876920
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 7 deletions.
diff --git a/data/amenity_dataset.csv b/data/amenity_dataset.csv
diff --git a/extension_service/app/routes.py b/extension_service/app/routes.py
@@ -13,7 +13,10 @@
 # limitations under the License.
 
 
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
+from langchain.embeddings.base import Embeddings
+
+import datastore
 
 routes = APIRouter()
 

diff --git a/extension_service/datastore/datastore.py b/extension_service/datastore/datastore.py
@@ -59,13 +59,13 @@ async def export_data(
         pass
 
     @abstractmethod
-    async def get_amenity(self, id: int) -> List[Dict[str, Any]]:
+    async def get_amenity(self, id: int) -> list[Dict[str, Any]]:
         raise NotImplementedError("Subclass should implement this!")
 
     @abstractmethod
     async def amenities_search(
-        self, query_embedding: List[float], similarity_threshold: float, top_k: int
-    ) -> List[Dict[str, Any]]:
+        self, query_embedding: list[float], similarity_threshold: float, top_k: int
+    ) -> list[Dict[str, Any]]:
         raise NotImplementedError("Subclass should implement this!")
 
     @abstractmethod

diff --git a/extension_service/datastore/providers/postgres.py b/extension_service/datastore/providers/postgres.py
@@ -141,7 +141,7 @@ async def export_data(
 
         return airports, amenities
 
-    async def get_amenity(self, id: int) -> List[Dict[str, Any]]:
+    async def get_amenity(self, id: int) -> list[Dict[str, Any]]:
         results = await self.__pool.fetch(
             """
                 SELECT name, description, location, terminal, category, hour
@@ -154,8 +154,8 @@ async def get_amenity(self, id: int) -> List[Dict[str, Any]]:
         return results
 
     async def amenities_search(
-        self, query_embedding: List[float], similarity_threshold: float, top_k: int
-    ) -> List[Dict[str, Any]]:
+        self, query_embedding: list[float], similarity_threshold: float, top_k: int
+    ) -> list[Dict[str, Any]]:
         results = await self.__pool.fetch(
             """
                 SELECT name, description, location, terminal, category, hour

diff --git a/extension_service/run_database_export.py b/extension_service/run_database_export.py
@@ -55,5 +55,6 @@ async def main():
         for a in amenities:
             writer.writerow(a.model_dump())
 
+
 if __name__ == "__main__":
     asyncio.run(main())