mainsequence 9.0.21.dev63__py3-none-any.whl → 9.0.22.dev65__py3-none-any.whl

mainsequence/cli/api.py

@@ -63,7 +63,27 @@ MCP_PROTOCOL_VERSION = "2025-11-25"
 MCP_CLIENT_NAME = "mainsequence-cli"
 MCP_MAX_RESOURCE_PAGES = 100
 
-S = requests.Session()
+
+class _CliSession(requests.Session):
+    """The CLI's HTTP session.
+
+    A request sent without its own timeout gets the SDK's default request
+    budget: 5 s to connect, 120 s to read and 125 s in total, inside any budget
+    that is already running.
+    """
+
+    def request(self, method, url, **kwargs):
+        if kwargs.get("timeout") is not None:
+            return super().request(method, url, **kwargs)
+        # The CLI imports the SDK client on its first request, not when it starts.
+        from mainsequence._transport import DEFAULT_TIMEOUT, request_budget
+
+        with request_budget(DEFAULT_TIMEOUT) as budget:
+            kwargs["timeout"] = budget.timeout()
+            return super().request(method, url, **kwargs)
+
+
+S = _CliSession()
 S.headers.update({"Content-Type": "application/json"})
 
 
@@ -494,7 +514,7 @@ def _mcp_json_rpc(
     default request budget: 5 s to connect, 120 s to read, 125 s in total.
     """
     # The CLI imports the SDK client only where it needs it.
-    from mainsequence.client._transport import DEFAULT_TIMEOUT, request_budget
+    from mainsequence._transport import DEFAULT_TIMEOUT, request_budget
 
     payload = {
         "jsonrpc": "2.0",

mainsequence/cli/cli.py

@@ -1946,6 +1946,10 @@ def login(
     except ApiError as e:
         error(f"Login failed: {e}")
         raise typer.Exit(1) from e
+    except (requests.exceptions.ConnectionError, requests.exceptions.Timeout) as e:
+        # Never echo the exception: a transport error can carry request details.
+        error(f"The backend at {normalized_backend} could not be reached ({type(e).__name__}).")
+        raise typer.Exit(1) from e
     finally:
         if previous_backend_override is None:
             os.environ.pop("MAINSEQUENCE_ENDPOINT", None)

mainsequence/client/agent_runtime_models.py

@@ -12,7 +12,7 @@ from typing import Any, ClassVar, Literal
 import requests
 from pydantic import ConfigDict, Field, model_validator
 
-from ._transport import request_budget, request_within_budget
+from .._transport import request_budget, request_within_budget
 from .base import (
     BaseObjectOrm,
     BasePydanticModel,

mainsequence/client/utils.py

@@ -28,10 +28,10 @@ from mainsequence.runtime_credential_exchange import (
     identity_token_file_from_environment,
 )
 
-from ._transport import DEFAULT_ALLOWED_METHODS as DEFAULT_ALLOWED_METHODS
-from ._transport import DEFAULT_STATUS_FORCELIST as DEFAULT_STATUS_FORCELIST
-from ._transport import DEFAULT_TIMEOUT as DEFAULT_TIMEOUT
-from ._transport import DeadlineHTTPAdapter, remaining_timeout, request_budget
+from .._transport import DEFAULT_ALLOWED_METHODS as DEFAULT_ALLOWED_METHODS
+from .._transport import DEFAULT_STATUS_FORCELIST as DEFAULT_STATUS_FORCELIST
+from .._transport import DEFAULT_TIMEOUT as DEFAULT_TIMEOUT
+from .._transport import DeadlineHTTPAdapter, remaining_timeout, request_budget
 
 # ---- Backend defaults (single source of truth) ----
 MAINSEQUENCE_ENDPOINT = resolve_backend_endpoint()

mainsequence/logconf.py

@@ -5,7 +5,6 @@ import logging
 import logging.config
 import os
 import sys
-import time
 import traceback
 from collections.abc import Mapping
 from importlib.metadata import PackageNotFoundError
@@ -20,6 +19,7 @@ from structlog.contextvars import bind_contextvars, unbind_contextvars
 from structlog.dev import ConsoleRenderer
 from structlog.stdlib import BoundLogger
 
+from ._transport import DeadlineHTTPAdapter, request_budget
 from .defaults import resolve_backend_endpoint
 from .instrumentation import OTelJSONRenderer
 from .repository_identity_security import UNSUPPORTED_SOURCE_IDENTITY_ENV_NAMES
@@ -76,14 +76,27 @@ class CustomConsoleRenderer(ConsoleRenderer):
         return rendered
 
 
-def _request_job_startup_state(*, timeout_s: float = 10.0) -> dict[str, Any]:
+def _request_job_startup_state(*, timeout_s: float | None = None) -> dict[str, Any]:
     """
     Fetch startup state from backend using current env vars (JWT auth, endpoint, job_run_uid).
     Safe to call later after auth when access/refresh tokens become available.
+
+    The whole read, token renewal included, ends within one request budget:
+    ``timeout_s`` seconds in total, or the SDK's default request budget when it is
+    None. The GET is retried like any other SDK read. The startup state only
+    enriches the logger, so when the backend cannot be reached or does not answer
+    in time this reports it on stderr and returns an empty state instead of
+    failing the import.
     """
     if not is_running_in_pod():
         return {}
 
+    with request_budget(timeout_s) as budget:
+        return _read_job_startup_state(budget)
+
+
+def _read_job_startup_state(budget) -> dict[str, Any]:
+
     auth_mode = (os.getenv("MAINSEQUENCE_AUTH_MODE") or "jwt").strip().lower()
 
     def _backend_base_url() -> str:
@@ -110,7 +123,7 @@ def _request_job_startup_state(*, timeout_s: float = 10.0) -> dict[str, Any]:
                 token_url,
                 headers={"Content-Type": "application/json"},
                 json=body,
-                timeout=timeout_s,
+                timeout=budget.timeout(),
                 allow_redirects=False,
             )
 
@@ -119,7 +132,7 @@ def _request_job_startup_state(*, timeout_s: float = 10.0) -> dict[str, Any]:
                 _post,
                 credential_id=(os.getenv(RUNTIME_CREDENTIAL_ID_ENV) or "").strip(),
                 identity_token_file=identity_token_file_from_environment(),
-                deadline=time.monotonic() + timeout_s,
+                deadline=budget.deadline,
             )
         except Exception:
             return False
@@ -155,7 +168,7 @@ def _request_job_startup_state(*, timeout_s: float = 10.0) -> dict[str, Any]:
                 f"{_backend_base_url()}/auth/jwt-token/token/refresh/",
                 headers={"Content-Type": "application/json"},
                 json={"refresh": refresh_token},
-                timeout=timeout_s,
+                timeout=budget.timeout(),
             )
         except Exception:
             return False
@@ -202,10 +215,25 @@ def _request_job_startup_state(*, timeout_s: float = 10.0) -> dict[str, Any]:
     endpoint = f"{_backend_base_url()}/api/v1/job-runs/{job_run_uid}/startup-state/"
     params: dict[str, Any] = {}
 
-    resp = requests.get(endpoint, headers=headers, params=params, timeout=timeout_s)
-    if resp.status_code in {401, 403} and using_jwt and _refresh_access_token():
-        headers, _ = _auth_headers()
-        resp = requests.get(endpoint, headers=headers, params=params, timeout=timeout_s)
+    try:
+        with requests.Session() as session:
+            adapter = DeadlineHTTPAdapter(retries=3, backoff_factor=0.5)
+            session.mount("https://", adapter)
+            session.mount("http://", adapter)
+            resp = session.get(endpoint, headers=headers, params=params, timeout=budget.timeout())
+            if resp.status_code in {401, 403} and using_jwt and _refresh_access_token():
+                headers, _ = _auth_headers()
+                resp = session.get(
+                    endpoint, headers=headers, params=params, timeout=budget.timeout()
+                )
+    except requests.RequestException as exc:
+        # The exception text is not echoed: it can carry the request URL and headers.
+        print(
+            "mainsequence: the Job startup state could not be read "
+            f"({type(exc).__name__}); continuing without it.",
+            file=sys.stderr,
+        )
+        return {}
 
     if resp.status_code != 200:
         # Do not spam stdout during CLI usage when auth context is not present yet.
@@ -426,7 +454,7 @@ def build_application_logger(application_name: str = "ms-sdk", **metadata):
     return logger
 
 
-def refresh_application_logger_bindings(*, timeout_s: float = 10.0) -> BoundLogger:
+def refresh_application_logger_bindings(*, timeout_s: float | None = None) -> BoundLogger:
     """
     Importable helper: call this AFTER the user authenticates / token exists.
     It re-fetches backend state and binds the same keys as build_application_logger().

{mainsequence-9.0.21.dev63.dist-info → mainsequence-9.0.22.dev65.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mainsequence
-Version: 9.0.21.dev63
+Version: 9.0.22.dev65
 Summary: Main Sequence SDK
 Author-email: Main Sequence GmbH <dev@main-sequence.io>
 License-Expression: MIT

{mainsequence-9.0.21.dev63.dist-info → mainsequence-9.0.22.dev65.dist-info}/RECORD

@@ -11,19 +11,20 @@ agent_scaffold/skills/sdk_code_repository_execution/SKILL.md,sha256=zly7MheB-Sjd
 mainsequence/__init__.py,sha256=70CbIo7ZG1mzi5uwkqDtVESunBE0RanHjeFg4ptfsA0,385
 mainsequence/__main__.py,sha256=KuAP69uduS2ImrPIgNMzbGBRepZzjqvUONu5vFh4v4A,176
 mainsequence/_request_identity.py,sha256=vsbnQeJ9ycRB2p8oFTUxfPkzDh7-SBQ5Pxzn04pjqVM,4183
+mainsequence/_transport.py,sha256=gFSw5bl4O2o3NwZOk-ueNnTQvySBecyhC2-7OPb-BPk,8425
 mainsequence/bootstrap.py,sha256=AvG55Y46RcshVqJZsyqvUDN62CJg4CDbHu0Bvsbwfzs,2910
 mainsequence/code_repository_context.py,sha256=JRrWjwpnUy8I-OjSd9hHlrcq8-Ow3Zeh_N6cYvmtA3o,28545
 mainsequence/code_repository_skills.py,sha256=AyC1HFAxQXHXNBGbarVUJS2cHd4X5HwDx6u8XBophbE,23611
 mainsequence/defaults.py,sha256=5r6s7AI-X40rpm1D3IgcNsWam7iJg4_lIxB3F_1u2z0,408
-mainsequence/logconf.py,sha256=IxBuadkLTIBijNiEyid7rCkrZZP01WAQNaVhrj0OCuk,19005
+mainsequence/logconf.py,sha256=q4aTXScwR3lW1nOB3KdamwUDRR7dNeKvmfFtp36msI0,20274
 mainsequence/repository_identity_security.py,sha256=Cdywndhiy1zJFUPh-FfM90RjZ3Hg3tjhxBr64FRhmXs,1035
 mainsequence/runtime_credential_exchange.py,sha256=D-gDGHljKnGbMfOiUi_uJ9b5yVFkYB1CB2hikYxTdO4,6152
 mainsequence/runtime_flags.py,sha256=1eTM7VRRhnuZ_GXcmFhqAmdEKwyQYMyZcPsio88vJRQ,378
 mainsequence/scaffold_skills.py,sha256=k0V6eKC5AwbHr9wB9UGMJNF-8eJ0_1izF4-BU01KHrg,10606
 mainsequence/cli/__init__.py,sha256=sMWTnomCaISjnureLuXFRqOzkH2Y77uYEivsd-M6_8Y,28
-mainsequence/cli/api.py,sha256=QmdNd_dt0l0YQdWn0qKVTWjrQD7DXgIBl-tsfdzffBc,128140
+mainsequence/cli/api.py,sha256=u3vjwJ5w_u4o76ufkePXKIh6dixOHDok_r8Os0iA_04,128865
 mainsequence/cli/browser_auth.py,sha256=Vb5MBOnPC05HLZzVNUDODobJ_p5wEIzH_h8rIlpShlE,9984
-mainsequence/cli/cli.py,sha256=zV6vMnOkVjZrdNjknCRgqxSJAkYHYt7D874F8uAfgZI,269549
+mainsequence/cli/cli.py,sha256=8EM0j2rRvGX-t1ByfkVD8HUUx5QgK1BiurCImZfjqYI,269846
 mainsequence/cli/code_repository_status.py,sha256=SHEnU8YSWFowPG6dEdE4Yd8CS1tIcJSE1MXFLfvD3Os,5975
 mainsequence/cli/config.py,sha256=TJYnM11kg5pH2O7AGWFLpNEkC9UEu0g7k2RLjhAHCzo,45724
 mainsequence/cli/docker_utils.py,sha256=eAnp9MI042cHWwKasA5IF2I7INL3A6tV2JX-cSIe7rc,10687
@@ -35,8 +36,7 @@ mainsequence/cli/sdk_utils.py,sha256=SFuSzh8WDNf21mLiDa51K8Fqe5XiLWh2KhHj8zUjCXo
 mainsequence/cli/ssh_utils.py,sha256=m7HgFHZQ545sxY9igfQLpaNjWHm4SiN9VwCkAuGy2yw,11124
 mainsequence/cli/ui.py,sha256=memd6pmjALfGj8zndGCx_z80ztQeqTcOvcofU0un34U,2277
 mainsequence/client/__init__.py,sha256=lsr9JWxeVqOG0KRoHErW5M40ACPSR7SAEE508dTN5XM,672
-mainsequence/client/_transport.py,sha256=gFSw5bl4O2o3NwZOk-ueNnTQvySBecyhC2-7OPb-BPk,8425
-mainsequence/client/agent_runtime_models.py,sha256=6YbX1K8fA4UxbuOb9GMjbHYJJ9z50oKHExRITp78yyA,74616
+mainsequence/client/agent_runtime_models.py,sha256=xjXq0MyLGrXvwJRsz39EDv56I4X-iCbMn51nB_5Yte8,74617
 mainsequence/client/base.py,sha256=ZxuwUIscBNQGvByd7NGbn03VtNU9nazqkEouyKfVLk0,43129
 mainsequence/client/client.py,sha256=Jaw9RYObdVDS5J2O0pln99-XpuW9e4vW-SsbJRNldfw,3866
 mainsequence/client/compute_validation.py,sha256=ByeX0CkIE7qq06ggZFfN92U3Qp2e9cvo2RTIGWa5_Vw,6662
@@ -47,16 +47,16 @@ mainsequence/client/models_foundry.py,sha256=JwQdPLDSO4dZI-KC0SUdmN6izmNIKMb9IzZ
 mainsequence/client/models_helpers.py,sha256=CQRjBjx3DsREJLRk0vqFsC-Dcll5lUP2ofu6e5UMvhk,49051
 mainsequence/client/models_user.py,sha256=aOs_ouI1j9sr2oAaV94xhrD6KcN1DYKBcjPMZxkhD88,46235
 mainsequence/client/observability.py,sha256=_WrDKCaNk_TXmKElKCXC1inork6Exxxe8FRY4m1GI9s,16008
-mainsequence/client/utils.py,sha256=C0h0U-fOBZw3UxIwHcBTLf8CDClAOatf_oRgjvqFth4,31637
+mainsequence/client/utils.py,sha256=Rk2z-78swO6GepibLlQNdxL1eqYy8vHGrjiZdV3G5CM,31641
 mainsequence/client/value_sets.py,sha256=7TA-mpuAd3hOduNgO1WTQQTuNOGaFgue-VqCsDWKaC8,6181
 mainsequence/instrumentation/__init__.py,sha256=J_9XmfjprElvz0u2t9rTyJT0kFdyKpxdbkdQiaw28_U,316
 mainsequence/instrumentation/utils.py,sha256=b-ihjSioAepeLfMpudM2SqCtvnxMqIXileHx3klBCQU,3377
 mainsequence/server/__init__.py,sha256=BHUAhtdWPDRdxX07NYO_6wrBv5mf0GsXflecO52PmUc,73
 mainsequence/server/caller_assertions.py,sha256=7OEgPXxiGv-P98K6-XVKFSiNcYZkEFDmehBc_oJKkFM,12563
 mainsequence/server/fastapi.py,sha256=ZMtazH8ZN2C82uTkBtl0UQdx6F9mlCHD1HurgZQdHbU,18512
-mainsequence-9.0.21.dev63.dist-info/licenses/LICENSE,sha256=b6Ecsk8wjsEby3lbSzdljR6hHiFGHBizt9iWV2p1c_I,1074
-mainsequence-9.0.21.dev63.dist-info/METADATA,sha256=DZE9U8O44iaS_t1bomPj8dw2f4nmR2tGylZyBkW1HLM,7467
-mainsequence-9.0.21.dev63.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-mainsequence-9.0.21.dev63.dist-info/entry_points.txt,sha256=XGAOq3-mF2lWWpeRJvoaWyMarRcK167mH1g124aGdUs,88
-mainsequence-9.0.21.dev63.dist-info/top_level.txt,sha256=BFeblM_Q9q0cUWBvTxnfWcWQEHtf5XZi9nOS-Gdfwus,28
-mainsequence-9.0.21.dev63.dist-info/RECORD,,
+mainsequence-9.0.22.dev65.dist-info/licenses/LICENSE,sha256=b6Ecsk8wjsEby3lbSzdljR6hHiFGHBizt9iWV2p1c_I,1074
+mainsequence-9.0.22.dev65.dist-info/METADATA,sha256=iVI-Dap3Gl5LvTSpmppG5uR9Q8vMKnRauM7J-GURhew,7467
+mainsequence-9.0.22.dev65.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+mainsequence-9.0.22.dev65.dist-info/entry_points.txt,sha256=XGAOq3-mF2lWWpeRJvoaWyMarRcK167mH1g124aGdUs,88
+mainsequence-9.0.22.dev65.dist-info/top_level.txt,sha256=BFeblM_Q9q0cUWBvTxnfWcWQEHtf5XZi9nOS-Gdfwus,28
+mainsequence-9.0.22.dev65.dist-info/RECORD,,