wds-client 0.15.0__py3-none-any.whl → 0.18.0__py3-none-any.whl

wds_client/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "0.15.0"
+__version__ = "0.18.0"
 
 # import apis into sdk package
 from wds_client.api.capabilities_api import CapabilitiesApi
@@ -26,6 +26,7 @@ from wds_client.api.instances_api import InstancesApi
 from wds_client.api.job_api import JobApi
 from wds_client.api.records_api import RecordsApi
 from wds_client.api.schema_api import SchemaApi
+from wds_client.api.workspace_api import WorkspaceApi
 
 # import ApiClient
 from wds_client.api_response import ApiResponse
@@ -54,6 +55,7 @@ from wds_client.models.capabilities import Capabilities
 from wds_client.models.clone_job import CloneJob
 from wds_client.models.clone_response import CloneResponse
 from wds_client.models.collection import Collection
+from wds_client.models.collection_request import CollectionRequest
 from wds_client.models.commit import Commit
 from wds_client.models.error_response import ErrorResponse
 from wds_client.models.generic_job import GenericJob
@@ -71,3 +73,5 @@ from wds_client.models.search_sort_direction import SearchSortDirection
 from wds_client.models.status_response import StatusResponse
 from wds_client.models.tsv_upload_response import TsvUploadResponse
 from wds_client.models.version_response import VersionResponse
+from wds_client.models.workspace_init import WorkspaceInit
+from wds_client.models.workspace_init_clone import WorkspaceInitClone

wds_client/api/__init__.py

@@ -10,4 +10,5 @@ from wds_client.api.instances_api import InstancesApi
 from wds_client.api.job_api import JobApi
 from wds_client.api.records_api import RecordsApi
 from wds_client.api.schema_api import SchemaApi
+from wds_client.api.workspace_api import WorkspaceApi
 

wds_client/api/collection_api.py

@@ -20,6 +20,7 @@ from pydantic import Field, StrictStr
 from typing import List
 from typing_extensions import Annotated
 from wds_client.models.collection import Collection
+from wds_client.models.collection_request import CollectionRequest
 
 from wds_client.api_client import ApiClient, RequestSerialized
 from wds_client.api_response import ApiResponse
@@ -43,7 +44,7 @@ class CollectionApi:
     def create_collection_v1(
         self,
         workspace_id: Annotated[StrictStr, Field(description="Workspace id")],
-        collection: Annotated[Collection, Field(description="The collection to create")],
+        collection_request: Annotated[CollectionRequest, Field(description="The collection to create")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -59,12 +60,11 @@ class CollectionApi:
     ) -> Collection:
         """Create a collection in this workspace.
 
-        If collection id is specified in the request body, it must be a valid UUID. If omitted, the system will generate an id. 
 
         :param workspace_id: Workspace id (required)
         :type workspace_id: str
-        :param collection: The collection to create (required)
-        :type collection: Collection
+        :param collection_request: The collection to create (required)
+        :type collection_request: CollectionRequest
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -89,7 +89,7 @@ class CollectionApi:
 
         _param = self._create_collection_v1_serialize(
             workspace_id=workspace_id,
-            collection=collection,
+            collection_request=collection_request,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -114,7 +114,7 @@ class CollectionApi:
     def create_collection_v1_with_http_info(
         self,
         workspace_id: Annotated[StrictStr, Field(description="Workspace id")],
-        collection: Annotated[Collection, Field(description="The collection to create")],
+        collection_request: Annotated[CollectionRequest, Field(description="The collection to create")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -130,12 +130,11 @@ class CollectionApi:
     ) -> ApiResponse[Collection]:
         """Create a collection in this workspace.
 
-        If collection id is specified in the request body, it must be a valid UUID. If omitted, the system will generate an id. 
 
         :param workspace_id: Workspace id (required)
         :type workspace_id: str
-        :param collection: The collection to create (required)
-        :type collection: Collection
+        :param collection_request: The collection to create (required)
+        :type collection_request: CollectionRequest
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -160,7 +159,7 @@ class CollectionApi:
 
         _param = self._create_collection_v1_serialize(
             workspace_id=workspace_id,
-            collection=collection,
+            collection_request=collection_request,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -185,7 +184,7 @@ class CollectionApi:
     def create_collection_v1_without_preload_content(
         self,
         workspace_id: Annotated[StrictStr, Field(description="Workspace id")],
-        collection: Annotated[Collection, Field(description="The collection to create")],
+        collection_request: Annotated[CollectionRequest, Field(description="The collection to create")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -201,12 +200,11 @@ class CollectionApi:
     ) -> RESTResponseType:
         """Create a collection in this workspace.
 
-        If collection id is specified in the request body, it must be a valid UUID. If omitted, the system will generate an id. 
 
         :param workspace_id: Workspace id (required)
         :type workspace_id: str
-        :param collection: The collection to create (required)
-        :type collection: Collection
+        :param collection_request: The collection to create (required)
+        :type collection_request: CollectionRequest
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -231,7 +229,7 @@ class CollectionApi:
 
         _param = self._create_collection_v1_serialize(
             workspace_id=workspace_id,
-            collection=collection,
+            collection_request=collection_request,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -251,7 +249,7 @@ class CollectionApi:
     def _create_collection_v1_serialize(
         self,
         workspace_id,
-        collection,
+        collection_request,
         _request_auth,
         _content_type,
         _headers,
@@ -277,8 +275,8 @@ class CollectionApi:
         # process the header parameters
         # process the form parameters
         # process the body parameter
-        if collection is not None:
-            _body_params = collection
+        if collection_request is not None:
+            _body_params = collection_request
 
 
         # set the HTTP header `Accept`
@@ -1122,7 +1120,7 @@ class CollectionApi:
         self,
         workspace_id: Annotated[StrictStr, Field(description="Workspace id")],
         collection_id: Annotated[StrictStr, Field(description="Collection id")],
-        collection: Annotated[Collection, Field(description="The collection to update")],
+        collection_request: Annotated[CollectionRequest, Field(description="The collection to update")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -1138,14 +1136,13 @@ class CollectionApi:
     ) -> Collection:
         """Update the specified collection.
 
-        Collection id is optional in the request body. If specified, it must match the collection id specified in the url. 
 
         :param workspace_id: Workspace id (required)
         :type workspace_id: str
         :param collection_id: Collection id (required)
         :type collection_id: str
-        :param collection: The collection to update (required)
-        :type collection: Collection
+        :param collection_request: The collection to update (required)
+        :type collection_request: CollectionRequest
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -1171,7 +1168,7 @@ class CollectionApi:
         _param = self._update_collection_v1_serialize(
             workspace_id=workspace_id,
             collection_id=collection_id,
-            collection=collection,
+            collection_request=collection_request,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -1197,7 +1194,7 @@ class CollectionApi:
         self,
         workspace_id: Annotated[StrictStr, Field(description="Workspace id")],
         collection_id: Annotated[StrictStr, Field(description="Collection id")],
-        collection: Annotated[Collection, Field(description="The collection to update")],
+        collection_request: Annotated[CollectionRequest, Field(description="The collection to update")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -1213,14 +1210,13 @@ class CollectionApi:
     ) -> ApiResponse[Collection]:
         """Update the specified collection.
 
-        Collection id is optional in the request body. If specified, it must match the collection id specified in the url. 
 
         :param workspace_id: Workspace id (required)
         :type workspace_id: str
         :param collection_id: Collection id (required)
         :type collection_id: str
-        :param collection: The collection to update (required)
-        :type collection: Collection
+        :param collection_request: The collection to update (required)
+        :type collection_request: CollectionRequest
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -1246,7 +1242,7 @@ class CollectionApi:
         _param = self._update_collection_v1_serialize(
             workspace_id=workspace_id,
             collection_id=collection_id,
-            collection=collection,
+            collection_request=collection_request,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -1272,7 +1268,7 @@ class CollectionApi:
         self,
         workspace_id: Annotated[StrictStr, Field(description="Workspace id")],
         collection_id: Annotated[StrictStr, Field(description="Collection id")],
-        collection: Annotated[Collection, Field(description="The collection to update")],
+        collection_request: Annotated[CollectionRequest, Field(description="The collection to update")],
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -1288,14 +1284,13 @@ class CollectionApi:
     ) -> RESTResponseType:
         """Update the specified collection.
 
-        Collection id is optional in the request body. If specified, it must match the collection id specified in the url. 
 
         :param workspace_id: Workspace id (required)
         :type workspace_id: str
         :param collection_id: Collection id (required)
         :type collection_id: str
-        :param collection: The collection to update (required)
-        :type collection: Collection
+        :param collection_request: The collection to update (required)
+        :type collection_request: CollectionRequest
         :param _request_timeout: timeout setting for this request. If one
                                  number provided, it will be total request
                                  timeout. It can also be a pair (tuple) of
@@ -1321,7 +1316,7 @@ class CollectionApi:
         _param = self._update_collection_v1_serialize(
             workspace_id=workspace_id,
             collection_id=collection_id,
-            collection=collection,
+            collection_request=collection_request,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
@@ -1342,7 +1337,7 @@ class CollectionApi:
         self,
         workspace_id,
         collection_id,
-        collection,
+        collection_request,
         _request_auth,
         _content_type,
         _headers,
@@ -1370,8 +1365,8 @@ class CollectionApi:
         # process the header parameters
         # process the form parameters
         # process the body parameter
-        if collection is not None:
-            _body_params = collection
+        if collection_request is not None:
+            _body_params = collection_request
 
 
         # set the HTTP header `Accept`

wds_client/api/workspace_api.py

@@ -0,0 +1,326 @@
+# coding: utf-8
+
+"""
+    Workspace Data Service
+
+    This page lists current APIs.  All v0.2 APIs are subject to change without notice.  Changelog at [https://github.com/DataBiosphere/terra-workspace-data-service/releases](https://github.com/DataBiosphere/terra-workspace-data-service/releases) 
+
+    The version of the OpenAPI document: v0.2
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+import warnings
+from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
+from typing import Any, Dict, List, Optional, Tuple, Union
+from typing_extensions import Annotated
+
+from pydantic import Field, StrictStr
+from typing_extensions import Annotated
+from wds_client.models.generic_job import GenericJob
+from wds_client.models.workspace_init import WorkspaceInit
+
+from wds_client.api_client import ApiClient, RequestSerialized
+from wds_client.api_response import ApiResponse
+from wds_client.rest import RESTResponseType
+
+
+class WorkspaceApi:
+    """NOTE: This class is auto generated by OpenAPI Generator
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    def __init__(self, api_client=None) -> None:
+        if api_client is None:
+            api_client = ApiClient.get_default()
+        self.api_client = api_client
+
+
+    @validate_call
+    def init_workspace_v1(
+        self,
+        workspace_id: Annotated[StrictStr, Field(description="Workspace id")],
+        workspace_init: Annotated[WorkspaceInit, Field(description="Initialization parameters")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> GenericJob:
+        """Initialize WDS for a given workspace.
+
+        when the `clone` key is present in the request body, this API will clone all collections from sourceWorkspaceId into this workspace 
+
+        :param workspace_id: Workspace id (required)
+        :type workspace_id: str
+        :param workspace_init: Initialization parameters (required)
+        :type workspace_init: WorkspaceInit
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._init_workspace_v1_serialize(
+            workspace_id=workspace_id,
+            workspace_init=workspace_init,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '202': "GenericJob",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        ).data
+
+
+    @validate_call
+    def init_workspace_v1_with_http_info(
+        self,
+        workspace_id: Annotated[StrictStr, Field(description="Workspace id")],
+        workspace_init: Annotated[WorkspaceInit, Field(description="Initialization parameters")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> ApiResponse[GenericJob]:
+        """Initialize WDS for a given workspace.
+
+        when the `clone` key is present in the request body, this API will clone all collections from sourceWorkspaceId into this workspace 
+
+        :param workspace_id: Workspace id (required)
+        :type workspace_id: str
+        :param workspace_init: Initialization parameters (required)
+        :type workspace_init: WorkspaceInit
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._init_workspace_v1_serialize(
+            workspace_id=workspace_id,
+            workspace_init=workspace_init,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '202': "GenericJob",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        response_data.read()
+        return self.api_client.response_deserialize(
+            response_data=response_data,
+            response_types_map=_response_types_map,
+        )
+
+
+    @validate_call
+    def init_workspace_v1_without_preload_content(
+        self,
+        workspace_id: Annotated[StrictStr, Field(description="Workspace id")],
+        workspace_init: Annotated[WorkspaceInit, Field(description="Initialization parameters")],
+        _request_timeout: Union[
+            None,
+            Annotated[StrictFloat, Field(gt=0)],
+            Tuple[
+                Annotated[StrictFloat, Field(gt=0)],
+                Annotated[StrictFloat, Field(gt=0)]
+            ]
+        ] = None,
+        _request_auth: Optional[Dict[StrictStr, Any]] = None,
+        _content_type: Optional[StrictStr] = None,
+        _headers: Optional[Dict[StrictStr, Any]] = None,
+        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
+    ) -> RESTResponseType:
+        """Initialize WDS for a given workspace.
+
+        when the `clone` key is present in the request body, this API will clone all collections from sourceWorkspaceId into this workspace 
+
+        :param workspace_id: Workspace id (required)
+        :type workspace_id: str
+        :param workspace_init: Initialization parameters (required)
+        :type workspace_init: WorkspaceInit
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :type _request_timeout: int, tuple(int, int), optional
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the
+                              authentication in the spec for a single request.
+        :type _request_auth: dict, optional
+        :param _content_type: force content-type for the request.
+        :type _content_type: str, Optional
+        :param _headers: set to override the headers for a single
+                         request; this effectively ignores the headers
+                         in the spec for a single request.
+        :type _headers: dict, optional
+        :param _host_index: set to override the host_index for a single
+                            request; this effectively ignores the host_index
+                            in the spec for a single request.
+        :type _host_index: int, optional
+        :return: Returns the result object.
+        """ # noqa: E501
+
+        _param = self._init_workspace_v1_serialize(
+            workspace_id=workspace_id,
+            workspace_init=workspace_init,
+            _request_auth=_request_auth,
+            _content_type=_content_type,
+            _headers=_headers,
+            _host_index=_host_index
+        )
+
+        _response_types_map: Dict[str, Optional[str]] = {
+            '202': "GenericJob",
+        }
+        response_data = self.api_client.call_api(
+            *_param,
+            _request_timeout=_request_timeout
+        )
+        return response_data.response
+
+
+    def _init_workspace_v1_serialize(
+        self,
+        workspace_id,
+        workspace_init,
+        _request_auth,
+        _content_type,
+        _headers,
+        _host_index,
+    ) -> RequestSerialized:
+
+        _host = None
+
+        _collection_formats: Dict[str, str] = {
+        }
+
+        _path_params: Dict[str, str] = {}
+        _query_params: List[Tuple[str, str]] = []
+        _header_params: Dict[str, Optional[str]] = _headers or {}
+        _form_params: List[Tuple[str, str]] = []
+        _files: Dict[str, Union[str, bytes]] = {}
+        _body_params: Optional[bytes] = None
+
+        # process the path parameters
+        if workspace_id is not None:
+            _path_params['workspaceId'] = workspace_id
+        # process the query parameters
+        # process the header parameters
+        # process the form parameters
+        # process the body parameter
+        if workspace_init is not None:
+            _body_params = workspace_init
+
+
+        # set the HTTP header `Accept`
+        if 'Accept' not in _header_params:
+            _header_params['Accept'] = self.api_client.select_header_accept(
+                [
+                    'application/json'
+                ]
+            )
+
+        # set the HTTP header `Content-Type`
+        if _content_type:
+            _header_params['Content-Type'] = _content_type
+        else:
+            _default_content_type = (
+                self.api_client.select_header_content_type(
+                    [
+                        'application/json'
+                    ]
+                )
+            )
+            if _default_content_type is not None:
+                _header_params['Content-Type'] = _default_content_type
+
+        # authentication setting
+        _auth_settings: List[str] = [
+            'bearerAuth'
+        ]
+
+        return self.api_client.param_serialize(
+            method='POST',
+            resource_path='/workspaces/v1/{workspaceId}',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth
+        )
+
+

wds_client/api_client.py

@@ -15,6 +15,7 @@
 import datetime
 from dateutil.parser import parse
 from enum import Enum
+import decimal
 import json
 import mimetypes
 import os
@@ -66,6 +67,7 @@ class ApiClient:
         'bool': bool,
         'date': datetime.date,
         'datetime': datetime.datetime,
+        'decimal': decimal.Decimal,
         'object': object,
     }
     _pool = None
@@ -88,7 +90,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'wds-client/0.15.0/python'
+        self.user_agent = 'wds-client/0.18.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):
@@ -338,6 +340,7 @@ class ApiClient:
         If obj is str, int, long, float, bool, return directly.
         If obj is datetime.datetime, datetime.date
             convert to string in iso8601 format.
+        If obj is decimal.Decimal return string representation.
         If obj is list, sanitize each element in the list.
         If obj is dict, return the dict.
         If obj is OpenAPI model, return the properties dict.
@@ -363,6 +366,8 @@ class ApiClient:
             )
         elif isinstance(obj, (datetime.datetime, datetime.date)):
             return obj.isoformat()
+        elif isinstance(obj, decimal.Decimal):
+            return str(obj)
 
         elif isinstance(obj, dict):
             obj_dict = obj
@@ -454,6 +459,8 @@ class ApiClient:
             return self.__deserialize_date(data)
         elif klass == datetime.datetime:
             return self.__deserialize_datetime(data)
+        elif klass == decimal.Decimal:
+            return decimal.Decimal(data)
         elif issubclass(klass, Enum):
             return self.__deserialize_enum(data, klass)
         else:

wds_client/configuration.py

@@ -392,7 +392,7 @@ class Configuration:
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: v0.2\n"\
-               "SDK Package Version: 0.15.0".\
+               "SDK Package Version: 0.18.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

wds_client/models/__init__.py

@@ -29,6 +29,7 @@ from wds_client.models.capabilities import Capabilities
 from wds_client.models.clone_job import CloneJob
 from wds_client.models.clone_response import CloneResponse
 from wds_client.models.collection import Collection
+from wds_client.models.collection_request import CollectionRequest
 from wds_client.models.commit import Commit
 from wds_client.models.error_response import ErrorResponse
 from wds_client.models.generic_job import GenericJob
@@ -46,3 +47,5 @@ from wds_client.models.search_sort_direction import SearchSortDirection
 from wds_client.models.status_response import StatusResponse
 from wds_client.models.tsv_upload_response import TsvUploadResponse
 from wds_client.models.version_response import VersionResponse
+from wds_client.models.workspace_init import WorkspaceInit
+from wds_client.models.workspace_init_clone import WorkspaceInitClone

wds_client/models/collection_request.py

@@ -0,0 +1,97 @@
+# coding: utf-8
+
+"""
+    Workspace Data Service
+
+    This page lists current APIs.  All v0.2 APIs are subject to change without notice.  Changelog at [https://github.com/DataBiosphere/terra-workspace-data-service/releases](https://github.com/DataBiosphere/terra-workspace-data-service/releases) 
+
+    The version of the OpenAPI document: v0.2
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List
+from typing_extensions import Annotated
+from typing import Optional, Set
+from typing_extensions import Self
+
+class CollectionRequest(BaseModel):
+    """
+    CollectionRequest
+    """ # noqa: E501
+    name: Annotated[str, Field(strict=True)] = Field(description="Letters, numbers, dash and underscore only. Max 128 characters.")
+    description: StrictStr
+    __properties: ClassVar[List[str]] = ["name", "description"]
+
+    @field_validator('name')
+    def name_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if not re.match(r"[a-zA-Z0-9-_]{1,128}", value):
+            raise ValueError(r"must validate the regular expression /[a-zA-Z0-9-_]{1,128}/")
+        return value
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of CollectionRequest from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of CollectionRequest from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "name": obj.get("name"),
+            "description": obj.get("description")
+        })
+        return _obj
+
+

wds_client/models/generic_job.py

@@ -41,8 +41,8 @@ class GenericJob(BaseModel):
     @field_validator('job_type')
     def job_type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in set(['DATA_IMPORT', 'UNKNOWN']):
-            raise ValueError("must be one of enum values ('DATA_IMPORT', 'UNKNOWN')")
+        if value not in set(['DATA_IMPORT', 'WORKSPACE_INIT', 'UNKNOWN']):
+            raise ValueError("must be one of enum values ('DATA_IMPORT', 'WORKSPACE_INIT', 'UNKNOWN')")
         return value
 
     @field_validator('status')

wds_client/models/job_v1.py

@@ -39,8 +39,8 @@ class JobV1(BaseModel):
     @field_validator('job_type')
     def job_type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in set(['DATA_IMPORT', 'UNKNOWN']):
-            raise ValueError("must be one of enum values ('DATA_IMPORT', 'UNKNOWN')")
+        if value not in set(['DATA_IMPORT', 'WORKSPACE_INIT', 'UNKNOWN']):
+            raise ValueError("must be one of enum values ('DATA_IMPORT', 'WORKSPACE_INIT', 'UNKNOWN')")
         return value
 
     @field_validator('status')

wds_client/models/record_query_response.py

@@ -78,9 +78,9 @@ class RecordQueryResponse(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of each item in records (list)
         _items = []
         if self.records:
-            for _item in self.records:
-                if _item:
-                    _items.append(_item.to_dict())
+            for _item_records in self.records:
+                if _item_records:
+                    _items.append(_item_records.to_dict())
             _dict['records'] = _items
         return _dict
 

wds_client/models/record_type_schema.py

@@ -75,9 +75,9 @@ class RecordTypeSchema(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of each item in attributes (list)
         _items = []
         if self.attributes:
-            for _item in self.attributes:
-                if _item:
-                    _items.append(_item.to_dict())
+            for _item_attributes in self.attributes:
+                if _item_attributes:
+                    _items.append(_item_attributes.to_dict())
             _dict['attributes'] = _items
         return _dict
 

wds_client/models/search_filter.py

@@ -27,7 +27,8 @@ class SearchFilter(BaseModel):
     SearchFilter
     """ # noqa: E501
     ids: Optional[List[StrictStr]] = Field(default=None, description="Record ids by which to filter the query")
-    __properties: ClassVar[List[str]] = ["ids"]
+    query: Optional[StrictStr] = Field(default=None, description="in the form column:text")
+    __properties: ClassVar[List[str]] = ["ids", "query"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -80,7 +81,8 @@ class SearchFilter(BaseModel):
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "ids": obj.get("ids")
+            "ids": obj.get("ids"),
+            "query": obj.get("query")
         })
         return _obj
 

wds_client/models/workspace_init.py

@@ -0,0 +1,91 @@
+# coding: utf-8
+
+"""
+    Workspace Data Service
+
+    This page lists current APIs.  All v0.2 APIs are subject to change without notice.  Changelog at [https://github.com/DataBiosphere/terra-workspace-data-service/releases](https://github.com/DataBiosphere/terra-workspace-data-service/releases) 
+
+    The version of the OpenAPI document: v0.2
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict
+from typing import Any, ClassVar, Dict, List, Optional
+from wds_client.models.workspace_init_clone import WorkspaceInitClone
+from typing import Optional, Set
+from typing_extensions import Self
+
+class WorkspaceInit(BaseModel):
+    """
+    WorkspaceInit
+    """ # noqa: E501
+    clone: Optional[WorkspaceInitClone] = None
+    __properties: ClassVar[List[str]] = ["clone"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of WorkspaceInit from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        # override the default output from pydantic by calling `to_dict()` of clone
+        if self.clone:
+            _dict['clone'] = self.clone.to_dict()
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of WorkspaceInit from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "clone": WorkspaceInitClone.from_dict(obj["clone"]) if obj.get("clone") is not None else None
+        })
+        return _obj
+
+

wds_client/models/workspace_init_clone.py

@@ -0,0 +1,87 @@
+# coding: utf-8
+
+"""
+    Workspace Data Service
+
+    This page lists current APIs.  All v0.2 APIs are subject to change without notice.  Changelog at [https://github.com/DataBiosphere/terra-workspace-data-service/releases](https://github.com/DataBiosphere/terra-workspace-data-service/releases) 
+
+    The version of the OpenAPI document: v0.2
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List
+from typing import Optional, Set
+from typing_extensions import Self
+
+class WorkspaceInitClone(BaseModel):
+    """
+    when present, will clone all collections from sourceWorkspaceId into this workspace
+    """ # noqa: E501
+    source_workspace_id: StrictStr = Field(description="id of the workspace being cloned", alias="sourceWorkspaceId")
+    __properties: ClassVar[List[str]] = ["sourceWorkspaceId"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of WorkspaceInitClone from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of WorkspaceInitClone from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "sourceWorkspaceId": obj.get("sourceWorkspaceId")
+        })
+        return _obj
+
+

{wds_client-0.15.0.dist-info → wds_client-0.18.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wds-client
-Version: 0.15.0
+Version: 0.18.0
 Summary: Workspace Data Service
 Home-page: 
 Author: OpenAPI Generator community

{wds_client-0.15.0.dist-info → wds_client-0.18.0.dist-info}/RECORD

@@ -1,21 +1,22 @@
-wds_client/__init__.py,sha256=X6yNOO7zB-KB4Y_iIbHwWiiRCK6G2wUGkWLsCkhUGwY,3366
-wds_client/api_client.py,sha256=OMp6nuH20uqG0XbE00XJpQJb8coUl2XhUAZeyrPwj6I,26923
+wds_client/__init__.py,sha256=T44qdH86ojkWjg6nnLWcb3yCTzvLiwb62mpYKflf7sM,3616
+wds_client/api_client.py,sha256=w_3XeVIaKy3GOCD8RK7Ii6g7rXH3-vHrGjZEjLTGvSg,27193
 wds_client/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
-wds_client/configuration.py,sha256=2V_j1j6cEH176Gu48-4JsRH6e2G4k8jp15EGmB9Qjfc,15455
+wds_client/configuration.py,sha256=8oYYpqIHNn2cos9PiIrt_HClHdKP-SmmTTpP3Kze63s,15455
 wds_client/exceptions.py,sha256=674T2OrRc-tySXqf45i00iZdt3r6AS-RnWjBUgRxAvc,6122
 wds_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wds_client/rest.py,sha256=Gbp9F8A2qoMDg4xrkCjSAG0FDHXUxcNB8oyfzJXxw4U,9554
-wds_client/api/__init__.py,sha256=v5lOQMp34S1yRr6sWAlsQqoBXvLb6jvHS7DAF4-ZorY,536
+wds_client/api/__init__.py,sha256=0i7Q7g32_5zFZT31bR9BQj6gH7kQDAh17yH8OMfj9Sc,590
 wds_client/api/capabilities_api.py,sha256=fbu84ZPzJq2cWS_x4HK_AeuvycDavlvbD-RkumXzs1M,10329
 wds_client/api/cloning_api.py,sha256=LkDwC-FYSyWqYqWHZZTI5Xic-jo01VlrjbT9J1joLjw,32455
-wds_client/api/collection_api.py,sha256=289_Hh_hll8IJu_MKx5AxvgUVCWdHbW9oMPgWVJfaDk,55999
+wds_client/api/collection_api.py,sha256=abZF56OGRIiqbloMi6zd7ahdBkwFwEMO6m4ZbNP8DXA,55679
 wds_client/api/general_wds_information_api.py,sha256=xwfn820K0Q1BaWtIEWWuIkMUNxeFFq2LQiiYIY4BUrA,20256
 wds_client/api/import_api.py,sha256=-R7A7mr-FkkF-CKA_aEdXw_gFi101vm3n6pgWEoXgfU,12930
 wds_client/api/instances_api.py,sha256=chNSyh-oiihu_6CcsUa2af853TwtDLFRxGTWpPKS9zo,33855
 wds_client/api/job_api.py,sha256=2oQdl-1Si_QloKtiPGgOitftCb0GMto-O-PZoyUZ7kE,21802
 wds_client/api/records_api.py,sha256=5sESj3Wq6oG2f82Rbtr-Wab4yOr64N023IFr5U5YFNo,106659
 wds_client/api/schema_api.py,sha256=nIuLrh_GJUjkoAZwomIrQXagYZU4HLvg4naHh3uBWZM,61103
-wds_client/models/__init__.py,sha256=_LXg2jqctQ-W-B3Ry3VJpyY_em3EsGE9fWGx7txnvhE,2369
+wds_client/api/workspace_api.py,sha256=1dYyHxLRoCxX9fy-gbqXWOfGPRJSlayqWoNK1sFio1A,12985
+wds_client/models/__init__.py,sha256=xWv8s7r50bVB6aWNzIDPUMLu4uHj9qYCE0ps2IcyiLI,2565
 wds_client/models/app.py,sha256=9aTIAS8vTOch8zKHBvZHuXumL0vYZBOO2g9Y8VKjPPw,2772
 wds_client/models/attribute_data_type.py,sha256=R4kI1B2oH7pcyNYcIUElp5MmAMWGj0KY1AeQ5zo0lKk,1514
 wds_client/models/attribute_schema.py,sha256=Lrrw5iTq9O56DbcCgAGgif500eO9-aaJ8FWHNM6pF7U,3091
@@ -31,24 +32,27 @@ wds_client/models/capabilities.py,sha256=Vqh62U0ZX_tNaBnAvabkdOCzByLp49FHBToxOZ6
 wds_client/models/clone_job.py,sha256=Dt7imPtHrLgJbdWBbABjXo3ArZ4aJVRKEHgETiCTI1Y,4057
 wds_client/models/clone_response.py,sha256=qrBpBfS-b3EmAszCdY7vzfMJj4zr36xvp5Zlj0fLjoM,2943
 wds_client/models/collection.py,sha256=LxuptlecUwSBpieeyuIUCgKghO47i1R7xyv_-HHKoOQ,3261
+wds_client/models/collection_request.py,sha256=eNm5jUvaTqz20jrN0qoNg8iXf84sNmEF1ZpyP608fPM,3205
 wds_client/models/commit.py,sha256=yE9OxZ_1kGnbD3U80QTBi8HOELfxd21Eb3-RraPqbsc,2720
 wds_client/models/error_response.py,sha256=U1Fl24jQhD2gEEREBSemaUp8PHKO7XHJ4pSLmgnVxz0,3115
-wds_client/models/generic_job.py,sha256=XCO9Ll3aFcuVEZtbhbGzJ-u-KqgA18JBjj7MGPOWGck,4385
+wds_client/models/generic_job.py,sha256=-LW-WC1T_SSfpAZTdxoEKc3_Njn-Iab1Opmy7E2hwfU,4421
 wds_client/models/git.py,sha256=ylt-GWcCKsfZmWfBHQIT7EO5mHhLqQnnf8hANgUZcl0,2962
 wds_client/models/import_request.py,sha256=r8Tph4ZXFfXpI3n1nlbqs7azgrdEynwlQYrn4RvufWw,3309
 wds_client/models/job.py,sha256=vaqbX9i6Oe0plmCAD9hBbpSCysvSxAqWkkOTuRwCTBo,3499
-wds_client/models/job_v1.py,sha256=txrmfTIW6VZ3NvRmtHSmxbJeU22SvesWzJYHVWMEHa8,3926
-wds_client/models/record_query_response.py,sha256=MnWYml3zasmWKLaFObZmkkredGo_mpHRoPnMljzFr_M,3809
+wds_client/models/job_v1.py,sha256=2-M7pJrzvdNiCTIRxOW8GiY9WJfDL_QeitPNQzojRvE,3962
+wds_client/models/record_query_response.py,sha256=mwIUazdWiw1uu9Kq0MeSe4wqJAgA-5mQFS8os0GpofI,3833
 wds_client/models/record_request.py,sha256=c-jJuqOgogRM5HdR2HoafMnpIAdfCukysSBFCqnwCjM,2796
 wds_client/models/record_response.py,sha256=ZniN8hDVM7QAEbhwbUnr5RXYpZJHqwFPxBlmlhorBDk,3001
-wds_client/models/record_type_schema.py,sha256=WITuWzyFehg0sYNwhixeeCT7lODEZvEFnlDLVjxAugw,3752
-wds_client/models/search_filter.py,sha256=x7DKOQEgJfYZ71b2AmBvvGLSnhZhycSKsjAIOr135ZY,2720
+wds_client/models/record_type_schema.py,sha256=UMlHVrAwfrsEn0-9YjgVw9WfVB2mBOi1ntsGwECaspQ,3785
+wds_client/models/search_filter.py,sha256=TWUJEqSOdgER6OV9IrNodSnn9JZ8Q7Spc0e1EYWm7M0,2860
 wds_client/models/search_request.py,sha256=RLJq3S4vC4bg9dprEH0kT-h9m6PVblBkAzVHYw5XW-I,3801
 wds_client/models/search_sort_direction.py,sha256=fnqUYvbgXHQ5mESZnxDvcUZ5wi6i770fkqu00jtCATM,932
 wds_client/models/status_response.py,sha256=A5i2yWShlaGVVyi1DGg1KsC8S4fyLbmxJmqLlMKmtH0,2768
 wds_client/models/tsv_upload_response.py,sha256=yhj-3KEFzs-EYnaGZvsr6KgrK6wlYCZKVA7ObfZ2ECc,2807
 wds_client/models/version_response.py,sha256=pQ9eukrGQPdLBwvPKN_ucFlMKff25oGywruwIdL918o,3516
-wds_client-0.15.0.dist-info/METADATA,sha256=bIfXYUhRBuf_LJRqXUnwyOk4wrG_BaO_wQE6DIHDoNw,675
-wds_client-0.15.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-wds_client-0.15.0.dist-info/top_level.txt,sha256=hU2h533r5-3FzApV8ps3zXmQJKy74SPT3sYR8-uZhp8,11
-wds_client-0.15.0.dist-info/RECORD,,
+wds_client/models/workspace_init.py,sha256=XHtI3gddZY3_X0byd232m15cChbvln_jWBDZoE8_20w,2942
+wds_client/models/workspace_init_clone.py,sha256=MTQuoSuJrYCQLbWGPA8VCcB3phs7101HcUj3Q27yVK0,2847
+wds_client-0.18.0.dist-info/METADATA,sha256=caCbBHwQ97SNqFPXe9wV_8wyo7KT_PWXOtPEXHPLZdw,675
+wds_client-0.18.0.dist-info/WHEEL,sha256=nCVcAvsfA9TDtwGwhYaRrlPhTLV9m-Ga6mdyDtuwK18,91
+wds_client-0.18.0.dist-info/top_level.txt,sha256=hU2h533r5-3FzApV8ps3zXmQJKy74SPT3sYR8-uZhp8,11
+wds_client-0.18.0.dist-info/RECORD,,

{wds_client-0.15.0.dist-info → wds_client-0.18.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (73.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any