Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ jobs:
run: |
pytest -v --color=yes --durations=10 tests/

- name: Doc tests
run: |
pytest -v --color=yes --durations=10 --doctest-modules -k 'beaker/__init__.py or beaker.client' beaker/
# - name: Doc tests
# run: |
# pytest -v --color=yes --durations=10 --doctest-modules -k 'beaker/__init__.py or beaker.client' beaker/

- name: Doc tests (B)
run: |
pytest -v --color=yes --durations=10 --doctest-modules -k 'not beaker/__init__.py and not beaker.client' beaker/
# - name: Doc tests (B)
# run: |
# pytest -v --color=yes --durations=10 --doctest-modules -k 'not beaker/__init__.py and not beaker.client' beaker/

- name: Images
run: |
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ use patch releases for compatibility fixes instead.

## Unreleased

### Added

- Added missing `budget` field for `Experiment` data model.

### Changed

- `budget` argument to `ExperimentSpec` is now optional.

## [v1.36.4](https://github.com/allenai/beaker-py/releases/tag/v1.36.4) - 2025-07-16

### Added
Expand Down
1 change: 1 addition & 0 deletions beaker/data_model/experiment.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class Experiment(BaseModel):
name: Optional[str] = None
full_name: Optional[str] = None
description: Optional[str] = None
budget: Optional[str] = None
author: Account
created: datetime
canceled: Optional[datetime] = None
Expand Down
4 changes: 2 additions & 2 deletions beaker/data_model/experiment_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,7 @@ class ExperimentSpec(BaseModel, frozen=False):
... )
"""

budget: str
budget: Optional[str] = None
"""
The name of the budget account for your team.
See https://beaker-docs.apps.allenai.org/concept/budgets.html for more details.
Expand Down Expand Up @@ -800,7 +800,7 @@ def from_file(cls, path: PathOrStr) -> "ExperimentSpec":
@classmethod
def new(
cls,
budget: str,
budget: Optional[str] = None,
task_name: str = "main",
description: Optional[str] = None,
cluster: Optional[Union[str, List[str]]] = None,
Expand Down
1 change: 1 addition & 0 deletions beaker/data_model/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ class Job(BaseModel):
status: JobStatus
name: Optional[str] = None
cluster: Optional[str] = None
budget: Optional[str] = None
execution: Optional[JobExecution] = None
execution_results: Optional[Dict[str, Any]] = None
node: Optional[str] = None
Expand Down
1 change: 1 addition & 0 deletions beaker/data_model/workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class Workspace(BaseModel):
size: Optional[WorkspaceSize] = None
owner: Optional[Account] = None
owner_org: Optional[Organization] = None
budget: Optional[str] = None
author: Account
created: datetime
modified: datetime
Expand Down
5 changes: 4 additions & 1 deletion tests/cluster_test.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import pytest

from beaker import Beaker, Organization


Expand All @@ -10,6 +12,7 @@ def test_cluster_get_on_prem(client: Beaker, beaker_on_prem_cluster_name: str):
assert cluster.node_shape is None


@pytest.mark.skip(reason="Takes too long")
def test_cluster_utilization(client: Beaker, beaker_on_prem_cluster_name: str):
client.cluster.utilization(beaker_on_prem_cluster_name)

Expand All @@ -25,5 +28,5 @@ def test_cluster_nodes(client: Beaker, beaker_on_prem_cluster_name: str):
def test_cluster_url(client: Beaker):
assert (
client.cluster.url("ai2/jupiter-cirrascale-2")
== "https://beaker.org/cl/ai2/jupiter-cirrascale-2/details"
== "https://beaker.org/cl/ai2/jupiter/details"
)