doploy-cli 0.2.5__tar.gz → 0.2.7__tar.gz

{doploy_cli-0.2.5 → doploy_cli-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doploy-cli
-Version: 0.2.5
+Version: 0.2.7
 Summary: doploy CLI: watch builds, read logs, and drive Odoo deployments from a terminal
 License: MIT
 Project-URL: Homepage, https://doploy.io
@@ -129,8 +129,9 @@ doploy logs 418 --source test --filter ERROR
 doploy logs 419 --source test -f
 ```
 
-Exits on its own when the build settles. `--source odoo` follows the running container's log
-instead and runs until Ctrl-C.
+Exits on its own when the build settles. `--source odoo` follows the Odoo server log (the same
+odoo.log the dashboard's Logs tab shows, with tracebacks) and runs until Ctrl-C. It returns a 409
+until Odoo has started for that build. `doploy --version` prints the installed CLI version.
 
 **Ship a change to staging**
 

{doploy_cli-0.2.5 → doploy_cli-0.2.7}/README.md

@@ -107,8 +107,9 @@ doploy logs 418 --source test --filter ERROR
 doploy logs 419 --source test -f
 ```
 
-Exits on its own when the build settles. `--source odoo` follows the running container's log
-instead and runs until Ctrl-C.
+Exits on its own when the build settles. `--source odoo` follows the Odoo server log (the same
+odoo.log the dashboard's Logs tab shows, with tracebacks) and runs until Ctrl-C. It returns a 409
+until Odoo has started for that build. `doploy --version` prints the installed CLI version.
 
 **Ship a change to staging**
 

{doploy_cli-0.2.5 → doploy_cli-0.2.7}/doploy_cli/SKILL.md

@@ -39,7 +39,7 @@ Do not create a new build by hand for a branch you already pushed; the push did
 
 ```bash
 doploy logs <build> --source test -f        # follow the test run until the build settles
-doploy logs <build> --source odoo --filter Traceback   # the running container (staging/prod)
+doploy logs <build> --source odoo --filter Traceback   # the Odoo server log (odoo.log), same as the Logs tab
 doploy logs <build> --source build           # doploy's own deploy log
 ```
 

{doploy_cli-0.2.5 → doploy_cli-0.2.7}/doploy_cli/main.py

@@ -183,8 +183,12 @@ def _free_port() -> int:
         return s.getsockname()[1]
 
 
-def _wait_for_callback(port: int, state: str, timeout: float = 300.0) -> str:
-    """Serve one loopback request and return the OAuth `code` it carried."""
+def _wait_for_callback(port: int, state: str, done_url: str, timeout: float = 300.0) -> str:
+    """Serve one loopback request and return the OAuth `code` it carried.
+
+    The browser is sent on to ``done_url?status=...`` (a branded page hosted by
+    the doploy server) rather than shown bare text from this loopback server.
+    """
     from urllib.parse import parse_qs, urlparse
     result: dict = {}
 
@@ -192,15 +196,15 @@ def _wait_for_callback(port: int, state: str, timeout: float = 300.0) -> str:
         def do_GET(self):  # noqa: N802
             q = parse_qs(urlparse(self.path).query)
             if q.get('state', [''])[0] != state:
-                body, result['error'] = 'State mismatch. Close this tab and retry.', 'state mismatch'
+                status, result['error'] = 'error', 'state mismatch'
             elif q.get('error'):
-                body, result['error'] = 'Login cancelled. You can close this tab.', q['error'][0]
+                status, result['error'] = 'cancelled', q['error'][0]
             else:
-                body, result['code'] = 'Logged in to doploy. You can close this tab.', q.get('code', [''])[0]
-            self.send_response(200)
-            self.send_header('Content-Type', 'text/html')
+                status, result['code'] = 'ok', q.get('code', [''])[0]
+            self.send_response(302)
+            self.send_header('Location', f'{done_url}?status={status}')
+            self.send_header('Content-Length', '0')
             self.end_headers()
-            self.wfile.write(f'<html><body style="font-family:sans-serif"><p>{body}</p></body></html>'.encode())
 
         def log_message(self, *a):  # silence
             pass
@@ -241,7 +245,7 @@ def _browser_login(base: str) -> None:
     print('Opening your browser to sign in to doploy. If it does not open, visit:')
     print(f'  {url}')
     webbrowser.open(url)
-    code = _wait_for_callback(port, state)
+    code = _wait_for_callback(port, state, f'{issuer}/cli/complete')
 
     tok = _oauth_token_request(base, {
         'grant_type': 'authorization_code', 'code': code, 'redirect_uri': redirect_uri,
@@ -339,20 +343,29 @@ def cmd_tests(args):
     c = data['counts']
     print(f"build {data['build_id']} [{data['build_status']}] — "
           f"{c['error']} errors, {c['fail']} failures, {c['warning']} warnings")
-    loader_rows = 0
+    summarized = 0
     for r in data['results']:
         if r['error_type'] not in ('ERROR', 'FAIL') and not args.warnings:
             continue
         is_test = bool(r.get('test')) and r['test'] != 'Unknown'
-        if not is_test and not args.details:
-            loader_rows += 1  # module-loading summaries: only interesting with --details
-            continue
         where = f"{r['module']}.{r['test']}" if is_test else '(module loading)'
         print(f"\n[{r['error_type']}] {where}")
         if args.details:
             print(r['details'])
-    if loader_rows:
-        print(f"\n(+{loader_rows} module-loading message(s); use --details to see them)")
+        else:
+            # Without --details, the last line of the traceback is the one
+            # that names the problem (AssertionError: ..., ParseError: ...).
+            summary = _last_line(r.get('details'))
+            if summary:
+                print(f"  {summary}")
+                summarized += 1
+    if summarized:
+        print("\n(use --details for full tracebacks)")
+
+
+def _last_line(text):
+    lines = [ln.strip() for ln in (text or '').splitlines() if ln.strip()]
+    return lines[-1] if lines else ''
 
 
 def cmd_rebuild(args):
@@ -389,8 +402,14 @@ def _new_lines(previous: list[str], current: list[str]) -> list[str]:
 _TERMINAL_BUILD_STATUSES = {'success', 'error', 'warning', 'active error', 'cancelled', 'deleted'}
 
 
+_LOG_LINES_MAX = 2000
+
+
 def cmd_logs(args):
     client = _client(args)
+    if args.lines > _LOG_LINES_MAX:
+        print(f"note: the API returns at most {_LOG_LINES_MAX} lines; showing the last {_LOG_LINES_MAX}. "
+              f"Use --filter to search further back.", file=sys.stderr)
     params = {'source': args.source, 'lines': str(args.lines)}
     if args.filter:
         params['filter'] = args.filter
@@ -419,12 +438,12 @@ def cmd_logs(args):
             print(f"... (showing last {len(shown)} lines; use --lines to see more)", file=sys.stderr)
         return
     # Follow: poll and print only what is new. Build and test logs end when
-    # the build settles; the odoo source is a running container's stdout, so
-    # it follows until Ctrl-C (like `docker logs -f`). Each odoo poll runs a
-    # small playbook on the host, so it is polled no faster than every 15s.
-    interval = max(args.interval, 15.0) if args.source == 'odoo' else args.interval
+    # the build settles; the odoo source is the live Odoo server log, so it
+    # follows until Ctrl-C (like `tail -f`). Each odoo poll is an SSH tail on
+    # the host, so it is polled no faster than every 5s.
+    interval = max(args.interval, 5.0) if args.source == 'odoo' else args.interval
     if args.source == 'odoo':
-        print(f'following container logs every {interval:.0f}s; Ctrl-C to stop', file=sys.stderr)
+        print(f'following the Odoo server log every {interval:.0f}s; Ctrl-C to stop', file=sys.stderr)
     previous = shown
     try:
         while True:
@@ -549,8 +568,17 @@ def cmd_skill(args):
     print('Other agents: `doploy skill print >> AGENTS.md`')
 
 
+def _cli_version():
+    try:
+        from importlib.metadata import version
+        return version('doploy-cli')
+    except Exception:  # not installed as a distribution (source checkout)
+        return 'unknown'
+
+
 def main(argv=None):
     p = argparse.ArgumentParser(prog='doploy', description=__doc__.splitlines()[0])
+    p.add_argument('--version', action='version', version=f'doploy {_cli_version()}')
     p.add_argument('--token', help=argparse.SUPPRESS)
     p.add_argument('--base', help=f'API base URL (default {DEFAULT_BASE})')
     sub = p.add_subparsers(dest='command', required=True)
@@ -622,7 +650,7 @@ def main(argv=None):
                     help='keep printing new lines: build/test until the build settles, '
                          'odoo until Ctrl-C')
     sp.add_argument('--interval', type=float, default=5.0,
-                    help='poll seconds for --follow (odoo source: minimum 15)')
+                    help='poll seconds for --follow (odoo source: minimum 5)')
     sp.add_argument('--json', action='store_true')
     sp.set_defaults(func=cmd_logs)
 

{doploy_cli-0.2.5 → doploy_cli-0.2.7}/doploy_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: doploy-cli
-Version: 0.2.5
+Version: 0.2.7
 Summary: doploy CLI: watch builds, read logs, and drive Odoo deployments from a terminal
 License: MIT
 Project-URL: Homepage, https://doploy.io
@@ -129,8 +129,9 @@ doploy logs 418 --source test --filter ERROR
 doploy logs 419 --source test -f
 ```
 
-Exits on its own when the build settles. `--source odoo` follows the running container's log
-instead and runs until Ctrl-C.
+Exits on its own when the build settles. `--source odoo` follows the Odoo server log (the same
+odoo.log the dashboard's Logs tab shows, with tracebacks) and runs until Ctrl-C. It returns a 409
+until Odoo has started for that build. `doploy --version` prints the installed CLI version.
 
 **Ship a change to staging**
 

{doploy_cli-0.2.5 → doploy_cli-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "doploy-cli"
-version = "0.2.5"
+version = "0.2.7"
 description = "doploy CLI: watch builds, read logs, and drive Odoo deployments from a terminal"
 readme = "README.md"
 license = { text = "MIT" }