labkey 3.3.0__tar.gz → 3.4.0__tar.gz

{labkey-3.3.0 → labkey-3.4.0}/CHANGE.txt

@@ -2,6 +2,17 @@
 LabKey Python Client API News
 +++++++++++
 
+What's New in the LabKey 3.4.0 package
+==============================
+
+*Release date: TBD*
+- Add "valueExpression" to PropertyDescriptor class
+    - needed for creating/adding domain calculated fields
+    - update Domain class to append calculatedFields to the domain's fields
+- Fix Issue 52904
+    - UnexpectedRedirectError is not wrapped with ServerContextError
+    - Allow redirects when deactivating users
+
 What's New in the LabKey 3.3.0 package
 ==============================
 

{labkey-3.3.0/labkey.egg-info → labkey-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: labkey
-Version: 3.3.0
+Version: 3.4.0
 Summary: Python client API for LabKey Server
 Home-page: https://github.com/LabKey/labkey-api-python
 Author: LabKey
@@ -37,5 +37,18 @@ Requires-Dist: setuptools; extra == "build"
 Requires-Dist: build; extra == "build"
 Requires-Dist: twine; extra == "build"
 Requires-Dist: wheel; extra == "build"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 Python client API for LabKey Server. Supports query and experiment APIs.

{labkey-3.3.0 → labkey-3.4.0}/labkey/__init__.py

@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 __title__ = "labkey"
-__version__ = "3.3.0"
+__version__ = "3.4.0"
 __author__ = "LabKey"
 __license__ = "Apache License 2.0"

{labkey-3.3.0 → labkey-3.4.0}/labkey/domain.py

@@ -109,6 +109,7 @@ class PropertyDescriptor:
         )
         self.type_editable = kwargs.pop("type_editable", kwargs.pop("typeEditable", None))
         self.url = kwargs.pop("url", None)
+        self.value_expression = kwargs.pop("value_expression", kwargs.pop("valueExpression", None))
 
     def to_json(self, strip_none=True):
         # TODO: Likely only want to include those that are not None
@@ -155,6 +156,7 @@ class PropertyDescriptor:
             "shownInUpdateView": self.shown_in_update_view,
             "typeEditable": self.type_editable,
             "url": self.url,
+            "valueExpression": self.value_expression,
         }
 
         json_formats = []
@@ -232,9 +234,11 @@ class Domain:
             "template_description", kwargs.pop("templateDescription", None)
         )
 
-        fields = kwargs.pop("fields", [])
         fields_instances = []
-
+        fields = kwargs.pop("fields", [])
+        for field in fields:
+            fields_instances.append(PropertyDescriptor(**field))
+        fields = kwargs.pop("calculated_fields", kwargs.pop("calculatedFields", []))
         for field in fields:
             fields_instances.append(PropertyDescriptor(**field))
 

{labkey-3.3.0 → labkey-3.4.0}/labkey/security.py

@@ -121,6 +121,7 @@ def deactivate_users(
         target_ids=target_ids,
         api="deactivateUsers.view",
         container_path=container_path,
+        allow_redirects=True,
     )
     if response is not None and response["status_code"] == 200:
         return dict(success=True)
@@ -360,7 +361,11 @@ def __make_security_role_api_request(
 
 
 def __make_user_api_request(
-    server_context: ServerContext, target_ids: List[int], api: str, container_path: str = None
+    server_context: ServerContext,
+    target_ids: List[int],
+    api: str,
+    container_path: str = None,
+    allow_redirects: bool = False,
 ):
     """
     Make a request to the LabKey User Controller
@@ -372,7 +377,7 @@ def __make_user_api_request(
     """
     url = server_context.build_url(USER_CONTROLLER, api, container_path)
 
-    return server_context.make_request(url, {"userId": target_ids})
+    return server_context.make_request(url, {"userId": target_ids}, allow_redirects=allow_redirects)
 
 
 class SecurityWrapper:

{labkey-3.3.0 → labkey-3.4.0}/labkey/server_context.py

@@ -164,7 +164,12 @@ class ServerContext:
         return client
 
     def handle_request_exception(self, exception):
-        if type(exception) in [RequestAuthorizationError, QueryNotFoundError, ServerNotFoundError]:
+        if type(exception) in [
+            RequestAuthorizationError,
+            QueryNotFoundError,
+            ServerNotFoundError,
+            UnexpectedRedirectError,
+        ]:
             raise exception
 
         raise ServerContextError(self, exception)

{labkey-3.3.0 → labkey-3.4.0/labkey.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: labkey
-Version: 3.3.0
+Version: 3.4.0
 Summary: Python client API for LabKey Server
 Home-page: https://github.com/LabKey/labkey-api-python
 Author: LabKey
@@ -37,5 +37,18 @@ Requires-Dist: setuptools; extra == "build"
 Requires-Dist: build; extra == "build"
 Requires-Dist: twine; extra == "build"
 Requires-Dist: wheel; extra == "build"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: maintainer
+Dynamic: maintainer-email
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 Python client API for LabKey Server. Supports query and experiment APIs.