glaip-sdk 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

glaip_sdk/cli/utils.py

@@ -30,6 +30,7 @@ from glaip_sdk.branding import (
     SUCCESS_STYLE,
     WARNING_STYLE,
 )
+from glaip_sdk.cli import display as cli_display
 from glaip_sdk.cli import masking, pager
 from glaip_sdk.cli.config import load_config
 from glaip_sdk.cli.constants import LITERAL_STRING_THRESHOLD, TABLE_SORT_ENABLED
@@ -40,7 +41,6 @@ from glaip_sdk.cli.context import (
 from glaip_sdk.cli.context import (
     detect_export_format as _detect_export_format,
 )
-from glaip_sdk.cli import display as cli_display
 from glaip_sdk.cli.hints import command_hint
 from glaip_sdk.cli.io import export_resource_to_file_with_validation
 from glaip_sdk.cli.rich_helpers import markup_text, print_markup
@@ -548,45 +548,48 @@ _spinner_stop = stop_spinner
 
 
 def get_client(ctx: Any) -> Client:  # pragma: no cover
-    """Get configured client from context, env, and config file (ctx > env > file)."""
+    """Get configured client from context and account store (ctx > account)."""
+    # Import here to avoid circular import
+    from glaip_sdk.cli.auth import resolve_credentials  # noqa: PLC0415
+
     module = importlib.import_module("glaip_sdk")
     client_class = cast("type[Client]", module.Client)
-    file_config = load_config() or {}
     context_config_obj = getattr(ctx, "obj", None)
     context_config = context_config_obj or {}
 
-    raw_timeout = os.getenv("AIP_TIMEOUT", "0") or "0"
-    try:
-        timeout_value = float(raw_timeout)
-    except ValueError:
-        timeout_value = None
-
-    env_config = {
-        "api_url": os.getenv("AIP_API_URL"),
-        "api_key": os.getenv("AIP_API_KEY"),
-        "timeout": timeout_value if timeout_value else None,
-    }
-    env_config = {k: v for k, v in env_config.items() if v not in (None, "", 0)}
-
-    # Merge config sources: context > env > file
-    config = {
-        **file_config,
-        **env_config,
-        **{k: v for k, v in context_config.items() if v is not None},
-    }
+    account_name = context_config.get("account_name")
+    api_url, api_key, _ = resolve_credentials(
+        account_name=account_name,
+        api_url=context_config.get("api_url"),
+        api_key=context_config.get("api_key"),
+    )
 
-    if not config.get("api_url") or not config.get("api_key"):
-        configure_hint = command_hint("configure", slash_command="login", ctx=ctx)
-        actions = []
+    if not api_url or not api_key:
+        configure_hint = command_hint("accounts add", slash_command="login", ctx=ctx)
+        actions: list[str] = []
         if configure_hint:
-            actions.append(f"Run `{configure_hint}`")
-        actions.append("set AIP_* env vars")
+            actions.append(f"Run `{configure_hint}` to add an account profile")
+        else:
+            actions.append("add an account with 'aip accounts add'")
         raise click.ClickException(f"Missing api_url/api_key. {' or '.join(actions)}.")
 
+    # Get timeout from context or config
+    timeout = context_config.get("timeout")
+    if timeout is None:
+        raw_timeout = os.getenv("AIP_TIMEOUT", "0") or "0"
+        try:
+            timeout = float(raw_timeout) if raw_timeout != "0" else None
+        except ValueError:
+            timeout = None
+    if timeout is None:
+        # Fallback to legacy config
+        file_config = load_config() or {}
+        timeout = file_config.get("timeout")
+
     return client_class(
-        api_url=config.get("api_url"),
-        api_key=config.get("api_key"),
-        timeout=float(config.get("timeout") or 30.0),
+        api_url=api_url,
+        api_key=api_key,
+        timeout=float(timeout or 30.0),
     )
 
 

{glaip_sdk-0.4.0.dist-info → glaip_sdk-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: glaip-sdk
-Version: 0.4.0
+Version: 0.5.0
 Summary: Python SDK for GL AIP (GDP Labs AI Agent Package) - Simplified CLI Design
 License: MIT
 Author: Raymond Christopher

{glaip_sdk-0.4.0.dist-info → glaip_sdk-0.5.0.dist-info}/RECORD

@@ -2,24 +2,27 @@ glaip_sdk/__init__.py,sha256=7ICOkPeiwQGkadqxIgJXOYPHcJOHYRIF_GU0xkjOtSE,366
 glaip_sdk/_version.py,sha256=5CHGCxx_36fgmMWuEx6jJ2CzzM-i9eBFyQWFwBi23XE,2259
 glaip_sdk/branding.py,sha256=tLqYCIHMkUf8p2smpuAGNptwaKUN38G4mlh0A0DOl_w,7823
 glaip_sdk/cli/__init__.py,sha256=xCCfuF1Yc7mpCDcfhHZTX0vizvtrDSLeT8MJ3V7m5A0,156
+glaip_sdk/cli/account_store.py,sha256=NXuAVPaJS_32Aw1VTaZCNwIID-gADw4F_UMieoWmg3g,17336
 glaip_sdk/cli/agent_config.py,sha256=YAbFKrTNTRqNA6b0i0Q3pH-01rhHDRi5v8dxSFwGSwM,2401
-glaip_sdk/cli/auth.py,sha256=wvzJJXKzOeRaGfuWSv7_VJMba-vbvID0Q5jRYpALOBg,15891
+glaip_sdk/cli/auth.py,sha256=ycT6CepbJDfUqRT0KBYXfBhnJYd-zJ_np1-DSiY3EWs,23040
 glaip_sdk/cli/commands/__init__.py,sha256=6Z3ASXDut0lAbUX_umBFtxPzzFyqoiZfVeTahThFu1A,219
-glaip_sdk/cli/commands/agents.py,sha256=RTfL-Hj-ORbbsJoRZMJD_MM-zO6P765GPZzZvGxUpYE,47686
-glaip_sdk/cli/commands/configure.py,sha256=urq9Wdnd2JbHSY2KJMCy0-4rBMhQLYsdlWL_YMVgVu8,11420
+glaip_sdk/cli/commands/accounts.py,sha256=VCG-JZGY86DlWO5bAfDZ70RuyKQ5q-Rh4U0iM8NwO6M,13755
+glaip_sdk/cli/commands/agents.py,sha256=CGYWTPpcFXUms_3SMB5Mr-YRpBh7c8iu-Mj245XhSCc,47686
+glaip_sdk/cli/commands/common_config.py,sha256=IY13gPkeifXxSdpzRFUvfRin8J7s38p6Y7TYjdGw7w4,2474
+glaip_sdk/cli/commands/configure.py,sha256=8vfgtNEMK2lnEk3i6H1ZevsjxnYA6jAj4evhWmsHi6w,14494
 glaip_sdk/cli/commands/mcps.py,sha256=tttqQnfM89iI9Pm94u8YRhiHMQNYNouecFX0brsT4cQ,42551
 glaip_sdk/cli/commands/models.py,sha256=vfcGprK5CHprQ0CNpNzQlNNTELvdgKC7JxTG_ijOwmE,2009
 glaip_sdk/cli/commands/tools.py,sha256=7_RMTuTI1Guu7psClovbyt2umfk4rkp7jSW19GXKA44,18440
-glaip_sdk/cli/commands/transcripts.py,sha256=4kI6FoaL9K5ch10tKr7vdT10UPdFi5f5ANZhCDytyss,26377
+glaip_sdk/cli/commands/transcripts.py,sha256=ofxZLus1xLB061NxrLo1J6LPEb2VIxJTjmz7hLKgPmc,26377
 glaip_sdk/cli/commands/update.py,sha256=rIZo_x-tvpvcwpQLpwYwso1ix6qTHuNNTL4egmn5fEM,1812
-glaip_sdk/cli/config.py,sha256=2NZxFyt8jc6CMRUbuxx7sq_wsfTJXmwQGn09hhYHGnE,1341
+glaip_sdk/cli/config.py,sha256=_UU7pljAhgzwKLx7Yqp2_ibiInR-dHuykC_UWL51BHc,2310
 glaip_sdk/cli/constants.py,sha256=zqcVtzfj6huW97gbCmhkFqntge1H-c1vnkGqTazADgU,895
 glaip_sdk/cli/context.py,sha256=--Y5vc6lgoAV7cRoUAr9UxSQaLmkMg29FolA7EwoRqM,3803
-glaip_sdk/cli/display.py,sha256=845_VGCFeQJfvwyLtAIj4E6Rs-alFNmTQXOOWpF-F5U,12137
-glaip_sdk/cli/hints.py,sha256=ZnBvQFgODCmKwRPNIjFswi7XAFsKOyVgFBroxI4jvq4,1597
+glaip_sdk/cli/display.py,sha256=ojgWdGeD5KUnGOmWNqqK4JP-1EaWHWX--DWze3BmIz0,12137
+glaip_sdk/cli/hints.py,sha256=ca4krG103IS43s5BSLr0-N7uRMpte1_LY4nAXVvgDxo,1596
 glaip_sdk/cli/io.py,sha256=ChP6CRKbtuENsNomNEaMDfPDU0iqO-WuVvl4_y7F2io,3871
-glaip_sdk/cli/main.py,sha256=lPX7IoUuQshAXQQPtdOl563H6VhLWvxCwW9tsFLoJqM,16967
-glaip_sdk/cli/masking.py,sha256=QRtUeHBVCJG02EXLxnPzfhRmD-leMxWf6QKxh4TCax0,3666
+glaip_sdk/cli/main.py,sha256=vWbx7nQBX2ZeMkNFFY2PA2Hr5vyr6-lOyx2ixzJeay0,20974
+glaip_sdk/cli/masking.py,sha256=2lrXQ-pfL7N-vNEQRT1s4Xq3JPDPDT8RC61OdaTtkkc,4060
 glaip_sdk/cli/mcp_validators.py,sha256=cwbz7p_p7_9xVuuF96OBQOdmEgo5UObU6iWWQ2X03PI,10047
 glaip_sdk/cli/pager.py,sha256=XygkAB6UW3bte7I4KmK7-PUGCJiq2Pv-4-MfyXAmXCw,7925
 glaip_sdk/cli/parsers/__init__.py,sha256=NzLrSH6GOdNoewXtKNpB6GwrauA8rb_IGYV6cz5Hn3o,113
@@ -27,21 +30,21 @@ glaip_sdk/cli/parsers/json_input.py,sha256=kxoxeIlgfsaH2jhe6apZAgSxAtwlpSINLTMRs
 glaip_sdk/cli/resolution.py,sha256=K-VaEHm9SYY_qfb9538VNHykL4_2N6F8iQqI1zMx_64,2402
 glaip_sdk/cli/rich_helpers.py,sha256=kO47N8e506rxrN6Oc9mbAWN3Qb536oQPWZy1s9A616g,819
 glaip_sdk/cli/slash/__init__.py,sha256=J9TPL2UcNTkW8eifG6nRmAEGHhyEgdYMYk4cHaaObC0,386
-glaip_sdk/cli/slash/agent_session.py,sha256=F11RYVBGs86Ox2zW7czXSBjojPx9jMAdgAiSxWdZl6k,11304
+glaip_sdk/cli/slash/agent_session.py,sha256=9r1xNRk5mk6rfJXV6KIf2Yo4B4hjknimd9fkxH1LO3c,11304
 glaip_sdk/cli/slash/prompt.py,sha256=2urqR3QqN3O09lHmKKSEbhsIdlS4B7hm9O8AP_VwCSU,8034
-glaip_sdk/cli/slash/remote_runs_controller.py,sha256=1kdnrH6HNlblqpRtTJVlWzWUeFPlmd6Ef_IDkqZ01CI,21354
-glaip_sdk/cli/slash/session.py,sha256=GB6rMHw5-5zl61XI1ShjtIKe6MOi3zc8biXJxPaw9do,57448
+glaip_sdk/cli/slash/remote_runs_controller.py,sha256=Ok6CezIeF1CPGQ8-QN3TRx5kGGEACOrgyPwH_BRRCyI,21354
+glaip_sdk/cli/slash/session.py,sha256=GvdpLri_TzuaWDEWHdfAIbdOjMf7MUGewxpEtW_5hPk,57642
 glaip_sdk/cli/slash/tui/__init__.py,sha256=ljBAeAFY2qNDkbJrZh5NgXxjwUlsv9-UxgKNIv0AF1Q,274
-glaip_sdk/cli/slash/tui/remote_runs_app.py,sha256=MRAY8AeUML8dUaC9eHyDK1gwEa6H12bI1XgcO8w21MI,24763
+glaip_sdk/cli/slash/tui/remote_runs_app.py,sha256=YAtBtgjtzIy5y2NVOQexZX783DJpqFUkwAVYkVn1tSo,24762
 glaip_sdk/cli/transcript/__init__.py,sha256=yiYHyNtebMCu3BXu56Xm5RBC2tDc865q8UGPnoe6QRs,920
 glaip_sdk/cli/transcript/cache.py,sha256=Wi1uln6HP1U6F-MRTrfnxi9bn6XJTxwWXhREIRPoMqQ,17439
-glaip_sdk/cli/transcript/capture.py,sha256=5Zmg0HXPs01-M8v37pNl_JmdMR6WGk7NxIvXVq-bFaI,10343
+glaip_sdk/cli/transcript/capture.py,sha256=t8j_62cC6rhb51oCluZd17N04vcXqyjkhPRcRd3ZcmM,10291
 glaip_sdk/cli/transcript/export.py,sha256=reCvrZVzli8_LzYe5ZNdaa-MwZ1ov2RjnDzKZWr_6-E,1117
 glaip_sdk/cli/transcript/history.py,sha256=2FBjawxP8CX9gRPMUMP8bDjG50BGM2j2zk6IfHvAMH4,26211
 glaip_sdk/cli/transcript/launcher.py,sha256=z5ivkPXDQJpATIqtRLUK8jH3p3WIZ72PvOPqYRDMJvw,2327
 glaip_sdk/cli/transcript/viewer.py,sha256=ar1SzRkhKIf3_DgFz1EG1RZGDmd2w2wogAe038DLL_M,13037
 glaip_sdk/cli/update_notifier.py,sha256=qv-GfwTYZdrhlSbC_71I1AvKY9cV4QVBmtees16S2Xg,9807
-glaip_sdk/cli/utils.py,sha256=rrkASWWpJMKrPPgV8UjrZdE3tsyH2rrCDQsyE0KBu6Y,53342
+glaip_sdk/cli/utils.py,sha256=Dtvi8mkrU3v88ZO2HwHL2iuzY8Ic3PTDL0YySWsvy0Q,53510
 glaip_sdk/cli/validators.py,sha256=d-kq4y7HWMo6Gc7wLXWUsCt8JwFvJX_roZqRm1Nko1I,5622
 glaip_sdk/client/__init__.py,sha256=F-eE_dRSzA0cc1it06oi0tZetZBHmSUjWSHGhJMLCls,263
 glaip_sdk/client/_agent_payloads.py,sha256=VfBHoijuoqUOixGBf2SA2vlQIXQmBsjB3sXHZhXYiec,17681
@@ -104,7 +107,7 @@ glaip_sdk/utils/resource_refs.py,sha256=vF34kyAtFBLnaKnQVrsr2st1JiSxVbIZ4yq0DelJ
 glaip_sdk/utils/run_renderer.py,sha256=d_VMI6LbvHPUUeRmGqh5wK_lHqDEIAcym2iqpbtDad0,1365
 glaip_sdk/utils/serialization.py,sha256=z-qpvWLSBrGK3wbUclcA1UIKLXJedTnMSwPdq-FF4lo,13308
 glaip_sdk/utils/validation.py,sha256=Vt8oSnn7OM6ns5vjOl5FwGIMWBPb0yI6RD5XL_L5_4M,6826
-glaip_sdk-0.4.0.dist-info/METADATA,sha256=3-W1vIpTHWJPyrCo9XrN1V-XSv_1cJRkctTVpIQiNdU,7053
-glaip_sdk-0.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-glaip_sdk-0.4.0.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
-glaip_sdk-0.4.0.dist-info/RECORD,,
+glaip_sdk-0.5.0.dist-info/METADATA,sha256=869wDTHn4xaN_DBTqmlZG7bQ7UXzKuhqGp1Mx_umkV8,7053
+glaip_sdk-0.5.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+glaip_sdk-0.5.0.dist-info/entry_points.txt,sha256=EGs8NO8J1fdFMWA3CsF7sKBEvtHb_fujdCoNPhfMouE,47
+glaip_sdk-0.5.0.dist-info/RECORD,,