update

Author: Tom Softreck

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dialogchain"
-version = "0.1.16"
+version = "0.1.17"
 description = "DialogChain - A flexible and extensible dialog processing framework"
 authors = ["Tom Sapletta <info@softreck.dev>"]
 readme = "README.md"

src/dialogchain/__init__.py

@@ -17,77 +17,94 @@
     dialogchain validate -c config.yaml
 """
 
+import logging
+from typing import Dict, Any, Optional, Type, List, Union
+
 __version__ = "0.2.0"
 __author__ = "DialogChain Team"
 
-# Core components
-from .core.engine import DialogChainEngine
+# Import core components
+from .engine import (
+    DialogChainEngine,
+    Route,
+    RouteConfig,
+    ProcessorManager,
+    ProcessorConfig,
+    ConnectorManager,
+    default_connector_manager,
+    parse_uri,
+    merge_dicts,
+    get_nested_value,
+    set_nested_value,
+    deep_update,
+    format_template
+)
 
-# Processors
+# Import processors
 from .processors import (
-    Processor, 
+    Processor,
     TransformProcessor,
     FilterProcessor,
-    EnrichProcessor,
-    ValidateProcessor
+    ExternalProcessor,
+    AggregateProcessor,
+    DebugProcessor,
+    create_processor,
 )
 
-# Sources
-from .sources import (
+# Import connectors
+from .connectors import (
     Source,
-    TimerSource,
-    FileSource,
-    IMAPSource,
-    RTSPSource,
-    GRPCSource
-)
-
-# Destinations
-from .destinations import (
     Destination,
-    LogDestination,
-    FileDestination,
+    RTSPSource,
+    FileSource,
     HTTPDestination,
+    FileDestination,
+    IMAPSource,
+    TimerSource,
     EmailDestination,
-    MQTTDestination,
-    GRPCDestination
+    LogDestination,
 )
 
-# Utils and exceptions
-from . import utils
-from .exceptions import *
+# For backward compatibility
+ProcessorType = Type[Processor]
 
 __all__ = [
-    # Core components
-    "DialogChainEngine",
+    # Core
+    'DialogChainEngine',
+    'Route',
+    'RouteConfig',
+    'ProcessorManager',
+    'ProcessorConfig',
+    'ConnectorManager',
+    'default_connector_manager',
+    'parse_uri',
+    'merge_dicts',
+    'get_nested_value',
+    'set_nested_value',
+    'deep_update',
+    'format_template',
 
     # Processors
-    "Processor",
-    "TransformProcessor",
-    "FilterProcessor",
-    "EnrichProcessor",
-    "ValidateProcessor",
-    
-    # Sources
-    "Source",
-    "TimerSource",
-    "FileSource",
-    "IMAPSource",
-    "RTSPSource",
-    "GRPCSource",
-    
-    # Destinations
-    "Destination",
-    "LogDestination",
-    "FileDestination",
-    "HTTPDestination",
-    "EmailDestination",
-    "MQTTDestination",
-    "GRPCDestination",
-    
-    # Utils
-    "utils",
+    'Processor',
+    'TransformProcessor',
+    'FilterProcessor',
+    'ExternalProcessor',
+    'AggregateProcessor',
+    'DebugProcessor',
+    'create_processor',
+    'ProcessorType',
 
+    # Connectors
+    'Source',
+    'Destination',
+    'RTSPSource',
+    'FileSource',
+    'HTTPDestination',
+    'FileDestination',
+    'IMAPSource',
+    'TimerSource',
+    'EmailDestination',
+    'LogDestination',
     # Exceptions
     "DialogChainError",
     "ConfigurationError",

src/dialogchain/connectors/__init__.py

@@ -1,5 +1,9 @@
 """Connectors for DialogChain data sources and destinations."""
 
+class ConnectorError(Exception):
+    """Base exception for all connector-related errors."""
+    pass
+
 from .base import Source, Destination
 from .sources.rtsp import RTSPSource
 from .sources.imap import IMAPSource
@@ -12,6 +16,7 @@
 
 # Re-export for backward compatibility
 __all__ = [
+    'ConnectorError',
     'Source',
     'Destination',
     'RTSPSource',

src/dialogchain/connectors/destinations/email.py

@@ -11,7 +11,7 @@
 from typing import Any, Dict, List, Optional, Union, BinaryIO
 from pathlib import Path
 
-from ....exceptions import DestinationError
+from ...exceptions import DestinationError
 from ..base import Destination
 
 logger = logging.getLogger(__name__)

src/dialogchain/connectors/destinations/file.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import Any, Dict, Optional, Union, BinaryIO, TextIO
 
-from ....exceptions import DestinationError
+from ...exceptions import DestinationError
 from ..base import Destination
 
 logger = logging.getLogger(__name__)

src/dialogchain/connectors/destinations/http.py

@@ -7,7 +7,7 @@
 from typing import Any, Dict, Optional, Union
 from urllib.parse import urlparse, parse_qs
 
-from ....exceptions import DestinationError
+from ...exceptions import DestinationError
 from ..base import Destination
 
 logger = logging.getLogger(__name__)

src/dialogchain/connectors/destinations/log.py

@@ -4,7 +4,7 @@
 import json
 from typing import Any, Dict, Optional, Union
 
-from ....exceptions import DestinationError
+from ...exceptions import DestinationError
 from ..base import Destination
 
 logger = logging.getLogger(__name__)

src/dialogchain/connectors/sources/timer.py

@@ -4,7 +4,7 @@
 import logging
 import time
 from datetime import datetime, timedelta
-from typing import Dict, Any, AsyncIterator, Union
+from typing import Dict, Any, AsyncIterator, Union, Optional
 
 from ..base import Source
 

src/dialogchain/core/__init__.py

@@ -1,8 +1,30 @@
-"""Core functionality for DialogChain processing engine."""
+"""
+DEPRECATED: This module is deprecated and will be removed in a future version.
+Please update your imports to use the new module locations:
 
-from .engine import DialogChainEngine
-from .routes import Route, RouteConfig
-from .tasks import TaskManager
+- dialogchain.engine (for DialogChainEngine, Route, RouteConfig)
+- dialogchain.engine.processor (for TaskManager)
+"""
+
+import warnings
+
+# Import from new locations with deprecation warnings
+warnings.warn(
+    "The 'dialogchain.core' module is deprecated. "
+    "Please update your imports to use 'dialogchain.engine' instead.",
+    DeprecationWarning,
+    stacklevel=2
+)
+
+# Re-export for backward compatibility
+try:
+    from ..engine import DialogChainEngine, Route, RouteConfig
+    from ..engine.processor import ProcessorManager as TaskManager
+except ImportError as e:
+    raise ImportError(
+        "Failed to import from new module locations. "
+        "Please update your code to use 'dialogchain.engine' directly."
+    ) from e
 
 __all__ = [
     'DialogChainEngine',