Rename initialize_{search,processor,server} to configure_{search,procesor,server}

- Search is being reconfigured multiple times in /regenerate and
  n/reload. More appropriate name is configure_ rather than initialize_
  for it
- Standardize name of methods under configure.py
This commit is contained in:
Debanjum Singh Solanky
2022-08-06 03:20:04 +03:00
parent 7b04978f52
commit c5bf051a29
3 changed files with 10 additions and 13 deletions

View File

@@ -1,6 +1,3 @@
# Standard Packages
import sys
# External Packages # External Packages
import torch import torch
@@ -16,7 +13,7 @@ from src.utils.helpers import get_absolute_path
from src.utils.rawconfig import FullConfig from src.utils.rawconfig import FullConfig
def initialize_server(cmd_args): def configure_server(cmd_args):
# Load config from CLI # Load config from CLI
args = cli(cmd_args) args = cli(cmd_args)
@@ -30,15 +27,15 @@ def initialize_server(cmd_args):
state.verbose = args.verbose state.verbose = args.verbose
# Initialize the search model from Config # Initialize the search model from Config
state.model = initialize_search(state.model, args.config, args.regenerate, device=state.device, verbose=state.verbose) state.model = configure_search(state.model, args.config, args.regenerate, device=state.device, verbose=state.verbose)
# Initialize Processor from Config # Initialize Processor from Config
state.processor_config = initialize_processor(args.config, verbose=state.verbose) state.processor_config = configure_processor(args.config, verbose=state.verbose)
return args.host, args.port, args.socket return args.host, args.port, args.socket
def initialize_search(model: SearchModels, config: FullConfig, regenerate: bool, t: SearchType = None, device=torch.device("cpu"), verbose: int = 0): def configure_search(model: SearchModels, config: FullConfig, regenerate: bool, t: SearchType = None, device=torch.device("cpu"), verbose: int = 0):
# Initialize Org Notes Search # Initialize Org Notes Search
if (t == SearchType.Org or t == None) and config.content_type.org: if (t == SearchType.Org or t == None) and config.content_type.org:
# Extract Entries, Generate Notes Embeddings # Extract Entries, Generate Notes Embeddings
@@ -67,7 +64,7 @@ def initialize_search(model: SearchModels, config: FullConfig, regenerate: bool,
return model return model
def initialize_processor(config: FullConfig, verbose: int): def configure_processor(config: FullConfig, verbose: int):
if not config.processor: if not config.processor:
return return

View File

@@ -9,7 +9,7 @@ from fastapi.staticfiles import StaticFiles
from PyQt6 import QtCore, QtGui, QtWidgets from PyQt6 import QtCore, QtGui, QtWidgets
# Internal Packages # Internal Packages
from src.configure import initialize_server from src.configure import configure_server
from src.router import router from src.router import router
from src.utils import constants from src.utils import constants
@@ -22,7 +22,7 @@ app.include_router(router)
def run(): def run():
# Setup Application Server # Setup Application Server
host, port, socket = initialize_server(sys.argv[1:]) host, port, socket = configure_server(sys.argv[1:])
# Setup GUI # Setup GUI
gui = QtWidgets.QApplication([]) gui = QtWidgets.QApplication([])

View File

@@ -12,7 +12,7 @@ from fastapi.responses import HTMLResponse, FileResponse
from fastapi.templating import Jinja2Templates from fastapi.templating import Jinja2Templates
# Internal Packages # Internal Packages
from src.configure import initialize_search from src.configure import configure_search
from src.search_type import image_search, text_search from src.search_type import image_search, text_search
from src.processor.conversation.gpt import converse, extract_search_type, message_to_log, message_to_prompt, understand, summarize from src.processor.conversation.gpt import converse, extract_search_type, message_to_log, message_to_prompt, understand, summarize
from src.search_filter.explicit_filter import ExplicitFilter from src.search_filter.explicit_filter import ExplicitFilter
@@ -127,13 +127,13 @@ def search(q: str, n: Optional[int] = 5, t: Optional[SearchType] = None, r: Opti
@router.get('/reload') @router.get('/reload')
def reload(t: Optional[SearchType] = None): def reload(t: Optional[SearchType] = None):
state.model = initialize_search(state.model, state.config, regenerate=False, t=t, device=state.device) state.model = configure_search(state.model, state.config, regenerate=False, t=t, device=state.device)
return {'status': 'ok', 'message': 'reload completed'} return {'status': 'ok', 'message': 'reload completed'}
@router.get('/regenerate') @router.get('/regenerate')
def regenerate(t: Optional[SearchType] = None): def regenerate(t: Optional[SearchType] = None):
state.model = initialize_search(state.model, state.config, regenerate=True, t=t, device=state.device) state.model = configure_search(state.model, state.config, regenerate=True, t=t, device=state.device)
return {'status': 'ok', 'message': 'regeneration completed'} return {'status': 'ok', 'message': 'regeneration completed'}