urun-cli 0.1.2__tar.gz → 0.3.0__tar.gz

{urun_cli-0.1.2 → urun_cli-0.3.0}/.gitignore

@@ -12,3 +12,7 @@ htmlcov/
 dist/
 build/
 *.egg-info/
+
+# Local development environment
+.devcontainer.env
+.cache/

urun_cli-0.3.0/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Changelog
+
+## 0.3.0
+
+- Implement the `urun org` / `urun org id` command: print the caller's org id
+  (resolved via the control-plane org-config endpoint).
+- Implement `urun auth jwks set`: register the org's trusted JWKS for federated
+  identity, via `--jwks-url` or `--jwks-json` (file or stdin), with optional
+  `--issuer`/`--audience`. This registers a trust relationship only; JWTs are
+  issued out of band and the CLI never mints, fetches, or stores one.
+- Add `ApiClient.register_trusted_jwks`, calling `POST /org-config/trusted-jwks`.
+
+## 0.2.0
+
+- Bumped past 0.1.1/0.1.2 because both filenames were occupied by previously-deleted PyPI artifacts.
+- Drop the org-id requirement from `urun deploy`; authentication now relies solely on the API key.
+- Add `urun login`, `urun run`, and `urun org`/`urun auth` subcommands.
+
+## 0.1.0
+
+- Initial public `urun deploy` CLI.
+- Deploy from a Python app file with local Python imports included automatically.
+- Source manifest generation, dependency declaration upload, and API deploy flow.
+- Public docs for the config-free v1 CLI surface.

{urun_cli-0.1.2 → urun_cli-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: urun-cli
-Version: 0.1.2
+Version: 0.3.0
 Summary: End-user CLI for deploying apps to urun
 Project-URL: Homepage, https://urun.sh
 Project-URL: Repository, https://github.com/urun-sh/urun-cli
@@ -51,34 +51,47 @@ uvx urun-cli --version
 
 ## Quick start
 
-Set your API key:
+Today, an operator manually vends an org-scoped deploy API key. Save it locally
+with `urun login`:
 
 ```bash
-export URUN_API_KEY=urun_<32hex>
+urun login --api-key urun_<32hex>
 ```
 
-Create a small Python app:
+`urun login` verifies the key with the urun API and stores credentials for later
+commands. The future browser-based login flow is not available in this CLI
+release.
+
+For CI or one-off commands, you can still use the environment variable:
 
 ```bash
-cat > app.py <<'PY'
-print("hello from urun")
-PY
+export URUN_API_KEY=urun_<32hex>
 ```
 
-Deploy it:
+Create `app.py`:
 
-```bash
-urun deploy app.py
+```python
+import urun
+from urun import App
+
+app = App("hello-h100")
+
+
+@app.function(gpus="h100:1")
+def hello(ctx: urun.Context):
+    print(f"running on {ctx.device}")
+    return {"device": str(ctx.device)}
 ```
 
-You can also deploy a Python module:
+Run it:
 
 ```bash
-urun deploy -m my_package.main
+urun run app.py
 ```
 
-The API key identifies your account on the server side. There is no separate org
-ID, login step, or local project setup for the v1 CLI.
+In this release, `urun run` uses the same deploy pipeline as `urun deploy`.
+`deploy` remains available as the lower-level command while the full
+deploy/run/monitor workflow is being built.
 
 ## What gets deployed
 
@@ -86,11 +99,11 @@ ID, login step, or local project setup for the v1 CLI.
 
 | Entrypoint | Included source |
 | --- | --- |
-| `urun deploy app.py` | `app.py` only |
-| `urun deploy -m my_package.main` | Python files in the containing package |
+| `urun deploy app.py` | `app.py` and local Python files it imports |
 
-Dependency declarations are included when present. `pyproject.toml` is preferred;
-`requirements.txt` is used when no `pyproject.toml` exists.
+Dependencies are declared in your urun app code. Project-level files such as
+`pyproject.toml` and `requirements.txt` are not uploaded as dependency
+declarations by the CLI.
 
 Generated/cache content such as `.git`, dotfiles, `__pycache__`, and `.pyc`
 files is excluded. Add `.urunignore` to exclude additional paths.
@@ -100,12 +113,13 @@ auto-included yet.
 
 ## Common options
 
+Shared by `run` and `deploy`:
+
 | Option | Description |
 | --- | --- |
-| `-m, --module` | Deploy a Python module entrypoint, e.g. `my_package.main`. |
 | `--name` | Override the derived app name. |
-| `--api-url` | Override the API URL; defaults to `https://api.urun.sh/v1`. |
-| `--api-key` | API key; prefer `URUN_API_KEY` to avoid shell history leaks. |
+| `--api-url` | Override the API URL; defaults to `URUN_API_URL`, saved login credentials, or `https://api.urun.sh/v1`. |
+| `--api-key` | Deploy API key; defaults to `URUN_API_KEY` or saved login credentials. |
 | `--no-wait` | Finalize but do not poll for readiness. |
 | `--poll-interval`, `--timeout` | Control readiness polling. |
 
@@ -113,11 +127,11 @@ auto-included yet.
 
 | Error | Fix |
 | --- | --- |
-| `missing API key` | Set `URUN_API_KEY` or pass `--api-key`. |
+| `missing API key` | Run `urun login`, set `URUN_API_KEY`, or pass `--api-key`. |
 | `invalid API key format` | Use `urun_<32 lowercase hex chars>`. |
 | `entrypoint not found` | Run from the project root or pass the entrypoint path. |
 | `path is outside the project root` | Move the file under the project before deploying. |
-| Expected files are missing | Use a module entrypoint for packages; non-Python assets are not auto-included yet. |
+| Expected files are missing | Import local Python files from `app.py`; non-Python assets are not auto-included yet. |
 
 ## Development
 
@@ -126,3 +140,15 @@ Contributing and test instructions are in [CONTRIBUTING.md](CONTRIBUTING.md).
 ## License
 
 MIT.
+
+## Development environment
+
+This repo has a Nix/direnv/devcontainer baseline:
+
+```bash
+direnv allow
+just sync
+just check
+```
+
+Use VS Code Dev Containers to open the repository with the same toolchain in a container. Copy `devcontainer.env.example` to `.devcontainer.env` if you need to pass local git identity or other non-secret development settings into the container.

urun_cli-0.3.0/README.md

@@ -0,0 +1,132 @@
+# urun CLI
+
+Deploy Python apps to urun from your terminal.
+
+[![PyPI](https://img.shields.io/pypi/v/urun-cli.svg)](https://pypi.org/project/urun-cli/)
+[![Python](https://img.shields.io/pypi/pyversions/urun-cli.svg)](https://pypi.org/project/urun-cli/)
+
+## Install
+
+```bash
+uv tool install urun-cli
+# or
+pip install urun-cli
+```
+
+The package installs the `urun` command:
+
+```bash
+urun --version
+```
+
+For one-off `uvx` usage:
+
+```bash
+uvx --from urun-cli urun --version
+# or the package-matching command alias
+uvx urun-cli --version
+```
+
+## Quick start
+
+Today, an operator manually vends an org-scoped deploy API key. Save it locally
+with `urun login`:
+
+```bash
+urun login --api-key urun_<32hex>
+```
+
+`urun login` verifies the key with the urun API and stores credentials for later
+commands. The future browser-based login flow is not available in this CLI
+release.
+
+For CI or one-off commands, you can still use the environment variable:
+
+```bash
+export URUN_API_KEY=urun_<32hex>
+```
+
+Create `app.py`:
+
+```python
+import urun
+from urun import App
+
+app = App("hello-h100")
+
+
+@app.function(gpus="h100:1")
+def hello(ctx: urun.Context):
+    print(f"running on {ctx.device}")
+    return {"device": str(ctx.device)}
+```
+
+Run it:
+
+```bash
+urun run app.py
+```
+
+In this release, `urun run` uses the same deploy pipeline as `urun deploy`.
+`deploy` remains available as the lower-level command while the full
+deploy/run/monitor workflow is being built.
+
+## What gets deployed
+
+`urun deploy` creates a source manifest from your Python entrypoint:
+
+| Entrypoint | Included source |
+| --- | --- |
+| `urun deploy app.py` | `app.py` and local Python files it imports |
+
+Dependencies are declared in your urun app code. Project-level files such as
+`pyproject.toml` and `requirements.txt` are not uploaded as dependency
+declarations by the CLI.
+
+Generated/cache content such as `.git`, dotfiles, `__pycache__`, and `.pyc`
+files is excluded. Add `.urunignore` to exclude additional paths.
+
+Non-Python assets such as templates, static files, and data files are not
+auto-included yet.
+
+## Common options
+
+Shared by `run` and `deploy`:
+
+| Option | Description |
+| --- | --- |
+| `--name` | Override the derived app name. |
+| `--api-url` | Override the API URL; defaults to `URUN_API_URL`, saved login credentials, or `https://api.urun.sh/v1`. |
+| `--api-key` | Deploy API key; defaults to `URUN_API_KEY` or saved login credentials. |
+| `--no-wait` | Finalize but do not poll for readiness. |
+| `--poll-interval`, `--timeout` | Control readiness polling. |
+
+## Troubleshooting
+
+| Error | Fix |
+| --- | --- |
+| `missing API key` | Run `urun login`, set `URUN_API_KEY`, or pass `--api-key`. |
+| `invalid API key format` | Use `urun_<32 lowercase hex chars>`. |
+| `entrypoint not found` | Run from the project root or pass the entrypoint path. |
+| `path is outside the project root` | Move the file under the project before deploying. |
+| Expected files are missing | Import local Python files from `app.py`; non-Python assets are not auto-included yet. |
+
+## Development
+
+Contributing and test instructions are in [CONTRIBUTING.md](CONTRIBUTING.md).
+
+## License
+
+MIT.
+
+## Development environment
+
+This repo has a Nix/direnv/devcontainer baseline:
+
+```bash
+direnv allow
+just sync
+just check
+```
+
+Use VS Code Dev Containers to open the repository with the same toolchain in a container. Copy `devcontainer.env.example` to `.devcontainer.env` if you need to pass local git identity or other non-secret development settings into the container.

{urun_cli-0.1.2 → urun_cli-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "urun-cli"
-version = "0.1.2"
+version = "0.3.0"
 description = "End-user CLI for deploying apps to urun"
 readme = "README.md"
 requires-python = ">=3.11"

{urun_cli-0.1.2 → urun_cli-0.3.0}/src/urun/api.py

@@ -32,6 +32,18 @@ class ApiClient:
     def deployment_status(self, manifest_hash: str) -> dict[str, Any]:
         return self._json("GET", f"/deployment-status/{manifest_hash}", None)
 
+    def org_config(self) -> dict[str, Any]:
+        return self._json("GET", "/org-config", None)
+
+    def register_trusted_jwks(self, payload: dict[str, Any]) -> dict[str, Any]:
+        """Register this org's trusted JWKS with the control plane.
+
+        The org is derived server-side from the API key; the payload carries only
+        the trusted key source (jwks_url OR jwks_json) plus optional iss/aud. This
+        records a trust relationship — it does not mint or fetch a JWT.
+        """
+        return self._json("POST", "/org-config/trusted-jwks", payload)
+
     def _json(self, method: str, path: str, body: dict[str, Any] | None) -> dict[str, Any]:
         data = (
             None