Forward-merge branch-24.10 into branch-25.02 (#2068)

## Description
Manually resolving conflicts from forwar-merger PR #2060

## By Submitting this PR I confirm:
- I am familiar with the [Contributing
Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md).
- When the PR is ready for review, new or existing tests cover these
changes.
- When the PR is ready for review, the documentation is up to date with
these changes.

ci/release/update-version.sh

@@ -113,6 +113,9 @@ sed_runner "s/${CURRENT_SHORT_TAG}/${NEXT_SHORT_TAG}/g" docs/source/getting_star
 sed_runner "s|blob/branch-${CURRENT_SHORT_TAG}|blob/branch-${NEXT_SHORT_TAG}|g" models/model-cards/*.md
 sed_runner "s|tree/branch-${CURRENT_SHORT_TAG}|tree/branch-${NEXT_SHORT_TAG}|g" models/model-cards/*.md
 
+# thirdparty
+sed_runner "s|tree/branch-${CURRENT_SHORT_TAG}|tree/branch-${NEXT_SHORT_TAG}|g" thirdparty/README.md
+
 # Update the version of the Morpheus model container
 # We need to update several files, however we need to avoid symlinks as well as the build and .cache directories
 DOCS_MD_FILES=$(find -P ./docs/source/ -type f -iname "*.md")

conda/environments/all_cuda-125_arch-x86_64.yaml

@@ -66,7 +66,7 @@ dependencies:
 - libtool
 - libwebp=1.3.2
 - libzlib >=1.3.1,<2
-- mlflow
+- mlflow>=2.10.0,<2.18
 - mrc=25.02
 - myst-parser=0.18.1
 - nbsphinx

conda/environments/dev_cuda-125_arch-x86_64.yaml

@@ -56,7 +56,7 @@ dependencies:
 - libtool
 - libwebp=1.3.2
 - libzlib >=1.3.1,<2
-- mlflow
+- mlflow>=2.10.0,<2.18
 - mrc=25.02
 - myst-parser=0.18.1
 - nbsphinx

conda/environments/examples_cuda-125_arch-x86_64.yaml

@@ -29,7 +29,7 @@ dependencies:
 - jsonpatch>=1.33
 - kfp
 - libwebp=1.3.2
-- mlflow
+- mlflow>=2.10.0,<2.18
 - mrc=25.02
 - networkx=2.8.8
 - newspaper3k=0.2

conda/environments/runtime_cuda-125_arch-x86_64.yaml

@@ -26,7 +26,7 @@ dependencies:
 - grpcio
 - grpcio-status
 - libwebp=1.3.2
-- mlflow
+- mlflow>=2.10.0,<2.18
 - mrc=25.02
 - networkx=2.8.8
 - numpydoc=1.5

dependencies.yaml

@@ -376,7 +376,7 @@ dependencies:
           - grpcio
           - grpcio-status
           # - libwebp=1.3.2 # Required for CVE mitigation: https://nvd.nist.gov/vuln/detail/CVE-2023-4863 ##
-          - mlflow #>=2.10.0,<3
+          - mlflow>=2.10.0,<2.18 # Pin version to avoid breaking change in 2.18 to thread local variable code commit id: 5541888
           - mrc=25.02
           - networkx=2.8.8
           - numpydoc=1.5

docker/Dockerfile

@@ -363,6 +363,7 @@ COPY --from=git_clone "/tmp/morpheus_repo/examples" "./examples"
 COPY --from=git_clone "/tmp/morpheus_repo/scripts" "./scripts"
 COPY --from=git_clone "/tmp/morpheus_repo/*.md" "./"
 COPY --from=git_clone "/tmp/morpheus_repo/LICENSE" "./"
+COPY --from=git_clone "/tmp/morpheus_repo/thirdparty" "./thirdparty"
 
 RUN /opt/conda/bin/conda clean -afy && \
     # Ensure the conda-bld directory is indexed even if empty

thirdparty/README.md

@@ -0,0 +1,20 @@
+<!--
+SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+SPDX-License-Identifier: Apache-2.0
+
+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.
+-->
+
+# Source Code for OSS Packages in the NVIDIA Morpheus Docker container
+
+The source code for OSS packages which are included in the NVIDIA Morpheus Docker image is available at [https://github.com/nv-morpheus/morpheus_third_party_oss/tree/branch-25.02](https://github.com/nv-morpheus/morpheus_third_party_oss/tree/branch-25.02)