cleanup

endpoints/constructors.py

@@ -6,30 +6,6 @@ from pydantic import BaseModel
 # Constructors
 # TODO: REORDER
 
-"""
-AI
-"""
-
-class ValidAISongRequest(BaseModel):
-    """
-    - **a**: artist
-    - **s**: track title
-    """
-    
-    a: str
-    s: str
-    
-class ValidHookSongRequest(BaseModel):
-    """
-    - **a**: artist
-    - **s**: track title
-    - **hook**: hook to return
-    """
-
-    a: str
-    s: str
-    hook: str | None = ""    
-
 """
 Karma
 """
@@ -58,7 +34,7 @@ class ValidTopKarmaRequest(BaseModel):
     """
     - **n**: Number of top results to return (default: 10)
     """
-    n: int | None = 10
+    n: Optional[int] = 10
 
 """
 LastFM
@@ -124,7 +100,7 @@ class RandMsgRequest(BaseModel):
     - **short**: Short randmsg?
     """
 
-    short: Optional[bool] = False
+    short: Optional[bool] 
 
 """
 YT
@@ -152,7 +128,7 @@ class ValidXCRequest(BaseModel):
     key: str
     bid: int
     cmd: str
-    data: dict | None = None 
+    data: Optional[dict] 
 
 """
 Transcriptions
@@ -190,14 +166,14 @@ class ValidLyricRequest(BaseModel):
     - **excluded_sources**: sources to exclude (new only)
     """
 
-    a: str | None = None
-    s: str | None = None 
-    t: str | None = None
-    sub: str | None = None
-    extra: bool | None = False
-    lrc: bool | None = False
+    a: Optional[str] = None 
+    s: Optional[str] = None
+    t: Optional[str] = None
+    sub: Optional[str] = None
+    extra: Optional[bool] = False
+    lrc: Optional[bool] = False
     src: str
-    excluded_sources: list | None = None
+    excluded_sources: Optional[list] = None
 
     model_config = {
         "json_schema_extra": {
@@ -218,7 +194,7 @@ class ValidTypeAheadRequest(BaseModel):
     """
     - **query**: query string
     """
-    pre_query: str|None = None
+    pre_query: Optional[str] = None
     query: str
 
 """
@@ -237,10 +213,10 @@ class ValidRadioSongRequest(BaseModel):
     - **alsoSkip**: Whether to skip immediately to this track [not implemented]
     """
     key: str
-    artist: str | None = None
-    song: str | None = None
-    artistsong: str | None = None
-    alsoSkip: bool = False
+    artist: Optional[str] = None
+    song: Optional[str] = None
+    artistsong: Optional[str] = None
+    alsoSkip: Optional[bool] = False
     
 class ValidRadioQueueGetRequest(BaseModel):
     """
@@ -248,8 +224,8 @@ class ValidRadioQueueGetRequest(BaseModel):
     - **limit**: optional, default: 15k
     """
     
-    key: str|None = None
-    limit: int|None = 15000
+    key: Optional[str] = None
+    limit: Optional[int] = 15_000
     
 class ValidRadioNextRequest(BaseModel):
     """
@@ -257,7 +233,7 @@ class ValidRadioNextRequest(BaseModel):
     - **skipTo**: UUID to skip to [optional]
     """
     key: str
-    skipTo: str|None = None
+    skipTo: Optional[str] = None
     
 class ValidRadioReshuffleRequest(ValidRadioNextRequest):
     """
@@ -272,7 +248,7 @@ class ValidRadioQueueShiftRequest(BaseModel):
     """
     key: str
     uuid: str
-    next: bool = False
+    next: Optional[bool] = False
     
 class ValidRadioQueueRemovalRequest(BaseModel):
     """