Skip to content

MLE-23398 Updated copyright and version and NOTICE #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 30 additions & 32 deletions NOTICE.txt
Original file line number Diff line number Diff line change
@@ -1,61 +1,59 @@
MarkLogic® for Python Client API

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.

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
Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

http://www.apache.org/licenses/LICENSE-2.0
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 Progress Software
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.

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.

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.

The following software may be included in this project (last updated October 3, 2023):
The following software may be included in this project (last updated August 6, 2025):

-------------------------------------------------------------------------
Third Party Components
Third Party Components

Requests: HTTP for Humans™ v2.31.0
Requests: HTTP for Humans™ v2.32.4
Copyright 2018 Kenneth Reitz
http://docs.python-requests.org/en/master/
https://pypi.org/project/requests/#files
Made available under the Apache License 2.0
http://spdx.org/licenses/Apache-2.0

The Requests Toolbelt v1.0.0
Copyright 2014 Ian Cordasco, Cory Benfield
https://toolbelt.readthedocs.io/en/latest/
https://pypi.org/project/requests-toolbelt/#files
Made available under the Apache License 2.0
http://spdx.org/licenses/Apache-2.0

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.
"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.

"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.

"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.

"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.

"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).

"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.

"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."

"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.

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.
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.
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:
Expand All @@ -64,26 +62,26 @@ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
(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
(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.
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.

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.
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.
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.
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.
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.
END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

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.

Copyright [yyyy] [name of copyright owner]

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.
Expand Down
3 changes: 3 additions & 0 deletions marklogic/client.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import json
import requests

Expand Down
3 changes: 3 additions & 0 deletions marklogic/cloud_auth.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import logging
import requests
from requests import Response, Session, Request
Expand Down
11 changes: 5 additions & 6 deletions marklogic/documents.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import json
from collections import OrderedDict
from email.message import Message
Expand Down Expand Up @@ -263,15 +266,11 @@ def _extract_values_from_header(part) -> dict:
Returns a dict containing values about the document content or metadata.
"""
encoding = part.encoding
disposition = part.headers["Content-Disposition".encode(encoding)].decode(
encoding
)
disposition = part.headers["Content-Disposition".encode(encoding)].decode(encoding)
Copy link
Preview

Copilot AI Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line formatting change appears unrelated to the copyright update purpose of this PR. Code formatting changes should be separated from copyright updates to maintain clear change attribution.

Copilot uses AI. Check for mistakes.


content_type = None
if part.headers.get("Content-Type".encode(encoding)):
content_type = part.headers["Content-Type".encode(encoding)].decode(
encoding
)
content_type = part.headers["Content-Type".encode(encoding)].decode(encoding)
Copy link
Preview

Copilot AI Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line formatting change appears unrelated to the copyright update purpose of this PR. Code formatting changes should be separated from copyright updates to maintain clear change attribution.

Copilot uses AI. Check for mistakes.


content_disposition_header = part.headers[
"Content-Disposition".encode(encoding)
Expand Down
2 changes: 2 additions & 0 deletions marklogic/internal/eval.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

import json

from decimal import Decimal
Expand Down
2 changes: 2 additions & 0 deletions marklogic/internal/util.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.

from requests import Response


Expand Down
3 changes: 3 additions & 0 deletions marklogic/rows.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import json
from requests import Session
from marklogic.transactions import Transaction
Expand Down
3 changes: 3 additions & 0 deletions marklogic/transactions.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import logging
from requests import Response, Session
from requests.exceptions import HTTPError
Expand Down
11 changes: 5 additions & 6 deletions marklogic/vectors.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


"""
Supports encoding and decoding vectors using the same approach as the vec:base64-encode and vec:base64-decode
functions supported by the MarkLogic server.
Expand Down Expand Up @@ -26,9 +29,7 @@ def base64_decode(encoded_vector: str) -> List[float]:
"""
buffer = base64.b64decode(encoded_vector)
if len(buffer) < 8:
raise ValueError(
"Buffer is too short to contain version and dimensions."
)
raise ValueError("Buffer is too short to contain version and dimensions.")
Copy link
Preview

Copilot AI Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line formatting change appears unrelated to the copyright update purpose of this PR. Code formatting changes should be separated from copyright updates to maintain clear change attribution.

Copilot uses AI. Check for mistakes.

version, dimensions = struct.unpack("<ii", buffer[:8])
if version != 0:
raise ValueError(f"Unsupported vector version: {version}")
Expand All @@ -37,7 +38,5 @@ def base64_decode(encoded_vector: str) -> List[float]:
raise ValueError(
f"Buffer is too short for the specified dimensions: expected {expected_length}, got {len(buffer)}"
)
floats = struct.unpack(
"<" + "f" * dimensions, buffer[8 : 8 + 4 * dimensions]
)
floats = struct.unpack("<" + "f" * dimensions, buffer[8 : 8 + 4 * dimensions])
Copy link
Preview

Copilot AI Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line formatting change appears unrelated to the copyright update purpose of this PR. Code formatting changes should be separated from copyright updates to maintain clear change attribution.

Suggested change
floats = struct.unpack("<" + "f" * dimensions, buffer[8 : 8 + 4 * dimensions])
floats = struct.unpack("<" + "f" * dimensions, buffer[8:8 + 4 * dimensions])

Copilot uses AI. Check for mistakes.

return list(floats)
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "marklogic-python-client"
version = "1.2.1"
version = "1.3.0"
description = "Python client for MarkLogic, built on the requests library"
authors = ["MarkLogic <[email protected]>"]
readme = "README.md"
Expand Down
3 changes: 3 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import pytest

from marklogic import Client
Expand Down
3 changes: 3 additions & 0 deletions tests/test_cloud.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import logging
import pytest
import time
Expand Down
3 changes: 3 additions & 0 deletions tests/test_eval.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import decimal

from marklogic.documents import Document
Expand Down
3 changes: 3 additions & 0 deletions tests/test_graphql.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


def test_graphql(client):
data = client.rows.query(
graphql="query musicianQuery { test_musician { lastName firstName dob } }"
Expand Down
3 changes: 3 additions & 0 deletions tests/test_invoke.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import decimal

from marklogic.documents import Document
Expand Down
5 changes: 4 additions & 1 deletion tests/test_read_documents.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


from requests import Response

from marklogic import Client
Expand Down Expand Up @@ -139,7 +142,7 @@ def test_read_with_basic_client(basic_client: Client):

def test_read_with_original_response(basic_client: Client):
response = basic_client.documents.read("/doc1.json", return_response=True)
assert b'--ML_BOUNDARY' in response.content
assert b"--ML_BOUNDARY" in response.content
Copy link
Preview

Copilot AI Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This quote style change from single to double quotes appears unrelated to the copyright update purpose of this PR. Code formatting changes should be separated from copyright updates to maintain clear change attribution.

Suggested change
assert b"--ML_BOUNDARY" in response.content
assert b'--ML_BOUNDARY' in response.content

Copilot uses AI. Check for mistakes.

assert b'filename="/doc1.json"' in response.content
assert b'{"hello":"world"}' in response.content

Expand Down
3 changes: 3 additions & 0 deletions tests/test_rows.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


from pytest import raises
from marklogic.documents import Document
import uuid
Expand Down
3 changes: 3 additions & 0 deletions tests/test_rows_update.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import json
from marklogic.documents import Document

Expand Down
11 changes: 5 additions & 6 deletions tests/test_search_docs.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import json

from requests import Response
Expand Down Expand Up @@ -126,15 +129,11 @@ def test_not_rest_user(not_rest_user_client: Client):

def test_version_id(client: Client):
equalSignEtag = (
client.get("v1/documents?uri=/doc2=copy.xml")
.headers["ETag"]
.replace('"', "")
client.get("v1/documents?uri=/doc2=copy.xml").headers["ETag"].replace('"', "")
Copy link
Preview

Copilot AI Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line formatting change appears unrelated to the copyright update purpose of this PR. Code formatting changes should be separated from copyright updates to maintain clear change attribution.

Suggested change
client.get("v1/documents?uri=/doc2=copy.xml").headers["ETag"].replace('"', "")
client.get("v1/documents?uri=/doc2=copy.xml").headers["ETag"].replace('"', "")

Copilot uses AI. Check for mistakes.

)

semicolonEtag = (
client.get("v1/documents?uri=/doc2;copy.xml")
.headers["ETag"]
.replace('"', "")
client.get("v1/documents?uri=/doc2;copy.xml").headers["ETag"].replace('"', "")
Copy link
Preview

Copilot AI Aug 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line formatting change appears unrelated to the copyright update purpose of this PR. Code formatting changes should be separated from copyright updates to maintain clear change attribution.

Copilot uses AI. Check for mistakes.

)

docs = client.documents.search(
Expand Down
3 changes: 3 additions & 0 deletions tests/test_ssl.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


def test_verify_false(ssl_client):
"""
The certificate verification in requests is fairly picky; while it's
Expand Down
3 changes: 3 additions & 0 deletions tests/test_transactions.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import requests
import time
from marklogic import Client
Expand Down
3 changes: 3 additions & 0 deletions tests/test_vectors.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import math
import ast
from marklogic.vectors import base64_encode, base64_decode
Expand Down
3 changes: 3 additions & 0 deletions tests/test_write_documents.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (c) 2023-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.


import pytest

from marklogic import Client
Expand Down
Loading