nw-env

src/server/main.py

@@ -402,7 +402,7 @@ async def chat(
     logger.info(f"Received prompt: {decrypted_prompt}, src_lang: {decrypted_src_lang}, user_id: {user_id}")
     
     try:
-        external_url = "http://155.248.245.86:7860/v1/chat"
+        external_url = f"{settings.external_api_base_url}/v1/chat"
         payload = {
             "prompt": decrypted_prompt,
             "src_lang": decrypted_src_lang,
@@ -670,7 +670,7 @@ async def translate(
 
     logger.info(f"Received translation request: {len(decrypted_sentences)} sentences, src_lang: {decrypted_src_lang}, tgt_lang: {decrypted_tgt_lang}, user_id: {user_id}")
 
-    external_url = "http://155.248.245.86:7860/v1/translate"
+    external_url = f"{settings.external_api_base_url}/v1/translate"
 
     payload = {
         "sentences": decrypted_sentences,
@@ -758,7 +758,7 @@ async def extract_text(
     
     logger.info("Processing PDF text extraction request", extra={
         "endpoint": "/v1/extract-text",
-        "file_name": file.filename,  # Changed from 'filename' to 'file_name'
+        "file_name": file.filename,
         "page_number": page_number,
         "client_ip": get_remote_address(request),
         "user_id": user_id
@@ -767,7 +767,7 @@ async def extract_text(
     start_time = time()
     try:
         # Call external API
-        external_url = f"http://155.248.245.86:7861/extract-text/?page_number={page_number}"
+        external_url = f"{settings.external_pdf_api_base_url}/extract-text/?page_number={page_number}"
         files = {"file": (file.filename, decrypted_content, file.content_type)}
         
         response = requests.post(
@@ -796,7 +796,7 @@ async def extract_text(
     except ValueError as e:
         logger.error(f"Invalid JSON response from external API: {str(e)}")
         raise HTTPException(status_code=500, detail="Invalid response format from external API")
-    
+
 @app.post("/v1/visual_query", 
           response_model=VisualQueryResponse,
           summary="Visual Query with Image",
@@ -877,7 +877,7 @@ async def visual_query(
         "tgt_lang": decrypted_tgt_lang
     })
     
-    external_url = f"http://155.248.245.86:7860/v1/visual_query/?src_lang={decrypted_src_lang}&tgt_lang={decrypted_tgt_lang}"
+    external_url = f"{settings.external_api_base_url}/v1/visual_query/?src_lang={decrypted_src_lang}&tgt_lang={decrypted_tgt_lang}"
     
     try:
         files = {"file": (file.filename, decrypted_content, file.content_type)}
@@ -967,7 +967,7 @@ async def speech_to_speech(
         encrypted_content = await file.read()
         file_content = decrypt_data(encrypted_content, session_key)
         files = {"file": (file.filename, file_content, file.content_type)}
-        external_url = f"http://155.248.245.86:7860/v1/speech_to_speech?language={decrypted_language}"
+        external_url = f"{settings.external_api_base_url}/v1/speech_to_speech?language={decrypted_language}"
 
         response = requests.post(
             external_url,
@@ -996,7 +996,7 @@ async def speech_to_speech(
     except requests.RequestException as e:
         logger.error(f"External speech-to-speech API error: {str(e)}", extra={"user_id": user_id})
         raise HTTPException(status_code=500, detail=f"External API error: {str(e)}")
-    
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Run the FastAPI server.")
     parser.add_argument("--port", type=int, default=settings.port, help="Port to run the server on.")

src/server/utils/auth.py

@@ -59,6 +59,8 @@ class Settings(BaseSettings):
     external_asr_url: str = Field(..., env="EXTERNAL_ASR_URL")
     external_text_gen_url: str = Field(..., env="EXTERNAL_TEXT_GEN_URL")
     external_audio_proc_url: str = Field(..., env="EXTERNAL_AUDIO_PROC_URL")
+    external_api_base_url: str = Field("http://localhost:7860", env="EXTERNAL_API_BASE_URL")  # New field
+    external_pdf_api_base_url: str = Field("http://localhost:7861", env="EXTERNAL_PDF_API_BASE_URL")  # New field
     default_admin_username: str = Field("admin", env="DEFAULT_ADMIN_USERNAME")
     default_admin_password: str = Field("admin54321", env="DEFAULT_ADMIN_PASSWORD")
     database_path: str = DATABASE_PATH