From 7145e86ded63f75179516df91648b24ec8d893f1 Mon Sep 17 00:00:00 2001 From: codey Date: Tue, 11 Feb 2025 11:26:20 -0500 Subject: [PATCH] cleanup --- endpoints/ai.py | 5 ----- endpoints/constructors.py | 1 - endpoints/karma.py | 2 -- endpoints/lastfm.py | 1 - endpoints/lyric_search.py | 8 -------- endpoints/misc.py | 7 ------- endpoints/radio.py | 8 ++------ endpoints/radio_util.py | 2 +- endpoints/rand_msg.py | 2 -- endpoints/transcriptions.py | 2 -- gpt/__init__.py | 2 -- 11 files changed, 3 insertions(+), 37 deletions(-) diff --git a/endpoints/ai.py b/endpoints/ai.py index fb17aee..967c9d1 100644 --- a/endpoints/ai.py +++ b/endpoints/ai.py @@ -4,15 +4,10 @@ import logging import traceback import regex -import json - from aiohttp import ClientSession, ClientTimeout from fastapi import FastAPI, Request, HTTPException, BackgroundTasks -from pydantic import BaseModel from .constructors import ValidHookSongRequest, ValidAISongRequest -# pylint: enable=bad-indentation - class AI(FastAPI): """AI Endpoints""" def __init__(self, app: FastAPI, my_util, constants, glob_state): # pylint: disable=super-init-not-called diff --git a/endpoints/constructors.py b/endpoints/constructors.py index 5b3d169..7aff060 100644 --- a/endpoints/constructors.py +++ b/endpoints/constructors.py @@ -6,7 +6,6 @@ from pydantic import BaseModel # Constructors # TODO: REORDER - """ AI """ diff --git a/endpoints/karma.py b/endpoints/karma.py index b770b45..6e63f1d 100644 --- a/endpoints/karma.py +++ b/endpoints/karma.py @@ -8,11 +8,9 @@ import datetime import traceback import aiosqlite as sqlite3 from fastapi import FastAPI, Request, HTTPException -from pydantic import BaseModel from .constructors import ValidTopKarmaRequest, ValidKarmaRetrievalRequest,\ ValidKarmaUpdateRequest - class KarmaDB: """Karma DB Util""" def __init__(self): diff --git a/endpoints/lastfm.py b/endpoints/lastfm.py index e9fd1ce..41992b5 100644 --- a/endpoints/lastfm.py +++ b/endpoints/lastfm.py @@ -4,7 +4,6 @@ import importlib import traceback from fastapi import FastAPI -from pydantic import BaseModel from .constructors import ValidArtistSearchRequest, ValidAlbumDetailRequest,\ ValidTrackInfoRequest diff --git a/endpoints/lyric_search.py b/endpoints/lyric_search.py index 4fa6a5e..ca34f15 100644 --- a/endpoints/lyric_search.py +++ b/endpoints/lyric_search.py @@ -1,24 +1,16 @@ #!/usr/bin/env python3.12 # pylint: disable=bare-except, broad-exception-raised, broad-exception-caught -import importlib -import traceback import logging import os import urllib.parse -from typing import Optional import regex -import aiohttp import aiosqlite as sqlite3 from fastapi import FastAPI, HTTPException -from pydantic import BaseModel from .constructors import ValidTypeAheadRequest, ValidLyricRequest from lyric_search.sources import aggregate from lyric_search import notifier - - - class CacheUtils: """Lyrics Cache DB Utils""" def __init__(self): diff --git a/endpoints/misc.py b/endpoints/misc.py index 08e733c..25efc01 100644 --- a/endpoints/misc.py +++ b/endpoints/misc.py @@ -1,16 +1,9 @@ #!/usr/bin/env python3.12 # pylint: disable=bare-except, broad-exception-caught, invalid-name -import logging -import traceback import time from fastapi import FastAPI -from aiohttp import ClientSession, ClientTimeout import redis.asyncio as redis -from redis.commands.search.query import Query -from redis.commands.search.indexDefinition import IndexDefinition, IndexType -from redis.commands.search.field import TextField, TagField -from redis.commands.json.path import Path from lyric_search.sources import private, cache as LyricsCache, redis_cache class Misc(FastAPI): diff --git a/endpoints/radio.py b/endpoints/radio.py index 62bda39..7fcb94d 100644 --- a/endpoints/radio.py +++ b/endpoints/radio.py @@ -1,5 +1,4 @@ #!/usr/bin/env python3.12 -# pylint: disable=bare-except, broad-exception-caught, invalid-name import logging import traceback @@ -15,10 +14,10 @@ from .constructors import ValidRadioNextRequest, ValidRadioReshuffleRequest, Val ValidRadioQueueRemovalRequest, ValidRadioSongRequest, RadioException from uuid import uuid4 as uuid from typing import Optional -from pydantic import BaseModel from fastapi import FastAPI, BackgroundTasks, Request, Response, HTTPException from fastapi.responses import RedirectResponse from aiohttp import ClientSession, ClientTimeout +# pylint: disable=bare-except, broad-exception-caught, invalid-name double_space = regex.compile(r'\s{2,}') @@ -26,10 +25,7 @@ double_space = regex.compile(r'\s{2,}') TODO: minor refactoring/type annotations/docstrings """ - - - - + class Radio(FastAPI): """Radio Endpoints""" def __init__(self, app: FastAPI, my_util, constants, glob_state) -> None: # pylint: disable=super-init-not-called diff --git a/endpoints/radio_util.py b/endpoints/radio_util.py index a86141a..7c1e238 100644 --- a/endpoints/radio_util.py +++ b/endpoints/radio_util.py @@ -8,8 +8,8 @@ import logging import traceback import time import datetime -from aiohttp import ClientSession, ClientTimeout import gpt +from aiohttp import ClientSession, ClientTimeout class RadioUtil: def __init__(self, constants) -> None: diff --git a/endpoints/rand_msg.py b/endpoints/rand_msg.py index 2caf20b..ebfcca9 100644 --- a/endpoints/rand_msg.py +++ b/endpoints/rand_msg.py @@ -2,10 +2,8 @@ import os import random -from typing import Optional import aiosqlite as sqlite3 from fastapi import FastAPI -from pydantic import BaseModel from .constructors import RandMsgRequest class RandMsg(FastAPI): diff --git a/endpoints/transcriptions.py b/endpoints/transcriptions.py index 7a3cc9d..bed447f 100644 --- a/endpoints/transcriptions.py +++ b/endpoints/transcriptions.py @@ -3,10 +3,8 @@ import os import aiosqlite as sqlite3 from fastapi import FastAPI -from pydantic import BaseModel from .constructors import ValidShowEpisodeLineRequest, ValidShowEpisodeListRequest - class Transcriptions(FastAPI): """Transcription Endpoints""" def __init__(self, app: FastAPI, util, constants, glob_state): # pylint: disable=super-init-not-called diff --git a/gpt/__init__.py b/gpt/__init__.py index 76d68cb..40cf305 100644 --- a/gpt/__init__.py +++ b/gpt/__init__.py @@ -1,6 +1,4 @@ #!/usr/bin/env python3.12 -import os -import asyncio from typing import Optional from openai import AsyncOpenAI