starrocks-br 0.4.0__tar.gz → 0.5.1__tar.gz

{starrocks_br-0.4.0 → starrocks_br-0.5.1}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: starrocks-br
-Version: 0.4.0
+Version: 0.5.1
 Summary: StarRocks Backup and Restore automation tool
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: click<9,>=8.1.7
 Requires-Dist: PyYAML<7,>=6.0.1
@@ -12,6 +12,7 @@ Requires-Dist: pytest<9,>=8.3.2; extra == "dev"
 Requires-Dist: pytest-mock<4,>=3.14.0; extra == "dev"
 Requires-Dist: pytest-cov<6,>=5.0.0; extra == "dev"
 Requires-Dist: ruff<1,>=0.8.0; extra == "dev"
+Requires-Dist: pre-commit<5,>=4.0.0; extra == "dev"
 
 # StarRocks Backup & Restore
 

{starrocks_br-0.4.0 → starrocks_br-0.5.1}/pyproject.toml

@@ -4,10 +4,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "starrocks-br"
-version = "0.4.0"
+version = "0.5.1"
 description = "StarRocks Backup and Restore automation tool"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 dependencies = [
     "click>=8.1.7,<9",
     "PyYAML>=6.0.1,<7",
@@ -20,6 +20,7 @@ dev = [
     "pytest-mock>=3.14.0,<4",
     "pytest-cov>=5.0.0,<6",
     "ruff>=0.8.0,<1",
+    "pre-commit>=4.0.0,<5",
 ]
 
 [project.scripts]
@@ -47,7 +48,7 @@ line-length = 100
 
 [tool.ruff]
 line-length = 100
-target-version = "py39"
+target-version = "py310"
 
 [tool.ruff.lint]
 select = [

{starrocks_br-0.4.0 → starrocks_br-0.5.1}/src/starrocks_br/cli.py

@@ -6,6 +6,8 @@ import click
 from . import (
     concurrency,
     db,
+    error_handler,
+    exceptions,
     executor,
     health,
     labels,
@@ -63,9 +65,20 @@ def _handle_snapshot_exists_error(
 
 
 @click.group()
-def cli():
+@click.option("--verbose", is_flag=True, help="Enable verbose debug logging")
+@click.pass_context
+def cli(ctx, verbose):
     """StarRocks Backup & Restore automation tool."""
-    pass
+    ctx.ensure_object(dict)
+    ctx.obj["verbose"] = verbose
+
+    if verbose:
+        import logging
+
+        logger.setup_logging(level=logging.DEBUG)
+        logger.debug("Verbose logging enabled")
+    else:
+        logger.setup_logging()
 
 
 @cli.command("init")
@@ -112,11 +125,14 @@ def init(config):
                 "   starrocks-br backup incremental --group my_daily_incremental --config config.yaml"
             )
 
-    except FileNotFoundError as e:
-        logger.error(f"Config file not found: {e}")
+    except exceptions.ConfigFileNotFoundError as e:
+        error_handler.handle_config_file_not_found_error(e)
         sys.exit(1)
-    except ValueError as e:
-        logger.error(f"Configuration error: {e}")
+    except exceptions.ConfigValidationError as e:
+        error_handler.handle_config_validation_error(e, config)
+        sys.exit(1)
+    except FileNotFoundError as e:
+        error_handler.handle_config_file_not_found_error(exceptions.ConfigFileNotFoundError(str(e)))
         sys.exit(1)
     except Exception as e:
         logger.error(f"Failed to initialize schema: {e}")
@@ -262,14 +278,26 @@ def backup_incremental(config, baseline_backup, group, name):
                 logger.error(f"{result['error_message']}")
                 sys.exit(1)
 
+    except exceptions.ConcurrencyConflictError as e:
+        error_handler.handle_concurrency_conflict_error(e, config)
+        sys.exit(1)
+    except exceptions.BackupLabelNotFoundError as e:
+        error_handler.handle_backup_label_not_found_error(e, config)
+        sys.exit(1)
+    except exceptions.NoFullBackupFoundError as e:
+        error_handler.handle_no_full_backup_found_error(e, config, group)
+        sys.exit(1)
+    except exceptions.ConfigFileNotFoundError as e:
+        error_handler.handle_config_file_not_found_error(e)
+        sys.exit(1)
+    except exceptions.ConfigValidationError as e:
+        error_handler.handle_config_validation_error(e, config)
+        sys.exit(1)
     except FileNotFoundError as e:
-        logger.error(f"Config file not found: {e}")
+        error_handler.handle_config_file_not_found_error(exceptions.ConfigFileNotFoundError(str(e)))
         sys.exit(1)
     except ValueError as e:
-        logger.error(f"Configuration error: {e}")
-        sys.exit(1)
-    except RuntimeError as e:
-        logger.error(f"{e}")
+        logger.error(f"Error: {e}")
         sys.exit(1)
     except Exception as e:
         logger.error(f"Unexpected error: {e}")
@@ -381,15 +409,23 @@ def backup_full(config, group, name):
                 logger.error(f"{result['error_message']}")
                 sys.exit(1)
 
-    except (FileNotFoundError, ValueError, RuntimeError, Exception) as e:
-        if isinstance(e, FileNotFoundError):
-            logger.error(f"Config file not found: {e}")
-        elif isinstance(e, ValueError):
-            logger.error(f"Configuration error: {e}")
-        elif isinstance(e, RuntimeError):
-            logger.error(f"{e}")
-        else:
-            logger.error(f"Unexpected error: {e}")
+    except exceptions.ConcurrencyConflictError as e:
+        error_handler.handle_concurrency_conflict_error(e, config)
+        sys.exit(1)
+    except exceptions.ConfigFileNotFoundError as e:
+        error_handler.handle_config_file_not_found_error(e)
+        sys.exit(1)
+    except exceptions.ConfigValidationError as e:
+        error_handler.handle_config_validation_error(e, config)
+        sys.exit(1)
+    except FileNotFoundError as e:
+        error_handler.handle_config_file_not_found_error(exceptions.ConfigFileNotFoundError(str(e)))
+        sys.exit(1)
+    except ValueError as e:
+        logger.error(f"Error: {e}")
+        sys.exit(1)
+    except Exception as e:
+        logger.error(f"Unexpected error: {e}")
         sys.exit(1)
 
 
@@ -429,14 +465,13 @@ def restore_command(config, target_label, group, table, rename_suffix, yes):
         if table:
             table = table.strip()
             if not table:
-                logger.error("Table name cannot be empty")
-                sys.exit(1)
+                raise exceptions.InvalidTableNameError("", "Table name cannot be empty")
 
             if "." in table:
-                logger.error(
-                    "Table name must not include database prefix. Use 'table_name' not 'database.table_name'. Database comes from config file."
+                raise exceptions.InvalidTableNameError(
+                    table,
+                    "Table name must not include database prefix. Use 'table_name' not 'database.table_name'",
                 )
-                sys.exit(1)
 
         cfg = config_module.load_config(config)
         config_module.validate_config(cfg)
@@ -472,39 +507,21 @@ def restore_command(config, target_label, group, table, rename_suffix, yes):
 
             logger.info(f"Finding restore sequence for target backup: {target_label}")
 
-            try:
-                restore_pair = restore.find_restore_pair(database, target_label)
-                logger.success(f"Found restore sequence: {' -> '.join(restore_pair)}")
-            except ValueError as e:
-                logger.error(f"Failed to find restore sequence: {e}")
-                sys.exit(1)
+            restore_pair = restore.find_restore_pair(database, target_label)
+            logger.success(f"Found restore sequence: {' -> '.join(restore_pair)}")
 
             logger.info("Determining tables to restore from backup manifest...")
 
-            try:
-                tables_to_restore = restore.get_tables_from_backup(
-                    database,
-                    target_label,
-                    group=group,
-                    table=table,
-                    database=cfg["database"] if table else None,
-                )
-            except ValueError as e:
-                logger.error(str(e))
-                sys.exit(1)
+            tables_to_restore = restore.get_tables_from_backup(
+                database,
+                target_label,
+                group=group,
+                table=table,
+                database=cfg["database"] if table else None,
+            )
 
             if not tables_to_restore:
-                if group:
-                    logger.warning(
-                        f"No tables found in backup '{target_label}' for group '{group}'"
-                    )
-                elif table:
-                    logger.warning(
-                        f"No tables found in backup '{target_label}' for table '{table}'"
-                    )
-                else:
-                    logger.warning(f"No tables found in backup '{target_label}'")
-                sys.exit(1)
+                raise exceptions.NoTablesFoundError(group=group, label=target_label)
 
             logger.success(
                 f"Found {len(tables_to_restore)} table(s) to restore: {', '.join(tables_to_restore)}"
@@ -527,14 +544,46 @@ def restore_command(config, target_label, group, table, rename_suffix, yes):
                 logger.error(f"Restore failed: {result['error_message']}")
                 sys.exit(1)
 
+    except exceptions.InvalidTableNameError as e:
+        error_handler.handle_invalid_table_name_error(e)
+        sys.exit(1)
+    except exceptions.BackupLabelNotFoundError as e:
+        error_handler.handle_backup_label_not_found_error(e, config)
+        sys.exit(1)
+    except exceptions.NoSuccessfulFullBackupFoundError as e:
+        error_handler.handle_no_successful_full_backup_found_error(e, config)
+        sys.exit(1)
+    except exceptions.TableNotFoundInBackupError as e:
+        error_handler.handle_table_not_found_in_backup_error(e, config)
+        sys.exit(1)
+    except exceptions.NoTablesFoundError as e:
+        error_handler.handle_no_tables_found_error(e, config, target_label)
+        sys.exit(1)
+    except exceptions.SnapshotNotFoundError as e:
+        error_handler.handle_snapshot_not_found_error(e, config)
+        sys.exit(1)
+    except exceptions.RestoreOperationCancelledError:
+        error_handler.handle_restore_operation_cancelled_error()
+        sys.exit(1)
+    except exceptions.ConfigFileNotFoundError as e:
+        error_handler.handle_config_file_not_found_error(e)
+        sys.exit(1)
+    except exceptions.ConfigValidationError as e:
+        error_handler.handle_config_validation_error(e, config)
+        sys.exit(1)
+    except exceptions.ClusterHealthCheckFailedError as e:
+        error_handler.handle_cluster_health_check_failed_error(e, config)
+        sys.exit(1)
     except FileNotFoundError as e:
-        logger.error(f"Config file not found: {e}")
+        error_handler.handle_config_file_not_found_error(exceptions.ConfigFileNotFoundError(str(e)))
         sys.exit(1)
     except ValueError as e:
-        logger.error(f"Configuration error: {e}")
+        error_handler.handle_config_validation_error(
+            exceptions.ConfigValidationError(str(e)), config
+        )
         sys.exit(1)
-    except RuntimeError as e:
-        logger.error(f"{e}")
+    except exceptions.ConcurrencyConflictError as e:
+        error_handler.handle_concurrency_conflict_error(e, config)
         sys.exit(1)
     except Exception as e:
         logger.error(f"Unexpected error: {e}")

{starrocks_br-0.4.0 → starrocks_br-0.5.1}/src/starrocks_br/concurrency.py

@@ -1,6 +1,6 @@
 from typing import Literal
 
-from . import logger, utils
+from . import exceptions, logger, utils
 
 
 def reserve_job_slot(db, scope: str, label: str) -> None:
@@ -46,14 +46,7 @@ def _can_heal_stale_job(scope: str, label: str, db) -> bool:
 
 def _raise_concurrency_conflict(scope: str, active_jobs: list[tuple[str, str, str]]) -> None:
     """Raise a concurrency conflict error with helpful message."""
-    active_job_strings = [f"{job[0]}:{job[1]}" for job in active_jobs]
-    active_labels = [job[1] for job in active_jobs]
-
-    raise RuntimeError(
-        f"Concurrency conflict: Another '{scope}' job is already ACTIVE: {', '.join(active_job_strings)}. "
-        f"Wait for it to complete or cancel it via: UPDATE ops.run_status SET state='CANCELLED' "
-        f"WHERE label='{active_labels[0]}' AND state='ACTIVE'"
-    )
+    raise exceptions.ConcurrencyConflictError(scope, active_jobs)
 
 
 def _insert_new_job(db, scope: str, label: str) -> None:

{starrocks_br-0.4.0 → starrocks_br-0.5.1}/src/starrocks_br/config.py

@@ -2,6 +2,8 @@ from typing import Any
 
 import yaml
 
+from . import exceptions
+
 
 def load_config(config_path: str) -> dict[str, Any]:
     """Load and parse YAML configuration file.
@@ -20,7 +22,7 @@ def load_config(config_path: str) -> dict[str, Any]:
         config = yaml.safe_load(f)
 
     if not isinstance(config, dict):
-        raise ValueError("Config must be a dictionary")
+        raise exceptions.ConfigValidationError("Config must be a dictionary")
 
     return config
 
@@ -32,13 +34,13 @@ def validate_config(config: dict[str, Any]) -> None:
         config: Configuration dictionary
 
     Raises:
-        ValueError: If required fields are missing
+        ConfigValidationError: If required fields are missing
     """
     required_fields = ["host", "port", "user", "database", "repository"]
 
     for field in required_fields:
         if field not in config:
-            raise ValueError(f"Missing required config field: {field}")
+            raise exceptions.ConfigValidationError(f"Missing required config field: {field}")
 
     _validate_tls_section(config.get("tls"))
 
@@ -48,17 +50,19 @@ def _validate_tls_section(tls_config) -> None:
         return
 
     if not isinstance(tls_config, dict):
-        raise ValueError("TLS configuration must be a dictionary")
+        raise exceptions.ConfigValidationError("TLS configuration must be a dictionary")
 
     enabled = bool(tls_config.get("enabled", False))
 
     if enabled and not tls_config.get("ca_cert"):
-        raise ValueError("TLS configuration requires 'ca_cert' when 'enabled' is true")
+        raise exceptions.ConfigValidationError(
+            "TLS configuration requires 'ca_cert' when 'enabled' is true"
+        )
 
     if "verify_server_cert" in tls_config and not isinstance(
         tls_config["verify_server_cert"], bool
     ):
-        raise ValueError(
+        raise exceptions.ConfigValidationError(
             "TLS configuration field 'verify_server_cert' must be a boolean if provided"
         )
 
@@ -67,6 +71,6 @@ def _validate_tls_section(tls_config) -> None:
         if not isinstance(tls_versions, list) or not all(
             isinstance(version, str) for version in tls_versions
         ):
-            raise ValueError(
+            raise exceptions.ConfigValidationError(
                 "TLS configuration field 'tls_versions' must be a list of strings if provided"
             )

{starrocks_br-0.4.0 → starrocks_br-0.5.1}/src/starrocks_br/db.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 import mysql.connector
 
@@ -13,7 +13,7 @@ class StarRocksDB:
         user: str,
         password: str,
         database: str,
-        tls_config: Optional[dict[str, Any]] = None,
+        tls_config: dict[str, Any] | None = None,
     ):
         """Initialize database connection.
 
@@ -31,7 +31,7 @@ class StarRocksDB:
         self.database = database
         self._connection = None
         self.tls_config = tls_config or {}
-        self._timezone: Optional[str] = None
+        self._timezone: str | None = None
 
     def connect(self) -> None:
         """Establish database connection."""