Update main.py

main.py

@@ -2,66 +2,105 @@ import enkacard
 import enkacard.encbanner
 import enkanetwork
 import asyncio
-from flask import Flask, jsonify, request
 import requests
 from io import BytesIO
 from enkanetwork import EnkaNetworkAPI
 import os
+from contextlib import asynccontextmanager
+
+from fastapi import FastAPI
+
+from fastapi.responses import (
+    JSONResponse,
+)  
+from enkacard import enkatools
+
+import uvicorn
 
 enka_update = EnkaNetworkAPI()
 
-app = Flask(__name__)
+
+async def update_genshin():
+    try:
+        async with enka_update:
+            await enka_update.update_assets(path="/tmp", lang=["EN"])
+    
+
+            # lang=["EN"], 
+            print("Finished update")
+    except Exception as e:
+        print(f"Update failed: {e}")
 
 async def card(id, designtype):
     async with enkacard.encbanner.ENC(uid = str(id)) as encard:
         return await encard.creat(template = (2 if str(designtype) == "2" else 1))
     
-@app.route("/<int:id>")
-def characters(id):
+@asynccontextmanager
+async def lifespan(app: FastAPI):
+    data_dir = "/tmp/data"
+
+    if not os.path.exists(data_dir):
+        os.makedirs(data_dir)
+
+    data_dir = "/tmp/langs"
+
+    if not os.path.exists(data_dir):
+        os.makedirs(data_dir)
+    await update_genshin()
+    yield
+    print("Goodbye")
+
+app = FastAPI()
+# app = FastAPI(lifespan=lifespan)
+
+@app.get("/{id}")  # Correct route definition without prefix
+async def characters(id: int, design: str = "1"):  # Use async and await
     try:
         characters = []
-        result = asyncio.run(card(id, request.args.get('design')))
+        result = await card(id, design)  # Use await instead of asyncio.run()
+
         for dt in result.card:
-         with BytesIO() as byte_io: 
-            dt.card.save(byte_io, "PNG")
-            byte_io.seek(0)
-            image_url = upload_image(byte_io)
-            
-            characters.append({
-                "name": dt.name,
-                "url": image_url
-            })
-        return jsonify({'response': characters}) 
-    except enkanetwork.exception.VaildateUIDError:
-        # return jsonify({'error': 'Invalid UID. Please check your UID.'}), 400 
+            with BytesIO() as byte_io:
+                dt.card.save(byte_io, "PNG")
+                byte_io.seek(0)
+                image_url = upload_image(byte_io)
 
-        return jsonify({'error': 'Invalid UID. Please check your UID.'})
+                characters.append({
+                    "name": dt.name,
+                    "url": image_url
+                })
 
-    except enkacard.enc_error.ENCardError:
-        # return jsonify({'error': 'Enable display of the showcase in the game or add characters there.'}), 400 
-        return jsonify({'error': 'Enable display of the showcase in the game or add characters there.'})
-    except Exception as e:
+        # Return valid JSON response using FastAPI's JSONResponse
+        return JSONResponse(content={'response': characters})
 
-        return jsonify({'error': 'UNKNOWN ERR' + e.__str__()})
+    except enkanetwork.exception.VaildateUIDError:
+        return JSONResponse(content={'error': 'Invalid UID. Please check your UID.'}, status_code=400)
+
+    except enkacard.enc_error.ENCardError:
+        return JSONResponse(content={'error': 'Enable display of the showcase in the game or add characters there.'}, status_code=400)
 
+    except Exception as e:
+        return JSONResponse(content={'error': 'UNKNOWN ERR: ' + str(e)}, status_code=500)
 
-@app.route("/")
+@app.get("/")
 def hello_world():
     return 'AMERICA YA HALLO!!'
 
-@app.route("/update_char")
-def upload():
-    data_dir = "/tmp/data"
+# @app.route("/update_char")
+# def upload():
+    # data_dir = "/tmp/data"
 
-    if not os.path.exists(data_dir):
-        os.makedirs(data_dir)
+    # if not os.path.exists(data_dir):
+    #     os.makedirs(data_dir)
+
+    # data_dir = "/tmp/langs"
+
+    # if not os.path.exists(data_dir):
+    #     os.makedirs(data_dir)
+    # asyncio.run(update_genshin())
+#     return 'Update smth ig!!'
 
-    data_dir = "/tmp/langs"
 
-    if not os.path.exists(data_dir):
-        os.makedirs(data_dir)
-    asyncio.run(update_genshin())
-    return 'Update smth ig!!'
 
 def upload_image(data):
     url = "https://telegra.ph/upload"
@@ -81,4 +120,14 @@ def upload_image(data):
         raise Exception(f"Failed to parse response: {str(e)}")
     
 if __name__ == "__main__":
-    app.run(debug=False, use_reloader=False)
+    data_dir = "/tmp/data"
+
+    if not os.path.exists(data_dir):
+        os.makedirs(data_dir)
+
+    data_dir = "/tmp/langs"
+
+    if not os.path.exists(data_dir):
+        os.makedirs(data_dir)
+    asyncio.run(update_genshin())
+    uvicorn.run("main:app", host="0.0.0.0", port=7860, workers=8, timeout_keep_alive=600)