adding files

main.py

@@ -74,47 +74,40 @@ import os
 import logging
 from werkzeug.exceptions import HTTPException, UnprocessableEntity, InternalServerError
 from flask import Flask
+from dotenv import load_dotenv
 from flask_swagger_ui import get_swaggerui_blueprint
 from flask_cors import CORS
 from waitress import serve
-from dotenv import load_dotenv
-import spacy
-from spacy.cli import download
+from router.router import app  # Assuming router is correctly defined elsewhere
+from config.logger import CustomLogger, request_id_var  # Ensure logger is set up properly
 
 # Load environment variables
 load_dotenv()
 
-# Flask app setup
+# Initialize the request ID
+request_id_var.set("StartUp")
+
+# Set up Swagger UI and API URL
+SWAGGER_URL = '/rai/v1/moderations/docs'  # URL for exposing Swagger UI (without trailing '/')
+API_URL = '/static/metadata.json'  # Swagger API URL for the documentation
+
+# Initialize the Flask app
 app1 = Flask(__name__)
 
-# Swagger UI setup
-SWAGGER_URL = '/rai/v1/moderations/docs'  
-API_URL = '/static/metadata.json'
-swaggerui_blueprint = get_swaggerui_blueprint(SWAGGER_URL, API_URL, config={'app_name': "Infosys Responsible AI - Moderation"})
+# Set up Swagger UI Blueprint
+swaggerui_blueprint = get_swaggerui_blueprint(
+    SWAGGER_URL,
+    API_URL,
+    config={'app_name': "Infosys Responsible AI - Moderation"}
+)
+
+# Register Blueprints
+app1.register_blueprint(app)  # Assuming 'app' comes from the router
 app1.register_blueprint(swaggerui_blueprint)
 
-# CORS setup
+# Enable CORS (Cross-Origin Resource Sharing)
 CORS(app1)
 
-# Ensure Spacy model is installed and loaded
-def load_spacy_model():
-    try:
-        # Attempt to load the model
-        nlp = spacy.load('en_core_web_lg')
-    except OSError:
-        # If model is not found, download it
-        download('en_core_web_lg')
-        nlp = spacy.load('en_core_web_lg')
-    return nlp
-
-# Attempt to load Spacy model
-try:
-    nlp = load_spacy_model()
-    logging.info("Spacy model loaded successfully.")
-except Exception as e:
-    logging.error(f"Failed to load Spacy model: {e}")
-    raise
-
 # Error Handlers
 @app1.errorhandler(HTTPException)
 def handle_exception(e):
@@ -129,7 +122,7 @@ def handle_exception(e):
 
 @app1.errorhandler(UnprocessableEntity)
 def validation_error_handler(exc):
-    """Return JSON instead of HTML for HTTP errors."""
+    """Return JSON instead of HTML for UnprocessableEntity errors."""
     response = exc.get_response()
     exc_code_desc = exc.description.split("-")
     exc_code = int(exc_code_desc[0])
@@ -143,7 +136,7 @@ def validation_error_handler(exc):
 
 @app1.errorhandler(InternalServerError)
 def internal_server_error_handler(exc):
-    """Return JSON instead of HTML for HTTP errors."""
+    """Return JSON instead of HTML for InternalServerError."""
     response = exc.get_response()
     response.data = json.dumps({
         "code": 500,
@@ -152,35 +145,29 @@ def internal_server_error_handler(exc):
     response.content_type = "application/json"
     return response
 
-# Ensure that log directories exist and are writable
-log_dir = '/home/user/logs'  # Update to a directory inside user's home directory
-if not os.path.exists(log_dir):
-    os.makedirs(log_dir, exist_ok=True)
-    logging.info(f"Created log directory at: {log_dir}")
-else:
-    logging.info(f"Log directory already exists: {log_dir}")
-
-# Configure basic logging
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
+# Ensure application starts with waitress in production
+if __name__ == "__main__":
+    # Ensure environment variables are set and log them
+    logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
-# Debugging: log environment variables
-logging.info(f"PORT: {os.getenv('PORT', 'Not Set')}")
-logging.info(f"THREADS: {os.getenv('THREADS', 'Not Set')}")
-logging.info(f"CONNECTION_LIMIT: {os.getenv('CONNECTION_LIMIT', 'Not Set')}")
-logging.info(f"CHANNEL_TIMEOUT: {os.getenv('CHANNEL_TIMEOUT', 'Not Set')}")
+    logging.info(f"PORT: {os.getenv('PORT', 7860)}")  # Default to 7860 if not set
+    logging.info(f"THREADS: {os.getenv('THREADS', 6)}")
+    logging.info(f"CONNECTION_LIMIT: {os.getenv('CONNECTION_LIMIT', 500)}")
+    logging.info(f"CHANNEL_TIMEOUT: {os.getenv('CHANNEL_TIMEOUT', 120)}")
 
-# Use Waitress for production server, or Flask for development
-if __name__ == "__main__":
     try:
-        logging.info("Starting Flask application...")
-        port = int(os.getenv("PORT", 7860))  # Default to 7860 if PORT is not set
-        logging.info(f"Flask app is starting on port {port}...")
-        serve(app1, host="0.0.0.0", port=port, threads=int(os.getenv('THREADS', 6)),
-              connection_limit=int(os.getenv('CONNECTION_LIMIT', 500)), 
+        # Get port from environment or default to 7860
+        port = int(os.getenv("PORT", 7860))
+
+        logging.info(f"Starting the application with Waitress on port {port}...")
+        # Start the server using waitress (production WSGI server)
+        serve(app1, host='0.0.0.0', port=port,
+              threads=int(os.getenv('THREADS', 6)),
+              connection_limit=int(os.getenv('CONNECTION_LIMIT', 500)),
               channel_timeout=int(os.getenv('CHANNEL_TIMEOUT', 120)))
     except Exception as e:
-        logging.error(f"Error starting Flask application with Waitress: {e}")
-        raise
+        logging.error(f"Error starting the application: {e}")
+