flywheel-sdk 19.3.0rc1__py2.py3-none-any.whl → 19.4.0__py2.py3-none-any.whl

flywheel/models/__init__.py

@@ -6,7 +6,7 @@
 
     Flywheel: API for data import, automated curation, image processing, machine learning workflows, and secure collaboration.  # noqa: E501
 
-    OpenAPI spec version: 19.3.0-rc1
+    OpenAPI spec version: 19.4.0
     
     Generated by: https://github.com/swagger-api/swagger-codegen.git
 """
@@ -237,6 +237,7 @@ from flywheel.models.file_version_output import FileVersionOutput
 from flywheel.models.file_via import FileVia
 from flywheel.models.file_zip_entry import FileZipEntry
 from flywheel.models.file_zip_info import FileZipInfo
+from flywheel.models.filter import Filter
 from flywheel.models.filter_values import FilterValues
 from flywheel.models.fixed_file_version_input import FixedFileVersionInput
 from flywheel.models.fixed_input import FixedInput

flywheel/models/daily_report_usage.py

@@ -33,7 +33,9 @@ class DailyReportUsage(object):
         'center_compute_ms': 'int',
         'group_compute_ms': 'int',
         'center_storage_bytes': 'int',
-        'group_storage_bytes': 'int'
+        'center_storage_soft_deleted_bytes': 'int',
+        'group_storage_bytes': 'int',
+        'group_storage_soft_deleted_bytes': 'int'
     }
 
     attribute_map = {
@@ -49,7 +51,9 @@ class DailyReportUsage(object):
         'center_compute_ms': 'center_compute_ms',
         'group_compute_ms': 'group_compute_ms',
         'center_storage_bytes': 'center_storage_bytes',
-        'group_storage_bytes': 'group_storage_bytes'
+        'center_storage_soft_deleted_bytes': 'center_storage_soft_deleted_bytes',
+        'group_storage_bytes': 'group_storage_bytes',
+        'group_storage_soft_deleted_bytes': 'group_storage_soft_deleted_bytes'
     }
 
     rattribute_map = {
@@ -65,10 +69,12 @@ class DailyReportUsage(object):
         'center_compute_ms': 'center_compute_ms',
         'group_compute_ms': 'group_compute_ms',
         'center_storage_bytes': 'center_storage_bytes',
-        'group_storage_bytes': 'group_storage_bytes'
+        'center_storage_soft_deleted_bytes': 'center_storage_soft_deleted_bytes',
+        'group_storage_bytes': 'group_storage_bytes',
+        'group_storage_soft_deleted_bytes': 'group_storage_soft_deleted_bytes'
     }
 
-    def __init__(self, year=None, month=None, day=None, project_label=None, group=None, project=None, session_count=0, center_job_count=0, group_job_count=0, center_compute_ms=0, group_compute_ms=0, center_storage_bytes=0, group_storage_bytes=0):  # noqa: E501
+    def __init__(self, year=None, month=None, day=None, project_label=None, group=None, project=None, session_count=0, center_job_count=0, group_job_count=0, center_compute_ms=0, group_compute_ms=0, center_storage_bytes=0, center_storage_soft_deleted_bytes=0, group_storage_bytes=0, group_storage_soft_deleted_bytes=0):  # noqa: E501
         """DailyReportUsage - a model defined in Swagger"""
         super(DailyReportUsage, self).__init__()
 
@@ -84,7 +90,9 @@ class DailyReportUsage(object):
         self._center_compute_ms = None
         self._group_compute_ms = None
         self._center_storage_bytes = None
+        self._center_storage_soft_deleted_bytes = None
         self._group_storage_bytes = None
+        self._group_storage_soft_deleted_bytes = None
         self.discriminator = None
         self.alt_discriminator = None
 
@@ -107,8 +115,12 @@ class DailyReportUsage(object):
             self.group_compute_ms = group_compute_ms
         if center_storage_bytes is not None:
             self.center_storage_bytes = center_storage_bytes
+        if center_storage_soft_deleted_bytes is not None:
+            self.center_storage_soft_deleted_bytes = center_storage_soft_deleted_bytes
         if group_storage_bytes is not None:
             self.group_storage_bytes = group_storage_bytes
+        if group_storage_soft_deleted_bytes is not None:
+            self.group_storage_soft_deleted_bytes = group_storage_soft_deleted_bytes
 
     @property
     def year(self):
@@ -384,6 +396,29 @@ class DailyReportUsage(object):
 
         self._center_storage_bytes = center_storage_bytes
 
+    @property
+    def center_storage_soft_deleted_bytes(self):
+        """Gets the center_storage_soft_deleted_bytes of this DailyReportUsage.
+
+        The total storage used by soft deleted files originating from devices or center-designated gears on this day (billable to the center)
+
+        :return: The center_storage_soft_deleted_bytes of this DailyReportUsage.
+        :rtype: int
+        """
+        return self._center_storage_soft_deleted_bytes
+
+    @center_storage_soft_deleted_bytes.setter
+    def center_storage_soft_deleted_bytes(self, center_storage_soft_deleted_bytes):
+        """Sets the center_storage_soft_deleted_bytes of this DailyReportUsage.
+
+        The total storage used by soft deleted files originating from devices or center-designated gears on this day (billable to the center)
+
+        :param center_storage_soft_deleted_bytes: The center_storage_soft_deleted_bytes of this DailyReportUsage.  # noqa: E501
+        :type: int
+        """
+
+        self._center_storage_soft_deleted_bytes = center_storage_soft_deleted_bytes
+
     @property
     def group_storage_bytes(self):
         """Gets the group_storage_bytes of this DailyReportUsage.
@@ -407,6 +442,29 @@ class DailyReportUsage(object):
 
         self._group_storage_bytes = group_storage_bytes
 
+    @property
+    def group_storage_soft_deleted_bytes(self):
+        """Gets the group_storage_soft_deleted_bytes of this DailyReportUsage.
+
+        The total storage used by soft deleted files not originating from devices or non-center-designated (lab) gears on this day (billable to the group)
+
+        :return: The group_storage_soft_deleted_bytes of this DailyReportUsage.
+        :rtype: int
+        """
+        return self._group_storage_soft_deleted_bytes
+
+    @group_storage_soft_deleted_bytes.setter
+    def group_storage_soft_deleted_bytes(self, group_storage_soft_deleted_bytes):
+        """Sets the group_storage_soft_deleted_bytes of this DailyReportUsage.
+
+        The total storage used by soft deleted files not originating from devices or non-center-designated (lab) gears on this day (billable to the group)
+
+        :param group_storage_soft_deleted_bytes: The group_storage_soft_deleted_bytes of this DailyReportUsage.  # noqa: E501
+        :type: int
+        """
+
+        self._group_storage_soft_deleted_bytes = group_storage_soft_deleted_bytes
+
 
     @staticmethod
     def positional_to_model(value):

flywheel/models/features.py

@@ -81,7 +81,7 @@ class Features(object):
         'userpilot': 'bool',
         'validate_classification': 'bool',
         'virus_scan': 'bool',
-        'web_uploader_v2': 'bool'
+        'legacy_dicom_uploader': 'bool'
     }
 
     attribute_map = {
@@ -145,7 +145,7 @@ class Features(object):
         'userpilot': 'userpilot',
         'validate_classification': 'validate_classification',
         'virus_scan': 'virus_scan',
-        'web_uploader_v2': 'web_uploader_v2'
+        'legacy_dicom_uploader': 'legacy_dicom_uploader'
     }
 
     rattribute_map = {
@@ -209,10 +209,10 @@ class Features(object):
         'userpilot': 'userpilot',
         'validate_classification': 'validate_classification',
         'virus_scan': 'virus_scan',
-        'web_uploader_v2': 'web_uploader_v2'
+        'legacy_dicom_uploader': 'legacy_dicom_uploader'
     }
 
-    def __init__(self, api_enabled_gear_rules=True, auth0=None, audit_trail=False, azureml_integration=False, cold_job_logs=False, collections=False, copy_by_reference=True, core_api=True, crawler=False, data_views_non_21_cfr=True, default_viewer_apps=True, deid_log=False, deid_profile=False, dicom_web_uploader_non_21_cfr=True, dimse=False, elastic_search_primary=False, exchange=False, exchange_admin=False, external_routing=False, gear_access=True, google_analytics=True, healthcare_api=False, job_ask=True, job_prioritization=True, job_tickets=True, jupyter_integration=False, jupyterhub_external_storage=True, ldap_sync=False, multifactor_auth=False, multipart_signed_url=True, multiproject=False, ohif_multi_subject_view=False, ohif_react=False, ohif_react_beta=False, ohif_slice_order=None, ohif_v2_adhoc_indexing=True, ohif_v3=False, ohif_v3_beta=False, ohif_v3_default_app=False, ohif_v3_readonly=True, project_export=True, project_import=True, project_list_uses_stats=False, project_locking=False, reader_tasks=False, rts_sync=False, sentry_logging=None, session_templates_non_21_cfr=True, shared_projects=False, signed_url=False, study_task_status=False, tagging=False, tags_in_lists=True, task_manager_data_views=True, transform_search_fields=True, unsafe_login=False, url_access_apps=False, userpilot=None, validate_classification=False, virus_scan=False, web_uploader_v2=True):  # noqa: E501
+    def __init__(self, api_enabled_gear_rules=True, auth0=None, audit_trail=False, azureml_integration=False, cold_job_logs=False, collections=False, copy_by_reference=True, core_api=True, crawler=False, data_views_non_21_cfr=True, default_viewer_apps=True, deid_log=False, deid_profile=False, dicom_web_uploader_non_21_cfr=True, dimse=False, elastic_search_primary=False, exchange=False, exchange_admin=False, external_routing=False, gear_access=True, google_analytics=True, healthcare_api=False, job_ask=True, job_prioritization=True, job_tickets=True, jupyter_integration=False, jupyterhub_external_storage=True, ldap_sync=False, multifactor_auth=False, multipart_signed_url=True, multiproject=False, ohif_multi_subject_view=False, ohif_react=False, ohif_react_beta=False, ohif_slice_order=None, ohif_v2_adhoc_indexing=True, ohif_v3=True, ohif_v3_beta=False, ohif_v3_default_app=False, ohif_v3_readonly=False, project_export=True, project_import=True, project_list_uses_stats=False, project_locking=False, reader_tasks=False, rts_sync=False, sentry_logging=None, session_templates_non_21_cfr=True, shared_projects=False, signed_url=False, study_task_status=False, tagging=False, tags_in_lists=True, task_manager_data_views=True, transform_search_fields=True, unsafe_login=False, url_access_apps=False, userpilot=None, validate_classification=False, virus_scan=False, legacy_dicom_uploader=False):  # noqa: E501
         """Features - a model defined in Swagger"""
         super(Features, self).__init__()
 
@@ -276,7 +276,7 @@ class Features(object):
         self._userpilot = None
         self._validate_classification = None
         self._virus_scan = None
-        self._web_uploader_v2 = None
+        self._legacy_dicom_uploader = None
         self.discriminator = None
         self.alt_discriminator = None
 
@@ -400,8 +400,8 @@ class Features(object):
             self.validate_classification = validate_classification
         if virus_scan is not None:
             self.virus_scan = virus_scan
-        if web_uploader_v2 is not None:
-            self.web_uploader_v2 = web_uploader_v2
+        if legacy_dicom_uploader is not None:
+            self.legacy_dicom_uploader = legacy_dicom_uploader
 
     @property
     def api_enabled_gear_rules(self):
@@ -1664,25 +1664,25 @@ class Features(object):
         self._virus_scan = virus_scan
 
     @property
-    def web_uploader_v2(self):
-        """Gets the web_uploader_v2 of this Features.
+    def legacy_dicom_uploader(self):
+        """Gets the legacy_dicom_uploader of this Features.
 
 
-        :return: The web_uploader_v2 of this Features.
+        :return: The legacy_dicom_uploader of this Features.
         :rtype: bool
         """
-        return self._web_uploader_v2
+        return self._legacy_dicom_uploader
 
-    @web_uploader_v2.setter
-    def web_uploader_v2(self, web_uploader_v2):
-        """Sets the web_uploader_v2 of this Features.
+    @legacy_dicom_uploader.setter
+    def legacy_dicom_uploader(self, legacy_dicom_uploader):
+        """Sets the legacy_dicom_uploader of this Features.
 
 
-        :param web_uploader_v2: The web_uploader_v2 of this Features.  # noqa: E501
+        :param legacy_dicom_uploader: The legacy_dicom_uploader of this Features.  # noqa: E501
         :type: bool
         """
 
-        self._web_uploader_v2 = web_uploader_v2
+        self._legacy_dicom_uploader = legacy_dicom_uploader
 
 
     @staticmethod

flywheel/models/filter.py

@@ -0,0 +1,217 @@
+# coding: utf-8
+
+"""
+    Flywheel
+
+    No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)  # noqa: E501
+
+    OpenAPI spec version: 0.0.1
+    
+    Generated by: https://github.com/swagger-api/swagger-codegen.git
+"""
+
+
+## NOTE: This file is auto generated by the swagger code generator program.
+## Do not edit the file manually.
+
+import pprint
+import re  # noqa: F401
+import six
+
+class Filter(object):
+
+    swagger_types = {
+        'attribute': 'str',
+        'operator': 'str',
+        'value': 'union[str,integer,list[Object]]'
+    }
+
+    attribute_map = {
+        'attribute': 'attribute',
+        'operator': 'operator',
+        'value': 'value'
+    }
+
+    rattribute_map = {
+        'attribute': 'attribute',
+        'operator': 'operator',
+        'value': 'value'
+    }
+
+    def __init__(self, attribute=None, operator=None, value=None):  # noqa: E501
+        """Filter - a model defined in Swagger"""
+        super(Filter, self).__init__()
+
+        self._attribute = None
+        self._operator = None
+        self._value = None
+        self.discriminator = None
+        self.alt_discriminator = None
+
+        self.attribute = attribute
+        self.operator = operator
+        if value is not None:
+            self.value = value
+
+    @property
+    def attribute(self):
+        """Gets the attribute of this Filter.
+
+
+        :return: The attribute of this Filter.
+        :rtype: str
+        """
+        return self._attribute
+
+    @attribute.setter
+    def attribute(self, attribute):
+        """Sets the attribute of this Filter.
+
+
+        :param attribute: The attribute of this Filter.  # noqa: E501
+        :type: str
+        """
+
+        self._attribute = attribute
+
+    @property
+    def operator(self):
+        """Gets the operator of this Filter.
+
+        Comparison operator to filter on. Can be one of: < (lt), <= (lte), = (eq), != (neq), >= (gte), > (gt), =~ (reg), =| (in), !=| (not_in)
+
+        :return: The operator of this Filter.
+        :rtype: str
+        """
+        return self._operator
+
+    @operator.setter
+    def operator(self, operator):
+        """Sets the operator of this Filter.
+
+        Comparison operator to filter on. Can be one of: < (lt), <= (lte), = (eq), != (neq), >= (gte), > (gt), =~ (reg), =| (in), !=| (not_in)
+
+        :param operator: The operator of this Filter.  # noqa: E501
+        :type: str
+        """
+
+        self._operator = operator
+
+    @property
+    def value(self):
+        """Gets the value of this Filter.
+
+
+        :return: The value of this Filter.
+        :rtype: union[str,integer,list[Object]]
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this Filter.
+
+
+        :param value: The value of this Filter.  # noqa: E501
+        :type: union[str,integer,list[Object]]
+        """
+
+        self._value = value
+
+
+    @staticmethod
+    def positional_to_model(value):
+        """Converts a positional argument to a model value"""
+        return value
+
+    def return_value(self):
+        """Unwraps return value from model"""
+        return self
+
+    def to_dict(self):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        for attr, _ in six.iteritems(self.swagger_types):
+            value = getattr(self, attr)
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: x.to_dict() if hasattr(x, "to_dict") else x,
+                    value
+                ))
+            elif hasattr(value, "to_dict"):
+                result[attr] = value.to_dict()
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], item[1].to_dict())
+                    if hasattr(item[1], "to_dict") else item,
+                    value.items()
+                ))
+            else:
+                result[attr] = value
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, Filter):
+            return False
+
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        return not self == other
+
+    # Container emulation
+    def __getitem__(self, key):
+        """Returns the value of key"""
+        key = self._map_key(key)
+        return getattr(self, key)
+
+    def __setitem__(self, key, value):
+        """Sets the value of key"""
+        key = self._map_key(key)
+        setattr(self, key, value)
+
+    def __contains__(self, key):
+        """Checks if the given value is a key in this object"""
+        key = self._map_key(key, raise_on_error=False)
+        return key is not None
+
+    def keys(self):
+        """Returns the list of json properties in the object"""
+        return self.__class__.rattribute_map.keys()
+
+    def values(self):
+        """Returns the list of values in the object"""
+        for key in self.__class__.attribute_map.keys():
+            yield getattr(self, key)
+
+    def items(self):
+        """Returns the list of json property to value mapping"""
+        for key, prop in self.__class__.rattribute_map.items():
+            yield key, getattr(self, prop)
+
+    def get(self, key, default=None):
+        """Get the value of the provided json property, or default"""
+        key = self._map_key(key, raise_on_error=False)
+        if key:
+            return getattr(self, key, default)
+        return default
+
+    def _map_key(self, key, raise_on_error=True):
+        result = self.__class__.rattribute_map.get(key)
+        if result is None:
+            if raise_on_error:
+                raise AttributeError('Invalid attribute name: {}'.format(key))
+            return None
+        return '_' + result

flywheel/models/mixins.py

@@ -1,8 +1,9 @@
+import warnings
+
 from .. import util
 from ..finder import Finder
 from .gear_mixin import GearMixin
 
-
 class ContextBase(object):
     def __init__(self):
         self._context = None
@@ -48,6 +49,9 @@ class ContainerBase(object):
                 fname = fname.replace("file", file_group)
             fn = getattr(self.__context, fname, None)
             if fn:
+                if len(args) > 1 and isinstance(args[1], str):
+                    if "/" in args[1]:
+                        warnings.warn(f"Filename {args[1]} contains disallowed character '/', methods on this object will fail. Rename file with fw.move_file")
                 return fn(*args, **kwargs)
         return None
 
@@ -129,14 +133,41 @@ class ContainerBase(object):
 
 
 class InfoMethods(object):
+
+    def _warn_if_keys_will_be_sanitized(self, key):
+        """Log warning message for offending characters"""
+        if "$" in key:
+            warnings.warn(f"Key {key} contains '$', which will be replaced with '-'.")
+        if "." in key:
+            warnings.warn(f"Key {key} contains '.', which will be replaced with '_'.")
+
+    def _check_list(self, values):
+        """Check list values"""
+        for val in values:
+            if isinstance(val, list):
+                self._check_list(val)
+            elif isinstance(val, dict):
+                self._validate_keys(val)
+
+    def _validate_keys(self, body):
+        """Recursively check for keys that contain offending characters"""
+        for key, values in body.items():
+            self._warn_if_keys_will_be_sanitized(key)
+            if isinstance(values, dict):
+                self._validate_keys(values)
+            elif isinstance(values, list):
+                self._check_list(values)
+
     def replace_info(self, info):
         """Fully replace this object's info with the provided value"""
+        self._validate_keys(info)
         return self._invoke_container_api("replace_{}_info", self.id, info)
 
     def update_info(self, *args, **kwargs):
         """Update the info with the passed in arguments"""
         # Could either pass a dictionary or kwargs values
         body = util.params_to_dict("update_info", args, kwargs)
+        self._validate_keys(body)
         return self._invoke_container_api("set_{}_info", self.id, body)
 
     def delete_info(self, *args):
@@ -663,7 +694,7 @@ class FileMixin(ContainerBase):
 
     def get_zip_info(self, **kwargs):
         """Get zip member information for this file"""
-        return self.parent.get_file_zip_info(self.name, **kwargs)
+        return self._invoke_container_api("get_file_zip_info", self.file_id, **kwargs)
 
     def download_zip_member(self, member_path, dest_file, **kwargs):
         """Download file's zip member to the given path"""

flywheel/models/report_usage.py

@@ -32,8 +32,11 @@ class ReportUsage(object):
         'group_compute_ms': 'int',
         'total_compute_ms': 'int',
         'center_storage_byte_day': 'int',
+        'center_storage_soft_deleted_byte_day': 'int',
         'group_storage_byte_day': 'int',
+        'group_storage_soft_deleted_byte_day': 'int',
         'total_storage_byte_day': 'int',
+        'total_storage_soft_deleted_byte_day': 'int',
         'days': 'int'
     }
 
@@ -49,8 +52,11 @@ class ReportUsage(object):
         'group_compute_ms': 'group_compute_ms',
         'total_compute_ms': 'total_compute_ms',
         'center_storage_byte_day': 'center_storage_byte_day',
+        'center_storage_soft_deleted_byte_day': 'center_storage_soft_deleted_byte_day',
         'group_storage_byte_day': 'group_storage_byte_day',
+        'group_storage_soft_deleted_byte_day': 'group_storage_soft_deleted_byte_day',
         'total_storage_byte_day': 'total_storage_byte_day',
+        'total_storage_soft_deleted_byte_day': 'total_storage_soft_deleted_byte_day',
         'days': 'days'
     }
 
@@ -66,12 +72,15 @@ class ReportUsage(object):
         'group_compute_ms': 'group_compute_ms',
         'total_compute_ms': 'total_compute_ms',
         'center_storage_byte_day': 'center_storage_byte_day',
+        'center_storage_soft_deleted_byte_day': 'center_storage_soft_deleted_byte_day',
         'group_storage_byte_day': 'group_storage_byte_day',
+        'group_storage_soft_deleted_byte_day': 'group_storage_soft_deleted_byte_day',
         'total_storage_byte_day': 'total_storage_byte_day',
+        'total_storage_soft_deleted_byte_day': 'total_storage_soft_deleted_byte_day',
         'days': 'days'
     }
 
-    def __init__(self, project_label=None, group='', project=None, session_count=0, center_job_count=0, group_job_count=0, total_job_count=0, center_compute_ms=0, group_compute_ms=0, total_compute_ms=0, center_storage_byte_day=0, group_storage_byte_day=0, total_storage_byte_day=0, days=0):  # noqa: E501
+    def __init__(self, project_label=None, group='', project=None, session_count=0, center_job_count=0, group_job_count=0, total_job_count=0, center_compute_ms=0, group_compute_ms=0, total_compute_ms=0, center_storage_byte_day=0, center_storage_soft_deleted_byte_day=0, group_storage_byte_day=0, group_storage_soft_deleted_byte_day=0, total_storage_byte_day=0, total_storage_soft_deleted_byte_day=0, days=0):  # noqa: E501
         """ReportUsage - a model defined in Swagger"""
         super(ReportUsage, self).__init__()
 
@@ -86,8 +95,11 @@ class ReportUsage(object):
         self._group_compute_ms = None
         self._total_compute_ms = None
         self._center_storage_byte_day = None
+        self._center_storage_soft_deleted_byte_day = None
         self._group_storage_byte_day = None
+        self._group_storage_soft_deleted_byte_day = None
         self._total_storage_byte_day = None
+        self._total_storage_soft_deleted_byte_day = None
         self._days = None
         self.discriminator = None
         self.alt_discriminator = None
@@ -114,10 +126,16 @@ class ReportUsage(object):
             self.total_compute_ms = total_compute_ms
         if center_storage_byte_day is not None:
             self.center_storage_byte_day = center_storage_byte_day
+        if center_storage_soft_deleted_byte_day is not None:
+            self.center_storage_soft_deleted_byte_day = center_storage_soft_deleted_byte_day
         if group_storage_byte_day is not None:
             self.group_storage_byte_day = group_storage_byte_day
+        if group_storage_soft_deleted_byte_day is not None:
+            self.group_storage_soft_deleted_byte_day = group_storage_soft_deleted_byte_day
         if total_storage_byte_day is not None:
             self.total_storage_byte_day = total_storage_byte_day
+        if total_storage_soft_deleted_byte_day is not None:
+            self.total_storage_soft_deleted_byte_day = total_storage_soft_deleted_byte_day
         if days is not None:
             self.days = days
 
@@ -374,6 +392,29 @@ class ReportUsage(object):
 
         self._center_storage_byte_day = center_storage_byte_day
 
+    @property
+    def center_storage_soft_deleted_byte_day(self):
+        """Gets the center_storage_soft_deleted_byte_day of this ReportUsage.
+
+        The storage, in byte-days, used by soft deleted files originating from devices or center-designated gears in this project during the month (billable to the center)
+
+        :return: The center_storage_soft_deleted_byte_day of this ReportUsage.
+        :rtype: int
+        """
+        return self._center_storage_soft_deleted_byte_day
+
+    @center_storage_soft_deleted_byte_day.setter
+    def center_storage_soft_deleted_byte_day(self, center_storage_soft_deleted_byte_day):
+        """Sets the center_storage_soft_deleted_byte_day of this ReportUsage.
+
+        The storage, in byte-days, used by soft deleted files originating from devices or center-designated gears in this project during the month (billable to the center)
+
+        :param center_storage_soft_deleted_byte_day: The center_storage_soft_deleted_byte_day of this ReportUsage.  # noqa: E501
+        :type: int
+        """
+
+        self._center_storage_soft_deleted_byte_day = center_storage_soft_deleted_byte_day
+
     @property
     def group_storage_byte_day(self):
         """Gets the group_storage_byte_day of this ReportUsage.
@@ -397,6 +438,29 @@ class ReportUsage(object):
 
         self._group_storage_byte_day = group_storage_byte_day
 
+    @property
+    def group_storage_soft_deleted_byte_day(self):
+        """Gets the group_storage_soft_deleted_byte_day of this ReportUsage.
+
+        The storage, in byte-days, used by soft deleted files not originating from devices or non-center-designated (lab) gears in this project during the month (billable to the group)
+
+        :return: The group_storage_soft_deleted_byte_day of this ReportUsage.
+        :rtype: int
+        """
+        return self._group_storage_soft_deleted_byte_day
+
+    @group_storage_soft_deleted_byte_day.setter
+    def group_storage_soft_deleted_byte_day(self, group_storage_soft_deleted_byte_day):
+        """Sets the group_storage_soft_deleted_byte_day of this ReportUsage.
+
+        The storage, in byte-days, used by soft deleted files not originating from devices or non-center-designated (lab) gears in this project during the month (billable to the group)
+
+        :param group_storage_soft_deleted_byte_day: The group_storage_soft_deleted_byte_day of this ReportUsage.  # noqa: E501
+        :type: int
+        """
+
+        self._group_storage_soft_deleted_byte_day = group_storage_soft_deleted_byte_day
+
     @property
     def total_storage_byte_day(self):
         """Gets the total_storage_byte_day of this ReportUsage.
@@ -420,6 +484,29 @@ class ReportUsage(object):
 
         self._total_storage_byte_day = total_storage_byte_day
 
+    @property
+    def total_storage_soft_deleted_byte_day(self):
+        """Gets the total_storage_soft_deleted_byte_day of this ReportUsage.
+
+        The total storage, in byte-days, used by soft deleted files in this project during the month
+
+        :return: The total_storage_soft_deleted_byte_day of this ReportUsage.
+        :rtype: int
+        """
+        return self._total_storage_soft_deleted_byte_day
+
+    @total_storage_soft_deleted_byte_day.setter
+    def total_storage_soft_deleted_byte_day(self, total_storage_soft_deleted_byte_day):
+        """Sets the total_storage_soft_deleted_byte_day of this ReportUsage.
+
+        The total storage, in byte-days, used by soft deleted files in this project during the month
+
+        :param total_storage_soft_deleted_byte_day: The total_storage_soft_deleted_byte_day of this ReportUsage.  # noqa: E501
+        :type: int
+        """
+
+        self._total_storage_soft_deleted_byte_day = total_storage_soft_deleted_byte_day
+
     @property
     def days(self):
         """Gets the days of this ReportUsage.