Merge pull request #136 from smartsheet-platform/tw-updates

r83 updates

Author: kfansler

smartsheet/models/__init__.py

@@ -95,6 +95,7 @@
 from .sheet_filter import SheetFilter
 from .sheet_filter_details import SheetFilterDetails
 from .sheet_publish import SheetPublish
+from .sheet_summary import SheetSummary
 from .sheet_user_settings import SheetUserSettings
 from .shortcut_data_item import ShortcutDataItem
 from .sight import Sight
@@ -103,6 +104,7 @@
 from .sort_specifier import SortSpecifier
 from .source import Source
 from .string_object_value import StringObjectValue
+from .summary_field import SummaryField
 from .template import Template
 from .update_request import UpdateRequest
 from .user import User

smartsheet/models/cell.py

@@ -18,17 +18,10 @@
 from __future__ import absolute_import
 
 from .cell_link import CellLink
+from .explicit_null import ExplicitNull
 from .hyperlink import Hyperlink
 from .image import Image
-from .object_value import *
-from .duration import Duration
-from .predecessor_list import PredecessorList
-from .contact_object_value import ContactObjectValue
-from .multi_contact_object_value import MultiContactObjectValue
-from .date_object_value import DateObjectValue
-from .string_object_value import StringObjectValue
-from .number_object_value import NumberObjectValue
-from .boolean_object_value import BooleanObjectValue
+from ..object_value import assign_to_object_value
 from ..types import *
 from ..util import serialize
 from ..util import deserialize
@@ -162,36 +155,7 @@ def object_value(self):
 
     @object_value.setter
     def object_value(self, value):
-        if isinstance(value, ObjectValue):
-            self._object_value = value
-        elif isinstance(value, dict):
-            object_type = value['objectType']
-            if object_type in OBJECT_VALUE['object_type']:
-                enum_object_type = enum_object_value_type(object_type)
-                if enum_object_type == DURATION:
-                    self._object_value = Duration(value, self._base)
-                elif enum_object_type == PREDECESSOR_LIST:
-                    self._object_value = PredecessorList(value, self._base)
-                elif enum_object_type == CONTACT:
-                    self._object_value = ContactObjectValue(value, self._base)
-                elif enum_object_type == DATE or enum_object_type == DATETIME or \
-                        enum_object_type == ABSTRACT_DATETIME:
-                    self._object_value = DateObjectValue(value, enum_object_value_type, self._base)
-                elif enum_object_type == MULTI_CONTACT:
-                    self._object_value = MultiContactObjectValue(value, self._base)
-                else:
-                    self._object_value = None
-            else:
-                raise ValueError(
-                    ("`{0}` is an invalid value for ObjectValue`object_type`,"
-                     " must be one of {1}").format(
-                        object_type, OBJECT_VALUE['object_type']))
-        elif isinstance(value, six.string_types):
-            self._object_value = StringObjectValue(value)
-        elif isinstance(value, (six.integer_types, float)):
-            self._object_value = NumberObjectValue(value)
-        elif isinstance(value, bool):
-            self._object_value = BooleanObjectValue(value)
+        self._object_value = assign_to_object_value(value)
 
     @property
     def override_validation(self):

smartsheet/models/search_result_item.py

@@ -40,6 +40,7 @@ def __init__(self, props=None, base_obj=None):
                 'folder',
                 'workspace',
                 'sight',
+                'summaryField',
                 'template',
                 'discussion',
                 'attachment'],

smartsheet/models/sheet.py

@@ -27,6 +27,8 @@
 from .enums import AccessLevel, AttachmentType
 from .project_settings import ProjectSettings
 from .row import Row
+from .sheet_summary import SheetSummary
+from .sheet_user_permissions import SheetUserPermissions
 from .sheet_user_settings import SheetUserSettings
 from .source import Source
 from ..types import *
@@ -61,6 +63,7 @@ def __init__(self, props=None, base_obj=None):
         self._filters = TypedList(SheetFilter)
         self._from_id = Number()
         self._gantt_enabled = Boolean()
+        self._has_summary_fields = Boolean()
         self._id_ = Number()
         self._modified_at = Timestamp()
         self._name = String()
@@ -73,7 +76,9 @@ def __init__(self, props=None, base_obj=None):
         self._rows = TypedList(Row)
         self._show_parent_rows_for_filters = Boolean()
         self._source = TypedObject(Source)
+        self._summary = TypedObject(SheetSummary)
         self._total_row_count = Number()
+        self._user_permissions = TypedObject(SheetUserPermissions)
         self._user_settings = TypedObject(SheetUserSettings)
         self._version = Number()
         self._workspace = TypedObject(Workspace)
@@ -201,6 +206,14 @@ def gantt_enabled(self):
     def gantt_enabled(self, value):
         self._gantt_enabled.value = value
 
+    @property
+    def has_summary_fields(self):
+        return self._has_summary_fields.value
+
+    @has_summary_fields.setter
+    def has_summary_fields(self, value):
+        self._has_summary_fields.value = value
+
     @property
     def id_(self):
         return self._id_.value
@@ -297,6 +310,14 @@ def source(self):
     def source(self, value):
         self._source.value = value
 
+    @property
+    def summary(self):
+        return self._summary.value
+
+    @summary.setter
+    def summary(self, value):
+        self._summary.value = value
+
     @property
     def total_row_count(self):
         return self._total_row_count.value
@@ -305,6 +326,14 @@ def total_row_count(self):
     def total_row_count(self, value):
         self._total_row_count.value = value
 
+    @property
+    def user_permissions(self):
+        return self._user_permissions.value
+
+    @user_permissions.setter
+    def user_permissions(self, value):
+        self._user_permissions.value = value
+
     @property
     def user_settings(self):
         return self._user_settings.value

smartsheet/models/sheet_summary.py

@@ -0,0 +1,60 @@
+# pylint: disable=C0111,R0902,R0904,R0912,R0913,R0915,E1101
+# Smartsheet Python SDK.
+#
+# Copyright 2019 Smartsheet.com, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"): you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from __future__ import absolute_import
+
+from ..types import *
+from ..util import serialize
+from ..util import deserialize
+from .summary_field import SummaryField
+
+
+class SheetSummary(object):
+
+    """Smartsheet SheetSummary data model."""
+
+    def __init__(self, props=None, base_obj=None):
+        """Initialize the SheetSummary model."""
+        self._base = None
+        if base_obj is not None:
+            self._base = base_obj
+
+        self._fields = TypedList(SummaryField)
+
+        if props:
+            deserialize(self, props)
+
+        # requests package Response object
+        self.request_response = None
+        self.__initialized = True
+
+    @property
+    def fields(self):
+        return self._fields
+
+    @fields.setter
+    def fields(self, value):
+        self._fields.load(value)
+
+    def to_dict(self):
+        return serialize(self)
+
+    def to_json(self):
+        return json.dumps(self.to_dict())
+
+    def __str__(self):
+        return self.to_json()

smartsheet/models/sheet_user_permissions.py

@@ -0,0 +1,59 @@
+# pylint: disable=C0111,R0902,R0904,R0912,R0913,R0915,E1101
+# Smartsheet Python SDK.
+#
+# Copyright 2019 Smartsheet.com, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"): you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from __future__ import absolute_import
+
+from ..types import *
+from ..util import serialize
+from ..util import deserialize
+
+
+class SheetUserPermissions(object):
+
+    """Smartsheet SheetUserPermissions data model."""
+
+    def __init__(self, props=None, base_obj=None):
+        """Initialize the SheetUserPermissions model."""
+        self._base = None
+        if base_obj is not None:
+            self._base = base_obj
+
+        self._summary_permissions = String()
+
+        if props:
+            deserialize(self, props)
+
+        # requests package Response object
+        self.request_response = None
+        self.__initialized = True
+
+    @property
+    def summary_permissions(self):
+        return self._summary_permissions.value
+
+    @summary_permissions.setter
+    def summary_permissions(self, value):
+        self._summary_permissions.value = value
+
+    def to_dict(self):
+        return serialize(self)
+
+    def to_json(self):
+        return json.dumps(self.to_dict())
+
+    def __str__(self):
+        return self.to_json()