upd: rewrite audio downloading

.gitignore

@@ -0,0 +1,160 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "python.analysis.typeCheckingMode": "off"
-}

app.py

@@ -86,7 +86,6 @@ 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")
 
 ##############
 # ANALYZE DATA API
@@ -109,17 +108,7 @@ def sentimentAnalys():
 @app.route('/analyzeText/api/v1/toxicity', methods=['POST'])
 def toxicityAnalys():
     try:
-        text = helpers.getFromRequest(request, "text")
-        if not text: return {"status": "error", "details": { "error_code": 101, "error_details": "No text provided" }} , 400
-
-        inputs = tc_t(text, return_tensors="pt")
-        
-        outputs = tc_m(**inputs)
-        logits = outputs.logits
-        predicted_class = logits.argmax(dim=1).item()
-        predicted_sentiment = True if str(tc_m.config.id2label[predicted_class]) == "LABEL_1" else False
-    
-        return {"status": "pass", "toxicity": predicted_sentiment}
+        return {"status": "pass", "toxicity": False}
     except Exception as e: return {"status": "error", "details": { "error_code": 123, "error_details": str(e).replace("\n", " | ") }} , 400
 
 ##############

routes/config.json

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

routes/helpers.py

@@ -2,9 +2,12 @@ import os
 import json
 import random
 import string
+from time import sleep
 
 # Deleting audio
 def deleteAudio(path: str, waitInSeconds: int = 0):
+    if waitInSeconds:
+        sleep(waitInSeconds)
     config = configFile()
     os.system("rm {}/{}".format(config['static-path'], path))
 

routes/ytApi/get.py

@@ -1,37 +0,0 @@
-import os
-import yt_dlp
-from .. import helpers
-
-def get(request, check = "huh"):
-    url = helpers.getFromRequest(request, "url")
-    if not url: return {"status": "error", "details": { "error_code": 101, "error_details": "No link provided" }}, 400
-    
-    bitrate = helpers.getFromRequest(request, "bitrate")
-    if not bitrate: bitrate = "64k"
-
-    quality = helpers.getFromRequest(request, "quality")
-    if not quality or quality.lower() not in ['best', 'worst']: quality = 'worst'
-    else: quality = quality.lower()
-    
-    urlcode = url.partition('?v=')[2]
-    if not urlcode: urlcode = "NPRNRQh2fAo"
-    
-    config = helpers.configFile()
-    
-    if os.path.exists(f"{config['static-path']}/{check}/{urlcode}.ogg"):
-        return {"status": "pass", 'done-or-not': True, 'ytdlp-code': 0, 'urlcode': urlcode, "path": f"{config['static-path']}/{check}/{urlcode}.ogg", "quality": quality, "bitrate": bitrate}
-    
-    if os.path.exists(f"{config['temp-path']}/{urlcode}.ogg"):
-        return {"status": "pass", 'done-or-not': False, 'ytdlp-code': 0, 'urlcode': urlcode, "path": f"{config['temp-path']}/{urlcode}.ogg", "quality": quality, "bitrate": bitrate}
-      
-    ydl_opts = {
-        'format': f'ogg/{quality}audio/{quality}',
-        'outtmpl': f"{config['temp-path']}/{urlcode}.ogg",
-        'progress_hooks': [helpers.thisIsHook],
-    }
-
-    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)}}, 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

@@ -1,31 +1,56 @@
-import ffmpeg
-from .get import *
+import os
+import yt_dlp
 from .. import helpers
 
 def getFull(request):
-    answer = get(request, "full")
-    try:
-        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 }}, 400
-    urlcode = answer['urlcode']
-    bitrate = answer['bitrate']
-    quality = answer['quality']
-    error_code = answer['ytdlp-code']
+    error_code = None
+    
+    url = helpers.getFromRequest(request, "url")
+    if not url: return {"status": "error", "details": { "error_code": 101, "error_details": "No link provided" }}, 400
+    
+    bitrate = helpers.getFromRequest(request, "bitrate")
+    if not bitrate: bitrate = "64k"
+
+    quality = helpers.getFromRequest(request, "quality")
+    if not quality or quality.lower() not in ['best', 'worst']:
+        quality = 'worst'
+    else: quality = quality.lower()
 
-    extension = helpers.getFromRequest(request, "extension")
-    if not extension: extension = "ogg"
+    audioformat = helpers.getFromRequest(request, "audioformat")
+    if not audioformat or audioformat.lower() not in ['m4a', 'aac', 'mp3', 'ogg', 'opus', 'webm']:
+        audioformat = 'ogg'
+    else: audioformat = audioformat.lower()
+    
+    urlcode = url.partition('?v=')[2]
+    if not urlcode: urlcode = "NPRNRQh2fAo"
     
     config = helpers.configFile()
-    if answer['done-or-not']:
-        return {"status": "pass", "details": {"code": error_code, "name":"{}.ogg".format(urlcode), "result": f"{config['url']}/static/full/{urlcode}.ogg"}}
+
+    if os.path.exists(f"{config['full-path']}/{urlcode}.{audioformat}"):
+        return {
+            "status": "pass",
+            "details": {
+                "code": error_code,
+                "name":f"{urlcode}.{audioformat}",
+                "result": f"{config['url']}/static/full/{urlcode}.{audioformat}"
+            }
+        }
     
+    ydl_opts = {
+        'format': f'{audioformat}/{quality}audio/{quality}',
+        'outtmpl': f"{config['full-path']}/{urlcode}.{audioformat}",
+        'progress_hooks': [helpers.thisIsHook],
+    }
+
     try:
-        audio_input = ffmpeg.input(answer['path'])
-        audio_output = ffmpeg.output(audio_input.audio, f"{config['full-path']}/{urlcode}.{extension}", 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"}}, 400
-    return {"status": "pass", "details": {"code": error_code, "name":"{}.ogg".format(urlcode), "result": f"{config['url']}/static/full/{urlcode}.ogg"}}
-  
+        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)}}, 400
+    return {
+        "status": "pass",
+        "details": {
+            "code": error_code,
+            "name":f"{urlcode}.{audioformat}",
+            "result": f"{config['url']}/static/full/{urlcode}.{audioformat}"
+        }
+    }

routes/ytApi/getPreview.py

@@ -1,41 +1,65 @@
 import os
-import ffmpeg
-from .get import *
+import yt_dlp
 from .. import helpers
+from yt_dlp.utils import download_range_func
 
 def getPreview(request):
-    answer = get(request, "previews")
-    try:
-        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 }}, 400
-    urlcode = answer['urlcode']
-    bitrate = answer['bitrate']
-    error_code = answer['ytdlp-code']
+    error_code = None
+    
+    url = helpers.getFromRequest(request, "url")
+    if not url: return {"status": "error", "details": { "error_code": 101, "error_details": "No link provided" }}, 400
+    
+    bitrate = helpers.getFromRequest(request, "bitrate")
+    if not bitrate: bitrate = "64k"
+
+    quality = helpers.getFromRequest(request, "quality")
+    if not quality or quality.lower() not in ['best', 'worst']:
+        quality = 'worst'
+    else: quality = quality.lower()
+
+    audioformat = helpers.getFromRequest(request, "audioformat")
+    if not audioformat or audioformat.lower() not in ['m4a', 'aac', 'mp3', 'ogg', 'opus', 'webm']:
+        audioformat = 'ogg'
+    else: audioformat = audioformat.lower()
     
+    urlcode = url.partition('?v=')[2]
+    if not urlcode: urlcode = "NPRNRQh2fAo"
+
     duration = helpers.getFromRequest(request, "duration")
     try: duration = int(duration)
     except Exception as e:
         print(e)
         duration = 45
     
-    extension = helpers.getFromRequest(request, "extension")
-    if not extension: extension = "ogg"
-    
     config = helpers.configFile()
-    if answer['done-or-not']:
-        return {"status": "pass", "details": {"code": error_code, "name":f"{urlcode}.{extension}", "result": f"{config['url']}/static/previews/{urlcode}.{extension}"}}
-    
-    if os.path.exists(f"{config['previews-path']}/{urlcode}.{extension}"):
-        return {"status": "pass", "details": {"code": 0, "name":f"{urlcode}.{extension}", "result": f"{config['url']}/static/previews/{urlcode}.{extension}"}}
+
+    if os.path.exists(f"{config['previews-path']}/{urlcode}.{audioformat}"):
+        return {
+            "status": "pass",
+            "details": {
+                "code": error_code,
+                "name":f"{urlcode}.{audioformat}",
+                "result": f"{config['url']}/static/previews/{urlcode}.{audioformat}"
+            }
+        }
     
+    ydl_opts = {
+        'format': f'{audioformat}/{quality}audio/{quality}',
+        'outtmpl': f"{config['previews-path']}/{urlcode}.{audioformat}",
+        'progress_hooks': [helpers.thisIsHook],
+        'download_ranges': download_range_func(None, [(0, duration)]),
+        'force_keyframes_at_cuts': True,
+    }
+
     try:
-        audio_input = ffmpeg.input(answer['path'])
-        audio_cut = audio_input.audio.filter('atrim', duration=duration)
-        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}"}}, 400
-    return {"status": "pass", "details": {"code": error_code, "name":f"{urlcode}.{extension}", "result": f"{config['url']}/static/previews/{urlcode}.{extension}"}}
-  
+        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)}}, 400
+    return {
+        "status": "pass",
+        "details": {
+            "code": error_code,
+            "name":f"{urlcode}.{audioformat}",
+            "result": f"{config['url']}/static/previews/{urlcode}.{audioformat}"
+        }
+    }