onnx 1.16.1__cp310-cp310-macosx_11_0_universal2.whl → 1.16.2__cp310-cp310-macosx_11_0_universal2.whl

onnx/backend/test/runner/__init__.py

@@ -10,7 +10,6 @@ import os
 import re
 import shutil
 import sys
-import tarfile
 import tempfile
 import time
 import unittest
@@ -238,8 +237,7 @@ class Runner:
             )
             urlretrieve(model_test.url, download_file.name)
             print("Done")
-            with tarfile.open(download_file.name) as t:
-                t.extractall(models_dir)
+            onnx.utils._extract_model_safe(download_file.name, models_dir)
         except Exception as e:
             print(f"Failed to prepare data for model {model_test.model_name}: {e}")
             raise

onnx/common/version.h

@@ -9,6 +9,6 @@
 namespace ONNX_NAMESPACE {
 
 // Represents the most recent release version. Updated with every release.
-constexpr const char* LAST_RELEASE_VERSION = "1.16.1";
+constexpr const char* LAST_RELEASE_VERSION = "1.16.2";
 
 } // namespace ONNX_NAMESPACE

onnx/defs/math/old.cc

@@ -2322,10 +2322,15 @@ ONNX_OPERATOR_SET_SCHEMA(
             auto transBAttr = ctx.getAttribute("transB");
             bool transB = transBAttr ? static_cast<int>(transBAttr->i()) != 0 : false;
 
+            checkInputRank(ctx, 0, 2);
+            checkInputRank(ctx, 1, 2);
+
+            auto& first_input_shape = getInputShape(ctx, 0);
+            auto& second_input_shape = getInputShape(ctx, 1);
             *ctx.getOutputType(0)->mutable_tensor_type()->mutable_shape()->add_dim() =
-                ctx.getInputType(0)->tensor_type().shape().dim(transA ? 1 : 0);
+                first_input_shape.dim(transA ? 1 : 0);
             *ctx.getOutputType(0)->mutable_tensor_type()->mutable_shape()->add_dim() =
-                ctx.getInputType(1)->tensor_type().shape().dim(transB ? 0 : 1);
+                second_input_shape.dim(transB ? 0 : 1);
           } else if (
               hasInputShape(ctx, 2) &&
               (!ctx.getAttribute("broadcast") || static_cast<int>(ctx.getAttribute("broadcast")->i()) == 0)) {

onnx/defs/tensor/old.cc

@@ -1380,7 +1380,7 @@ ONNX_OPERATOR_SET_SCHEMA(
 
 static const char* Slice_ver11_doc = R"DOC(
 Produces a slice of the input tensor along multiple axes. Similar to numpy:
-https://docs.scipy.org/doc/numpy/reference/arrays.indexing.html
+https://numpy.org/doc/stable/reference/routines.indexing.html
 Slices uses `starts`, `ends`, `axes` and `steps` inputs to specify the start and end
 dimension and step for each axis in the list of axes, it uses this information to
 slice the input `data` tensor. If a negative value is passed for any of the
@@ -4443,7 +4443,7 @@ ONNX_OPERATOR_SET_SCHEMA(
 
 static const char* Slice_ver1_doc = R"DOC(
 Produces a slice of the input tensor along multiple axes. Similar to numpy:
-https://docs.scipy.org/doc/numpy/reference/arrays.indexing.html
+https://numpy.org/doc/stable/reference/routines.indexing.html
 Slices uses `axes`, `starts` and `ends` attributes to specify the start and end
 dimension for each axis in the list of axes, it uses this information to
 slice the input `data` tensor. If a negative value is passed for any of the
@@ -4559,7 +4559,7 @@ ONNX_OPERATOR_SET_SCHEMA(
 
 static const char* Slice_ver10_doc = R"DOC(
 Produces a slice of the input tensor along multiple axes. Similar to numpy:
-https://docs.scipy.org/doc/numpy/reference/arrays.indexing.html
+https://numpy.org/doc/stable/reference/routines.indexing.html
 Slices uses `starts`, `ends`, `axes` and `steps` inputs to specify the start and end
 dimension and step for each axis in the list of axes, it uses this information to
 slice the input `data` tensor. If a negative value is passed for any of the

onnx/hub.py

@@ -9,7 +9,6 @@ import hashlib
 import json
 import os
 import sys
-import tarfile
 from io import BytesIO
 from os.path import join
 from typing import IO, Any, Dict, List, Optional, Set, Tuple, cast
@@ -296,6 +295,7 @@ def download_model_with_test_data(
     silent: bool = False,
 ) -> Optional[str]:
     """Downloads a model along with test data by name from the onnx model hub and returns the directory to which the files have been extracted.
+    Users are responsible for making sure the model comes from a trusted source, and the data is safe to be extracted.
 
     Args:
         model: The name of the onnx model in the manifest. This field is
@@ -361,12 +361,14 @@ def download_model_with_test_data(
                 "download the model from the model hub."
             )
 
-    with tarfile.open(local_model_with_data_path) as model_with_data_zipped:
-        # FIXME: Avoid index manipulation with magic numbers
-        local_model_with_data_dir_path = local_model_with_data_path[
-            0 : len(local_model_with_data_path) - 7
-        ]
-        model_with_data_zipped.extractall(local_model_with_data_dir_path)
+    # FIXME: Avoid index manipulation with magic numbers,
+    # remove ".tar.gz"
+    local_model_with_data_dir_path = local_model_with_data_path[
+        0 : len(local_model_with_data_path) - 7
+    ]
+    onnx.utils._extract_model_safe(
+        local_model_with_data_path, local_model_with_data_dir_path
+    )
     model_with_data_path = (
         local_model_with_data_dir_path
         + "/"

onnx/tools/net_drawer.py

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # A library and utility for drawing ONNX nets. Most of this implementation has
 # been borrowed from the caffe2 implementation
-# https://github.com/pytorch/pytorch/blob/master/caffe2/python/net_drawer.py
+# https://github.com/pytorch/pytorch/blob/v2.3.1/caffe2/python/net_drawer.py
 #
 # The script takes two required arguments:
 #   -input: a path to a serialized ModelProto .pb file.

onnx/utils.py

@@ -4,6 +4,7 @@
 from __future__ import annotations
 
 import os
+import tarfile
 
 import onnx.checker
 import onnx.helper
@@ -212,3 +213,65 @@ def extract_model(
     onnx.save(extracted, output_path)
     if check_model:
         onnx.checker.check_model(output_path)
+
+
+def _tar_members_filter(
+    tar: tarfile.TarFile, base: str | os.PathLike
+) -> list[tarfile.TarInfo]:
+    """Check that the content of ``tar`` will be extracted safely
+
+    Args:
+        tar: The tarball file
+        base: The directory where the tarball will be extracted
+
+    Returns:
+        list of tarball members
+    """
+    result = []
+    for member in tar:
+        member_path = os.path.join(base, member.name)
+        abs_base = os.path.abspath(base)
+        abs_member = os.path.abspath(member_path)
+        if not abs_member.startswith(abs_base):
+            raise RuntimeError(
+                f"The tarball member {member_path} in downloading model contains "
+                f"directory traversal sequence which may contain harmful payload."
+            )
+        elif member.issym() or member.islnk():
+            raise RuntimeError(
+                f"The tarball member {member_path} in downloading model contains "
+                f"symbolic links which may contain harmful payload."
+            )
+        result.append(member)
+    return result
+
+
+def _extract_model_safe(
+    model_tar_path: str | os.PathLike, local_model_with_data_dir_path: str | os.PathLike
+) -> None:
+    """Safely extracts a tar file to a specified directory.
+
+    This function ensures that the extraction process mitigates against
+    directory traversal vulnerabilities by validating or sanitizing paths
+    within the tar file. It also provides compatibility for different versions
+    of the tarfile module by checking for the availability of certain attributes
+    or methods before invoking them.
+
+    Args:
+        model_tar_path: The path to the tar file to be extracted.
+        local_model_with_data_dir_path: The directory path where the tar file
+      contents will be extracted to.
+    """
+    with tarfile.open(model_tar_path) as model_with_data_zipped:
+        # Mitigate tarball directory traversal risks
+        if hasattr(tarfile, "data_filter"):
+            model_with_data_zipped.extractall(
+                path=local_model_with_data_dir_path, filter="data"
+            )
+        else:
+            model_with_data_zipped.extractall(
+                path=local_model_with_data_dir_path,
+                members=_tar_members_filter(
+                    model_with_data_zipped, local_model_with_data_dir_path
+                ),
+            )

onnx/version.py

@@ -1,5 +1,5 @@
 # This file is generated by setup.py. DO NOT EDIT!
 
 
-version = "1.16.1"
-git_version = "595228d99e3977ac27cb79d5963adda262af99ad"
+version = "1.16.2"
+git_version = "3bf92c03a9f27eba3bda1e5b9e63ea20ec213557"

{onnx-1.16.1.dist-info → onnx-1.16.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: onnx
-Version: 1.16.1
+Version: 1.16.2
 Summary: Open Neural Network Exchange
 Author-email: ONNX Contributors <onnx-technical-discuss@lists.lfaidata.foundation>
 License: Apache License v2.0
@@ -14,7 +14,7 @@ Requires-Dist: numpy >=1.20
 Requires-Dist: protobuf >=3.20.2
 Provides-Extra: reference
 Requires-Dist: google-re2 ; extra == 'reference'
-Requires-Dist: Pillow ; extra == 'reference'
+Requires-Dist: pillow ; extra == 'reference'
 
 <!--
 Copyright (c) ONNX Project Contributors

{onnx-1.16.1.dist-info → onnx-1.16.2.dist-info}/RECORD

@@ -7,7 +7,7 @@ onnx/cpp2py_export.cc,sha256=QB2xA1Ubt51MIonzmLk8kUbhzw5kxU1BVaSuyzz0S8I,30520
 onnx/external_data_helper.py,sha256=_ccDOOeE08Rp80KnyqO4z6rmcV8pWVKQGYaEJ_7qihM,11602
 onnx/gen_proto.py,sha256=xg6KDpD5GGXMWojpZwkzITmkFYIm4H_v59V_K_U83Ms,8621
 onnx/helper.py,sha256=Vu_YDHSwiqZV3i9tYpsXPgNf5GamkzbmyZtqz-wEhAM,54045
-onnx/hub.py,sha256=b0urBSABDZ1hYhGtjO2IpQu1nAyUdJjjhlsqzL9Peg0,17848
+onnx/hub.py,sha256=NhmntjdsHvO9_g5zBRETgLTezdKtCTYYVzl5e0g2-HE,17918
 onnx/inliner.py,sha256=81Mpijh9KQ--wyUUmas2AHsBAwzmWsKy9TBba5sZ2eM,1722
 onnx/mapping.py,sha256=K6dkPQYww8YhVfcZ25-Br7p7vNuf-CabjEqooMYugxI,8234
 onnx/model_container.py,sha256=K7QcFqMfy48QsN9g-QSMPivpXtvqkDm18oQa6vZtOwE,12758
@@ -22,7 +22,7 @@ onnx/onnx-operators.proto,sha256=vvkYjfZ1oXnmtBYhP3mbq0ae5XAIfjKDecp9e6uSQ1E,530
 onnx/onnx-operators_pb.h,sha256=-iF6vkmdSP1k5XXMgnfI3H_kqPzBqqLgd9ZU7Ekie3k,190
 onnx/onnx.in.proto,sha256=OoKnvm_Kjiu5H4YnkWaI7xyVW_Z2JmmUOK2HM4iMm1M,37641
 onnx/onnx.proto,sha256=ECPH85pWjzCf3QtEWoGnoNkPdARuWWfC6BfU5OBqXxs,37244
-onnx/onnx_cpp2py_export.cpython-310-darwin.so,sha256=HhLiOhhhrKWGCQuijQO2KZwbWr_OgT4C0OXSXJgShsg,11720248
+onnx/onnx_cpp2py_export.cpython-310-darwin.so,sha256=L7KQJGZyOaNp1g2TYtavU7dulsbE-0kk2xmOzjJXdQs,11679096
 onnx/onnx_data_pb.py,sha256=cBcegQEm2iiYrfhwmebhiSWp1RB6mNf3MYS6uz57EO0,90
 onnx/onnx_data_pb2.py,sha256=YuJmAGmOGE_ClfmD9Gbbc1qn9_FzOMDH61e7ay9t5xw,2894
 onnx/onnx_data_pb2.pyi,sha256=VTSip9Evt2RqdKpntIo6G9LVASJVfc6zJ-yy-T4kW_o,4682
@@ -42,8 +42,8 @@ onnx/serialization.py,sha256=b69qhq7Os5coLIhEdABgNSnnL-9h9xcELhICqoVhFck,7860
 onnx/shape_inference.py,sha256=-CzKEZ6tmK05uAMpTr4Cf-LUi0sFvxCuyj7BEax81Jo,5780
 onnx/string_utils.h,sha256=m39GW7Gu2rr3RgFov0vXCi-wdACOyuRrnTbWf8UFC4s,1276
 onnx/subbyte.py,sha256=PjO3tOrbQlQkev80bQ3dQo2trojm5wugquUl3NQkxp4,2289
-onnx/utils.py,sha256=ZSzxnE2Elbs4v7BHY-Yjq1WwL-VFUzmryKHfK3FcJ90,8386
-onnx/version.py,sha256=U8rogWn5YQCBWCM2SlN4FUQTcpb74_oc5b72IM20c2Q,129
+onnx/utils.py,sha256=tR1I0qis28orjvqrOIyJNeTrZp-EEv7oLrPRlprnS74,10756
+onnx/version.py,sha256=Ij-Ni-gE350NxzxJQTwdYZ2SWlQ_8jaNOqdw8ean0WM,129
 onnx/version_converter.py,sha256=0_njujBv5XsPv6RreUnJ8Tjan1TKwq_pxi4bjAz1ZLY,1233
 onnx/backend/__init__.py,sha256=x6thC2ykdnq7G6hJ-ENaxiRV3WfttWPcBYskup5sjig,82
 onnx/backend/base.py,sha256=OITLHSneACUKz0cbJpcPU5NallMK0IN_ZMwPtbUmBqk,4543
@@ -6037,7 +6037,7 @@ onnx/backend/test/loader/__init__.py,sha256=4Xk0fTvT0nxdENsWzT5Bqq-CneAS9PY-xZis
 onnx/backend/test/report/__init__.py,sha256=Msh-fHxNvLeo52_o9ZNE3F26MGnPydRwfFM07DtCDZs,1217
 onnx/backend/test/report/base.py,sha256=cZ5yWMhqmWm7wfYkV1sBmIe7QhWvxXbPDgoave3qrPg,112
 onnx/backend/test/report/coverage.py,sha256=mYi2vfOXpbJ1VBPnzfL_fMuPP5M9GXvF3SI2CqeMA2Q,10994
-onnx/backend/test/runner/__init__.py,sha256=efPuT6gyR_bVCL5PLSTA8x1C9AK8kUfOEfot0CZ5ZZU,21362
+onnx/backend/test/runner/__init__.py,sha256=Q4Pam7q6BG1wVXRJAAX7vu-aNX1ySBHgO3lgPiC8TnQ,21325
 onnx/backend/test/runner/item.py,sha256=jVL26TcrDzW7V5BxfUNDU2lvHpXY1A_Y9nLOTqsqDFc,412
 onnx/bin/__init__.py,sha256=x6thC2ykdnq7G6hJ-ENaxiRV3WfttWPcBYskup5sjig,82
 onnx/bin/checker.py,sha256=NG1moFNAgyvzQk9Oudgw3AT4o0GYJUFFxvYhrB9SxUw,658
@@ -6062,7 +6062,7 @@ onnx/common/proto_util.h,sha256=N5gmA2_6_uzlCsrfjafYawK0GwemOezaAKnXdhCOmGY,1430
 onnx/common/status.cc,sha256=1Y-Fsd3M1BF29FSyZ3ISWrP7dyxIbWyTeTp4QTDbd-s,1892
 onnx/common/status.h,sha256=hKOESDi7s_1wAAcP5OkA0ybIaF9GIVcJ4f1WR7CE700,1912
 onnx/common/tensor.h,sha256=9OMnKOS6ZDGlfH-8JjzI5lCSYb-Bm2OiqGXIh6roLik,7428
-onnx/common/version.h,sha256=sBvIHkN3ZKei3dqMRxvUREOv1tjYCAiIAnebw2V0cL8,294
+onnx/common/version.h,sha256=2BEongl2Z9p7ygXob9UMv_Kqi9geUGQvlJc44CY2-V0,294
 onnx/common/visitor.h,sha256=Lbu4Wdk7UyTT1J5q1rD5NjGB7-ruU-uLUYeKuDr7fvc,3086
 onnx/defs/__init__.py,sha256=sAw-GngDd97is5tuwaNAh9bv_7ohDJS-S_1nnfM2qUw,4140
 onnx/defs/attr_proto_util.cc,sha256=BcU_HbG4jgz0___2RSj9U7XDr8dk-oO8CvlxD1tbChE,3587
@@ -6102,7 +6102,7 @@ onnx/defs/image/defs.cc,sha256=RVZaMaup5zGdtsdsvLYnm9WS1wkR6CCk9AdcVk_vIn8,2765
 onnx/defs/logical/defs.cc,sha256=jk8Fk5lLB-3PeoxwEhgMmETIcg6SJiRaWfNk2OyxIWs,11824
 onnx/defs/logical/old.cc,sha256=oCYtSU4Lh4VedRkXmb6q2Y7d4Vu6OxYE7KxLmOw2Y4I,10060
 onnx/defs/math/defs.cc,sha256=6UUbM-chrWandiefC6fkx-LFepBLd6pG2aeKBOV2SXs,141673
-onnx/defs/math/old.cc,sha256=wjFir0ejl2Of8boIgIhdDzHrIzlz6ZVgl6RWd_xQE2g,130526
+onnx/defs/math/old.cc,sha256=qma8OR8afnqeXOVtUg6uuNQKDKvFIscuyNdyy2YEldM,130679
 onnx/defs/math/utils.cc,sha256=46aFqwX5Yh55kaN8H6FQVP3pLpOe_nmvzZxzvV8GHGc,4854
 onnx/defs/math/utils.h,sha256=16eLg7f0OgU_lQiTCE3agLPAdIoeTMxEuKNBa5QZE_0,1301
 onnx/defs/nn/defs.cc,sha256=YIkGGe1epSPWVrW54aVvG1fvoHofaLlAIhVHst6AKow,125492
@@ -6121,7 +6121,7 @@ onnx/defs/rnn/defs.cc,sha256=033m0uf5sSPKsnFgpjwy_5Zy4s6gq4Qo8r4nFZwmcRQ,19570
 onnx/defs/rnn/old.cc,sha256=PHrK1DmZpaDujjEQ2_dHgeqltS7WO6t6Kk-nfBJGemk,39020
 onnx/defs/sequence/defs.cc,sha256=kUt_x-T9dvCDT5CCvnqxyjkszC6kc8aS7zbTnE5FXJA,34034
 onnx/defs/tensor/defs.cc,sha256=QPQpkPdY_9hDF4iPO3uPNGw5lETca9E-H9V3fKme47g,162757
-onnx/defs/tensor/old.cc,sha256=jnwutjZk8UNPDiDTuDKMdV2CEwgGbzuHxqOzjJYTZMU,265482
+onnx/defs/tensor/old.cc,sha256=mtAtztIddvLXnaNb19g15x_HqfabFvEf4JwiKhlB9xY,265476
 onnx/defs/tensor/utils.cc,sha256=rXFhyFwCUALlYn3GUwdokS-VS5lawOcd-u0WlKfYtv0,18799
 onnx/defs/tensor/utils.h,sha256=Ivv5xZ-F4rtRK9cn1smspBFnY3eFGMhH3MkoSOpdRaQ,1796
 onnx/defs/text/defs.cc,sha256=oAYX8mcB23X5dR700n1N8U-Alnm9rW-x77h_Zj9tOtY,10376
@@ -6427,7 +6427,7 @@ onnx/test/version_converter/automatic_conversion_test_base.py,sha256=iY8gsSHHKQH
 onnx/test/version_converter/automatic_downgrade_test.py,sha256=EG-iqBGJwplgl_DNJ_eNjJy6-UgL91pH0MW1f5WQ5wA,3268
 onnx/test/version_converter/automatic_upgrade_test.py,sha256=CeedCTT42AOAcP-G7tp25kog3kVZIbWwKUzv_8cYqXo,54247
 onnx/tools/__init__.py,sha256=x6thC2ykdnq7G6hJ-ENaxiRV3WfttWPcBYskup5sjig,82
-onnx/tools/net_drawer.py,sha256=s7lttZqBxlsk9Gs1Yb5y5wWFCn_oWYOU7Lg5p9MH5uY,4901
+onnx/tools/net_drawer.py,sha256=2VUhO4krsZmX3MvQaOSxThaqUjWW_8ZKoMYw6reb8eg,4901
 onnx/tools/replace_constants.py,sha256=mstaW9gZ_FtaDj6CGFhUHmhkqZpwFIjvtRsTl7832MQ,14847
 onnx/tools/update_model_dims.py,sha256=_GuCbuwFumG07ME5rPk8UGmnKjbe5lHnIGN15uOAcZw,3431
 onnx/version_converter/BaseConverter.h,sha256=Rr_9d0VLZOMhMDMrXwvYlJXRmMeGoEId73EXf8GrnLU,3757
@@ -6476,9 +6476,9 @@ onnx/version_converter/adapters/upsample_6_7.h,sha256=Q2-6lQEK0AaH7BvaB6NSM3KOdr
 onnx/version_converter/adapters/upsample_8_9.h,sha256=lvchztwbnzj58pI334a46wTaa5BDENwRPcvnp6mzTaM,1284
 onnx/version_converter/adapters/upsample_9_10.h,sha256=X2pSzTUdOE9KsV5K3sbVsC04rUdeyUWy_Ez7qBnmjjw,1070
 onnx/version_converter/adapters/upsample_9_8.h,sha256=kNSLYSQgVmIBun4ZsvUyziMQp7MTeeQcM6SVN4yOsFM,2519
-onnx-1.16.1.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-onnx-1.16.1.dist-info/METADATA,sha256=s5v66cYax5ndcdVuqAJXuPHi1mXOnQnKcArAVHxKRZg,16489
-onnx-1.16.1.dist-info/WHEEL,sha256=Nw4S-_sy5QY9u_aSwLM4rxffJlGgG5_MGtpAmRIWVPo,115
-onnx-1.16.1.dist-info/entry_points.txt,sha256=kI2A5Kl3HXkb7WkSIlcynOx46XYhwXcFVJlmwL58mPk,156
-onnx-1.16.1.dist-info/top_level.txt,sha256=fok5iu7rojicZZye7lCMdLme_jvte9jjDqYyhL0Kg6E,5
-onnx-1.16.1.dist-info/RECORD,,
+onnx-1.16.2.dist-info/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+onnx-1.16.2.dist-info/METADATA,sha256=YS3pTnK3mdvLqdJGjHVdsIRvasyOaELXGkEmWpt6kaY,16489
+onnx-1.16.2.dist-info/WHEEL,sha256=kQu_2NCICDaSrRhzGV_c92P1_3J2E--BGhzCtWWR2d0,114
+onnx-1.16.2.dist-info/entry_points.txt,sha256=kI2A5Kl3HXkb7WkSIlcynOx46XYhwXcFVJlmwL58mPk,156
+onnx-1.16.2.dist-info/top_level.txt,sha256=fok5iu7rojicZZye7lCMdLme_jvte9jjDqYyhL0Kg6E,5
+onnx-1.16.2.dist-info/RECORD,,

{onnx-1.16.1.dist-info → onnx-1.16.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_11_0_universal2