labkey 3.3.0__tar.gz → 4.0.0__tar.gz

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

@@ -2,6 +2,26 @@
 LabKey Python Client API News
 +++++++++++
 
+What's New in the LabKey 4.0.0 package
+==============================
+
+*Release date: 09/16/2025*
+- Add save_rows API to query module
+    - Accessible via API wrappers e.g. api.query.save_rows
+- Update the minimum required version of Python to 3.10
+- Add "derivationDataScope" to PropertyDescriptor class. Thanks @eso-xyme!
+
+What's New in the LabKey 3.4.0 package
+==============================
+
+*Release date: 04/22/2025*
+- 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-4.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: labkey
-Version: 3.3.0
+Version: 4.0.0
 Summary: Python client API for LabKey Server
 Home-page: https://github.com/LabKey/labkey-api-python
 Author: LabKey
@@ -19,6 +19,7 @@ Classifier: Operating System :: Microsoft
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
+Requires-Python: >=3.10
 License-File: LICENSE.txt
 Requires-Dist: requests
 Provides-Extra: test
@@ -37,5 +38,20 @@ Requires-Dist: setuptools; extra == "build"
 Requires-Dist: build; extra == "build"
 Requires-Dist: twine; extra == "build"
 Requires-Dist: wheel; extra == "build"
+Requires-Dist: packaging; 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: requires-python
+Dynamic: summary
 
 Python client API for LabKey Server. Supports query and experiment APIs.

{labkey-3.3.0 → labkey-4.0.0}/README.md

@@ -113,7 +113,7 @@ else:
 ```
 
 ## Supported Versions
-Python 3.7+ is fully supported.
+Python 3.10+ is fully supported. <!-- Note: update setup.py python_requires if you change this -->
 LabKey Server v15.1 and later.
 
 ## Contributing

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

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

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

@@ -48,6 +48,9 @@ class PropertyDescriptor:
         self.default_value_type = kwargs.pop(
             "default_value_type", kwargs.pop("defaultValueType", None)
         )
+        self.derivation_data_scope = kwargs.pop(
+            "derivation_data_scope", kwargs.pop("derivationDataScope", None)
+        )
         self.description = kwargs.pop("description", None)
         self.dimension = kwargs.pop("dimension", None)
         self.disable_editing = kwargs.pop("disable_editing", kwargs.pop("disableEditing", None))
@@ -109,6 +112,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
@@ -119,6 +123,7 @@ class PropertyDescriptor:
             "defaultScale": self.default_scale,
             "defaultValue": self.default_value,
             "defaultValueType": self.default_value_type,
+            "derivationDataScope": self.derivation_data_scope,
             "description": self.description,
             "dimension": self.dimension,
             "disableEditing": self.disable_editing,
@@ -155,6 +160,7 @@ class PropertyDescriptor:
             "shownInUpdateView": self.shown_in_update_view,
             "typeEditable": self.type_editable,
             "url": self.url,
+            "valueExpression": self.value_expression,
         }
 
         json_formats = []
@@ -232,9 +238,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-4.0.0}/labkey/query.py

@@ -15,15 +15,15 @@
 #
 """
 ############################################################################
-NAME: 
-LabKey Query API 
+NAME:
+LabKey Query API
 
-SUMMARY:  
+SUMMARY:
 This module provides functions for interacting with data on a LabKey Server.
 
 DESCRIPTION:
-This module is designed to simplify querying and manipulating data in LabKey Server.  
-Its APIs are modeled after the LabKey Server JavaScript APIs of the same names. 
+This module is designed to simplify querying and manipulating data in LabKey Server.
+Its APIs are modeled after the LabKey Server JavaScript APIs of the same names.
 
 Installation and Setup for the LabKey Python API:
 https://github.com/LabKey/labkey-api-python/blob/master/README.md
@@ -41,7 +41,7 @@ https://www.labkey.org/home/developer/forum/project-start.view
 ############################################################################
 """
 import functools
-from typing import List, TextIO
+from typing import List, Literal, NotRequired, TextIO, TypedDict
 
 from .server_context import ServerContext
 from .utils import waf_encode
@@ -196,7 +196,7 @@ def delete_rows(
     :param transacted: whether all of the updates should be done in a single transaction
     :param audit_behavior: used to override the audit behavior for the update. See class query.AuditBehavior
     :param audit_user_comment: used to provide a comment that will be attached to certain detailed audit log records
-    :param timeout: timeout of request in seconds (defaults to 30s)
+    :param timeout: timeout of request in seconds (defaults to 300s)
     :return:
     """
     url = server_context.build_url("query", "deleteRows.api", container_path=container_path)
@@ -232,7 +232,7 @@ def truncate_table(
     :param schema_name: schema of table
     :param query_name: table name to delete from
     :param container_path: labkey container path if not already set in context
-    :param timeout: timeout of request in seconds (defaults to 30s)
+    :param timeout: timeout of request in seconds (defaults to 300s)
     :return:
     """
     url = server_context.build_url("query", "truncateTable.api", container_path=container_path)
@@ -275,7 +275,7 @@ def execute_sql(
     :param save_in_session: save query result as a named view to the session
     :param parameters: parameter values to pass through to a parameterized query
     :param required_version: Api version of response
-    :param timeout: timeout of request in seconds (defaults to 30s)
+    :param timeout: timeout of request in seconds (defaults to 300s)
     :param waf_encode_sql: WAF encode sql in request (defaults to True)
     :return:
     """
@@ -331,7 +331,7 @@ def insert_rows(
     :param transacted: whether all of the updates should be done in a single transaction
     :param audit_behavior: used to override the audit behavior for the update. See class query.AuditBehavior
     :param audit_user_comment: used to provide a comment that will be attached to certain detailed audit log records
-    :param timeout: timeout of request in seconds (defaults to 30s)
+    :param timeout: timeout of request in seconds (defaults to 300s)
     :return:
     """
     url = server_context.build_url("query", "insertRows.api", container_path=container_path)
@@ -407,6 +407,93 @@ def import_rows(
     return server_context.make_request(url, payload, method="POST", file_payload=file_payload)
 
 
+class Command(TypedDict):
+    """
+    TypedDict representing a command for saveRows API.
+    """
+
+    audit_behavior: NotRequired[AuditBehavior]
+    audit_user_comment: NotRequired[str]
+    command: Literal["insert", "update", "delete"]
+    container_path: NotRequired[str]
+    extra_context: NotRequired[dict]
+    query_name: str
+    rows: List[any]
+    schema_name: str
+    skip_reselect_rows: NotRequired[bool]
+
+
+def save_rows(
+    server_context: ServerContext,
+    commands: List[Command],
+    api_version: float = None,
+    container_path: str = None,
+    extra_context: dict = None,
+    timeout: int = _default_timeout,
+    transacted: bool = None,
+    validate_only: bool = None,
+):
+    """
+    Save inserts, updates, and/or deletes to potentially multiple tables with a single request.
+    :param server_context: A LabKey server context. See utils.create_server_context.
+    :param commands: A List of the update/insert/delete operations to be performed.
+    :param api_version: decimal value that indicates the response version of the api. If this is 13.2 or higher, a
+    request that fails validation will be returned as a successful response. Use the 'errorCount' and 'committed'
+    properties in the response to tell if it committed or not.
+    :param container_path: folder path if not already part of server_context
+    :param extra_context: Extra context object passed into the transformation/validation script environment.
+    :param timeout: Request timeout in seconds (defaults to 300s)
+    :param transacted: Whether all the commands should be done in a single transaction, so they all succeed or all
+    fail. Defaults to true.
+    :param validate_only: Whether the server should attempt to proceed through all the commands but not commit them to
+    the database. Useful for scenarios like giving incremental validation feedback as a user fills out a UI form but
+    does not save anything until they explicitly request a save.
+    """
+    url = server_context.build_url("query", "saveRows.api", container_path=container_path)
+
+    json_commands = []
+    for command in commands:
+        json_command = {
+            "command": command["command"],
+            "queryName": command["query_name"],
+            "schemaName": command["schema_name"],
+            "rows": command["rows"],
+        }
+
+        if command.get("audit_behavior") is not None:
+            json_command["auditBehavior"] = command["audit_behavior"]
+
+        if command.get("audit_user_comment") is not None:
+            json_command["auditUserComment"] = command["audit_user_comment"]
+
+        if command.get("container_path") is not None:
+            json_command["containerPath"] = command["container_path"]
+
+        if command.get("extra_context") is not None:
+            json_command["extraContext"] = command["extra_context"]
+
+        if command.get("skip_reselect_rows") is not None:
+            json_command["skipReselectRows"] = command["skip_reselect_rows"]
+
+        json_commands.append(json_command)
+
+    payload = {"commands": json_commands}
+
+    if api_version is not None:
+        payload["apiVersion"] = api_version
+
+    if extra_context is not None:
+        payload["extraContext"] = extra_context
+
+    if transacted is not None:
+        payload["transacted"] = transacted
+
+    if validate_only is not None:
+        payload["validateOnly"] = validate_only
+
+    return server_context.make_request(url, json=payload, timeout=timeout)
+
+
 def select_rows(
     server_context: ServerContext,
     schema_name: str,
@@ -450,7 +537,7 @@ def select_rows(
     :param include_update_column: Boolean value that indicates whether to include an Update link column in results
     :param selection_key:
     :param required_version: decimal value that indicates the response version of the api
-    :param timeout: Request timeout in seconds (defaults to 30s)
+    :param timeout: Request timeout in seconds (defaults to 300s)
     :param ignore_filter: Boolean, if true, the command will ignore any filter that may be part of the chosen view.
     :return:
     """
@@ -534,7 +621,7 @@ def update_rows(
     :param transacted: whether all of the updates should be done in a single transaction
     :param audit_behavior: used to override the audit behavior for the update. See class query.AuditBehavior
     :param audit_user_comment: used to provide a comment that will be attached to certain detailed audit log records
-    :param timeout: timeout of request in seconds (defaults to 30s)
+    :param timeout: timeout of request in seconds (defaults to 300s)
     :return:
     """
     url = server_context.build_url("query", "updateRows.api", container_path=container_path)
@@ -580,7 +667,7 @@ def move_rows(
     :param transacted: whether all of the updates should be done in a single transaction
     :param audit_behavior: used to override the audit behavior for the update. See class query.AuditBehavior
     :param audit_user_comment: used to provide a comment that will be attached to certain detailed audit log records
-    :param timeout: timeout of request in seconds (defaults to 30s)
+    :param timeout: timeout of request in seconds (defaults to 300s)
     :return:
     """
     url = server_context.build_url("query", "moveRows.api", container_path=container_path)
@@ -726,6 +813,28 @@ class QueryWrapper:
             import_lookup_by_alternate_key,
         )
 
+    @functools.wraps(save_rows)
+    def save_rows(
+        self,
+        commands: List[Command],
+        api_version: float = None,
+        container_path: str = None,
+        extra_context: dict = None,
+        timeout: int = _default_timeout,
+        transacted: bool = None,
+        validate_only: bool = None,
+    ):
+        return save_rows(
+            self.server_context,
+            commands,
+            api_version,
+            container_path,
+            extra_context,
+            timeout,
+            transacted,
+            validate_only,
+        )
+
     @functools.wraps(select_rows)
     def select_rows(
         self,

{labkey-3.3.0 → labkey-4.0.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-4.0.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-4.0.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: 4.0.0
 Summary: Python client API for LabKey Server
 Home-page: https://github.com/LabKey/labkey-api-python
 Author: LabKey
@@ -19,6 +19,7 @@ Classifier: Operating System :: Microsoft
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering
+Requires-Python: >=3.10
 License-File: LICENSE.txt
 Requires-Dist: requests
 Provides-Extra: test
@@ -37,5 +38,20 @@ Requires-Dist: setuptools; extra == "build"
 Requires-Dist: build; extra == "build"
 Requires-Dist: twine; extra == "build"
 Requires-Dist: wheel; extra == "build"
+Requires-Dist: packaging; 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: requires-python
+Dynamic: summary
 
 Python client API for LabKey Server. Supports query and experiment APIs.

{labkey-3.3.0 → labkey-4.0.0}/labkey.egg-info/SOURCES.txt

@@ -2,7 +2,6 @@ CHANGE.txt
 LICENSE.txt
 MANIFEST.in
 README.md
-debug.txt
 pyproject.toml
 pytest.ini
 setup.cfg

{labkey-3.3.0 → labkey-4.0.0}/labkey.egg-info/requires.txt

@@ -5,6 +5,7 @@ setuptools
 build
 twine
 wheel
+packaging
 
 [dev]
 pytest

{labkey-3.3.0 → labkey-4.0.0}/setup.py

@@ -34,7 +34,7 @@ long_desc = "Python client API for LabKey Server. Supports query and experiment
 
 tests_require = ["pytest", "requests", "mock", "pytest-cov"]
 dev_require = ["pytest", "requests", "mock", "pytest-cov", "black"]
-build_require = ["setuptools", "build", "twine", "wheel"]
+build_require = ["setuptools", "build", "twine", "wheel", "packaging"]
 
 setup(
     name="labkey",
@@ -49,6 +49,7 @@ setup(
     url="https://github.com/LabKey/labkey-api-python",
     packages=packages,
     package_data={},
+    python_requires=">=3.10", # Note: update README.md supported versions if you change this
     install_requires=["requests"],
     extras_require={"test": tests_require, "dev": dev_require, "build": build_require},
     keywords="labkey api client",