baucli 1.0.78__tar.gz → 1.0.80__tar.gz

{baucli-1.0.78 → baucli-1.0.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: baucli
-Version: 1.0.78
+Version: 1.0.80
 Summary: Extracts verified business-logic and schema context from Oracle, PostgreSQL, MySQL and SQL Server
 Home-page: https://www.begcloud.com
 Author: BEG Support

{baucli-1.0.78 → baucli-1.0.80}/baucli/__init__.py

@@ -3,6 +3,6 @@
 import warnings
 warnings.filterwarnings("ignore", message="urllib3 v2 only supports OpenSSL")
 
-__version__ = "1.0.78"
+__version__ = "1.0.80"
 __product__ = "BAUCLI"
 __author__ = "BEG Support"

{baucli-1.0.78 → baucli-1.0.80}/baucli/cli.py

@@ -926,6 +926,12 @@ def _guard_db_tenant(cfg, db_name, acao="sincronizar"):
 @click.option("--scope", "scope_code", default=None,
               help="Sincroniza só os objetos do scope set (BAU_SCOPE_SETS) deste código. "
                    "Default: [project].scope do bau.toml.")
+@click.option("--conflicts", "conflicts_only", is_flag=True, default=False,
+              help="Sincroniza APENAS os objetos cujo deploy está em CONFLITO no "
+                   "BAU (fonte mudou no banco depois de documentado). Busca a fila, "
+                   "re-captura o fonte vivo desses objetos (lote escopado, --full) "
+                   "e combina com --object/--table (união). Depois re-documente/"
+                   "aprove para gerar novos deploys.")
 @click.option("--no-rowcount", "no_rowcount", is_flag=True, default=False,
               help="Não capturar a contagem de linhas (num_rows) das tabelas no "
                    "fim do sync. Por padrão o sync traz esse baseline (origem DEV).")
@@ -947,7 +953,7 @@ def _guard_db_tenant(cfg, db_name, acao="sincronizar"):
 def sync(db_name: str, sync_all_dbs: bool, full: bool, days: int,
          objects_only: bool, tables_only: bool, object_name: str, table_name: str,
          parallel: bool, batch_size: int, overwrite_undocumented: bool,
-         dry_run: bool, scope_code: str,
+         dry_run: bool, scope_code: str, conflicts_only: bool,
          no_rowcount: bool, yes: bool, select: bool, include_bau: bool, verbose: bool):
     """Sync database objects to BAU Server.
 
@@ -961,6 +967,7 @@ def sync(db_name: str, sync_all_dbs: bool, full: bool, days: int,
       baucli sync --object PKG_X           Sync just one PL/SQL object (FULL)
       baucli sync --table  MEDICOS         Sync just one table/view (FULL)
       baucli sync --table T1 --object P1 --object P2   Uniao (repetivel, FULL)
+      baucli sync --conflicts              So os objetos com deploy em CONFLITO
       baucli sync --parallel               Force parallel extraction
       baucli sync --no-parallel            Force sequential extraction
       baucli sync --full -O                Re-seed comments on undocumented rows
@@ -1016,6 +1023,32 @@ def sync(db_name: str, sync_all_dbs: bool, full: bool, days: int,
 
     api = get_api(cfg)
 
+    # --conflicts: busca na fila DOCPL os deploys em CONFLITO (fonte mudou no
+    # banco depois de documentado) e vira sync dirigido por --object (união com
+    # os passados na linha de comando). Lote escopado: não avança o watermark.
+    if conflicts_only:
+        if sync_all_dbs:
+            console.print("[red]--conflicts não combina com --all (rode por --db).[/red]")
+            raise SystemExit(1)
+        from baucli.api import BauApiError as _CfErr
+        try:
+            _cf = api.deploys_pending(status="CONFLICT", limit=500) or {}
+        except _CfErr as e:
+            console.print(f"[red]API /deploys/pending?status=CONFLICT: {e}[/red]")
+            raise SystemExit(1)
+        _cf_items = _cf.get("deploys", []) or []
+        _cf_names = sorted({(d.get("name") or "").upper()
+                            for d in _cf_items if d.get("name")})
+        if not _cf_names:
+            console.print("[green]Nenhum deploy em CONFLITO no BAU — nada a sincronizar.[/green]")
+            raise SystemExit(0)
+        console.print(f"[yellow]{len(_cf_names)} objeto(s) com deploy em CONFLITO:[/yellow] "
+                      + ", ".join(_cf_names))
+        object_name = sorted(set(object_name or []) | set(_cf_names))
+        full = True
+        if not table_name:
+            objects_only = True
+
     # Resolve scope set (CLI > bau.toml [project].scope) and fetch its object
     # lists once. Filtering happens client-side in sync_database.
     scope_names = None
@@ -3021,7 +3054,7 @@ def deploy_apply(deploy_ref: str, db_name: str, out_file: str, mark_applied: boo
                     _idx = _build_live_ddl_index(extractor, [_meta.get("schema", "")])
                     _blocked, _live, _doc = _deploy_ddl_conflict(_meta, _idx)
                     if _blocked:
-                        _print_conflict_block(deploy_ref.upper(), _meta, _live, _doc)
+                        _print_conflict_block(deploy_ref.upper(), _meta, _live, _doc, db_name=name)
                         _report_deploy_outcome(api, cfg, _meta, "BLOCKED_LOSTUPDATE", "BLOCKED",
                             db_name=name, engine=db_config.get("engine"),
                             error="LAST_DDL vivo mais novo que o documentado",
@@ -3048,8 +3081,11 @@ def deploy_apply(deploy_ref: str, db_name: str, out_file: str, mark_applied: boo
                 extractor._conn, script, (db_config.get("engine") or None))
             if _drift:
                 console.print(f"  [yellow]BLOQUEADO (drift de código)[/yellow]: {_ddetail}")
-                console.print("  Rode [cyan]baucli sync[/cyan] + re-documente, ou "
-                              "[cyan]--force[/cyan] para sobrescrever.")
+                console.print(
+                    "  Re-capture, re-documente e gere novo header — ou "
+                    "[cyan]--force[/cyan] para sobrescrever:")
+                console.print(
+                    f"    [cyan]{_sync_cmd_for(name, [('--object', _obj_name or '')])}[/cyan]")
                 _rd = dict(_meta or {}); _rd.setdefault("id", deploy_id)
                 _rd.setdefault("_kind", kind); _rd.setdefault("name", _obj_name)
                 _report_deploy_outcome(api, cfg, _rd, "BLOCKED_DRIFT", "BLOCKED",
@@ -3477,17 +3513,41 @@ def _deploy_ddl_conflict(d: dict, live_idx: dict):
     return (cur_min > doc_min, live, doc)
 
 
-def _print_conflict_block(ref: str, d: dict, live_ddl, doc_ddl):
+
+
+def _sync_cmd_for(db_name=None, items=None) -> str:
+    """Ready-to-run directed-sync command for blocked deploys.
+
+    items: list of ("--object"|"--table", NAME). Flags are repeatable and
+    combinable (1.0.75+); dedupes preserving order. db_name optional.
+    """
+    seen, parts = set(), []
+    for flag, nm in (items or []):
+        key = (flag, (nm or "").upper())
+        if not nm or key in seen:
+            continue
+        seen.add(key)
+        parts.append(f"{flag} {nm.upper()}")
+    cmd = "baucli sync"
+    if db_name:
+        cmd += f" --db {db_name}"
+    return cmd + (" " + " ".join(parts) if parts else "")
+
+def _print_conflict_block(ref: str, d: dict, live_ddl, doc_ddl, db_name: str = None):
     """Uniform message when a deploy is blocked to protect in-progress work."""
     console.print(
         f"  [red]BLOQUEADO[/red] — {d.get('schema','')}.{d.get('name','')} "
         f"({d.get('type','')}) mudou no banco depois de documentado.")
     console.print(
         f"    [dim]DDL vivo: {live_ddl or '?'}  >  documentado: {doc_ddl or '?'}[/dim]")
+    _flag = "--table" if (d.get("type") or "").upper() in (
+        "TABLE", "VIEW", "MATERIALIZED VIEW") else "--object"
     console.print(
         "    [yellow]Não aplicado para não sobrescrever trabalho em andamento.[/yellow] "
-        "Rode [cyan]baucli sync[/cyan] (re-captura o fonte atual), re-documente/aprove "
-        "e gere um novo header — ou reaplique com [cyan]--force[/cyan] se tiver certeza.")
+        "Re-capture o fonte atual, re-documente/aprove e gere um novo header — "
+        "ou reaplique com [cyan]--force[/cyan] se tiver certeza:")
+    console.print(
+        f"      [cyan]{_sync_cmd_for(db_name, [(_flag, d.get('name') or '')])}[/cyan]")
 
 
 @deploy.command("apply-all")
@@ -3741,6 +3801,7 @@ def deploy_apply_all(db_name: str, schema: str, kind: str, status: str,
             live_idx = _build_live_ddl_index(extractor, _docpl_schemas)
 
     applied_objs: list[str] = []   # DOCPL aplicados -> baseline pós-apply
+    blocked_syncs: list[tuple] = []  # (--object|--table, NOME) p/ comando de sync no resumo
     import uuid as _uuid
     _batch_id = "aa-" + _uuid.uuid4().hex[:14]   # agrupa este apply-all na trilha de suporte
 
@@ -3755,8 +3816,9 @@ def deploy_apply_all(db_name: str, schema: str, kind: str, status: str,
         if not force:
             _blk, _live, _doc = _deploy_ddl_conflict(d, live_idx)
             if _blk:
-                _print_conflict_block(ref, d, _live, _doc)
+                _print_conflict_block(ref, d, _live, _doc, db_name=name)
                 blocked_refs.append(ref)
+                blocked_syncs.append(("--table" if dkind == "doctab" else "--object", obj))
                 _report_deploy_outcome(api, cfg, d, "BLOCKED_LOSTUPDATE", "BLOCKED",
                     db_name=name, engine=db_config.get("engine"),
                     error="LAST_DDL vivo mais novo que o documentado",
@@ -3789,6 +3851,7 @@ def deploy_apply_all(db_name: str, schema: str, kind: str, status: str,
             if _drift:
                 console.print(f"  [yellow]BLOQUEADO (drift de código)[/yellow]: {_ddetail}")
                 blocked_refs.append(ref)
+                blocked_syncs.append(("--object", obj))
                 _report_deploy_outcome(api, cfg, d, "BLOCKED_DRIFT", "BLOCKED",
                     db_name=name, engine=db_config.get("engine"), error=_ddetail,
                     deploy_mode="APPLY_ALL", batch_id=_batch_id)
@@ -3840,9 +3903,15 @@ def deploy_apply_all(db_name: str, schema: str, kind: str, status: str,
         _post_apply_context(no_context)
     if blocked_refs:
         console.print(f"[yellow]{len(blocked_refs)} bloqueado(s)[/yellow] "
-                      f"(mudaram no banco desde a documentação): {', '.join(blocked_refs)}. "
-                      "Rode [cyan]baucli sync[/cyan] + re-documente, ou use "
-                      "[cyan]--force[/cyan].")
+                      f"(mudaram no banco desde a documentação): {', '.join(blocked_refs)}.")
+        console.print(
+            "  Sincronize os bloqueados (re-captura o fonte atual), re-documente/aprove "
+            "e gere novos headers — ou reaplique com [cyan]--force[/cyan]:")
+        console.print(f"    [cyan]{_sync_cmd_for(name, blocked_syncs)}[/cyan]")
+        console.print(
+            "  [dim]Esse sync marca os deploys como CONFLITO na fila; dali em diante,[/dim] "
+            f"[cyan]baucli sync --db {name} --conflicts[/cyan] [dim]re-sincroniza o que "
+            "estiver em conflito, sem listar objeto a objeto.[/dim]")
     if failed_refs:
         console.print(f"[red]{len(failed_refs)} failed[/red] "
                       "(marcados FAILED na fila + registrados em BAU_DEPLOY_LOG):")

{baucli-1.0.78 → baucli-1.0.80}/baucli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: baucli
-Version: 1.0.78
+Version: 1.0.80
 Summary: Extracts verified business-logic and schema context from Oracle, PostgreSQL, MySQL and SQL Server
 Home-page: https://www.begcloud.com
 Author: BEG Support

{baucli-1.0.78 → baucli-1.0.80}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="baucli",
-    version="1.0.78",
+    version="1.0.80",
     description="Extracts verified business-logic and schema context from Oracle, PostgreSQL, MySQL and SQL Server",
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",