llamactl 0.2.7a1__py3-none-any.whl → 0.3.0__py3-none-any.whl

llama_deploy/cli/textual/secrets_form.py

@@ -1,11 +1,10 @@
 """Textual-based deployment forms for CLI interactions"""
 
 from llama_deploy.cli.env import load_env_secrets_from_string
-
 from textual.app import ComposeResult
 from textual.containers import HorizontalGroup, Widget
-from textual.widgets import Button, Input, Label, Static, TextArea
 from textual.reactive import reactive
+from textual.widgets import Button, Input, Label, Static, TextArea
 
 
 class SecretsWidget(Widget):
@@ -62,25 +61,34 @@ class SecretsWidget(Widget):
     """
     secrets = reactive({}, recompose=True)  # Auto-recompose when secrets change
     prior_secrets = reactive(set(), recompose=True)
-    visible_secrets = reactive(
-        set(), recompose=True
-    )  # Auto-recompose when visible secrets change
+    visible_secrets = reactive(set(), recompose=True)
 
     def __init__(
         self,
         initial_secrets: dict[str, str] | None = None,
         prior_secrets: set[str] | None = None,
+        info_message: str | None = None,
     ):
         super().__init__()
         self.secrets = initial_secrets or {}
         self.prior_secrets = prior_secrets or set()
         self.visible_secrets = set()
+        # Persist textarea content across recomposes triggered by other actions
+        self._new_secrets_text = ""
+        self.info_message = info_message
 
     def compose(self) -> ComposeResult:
         """Compose the secrets section - called automatically when secrets change"""
-        yield Static("Environment Variables", classes="secrets-header")
-        secret_names = self.prior_secrets.union(self.secrets.keys())
+        yield Static("Secrets", classes="secrets-header")
+        # Preserve deterministic order: known secrets in insertion order, then prior-only sorted
+        known_secret_names = list(self.secrets.keys())
+        prior_only_secret_names = sorted(
+            [name for name in self.prior_secrets if name not in self.secrets]
+        )
+        secret_names = known_secret_names + prior_only_secret_names
         hidden = len(secret_names) == 0
+        if self.info_message:
+            yield Static(self.info_message, classes="secondary-message mb-1")
         with Static(
             classes="secrets-grid" + (" hidden" if hidden else ""),
             id="secrets-grid",
@@ -108,9 +116,15 @@ class SecretsWidget(Widget):
                     compact=True,
                 )
 
+        # Short help text for textarea format
+        yield Static(
+            "Format: one per line, KEY=VALUE",
+            classes="secret-label",
+        )
+
         with HorizontalGroup(classes="text-container"):
             yield TextArea(
-                "",
+                self._new_secrets_text,
                 id="new_secrets",
                 show_line_numbers=True,
                 highlight_cursor_line=True,
@@ -154,6 +168,7 @@ class SecretsWidget(Widget):
 
         # Clear textarea
         textarea.text = ""
+        self._new_secrets_text = ""
 
     def _toggle_secret_visibility(self, secret_name: str) -> None:
         """Toggle the visibility of a secret"""
@@ -175,6 +190,11 @@ class SecretsWidget(Widget):
             updated_prior_secrets.remove(secret_name)
             self.prior_secrets = updated_prior_secrets
 
+    def on_text_area_changed(self, event: TextArea.Changed) -> None:
+        """Track textarea edits so content persists across recomposes."""
+        text = event.text_area.text
+        self._new_secrets_text = text
+
     def get_updated_secrets(self) -> dict[str, str]:
         """Get current secrets with values from input fields"""
         self._add_secrets_from_textarea()

llama_deploy/cli/textual/styles.tcss

@@ -30,6 +30,10 @@ Container {
     height: auto;
 }
 
+.two-column-form-grid .full-width {
+    column-span: 2;
+}
+
 /* =============================================== */
 /* FORM ELEMENTS                                  */
 /* =============================================== */
@@ -72,6 +76,13 @@ Input.disabled {
     margin-top: 2;
 }
 
+.m-1 {
+    margin: 1;
+}
+.m-2 {
+    margin: 2;
+}
+
 .text-error {
     color: $error;
 }
@@ -95,32 +106,35 @@ Input.disabled {
     color: $text-error;
     background: $error-muted;
     border-left: heavy $error;
-    margin: 0 0 1 0;
-    padding: 0 0 0 1
+    padding: 0 0 0 1;
 }
 
 .primary-message {
     color: $text-primary;
     background: $primary-muted;
     border-left: heavy $primary;
-    margin: 0 0 1 0;
-    padding: 0 0 0 1
+    padding: 0 0 0 1;
 }
 
 .secondary-message {
     color: $text-secondary;
     background: $secondary-muted;
     border-left: heavy $secondary;
-    margin: 0 0 1 0;
-    padding: 0 0 0 1
+    padding: 0 0 0 1;
 }
 
 .success-message {
     color: $text-success;
     background: $success-muted;
     border-left: heavy $success;
-    padding: 1;
-    margin: 1 0;
+    padding: 0 0 0 1;
+}
+
+.warning-message {
+    color: $text-warning;
+    background: $warning-muted;
+    border-left: heavy $warning;
+    padding: 0 0 0 1;
 }
 
 .hidden {
@@ -138,6 +152,14 @@ Input.disabled {
     layout: vertical;
 }
 
+.flex-1 {
+    width: 1fr;
+}
+
+.align-right {
+    align: right middle;
+}
+
 /* =============================================== */
 /* BUTTONS & ACTIONS                              */
 /* =============================================== */
@@ -160,3 +182,22 @@ Button.secondary {
 }
 
 
+/* Centered button row for help back button */
+.centered-button-row {
+    align: center middle;
+    margin-top: 1;
+}
+
+/* Link-styled button */
+.link-button {
+    background: transparent;
+    color: $accent;
+    text-style: underline;
+    border: none;
+    padding: 0 1;
+}
+
+.info-message {
+    align: left middle;
+}
+

llama_deploy/cli/utils/env_inject.py

@@ -0,0 +1,23 @@
+from __future__ import annotations
+
+from typing import Dict
+
+from llama_deploy.cli.config.schema import Auth
+
+
+def env_vars_from_profile(profile: Auth) -> Dict[str, str]:
+    """Return env var values derived strictly from the given profile.
+
+    Produces the three keys expected by CLI commands:
+    - LLAMA_CLOUD_API_KEY
+    - LLAMA_CLOUD_BASE_URL
+    - LLAMA_DEPLOY_PROJECT_ID
+    """
+    values: Dict[str, str] = {}
+    if profile.api_key:
+        values["LLAMA_CLOUD_API_KEY"] = profile.api_key
+    if profile.api_url:
+        values["LLAMA_CLOUD_BASE_URL"] = profile.api_url
+    if profile.project_id:
+        values["LLAMA_DEPLOY_PROJECT_ID"] = profile.project_id
+    return values

{llamactl-0.2.7a1.dist-info → llamactl-0.3.0.dist-info}/METADATA

@@ -1,21 +1,24 @@
 Metadata-Version: 2.3
 Name: llamactl
-Version: 0.2.7a1
+Version: 0.3.0
 Summary: A command-line interface for managing LlamaDeploy projects and deployments
 Author: Adrian Lyjak
 Author-email: Adrian Lyjak <adrianlyjak@gmail.com>
 License: MIT
-Requires-Dist: llama-deploy-core>=0.2.7a1,<0.3.0
-Requires-Dist: llama-deploy-appserver>=0.2.7a1,<0.3.0
-Requires-Dist: httpx>=0.24.0
+Requires-Dist: llama-deploy-core[client]>=0.3.0,<0.4.0
+Requires-Dist: llama-deploy-appserver>=0.3.0,<0.4.0
+Requires-Dist: httpx>=0.24.0,<1.0.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: questionary>=2.0.0
 Requires-Dist: click>=8.2.1
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: tenacity>=9.1.2
-Requires-Dist: textual>=4.0.0
+Requires-Dist: textual>=6.0.0
 Requires-Dist: aiohttp>=3.12.14
-Requires-Python: >=3.12, <4
+Requires-Dist: copier>=9.9.0
+Requires-Dist: pyjwt[crypto]>=2.10.1
+Requires-Dist: vibe-llama>=0.4.2,<0.5.0
+Requires-Python: >=3.11, <4
 Description-Content-Type: text/markdown
 
 # llamactl

llamactl-0.3.0.dist-info/RECORD

@@ -0,0 +1,38 @@
+llama_deploy/cli/__init__.py,sha256=df028686233c4d5a3e244bb50c1c7b84cf2399ae03abe45eb4d01e53caa1be38,476
+llama_deploy/cli/app.py,sha256=9170e4f506c482522bd745eb1cdb700a198cfcfd7204c168c94e5ee2b6b43ffa,2199
+llama_deploy/cli/auth/client.py,sha256=0673e2fdc71e8cf1f6d79a64e39596e608dc0257b7dddfebcc38e13e1545a2a8,11670
+llama_deploy/cli/client.py,sha256=f4053b5183224cff55c1393e78887d1af2597219135379a851b742c676adc154,1727
+llama_deploy/cli/commands/aliased_group.py,sha256=bc41007c97b7b93981217dbd4d4591df2b6c9412a2d9ed045b0ec5655ed285f2,1066
+llama_deploy/cli/commands/auth.py,sha256=1381eee494c3a0c73253322b4a54af1a857d5b89e5f1685b8afa3422eecc5607,23937
+llama_deploy/cli/commands/deployment.py,sha256=46339e09135521c46ff90235ccf765c37b1a161cec11d92e92a54ceac6528b01,9883
+llama_deploy/cli/commands/env.py,sha256=36cb1b0abb9e3d1c5546d3e8a3c4c7839c4d6c2abf75763e39efb08376b3eae9,6808
+llama_deploy/cli/commands/init.py,sha256=46f9fcdc43880edbd2f244b4c80d5cc5d387a6f8d7407c182f5995c46e41c851,10153
+llama_deploy/cli/commands/serve.py,sha256=309b416bfc0b527cd8c8e041beb36b64e78342545f767af7fde3bc55dbbce961,8448
+llama_deploy/cli/config/_config.py,sha256=654a4b6d06542e3503edab7023fc1c3148de510b3e3f6194e28cd4bd3e7c029a,14230
+llama_deploy/cli/config/_migrations.py,sha256=37055641970e1ea41abc583f270dc8a9dab03076224a02cd5fb08bbab2b9259f,2333
+llama_deploy/cli/config/auth_service.py,sha256=8a61110e18c752bbec5fbca23cd5d35d4ec232a4371f8c8291ba07ad83d30c6c,5208
+llama_deploy/cli/config/env_service.py,sha256=cd51a68f1e9aad0bdd49cd76351cd54cea612a7f669512484c42e2876fea0458,2650
+llama_deploy/cli/config/migrations/0001_init.sql,sha256=aaffcb1fd0a00398ecf0af2d98ae26479c91519ec938efa99270f2d98dfdd1f4,1091
+llama_deploy/cli/config/migrations/0002_add_auth_fields.sql,sha256=31bd109e5fa0a9ad563a205b4c0e8110db4df3b4b3956704a0c0cdf345002daa,724
+llama_deploy/cli/config/migrations/__init__.py,sha256=a092bdd1eba7041e69db0a9594941821a6337018f90d7e231d651195a9db0a69,151
+llama_deploy/cli/config/schema.py,sha256=bd7b68eacd8a242c7f6fbccd176970425eeed504f593838d228a73ea75d73770,1542
+llama_deploy/cli/debug.py,sha256=e85a72d473bbe1645eb31772f7349bde703d45704166f767385895c440afc762,496
+llama_deploy/cli/env.py,sha256=d4b83c1f12e07f90893fcc7388d769de37dc2b41d345eb6bc2041c39b4fb2c31,1057
+llama_deploy/cli/interactive_prompts/session_utils.py,sha256=b996f2eddf70d6c49636c4797d246d212fce0950fe7e9a3f59cf6a1bf7ae26f5,1142
+llama_deploy/cli/interactive_prompts/utils.py,sha256=594cc2a242cc3405d66d0e26a60647496cc5fcb4ce7d0500a4cfec4888c9a0fa,516
+llama_deploy/cli/options.py,sha256=62ee7286c3305ddb4b597783d19e854284d79bf9384800045f15b934dc245c1d,1298
+llama_deploy/cli/py.typed,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
+llama_deploy/cli/styles.py,sha256=15901fb567b0d10470f56a06d863819c4ed00a9f90b2a8c46b4bc2fb1dbdf6c3,307
+llama_deploy/cli/textual/deployment_form.py,sha256=61ff18bceaba810b40d68aac104969b92870316a7025ba839242c1e0b6bde397,23677
+llama_deploy/cli/textual/deployment_help.py,sha256=91094f9c460421bae75bc705c02c64a9ec464a7e92dd2eb5de365cfd5b08a9a7,2463
+llama_deploy/cli/textual/deployment_monitor.py,sha256=86b2545eeee9ef4ff9c8bec0ee5c8eefd54373d2200da5906a886fb614e763cd,16723
+llama_deploy/cli/textual/git_validation.py,sha256=94c95b61d0cbc490566a406b4886c9c12e1d1793dc14038a5be37119223c9568,13419
+llama_deploy/cli/textual/github_callback_server.py,sha256=3111cc45b3ff2632255a37e4472c85084670c94bcea25ec428f06b0761dd27bf,7584
+llama_deploy/cli/textual/llama_loader.py,sha256=33cb32a46dd40bcf889c553e44f2672c410e26bd1d4b17aa6cca6d0a5d59c2c4,1468
+llama_deploy/cli/textual/secrets_form.py,sha256=df6699de29d2bc2cbcaddd41ad2495ce0e622cdccaadbc8369a6ee09a9e79d34,7251
+llama_deploy/cli/textual/styles.tcss,sha256=c8fa0eec00a97fa6907d223faaad82c6add1ea3f60009f1630be19282ea77e3b,3271
+llama_deploy/cli/utils/env_inject.py,sha256=01911758bcc3cf22aad0db0d1ade56aece48d6ad6bdb7186ea213337c67f5a89,688
+llamactl-0.3.0.dist-info/WHEEL,sha256=66530aef82d5020ef5af27ae0123c71abb9261377c5bc519376c671346b12918,79
+llamactl-0.3.0.dist-info/entry_points.txt,sha256=b67e1eb64305058751a651a80f2d2268b5f7046732268421e796f64d4697f83c,52
+llamactl-0.3.0.dist-info/METADATA,sha256=d0e36387e6908f030aa7c5e237e7983018ab9fd9d8f8f5ff036b6b071fd1d6f9,3252
+llamactl-0.3.0.dist-info/RECORD,,

{llamactl-0.2.7a1.dist-info → llamactl-0.3.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.7.21
+Generator: uv 0.7.20
 Root-Is-Purelib: true
 Tag: py3-none-any