singlestoredb 0.3.3__py3-none-any.whl → 1.0.3__py3-none-any.whl

singlestoredb/management/workspace.py

@@ -3,21 +3,909 @@
 from __future__ import annotations
 
 import datetime
-from collections.abc import Sequence
+import glob
+import io
+import os
+import re
+import socket
+import time
 from typing import Any
+from typing import BinaryIO
 from typing import Dict
 from typing import List
 from typing import Optional
+from typing import TextIO
 from typing import Union
 
 from .. import connection
 from ..exceptions import ManagementError
+from .billing_usage import BillingUsageItem
 from .manager import Manager
+from .organization import Organization
 from .region import Region
+from .utils import from_datetime
+from .utils import NamedList
+from .utils import PathLike
+from .utils import snake_to_camel
 from .utils import to_datetime
+from .utils import ttl_property
 from .utils import vars_to_str
 
 
+def get_secret(name: str) -> str:
+    """Get a secret from the organization."""
+    return manage_workspaces().organization.get_secret(name).value
+
+
+class StageObject(object):
+    """
+    Stage file / folder object.
+
+    This object is not instantiated directly. It is used in the results
+    of various operations in ``WorkspaceGroup.stage`` methods.
+
+    """
+
+    def __init__(
+        self,
+        name: str,
+        path: str,
+        size: int,
+        type: str,
+        format: str,
+        mimetype: str,
+        created: Optional[datetime.datetime],
+        last_modified: Optional[datetime.datetime],
+        writable: bool,
+        content: Optional[List[str]] = None,
+    ):
+        #: Name of file / folder
+        self.name = name
+
+        if type == 'directory':
+            path = re.sub(r'/*$', r'', str(path)) + '/'
+
+        #: Path of file / folder
+        self.path = path
+
+        #: Size of the object (in bytes)
+        self.size = size
+
+        #: Data type: file or directory
+        self.type = type
+
+        #: Data format
+        self.format = format
+
+        #: Mime type
+        self.mimetype = mimetype
+
+        #: Datetime the object was created
+        self.created_at = created
+
+        #: Datetime the object was modified last
+        self.last_modified_at = last_modified
+
+        #: Is the object writable?
+        self.writable = writable
+
+        #: Contents of a directory
+        self.content: List[str] = content or []
+
+        self._stage: Optional[Stage] = None
+
+    @classmethod
+    def from_dict(
+        cls,
+        obj: Dict[str, Any],
+        stage: Stage,
+    ) -> StageObject:
+        """
+        Construct a StageObject from a dictionary of values.
+
+        Parameters
+        ----------
+        obj : dict
+            Dictionary of values
+        stage : Stage
+            Stage object to use as the parent
+
+        Returns
+        -------
+        :class:`StageObject`
+
+        """
+        out = cls(
+            name=obj['name'],
+            path=obj['path'],
+            size=obj['size'],
+            type=obj['type'],
+            format=obj['format'],
+            mimetype=obj['mimetype'],
+            created=to_datetime(obj.get('created')),
+            last_modified=to_datetime(obj.get('last_modified')),
+            writable=bool(obj['writable']),
+        )
+        out._stage = stage
+        return out
+
+    def __str__(self) -> str:
+        """Return string representation."""
+        return vars_to_str(self)
+
+    def __repr__(self) -> str:
+        """Return string representation."""
+        return str(self)
+
+    def open(
+        self,
+        mode: str = 'r',
+        encoding: Optional[str] = None,
+    ) -> Union[io.StringIO, io.BytesIO]:
+        """
+        Open a Stage path for reading or writing.
+
+        Parameters
+        ----------
+        mode : str, optional
+            The read / write mode. The following modes are supported:
+                * 'r' open for reading (default)
+                * 'w' open for writing, truncating the file first
+                * 'x' create a new file and open it for writing
+            The data type can be specified by adding one of the following:
+                * 'b' binary mode
+                * 't' text mode (default)
+        encoding : str, optional
+            The string encoding to use for text
+
+        Returns
+        -------
+        StageObjectBytesReader - 'rb' or 'b' mode
+        StageObjectBytesWriter - 'wb' or 'xb' mode
+        StageObjectTextReader - 'r' or 'rt' mode
+        StageObjectTextWriter - 'w', 'x', 'wt' or 'xt' mode
+
+        """
+        if self._stage is None:
+            raise ManagementError(
+                msg='No Stage object is associated with this object.',
+            )
+
+        if self.is_dir():
+            raise IsADirectoryError(
+                f'directories can not be read or written: {self.path}',
+            )
+
+        return self._stage.open(self.path, mode=mode, encoding=encoding)
+
+    def download(
+        self,
+        local_path: Optional[PathLike] = None,
+        *,
+        overwrite: bool = False,
+        encoding: Optional[str] = None,
+    ) -> Optional[Union[bytes, str]]:
+        """
+        Download the content of a stage path.
+
+        Parameters
+        ----------
+        local_path : Path or str
+            Path to local file target location
+        overwrite : bool, optional
+            Should an existing file be overwritten if it exists?
+        encoding : str, optional
+            Encoding used to convert the resulting data
+
+        Returns
+        -------
+        bytes or str or None
+
+        """
+        if self._stage is None:
+            raise ManagementError(
+                msg='No Stage object is associated with this object.',
+            )
+
+        return self._stage.download_file(
+            self.path, local_path=local_path,
+            overwrite=overwrite, encoding=encoding,
+        )
+
+    download_file = download
+
+    def remove(self) -> None:
+        """Delete the stage file."""
+        if self._stage is None:
+            raise ManagementError(
+                msg='No Stage object is associated with this object.',
+            )
+
+        if self.type == 'directory':
+            raise IsADirectoryError(
+                f'path is a directory; use rmdir or removedirs {self.path}',
+            )
+
+        self._stage.remove(self.path)
+
+    def rmdir(self) -> None:
+        """Delete the empty stage directory."""
+        if self._stage is None:
+            raise ManagementError(
+                msg='No Stage object is associated with this object.',
+            )
+
+        if self.type != 'directory':
+            raise NotADirectoryError(
+                f'path is not a directory: {self.path}',
+            )
+
+        self._stage.rmdir(self.path)
+
+    def removedirs(self) -> None:
+        """Delete the stage directory recursively."""
+        if self._stage is None:
+            raise ManagementError(
+                msg='No Stage object is associated with this object.',
+            )
+
+        if self.type != 'directory':
+            raise NotADirectoryError(
+                f'path is not a directory: {self.path}',
+            )
+
+        self._stage.removedirs(self.path)
+
+    def rename(self, new_path: PathLike, *, overwrite: bool = False) -> None:
+        """
+        Move the stage file to a new location.
+
+        Parameters
+        ----------
+        new_path : Path or str
+            The new location of the file
+        overwrite : bool, optional
+            Should path be overwritten if it already exists?
+
+        """
+        if self._stage is None:
+            raise ManagementError(
+                msg='No Stage object is associated with this object.',
+            )
+        out = self._stage.rename(self.path, new_path, overwrite=overwrite)
+        self.name = out.name
+        self.path = out.path
+        return None
+
+    def exists(self) -> bool:
+        """Does the file / folder exist?"""
+        if self._stage is None:
+            raise ManagementError(
+                msg='No Stage object is associated with this object.',
+            )
+        return self._stage.exists(self.path)
+
+    def is_dir(self) -> bool:
+        """Is the stage object a directory?"""
+        return self.type == 'directory'
+
+    def is_file(self) -> bool:
+        """Is the stage object a file?"""
+        return self.type != 'directory'
+
+    def abspath(self) -> str:
+        """Return the full path of the object."""
+        return str(self.path)
+
+    def basename(self) -> str:
+        """Return the basename of the object."""
+        return self.name
+
+    def dirname(self) -> str:
+        """Return the directory name of the object."""
+        return re.sub(r'/*$', r'', os.path.dirname(re.sub(r'/*$', r'', self.path))) + '/'
+
+    def getmtime(self) -> float:
+        """Return the last modified datetime as a UNIX timestamp."""
+        if self.last_modified_at is None:
+            return 0.0
+        return self.last_modified_at.timestamp()
+
+    def getctime(self) -> float:
+        """Return the creation datetime as a UNIX timestamp."""
+        if self.created_at is None:
+            return 0.0
+        return self.created_at.timestamp()
+
+
+class StageObjectTextWriter(io.StringIO):
+    """StringIO wrapper for writing to Stage."""
+
+    def __init__(self, buffer: Optional[str], stage: Stage, stage_path: PathLike):
+        self._stage = stage
+        self._stage_path = stage_path
+        super().__init__(buffer)
+
+    def close(self) -> None:
+        """Write the content to the stage path."""
+        self._stage._upload(self.getvalue(), self._stage_path)
+        super().close()
+
+
+class StageObjectTextReader(io.StringIO):
+    """StringIO wrapper for reading from Stage."""
+
+
+class StageObjectBytesWriter(io.BytesIO):
+    """BytesIO wrapper for writing to Stage."""
+
+    def __init__(self, buffer: bytes, stage: Stage, stage_path: PathLike):
+        self._stage = stage
+        self._stage_path = stage_path
+        super().__init__(buffer)
+
+    def close(self) -> None:
+        """Write the content to the stage path."""
+        self._stage._upload(self.getvalue(), self._stage_path)
+        super().close()
+
+
+class StageObjectBytesReader(io.BytesIO):
+    """BytesIO wrapper for reading from Stage."""
+
+
+class Stage(object):
+    """
+    Stage manager.
+
+    This object is not instantiated directly.
+    It is returned by ``WorkspaceGroup.stage``.
+
+    """
+
+    def __init__(self, workspace_group: WorkspaceGroup, manager: WorkspaceManager):
+        self._workspace_group = workspace_group
+        self._manager = manager
+
+    def open(
+        self,
+        stage_path: PathLike,
+        mode: str = 'r',
+        encoding: Optional[str] = None,
+    ) -> Union[io.StringIO, io.BytesIO]:
+        """
+        Open a Stage path for reading or writing.
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            The stage path to read / write
+        mode : str, optional
+            The read / write mode. The following modes are supported:
+                * 'r' open for reading (default)
+                * 'w' open for writing, truncating the file first
+                * 'x' create a new file and open it for writing
+            The data type can be specified by adding one of the following:
+                * 'b' binary mode
+                * 't' text mode (default)
+        encoding : str, optional
+            The string encoding to use for text
+
+        Returns
+        -------
+        StageObjectBytesReader - 'rb' or 'b' mode
+        StageObjectBytesWriter - 'wb' or 'xb' mode
+        StageObjectTextReader - 'r' or 'rt' mode
+        StageObjectTextWriter - 'w', 'x', 'wt' or 'xt' mode
+
+        """
+        if '+' in mode or 'a' in mode:
+            raise ValueError('modifying an existing stage file is not supported')
+
+        if 'w' in mode or 'x' in mode:
+            exists = self.exists(stage_path)
+            if exists:
+                if 'x' in mode:
+                    raise FileExistsError(f'stage path already exists: {stage_path}')
+                self.remove(stage_path)
+            if 'b' in mode:
+                return StageObjectBytesWriter(b'', self, stage_path)
+            return StageObjectTextWriter('', self, stage_path)
+
+        if 'r' in mode:
+            content = self.download_file(stage_path)
+            if isinstance(content, bytes):
+                if 'b' in mode:
+                    return StageObjectBytesReader(content)
+                encoding = 'utf-8' if encoding is None else encoding
+                return StageObjectTextReader(content.decode(encoding))
+
+            if isinstance(content, str):
+                return StageObjectTextReader(content)
+
+            raise ValueError(f'unrecognized file content type: {type(content)}')
+
+        raise ValueError(f'must have one of create/read/write mode specified: {mode}')
+
+    def upload_file(
+        self,
+        local_path: Union[PathLike, TextIO, BinaryIO],
+        stage_path: PathLike,
+        *,
+        overwrite: bool = False,
+    ) -> StageObject:
+        """
+        Upload a local file.
+
+        Parameters
+        ----------
+        local_path : Path or str or file-like
+            Path to the local file or an open file object
+        stage_path : Path or str
+            Path to the stage file
+        overwrite : bool, optional
+            Should the ``stage_path`` be overwritten if it exists already?
+
+        """
+        if isinstance(local_path, (TextIO, BinaryIO)):
+            pass
+        elif not os.path.isfile(local_path):
+            raise IsADirectoryError(f'local path is not a file: {local_path}')
+
+        if self.exists(stage_path):
+            if not overwrite:
+                raise OSError(f'stage path already exists: {stage_path}')
+
+            self.remove(stage_path)
+
+        if isinstance(local_path, (TextIO, BinaryIO)):
+            return self._upload(local_path, stage_path, overwrite=overwrite)
+        return self._upload(open(local_path, 'rb'), stage_path, overwrite=overwrite)
+
+    def upload_folder(
+        self,
+        local_path: PathLike,
+        stage_path: PathLike,
+        *,
+        overwrite: bool = False,
+        recursive: bool = True,
+        include_root: bool = False,
+        ignore: Optional[Union[PathLike, List[PathLike]]] = None,
+    ) -> StageObject:
+        """
+        Upload a folder recursively.
+
+        Only the contents of the folder are uploaded. To include the
+        folder name itself in the target path use ``include_root=True``.
+
+        Parameters
+        ----------
+        local_path : Path or str
+            Local directory to upload
+        stage_path : Path or str
+            Path of stage folder to upload to
+        overwrite : bool, optional
+            If a file already exists, should it be overwritten?
+        recursive : bool, optional
+            Should nested folders be uploaded?
+        include_root : bool, optional
+            Should the local root folder itself be uploaded as the top folder?
+        ignore : Path or str or List[Path] or List[str], optional
+            Glob patterns of files to ignore, for example, '**/*.pyc` will
+            ignore all '*.pyc' files in the directory tree
+
+        """
+        if not os.path.isdir(local_path):
+            raise NotADirectoryError(f'local path is not a directory: {local_path}')
+        if self.exists(stage_path) and not self.is_dir(stage_path):
+            raise NotADirectoryError(f'stage path is not a directory: {stage_path}')
+
+        ignore_files = set()
+        if ignore:
+            if isinstance(ignore, list):
+                for item in ignore:
+                    ignore_files.update(glob.glob(str(item), recursive=recursive))
+            else:
+                ignore_files.update(glob.glob(str(ignore), recursive=recursive))
+
+        parent_dir = os.path.basename(os.getcwd())
+
+        files = glob.glob(os.path.join(local_path, '**'), recursive=recursive)
+
+        for src in files:
+            if ignore_files and src in ignore_files:
+                continue
+            target = os.path.join(parent_dir, src) if include_root else src
+            self.upload_file(src, target, overwrite=overwrite)
+
+        return self.info(stage_path)
+
+    def _upload(
+        self,
+        content: Union[str, bytes, TextIO, BinaryIO],
+        stage_path: PathLike,
+        *,
+        overwrite: bool = False,
+    ) -> StageObject:
+        """
+        Upload content to a stage file.
+
+        Parameters
+        ----------
+        content : str or bytes or file-like
+            Content to upload to stage
+        stage_path : Path or str
+            Path to the stage file
+        overwrite : bool, optional
+            Should the ``stage_path`` be overwritten if it exists already?
+
+        """
+        if self.exists(stage_path):
+            if not overwrite:
+                raise OSError(f'stage path already exists: {stage_path}')
+            self.remove(stage_path)
+
+        self._manager._put(
+            f'stage/{self._workspace_group.id}/fs/{stage_path}',
+            files={'file': content},
+            headers={'Content-Type': None},
+        )
+
+        return self.info(stage_path)
+
+    def mkdir(self, stage_path: PathLike, overwrite: bool = False) -> StageObject:
+        """
+        Make a directory in the stage.
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path of the folder to create
+        overwrite : bool, optional
+            Should the stage path be overwritten if it exists already?
+
+        Returns
+        -------
+        StageObject
+
+        """
+        stage_path = re.sub(r'/*$', r'', str(stage_path)) + '/'
+
+        if self.exists(stage_path):
+            if not overwrite:
+                return self.info(stage_path)
+
+            self.remove(stage_path)
+
+        self._manager._put(
+            f'stage/{self._workspace_group.id}/fs/{stage_path}?isFile=false',
+        )
+
+        return self.info(stage_path)
+
+    mkdirs = mkdir
+
+    def rename(
+        self,
+        old_path: PathLike,
+        new_path: PathLike,
+        *,
+        overwrite: bool = False,
+    ) -> StageObject:
+        """
+        Move the stage file to a new location.
+
+        Paraemeters
+        -----------
+        old_path : Path or str
+            Original location of the path
+        new_path : Path or str
+            New location of the path
+        overwrite : bool, optional
+            Should the ``new_path`` be overwritten if it exists already?
+
+        """
+        if not self.exists(old_path):
+            raise OSError(f'stage path does not exist: {old_path}')
+
+        if self.exists(new_path):
+            if not overwrite:
+                raise OSError(f'stage path already exists: {new_path}')
+
+            if str(old_path).endswith('/') and not str(new_path).endswith('/'):
+                raise OSError('original and new paths are not the same type')
+
+            if str(new_path).endswith('/'):
+                self.removedirs(new_path)
+            else:
+                self.remove(new_path)
+
+        self._manager._patch(
+            f'stage/{self._workspace_group.id}/fs/{old_path}',
+            json=dict(newPath=new_path),
+        )
+
+        return self.info(new_path)
+
+    def info(self, stage_path: PathLike) -> StageObject:
+        """
+        Return information about a stage location.
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to the stage location
+
+        Returns
+        -------
+        StageObject
+
+        """
+        res = self._manager._get(
+            re.sub(r'/+$', r'/', f'stage/{self._workspace_group.id}/fs/{stage_path}'),
+            params=dict(metadata=1),
+        ).json()
+
+        return StageObject.from_dict(res, self)
+
+    def exists(self, stage_path: PathLike) -> bool:
+        """
+        Does the given stage path exist?
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to stage object
+
+        Returns
+        -------
+        bool
+
+        """
+        try:
+            self.info(stage_path)
+            return True
+        except ManagementError as exc:
+            if exc.errno == 404:
+                return False
+            raise
+
+    def is_dir(self, stage_path: PathLike) -> bool:
+        """
+        Is the given stage path a directory?
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to stage object
+
+        Returns
+        -------
+        bool
+
+        """
+        try:
+            return self.info(stage_path).type == 'directory'
+        except ManagementError as exc:
+            if exc.errno == 404:
+                return False
+            raise
+
+    def is_file(self, stage_path: PathLike) -> bool:
+        """
+        Is the given stage path a file?
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to stage object
+
+        Returns
+        -------
+        bool
+
+        """
+        try:
+            return self.info(stage_path).type != 'directory'
+        except ManagementError as exc:
+            if exc.errno == 404:
+                return False
+            raise
+
+    def _listdir(self, stage_path: PathLike, *, recursive: bool = False) -> List[str]:
+        """
+        Return the names of files in a directory.
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to the folder in Stage
+        recursive : bool, optional
+            Should folders be listed recursively?
+
+        """
+        res = self._manager._get(
+            f'stage/{self._workspace_group.id}/fs/{stage_path}',
+        ).json()
+        if recursive:
+            out = []
+            for item in res['content'] or []:
+                out.append(item['path'])
+                if item['type'] == 'directory':
+                    out.extend(self._listdir(item['path'], recursive=recursive))
+            return out
+        return [x['path'] for x in res['content'] or []]
+
+    def listdir(
+        self,
+        stage_path: PathLike = '/',
+        *,
+        recursive: bool = False,
+    ) -> List[str]:
+        """
+        List the files / folders at the given path.
+
+        Parameters
+        ----------
+        stage_path : Path or str, optional
+            Path to the stage location
+
+        Returns
+        -------
+        List[str]
+
+        """
+        stage_path = re.sub(r'^(\./|/)+', r'', str(stage_path))
+        stage_path = re.sub(r'/+$', r'', stage_path) + '/'
+
+        if self.is_dir(stage_path):
+            out = self._listdir(stage_path, recursive=recursive)
+            if stage_path != '/':
+                stage_path_n = len(stage_path.split('/')) - 1
+                out = ['/'.join(x.split('/')[stage_path_n:]) for x in out]
+            return out
+
+        raise NotADirectoryError(f'stage path is not a directory: {stage_path}')
+
+    def download_file(
+        self,
+        stage_path: PathLike,
+        local_path: Optional[PathLike] = None,
+        *,
+        overwrite: bool = False,
+        encoding: Optional[str] = None,
+    ) -> Optional[Union[bytes, str]]:
+        """
+        Download the content of a stage path.
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to the stage file
+        local_path : Path or str
+            Path to local file target location
+        overwrite : bool, optional
+            Should an existing file be overwritten if it exists?
+        encoding : str, optional
+            Encoding used to convert the resulting data
+
+        Returns
+        -------
+        bytes or str - ``local_path`` is None
+        None - ``local_path`` is a Path or str
+
+        """
+        if local_path is not None and not overwrite and os.path.exists(local_path):
+            raise OSError('target file already exists; use overwrite=True to replace')
+        if self.is_dir(stage_path):
+            raise IsADirectoryError(f'stage path is a directory: {stage_path}')
+
+        out = self._manager._get(
+            f'stage/{self._workspace_group.id}/fs/{stage_path}',
+        ).content
+
+        if local_path is not None:
+            with open(local_path, 'wb') as outfile:
+                outfile.write(out)
+            return None
+
+        if encoding:
+            return out.decode(encoding)
+
+        return out
+
+    def download_folder(
+        self,
+        stage_path: PathLike,
+        local_path: PathLike = '.',
+        *,
+        overwrite: bool = False,
+    ) -> None:
+        """
+        Download a Stage folder to a local directory.
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to the stage file
+        local_path : Path or str
+            Path to local directory target location
+        overwrite : bool, optional
+            Should an existing directory / files be overwritten if they exist?
+
+        """
+        if local_path is not None and not overwrite and os.path.exists(local_path):
+            raise OSError(
+                'target directory already exists; '
+                'use overwrite=True to replace',
+            )
+        if not self.is_dir(stage_path):
+            raise NotADirectoryError(f'stage path is not a directory: {stage_path}')
+
+        for f in self.listdir(stage_path, recursive=True):
+            if self.is_dir(f):
+                continue
+            target = os.path.normpath(os.path.join(local_path, f))
+            os.makedirs(os.path.dirname(target), exist_ok=True)
+            self.download_file(f, target, overwrite=overwrite)
+
+    def remove(self, stage_path: PathLike) -> None:
+        """
+        Delete a stage location.
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to the stage location
+
+        """
+        if self.is_dir(stage_path):
+            raise IsADirectoryError(
+                'stage path is a directory, '
+                f'use rmdir or removedirs: {stage_path}',
+            )
+
+        self._manager._delete(f'stage/{self._workspace_group.id}/fs/{stage_path}')
+
+    def removedirs(self, stage_path: PathLike) -> None:
+        """
+        Delete a stage folder recursively.
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to the stage location
+
+        """
+        stage_path = re.sub(r'/*$', r'', str(stage_path)) + '/'
+        self._manager._delete(f'stage/{self._workspace_group.id}/fs/{stage_path}')
+
+    def rmdir(self, stage_path: PathLike) -> None:
+        """
+        Delete a stage folder.
+
+        Parameters
+        ----------
+        stage_path : Path or str
+            Path to the stage location
+
+        """
+        stage_path = re.sub(r'/*$', r'', str(stage_path)) + '/'
+
+        if self.listdir(stage_path):
+            raise OSError(f'stage folder is not empty, use removedirs: {stage_path}')
+
+        self._manager._delete(f'stage/{self._workspace_group.id}/fs/{stage_path}')
+
+    def __str__(self) -> str:
+        """Return string representation."""
+        return vars_to_str(self)
+
+    def __repr__(self) -> str:
+        """Return string representation."""
+        return str(self)
+
+
 class Workspace(object):
     """
     SingleStoreDB workspace definition.
@@ -37,9 +925,12 @@ class Workspace(object):
     """
 
     def __init__(
-        self, name: str, workspace_id: str,
-        workspace_group: Union[str, WorkspaceGroup],
-        size: str, state: str,
+        self,
+        name: str,
+        workspace_id: str,
+        workspace_group: Union[str, 'WorkspaceGroup'],
+        size: str,
+        state: str,
         created_at: Union[str, datetime.datetime],
         terminated_at: Optional[Union[str, datetime.datetime]] = None,
         endpoint: Optional[str] = None,
@@ -83,7 +974,7 @@ class Workspace(object):
         return str(self)
 
     @classmethod
-    def from_dict(cls, obj: Dict[str, Any], manager: 'WorkspaceManager') -> Workspace:
+    def from_dict(cls, obj: Dict[str, Any], manager: 'WorkspaceManager') -> 'Workspace':
         """
         Construct a Workspace from a dictionary of values.
 
@@ -125,6 +1016,7 @@ class Workspace(object):
         wait_on_terminated: bool = False,
         wait_interval: int = 10,
         wait_timeout: int = 600,
+        force: bool = False,
     ) -> None:
         """
         Terminate the workspace.
@@ -137,6 +1029,8 @@ class Workspace(object):
             Number of seconds between each server check
         wait_timeout : int, optional
             Total number of seconds to check server before giving up
+        force : bool, optional
+            Should the workspace group be terminated even if it has workspaces?
 
         Raises
         ------
@@ -148,7 +1042,8 @@ class Workspace(object):
             raise ManagementError(
                 msg='No workspace manager is associated with this object.',
             )
-        self._manager._delete(f'workspaces/{self.id}')
+        force_str = 'true' if force else 'false'
+        self._manager._delete(f'workspaces/{self.id}?force={force_str}')
         if wait_on_terminated:
             self._manager._wait_on_state(
                 self._manager.get_workspace(self.id),
@@ -178,6 +1073,78 @@ class Workspace(object):
         kwargs['host'] = self.endpoint
         return connection.connect(**kwargs)
 
+    def suspend(
+        self,
+        wait_on_suspended: bool = False,
+        wait_interval: int = 20,
+        wait_timeout: int = 600,
+    ) -> None:
+        """
+        Suspend the workspace.
+
+        Parameters
+        ----------
+        wait_on_suspended : bool, optional
+            Wait for the workspace to go into 'Suspended' mode before returning
+        wait_interval : int, optional
+            Number of seconds between each server check
+        wait_timeout : int, optional
+            Total number of seconds to check server before giving up
+
+        Raises
+        ------
+        ManagementError
+            If timeout is reached
+
+        """
+        if self._manager is None:
+            raise ManagementError(
+                msg='No workspace manager is associated with this object.',
+            )
+        self._manager._post(f'workspaces/{self.id}/suspend')
+        if wait_on_suspended:
+            self._manager._wait_on_state(
+                self._manager.get_workspace(self.id),
+                'Suspended', interval=wait_interval, timeout=wait_timeout,
+            )
+            self.refresh()
+
+    def resume(
+        self,
+        wait_on_resumed: bool = False,
+        wait_interval: int = 20,
+        wait_timeout: int = 600,
+    ) -> None:
+        """
+        Resume the workspace.
+
+        Parameters
+        ----------
+        wait_on_resumed : bool, optional
+            Wait for the workspace to go into 'Resumed' or 'Active' mode before returning
+        wait_interval : int, optional
+            Number of seconds between each server check
+        wait_timeout : int, optional
+            Total number of seconds to check server before giving up
+
+        Raises
+        ------
+        ManagementError
+            If timeout is reached
+
+        """
+        if self._manager is None:
+            raise ManagementError(
+                msg='No workspace manager is associated with this object.',
+            )
+        self._manager._post(f'workspaces/{self.id}/resume')
+        if wait_on_resumed:
+            self._manager._wait_on_state(
+                self._manager.get_workspace(self.id),
+                ['Resumed', 'Active'], interval=wait_interval, timeout=wait_timeout,
+            )
+            self.refresh()
+
 
 class WorkspaceGroup(object):
     """
@@ -200,8 +1167,8 @@ class WorkspaceGroup(object):
     def __init__(
         self, name: str, id: str,
         created_at: Union[str, datetime.datetime],
-        region: Region,
-        firewall_ranges: Sequence[str],
+        region: Optional[Region],
+        firewall_ranges: List[str],
         terminated_at: Optional[Union[str, datetime.datetime]],
     ):
         #: Name of the workspace group
@@ -213,7 +1180,7 @@ class WorkspaceGroup(object):
         #: Timestamp of when the workspace group was created
         self.created_at = to_datetime(created_at)
 
-        #: Region of the cluster (see :class:`Region`)
+        #: Region of the workspace group (see :class:`Region`)
         self.region = region
 
         #: List of allowed incoming IP addresses / ranges
@@ -235,7 +1202,7 @@ class WorkspaceGroup(object):
     @classmethod
     def from_dict(
         cls, obj: Dict[str, Any], manager: 'WorkspaceManager',
-    ) -> WorkspaceGroup:
+    ) -> 'WorkspaceGroup':
         """
         Construct a WorkspaceGroup from a dictionary of values.
 
@@ -251,18 +1218,42 @@ class WorkspaceGroup(object):
         :class:`WorkspaceGroup`
 
         """
+        try:
+            region = [x for x in manager.regions if x.id == obj['regionID']][0]
+        except IndexError:
+            region = Region(obj.get('regionID', '<unknown>'), '<unknown>', '<unknown>')
         out = cls(
-            name=obj['name'], id=obj['workspaceGroupID'],
+            name=obj['name'],
+            id=obj['workspaceGroupID'],
             created_at=obj['createdAt'],
-            region=[x for x in manager.regions if x.id == obj['regionID']][0],
+            region=region,
             firewall_ranges=obj.get('firewallRanges', []),
             terminated_at=obj.get('terminatedAt'),
         )
         out._manager = manager
         return out
 
-    def refresh(self) -> WorkspaceGroup:
-        """Update teh object to the current state."""
+    @property
+    def organization(self) -> Organization:
+        if self._manager is None:
+            raise ManagementError(
+                msg='No workspace manager is associated with this object.',
+            )
+        return self._manager.organization
+
+    @property
+    def stage(self) -> Stage:
+        """Stage manager."""
+        if self._manager is None:
+            raise ManagementError(
+                msg='No workspace manager is associated with this object.',
+            )
+        return Stage(self, self._manager)
+
+    stages = stage
+
+    def refresh(self) -> 'WorkspaceGroup':
+        """Update the object to the current state."""
         if self._manager is None:
             raise ManagementError(
                 msg='No workspace manager is associated with this object.',
@@ -275,17 +1266,17 @@ class WorkspaceGroup(object):
     def update(
         self, name: Optional[str] = None,
         admin_password: Optional[str] = None,
-        firewall_ranges: Optional[Sequence[str]] = None,
+        firewall_ranges: Optional[List[str]] = None,
     ) -> None:
         """
-        Update the cluster definition.
+        Update the workspace group definition.
 
         Parameters
         ----------
         name : str, optional
-            Cluster name
+            Workspace group name
         admim_password : str, optional
-            Admin password for the cluster
+            Admin password for the workspace group
         firewall_ranges : Sequence[str], optional
             List of allowed incoming IP addresses
 
@@ -317,7 +1308,7 @@ class WorkspaceGroup(object):
         force : bool, optional
             Terminate a workspace group even if it has active workspaces
         wait_on_terminated : bool, optional
-            Wait for the cluster to go into 'Terminated' mode before returning
+            Wait for the workspace group to go into 'Terminated' mode before returning
         wait_interval : int, optional
             Number of seconds between each server check
         wait_timeout : int, optional
@@ -335,16 +1326,21 @@ class WorkspaceGroup(object):
             )
         self._manager._delete(f'workspaceGroups/{self.id}', params=dict(force=force))
         if wait_on_terminated:
-            self._manager._wait_on_state(
-                self._manager.get_workspace_group(self.id),
-                'Terminated', interval=wait_interval, timeout=wait_timeout,
-            )
-            self.refresh()
+            while True:
+                self.refresh()
+                if self.terminated_at is not None:
+                    break
+                if wait_timeout <= 0:
+                    raise ManagementError(
+                        msg='Exceeded waiting time for WorkspaceGroup to terminate',
+                    )
+                time.sleep(wait_interval)
+                wait_timeout -= wait_interval
 
     def create_workspace(
         self, name: str, size: Optional[str] = None,
         wait_on_active: bool = False, wait_interval: int = 10,
-        wait_timeout: int = 600,
+        wait_timeout: int = 600, add_endpoint_to_firewall_ranges: bool = True,
     ) -> Workspace:
         """
         Create a new workspace.
@@ -362,6 +1358,9 @@ class WorkspaceGroup(object):
             if wait=True
         wait_interval : int, optional
             Number of seconds between each polling interval
+        add_endpoint_to_firewall_ranges : bool, optional
+            Should the workspace endpoint be added to the workspace group
+            firewall ranges?
 
         Returns
         -------
@@ -372,20 +1371,100 @@ class WorkspaceGroup(object):
             raise ManagementError(
                 msg='No workspace manager is associated with this object.',
             )
-        return self._manager.create_workspace(
+
+        out = self._manager.create_workspace(
             name=name, workspace_group=self, size=size, wait_on_active=wait_on_active,
             wait_interval=wait_interval, wait_timeout=wait_timeout,
         )
 
+        if add_endpoint_to_firewall_ranges and out.endpoint is not None:
+            ip_address = '{}/32'.format(socket.gethostbyname(out.endpoint))
+            self.update(firewall_ranges=self.firewall_ranges+[ip_address])
+
+        return out
+
     @property
-    def workspaces(self) -> List[Workspace]:
+    def workspaces(self) -> NamedList[Workspace]:
         """Return a list of available workspaces."""
         if self._manager is None:
             raise ManagementError(
                 msg='No workspace manager is associated with this object.',
             )
         res = self._manager._get('workspaces', params=dict(workspaceGroupID=self.id))
-        return [Workspace.from_dict(item, self._manager) for item in res.json()]
+        return NamedList(
+            [Workspace.from_dict(item, self._manager) for item in res.json()],
+        )
+
+
+class Billing(object):
+    """Billing information."""
+
+    COMPUTE_CREDIT = 'compute_credit'
+    STORAGE_AVG_BYTE = 'storage_avg_byte'
+
+    HOUR = 'hour'
+    DAY = 'day'
+    MONTH = 'month'
+
+    def __init__(self, manager: Manager):
+        self._manager = manager
+
+    def usage(
+        self,
+        start_time: datetime.datetime,
+        end_time: datetime.datetime,
+        metric: Optional[str] = None,
+        aggregate_by: Optional[str] = None,
+    ) -> List[BillingUsageItem]:
+        """
+        Get usage information.
+
+        Parameters
+        ----------
+        start_time : datetime.datetime
+            Start time for usage interval
+        end_time : datetime.datetime
+            End time for usage interval
+        metric : str, optional
+            Possible metrics are ``mgr.billing.COMPUTE_CREDIT`` and
+            ``mgr.billing.STORAGE_AVG_BYTE`` (default is all)
+        aggregate_by : str, optional
+            Aggregate type used to group usage: ``mgr.billing.HOUR``,
+            ``mgr.billing.DAY``, or ``mgr.billing.MONTH``
+
+        Returns
+        -------
+        List[BillingUsage]
+
+        """
+        res = self._manager._get(
+            'billing/usage',
+            params={
+                k: v for k, v in dict(
+                    metric=snake_to_camel(metric),
+                    startTime=from_datetime(start_time),
+                    endTime=from_datetime(end_time),
+                    aggregate_by=aggregate_by.lower() if aggregate_by else None,
+                ).items() if v is not None
+            },
+        )
+        return [
+            BillingUsageItem.from_dict(x, self._manager)
+            for x in res.json()['billingUsage']
+        ]
+
+
+class Organizations(object):
+    """Organizations."""
+
+    def __init__(self, manager: Manager):
+        self._manager = manager
+
+    @property
+    def current(self) -> Organization:
+        """Get current organization."""
+        res = self._manager._get('organizations/current').json()
+        return Organization.from_dict(res, self._manager)
 
 
 class WorkspaceManager(Manager):
@@ -419,20 +1498,38 @@ class WorkspaceManager(Manager):
     obj_type = 'workspace'
 
     @property
-    def workspace_groups(self) -> List[WorkspaceGroup]:
+    def workspace_groups(self) -> NamedList[WorkspaceGroup]:
         """Return a list of available workspace groups."""
         res = self._get('workspaceGroups')
-        return [WorkspaceGroup.from_dict(item, self) for item in res.json()]
+        return NamedList([WorkspaceGroup.from_dict(item, self) for item in res.json()])
 
     @property
-    def regions(self) -> List[Region]:
+    def organizations(self) -> Organizations:
+        """Return the organizations."""
+        return Organizations(self)
+
+    @property
+    def organization(self) -> Organization:
+        """ Return the current organization."""
+        return self.organizations.current
+
+    @property
+    def billing(self) -> Billing:
+        """Return the current billing information."""
+        return Billing(self)
+
+    @ttl_property(datetime.timedelta(hours=1))
+    def regions(self) -> NamedList[Region]:
         """Return a list of available regions."""
         res = self._get('regions')
-        return [Region.from_dict(item, self) for item in res.json()]
+        return NamedList([Region.from_dict(item, self) for item in res.json()])
 
     def create_workspace_group(
         self, name: str, region: Union[str, Region],
-        firewall_ranges: Sequence[str], admin_password: Optional[str] = None,
+        firewall_ranges: List[str], admin_password: Optional[str] = None,
+        expires_at: Optional[str] = None,
+        allow_all_traffic: Optional[bool] = None,
+        update_window: Optional[Dict[str, int]] = None,
     ) -> WorkspaceGroup:
         """
         Create a new workspace group.
@@ -449,6 +1546,17 @@ class WorkspaceManager(Manager):
         admin_password : str, optional
             Admin password for the workspace group. If no password is supplied,
             a password will be generated and retured in the response.
+        expires_at : str, optional
+            The timestamp of when the workspace group will expire.
+            If the expiration time is not specified,
+            the workspace group will have no expiration time.
+            At expiration, the workspace group is terminated and all the data is lost.
+            Expiration time can be specified as a timestamp or duration.
+            Example: "2021-01-02T15:04:05Z07:00", "2021-01-02", "3h30m"
+        allow_all_traffic : bool, optional
+            Allow all traffic to the workspace group
+        update_window : Dict[str, int], optional
+            Specify the day and hour of an update window: dict(day=0-6, hour=0-23)
 
         Returns
         -------
@@ -461,7 +1569,10 @@ class WorkspaceManager(Manager):
             'workspaceGroups', json=dict(
                 name=name, regionID=region,
                 adminPassword=admin_password,
-                firewallRanges=firewall_ranges,
+                firewallRanges=firewall_ranges or [],
+                expiresAt=expires_at,
+                allowAllTraffic=allow_all_traffic,
+                updateWindow=update_window,
             ),
         )
         return self.get_workspace_group(res.json()['workspaceGroupID'])
@@ -550,6 +1661,8 @@ def manage_workspaces(
     access_token: Optional[str] = None,
     version: str = WorkspaceManager.default_version,
     base_url: str = WorkspaceManager.default_base_url,
+    *,
+    organization_id: Optional[str] = None,
 ) -> WorkspaceManager:
     """
     Retrieve a SingleStoreDB workspace manager.
@@ -562,10 +1675,15 @@ def manage_workspaces(
         Version of the API to use
     base_url : str, optional
         Base URL of the workspace management API
+    organization_id : str, optional
+        ID of organization, if using a JWT for authentication
 
     Returns
     -------
     :class:`WorkspaceManager`
 
     """
-    return WorkspaceManager(access_token=access_token, base_url=base_url, version=version)
+    return WorkspaceManager(
+        access_token=access_token, base_url=base_url,
+        version=version, organization_id=organization_id,
+    )