update

Author: Tom Softreck

src/dialogchain/__init__.py

@@ -26,19 +26,19 @@
 from .connectors import *
 
 __all__ = [
-    'CamelRouterEngine',
-    'Processor',
-    'ExternalProcessor', 
-    'FilterProcessor',
-    'TransformProcessor',
-    'AggregateProcessor',
-    'Source',
-    'Destination',
-    'RTSPSource',
-    'TimerSource', 
-    'EmailDestination',
-    'HTTPDestination',
-    'MQTTDestination',
-    'FileDestination',
-    'LogDestination'
-]
+    "CamelRouterEngine",
+    "Processor",
+    "ExternalProcessor",
+    "FilterProcessor",
+    "TransformProcessor",
+    "AggregateProcessor",
+    "Source",
+    "Destination",
+    "RTSPSource",
+    "TimerSource",
+    "EmailDestination",
+    "HTTPDestination",
+    "MQTTDestination",
+    "FileDestination",
+    "LogDestination",
+]

src/dialogchain/cli.py

@@ -18,11 +18,13 @@ def cli():
 
 
 @cli.command()
-@click.option('--config', '-c', required=True, help='Path to YAML configuration file')
-@click.option('--env-file', '-e', default='.env', help='Path to .env file')
-@click.option('--route', '-r', help='Run specific route only')
-@click.option('--dry-run', is_flag=True, help='Show what would be executed without running')
-@click.option('--verbose', '-v', is_flag=True, help='Verbose output')
+@click.option("--config", "-c", required=True, help="Path to YAML configuration file")
+@click.option("--env-file", "-e", default=".env", help="Path to .env file")
+@click.option("--route", "-r", help="Run specific route only")
+@click.option(
+    "--dry-run", is_flag=True, help="Show what would be executed without running"
+)
+@click.option("--verbose", "-v", is_flag=True, help="Verbose output")
 def run(config, env_file, route, dry_run, verbose):
     """Run routes from configuration file"""
 
@@ -34,7 +36,7 @@ def run(config, env_file, route, dry_run, verbose):
 
     # Load and validate config
     try:
-        with open(config, 'r') as f:
+        with open(config, "r") as f:
             config_data = yaml.safe_load(f)
     except Exception as e:
         click.echo(f"❌ Error loading config: {e}", err=True)
@@ -67,94 +69,103 @@ def update_env_file(env_path, required_vars):
     env_path = Path(env_path)
     existing_vars = set()
     env_lines = []
-    
+
     # Read existing .env file if it exists
     if env_path.exists():
-        with open(env_path, 'r') as f:
+        with open(env_path, "r") as f:
             for line in f:
                 line = line.strip()
-                if line and not line.startswith('#'):
-                    var_name = line.split('=')[0].strip()
+                if line and not line.startswith("#"):
+                    var_name = line.split("=")[0].strip()
                     existing_vars.add(var_name)
                     env_lines.append(f"{line}\n")
                 else:
                     env_lines.append(f"{line}\n" if line else "\n")
-    
+
     # Add missing variables
     added_vars = []
     for var in sorted(required_vars):
         if var not in existing_vars:
             env_lines.append(f"{var}=\n")
             added_vars.append(var)
-    
+
     # Write back to .env file
     if added_vars:
-        with open(env_path, 'w') as f:
+        with open(env_path, "w") as f:
             f.writelines(env_lines)
-    
+
     return added_vars
 
+
 def extract_env_vars(template_content):
     """Extract environment variables from template content."""
     import re
+
     # Find all {{VARIABLE}} patterns
-    pattern = r'{{\s*([A-Z0-9_]+)\s*}}'
+    pattern = r"{{\s*([A-Z0-9_]+)\s*}}"
     matches = re.findall(pattern, template_content)
-    
+
     # Also check for env_vars section in YAML
     env_vars = set(matches)
     try:
         import yaml
+
         config = yaml.safe_load(template_content)
-        if 'env_vars' in config and isinstance(config['env_vars'], list):
-            env_vars.update(var for var in config['env_vars'] if isinstance(var, str))
+        if "env_vars" in config and isinstance(config["env_vars"], list):
+            env_vars.update(var for var in config["env_vars"] if isinstance(var, str))
     except Exception:
         pass
-    
+
     return sorted(env_vars)
 
+
 @cli.command()
-@click.option('--template', '-t', type=click.Choice(['camera', 'grpc', 'email', 'full']),
-              default='camera', help='Template type to generate')
-@click.option('--output', '-o', default='routes.yaml', help='Output file name')
-@click.option('--no-env', is_flag=True, help='Skip updating .env file')
+@click.option(
+    "--template",
+    "-t",
+    type=click.Choice(["camera", "grpc", "email", "full"]),
+    default="camera",
+    help="Template type to generate",
+)
+@click.option("--output", "-o", default="routes.yaml", help="Output file name")
+@click.option("--no-env", is_flag=True, help="Skip updating .env file")
 def init(template, output, no_env):
     """Generate sample configuration file and update .env with required variables"""
     templates = {
-        'camera': get_camera_template(),
-        'grpc': get_grpc_template(),
-        'email': get_email_template(),
-        'full': get_full_template()
+        "camera": get_camera_template(),
+        "grpc": get_grpc_template(),
+        "email": get_email_template(),
+        "full": get_full_template(),
     }
 
     template_content = templates[template]
 
     # Write the configuration file
-    with open(output, 'w') as f:
+    with open(output, "w") as f:
         f.write(template_content)
 
     click.echo(f"✓ Generated {template} template in {output}")
-    
+
     # Handle .env file
     if not no_env:  # Only update .env if --no-env flag is not set
         env_vars = extract_env_vars(template_content)
         if env_vars:
-            added = update_env_file('.env', env_vars)
+            added = update_env_file(".env", env_vars)
             if added:
                 click.echo("\n✓ Added the following environment variables to .env:")
                 for var in added:
                     click.echo(f"  - {var}")
                 click.echo("\n📝 Please edit .env and set the appropriate values")
-    
+
     click.echo(f"\n📝 Edit the configuration and run: dialogchain run -c {output}")
 
 
 @cli.command()
-@click.option('--config', '-c', required=True, help='Path to YAML configuration file')
+@click.option("--config", "-c", required=True, help="Path to YAML configuration file")
 def validate(config):
     """Validate configuration file"""
     try:
-        with open(config, 'r') as f:
+        with open(config, "r") as f:
             config_data = yaml.safe_load(f)
 
         engine = CamelRouterEngine(config_data)
@@ -310,46 +321,64 @@ def main():
 
 
 @cli.command()
-@click.option('--network', '-n', default='192.168.1.0/24', 
-              help='Network to scan in CIDR notation')
-@click.option('--service', '-s', multiple=True, 
-              type=click.Choice(['rtsp', 'smtp', 'imap', 'http', 'all']),
-              help='Service types to scan for')
-@click.option('--output', '-o', type=click.Path(),
-              help='Save results to a file')
-@click.option('--timeout', '-t', type=float, default=2.0,
-              help='Timeout in seconds for each connection attempt')
-@click.option('--verbose/--quiet', default=True,
-              help='Show/hide detailed output')
-async def scan(network: str, service: List[str], output: Optional[str], 
-              timeout: float, verbose: bool):
+@click.option(
+    "--network", "-n", default="192.168.1.0/24", help="Network to scan in CIDR notation"
+)
+@click.option(
+    "--service",
+    "-s",
+    multiple=True,
+    type=click.Choice(["rtsp", "smtp", "imap", "http", "all"]),
+    help="Service types to scan for",
+)
+@click.option("--output", "-o", type=click.Path(), help="Save results to a file")
+@click.option(
+    "--timeout",
+    "-t",
+    type=float,
+    default=2.0,
+    help="Timeout in seconds for each connection attempt",
+)
+@click.option("--verbose/--quiet", default=True, help="Show/hide detailed output")
+async def scan(
+    network: str,
+    service: List[str],
+    output: Optional[str],
+    timeout: float,
+    verbose: bool,
+):
     """Scan network for common services like RTSP, SMTP, IMAP, etc."""
     try:
-        if not service or 'all' in service:
+        if not service or "all" in service:
             service_types = None
         else:
             service_types = list(service)
-        
+
         if verbose:
-            click.echo(f"🔍 Scanning network {network} for services: {service_types or 'all'}")
-        
+            click.echo(
+                f"🔍 Scanning network {network} for services: {service_types or 'all'}"
+            )
+
         scanner = NetworkScanner(timeout=timeout)
-        services = await scanner.scan_network(network=network, service_types=service_types)
-        
+        services = await scanner.scan_network(
+            network=network, service_types=service_types
+        )
+
         # Format and display results
         result = NetworkScanner.format_service_list(services)
         click.echo("\n" + result)
-        
+
         # Save to file if requested
         if output:
             output_path = Path(output)
             output_path.write_text(result)
             click.echo(f"\n✓ Results saved to {output_path}")
-            
+
     except Exception as e:
         click.echo(f"❌ Error during scan: {e}", err=True)
         if verbose:
             import traceback
+
             traceback.print_exc()
         return 1
 
@@ -359,5 +388,5 @@ def main():
     cli()
 
 
-if __name__ == '__main__':
-    main()
+if __name__ == "__main__":
+    main()