Remove legacy routers for all API functions

Author: dormant-user

docs/index.html

@@ -20,7 +20,6 @@
 api_config = APIConfig()
 multiprocessing_logger(filename=api_config.DEFAULT_LOG_FILENAME)
 
-
 # Creates log files
 if not os.path.isfile(api_config.ACCESS_LOG_FILENAME):
     pathlib.Path(api_config.ACCESS_LOG_FILENAME).touch()

jarvis/api/logger.py

@@ -1,18 +1,13 @@
 import os
 from http import HTTPStatus
 
-from fastapi import APIRouter
-from fastapi.responses import FileResponse, RedirectResponse
+from fastapi.responses import FileResponse
 
 from jarvis.api.logger import logger
-from jarvis.api.models import authenticator
 from jarvis.modules.conditions import keywords as keywords_mod
 from jarvis.modules.exceptions import APIResponse
 
-router = APIRouter()
 
-
-@router.get(path="/", response_class=RedirectResponse, include_in_schema=False)
 async def redirect_index():
     """Redirect to docs in read-only mode.
 
@@ -24,7 +19,6 @@ async def redirect_index():
     return "/redoc"
 
 
-@router.get(path="/health", include_in_schema=False)
 async def health():
     """Health Check for OfflineCommunicator.
 
@@ -35,7 +29,6 @@ async def health():
     raise APIResponse(status_code=HTTPStatus.OK, detail=HTTPStatus.OK.phrase)
 
 
-@router.get(path="/favicon.ico", include_in_schema=False)
 async def get_favicon():
     """Gets the favicon.ico and adds to the API endpoint.
 
@@ -57,7 +50,6 @@ async def get_favicon():
     )
 
 
-@router.get(path="/keywords", dependencies=authenticator.OFFLINE_PROTECTOR)
 async def keywords():
     """Converts the keywords and conversations into a dictionary of key-value pairs.
 

jarvis/api/routers/basics.py

@@ -2,18 +2,14 @@
 from datetime import datetime
 from http import HTTPStatus
 
-from fastapi import APIRouter, UploadFile
+from fastapi import UploadFile
 from fastapi.responses import FileResponse
 
 from jarvis.api.logger import logger
-from jarvis.api.models import authenticator
 from jarvis.modules.exceptions import APIResponse
 from jarvis.modules.models import models
 
-router = APIRouter()
 
-
-@router.get(path="/list-files", dependencies=authenticator.OFFLINE_PROTECTOR)
 async def list_files():
     """Get all YAML files from fileio and all log files from logs directory.
 
@@ -41,11 +37,6 @@ async def list_files():
     }
 
 
-@router.get(
-    path="/get-file",
-    response_class=FileResponse,
-    dependencies=authenticator.OFFLINE_PROTECTOR,
-)
 async def get_file(filename: str):
     """Download a particular YAML file from fileio or log file from logs directory.
 
@@ -89,7 +80,6 @@ async def get_file(filename: str):
     )
 
 
-@router.post(path="/put-file", dependencies=authenticator.OFFLINE_PROTECTOR)
 async def put_file(file: UploadFile):
     """Upload a particular YAML file to the fileio directory.
 

jarvis/api/routers/fileio.py

@@ -7,23 +7,18 @@
 
 import gmailconnector
 import jinja2
-from fastapi import APIRouter, Request
+from fastapi import Request
 from fastapi.responses import HTMLResponse
 
 from jarvis.api.logger import logger
-from jarvis.api.models import authenticator, settings
+from jarvis.api.models import settings
 from jarvis.api.squire import timeout_otp
 from jarvis.modules.exceptions import CONDITIONAL_ENDPOINT_RESTRICTION, APIResponse
 from jarvis.modules.models import models
 from jarvis.modules.templates import templates
 from jarvis.modules.utils import support, util
 
-router = APIRouter()
 
-
-@router.post(
-    path="/robinhood-authenticate", dependencies=authenticator.ROBINHOOD_PROTECTOR
-)
 async def authenticate_robinhood():
     """Authenticates the request and generates single use token.
 
@@ -90,7 +85,6 @@ async def authenticate_robinhood():
         )
 
 
-@router.get(path="/investment", response_class=HTMLResponse)
 async def robinhood_path(request: Request, token: str = None):
     """Serves static file.
 

jarvis/api/routers/investment.py

@@ -4,11 +4,11 @@
 from http import HTTPStatus
 from threading import Thread
 
-from fastapi import APIRouter, Request
+from fastapi import Request
 from fastapi.responses import FileResponse
 
 from jarvis.api.logger import logger
-from jarvis.api.models import authenticator, modals
+from jarvis.api.models import modals
 from jarvis.api.routers import speech_synthesis
 from jarvis.executors import commander, offline, others, restrictions, word_match
 from jarvis.modules.audio import tts_stt
@@ -18,7 +18,6 @@
 from jarvis.modules.models import models
 from jarvis.modules.utils import support
 
-router = APIRouter()
 db = database.Database(database=models.fileio.base_db)
 
 
@@ -78,7 +77,6 @@ async def process_ok_response(
     raise APIResponse(status_code=HTTPStatus.OK.real, detail=response)
 
 
-@router.post(path="/offline-communicator", dependencies=authenticator.OFFLINE_PROTECTOR)
 async def offline_communicator_api(
     request: Request, input_data: modals.OfflineCommunicatorModal
 ):

jarvis/api/routers/offline.py

@@ -2,14 +2,12 @@
 from http import HTTPStatus
 
 import requests
-from fastapi import APIRouter, Request, Response
+from fastapi import Request, Response
 from pydantic import HttpUrl
 
 from jarvis.api.logger import logger
 from jarvis.modules.exceptions import APIResponse, EgressErrors
 
-router = APIRouter()
-
 
 def is_valid_media_type(media_type: str) -> bool:
     """Regular expression to match valid media types.
@@ -25,7 +23,6 @@ def is_valid_media_type(media_type: str) -> bool:
     return bool(re.match(media_type_pattern, media_type))
 
 
-@router.get(path="/proxy")
 async def proxy_service_api(request: Request, origin: HttpUrl, output: str):
     """API endpoint to act as a proxy for GET calls.
 

jarvis/api/routers/proxy_service.py

@@ -2,17 +2,14 @@
 from http import HTTPStatus
 from typing import Optional
 
-from fastapi import APIRouter, Header, Request
+from fastapi import Header, Request
 
 from jarvis.api.logger import logger
 from jarvis.executors import files
 from jarvis.modules.exceptions import APIResponse
 from jarvis.modules.models import models
 
-router = APIRouter()
 
-
-@router.post(path="/secure-send")
 async def secure_send_api(request: Request, access_token: Optional[str] = Header(None)):
     """API endpoint to share/retrieve secrets.
 

jarvis/api/routers/secure_send.py

@@ -5,22 +5,16 @@
 from urllib.parse import urljoin
 
 import requests
-from fastapi import APIRouter
 from fastapi.responses import FileResponse
 
 from jarvis.api.logger import logger
-from jarvis.api.models import authenticator, modals
+from jarvis.api.models import modals
 from jarvis.modules.audio import speaker
 from jarvis.modules.exceptions import APIResponse, EgressErrors
 from jarvis.modules.models import models
 from jarvis.modules.utils import support
 
-router = APIRouter()
 
-
-@router.get(
-    path="/speech-synthesis-voices", dependencies=authenticator.OFFLINE_PROTECTOR
-)
 async def speech_synthesis_voices():
     """Get all available voices in speech synthesis.
 
@@ -61,11 +55,6 @@ async def speech_synthesis_voices():
         raise APIResponse(status_code=response.status_code, detail=response.content)
 
 
-@router.post(
-    path="/speech-synthesis",
-    response_class=FileResponse,
-    dependencies=authenticator.OFFLINE_PROTECTOR,
-)
 async def speech_synthesis(
     input_data: modals.SpeechSynthesisModal, raise_for_status: bool = True
 ):

jarvis/api/routers/speech_synthesis.py

@@ -18,7 +18,6 @@
 from collections.abc import Generator
 from typing import List
 
-from fastapi import APIRouter
 from fastapi.responses import RedirectResponse
 from pydantic import FilePath, PositiveInt
 
@@ -35,8 +34,6 @@ class StrEnum(str, Enum):
         """Override for python 3.10 due to lack of StrEnum."""
 
 
-router = APIRouter()
-
 FILE_EXTENSIONS: List[str] = [".html", ".py", ".scpt", ".sh", ".xml"]
 
 
@@ -49,17 +46,17 @@ class ValidColors(StrEnum):
         https://github.com/badges/buckler/blob/master/README.md#valid-colours
     """
 
-    brightgreen: str = "brightgreen"
-    green: str = "green"
-    yellowgreen: str = "yellowgreen"
-    yellow: str = "yellow"
-    orange: str = "orange"
-    red: str = "red"
-    grey: str = "grey"
-    gray: str = "grey"
-    lightgrey: str = "lightgrey"
-    lightgray: str = "lightgray"
-    blue: str = "blue"
+    brightgreen = "brightgreen"
+    green = "green"
+    yellowgreen = "yellowgreen"
+    yellow = "yellow"
+    orange = "orange"
+    red = "red"
+    grey = "grey"
+    gray = "grey"
+    lightgrey = "lightgrey"
+    lightgray = "lightgray"
+    blue = "blue"
 
 
 def should_include(filepath: FilePath) -> bool:
@@ -89,7 +86,7 @@ def count_lines(filepath: FilePath) -> PositiveInt:
         return sum(1 for _ in file)
 
 
-def get_files() -> Generator[FilePath]:
+def get_files() -> Generator[str]:
     """Walk through the directory and collect all relevant files.
 
     Yields:
@@ -126,9 +123,10 @@ def total_files() -> PositiveInt:
     return len(list(get_files()))
 
 
-@router.get(path="/line-count", include_in_schema=True)
 async def line_count(
-    badge: bool = False, color: ValidColors = "blue", text: str = "lines of code"
+    badge: bool = False,
+    color: ValidColors = ValidColors.blue,
+    text: str = "lines of code",
 ):
     """Get total lines of code for Jarvis.
 
@@ -151,9 +149,10 @@ async def line_count(
     return total_lines
 
 
-@router.get(path="/file-count", include_in_schema=True)
 async def file_count(
-    badge: bool = False, color: ValidColors = "blue", text: str = "total files"
+    badge: bool = False,
+    color: ValidColors = ValidColors.blue,
+    text: str = "total files",
 ):
     """Get total number of files for Jarvis.