Skip to content

Commit 24dc2a3

Browse files
authored
Merge pull request #119 from marklogic/feature/copyright
MLE-23398 Updated copyright and version and NOTICE
2 parents 4607bff + 38fa663 commit 24dc2a3

24 files changed

+102
-52
lines changed

NOTICE.txt

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,59 @@
11
MarkLogic® for Python Client API
2-
3-
Copyright © 2023 MarkLogic Corporation. MarkLogic and MarkLogic logo are trademarks or registered trademarks of MarkLogic Corporation in the United States and other countries. All other trademarks are the property of their respective owners.
42

5-
This project is licensed under the Apache License, Version 2.0 (the "License"); you may not use this project except in compliance with the License. You may obtain a copy of the License at
3+
Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
64

7-
http://www.apache.org/licenses/LICENSE-2.0
5+
To the extent required by the applicable open-source license, a complete machine-readable copy of the source code
6+
corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and
7+
shall expire three years following the date of the final distribution of this product version by Progress Software
8+
Corporation. To obtain such source code, send an email to [email protected]. Please specify the
9+
product and version for which you are requesting source code.
810

9-
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.
10-
11-
To the extent required by the applicable open-source license, a complete machine-readable copy of the source code corresponding to such code is available upon request. This offer is valid to anyone in receipt of this information and shall expire three years following the date of the final distribution of this product version by MarkLogic Corporation. To obtain such source code, send an email to [email protected]. Please specify the product and version for which you are requesting source code.
12-
13-
The following software may be included in this project (last updated October 3, 2023):
11+
The following software may be included in this project (last updated August 6, 2025):
1412

1513
-------------------------------------------------------------------------
16-
Third Party Components
14+
Third Party Components
1715

18-
Requests: HTTP for Humans™ v2.31.0
16+
Requests: HTTP for Humans™ v2.32.4
1917
Copyright 2018 Kenneth Reitz
2018
http://docs.python-requests.org/en/master/
2119
https://pypi.org/project/requests/#files
2220
Made available under the Apache License 2.0
2321
http://spdx.org/licenses/Apache-2.0
24-
22+
2523
The Requests Toolbelt v1.0.0
2624
Copyright 2014 Ian Cordasco, Cory Benfield
2725
https://toolbelt.readthedocs.io/en/latest/
2826
https://pypi.org/project/requests-toolbelt/#files
2927
Made available under the Apache License 2.0
3028
http://spdx.org/licenses/Apache-2.0
31-
29+
3230
Apache License
3331
Version 2.0, January 2004
3432
http://www.apache.org/licenses/
35-
33+
3634
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
37-
35+
3836
1. Definitions.
3937
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
40-
38+
4139
"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
42-
40+
4341
"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
44-
42+
4543
"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
46-
44+
4745
"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
48-
46+
4947
"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
50-
48+
5149
"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
52-
50+
5351
"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
54-
52+
5553
"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
56-
54+
5755
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
58-
56+
5957
2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
6058
3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
6159
4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
@@ -64,26 +62,26 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6462
(c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
6563
(d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
6664
You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
67-
65+
6866
5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
6967
6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
7068
7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
7169
8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
7270
9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
7371
END OF TERMS AND CONDITIONS
74-
72+
7573
APPENDIX: How to apply the Apache License to your work.
76-
74+
7775
To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
78-
76+
7977
Copyright [yyyy] [name of copyright owner]
80-
78+
8179
Licensed under the Apache License, Version 2.0 (the "License");
8280
you may not use this file except in compliance with the License.
8381
You may obtain a copy of the License at
84-
82+
8583
http://www.apache.org/licenses/LICENSE-2.0
86-
84+
8785
Unless required by applicable law or agreed to in writing, software
8886
distributed under the License is distributed on an "AS IS" BASIS,
8987
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

marklogic/client.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
2+
3+
14
import json
25
import requests
36

marklogic/cloud_auth.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
2+
3+
14
import logging
25
import requests
36
from requests import Response, Session, Request

marklogic/documents.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
2+
3+
14
import json
25
from collections import OrderedDict
36
from email.message import Message
@@ -263,15 +266,11 @@ def _extract_values_from_header(part) -> dict:
263266
Returns a dict containing values about the document content or metadata.
264267
"""
265268
encoding = part.encoding
266-
disposition = part.headers["Content-Disposition".encode(encoding)].decode(
267-
encoding
268-
)
269+
disposition = part.headers["Content-Disposition".encode(encoding)].decode(encoding)
269270

270271
content_type = None
271272
if part.headers.get("Content-Type".encode(encoding)):
272-
content_type = part.headers["Content-Type".encode(encoding)].decode(
273-
encoding
274-
)
273+
content_type = part.headers["Content-Type".encode(encoding)].decode(encoding)
275274

276275
content_disposition_header = part.headers[
277276
"Content-Disposition".encode(encoding)

marklogic/internal/eval.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
2+
13
import json
24

35
from decimal import Decimal

marklogic/internal/util.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
2+
13
from requests import Response
24

35

marklogic/rows.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
2+
3+
14
import json
25
from requests import Session
36
from marklogic.transactions import Transaction

marklogic/transactions.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
2+
3+
14
import logging
25
from requests import Response, Session
36
from requests.exceptions import HTTPError

marklogic/vectors.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
2+
3+
14
"""
25
Supports encoding and decoding vectors using the same approach as the vec:base64-encode and vec:base64-decode
36
functions supported by the MarkLogic server.
@@ -26,9 +29,7 @@ def base64_decode(encoded_vector: str) -> List[float]:
2629
"""
2730
buffer = base64.b64decode(encoded_vector)
2831
if len(buffer) < 8:
29-
raise ValueError(
30-
"Buffer is too short to contain version and dimensions."
31-
)
32+
raise ValueError("Buffer is too short to contain version and dimensions.")
3233
version, dimensions = struct.unpack("<ii", buffer[:8])
3334
if version != 0:
3435
raise ValueError(f"Unsupported vector version: {version}")
@@ -37,7 +38,5 @@ def base64_decode(encoded_vector: str) -> List[float]:
3738
raise ValueError(
3839
f"Buffer is too short for the specified dimensions: expected {expected_length}, got {len(buffer)}"
3940
)
40-
floats = struct.unpack(
41-
"<" + "f" * dimensions, buffer[8 : 8 + 4 * dimensions]
42-
)
41+
floats = struct.unpack("<" + "f" * dimensions, buffer[8 : 8 + 4 * dimensions])
4342
return list(floats)

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "marklogic-python-client"
3-
version = "1.2.1"
3+
version = "1.3.0"
44
description = "Python client for MarkLogic, built on the requests library"
55
authors = ["MarkLogic <[email protected]>"]
66
readme = "README.md"

0 commit comments

Comments
 (0)