direct-cli 0.3.16__tar.gz → 0.4.1__tar.gz

{direct_cli-0.3.16 → direct_cli-0.4.1}/CHANGELOG.md

@@ -1,5 +1,201 @@
 # Changelog
 
+## 0.4.1
+
+Russian-default CLI localization across all command modules (epic #466).
+
+**Fixed — bug hunt (#483):**
+
+- `bids get` / `keywordbids get`: refuse an empty `SelectionCriteria` before the
+  API call, raising a `UsageError` that asks for at least one filter
+  (`--campaign-ids` / `--adgroup-ids` / `--keyword-ids` / `--serving-statuses`)
+  instead of letting the API reject it with the opaque error 4001.
+- `bids set-auto`: require exactly one of `--campaign-id`, `--adgroup-id`, or
+  `--keyword-id` via the shared `add_single_id_selector` (the three are mutually
+  exclusive per the API docs), matching `bids set`.
+- `reports get`: reject a `--fields` value that parses to an empty list (for
+  example `",,,"`) before building the request, instead of sending an invalid
+  `FieldNames: []` (API error 8000).
+- Error-handling consistency: `get`/lifecycle handlers across `bids`,
+  `keywordbids`, `negativekeywordsharedsets`, `balance`, `strategies`,
+  `retargeting`, `ads` (all 8 commands), and `advideos` now re-raise
+  `click.UsageError` / `click.ClickException` before the generic
+  `except Exception`, so validation errors keep their Click formatting and
+  exit code 2 instead of being downgraded to an `Abort`.
+- Vendor `tapi_yandex_direct`: `to_columns()` no longer raises `IndexError` on
+  report rows shorter than the header (pads with `""`); the error handler reads
+  `error_detail` with `.get()` so an unfamiliar error structure no longer masks
+  the original API error with a `KeyError`.
+- `utils.parse_priority_goals_spec`: corrected the item type annotation to
+  `List[Dict[str, Any]]` (items hold `"YES"/"NO"` strings, not only ints).
+
+**Fixed — `--help` hung on a client-login network call (#480 follow-up):**
+
+- After #480, `get_credentials` resolved the bare Client-Login via a network
+  `clients.get` on every CLI invocation — including `<group> --help` — whenever
+  an OAuth profile with an email login had not yet been migrated. That call had
+  no timeout, so a slow link or a Yandex SmartCaptcha gateway could hang the
+  CLI. Help/version passes now skip the resolver, the resolver is capped with a
+  hard timeout, and the unit suite neutralizes it so tests never touch the
+  network.
+
+**Fixed — auth login saved Passport email, breaking v4 (#480):**
+
+- `direct auth login` (OAuth / PKCE) stored the Passport email
+  (`<login>@yandex.ru`) in `auth.json`, which Direct v4 AccountManagement
+  rejects with `FaultCode 259` ("This client does not exist") — breaking
+  `direct balance` and `direct v4account ...`. Login now resolves the bare
+  **Client-Login** via a one-shot v5 `clients.get` (`resolve_account_login`),
+  falling back to the Passport login only if that call fails.
+- `get_credentials` migrates older profiles in place: when a stored OAuth login
+  is an email whose local part matches the token owner's resolved Client-Login,
+  it is rewritten to the bare login (one-time, persisted). Agency profiles whose
+  login differs from the token owner are never clobbered, and an explicit
+  `--login` is never overridden.
+
+**Localized — interpolated error messages (#478), completing epic #466:**
+
+- Rewrote all 121 interpolated `click.UsageError` / `click.BadParameter` /
+  `print_*` messages (114 f-strings + 7 string concatenations) across the
+  command modules into the stable `t("<template>").format(**kwargs)` pattern,
+  with 96 unique English templates translated to Russian (6 shared templates,
+  e.g. `Provide a non-empty comma-separated {wsdl_key} list.`, in
+  `common.json`). Placeholder names, conversions, and format specs are
+  preserved verbatim in both locales, so the rendered English text is
+  byte-identical to before and the Russian render fills the same fields.
+- `t()` gained `@overload` signatures (`str -> str`, `None -> None`) so
+  `t(...).format(...)` type-checks without touching call sites.
+- `tests/test_i18n.py` now (a) flags f-string / concat — not just static —
+  bare literals in `_RUNTIME_MESSAGE_FUNCS` calls (also covering
+  `print_success`), accepting only `t(...)` / `t(...).format(...)`; and
+  (b) asserts placeholder parity between every English template key and its
+  Russian translation. This completes the error-message localization checklist
+  of epic #466.
+
+**Localized — static error messages (#477):**
+
+- Wrapped all 179 static `click.UsageError` / `click.BadParameter` string
+  literals (and the `auth` OAuth-code `click.prompt`) across 33 command
+  modules in `t(...)`, with Russian translations added to the per-module
+  `translations/*.json` catalogs; seven messages shared across modules
+  (e.g. `Provide at least one field to update`,
+  `--status and --statuses are mutually exclusive`) live in `common.json`.
+  Validation errors now render in Russian by default and in English under
+  `--locale en`. Flag names, enum values, and WSDL field names are unchanged.
+- Extended `tests/test_i18n.py::test_localized_groups_wrap_runtime_messages`
+  to also scan `UsageError` / `BadParameter` / `prompt` / `confirm` (bare or
+  `click.<Name>`); a bare string literal first argument is rejected. Only
+  static `ast.Constant` literals are enforced for now — interpolated
+  (f-string / concat) messages are stage B (#478).
+- Test suite defaults the CLI locale to English (`tests/conftest.py` autouse
+  fixture) so the existing English error-contract assertions stay valid; the
+  Russian default remains covered by `tests/test_i18n.py`.
+
+**Added — scalable i18n mechanism (#467):**
+
+- Source-string-keyed translation catalog: the English `help=` / docstring /
+  epilog text is the catalog key, with Russian translations in external
+  `direct_cli/translations/*.json` files (one per module, plus shared
+  `common.json`). No `cls=`/`help_key` edits in command modules —
+  `cli._apply_directcli_classes` retypes every plain `click.Option` to
+  `LocalizedOption` and localizes command/group docstrings and epilogs at
+  render time.
+- `t()` is now source-keyed and context-free safe (`set_active_locale`), so
+  `print_*` runtime messages localize too. `--locale` is eager so the root
+  `--help` epilog honors an inline `--locale`.
+- `tests/test_i18n.py` gains a `LOCALIZED_GROUPS` registry with two enforced
+  invariants per localized module: translation completeness (no silent English
+  leak under the Russian default) and `print_*` runtime-message wrapping.
+- `v4finance` migrated to the new mechanism and fully localized as the
+  reference module.
+
+**Localized — Core search (#468):**
+
+- Russian help/docstrings for `campaigns`, `ads`, `adgroups`, `keywords`,
+  `keywordbids`, and `bids` (510 unique strings across the six modules).
+  WSDL field paths, enum values, and flag names are kept verbatim; only
+  human-readable text is translated. These groups join `LOCALIZED_GROUPS`,
+  so their translation completeness is now enforced by `test_i18n.py`.
+
+**Localized — Targeting & creatives (#469):**
+
+- Russian help/docstrings for `strategies`, `bidmodifiers`, `smartadtargets`,
+  `vcards`, `feeds`, `dynamicads`, `audiencetargets`, `dynamicfeedadtargets`,
+  `retargeting`, `negativekeywordsharedsets`, `adextensions`, `adimages`,
+  `sitelinks`, `creatives`, `advideos`, and `turbopages` (247 unique strings
+  across the sixteen modules). WSDL field paths, enum values, and flag names
+  are kept verbatim; only human-readable text is translated. These groups
+  join `LOCALIZED_GROUPS`, so their translation completeness is now enforced
+  by `test_i18n.py`.
+
+**Localized — Account, clients, reporting (#470):**
+
+- Russian help/docstrings for `clients`, `agencyclients`, `reports`, `changes`,
+  `auth`, `leads`, `dictionaries`, `keywordsresearch`, `businesses`, and
+  `balance` (142 source strings across the ten modules). WSDL field paths,
+  enum values, and flag names are kept verbatim; only human-readable text is
+  translated.
+- First modules with localized **runtime messages**: `print_*` calls carrying a
+  human-readable literal (`auth` interactive prompts, the `agencyclients delete`
+  not-supported notice) are now wrapped in `t()` so they follow the active
+  locale. `print_error(str(e))` API-error passthroughs are unchanged. These
+  groups join `LOCALIZED_GROUPS`, enforcing both translation completeness and
+  the runtime-message wrapping invariant.
+
+**Localized — v4 Live services (#471), completing epic #466:**
+
+- Russian help/docstrings for `v4account`, `v4tags`, `v4forecast`,
+  `v4wordstat`, `v4events`, `v4adimage`, `v4goals`, `v4keywords`, and `v4meta`
+  (87 source strings across the nine modules). `v4finance` was already
+  localized as the reference module in #467.
+- With these groups, **all 42 CLI command groups are in `LOCALIZED_GROUPS`**:
+  the completeness invariant now covers the entire command tree, so every
+  English help/docstring string ships with a Russian translation under the
+  Russian default. The `v4 Live` epilog (single-sourced docs URL) stays
+  verbatim per the URL-registry rule. This closes the localization epic #466.
+
+## 0.4.0
+
+Milestone release closing the 0.4.0 roadmap (#123): typed Yandex Direct
+API **v4 Live** CLI support and completion of the post-0.3.0 write-command
+coverage gates. All public v4 input stays typed and canonical — no `--json`
+passthrough — and mirrors `dg-v4/live/*` wire shapes 1:1.
+
+**Added — typed v4 Live CLI:**
+
+- v4 Live command foundation with typed Click groups and a `--dry-run`
+  seam that prints the `{method, param}` body before token/locale
+  enrichment (#124, closes #111 — typed CLI, not raw JSON passthrough).
+- `v4finance` and `v4account` typed finance and shared-account commands
+  (#125).
+- `v4goals`, `v4events`, `v4wordstat`, and `v4forecast` typed commands
+  (#126).
+- `v4events get-events-log` and `v4forecast create-new-forecast` now expose
+  every documented input field (#456).
+- Russian-default CLI help with English opt-in, starting with `v4finance`
+  (#458).
+
+**Changed — write-command coverage gates:**
+
+- Extended the WSDL schema gate to mutating operations; `keywordbids.set`
+  is now enum-validated against its WSDL `*FieldEnum` (#118).
+- Per-method `WRITE_SANDBOX` integration coverage completed — zero
+  unexplained `NOT_COVERED` commands in `direct_cli/smoke_matrix.py`
+  (#122).
+- Closed the remaining mutating `DRY_RUN_PAYLOAD_EXCLUSIONS`; every
+  declared WSDL operation now has a `PAYLOAD_CASES` fixture or a
+  documented technical exclusion (#127).
+
+**Tests / tooling:**
+
+- Offline VCR cassettes for all v5 read-only commands (#455).
+- v4 Live read cassettes and a fix for an unbounded retry-loop (#457,
+  closes #454).
+- Docs/wire-shape scanner with the 2026-05-29 sweep (#451).
+
+`strict_parity_ok`, `live_model_parity_ok`, and `schema_parity_ok` all
+report `true` in `scripts/build_api_coverage_report.py`.
+
 ## 0.3.16
 
 **BREAKING CHANGES (regression fix — reverts 0.3.15 wire-shape changes):**

{direct_cli-0.3.16 → direct_cli-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: direct-cli
-Version: 0.3.16
+Version: 0.4.1
 Summary: Command-line interface for Yandex Direct API
 Author: axisrow
 License: MIT
@@ -208,6 +208,31 @@ direct v4wordstat get-report --report-id 123 --format table
 direct v4wordstat delete-report --report-id 123
 ```
 
+### V4 Live Keyword Suggestions
+
+`get-suggestion` returns up to 20 related phrases for the seed phrases. Repeat
+`--keyword` for multiple seeds. The method consumes API points.
+
+```bash
+direct v4keywords get-suggestion --keyword холодильник --keyword камера
+direct v4keywords get-suggestion --keyword "buy laptop" --format table
+direct v4keywords get-suggestion --keyword холодильник --dry-run
+```
+
+### V4 Live Ad-Image Associations
+
+`AdImageAssociation` is exposed as two typed commands. `get` reads ad-to-image
+associations via an optional selection filter (an empty filter returns up to
+10000 associations). `set` attaches or detaches images: `--association AD_ID=HASH`
+attaches an image, `--association AD_ID` (no hash) detaches the current image
+(max 10000 associations per call).
+
+```bash
+direct v4adimage get --ad-ids 123,456 --status-moderate Yes --limit 20
+direct v4adimage get --campaign-ids 789 --format table
+direct v4adimage set --association 123=abc123hash --association 456 --dry-run
+```
+
 ### V4 Live Budget Forecasts
 
 Budget forecasts are asynchronous. Direct CLI makes exactly one API call per
@@ -233,9 +258,15 @@ per-request token from `--master-token`, `--operation-num`, and
 Environment variables are
 `YANDEX_DIRECT_MASTER_TOKEN`, `YANDEX_DIRECT_FINANCE_LOGIN`,
 `YANDEX_DIRECT_FINANCE_TOKEN`, and `YANDEX_DIRECT_OPERATION_NUM`.
-`transfer-money` and `pay-campaigns` are dry-run-only in this release and
-always require `--dry-run`; `create-invoice` can be sent live when `--dry-run`
-is omitted. Dry-run output masks the financial token.
+`transfer-money`, `pay-campaigns`, and `pay-campaigns-by-card` are dry-run-only
+in this release and always require `--dry-run`; `create-invoice` can be sent
+live when `--dry-run` is omitted. Dry-run output masks the financial token.
+`pay-campaigns-by-card` has an undocumented request shape; its dry-run body
+mirrors the documented `pay-campaigns` shape as a best-effort preview.
+
+> ⚠ **Finance commands have not been tested against the live API.** Treat the
+> request shapes as best-effort and always verify with `--dry-run` before
+> sending anything that runs live (`create-invoice`).
 
 ```bash
 direct v4finance get-clients-units --logins client-login,other-client --format table
@@ -244,6 +275,7 @@ direct v4finance create-invoice --payment 123=100.50 --payment 456=25 --currency
 direct v4finance check-payment --custom-transaction-id A123456789012345678901234567890B
 direct v4finance transfer-money --from-campaign-id 123 --to-campaign-id 456 --amount 100.50 --currency RUB --master-token MASTER_TOKEN --operation-num 123 --finance-login agency-login --dry-run
 direct v4finance pay-campaigns --campaign-ids 123,456 --amount 100.50 --contract-id CONTRACT_ID --pay-method Bank --currency RUB --master-token MASTER_TOKEN --operation-num 123 --finance-login agency-login --dry-run
+direct v4finance pay-campaigns-by-card --campaign-ids 123,456 --amount 100.50 --currency RUB --master-token MASTER_TOKEN --operation-num 128 --finance-login agency-login --dry-run
 ```
 
 ### V4 Live Shared Account
@@ -272,6 +304,20 @@ direct v4account account-management --action TransferMoney --from-account-id 132
 direct --sandbox v4account enable-shared-account --client-login client-login
 ```
 
+### V4 Live — Intentionally Omitted Methods
+
+Some v4 Live methods present in the API registry are intentionally **not**
+exposed as CLI commands:
+
+- `DeleteReport` / `DeleteOfflineReport` — disabled by Yandex (the official
+  docs list them under "Отключенные методы" / "Метод отключен. Используйте API
+  версии 5"). Use the v5 reports API instead.
+- `PingAPI`, `PingAPI_X`, `GetVersion`, `GetAvailableVersions` — service
+  diagnostics / version probes with no documented request shape; not useful as
+  user-facing CLI commands.
+- `PayCampaignsByCard` is exposed but **dry-run-only** (undocumented,
+  financially sensitive — see V4 Live Finance above).
+
 ### CLI Convention
 
 The current CLI convention is defined as follows.

{direct_cli-0.3.16 → direct_cli-0.4.1}/README.md

@@ -165,6 +165,31 @@ direct v4wordstat get-report --report-id 123 --format table
 direct v4wordstat delete-report --report-id 123
 ```
 
+### V4 Live Keyword Suggestions
+
+`get-suggestion` returns up to 20 related phrases for the seed phrases. Repeat
+`--keyword` for multiple seeds. The method consumes API points.
+
+```bash
+direct v4keywords get-suggestion --keyword холодильник --keyword камера
+direct v4keywords get-suggestion --keyword "buy laptop" --format table
+direct v4keywords get-suggestion --keyword холодильник --dry-run
+```
+
+### V4 Live Ad-Image Associations
+
+`AdImageAssociation` is exposed as two typed commands. `get` reads ad-to-image
+associations via an optional selection filter (an empty filter returns up to
+10000 associations). `set` attaches or detaches images: `--association AD_ID=HASH`
+attaches an image, `--association AD_ID` (no hash) detaches the current image
+(max 10000 associations per call).
+
+```bash
+direct v4adimage get --ad-ids 123,456 --status-moderate Yes --limit 20
+direct v4adimage get --campaign-ids 789 --format table
+direct v4adimage set --association 123=abc123hash --association 456 --dry-run
+```
+
 ### V4 Live Budget Forecasts
 
 Budget forecasts are asynchronous. Direct CLI makes exactly one API call per
@@ -190,9 +215,15 @@ per-request token from `--master-token`, `--operation-num`, and
 Environment variables are
 `YANDEX_DIRECT_MASTER_TOKEN`, `YANDEX_DIRECT_FINANCE_LOGIN`,
 `YANDEX_DIRECT_FINANCE_TOKEN`, and `YANDEX_DIRECT_OPERATION_NUM`.
-`transfer-money` and `pay-campaigns` are dry-run-only in this release and
-always require `--dry-run`; `create-invoice` can be sent live when `--dry-run`
-is omitted. Dry-run output masks the financial token.
+`transfer-money`, `pay-campaigns`, and `pay-campaigns-by-card` are dry-run-only
+in this release and always require `--dry-run`; `create-invoice` can be sent
+live when `--dry-run` is omitted. Dry-run output masks the financial token.
+`pay-campaigns-by-card` has an undocumented request shape; its dry-run body
+mirrors the documented `pay-campaigns` shape as a best-effort preview.
+
+> ⚠ **Finance commands have not been tested against the live API.** Treat the
+> request shapes as best-effort and always verify with `--dry-run` before
+> sending anything that runs live (`create-invoice`).
 
 ```bash
 direct v4finance get-clients-units --logins client-login,other-client --format table
@@ -201,6 +232,7 @@ direct v4finance create-invoice --payment 123=100.50 --payment 456=25 --currency
 direct v4finance check-payment --custom-transaction-id A123456789012345678901234567890B
 direct v4finance transfer-money --from-campaign-id 123 --to-campaign-id 456 --amount 100.50 --currency RUB --master-token MASTER_TOKEN --operation-num 123 --finance-login agency-login --dry-run
 direct v4finance pay-campaigns --campaign-ids 123,456 --amount 100.50 --contract-id CONTRACT_ID --pay-method Bank --currency RUB --master-token MASTER_TOKEN --operation-num 123 --finance-login agency-login --dry-run
+direct v4finance pay-campaigns-by-card --campaign-ids 123,456 --amount 100.50 --currency RUB --master-token MASTER_TOKEN --operation-num 128 --finance-login agency-login --dry-run
 ```
 
 ### V4 Live Shared Account
@@ -229,6 +261,20 @@ direct v4account account-management --action TransferMoney --from-account-id 132
 direct --sandbox v4account enable-shared-account --client-login client-login
 ```
 
+### V4 Live — Intentionally Omitted Methods
+
+Some v4 Live methods present in the API registry are intentionally **not**
+exposed as CLI commands:
+
+- `DeleteReport` / `DeleteOfflineReport` — disabled by Yandex (the official
+  docs list them under "Отключенные методы" / "Метод отключен. Используйте API
+  версии 5"). Use the v5 reports API instead.
+- `PingAPI`, `PingAPI_X`, `GetVersion`, `GetAvailableVersions` — service
+  diagnostics / version probes with no documented request shape; not useful as
+  user-facing CLI commands.
+- `PayCampaignsByCard` is exposed but **dry-run-only** (undocumented,
+  financially sensitive — see V4 Live Finance above).
+
 ### CLI Convention
 
 The current CLI convention is defined as follows.

{direct_cli-0.3.16 → direct_cli-0.4.1}/direct_cli/_vendor/tapi_yandex_direct/__init__.py

@@ -1,7 +1,7 @@
 
 __author__ = 'Pavel Maksimov'
 __email__ = 'vur21@ya.ru'
-__version__ = '2026.4.28'
+__version__ = '2026.5.29'
 
 
 from .resource_mapping import *

direct_cli-0.4.1/direct_cli/_vendor/tapi_yandex_direct/endpoints.py

@@ -0,0 +1,27 @@
+"""Runtime endpoints for Yandex Direct API transports.
+
+The v5 JSON API historically uses the ``.com`` TLD while the v4 Live API uses
+``.ru``; both hosts are valid Yandex Direct entrypoints. ``get_direct_api_root``
+keeps that per-transport distinction via the ``tld`` argument so neither
+adapter silently changes the domain its callers rely on.
+"""
+
+from typing import Any, Dict
+
+DIRECT_API_PRODUCTION_ROOT = "https://api.direct.yandex.{tld}/"
+DIRECT_API_SANDBOX_ROOT = "https://api-sandbox.direct.yandex.{tld}/"
+DIRECT_DEBUG_ROOT = "https://"
+
+
+def get_direct_api_root(api_params: Dict[str, Any], tld: str = "com") -> str:
+    """Return the Direct API root for production or sandbox requests.
+
+    ``tld`` selects the top-level domain: ``"com"`` for the v5 JSON API
+    (default, preserving the historical host) and ``"ru"`` for the v4 Live API.
+    """
+    template = (
+        DIRECT_API_SANDBOX_ROOT
+        if api_params.get("is_sandbox")
+        else DIRECT_API_PRODUCTION_ROOT
+    )
+    return template.format(tld=tld)

{direct_cli-0.3.16 → direct_cli-0.4.1}/direct_cli/_vendor/tapi_yandex_direct/tapi_yandex_direct.py

@@ -250,29 +250,51 @@ class YandexDirectClientAdapter(JSONAdapterMixin, TapiAdapter):
                 return True
 
         if error_code == 152:
+            # "Not enough units" is an API-points quota error, distinct from the
+            # rate-limit codes below: points replenish on a sliding 60-minute
+            # window, so the retry waits 5 minutes and uses its own budget
+            # (retries_if_not_enough_units) rather than the rate-limit budget.
+            # Without a cap the loop would be infinite (sleep, retry, forever).
             if api_params.get("retry_if_not_enough_units", False):
-                logger.warning("Not enough units, re-request after 5 minutes")
-                time.sleep(60 * 5)
-                return True
+                if repeat_number < api_params.get("retries_if_not_enough_units", 5):
+                    logger.warning("Not enough units, re-request after 5 minutes")
+                    time.sleep(60 * 5)
+                    return True
+                logger.error("Not enough units to request, retries exhausted")
+                return False
             else:
                 logger.error("Not enough units to request")
 
         elif error_code == 506 and api_params.get("retry_if_exceeded_limit", True):
-            logger.warning("API requests exceeded, re-request after 10 seconds")
-            time.sleep(10)
-            return True
+            # Bound rate-limit retries with their own attempt budget. Without
+            # this cap the loop is infinite (sleep 10s, retry, forever) whenever
+            # the API keeps returning the limit code — which hangs the caller.
+            if repeat_number < api_params.get("retries_if_exceeded_limit", 5):
+                logger.warning("API requests exceeded, re-request after 10 seconds")
+                time.sleep(10)
+                return True
+            logger.error("API requests exceeded, retries exhausted")
+            return False
 
         elif error_code == 56 and api_params.get("retry_if_exceeded_limit", True):
-            logger.warning("Method request limit exceeded. Re-request after 10 seconds")
-            time.sleep(10)
-            return True
+            if repeat_number < api_params.get("retries_if_exceeded_limit", 5):
+                logger.warning(
+                    "Method request limit exceeded. Re-request after 10 seconds"
+                )
+                time.sleep(10)
+                return True
+            logger.error("Method request limit exceeded, retries exhausted")
+            return False
 
         elif error_code == 9000 and api_params.get("retry_if_exceeded_limit", True):
-            logger.warning(
-                "Created by max number of reports. Re-request after 10 seconds"
-            )
-            time.sleep(10)
-            return True
+            if repeat_number < api_params.get("retries_if_exceeded_limit", 5):
+                logger.warning(
+                    "Created by max number of reports. Re-request after 10 seconds"
+                )
+                time.sleep(10)
+                return True
+            logger.error("Max number of reports limit exceeded, retries exhausted")
+            return False
 
         elif error_code in (52, 1000, 1001, 1002) or status_code == 500:
             if repeat_number < api_params.get("retries_if_server_error", 5):

{direct_cli-0.3.16 → direct_cli-0.4.1}/direct_cli/_vendor/tapi_yandex_direct/tapi_yandex_direct.pyi

@@ -101,7 +101,9 @@ class YandexDirect:
         login: str = None,
         is_sandbox: bool = False,
         retry_if_not_enough_units: bool = False,
+        retries_if_not_enough_units: int = 5,
         retry_if_exceeded_limit: bool = True,
+        retries_if_exceeded_limit: int = 5,
         retries_if_server_error: int = 5,
         language: str = None,
         processing_mode: str = "offline",
@@ -119,8 +121,10 @@ class YandexDirect:
         :param login: If you are making inquiries from an agent account, you must be sure to specify the account login.
         :param is_sandbox: Enable sandbox.
         :param retry_if_not_enough_units: Repeat request when units run out
+        :param retries_if_not_enough_units: Maximum total request attempts when units run out (includes the initial attempt; default 5 = 1 initial + 4 retries).
         :param retry_if_exceeded_limit: Repeat the request if the limits on the number of reports or requests are exceeded.
-        :param retries_if_server_error: Number of retries when server errors occur.
+        :param retries_if_exceeded_limit: Maximum total request attempts when report/request limits are exceeded (includes the initial attempt; default 5 = 1 initial + 4 retries).
+        :param retries_if_server_error: Maximum total request attempts when server errors occur (includes the initial attempt; default 5 = 1 initial + 4 retries).
         :param language: The language in which the data for directories and errors will be returned.
 
         :param processing_mode: (report resource) Report generation mode: online, offline or auto.

{direct_cli-0.3.16 → direct_cli-0.4.1}/direct_cli/_vendor/tapi_yandex_direct/v4/adapter.py

@@ -34,7 +34,8 @@ class V4LiveClientAdapter(JSONAdapterMixin, TapiAdapter):
         super().__init__(*args, **kwargs)
 
     def get_api_root(self, api_params: dict, resource_name: str) -> str:
-        return get_direct_api_root(api_params)
+        # v4 Live lives on the .ru host (the v5 JSON API uses .com).
+        return get_direct_api_root(api_params, tld="ru")
 
     def get_request_kwargs(self, api_params: dict, *args, **kwargs) -> dict:
         params = super().get_request_kwargs(api_params, *args, **kwargs)
@@ -176,11 +177,14 @@ class V4LiveClientAdapter(JSONAdapterMixin, TapiAdapter):
                 code = 0
 
         if code in (54, 55) and api_params.get("retry_if_exceeded_limit", True):
-            # Bound the limit-exceeded retries with the same attempt budget as
-            # the server-error branch below.  Without this guard the loop is
-            # infinite (sleep 10s, retry, forever) whenever the API keeps
-            # returning code 54/55 — which hangs the caller indefinitely.
-            if repeat_number < api_params.get("retries_if_server_error", 5):
+            # Bound the limit-exceeded retries with their own attempt budget.
+            # Without a cap the loop is infinite (sleep 10s, retry, forever)
+            # whenever the API keeps returning code 54/55 — which hangs the
+            # caller indefinitely.  Rate-limit retries use a dedicated
+            # ``retries_if_exceeded_limit`` budget so they stay independent of
+            # the server-error budget (a caller may want, e.g., zero
+            # server-error retries but still tolerate rate limiting).
+            if repeat_number < api_params.get("retries_if_exceeded_limit", 5):
                 logger.warning("v4 Live limit exceeded (code=%s), retry in 10s", code)
                 time.sleep(10)
                 return True

{direct_cli-0.3.16 → direct_cli-0.4.1}/direct_cli/_vendor/tapi_yandex_direct/v4/adapter.pyi

@@ -48,6 +48,7 @@ class YandexDirectV4Live:
         is_sandbox: bool = False,
         language: str = "en",
         retry_if_exceeded_limit: bool = True,
+        retries_if_exceeded_limit: int = 5,
         retries_if_server_error: int = 5,
         finance_token: Optional[str] = None,
         operation_num: Optional[int] = None,

{direct_cli-0.3.16 → direct_cli-0.4.1}/direct_cli/auth.py

@@ -33,6 +33,9 @@ DEFAULT_OAUTH_CLIENT_ID = "dcf15d9625f6471d94d6d054d52017ba"
 AUTH_STORE_PATH = Path.home() / ".direct-cli" / "auth.json"
 OAUTH_REFRESH_SKEW_SECONDS = 60
 PENDING_PKCE_TTL_SECONDS = 600
+# Hard ceiling for the best-effort client-login resolution network call so it
+# can never hang the credential-resolution path (see #480 follow-up).
+LOGIN_RESOLVE_TIMEOUT_SECONDS = 8
 
 
 def op_read(ref: str) -> str:
@@ -601,6 +604,58 @@ def resolve_login(token: str) -> Optional[str]:
         return None
 
 
+def _resolve_client_login_via_api(token: str) -> Optional[str]:
+    """Return the bare Direct **Client-Login** for *token* via v5 ``clients.get``.
+
+    The Passport ``/info`` login can be a full email (``<login>@yandex.ru``);
+    Direct v4 AccountManagement rejects that with ``FaultCode 259`` (issue
+    #480). ``clients.get`` (no ``SelectionCriteria``) returns the authoritative
+    Client-Login for the token's own account, avoiding any unreliable
+    ``split('@')`` guessing. Best-effort: returns ``None`` on any failure.
+    """
+    try:
+        # Lazy import: api.py imports this module, so importing the vendored
+        # client at module load would create a cycle. The vendor never imports
+        # auth, so a function-local import is safe.
+        from ._vendor.tapi_yandex_direct import YandexDirect
+
+        # Best-effort, on the credential-resolution hot path: cap the wait so a
+        # slow network or a Yandex SmartCaptcha gateway can never hang the CLI
+        # indefinitely (requests defaults to no timeout). Retries are disabled
+        # so the ceiling stays a single connect+read window.
+        client = YandexDirect(
+            access_token=token,
+            retry_if_exceeded_limit=False,
+            retries_if_server_error=0,
+        )
+        result = client.clients().post(
+            data={"method": "get", "params": {"FieldNames": ["Login"]}},
+            timeout=LOGIN_RESOLVE_TIMEOUT_SECONDS,
+        )
+        data = result().extract()
+        clients = data.get("Clients") if isinstance(data, dict) else None
+        if clients and isinstance(clients[0], dict):
+            login = clients[0].get("Login")
+            if login:
+                return login
+    except Exception as exc:  # best-effort; never block login on this
+        logging.debug("resolve client login via API failed: %s", exc)
+    return None
+
+
+def resolve_account_login(token: str) -> Optional[str]:
+    """Resolve the bare Direct Client-Login for an OAuth *token*.
+
+    Prefers the authoritative v5 ``clients.get`` Login (which v4 accepts);
+    falls back to the Passport login only when the API call fails (that value
+    may be a full email and can break v4 — see :func:`_resolve_client_login_via_api`).
+    """
+    login = _resolve_client_login_via_api(token)
+    if login:
+        return login
+    return resolve_login(token)
+
+
 def get_credentials(
     token: Optional[str] = None,
     login: Optional[str] = None,
@@ -610,6 +665,7 @@ def get_credentials(
     bw_token_ref: Optional[str] = None,
     bw_login_ref: Optional[str] = None,
     profile: Optional[str] = None,
+    allow_login_resolve: bool = True,
 ) -> Tuple[str, Optional[str]]:
     """
     Get credentials with priority:
@@ -655,6 +711,41 @@ def get_credentials(
             final_token = oauth_profile["token"]
             if not final_login:
                 final_login = oauth_profile["login"]
+            stored_login = oauth_profile.get("login")
+            if (
+                allow_login_resolve
+                and not login
+                and oauth_profile.get("source") == "oauth"
+                and isinstance(stored_login, str)
+                and "@" in stored_login
+                and not oauth_profile.get("login_migration_checked")
+            ):
+                # One-time migration (#480): older OAuth profiles saved the
+                # Passport email in `login`, which Direct v4 rejects with
+                # FaultCode 259. Resolve the bare Client-Login and rewrite the
+                # profile — but only when the stored email's local part matches
+                # the resolved login, so agency profiles whose login differs
+                # from the token owner are never clobbered. Either way we stamp
+                # `login_migration_checked` once the resolver answered, so the
+                # network round-trip never repeats per command for profiles that
+                # are intentionally left unmigrated (e.g. agency logins).
+                resolved = _resolve_client_login_via_api(final_token)
+                if resolved:
+                    matches = (
+                        stored_login.split("@", 1)[0].lower() == resolved.lower()
+                    )
+                    if matches:
+                        final_login = resolved
+                    try:
+                        store = load_auth_store()
+                        prof = store["profiles"].get(selected_profile)
+                        if isinstance(prof, dict):
+                            prof["login_migration_checked"] = True
+                            if matches:
+                                prof["login"] = resolved
+                            save_auth_store(store)
+                    except Exception as exc:  # best-effort persistence
+                        logging.debug("login migration persist failed: %s", exc)
 
     if selected_profile and not final_token:
         env_token, env_login = get_env_profile(selected_profile)