Fix merge conflicts and resolve circular import issues
- Resolve conflict markers in logging_config.py, main.py, app.py - Fix circular imports in story_writer services (image/audio/video generation) by using lazy imports for get_story_media_write_dir - Restore clean versions of: - sif_agents.py - tenant_provider_config.py - personalization_service.py - huggingface_provider.py - main_text_generation.py - logger_utils.py - Use setup_clean_logging() consistently across app.py and main.py - Restore verbose_mode handling in start_alwrity_backend.py
This commit is contained in:
@@ -49,12 +49,8 @@ load_dotenv(project_root / '.env') # root .env (fallback)
|
||||
load_dotenv() # CWD .env (fallback)
|
||||
|
||||
# Set up clean logging for end users
|
||||
from logging_config import configure_logging
|
||||
<<<<<<< HEAD
|
||||
configure_logging(bootstrap_source="asgi-import")
|
||||
=======
|
||||
configure_logging(mode="default", app_name="ALwrity")
|
||||
>>>>>>> pr-422
|
||||
from logging_config import setup_clean_logging
|
||||
setup_clean_logging()
|
||||
|
||||
# Import middleware
|
||||
from middleware.auth_middleware import get_current_user
|
||||
|
||||
Reference in New Issue
Block a user