Rename Frontend Router to Web Client. Fix logger usage in routers

- Use logger in api_beta router instead of print statements
- Remove unused logger in web client router

src/main.py

@@ -21,7 +21,7 @@ from PyQt6.QtCore import QThread, QTimer
 from src.configure import configure_server
 from src.routers.api import api
 from src.routers.api_beta import api_beta
-from src.routers.frontend import frontend_router
+from src.routers.web_client import web_client
 from src.utils import constants, state
 from src.utils.cli import cli
 from src.interface.desktop.main_window import MainWindow
@@ -33,7 +33,7 @@ app = FastAPI()
 app.mount("/static", StaticFiles(directory=constants.web_directory), name="static")
 app.include_router(api, prefix="/api")
 app.include_router(api_beta, prefix="/api/beta")
-app.include_router(frontend_router)
+app.include_router(web_client)
 
 logger = logging.getLogger('src')
 

src/routers/api.py

@@ -15,10 +15,12 @@ from src.utils.config import SearchType
 from src.utils import state, constants
 
 
+# Initialize Router
 api = APIRouter()
 logger = logging.getLogger(__name__)
 
 
+# Create Routes
 @api.get('/config/data', response_model=FullConfig)
 def get_config_data():
     return state.config

src/routers/api_beta.py

@@ -14,10 +14,12 @@ from src.utils.helpers import get_absolute_path, get_from_dict
 from src.utils import state
 
 
+# Initialize Router
 api_beta = APIRouter()
 logger = logging.getLogger(__name__)
 
 
+# Create Routes
 @api_beta.get('/search')
 def search_beta(q: str, n: Optional[int] = 1):
     # Extract Search Type using GPT
@@ -39,15 +41,13 @@ def chat(q: str):
 
     # Converse with OpenAI GPT
     metadata = understand(q, api_key=state.processor_config.conversation.openai_api_key, verbose=state.verbose)
-    if state.verbose > 1:
-        print(f'Understood: {get_from_dict(metadata, "intent")}')
+    logger.debug(f'Understood: {get_from_dict(metadata, "intent")}')
 
     if get_from_dict(metadata, "intent", "memory-type") == "notes":
         query = get_from_dict(metadata, "intent", "query")
         result_list = search(query, n=1, t=SearchType.Org)
         collated_result = "\n".join([item["entry"] for item in result_list])
-        if state.verbose > 1:
-            print(f'Semantically Similar Notes:\n{collated_result}')
+        logger.debug(f'Semantically Similar Notes:\n{collated_result}')
         gpt_response = summarize(collated_result, summary_type="notes", user_query=q, api_key=state.processor_config.conversation.openai_api_key)
     else:
         gpt_response = converse(q, chat_session, api_key=state.processor_config.conversation.openai_api_key)
@@ -64,8 +64,7 @@ def shutdown_event():
     # No need to create empty log file
     if not (state.processor_config and state.processor_config.conversation and state.processor_config.conversation.meta_log):
         return
-    elif state.processor_config.conversation.verbose:
-        print('INFO:\tSaving conversation logs to disk...')
+    logger.debug('INFO:\tSaving conversation logs to disk...')
 
     # Summarize Conversation Logs for this Session
     chat_session = state.processor_config.conversation.chat_session
@@ -86,4 +85,4 @@ def shutdown_event():
     with open(conversation_logfile, "w+", encoding='utf-8') as logfile:
         json.dump(conversation_log, logfile)
 
-    print('INFO:\tConversation logs saved to disk.')
+    logger.info('INFO:\tConversation logs saved to disk.')

src/routers/web_client.py

@@ -1,6 +1,3 @@
-# Standard Packages
-import logging
-
 # External Packages
 from fastapi import APIRouter
 from fastapi import Request
@@ -11,15 +8,16 @@ from fastapi.templating import Jinja2Templates
 from src.utils import constants
 
 
-frontend_router = APIRouter()
+# Initialize Router
+web_client = APIRouter()
 templates = Jinja2Templates(directory=constants.web_directory)
-logger = logging.getLogger(__name__)
 
 
-@frontend_router.get("/", response_class=FileResponse)
+# Create Routes
+@web_client.get("/", response_class=FileResponse)
 def index():
     return FileResponse(constants.web_directory / "index.html")
 
-@frontend_router.get('/config', response_class=HTMLResponse)
+@web_client.get('/config', response_class=HTMLResponse)
 def config_page(request: Request):
     return templates.TemplateResponse("config.html", context={'request': request})