Skip to content

Commit ef1270d

Browse files
committed
resolve merge conflicts
1 parent 092a935 commit ef1270d

1 file changed

Lines changed: 1 addition & 22 deletions

File tree

‎backend/app.py‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from flask_socketio import SocketIO, emit
1212
from flask_jwt_extended import (
1313
JWTManager, create_access_token, jwt_required,
14-
get_jwt_identity, set_access_cookies, unset_jwt_cookies
14+
get_jwt_identity, set_access_cookies, unset_jwt_cookiesS
1515
)
1616
from flask_limiter import Limiter
1717
from flask_limiter.errors import RateLimitExceeded
@@ -31,16 +31,8 @@
3131

3232
import logging
3333
from datetime import datetime, timedelta, timezone
34-
<<<<<<< bug/Refactor-Backend-Imports-to-Support-Consistent-Execution
35-
import sys
36-
import os
37-
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
38-
from backend.sanitizer import sanitize_payload
39-
from backend.reader_identity.routes import reader_identity_bp
40-
=======
4134
from backend.core.security.sanitizer import sanitize_payload
4235
from reader_identity.routes import reader_identity_bp
43-
>>>>>>> main
4436

4537
# Load environment variables from config directory based on APP_ENV
4638
env = os.getenv('APP_ENV', 'development')
@@ -54,21 +46,12 @@
5446
load_dotenv()
5547

5648
# Environment variables are now loaded centrally in backend/config.py
57-
<<<<<<< bug/Refactor-Backend-Imports-to-Support-Consistent-Execution
58-
from backend.config import app_config, setup_logging, validate_required_env_vars
59-
from backend.ai_service import generate_book_note, get_ai_recommendations, get_category_books, get_book_mood_tags_safe, generate_chat_response, llm_service
60-
from backend.models import db, User, Book, ShelfItem, BookNote, ReadingGoal, ReadingStats, Collection, CollectionItem, PriceHistory, PriceAlert, Review, register_user, login_user
61-
from backend.price_tracker.price_tracker import get_price_tracker
62-
from backend.cache_service import cache_service
63-
from backend.validators import (
64-
=======
6549
from config import app_config, setup_logging, validate_required_env_vars
6650
from ai_service import generate_book_note, get_ai_recommendations, get_category_books, get_book_mood_tags_safe, generate_chat_response, generate_chat_response_stream, llm_service, get_vibe_recommendations
6751
from models import db, User, Book, ShelfItem, BookNote, ReadingGoal, ReadingStats, Collection, CollectionItem, PriceHistory, PriceAlert, Review, register_user, login_user
6852
from price_tracker import get_price_tracker
6953
from cache_service import cache_service
7054
from backend.core.validators.validators import (
71-
>>>>>>> main
7255
validate_request,
7356
validate_schema,
7457
validate_google_books_id,
@@ -112,11 +95,7 @@
11295
from collections import defaultdict, deque
11396
from math import ceil
11497
from time import time
115-
<<<<<<< bug/Refactor-Backend-Imports-to-Support-Consistent-Execution
116-
from backend.error_responses import (
117-
=======
11898
from backend.core.responses.error_responses import (
119-
>>>>>>> main
12099
ErrorCodes, error_response, success_response,
121100
validation_error, missing_fields_error, invalid_json_error,
122101
auth_error, forbidden_error, unauthorized_access_error,

0 commit comments

Comments
 (0)