Revert "no cache"

This reverts commit 3bb3721807552a6f254ff0722e680201be0129d2.

App/Embedding/EmbeddingRoutes.py

@@ -2,28 +2,35 @@ from fastapi import APIRouter, BackgroundTasks
 
 from .utils.Initialize import TextSearch, IdSearch
 from .Schemas import SearchRequest, AddDocumentRequest
-from fastapi_cache.decorator import cache
+import redis, os, json
+
+REDIS = os.environ.get("REDIS")
+cache = redis.from_url(REDIS)
+
 
 embeddigs_router = APIRouter(tags=["embeddings"])
 
 
 # create
 @embeddigs_router.post("/add_document")
-# @cache(namespace="cache1")
 async def create_embeddings(req: AddDocumentRequest):
     pass
 
 
 @embeddigs_router.post("/search_id")
-# @cache(namespace="cache2")
 async def search_id(
     req: SearchRequest,
     background_tasks: BackgroundTasks,
 ):
-    return IdSearch(query=req.query, background_task=background_tasks)
+    data = cache.get(f"recommendations:{req.query}")
+    if data is not None:
+        return json.loads(data)
+
+    data = IdSearch(query=req.query, background_task=background_tasks)
+    cache.set(f"recommendations:{req.query}", json.dumps(data), ex=72000)
+    return data
 
 
 @embeddigs_router.post("/search_text")
-# @cache(namespace="cache3")
-async def search_text(req: SearchRequest):
-    return TextSearch(query=req.query)
+async def search_text(reqx: SearchRequest):
+    return TextSearch(query=reqx.query)

App/Embedding/utils/Initialize.py

@@ -11,7 +11,7 @@ from .Elastic import FetchDocuments
 index_name = "movie-recommender-fast"
 model_name = "thenlper/gte-base"
 embeddings = HuggingFaceEmbeddings(model_name=model_name)
-from fastapi_cache.decorator import cache
+
 
 TMDB_API = os.environ.get("TMDB_API")
 
@@ -27,7 +27,6 @@ vector_index = pinecone.Index(index_name=index_name)
 docsearch = Pinecone.from_existing_index(index_name, embeddings)
 
 
-# @cache(namespace="test")
 def check_if_exists(text, imdb_id):
     results = docsearch.similarity_search(text, filter={"key": {"$eq": imdb_id}}, k=1)
     if results:
@@ -36,7 +35,6 @@ def check_if_exists(text, imdb_id):
         return False
 
 
-# @cache(namespace="test")
 def add_document(imdb_id, doc):
     text, temp_doc = doc
     response = check_if_exists(text=text, imdb_id=imdb_id)
@@ -54,14 +52,12 @@ def add_document(imdb_id, doc):
     docsearch.add_documents([temp])
 
 
-# @cache(namespace="test")
 def generate_text(doc):
     if doc["tv_results"]:
         return pprint.pformat(doc["tv_results"][0]), doc["tv_results"][0]
     return pprint.pformat(doc["movie_results"][0]), doc["movie_results"][0]
 
 
-# @cache(namespace="test")
 def IdSearch(query: str, background_task: BackgroundTasks):
     doc = requests.get(
         f"https://api.themoviedb.org/3/find/{query}?external_source=imdb_id&language=en&api_key={TMDB_API}"
@@ -75,7 +71,6 @@ def IdSearch(query: str, background_task: BackgroundTasks):
     return TextSearch(text, filter={"key": {"$ne": query}})
 
 
-# @cache(namespace="test")
 def TextSearch(query: str, filter=None):
     docs = docsearch.similarity_search(query, k=10, filter=filter)
     keys = [doc.metadata["key"] for doc in docs]

App/Embedding/utils/__init__.py

@@ -1,14 +1,13 @@
 from elasticsearch import Elasticsearch
 import os
 
-elastic_host=os.environ.get('ELASTIC_HOST')
+elastic_host = os.environ.get(
+    "ELASTIC_HOST",
+    "https://u46hxt12c:[email protected]:443",
+)
 
 # initialize elasticSearch
-es = Elasticsearch(
-    [
-        elastic_host
-    ]
-)
+es = Elasticsearch([elastic_host])
 
 
 def FetchDocuments(ids):

requirements.txt

@@ -6,5 +6,6 @@ langchain
 uvicorn[standard]
 pydantic
 requests
+redis
 fastapi-cache2[memcache]