fixed pyservectl linter errors and formatting
This commit is contained in:
@@ -11,7 +11,7 @@ import yaml
|
||||
|
||||
|
||||
@click.group("config")
|
||||
def config_cmd():
|
||||
def config_cmd() -> None:
|
||||
"""
|
||||
Configuration management commands.
|
||||
|
||||
@@ -40,7 +40,7 @@ def config_cmd():
|
||||
help="Enable strict validation (warn on unknown fields)",
|
||||
)
|
||||
@click.pass_obj
|
||||
def validate_cmd(ctx, config_file: Optional[str], strict: bool):
|
||||
def validate_cmd(ctx: Any, config_file: Optional[str], strict: bool) -> None:
|
||||
"""
|
||||
Validate a configuration file.
|
||||
|
||||
@@ -146,7 +146,7 @@ def validate_cmd(ctx, config_file: Optional[str], strict: bool):
|
||||
help="Show only a specific section (e.g., server, logging)",
|
||||
)
|
||||
@click.pass_obj
|
||||
def show_cmd(ctx, config_file: Optional[str], output_format: str, section: Optional[str]):
|
||||
def show_cmd(ctx: Any, config_file: Optional[str], output_format: str, section: Optional[str]) -> None:
|
||||
"""
|
||||
Display current configuration.
|
||||
|
||||
@@ -192,7 +192,7 @@ def show_cmd(ctx, config_file: Optional[str], output_format: str, section: Optio
|
||||
elif output_format == "table":
|
||||
from rich.tree import Tree
|
||||
|
||||
def build_tree(data, tree):
|
||||
def build_tree(data: Any, tree: Any) -> None:
|
||||
if isinstance(data, dict):
|
||||
for key, value in data.items():
|
||||
if isinstance(value, (dict, list)):
|
||||
@@ -227,7 +227,7 @@ def show_cmd(ctx, config_file: Optional[str], output_format: str, section: Optio
|
||||
help="Path to configuration file",
|
||||
)
|
||||
@click.pass_obj
|
||||
def get_cmd(ctx, key: str, config_file: Optional[str]):
|
||||
def get_cmd(ctx: Any, key: str, config_file: Optional[str]) -> None:
|
||||
"""
|
||||
Get a specific configuration value.
|
||||
|
||||
@@ -291,7 +291,7 @@ def get_cmd(ctx, key: str, config_file: Optional[str]):
|
||||
help="Path to configuration file",
|
||||
)
|
||||
@click.pass_obj
|
||||
def set_cmd(ctx, key: str, value: str, config_file: Optional[str]):
|
||||
def set_cmd(ctx: Any, key: str, value: str, config_file: Optional[str]) -> None:
|
||||
"""
|
||||
Set a configuration value.
|
||||
|
||||
@@ -357,7 +357,7 @@ def set_cmd(ctx, key: str, value: str, config_file: Optional[str]):
|
||||
@config_cmd.command("diff")
|
||||
@click.argument("file1", type=click.Path(exists=True))
|
||||
@click.argument("file2", type=click.Path(exists=True))
|
||||
def diff_cmd(file1: str, file2: str):
|
||||
def diff_cmd(file1: str, file2: str) -> None:
|
||||
"""
|
||||
Compare two configuration files.
|
||||
|
||||
@@ -373,8 +373,8 @@ def diff_cmd(file1: str, file2: str):
|
||||
with open(file2) as f:
|
||||
data2 = yaml.safe_load(f)
|
||||
|
||||
def compare_dicts(d1, d2, path=""):
|
||||
differences = []
|
||||
def compare_dicts(d1: Any, d2: Any, path: str = "") -> list[tuple[str, str, Any, Any]]:
|
||||
differences: list[tuple[str, str, Any, Any]] = []
|
||||
|
||||
all_keys = set(d1.keys() if d1 else []) | set(d2.keys() if d2 else [])
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ pyserve down - Stop all services
|
||||
import signal
|
||||
import time
|
||||
from pathlib import Path
|
||||
from typing import cast
|
||||
from typing import Any, cast
|
||||
|
||||
import click
|
||||
|
||||
@@ -31,11 +31,11 @@ import click
|
||||
)
|
||||
@click.pass_obj
|
||||
def down_cmd(
|
||||
ctx,
|
||||
ctx: Any,
|
||||
timeout: int,
|
||||
volumes: bool,
|
||||
remove_orphans: bool,
|
||||
):
|
||||
) -> None:
|
||||
"""
|
||||
Stop and remove all services.
|
||||
|
||||
|
||||
@@ -5,6 +5,8 @@ pyserve health - Check health of services
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
|
||||
from typing import Any
|
||||
|
||||
import click
|
||||
|
||||
|
||||
@@ -25,7 +27,7 @@ import click
|
||||
help="Output format",
|
||||
)
|
||||
@click.pass_obj
|
||||
def health_cmd(ctx, services: tuple, timeout: int, output_format: str):
|
||||
def health_cmd(ctx: Any, services: tuple[str, ...], timeout: int, output_format: str) -> None:
|
||||
"""
|
||||
Check health of services.
|
||||
|
||||
|
||||
@@ -364,12 +364,12 @@ def get_template_content(template: str) -> str:
|
||||
)
|
||||
@click.pass_context
|
||||
def init_cmd(
|
||||
ctx,
|
||||
ctx: click.Context,
|
||||
template: str,
|
||||
output_file: str,
|
||||
force: bool,
|
||||
list_templates: bool,
|
||||
):
|
||||
) -> None:
|
||||
"""
|
||||
Initialize a new pyserve project.
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ pyserve logs - View service logs
|
||||
import asyncio
|
||||
import time
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
from typing import Any, Optional
|
||||
|
||||
import click
|
||||
|
||||
@@ -56,8 +56,8 @@ import click
|
||||
)
|
||||
@click.pass_obj
|
||||
def logs_cmd(
|
||||
ctx,
|
||||
services: tuple,
|
||||
ctx: Any,
|
||||
services: tuple[str, ...],
|
||||
follow: bool,
|
||||
tail: int,
|
||||
since: Optional[str],
|
||||
@@ -65,7 +65,7 @@ def logs_cmd(
|
||||
timestamps: bool,
|
||||
no_color: bool,
|
||||
filter_pattern: Optional[str],
|
||||
):
|
||||
) -> None:
|
||||
"""
|
||||
View service logs.
|
||||
|
||||
@@ -165,15 +165,15 @@ def _parse_time(time_str: str) -> Optional[float]:
|
||||
|
||||
|
||||
def _read_logs(
|
||||
log_files,
|
||||
service_colors,
|
||||
log_files: list[tuple[str, Path]],
|
||||
service_colors: dict[str, str],
|
||||
tail: int,
|
||||
since_time: Optional[float],
|
||||
until_time: Optional[float],
|
||||
timestamps: bool,
|
||||
no_color: bool,
|
||||
filter_pattern: Optional[str],
|
||||
):
|
||||
) -> None:
|
||||
import re
|
||||
|
||||
from ..output import console
|
||||
@@ -231,12 +231,12 @@ def _read_logs(
|
||||
|
||||
|
||||
async def _follow_logs(
|
||||
log_files,
|
||||
service_colors,
|
||||
log_files: list[tuple[str, Path]],
|
||||
service_colors: dict[str, str],
|
||||
timestamps: bool,
|
||||
no_color: bool,
|
||||
filter_pattern: Optional[str],
|
||||
):
|
||||
) -> None:
|
||||
from ..output import console
|
||||
|
||||
positions = {}
|
||||
|
||||
@@ -4,6 +4,7 @@ pyserve scale - Scale services
|
||||
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
import click
|
||||
|
||||
@@ -23,7 +24,7 @@ import click
|
||||
help="Don't wait for services to be ready",
|
||||
)
|
||||
@click.pass_obj
|
||||
def scale_cmd(ctx, scales: tuple, timeout: int, no_wait: bool):
|
||||
def scale_cmd(ctx: Any, scales: tuple[str, ...], timeout: int, no_wait: bool) -> None:
|
||||
"""
|
||||
Scale services to specified number of workers.
|
||||
|
||||
@@ -66,7 +67,7 @@ def scale_cmd(ctx, scales: tuple, timeout: int, no_wait: bool):
|
||||
|
||||
console.print("[bold]Scaling services...[/bold]")
|
||||
|
||||
async def do_scale():
|
||||
async def do_scale() -> None:
|
||||
for service, workers in scale_map.items():
|
||||
current = all_services[service].workers or 1
|
||||
print_info(f"Scaling {service}: {current} → {workers} workers")
|
||||
|
||||
@@ -5,6 +5,8 @@ pyserve start/stop/restart - Service management commands
|
||||
import asyncio
|
||||
from pathlib import Path
|
||||
|
||||
from typing import Any, Dict
|
||||
|
||||
import click
|
||||
|
||||
|
||||
@@ -18,7 +20,7 @@ import click
|
||||
help="Timeout in seconds for service startup",
|
||||
)
|
||||
@click.pass_obj
|
||||
def start_cmd(ctx, services: tuple, timeout: int):
|
||||
def start_cmd(ctx: Any, services: tuple[str, ...], timeout: int) -> None:
|
||||
"""
|
||||
Start one or more services.
|
||||
|
||||
@@ -43,8 +45,8 @@ def start_cmd(ctx, services: tuple, timeout: int):
|
||||
|
||||
console.print(f"[bold]Starting services: {', '.join(services)}[/bold]")
|
||||
|
||||
async def do_start():
|
||||
results = {}
|
||||
async def do_start() -> Dict[str, bool]:
|
||||
results: Dict[str, bool] = {}
|
||||
for service in services:
|
||||
try:
|
||||
success = await runner.start_service(service, timeout=timeout)
|
||||
@@ -83,7 +85,7 @@ def start_cmd(ctx, services: tuple, timeout: int):
|
||||
help="Force stop (SIGKILL)",
|
||||
)
|
||||
@click.pass_obj
|
||||
def stop_cmd(ctx, services: tuple, timeout: int, force: bool):
|
||||
def stop_cmd(ctx: Any, services: tuple[str, ...], timeout: int, force: bool) -> None:
|
||||
"""
|
||||
Stop one or more services.
|
||||
|
||||
@@ -106,8 +108,8 @@ def stop_cmd(ctx, services: tuple, timeout: int, force: bool):
|
||||
|
||||
console.print(f"[bold]Stopping services: {', '.join(services)}[/bold]")
|
||||
|
||||
async def do_stop():
|
||||
results = {}
|
||||
async def do_stop() -> Dict[str, bool]:
|
||||
results: Dict[str, bool] = {}
|
||||
for service in services:
|
||||
try:
|
||||
success = await runner.stop_service(service, timeout=timeout, force=force)
|
||||
@@ -140,7 +142,7 @@ def stop_cmd(ctx, services: tuple, timeout: int, force: bool):
|
||||
help="Timeout in seconds for restart",
|
||||
)
|
||||
@click.pass_obj
|
||||
def restart_cmd(ctx, services: tuple, timeout: int):
|
||||
def restart_cmd(ctx: Any, services: tuple[str, ...], timeout: int) -> None:
|
||||
"""
|
||||
Restart one or more services.
|
||||
|
||||
@@ -165,7 +167,7 @@ def restart_cmd(ctx, services: tuple, timeout: int):
|
||||
|
||||
console.print(f"[bold]Restarting services: {', '.join(services)}[/bold]")
|
||||
|
||||
async def do_restart():
|
||||
async def do_restart() -> Dict[str, bool]:
|
||||
results = {}
|
||||
for service in services:
|
||||
try:
|
||||
|
||||
@@ -4,7 +4,7 @@ pyserve ps / status - Show service status
|
||||
|
||||
import json
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
from typing import Any, Optional
|
||||
|
||||
import click
|
||||
|
||||
@@ -39,13 +39,13 @@ import click
|
||||
)
|
||||
@click.pass_obj
|
||||
def ps_cmd(
|
||||
ctx,
|
||||
services: tuple,
|
||||
ctx: Any,
|
||||
services: tuple[str, ...],
|
||||
show_all: bool,
|
||||
quiet: bool,
|
||||
output_format: str,
|
||||
filter_status: Optional[str],
|
||||
):
|
||||
) -> None:
|
||||
"""
|
||||
Show status of services.
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ pyserve top - Live monitoring dashboard
|
||||
import asyncio
|
||||
import time
|
||||
from pathlib import Path
|
||||
from typing import Optional
|
||||
from typing import Any, Optional
|
||||
|
||||
import click
|
||||
|
||||
@@ -25,7 +25,7 @@ import click
|
||||
help="Disable colored output",
|
||||
)
|
||||
@click.pass_obj
|
||||
def top_cmd(ctx, services: tuple, refresh_interval: float, no_color: bool):
|
||||
def top_cmd(ctx: Any, services: tuple[str, ...], refresh_interval: float, no_color: bool) -> None:
|
||||
"""
|
||||
Live monitoring dashboard for services.
|
||||
|
||||
@@ -60,11 +60,11 @@ def top_cmd(ctx, services: tuple, refresh_interval: float, no_color: bool):
|
||||
|
||||
|
||||
async def _run_dashboard(
|
||||
state_manager,
|
||||
filter_services: Optional[list],
|
||||
state_manager: Any,
|
||||
filter_services: Optional[list[str]],
|
||||
refresh_interval: float,
|
||||
no_color: bool,
|
||||
):
|
||||
) -> None:
|
||||
from rich.layout import Layout
|
||||
from rich.live import Live
|
||||
from rich.panel import Panel
|
||||
@@ -81,7 +81,7 @@ async def _run_dashboard(
|
||||
|
||||
start_time = time.time()
|
||||
|
||||
def make_dashboard():
|
||||
def make_dashboard() -> Any:
|
||||
all_services = state_manager.get_all_services()
|
||||
|
||||
if filter_services:
|
||||
|
||||
@@ -7,6 +7,7 @@ import signal
|
||||
import sys
|
||||
import time
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
import click
|
||||
|
||||
@@ -54,16 +55,16 @@ import click
|
||||
)
|
||||
@click.pass_obj
|
||||
def up_cmd(
|
||||
ctx,
|
||||
services: tuple,
|
||||
ctx: Any,
|
||||
services: tuple[str, ...],
|
||||
detach: bool,
|
||||
build: bool,
|
||||
force_recreate: bool,
|
||||
scales: tuple,
|
||||
scales: tuple[str, ...],
|
||||
timeout: int,
|
||||
wait: bool,
|
||||
remove_orphans: bool,
|
||||
):
|
||||
) -> None:
|
||||
"""
|
||||
Start services defined in configuration.
|
||||
|
||||
@@ -147,7 +148,7 @@ def up_cmd(
|
||||
else:
|
||||
console.print("[bold]Starting PyServe...[/bold]")
|
||||
|
||||
def signal_handler(signum, frame):
|
||||
def signal_handler(signum: int, frame: Any) -> None:
|
||||
console.print("\n[yellow]Received shutdown signal...[/yellow]")
|
||||
runner.stop()
|
||||
sys.exit(0)
|
||||
|
||||
Reference in New Issue
Block a user