added caching

.gitignore

@@ -1,3 +1,5 @@
+.env
+
 .idea/
 .vscode/
 .idea/**/workspace.xml

main.py

@@ -2,29 +2,12 @@ from json import loads
 
 from fastapi import FastAPI
 from fastapi.openapi.utils import get_openapi
+from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import JSONResponse
 from pydantic import ValidationError
 
 from src.errors import Response, NOT_FOUND
-from src.routes.achievements import achievements
+from src.routes import *
-from src.routes.adventureranks import adventure_ranks
-from src.routes.animals import animals
-from src.routes.artifacts import artifacts
-from src.routes.characters import characters
-from src.routes.crafts import crafts
-from src.routes.domains import domains
-from src.routes.elements import elements
-from src.routes.enemies import enemies
-from src.routes.foods import foods
-from src.routes.geographies import geographies
-from src.routes.glider import gliders
-from src.routes.materials import materials
-from src.routes.namecards import namecards
-from src.routes.outfits import outfits
-from src.routes.talentmaterialtypes import talent_material_types
-from src.routes.tcg import tcg
-from src.routes.weaponmaterialtypes import weapon_material_types
-from src.routes.weapons import weapons
 
 from src.routes.api import api
 
@@ -74,3 +57,11 @@ def custom_openapi():
 
 
 app.openapi = custom_openapi
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=['*'],
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)

requirements.txt

@@ -1,2 +1,6 @@
 fastapi
-uvicorn
+uvicorn
+pydantic
+
+python-memcached
+python-dotenv

src/constants.py

@@ -1,4 +1,4 @@
-SERVER_VERSION = '1.0'
+SERVER_VERSION = '1.1'
 GAME_VERSION = '4.2.0'
 
 DEFAULT_QUERY = ['English', 'Russian']

src/routes/__init__.py

@@ -0,0 +1,21 @@
+from .api import api
+
+from .achievements import achievements
+from .adventureranks import adventure_ranks
+from .animals import animals
+from .artifacts import artifacts
+from .characters import characters
+from .crafts import crafts
+from .domains import domains
+from .elements import elements
+from .enemies import enemies
+from .foods import foods
+from .geographies import geographies
+from .glider import gliders
+from .materials import materials
+from .namecards import namecards
+from .outfits import outfits
+from .talentmaterialtypes import talent_material_types
+from .tcg import tcg
+from .weaponmaterialtypes import weapon_material_types
+from .weapons import weapons

src/routes/api.py

@@ -4,7 +4,6 @@ from subprocess import check_output
 from src.constants import GAME_VERSION, SERVER_VERSION, LANGUAGES
 from src.errors import Response
 
-
 api = APIRouter(prefix='/api', tags=['Service'])
 
 
@@ -13,12 +12,12 @@ async def get_versions():
     git_server = git_info('.')
     git_data = git_info('./data')
 
-    reponse = {'server_version': SERVER_VERSION,
+    response = {'server_version': SERVER_VERSION,
-               'game_version': GAME_VERSION,
+                'game_version': GAME_VERSION,
-               'git_server': git_server,
+                'git_server': git_server,
-               'git_data': git_data}
+                'git_data': git_data}
 
-    return Response(response=reponse)
+    return Response(response=response)
 
 
 @api.get('/languages')

src/utils.py

@@ -1,24 +1,63 @@
-from json import load
+from json import load, loads, dumps
+from os import environ
 from os.path import join
 
+from dotenv import load_dotenv
 from fastapi import HTTPException
+from memcache import Client
 
 from src.constants import LANGUAGES, DEFAULT_RESULT, DEFAULT_QUERY, DATA_FOLDER
 
 
+load_dotenv()
+memcache_ip = environ.get('MEMCACHE_IP')
+memcache_port = environ.get('MEMCACHE_PORT') or 11211
+mc = Client([f'{memcache_ip}:{memcache_port}'], debug=1)
+
+
+def load_cached(key):
+    value = mc.get(key)
+    if not value:
+        return None
+    print(f'loaded {key} from cache')
+    return loads(value)
+
+
+def save_cache(key, value: str | dict):
+    if type(value) is dict:
+        mc.set(key, dumps(value), 86400)
+    else:
+        mc.set(key, value, 86400)
+
+
 def load_index(language: str, category: str):
+    cache_key = join('index', language, category)
+    if cache := load_cached(cache_key):
+        return cache
     with open(join(DATA_FOLDER, 'index', language, f'{category}.json'), 'r', encoding='utf-8') as f:
-        return load(f)
+        json = f.read()
+        save_cache(cache_key, json)
+        return loads(json)
 
 
 def load_category(lang: str, category: str, name: str) -> dict:
+    cache_key = join(lang, category, name)
+    if cache := load_cached(cache_key):
+        return cache
     with open(join(DATA_FOLDER, lang, category, f'{name}.json'), 'r', encoding='utf-8') as f:
-        return load(f)
+        json = f.read()
+        save_cache(cache_key, json)
+        return loads(json)
 
 
 def load_file(folder: str, name: str) -> dict:
+    cache_key = join(folder, name)
+    if cache := load_cached(cache_key):
+        return cache
     with open(join(DATA_FOLDER, folder, f'{name}.json'), 'r', encoding='utf-8') as f:
-        return load(f)
+        json = f.read()
+        save_cache(cache_key, json)
+        return loads(json)
 
 
 def get_file_name(query, category, langs) -> str: