removing signature and supporting only post

app.py

@@ -1,29 +1,16 @@
 import os
 from flask import *
-from flask_limiter import Limiter
-from flask_limiter.util import get_remote_address
 
-from routes.helpers import checkSignature, configFile
+from routes.helpers import configFile
 from routes import *
 
-from random import randint
-from transformers import AutoTokenizer, AutoModelForSequenceClassification, AutoModelForSeq2SeqLM
+from transformers import AutoTokenizer, AutoModelForSequenceClassification
 
 #initing
 app = Flask(__name__)
-VERSION = '1.0 build117'
+VERSION = '1.0 build120'
 app.config['JSON_AS_ASCII'] = False
-limiter = Limiter(app=app, key_func=get_remote_address, default_limits=["5/minute"], storage_uri="memory://",)
-
-#limiter
-@limiter.request_filter
-def ip_whitelist():
-    #try:
-    #    if request.method == 'POST': signature = request.form['signature']
-    #    else: signature = request.args['signature']
-    #    return checkSignature(signature)
-    #except: return False
-    return bool(randint(0,1))
+
 #error pages
 @app.errorhandler(429)
 def ratelimit_handler(e): return render_template('ratelimit.html')
@@ -37,68 +24,57 @@ def ratelimit_handler(e): return render_template('intervalservererror.html')
 def ratelimit_handler(e): return render_template('badgateway.html')
 
 #empty routes
-@app.route('/yt/api/v1', methods=['GET', 'POST'])
-@app.route('/recognize/api/v1', methods=['GET', 'POST'])
-@app.route('/osu/api/v1', methods=['GET', 'POST'])
+@app.route('/yt/api/v1', methods=['POST'])
+@app.route('/recognize/api/v1', methods=['POST'])
+@app.route('/osu/api/v1', methods=['POST'])
 def emptyPath(): return {} 
 
-@app.route('/yt/api/v1/<path:path>', methods=['GET', 'POST'])
-@app.route('/recognize/api/v1/<path:path>', methods=['GET', 'POST'])
-@app.route('/osu/api/v1/<path:path>', methods=['GET', 'POST'])
+@app.route('/yt/api/v1/<path:path>', methods=['POST'])
+@app.route('/recognize/api/v1/<path:path>', methods=['POST'])
+@app.route('/osu/api/v1/<path:path>', methods=['POST'])
 def emptyApiWA(path):  return {"status": "error", "error_code": 100, "error_details": "No method like that found"}
     
 #icon
 @app.route('/favicon.ico')
-@limiter.exempt
+
 def favicon(): return send_from_directory(os.path.join(app.root_path, 'static'), 'favicon.ico', mimetype='image/vnd.microsoft.icon')
 
 ###############
 #SITE ROUTES
 @app.route('/')
-@limiter.exempt
 def index(): return render_template('index.html') 
-@app.route('/signatures/api/v1/get', methods=['GET', 'POST'])
-@limiter.exempt
-def signatureGen(): return siteRoutes.signatureGen(request)
-@app.route('/system-info/api/v1/get', methods=['GET', 'POST'])
-@limiter.exempt
+@app.route('/signatures/api/v1/get', methods=['POST'])
 def systemInfo(): return siteRoutes.systemInfo()
-  
-###############
-#RECOGNIZE API
-@app.route('/recognize/api/v1/voice', methods=['GET', 'POST'])
-def recognizeVoice(): return recognizeApi.recognizeVoice(request)
 
 ###############
 #YT SOUND API
-@app.route('/yt/api/v1/search', methods=['GET', 'POST'])
+@app.route('/yt/api/v1/search', methods=['POST'])
 def search(): return ytApi.search(request)
-@app.route('/yt/api/v1/get-full', methods=['GET', 'POST'])
+@app.route('/yt/api/v1/get-full', methods=['POST'])
 def getFull(): return ytApi.getFull(request)
-@app.route('/yt/api/v1/get-preview', methods=['GET', 'POST'])
+@app.route('/yt/api/v1/get-preview', methods=['POST'])
 def getPreview(): return ytApi.getPreview(request)
 
 ###############
 #OSU API
-@app.route('/osu/api/v1/find-song', methods=['GET', 'POST'])
+@app.route('/osu/api/v1/find-song', methods=['POST'])
 def findSong(): return osuApi.findSong(request)
-@app.route('/osu/api/v1/get-beatmap', methods=['GET', 'POST'])
+@app.route('/osu/api/v1/get-beatmap', methods=['POST'])
 def getBeatmap(): return osuApi.getBeatmap(request)
-@app.route('/osu/api/v1/get-preview', methods=['GET', 'POST'])
+@app.route('/osu/api/v1/get-preview', methods=['POST'])
 def getBMPreview(): return osuApi.getPreview(request)
-@app.route('/osu/api/v1/get-full', methods=['GET', 'POST'])
+@app.route('/osu/api/v1/get-full', methods=['POST'])
 def getBMFull(): return osuApi.getFull(request)
 
 ###############
 # LOAD MODELS
 sa_t, sa_m = AutoTokenizer.from_pretrained("cardiffnlp/twitter-xlm-roberta-base-sentiment"), AutoModelForSequenceClassification.from_pretrained("cardiffnlp/twitter-xlm-roberta-base-sentiment")
 tc_t, tc_m = AutoTokenizer.from_pretrained("EIStakovskii/xlm_roberta_base_multilingual_toxicity_classifier_plus"), AutoModelForSequenceClassification.from_pretrained("EIStakovskii/xlm_roberta_base_multilingual_toxicity_classifier_plus")
-chct_t, chct_m = AutoTokenizer.from_pretrained("cointegrated/rut5-small-chitchat"), AutoModelForSeq2SeqLM.from_pretrained("cointegrated/rut5-small-chitchat")
 
 ##############
 # ANALYZE DATA API
 # to understand which text is negative, positive or neutral
-@app.route('/analyzeText/api/v1/sentiment', methods=['GET', 'POST'])
+@app.route('/analyzeText/api/v1/sentiment', methods=['POST'])
 def sentimentAnalys():
     try:
         text = request.form.get('text') or request.args.get('text') or request.values.get('text') or ""
@@ -110,7 +86,6 @@ def sentimentAnalys():
         
         inputs = sa_t(text, return_tensors="pt")
 
-        # Предсказание тональности текста
         outputs = sa_m(**inputs)
         logits = outputs.logits
         predicted_sentiment_index = logits.argmax(dim=1).item()
@@ -118,7 +93,7 @@ def sentimentAnalys():
     
         return {"status": "pass", "predicted_sentiment": predicted_sentiment}
     except Exception as e: return {"status": "error", "details": { "error_code": 123, "error_details": str(e).replace("\n", " | ") }}
-@app.route('/analyzeText/api/v1/toxicity', methods=['GET', 'POST'])
+@app.route('/analyzeText/api/v1/toxicity', methods=['POST'])
 def toxicityAnalys():
     try:
         text = request.form.get('text') or request.args.get('text') or request.values.get('text') or ""
@@ -130,7 +105,6 @@ def toxicityAnalys():
 
         inputs = tc_t(text, return_tensors="pt")
         
-        # Предсказание тональности текста
         outputs = tc_m(**inputs)
         logits = outputs.logits
         predicted_class = logits.argmax(dim=1).item()
@@ -138,26 +112,6 @@ def toxicityAnalys():
     
         return {"status": "pass", "toxicity": predicted_sentiment}
     except Exception as e: return {"status": "error", "details": { "error_code": 123, "error_details": str(e).replace("\n", " | ") }} , 400
-@app.route('/analyzeText/api/v1/chitchat', methods=['POST'])
-def chitchatRu():
-    try:
-        text = request.form.get('text') or request.args.get('text') or request.values.get('text') or ""
-        if text == "": 
-            try: text = request.json.get('text') or ""
-            except: pass
-                
-        if text == "":
-            return {"status": "error", "details": {"error_code": 101, "error_details": "No text provided"}}, 400
-        
-        inputs = chct_t.encode(text, padding=True, truncation=True, return_tensors="pt")
-        generated_ids = chct_m.generate(
-            input_ids=inputs,
-            use_cache=False
-        )
-        answer = chct_t.decode(generated_ids[0], skip_special_tokens=True)
-        return {"status": "pass", "answer": answer}, 200
-    except Exception as e:
-        return {"status": "error", "details": {"error_code": 123, "error_details": str(e).replace("\n", " | ")}}, 400
 
 if __name__ == "__main__":
     config = configFile()

requirements.txt

@@ -8,7 +8,6 @@ requests
 py-cpuinfo
 transformers
 ffmpeg-python
-flask_limiter
 sentencepiece
 tensorflow-cpu
 SpeechRecognition

routes/config.json

@@ -9,7 +9,5 @@
 	"config-path": "/app/routes/config.json",
 	"openapi-yaml-path": "/app/static/api.yaml",
 	
-	"signatures-db": "/app/signatures.db",
-	
 	"buildVersion": "1.0 build63"
 }

routes/helpers.py

@@ -1,33 +1,7 @@
 import os
-import time
 import json
 import random
 import string
-import sqlite3
-import hashlib
-import requests
-
-# SQLite3 class
-class EazySQLite3():
-    def __init__(self, db: str = "sqlite.db"):
-        self.connection = sqlite3.connect(db)
-        #self.cursor = sqlite_connection.cursor()
-    def query(self, query: str = ""):
-        cursor = self.connection.cursor()
-        try:
-            cursor.execute(query)
-            self.connection.commit()
-            try:
-                record = cursor.fetchall()
-                cursor.close()
-                return {"status": True, "details": record} 
-            except:
-                try: cursor.close()
-                except: pass
-                finally: return {"status": True, "details": None} 
-        except Exception as e: return {"status": False, "details": str(e)} 
-    def close(self):
-        self.connection.close()
 
 # Deleting audio
 def deleteAudio(path: str, waitInSeconds: int = 0):
@@ -40,19 +14,6 @@ def configFile():
         config = json.loads(file.read())
     return config
 
-# Signatures check!!! Wow!!!
-def checkSignature(signature: str):
-    config = configFile()
-    db = EazySQLite3(config['signatures-db'])
-    query = db.query(f"SELECT * FROM `table` WHERE (`key` LIKE \"{signature}\" OR `key`=\"{signature}\") AND `endtime`>{time.time()}")
-    #if len(query['details']) == 0: return False
-    for row in query['details']:
-        if signature == row[0]:
-            newTTL = round(time.time())+86400
-            if newTTL > row[1]: db.query(f"UPDATE `table` SET `endtime`={newTTL} WHERE `key`=\"{signature}\"")
-            return True
-    return False
-
 # Hook for yt-dlp
 def thisIsHook(d):
     try:
@@ -63,72 +24,7 @@ def thisIsHook(d):
 
 # Get variable from request
 def getFromRequest(request, thing: str):
-    try:
-        if request.method == 'POST': reqthing = request.form[thing]
-        else: reqthing = request.args[thing]
-        return reqthing
-    except: return None
-      
-# Recognizing things
-def req(access_token, meth, path, params, **kwargs):
-    full_url = "https://api.wit.ai" + path
-    headers = {
-        "authorization": "Bearer " + access_token,
-        "accept": "application/vnd.wit." + "20221114" + "+json", 
-    }
-    headers.update(kwargs.pop("headers", {}))
-    rsp = requests.request(meth, full_url, headers=headers, params=params, **kwargs)
-    if rsp.status_code > 200:
-        raise Exception(
-            str(rsp.status_code)
-            + " ("
-            + rsp.reason
-            + ")"
-        )
-    try: r = rsp.json()
-    except: r = rsp.text
-    if "error" in r:
-        raise Exception(json["error"])
+    return request.json.get(thing) if request.is_json else request.form.get(thing)
 
-    return r
-def dictation(access_token, audio_file, headers=None, verbose=None):
-    params = {}
-    headers = headers or {}
-    if verbose:
-        params["verbose"] = True
-    resp = req(
-        access_token,
-        "POST",
-        "/dictation",
-        params,
-        data=audio_file,
-        headers=headers,
-    )
-    return resp
-def clean(text):
-    if text not in ['', None]:
-        return text.replace('?', '').replace('!', '').replace(';', '').replace('.', '').replace(',', '')
-def delivering(text):
-    result = []
-    temp = None
-    toPush = None
-    tempLength = 0
-    for dirtLine in text.split('\n'):
-        if '"text"' in dirtLine:
-            line = dirtLine[11:-1]
-            if temp == None: temp = line
-            else:
-                if temp in line: toPush = line
-                else:
-                    temp = line
-                    result.append(toPush)
-    return ' '.join(result)
-def devRaw(text):
-    result = []
-    for line in text.split('\n'): #line[11:-1]
-        if '"text"' in line:
-            result.append(line[11:-1])
-    return result
-    
 def randString(len: int = 16):
     return ''.join(random.SystemRandom().choice(string.ascii_uppercase + string.ascii_lowercase + string.digits) for _ in range(len))

routes/osuApi/findSong.py

@@ -1,19 +1,9 @@
-import json
 from .. import helpers
 from requests import get
 from random import randint as rand
 def findSong(request):
-    try:
-        if request.method == 'POST': signature = request.form['signature']
-        else: signature = request.args['signature']
-    except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
-    
-    try:
-        if request.method == 'POST': query = request.form['query']
-        else: query = request.args['query']
-        if query.strip() in ['', None]: raise Exception()
-    except: return {"status": "error", "details": { "error_code": 133, "error_details": "No query" }}
+    query = helpers.getFromRequest(request, "query")
+    if not query: return {"status": "error", "details": { "error_code": 133, "error_details": "No query" }}, 400
     
     tryment = get("https://api.chimu.moe/v1/search", params={"query": query})
     if int(tryment.status_code) not in [404, 403]:
@@ -32,4 +22,4 @@ def findSong(request):
             if counter >= rand(3,7): break
         return {"status": "pass", "details": {"code": int(tryment.status_code), "result": res}}
     else: 
-        return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}
+        return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}, 400

routes/osuApi/getFull.py

@@ -5,27 +5,8 @@ from .findSong import *
 from requests import get
 from random import randint as rand
 def getFull(request):
-    try:
-        if request.method == 'POST': signature = request.form['signature']
-        else: signature = request.args['signature']
-    except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
-    
-    try:
-        if request.method == 'POST': beatmapId = request.form['beatmapId']
-        else: beatmapId = request.args['beatmapId']
-        if beatmapId.strip() in ['', None]:
-            raise Exception()
-    except: beatmapId = None
-    
-    try:
-        if request.method == 'POST': query = request.form['query']
-        else: query = request.args['query']
-        if query.strip() in ['', None]:
-            raise Exception()
-    except: 
-        if beatmapId == None: return {"status": "error", "details": { "error_code": 133, "error_details": "No details for finding preview" }}
-        else: query = None
+    beatmapId = helpers.getFromRequest(request, "beatmapId")
+    query = helpers.getFromRequest(request, "query")
     
     config = helpers.configFile()
     if beatmapId != None:
@@ -40,8 +21,8 @@ def getFull(request):
             helpers.deleteAudio(f"temp/{beatmapId}.ogg")
             return {"status": "pass", "details": {"code": int(tryment.status_code), "result": f"{config['url']}/static/full/{beatmapId}.ogg"}}
         else: 
-            return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}
-    if query != None:
+            return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}, 400
+    elif query != None:
         fffff = findSong(request)
         if fffff['status'] == "error": return fffff
         beatmapId = fffff['details']['result'][rand(0,len(fffff['details']['result'])-1)]['beatmapId']
@@ -56,5 +37,5 @@ def getFull(request):
             helpers.deleteAudio(f"temp/{beatmapId}.ogg")
             return {"status": "pass", "details": {"code": int(tryment.status_code), "name": f"{beatmapId}.ogg", "result": f"{config['url']}/static/full/{beatmapId}.ogg"}}
         else: 
-            return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}
-    return {}
+            return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}, 400
+    return {"status": "error", "details": { "error_code": 133, "error_details": "No details for finding preview" }}, 400

routes/osuApi/getPreview.py

@@ -3,37 +3,18 @@ from .findSong import *
 from requests import get
 from random import randint as rand
 def getPreview(request):
-    try:
-        if request.method == 'POST': signature = request.form['signature']
-        else: signature = request.args['signature']
-    except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
-    
-    try:
-        if request.method == 'POST': beatmapId = request.form['beatmapId']
-        else: beatmapId = request.args['beatmapId']
-        if beatmapId.strip() in ['', None]:
-            raise Exception()
-    except: beatmapId = None
-    
-    try:
-        if request.method == 'POST': query = request.form['query']
-        else: query = request.args['query']
-        if query.strip() in ['', None]:
-            raise Exception()
-    except: 
-        if beatmapId == None: return {"status": "error", "details": { "error_code": 133, "error_details": "No details for finding preview" }}
-        else: query = None
-    
+    beatmapId = helpers.getFromRequest(request, "beatmapId")
+    query = helpers.getFromRequest(request, "query")
+
     if beatmapId != None:
         tryment = get(f"https://b.ppy.sh/preview/{beatmapId}.mp3")
         if int(tryment.status_code) not in [404, 403]:
             return {"status": "pass", "details": {"code": int(tryment.status_code), "result": f"https://b.ppy.sh/preview/{beatmapId}.mp3"}}
         else: 
-            return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}
-    if query != None:
+            return {"status": "error", "details": {"code": int(tryment.status_code), "answer": tryment.text}}, 400
+    elif query != None:
         fffff = findSong(request)
-        if fffff['status'] == "error": return fffff
+        if fffff['status'] == "error": return fffff, 400
         rBId = fffff['details']['result'][rand(0,len(fffff['details']['result'])-1)]['beatmapId']
         return {"status": "pass", "details": {"code": fffff['details']['code'], "name": "{rBId}.mp3", "result": f"https://b.ppy.sh/preview/{rBId}.mp3"}}
-    return {}
+    return {"status": "error", "details": { "error_code": 133, "error_details": "No details for finding preview" }}, 400

routes/recognizeApi/__init__.py

@@ -1 +0,0 @@
-from .recognizeVoice import *

routes/recognizeApi/recognizeVoice.py

@@ -1,58 +0,0 @@
-import wget
-import random
-import string
-import ffmpeg
-from .. import helpers
-import speech_recognition as sr 
-
-def recognizeVoice(request):
-    try:
-        if request.method == 'POST': url = request.form['url']
-        else: url = request.args['url']
-        if url.strip() in ['', None]: raise Exception()
-    except: return {"status": "error", "details": { "error_code": 101, "error_details": "No link provided" }}
-    try:
-        if request.method == 'POST': signature = request.form['signature']
-        else: signature = request.args['signature']
-    except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
-    try:
-        if request.method == 'POST': lang = request.form['lang']
-        else: lang = request.args['lang']
-        if lang.lower() in ['en','en-us']: lang = 'en-US'
-        elif lang.lower() in ['ru','ru-ru']: lang = 'ru-RU'
-    except: lang = "en-US"
-    
-    fileId = ''.join(random.SystemRandom().choice(string.ascii_uppercase + string.ascii_lowercase + string.digits) for _ in range(16))
-    fileExt = url[url.rfind('.'):url.rfind('.')+4]
-    if fileExt in [".wav",".mp3",".ogg",'.aac']: pass
-    else: return {"status": "error", "details": { "error_code": 111, "error_details": "Wrong file format (only ogg, wav, mp3)" }}
-    
-    r = sr.Recognizer() 
-
-    config = helpers.configFile()
-    
-    wget.download(url, f"{config['temp-path']}/{fileId}{fileExt}")
-    if fileExt != ".wav":
-        audio_input = ffmpeg.input(f"{config['temp-path']}/{fileId}{fileExt}")
-        oldFE = fileExt
-        fileExt = ".wav"
-        audio_output = ffmpeg.output(audio_input.audio, f"{config['temp-path']}/{fileId}{fileExt}")
-        ffmpeg.run(audio_output)
-        helpers.deleteAudio(f"temp/{fileId}.{oldFE}")
-    
-    rawSource = sr.AudioFile(f"{config['temp-path']}/{fileId}{fileExt}") 
-    with rawSource as source: 
-        r.adjust_for_ambient_noise(source)
-        audio = r.record(source) 
-    
-    try: googleText = r.recognize_google(audio, language=lang)
-    except: googleText = ""
-    
-    # at now here's no keys :(
-    #try: houndifyText = r.recognize_houndify(audio)
-    #except: houndifyText = ""
-        
-    helpers.deleteAudio(f"temp/{fileId}{fileExt}")
-    
-    return {"status": "pass", "result": {"google": googleText, "houndify": "NOT-WORKING"}}

routes/siteRoutes/__init__.py

@@ -1,2 +1 @@
-from .sigGen import *
 from .systemInfo import *

routes/siteRoutes/sigGen.py

@@ -1,29 +0,0 @@
-import time
-import random
-import hashlib
-from .. import helpers
-
-def signatureGen(request):
-    endtime = round(time.time())+3600
-
-    uK = helpers.getFromRequest(request, "key")
-    if uK == None: return {"status": "error", "details": {"error_code": -1, "error_details": "No key to generate signature"}} 
-
-    userKey = hashlib.md5(uK.encode()).hexdigest()
-    text = f"--START SIGNATURE-- {userKey}{endtime} --END SIGNATURE--"
-    salt = hashlib.md5("funapi-salt".encode()).hexdigest()[0:16]
-    
-    creatorKey = hashlib.md5(f"HOST-IP:{request.remote_addr};USERKEY={userKey};DATE={time.strftime('%Y-%m-%d')};".encode()).hexdigest()
-    
-    key = hashlib.blake2b(text.encode(), key=userKey.encode(), salt=salt.encode()).hexdigest().upper()
-    
-    config = helpers.configFile()
-    db = helpers.EazySQLite3(config['signatures-db'])
-    
-    query = db.query(f"INSERT INTO `table` (`key`, `endtime`, `creatorKey`) VALUES (\"{key}\", \"{endtime}\", \"{creatorKey}\")")
-    
-    if query['status']:
-        return {"status": "pass", "result": key, "endtime": endtime}
-    else:
-        return {"status": "error", "details": {"error_code": -1, "error_details": "This key already got signature"}}
-    

routes/ytApi/get.py

@@ -3,33 +3,18 @@ import yt_dlp
 from .. import helpers
 
 def get(request, check = "huh"):
-    try:
-        if request.method == 'POST': signature = request.form['signature']
-        else: signature = request.args['signature']
-    except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
-    
-    try:
-        if request.method == 'POST': url = request.form['url']
-        else: url = request.args['url']
-        if url.strip() in ['', None]:
-            raise Exception()
-    except: return {"status": "error", "details": { "error_code": 101, "error_details": "No link provided" }}
+    url = helpers.getFromRequest(request, "url")
+    if not url: return {"status": "error", "details": { "error_code": 101, "error_details": "No link provided" }}, 400
     
-    try:
-        if request.method == 'POST': bitrate = str(request.form['bitrate']) 
-        else: bitrate = str(request.args['bitrate'])
-    except: bitrate = "64k"
-    try:
-        if request.method == 'POST': quality = request.form['quality']
-        else: quality = request.args['quality']
-        if quality.lower() not in ['best', 'worst']: raise Exception()
-    except: quality = 'worst'
+    bitrate = helpers.getFromRequest(request, "bitrate")
+    if not bitrate: bitrate = "64k"
+
+    quality = helpers.getFromRequest(request, "quality").lower()
+    if quality.lower() not in ['best', 'worst']: quality = 'worst'
+    else: bitrate = str(bitrate)
     
-    urlcode = None
-    try: urlcode = url.partition('?v=')[2]
-    except: urlcode = helpers.randString()
-    if urlcode in ['', None]: urlcode = helpers.randString()
+    urlcode = url.partition('?v=')[2]
+    if not urlcode: urlcode = "NPRNRQh2fAo"
     
     config = helpers.configFile()
     
@@ -48,5 +33,5 @@ def get(request, check = "huh"):
     try:
         with yt_dlp.YoutubeDL(ydl_opts) as ydl:
             error_code = ydl.download(url)
-    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e)}}
+    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e)}}, 400
     return {"status": "pass", 'done-or-not': False, 'ytdlp-code': error_code, 'urlcode': urlcode, "path": f"{config['temp-path']}/{urlcode}.ogg", "quality": quality, "bitrate": bitrate}

routes/ytApi/getFull.py

@@ -8,7 +8,7 @@ def getFull(request):
         if answer['status'] == "error": return answer
         if answer['error']: return answer
     except KeyError: pass
-    except Exception as e: return {"status": "error", "details": { "error_code": 123, "error_details": e }}
+    except Exception as e: return {"status": "error", "details": { "error_code": 123, "error_details": e }}, 400
     urlcode = answer['urlcode']
     bitrate = answer['bitrate']
     quality = answer['quality']
@@ -23,6 +23,6 @@ def getFull(request):
         audio_output = ffmpeg.output(audio_input.audio, f"{config['full-path']}/{urlcode}.ogg", audio_bitrate=bitrate)
         ffmpeg.run(audio_output)
         helpers.deleteAudio(f"temp/{urlcode}.ogg")
-    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e), "result": f"{config['url']}/static/temp/{urlcode}.ogg"}}
+    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e), "result": f"{config['url']}/static/temp/{urlcode}.ogg"}}, 400
     return {"status": "pass", "details": {"code": error_code, "name":"{}.ogg".format(urlcode), "result": f"{config['url']}/static/full/{urlcode}.ogg"}}
   

routes/ytApi/getPreview.py

@@ -9,24 +9,17 @@ def getPreview(request):
         if answer['status'] == "error": return answer
         if answer['error']: return answer
     except KeyError: pass
-    except Exception as e: return {"status": "error", "details": { "error_code": 123, "error_details": e }}
+    except Exception as e: return {"status": "error", "details": { "error_code": 123, "error_details": e }}, 400
     urlcode = answer['urlcode']
     bitrate = answer['bitrate']
-    quality = answer['quality']
     error_code = answer['ytdlp-code']
     
-    try:
-        if request.method == 'POST': duration = int(request.form['duration'])
-        else: duration = int(request.args['duration'])
-        if duration >= 60: duration = 60
-    except Exception as e:
-        print(e)
-        duration = 30
+    duration = helpers.getFromRequest(request, "duration")
+    try: duration = int(duration) if duration.isnumeric() and int(duration) <= 90 else 45
+    except: duration = 45
     
-    try:
-        if request.method == 'POST': extension = request.form['extension']
-        else: extension = request.args['extension']
-    except: extension = "ogg"
+    extension = helpers.getFromRequest(request, "extension")
+    if not extension: extension = "ogg"
     
     config = helpers.configFile()
     if answer['done-or-not']:
@@ -41,6 +34,6 @@ def getPreview(request):
         audio_output = ffmpeg.output(audio_cut, f"{config['previews-path']}/{urlcode}.{extension}", audio_bitrate=bitrate)
         ffmpeg.run(audio_output)
         helpers.deleteAudio(f"temp/{urlcode}.{extension}")
-    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e), "result": f"{config['url']}/static/temp/{urlcode}.{extension}"}}
+    except Exception as e: return {"status": "error", "details": {"error_code": 102, "error_details": str(e), "result": f"{config['url']}/static/temp/{urlcode}.{extension}"}}, 400
     return {"status": "pass", "details": {"code": error_code, "name":f"{urlcode}.{extension}", "result": f"{config['url']}/static/previews/{urlcode}.{extension}"}}
   

routes/ytApi/search.py

@@ -3,20 +3,14 @@ import re
 from .. import helpers
 
 def search(request):
+    searchQuery = helpers.getFromRequest(request, "query")
+    if not searchQuery: searchQuery = "rickroll"
     try:
-        if request.method == 'POST': searchQuery = request.form['query']
-        else: searchQuery = request.args['query']
-        if searchQuery.strip() in ['', None]:
-            raise Exception()
-    except: searchQuery = "rickroll"
-    try:
-        if request.method == 'POST': signature = request.form['signature']
-        else: signature = request.args['signature']
-    except: return {"status": "error", "details": { "error_code": 103, "error_details": "No signature" }}
-    if not helpers.checkSignature(signature): return {"status": "error", "details": { "error_code": 105, "error_details": "Invalid signature" }}
-    html = urllib.request.urlopen("https://www.youtube.com/results?search_query={}".format(urllib.parse.quote_plus(searchQuery)))
-    videoList = re.findall(r"watch\?v=(\S{11})", html.read().decode())
-    videoIds = dict()
-    for i in range(len(videoList)):
-        videoIds.update({i: videoList[i]})
-    return {"status": "pass", "query": searchQuery, "videoIds": videoIds}
+        html = urllib.request.urlopen("https://www.youtube.com/results?search_query={}".format(urllib.parse.quote_plus(searchQuery)))
+        videoList = re.findall(r"watch\?v=(\S{11})", html.read().decode())
+        videoIds = dict()
+        for i in range(len(videoList)): videoIds.update({i: videoList[i]})
+        return {"status": "pass", "query": searchQuery, "videoIds": videoIds}
+    except Exception as e:
+        print(e)
+        return {"status": "error", "details": { "error_code": 666, "error_details": "Something went wrong..." }}, 500

static/api.yaml

@@ -5,33 +5,9 @@ info:
   version: $VERSION_VARIABLE$
 servers:
   - url: 'https://imperialwool-funapi.hf.space/'
-    description: 'You are here! ^з^'
+    description: 'You are here! ^�^'
 paths:
   /signatures/api/v1/get:
-    get:
-        tags:
-            - "Authentication"
-        parameters:
-            - name: 'key'
-              description: Key to generate signature.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: rickroll
-        summary: "Generating auth key with small TTL."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/AuthSuccessObject"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/AuthErrorObject"
     post:
         tags:
             - "Authentication"
@@ -57,36 +33,6 @@ paths:
                 schema:
                   $ref: "#/components/schemas/AuthErrorObject"
   /osu/api/v1/find-song:
-    get:
-        tags:
-            - "osu! API"
-        parameters:
-            - name: 'query'
-              description: Query to find beatmap.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: rickroll
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
-        summary: "Finding beatmap by query."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/FindBeatmapsObject"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/ErrorObject"
     post:
         tags:
             - "osu! API"
@@ -97,12 +43,6 @@ paths:
               schema:
                 type: 'string'
               example: rickroll
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
         summary: "Finding beatmap by query."
         responses:
           200:
@@ -118,42 +58,6 @@ paths:
                 schema:
                   $ref: "#/components/schemas/ErrorObject"
   /osu/api/v1/get-full:
-    get:
-        tags:
-            - "osu! API"
-        parameters:
-            - name: 'query'
-              description: Query to find beatmap and download full song.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: rickroll
-            - name: 'beatmapId'
-              description: Beatset id. Not map, set.
-              in: 'query'
-              schema:
-                type: 'integer'
-              example: 1
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
-        summary: "Get beatmap's full song."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/SongFullObject"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/ErrorObject"
     post:
         tags:
             - "osu! API"
@@ -170,12 +74,6 @@ paths:
               schema:
                 type: 'integer'
               example: 1
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
         summary: "Get beatmap's full song."
         responses:
           200:
@@ -191,42 +89,6 @@ paths:
                 schema:
                   $ref: "#/components/schemas/ErrorObject"
   /osu/api/v1/get-preview:
-    get:
-        tags:
-            - "osu! API"
-        parameters:
-            - name: 'query'
-              description: Query to find beatmap and download full song.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: rickroll
-            - name: 'beatmapId'
-              description: Beatset id. Not map, set.
-              in: 'query'
-              schema:
-                type: 'integer'
-              example: 1
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
-        summary: "Get beatmap's song preview."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/SongPreviewObject"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/ErrorObject"
     post:
         tags:
             - "osu! API"
@@ -243,12 +105,6 @@ paths:
               schema:
                 type: 'integer'
               example: 1
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
         summary: "Get beatmap's song preview."
         responses:
           200:
@@ -263,104 +119,7 @@ paths:
               application/json:
                 schema:
                   $ref: "#/components/schemas/ErrorObject"
-  /recognize/api/v1/voice:
-    get:
-        tags:
-            - Recognize API
-        parameters:
-            - name: 'url'
-              description: URL-link to voice message. Should be mp3, ogg or wav.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: https://cdn-102.anonfiles.com/q8v0o5O5y8/3d62dac1-1671893935/j4893hg894g4.mp3
-            - name: 'extendInfo'
-              description: Provide additional information or not.
-              in: 'query'
-              schema:
-                type: 'string'
-                default: False
-              example: False
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
-        summary: "This method can help with converting voice into the text."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/RecognizeObject"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/ErrorObject"
-    post:
-        tags:
-            - Recognize API
-        parameters:
-            - name: 'url'
-              description: URL-link to voice message. Should be mp3, ogg or wav.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: https://cdn-102.anonfiles.com/q8v0o5O5y8/3d62dac1-1671893935/j4893hg894g4.mp3
-            - name: 'file'
-              description: Upload file to recognize voice. **NOT SUPPORTED NOW**
-              in: 'query'
-              schema:
-                type: 'string'
-            - name: 'extendInfo'
-              description: Provide additional information or not.
-              in: 'query'
-              schema:
-                type: 'string'
-                default: False
-              example: False
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
-        summary: "This method can help with converting voice into the text."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/RecognizeObject"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/ErrorObject"
   /system-info/api/v1/get:
-    get:
-        tags:
-            - "System information"
-        summary: "Information about server."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/SysinfoObject"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/ErrorObject"
     post:
         tags:
             - "System information"
@@ -379,36 +138,6 @@ paths:
                 schema:
                   $ref: "#/components/schemas/ErrorObject"
   /yt/api/v1/search:
-    get:
-        tags:
-            - "Youtube: Becoming Music Platform"
-        parameters:
-            - name: 'query'
-              description: Query for YouTube to find videos.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: never gonna give you up
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
-        summary: "This method can help with searching videos on YouTube."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/YTSearchObject"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/ErrorObject"
     post:
         tags:
             - "Youtube: Becoming Music Platform"
@@ -419,12 +148,7 @@ paths:
               schema:
                 type: 'string'
               example: never gonna give you up
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
+           
         summary: "This method can help with searching videos on YouTube."
         responses:
           200:
@@ -440,47 +164,6 @@ paths:
                 schema:
                   $ref: "#/components/schemas/ErrorObject"        
   /yt/api/v1/get-full:
-    get:
-        tags:
-            - "Youtube: Becoming Music Platform"
-        parameters:
-            - name: 'url'
-              description: Url to video from YouTube. (TikTok also works sometimes.)
-              in: 'query'
-              schema:
-                type: 'string'
-            - name: 'bitrate'
-              description: Bitrate of final audio.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: "64k"
-            - name: 'quality'
-              description: Quality of final audio. Only 'worst' or 'best'.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: "worst"
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
-        summary: "Download video as audio and providing link for you."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/YTFullObject"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/ErrorObject"
     post:
         tags:
             - "Youtube: Becoming Music Platform"
@@ -502,12 +185,7 @@ paths:
               schema:
                 type: 'string'
               example: "worst"
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
+           
         summary: "Download video as audio and providing link for you."
         responses:
           200:
@@ -523,53 +201,6 @@ paths:
                 schema:
                   $ref: "#/components/schemas/ErrorObject"
   /yt/api/v1/get-preview:
-    get:
-        tags:
-            - "Youtube: Becoming Music Platform"
-        parameters:
-            - name: 'url'
-              description: Url to video from YouTube. (TikTok also works sometimes.)
-              in: 'query'
-              schema:
-                type: 'string'
-            - name: 'bitrate'
-              description: Bitrate of final audio.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: "64k"
-            - name: 'quality'
-              description: Quality of final audio. Only 'worst' or 'best'.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: "worst"
-            - name: 'duration'
-              description: Duration of preview. Maximum 60 seconds.
-              in: 'query'
-              schema:
-                type: 'integer'
-              example: 30
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
-        summary: "Download video as cutted audio and providing link for you."
-        responses:
-          200:
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/YTPreviewResult"
-          400:
-            description: Bad Request
-            content:
-              application/json:
-                schema:
-                  $ref: "#/components/schemas/ErrorObject"
     post:
         tags:
             - "Youtube: Becoming Music Platform"
@@ -597,12 +228,6 @@ paths:
               schema:
                 type: 'integer'
               example: 30
-            - name: 'signature'
-              description: Special access key.
-              in: 'query'
-              schema:
-                type: 'string'
-              example: 'B46AAB1A3F1E33625C1B6BD9507453B928DE69BA638E7098DB533A2184ED288EFB899D563EF8AB5487DACBCAD909A801E4C81FD6D34B639F6591295CD1D10A5B'
         summary: "Download video as cutted audio and providing link for you."
         responses:
           200: