feat: add generated status dataclasses (#26)

These come from the Go generator in: benhoyt/juju#2
canonical · Feb 19, 2025 · d2d1daf · d2d1daf
1 parent d20d899
commit d2d1daf
Show file tree

Hide file tree

Showing 6 changed files with 754 additions and 103 deletions.
diff --git a/jubilant/__init__.py b/jubilant/__init__.py
@@ -1,5 +1,6 @@
 """Jubilant is a Pythonic wrapper around the Juju CLI for integration testing."""
 
+from . import types
 from ._errors import CLIError, WaitError
 from ._helpers import (
     all_active,
@@ -14,7 +15,7 @@
     any_waiting,
 )
 from ._juju import Juju
-from ._types import Status
+from .types import Status
 
 __all__ = [
     'CLIError',
@@ -31,6 +32,7 @@
     'any_error',
     'any_maintenance',
     'any_waiting',
+    'types',
 ]
 
 __version__ = '0.0.0a1'
diff --git a/jubilant/_helpers.py b/jubilant/_helpers.py
@@ -1,6 +1,6 @@
 from collections.abc import Iterable
 
-from ._types import Status
+from .types import Status
 
 
 def all_active(status: Status, apps: Iterable[str] | None = None) -> bool:

diff --git a/jubilant/_juju.py b/jubilant/_juju.py
@@ -6,7 +6,7 @@
 from collections.abc import Callable, Iterable
 
 from ._errors import CLIError, WaitError
-from ._types import Status
+from .types import Status
 
 logger = logging.getLogger('jubilant')
 
@@ -223,7 +223,7 @@ def status(self) -> Status:
         args = ['status', '--format', 'json']
         stdout = self.cli(*args)
         result = json.loads(stdout)
-        return Status.from_dict(result)
+        return Status._from_dict(result)
 
     def wait(
         self,

diff --git a/jubilant/_types.py b/jubilant/_types.py