forked from genewildish/Mainline
style: Fix linting errors and organize imports
This commit is contained in:
@@ -10,12 +10,18 @@ from engine.display import BorderMode, DisplayRegistry
|
|||||||
from engine.effects import get_registry
|
from engine.effects import get_registry
|
||||||
from engine.fetch import fetch_all, fetch_all_fast, fetch_poetry, load_cache, save_cache
|
from engine.fetch import fetch_all, fetch_all_fast, fetch_poetry, load_cache, save_cache
|
||||||
|
|
||||||
|
# Import from engine (Mainline-specific)
|
||||||
|
from engine.pipeline import list_presets
|
||||||
|
|
||||||
|
# Import from engine (Mainline-specific)
|
||||||
|
from engine.pipeline.ui import UIConfig, UIPanel
|
||||||
|
from engine.pipeline.validation import validate_pipeline_config
|
||||||
|
|
||||||
# Import from sideline (the framework)
|
# Import from sideline (the framework)
|
||||||
from sideline.pipeline import (
|
from sideline.pipeline import (
|
||||||
Pipeline,
|
Pipeline,
|
||||||
PipelineConfig,
|
PipelineConfig,
|
||||||
PipelineContext,
|
PipelineContext,
|
||||||
StageRegistry,
|
|
||||||
)
|
)
|
||||||
from sideline.pipeline.adapters import (
|
from sideline.pipeline.adapters import (
|
||||||
CameraStage,
|
CameraStage,
|
||||||
@@ -26,10 +32,6 @@ from sideline.pipeline.adapters import (
|
|||||||
)
|
)
|
||||||
from sideline.pipeline.params import PipelineParams
|
from sideline.pipeline.params import PipelineParams
|
||||||
|
|
||||||
# Import from engine (Mainline-specific)
|
|
||||||
from engine.pipeline.ui import UIConfig, UIPanel
|
|
||||||
from engine.pipeline.validation import validate_pipeline_config
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from engine.display.backends.websocket import WebSocketDisplay
|
from engine.display.backends.websocket import WebSocketDisplay
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|||||||
@@ -9,28 +9,6 @@ Note: This module is deprecated and will be removed in future versions.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
# Re-export from sideline for backward compatibility
|
# Re-export from sideline for backward compatibility
|
||||||
from sideline.pipeline import (
|
|
||||||
Pipeline,
|
|
||||||
PipelineConfig,
|
|
||||||
PipelineContext,
|
|
||||||
Stage,
|
|
||||||
StageConfig,
|
|
||||||
StageError,
|
|
||||||
StageResult,
|
|
||||||
PipelineParams,
|
|
||||||
StageRegistry,
|
|
||||||
discover_stages,
|
|
||||||
register_camera,
|
|
||||||
register_display,
|
|
||||||
register_effect,
|
|
||||||
register_source,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Also re-export from sideline.core for compatibility
|
|
||||||
from sideline.pipeline.core import (
|
|
||||||
DataType,
|
|
||||||
)
|
|
||||||
|
|
||||||
# Re-export from engine.pipeline.presets (Mainline-specific)
|
# Re-export from engine.pipeline.presets (Mainline-specific)
|
||||||
from engine.pipeline.presets import (
|
from engine.pipeline.presets import (
|
||||||
DEMO_PRESET,
|
DEMO_PRESET,
|
||||||
@@ -45,6 +23,32 @@ from engine.pipeline.presets import (
|
|||||||
list_presets,
|
list_presets,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Re-export additional functions from sideline.pipeline
|
||||||
|
from sideline.pipeline import (
|
||||||
|
Pipeline,
|
||||||
|
PipelineConfig,
|
||||||
|
PipelineContext,
|
||||||
|
PipelineParams,
|
||||||
|
PipelineRunner,
|
||||||
|
Stage,
|
||||||
|
StageConfig,
|
||||||
|
StageError,
|
||||||
|
StageRegistry,
|
||||||
|
StageResult,
|
||||||
|
create_default_pipeline,
|
||||||
|
create_pipeline_from_params,
|
||||||
|
discover_stages,
|
||||||
|
register_camera,
|
||||||
|
register_display,
|
||||||
|
register_effect,
|
||||||
|
register_source,
|
||||||
|
)
|
||||||
|
|
||||||
|
# Also re-export from sideline.core for compatibility
|
||||||
|
from sideline.pipeline.core import (
|
||||||
|
DataType,
|
||||||
|
)
|
||||||
|
|
||||||
# Re-export from sideline.pipeline.params
|
# Re-export from sideline.pipeline.params
|
||||||
from sideline.pipeline.params import (
|
from sideline.pipeline.params import (
|
||||||
DEFAULT_HEADLINE_PARAMS,
|
DEFAULT_HEADLINE_PARAMS,
|
||||||
@@ -52,13 +56,6 @@ from sideline.pipeline.params import (
|
|||||||
DEFAULT_PYGAME_PARAMS,
|
DEFAULT_PYGAME_PARAMS,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Re-export additional functions from sideline.pipeline
|
|
||||||
from sideline.pipeline import (
|
|
||||||
create_default_pipeline,
|
|
||||||
create_pipeline_from_params,
|
|
||||||
PipelineRunner,
|
|
||||||
)
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
# Core (from sideline)
|
# Core (from sideline)
|
||||||
"Stage",
|
"Stage",
|
||||||
|
|||||||
@@ -38,10 +38,10 @@ def register_stages(registry):
|
|||||||
def _register_data_sources(registry):
|
def _register_data_sources(registry):
|
||||||
"""Register Mainline data source stages."""
|
"""Register Mainline data source stages."""
|
||||||
try:
|
try:
|
||||||
from engine.data_sources.sources import HeadlinesDataSource, PoetryDataSource
|
|
||||||
from engine.data_sources.pipeline_introspection import (
|
from engine.data_sources.pipeline_introspection import (
|
||||||
PipelineIntrospectionSource,
|
PipelineIntrospectionSource,
|
||||||
)
|
)
|
||||||
|
from engine.data_sources.sources import HeadlinesDataSource, PoetryDataSource
|
||||||
|
|
||||||
registry.register("source", HeadlinesDataSource)
|
registry.register("source", HeadlinesDataSource)
|
||||||
registry.register("source", PoetryDataSource)
|
registry.register("source", PoetryDataSource)
|
||||||
@@ -60,13 +60,6 @@ def _register_data_sources(registry):
|
|||||||
def _register_effects(registry):
|
def _register_effects(registry):
|
||||||
"""Register Mainline effect stages."""
|
"""Register Mainline effect stages."""
|
||||||
try:
|
try:
|
||||||
# Register effects
|
|
||||||
from sideline.effects import EffectRegistry
|
|
||||||
from sideline.effects.registry import get_registry
|
|
||||||
|
|
||||||
# Get the global effect registry instance
|
|
||||||
effect_registry = get_registry()
|
|
||||||
|
|
||||||
# Note: EffectRegistry stores effect instances, not classes
|
# Note: EffectRegistry stores effect instances, not classes
|
||||||
# For now, skip effect registration since it requires more refactoring
|
# For now, skip effect registration since it requires more refactoring
|
||||||
logger.info("Effect registration skipped (requires effect refactoring)")
|
logger.info("Effect registration skipped (requires effect refactoring)")
|
||||||
|
|||||||
Reference in New Issue
Block a user