diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f0d9690fa..5b63e9a35 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -27,12 +27,51 @@ jobs: run: | make fmt git diff --exit-code + check-flyteidl2-versions: + name: check flyteidl2 versions + runs-on: ubuntu-latest + steps: + - name: Fetch the code + uses: actions/checkout@v4 + - name: Check flyteidl2 version consistency + run: | + # Extract flyteidl2 version from root pyproject.toml + ROOT_VER=$(grep 'flyteidl2==' pyproject.toml | head -1 | sed 's/.*flyteidl2==\([^"]*\).*/\1/') + echo "Root pyproject.toml: flyteidl2==$ROOT_VER" + + # Extract flyteidl2 version from rs_controller/Cargo.toml + CARGO_VER=$(grep 'flyteidl2' rs_controller/Cargo.toml | grep -v '^#' | sed 's/.*"=\(.*\)".*/\1/') + echo "rs_controller/Cargo.toml: flyteidl2=$CARGO_VER" + + # Extract flyteidl2 version from rs_controller/pyproject.toml + RS_VER=$(grep 'flyteidl2==' rs_controller/pyproject.toml | head -1 | sed 's/.*flyteidl2==\([^"]*\).*/\1/') + echo "rs_controller/pyproject.toml: flyteidl2==$RS_VER" + + # Compare all three + if [ "$ROOT_VER" != "$CARGO_VER" ] || [ "$ROOT_VER" != "$RS_VER" ]; then + echo "ERROR: flyteidl2 versions do not match!" + echo " pyproject.toml: $ROOT_VER" + echo " rs_controller/Cargo.toml: $CARGO_VER" + echo " rs_controller/pyproject.toml: $RS_VER" + exit 1 + fi + echo "All flyteidl2 versions match: $ROOT_VER" rs-fmt: name: rust fmt runs-on: ubuntu-latest steps: - name: Fetch the code uses: actions/checkout@v4 + - name: Cache Cargo registry and build + uses: actions/cache@v4 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + rs_controller/target + key: ${{ runner.os }}-cargo-fmt-${{ hashFiles('rs_controller/Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-cargo-fmt- - name: Install nightly toolchain run: | rustup toolchain install nightly @@ -46,6 +85,16 @@ jobs: steps: - name: Fetch the code uses: actions/checkout@v4 + - name: Cache Cargo registry and build + uses: actions/cache@v4 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + rs_controller/target + key: ${{ runner.os }}-cargo-lint-${{ hashFiles('rs_controller/Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-cargo-lint- - name: Install toolchain run: | rustup toolchain install diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b534f264a..383d585ce 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,14 +3,95 @@ name: Publish on: release: types: [published] + push: + branches: [revisit-protos-ci] pull_request: paths: - ".github/workflows/publish.yml" - "maint_tools/build_default_image.py" jobs: + rs-controller-wheels: + name: Build RS controller wheel (${{ matrix.target }}) + runs-on: ${{ matrix.os }} + strategy: + matrix: + include: + - target: x86_64 + os: ubuntu-latest + - target: aarch64 + os: ubuntu-24.04-arm + - target: aarch64-apple-darwin + os: macos-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: "0" + - name: Set version from tag + run: | + if [[ "$GITHUB_REF" == refs/tags/v* ]]; then + VERSION=$(echo "$GITHUB_REF" | sed 's|refs/tags/v||') + else + VERSION="0.0.0.dev0" + fi + echo "VERSION=$VERSION" >> $GITHUB_ENV + sed "s/^version = .*/version = \"$VERSION\"/" rs_controller/pyproject.toml > tmp && mv tmp rs_controller/pyproject.toml + echo "Set version to $VERSION" + cat rs_controller/pyproject.toml + - name: Build wheels + uses: PyO3/maturin-action@v1 + with: + target: ${{ matrix.target }} + manylinux: auto + args: --release --out dist -m rs_controller/Cargo.toml + sccache: true + - name: Upload wheels + uses: actions/upload-artifact@v4 + with: + name: rs-controller-wheel-${{ matrix.target }} + path: dist/*.whl + + rs-controller-publish: + name: Publish RS controller to PyPI + needs: rs-controller-wheels + runs-on: ubuntu-latest + if: github.event_name == 'release' + steps: + - name: Download all wheel artifacts + uses: actions/download-artifact@v4 + with: + pattern: rs-controller-wheel-* + merge-multiple: true + path: dist/ + - name: Install twine + run: pip install twine + - name: Publish to PyPI + env: + TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: | + twine upload --verbose dist/* + - name: Wait for PyPI availability + run: | + VERSION=$(echo "$GITHUB_REF" | sed 's|refs/tags/v||') + LINK="https://pypi.org/project/flyte_controller_base/${VERSION}/" + echo "Waiting for $LINK" + for i in $(seq 1 60); do + if curl -L -I -s -f "$LINK"; then + echo "Found on PyPI: $LINK" + exit 0 + else + echo "Attempt $i: not yet available, retrying in 10s..." + sleep 10 + fi + done + echo "ERROR: timed out waiting for PyPI" + exit 1 + flyte-pypi: name: PyPI package + needs: rs-controller-publish + if: always() && (needs.rs-controller-publish.result == 'success' || needs.rs-controller-publish.result == 'skipped') runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -27,18 +108,25 @@ jobs: run: | uv venv uv pip install build twine setuptools wheel + - name: Pin flyte_controller_base version (release only) + if: github.event_name == 'release' + run: | + VERSION=$(echo "$GITHUB_REF" | sed 's|refs/tags/v||') + sed -i "s/flyte_controller_base>=2.0.0b0/flyte_controller_base==${VERSION}/" pyproject.toml + echo "Pinned flyte_controller_base==${VERSION}" + grep flyte_controller_base pyproject.toml - name: Build and publish run: | uv run python -m build --wheel --installer uv - name: Publish if: ${{ github.event_name == 'release' }} - working-directory: ${{ matrix.workdir }} env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} run: | uv run python -m twine upload --verbose dist/* - name: Sleep until pypi is available + if: ${{ github.event_name == 'release' }} id: pypiwait run: | # from 'refs/tags/v1.2.3 get 1.2.3' and make sure it's not an empty string diff --git a/examples/basics/large_slow_run.py b/examples/basics/large_slow_run.py index bd0b967aa..8c9c81052 100644 --- a/examples/basics/large_slow_run.py +++ b/examples/basics/large_slow_run.py @@ -1,8 +1,18 @@ import asyncio +from pathlib import Path import flyte +from flyte._image import PythonWheels -env = flyte.TaskEnvironment("large-slow-run") +controller_dist_folder = Path("/Users/ytong/go/src/github.com/flyteorg/sdk-rust/rs_controller/dist") +wheel_layer = PythonWheels(wheel_dir=controller_dist_folder, package_name="flyte_controller_base") +base = flyte.Image.from_debian_base() +rs_controller_image = base.clone(addl_layer=wheel_layer) + +env = flyte.TaskEnvironment( + "large-slow-run", + image=rs_controller_image, +) @env.task diff --git a/examples/stress/duplicate_action_id.py b/examples/stress/duplicate_action_id.py index 4a0c5df40..95a146b02 100644 --- a/examples/stress/duplicate_action_id.py +++ b/examples/stress/duplicate_action_id.py @@ -14,13 +14,21 @@ """ import asyncio +from pathlib import Path import flyte +from flyte._image import PythonWheels + +controller_dist_folder = Path("/Users/ytong/go/src/github.com/flyteorg/sdk-rust/rs_controller/dist") +wheel_layer = PythonWheels(wheel_dir=controller_dist_folder, package_name="flyte_controller_base") +base = flyte.Image.from_debian_base() +rs_controller_image = base.clone(addl_layer=wheel_layer) env_worker = flyte.TaskEnvironment( name="worker", resources=flyte.Resources(cpu=1, memory="250Mi"), cache="disable", + image=rs_controller_image, ) env_main = flyte.TaskEnvironment( @@ -28,6 +36,7 @@ resources=flyte.Resources(cpu=1, memory="250Mi"), depends_on=[env_worker], cache="disable", + image=rs_controller_image, ) diff --git a/pyproject.toml b/pyproject.toml index dd116d307..e0da4297e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,8 @@ dependencies = [ "async-lru>=2.0.5", "mashumaro", "aiolimiter>=1.2.1", - "flyteidl2==2.0.2", + "flyteidl2==2.0.6", + "flyte_controller_base>=2.0.0b0", "packaging", ] @@ -166,6 +167,9 @@ ignore = ["PGH003", "PLC0415", "ASYNC210", "ASYNC240", "FURB122"] disable_error_code = ["import-untyped"] ignore_missing_imports = true +[tool.uv.sources] +flyte_controller_base = { path = "rs_controller" } + [tool.ty.rules] unused-ignore-comment = "warn" redundant-cast = "ignore" diff --git a/rs_controller/Cargo.lock b/rs_controller/Cargo.lock index ceba46e6b..425ac7364 100644 --- a/rs_controller/Cargo.lock +++ b/rs_controller/Cargo.lock @@ -2,21 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" - [[package]] name = "aho-corasick" version = "1.1.4" @@ -28,9 +13,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.98" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" +checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea" [[package]] name = "async-stream" @@ -56,9 +41,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.88" +version = "0.1.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" +checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", @@ -73,9 +58,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "axum" @@ -99,7 +84,7 @@ dependencies = [ "rustversion", "serde", "sync_wrapper", - "tower 0.5.2", + "tower 0.5.3", "tower-layer", "tower-service", ] @@ -124,21 +109,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets", -] - [[package]] name = "base64" version = "0.21.7" @@ -153,27 +123,27 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "bytes" -version = "1.10.1" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" +checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "cc" -version = "1.2.47" +version = "1.2.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd405d82c84ff7f35739f175f67d8b9fb7687a0e84ccdc78bd3568839827cf07" +checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" dependencies = [ "find-msvc-tools", "shlex", @@ -181,9 +151,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" @@ -193,23 +163,13 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chrono" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2" +checksum = "fac4744fb15ae8337dc853fee7fb3f4e48c0fbaa23d0afe49c447b4fab126118" dependencies = [ "num-traits", ] -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation" version = "0.10.1" @@ -243,15 +203,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" -[[package]] -name = "encoding_rs" -version = "0.8.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] - [[package]] name = "equivalent" version = "1.0.2" @@ -276,9 +227,9 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "fixedbitset" @@ -318,9 +269,9 @@ dependencies = [ [[package]] name = "flyteidl2" -version = "2.0.0" +version = "2.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fa9ca7ab4b9678e656821c53656ae9aa28115ad3e4579cc160b58b8b592abc2" +checksum = "6aa3f954939207e7ad9ded4cc6d7ab980bfbcc497a606a7cdcfb384a60b55aed" dependencies = [ "async-trait", "futures", @@ -329,7 +280,7 @@ dependencies = [ "pbjson-types", "prettyplease", "prost 0.13.5", - "prost-build 0.14.1", + "prost-build 0.14.3", "prost-types 0.12.6", "protobuf", "pyo3", @@ -354,19 +305,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" +name = "foldhash" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "form_urlencoded" @@ -379,9 +321,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" dependencies = [ "futures-channel", "futures-core", @@ -394,9 +336,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" dependencies = [ "futures-core", "futures-sink", @@ -404,15 +346,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" [[package]] name = "futures-executor" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" dependencies = [ "futures-core", "futures-task", @@ -421,15 +363,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" [[package]] name = "futures-macro" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" dependencies = [ "proc-macro2", "quote", @@ -438,21 +380,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-channel", "futures-core", @@ -462,15 +404,14 @@ dependencies = [ "futures-task", "memchr", "pin-project-lite", - "pin-utils", "slab", ] [[package]] name = "getrandom" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", "js-sys", @@ -494,16 +435,23 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.31.1" +name = "getrandom" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasip2", + "wasip3", +] [[package]] name = "h2" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5" +checksum = "2f44da3a8150a6703ed5d34e164b875fd14c2cdab9af1252a9a1020bde2bdc54" dependencies = [ "atomic-waker", "bytes", @@ -511,7 +459,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.9.0", + "indexmap 2.13.0", "slab", "tokio", "tokio-util", @@ -526,9 +474,18 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash", +] + +[[package]] +name = "hashbrown" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "heck" @@ -538,12 +495,11 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -584,13 +540,14 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "1.6.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ + "atomic-waker", "bytes", "futures-channel", - "futures-util", + "futures-core", "h2", "http", "http-body", @@ -598,6 +555,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", + "pin-utils", "smallvec", "tokio", "want", @@ -633,32 +591,15 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" -version = "0.1.14" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" +checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" dependencies = [ "base64 0.22.1", "bytes", "futures-channel", - "futures-core", "futures-util", "http", "http-body", @@ -667,12 +608,10 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2", - "system-configuration", + "socket2 0.6.2", "tokio", "tower-service", "tracing", - "windows-registry", ] [[package]] @@ -723,9 +662,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -737,9 +676,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" @@ -756,6 +695,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "idna" version = "1.1.0" @@ -789,19 +734,24 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.9.0" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", - "hashbrown 0.15.3", + "hashbrown 0.16.1", + "serde", + "serde_core", ] [[package]] name = "indoc" -version = "2.0.6" +version = "2.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd" +checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706" +dependencies = [ + "rustversion", +] [[package]] name = "ipnet" @@ -811,9 +761,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" dependencies = [ "memchr", "serde", @@ -837,17 +787,26 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" [[package]] name = "js-sys" -version = "0.3.83" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" dependencies = [ "once_cell", "wasm-bindgen", @@ -859,11 +818,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" -version = "0.2.172" +version = "0.2.182" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" [[package]] name = "linux-raw-sys" @@ -879,19 +844,18 @@ checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "lock_api" -version = "0.4.12" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" dependencies = [ - "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.27" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "lru-slab" @@ -907,9 +871,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "memchr" -version = "2.7.4" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" [[package]] name = "memoffset" @@ -926,24 +890,15 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "miniz_oxide" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" -dependencies = [ - "adler2", -] - [[package]] name = "mio" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -952,31 +907,13 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084" -[[package]] -name = "native-tls" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" -dependencies = [ - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework 2.11.1", - "security-framework-sys", - "tempfile", -] - [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "overload", - "winapi", + "windows-sys 0.61.2", ] [[package]] @@ -988,76 +925,23 @@ dependencies = [ "autocfg", ] -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" -[[package]] -name = "openssl" -version = "0.10.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "openssl-probe" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" - -[[package]] -name = "openssl-sys" -version = "0.9.111" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "overload" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" dependencies = [ "lock_api", "parking_lot_core", @@ -1065,15 +949,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.10" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-link", ] [[package]] @@ -1121,9 +1005,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "petgraph" @@ -1132,7 +1016,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3672b37090dbd86368a4145bc067582552b29c27377cad4e0a306c97f9bd7772" dependencies = [ "fixedbitset", - "indexmap 2.9.0", + "indexmap 2.13.0", +] + +[[package]] +name = "petgraph" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" +dependencies = [ + "fixedbitset", + "hashbrown 0.15.5", + "indexmap 2.13.0", ] [[package]] @@ -1167,17 +1062,11 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkg-config" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" - [[package]] name = "portable-atomic" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "potential_utf" @@ -1209,9 +1098,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] @@ -1238,12 +1127,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d" +checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568" dependencies = [ "bytes", - "prost-derive 0.14.1", + "prost-derive 0.14.3", ] [[package]] @@ -1253,11 +1142,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" dependencies = [ "heck", - "itertools 0.13.0", + "itertools 0.14.0", "log", "multimap", "once_cell", - "petgraph", + "petgraph 0.7.1", "prettyplease", "prost 0.13.5", "prost-types 0.13.5", @@ -1268,19 +1157,18 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac6c3320f9abac597dcbc668774ef006702672474aad53c6d596b62e487b40b1" +checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.13.0", + "itertools 0.14.0", "log", "multimap", - "once_cell", - "petgraph", + "petgraph 0.8.3", "prettyplease", - "prost 0.14.1", - "prost-types 0.14.1", + "prost 0.14.3", + "prost-types 0.14.3", "regex", "syn", "tempfile", @@ -1306,7 +1194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn", @@ -1314,12 +1202,12 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" +checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn", @@ -1345,11 +1233,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72" +checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7" dependencies = [ - "prost 0.14.1", + "prost 0.14.3", ] [[package]] @@ -1451,8 +1339,8 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2", - "thiserror 2.0.17", + "socket2 0.6.2", + "thiserror 2.0.18", "tokio", "tracing", "web-time", @@ -1473,7 +1361,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror 2.0.17", + "thiserror 2.0.18", "tinyvec", "tracing", "web-time", @@ -1488,16 +1376,16 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2", + "socket2 0.6.2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" dependencies = [ "proc-macro2", ] @@ -1526,7 +1414,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1546,7 +1434,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core 0.9.3", + "rand_core 0.9.5", ] [[package]] @@ -1555,32 +1443,32 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.16", + "getrandom 0.2.17", ] [[package]] name = "rand_core" -version = "0.9.3" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" dependencies = [ "getrandom 0.3.4", ] [[package]] name = "redox_syscall" -version = "0.5.12" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.12.2" +version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" dependencies = [ "aho-corasick", "memchr", @@ -1590,9 +1478,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" +checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" dependencies = [ "aho-corasick", "memchr", @@ -1601,32 +1489,27 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" +checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c" [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64 0.22.1", "bytes", - "encoding_rs", "futures-core", - "h2", "http", "http-body", "http-body-util", "hyper", "hyper-rustls", - "hyper-tls", "hyper-util", "js-sys", "log", - "mime", - "native-tls", "percent-encoding", "pin-project-lite", "quinn", @@ -1637,10 +1520,9 @@ dependencies = [ "serde_urlencoded", "sync_wrapper", "tokio", - "tokio-native-tls", "tokio-rustls", - "tower 0.5.2", - "tower-http 0.6.7", + "tower 0.5.3", + "tower-http 0.6.8", "tower-service", "url", "wasm-bindgen", @@ -1657,18 +1539,12 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.16", + "getrandom 0.2.17", "libc", "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -1677,9 +1553,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ "bitflags", "errno", @@ -1690,9 +1566,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.35" +version = "0.23.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" +checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ "log", "once_cell", @@ -1705,14 +1581,14 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3" +checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" dependencies = [ "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.5.1", + "security-framework", ] [[package]] @@ -1726,9 +1602,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" dependencies = [ "web-time", "zeroize", @@ -1736,9 +1612,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.8" +version = "0.103.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" +checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" dependencies = [ "ring", "rustls-pki-types", @@ -1747,15 +1623,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "schannel" @@ -1774,54 +1650,57 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.11.1" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "d17b898a6d6948c3a8ee4372c17cb384f90d2e6e912ef00895b14fd7ab54ec38" dependencies = [ "bitflags", - "core-foundation 0.9.4", + "core-foundation", "core-foundation-sys", "libc", "security-framework-sys", ] [[package]] -name = "security-framework" -version = "3.5.1" +name = "security-framework-sys" +version = "2.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" +checksum = "321c8673b092a9a42605034a9879d73cb79101ed5fd117bc9a597b89b4e9e61a" dependencies = [ - "bitflags", - "core-foundation 0.10.1", "core-foundation-sys", "libc", - "security-framework-sys", ] [[package]] -name = "security-framework-sys" -version = "2.15.0" +name = "semver" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" + +[[package]] +name = "serde" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ - "core-foundation-sys", - "libc", + "serde_core", + "serde_derive", ] [[package]] -name = "serde" -version = "1.0.219" +name = "serde_core" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1830,14 +1709,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.143" +version = "1.0.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" +checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" dependencies = [ "itoa", "memchr", - "ryu", "serde", + "serde_core", + "zmij", ] [[package]] @@ -1869,38 +1749,46 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.5" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] [[package]] name = "slab" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "socket2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -1915,9 +1803,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.111" +version = "2.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" +checksum = "3df424c70518695237746f84cede799c9c58fcb37450d7b23716568cc8bc69cb" dependencies = [ "proc-macro2", "quote", @@ -1944,41 +1832,20 @@ dependencies = [ "syn", ] -[[package]] -name = "system-configuration" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" -dependencies = [ - "bitflags", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "target-lexicon" -version = "0.13.2" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" +checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "tempfile" -version = "3.23.0" +version = "3.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1" dependencies = [ "fastrand", - "getrandom 0.3.4", + "getrandom 0.4.1", "once_cell", "rustix", "windows-sys 0.61.2", @@ -1995,11 +1862,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.17", + "thiserror-impl 2.0.18", ] [[package]] @@ -2015,9 +1882,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.17" +version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" dependencies = [ "proc-macro2", "quote", @@ -2026,12 +1893,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -2061,43 +1927,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.44.2" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ - "backtrace", "bytes", "libc", "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.6.2", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.4" @@ -2110,9 +1965,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +checksum = "32da49809aab5c3bc678af03902d4ccddea2a87d028d86392a4b1560c6906c70" dependencies = [ "futures-core", "pin-project-lite", @@ -2121,9 +1976,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" dependencies = [ "bytes", "futures-core", @@ -2155,7 +2010,7 @@ dependencies = [ "prost 0.13.5", "rustls-native-certs", "rustls-pemfile", - "socket2", + "socket2 0.5.10", "tokio", "tokio-rustls", "tokio-stream", @@ -2187,9 +2042,9 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" dependencies = [ "futures-core", "futures-util", @@ -2219,9 +2074,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags", "bytes", @@ -2230,7 +2085,7 @@ dependencies = [ "http-body", "iri-string", "pin-project-lite", - "tower 0.5.2", + "tower 0.5.3", "tower-layer", "tower-service", ] @@ -2249,9 +2104,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "log", "pin-project-lite", @@ -2261,9 +2116,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.28" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", @@ -2272,9 +2127,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -2293,9 +2148,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -2313,9 +2168,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" + +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unindent" @@ -2331,13 +2192,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.4" +version = "2.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" +checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] @@ -2358,12 +2220,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - [[package]] name = "want" version = "0.3.1" @@ -2375,24 +2231,33 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.1+wasi-0.2.4" +version = "1.0.2+wasi-0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" dependencies = [ "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" dependencies = [ "cfg-if", "once_cell", @@ -2403,11 +2268,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.56" +version = "0.4.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" +checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" dependencies = [ "cfg-if", + "futures-util", "js-sys", "once_cell", "wasm-bindgen", @@ -2416,9 +2282,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2426,9 +2292,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" dependencies = [ "bumpalo", "proc-macro2", @@ -2439,69 +2305,75 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.106" +version = "0.2.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" dependencies = [ "unicode-ident", ] [[package]] -name = "web-sys" -version = "0.3.83" +name = "wasm-encoder" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" dependencies = [ - "js-sys", - "wasm-bindgen", + "leb128fmt", + "wasmparser", ] [[package]] -name = "web-time" -version = "1.1.0" +name = "wasm-metadata" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ - "js-sys", - "wasm-bindgen", + "anyhow", + "indexmap 2.13.0", + "wasm-encoder", + "wasmparser", ] [[package]] -name = "webpki-roots" -version = "1.0.4" +name = "wasmparser" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ - "rustls-pki-types", + "bitflags", + "hashbrown 0.15.5", + "indexmap 2.13.0", + "semver", ] [[package]] -name = "winapi" -version = "0.3.9" +name = "web-sys" +version = "0.3.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "js-sys", + "wasm-bindgen", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] [[package]] -name = "windows-link" -version = "0.1.3" +name = "webpki-roots" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" +checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed" +dependencies = [ + "rustls-pki-types", +] [[package]] name = "windows-link" @@ -2510,41 +2382,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] -name = "windows-registry" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e" -dependencies = [ - "windows-link 0.1.3", - "windows-result", - "windows-strings", -] - -[[package]] -name = "windows-result" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" -dependencies = [ - "windows-link 0.1.3", -] - -[[package]] -name = "windows-strings" -version = "0.4.2" +name = "windows-sys" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-link 0.1.3", + "windows-targets 0.52.6", ] [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets", + "windows-targets 0.53.5", ] [[package]] @@ -2553,7 +2405,7 @@ version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" dependencies = [ - "windows-link 0.2.1", + "windows-link", ] [[package]] @@ -2562,14 +2414,31 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_gnullvm", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -2578,53 +2447,183 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + [[package]] name = "wit-bindgen" -version = "0.46.0" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap 2.13.0", + "prettyplease", + "syn", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags", + "indexmap 2.13.0", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap 2.13.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] [[package]] name = "writeable" @@ -2657,18 +2656,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.25" +version = "0.8.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.25" +version = "0.8.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517" dependencies = [ "proc-macro2", "quote", @@ -2734,3 +2733,9 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zmij" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" diff --git a/rs_controller/Cargo.toml b/rs_controller/Cargo.toml index 134eb1e0c..60be68698 100644 --- a/rs_controller/Cargo.toml +++ b/rs_controller/Cargo.toml @@ -34,8 +34,8 @@ async-trait = "0.1" thiserror = "1.0" # Uncomment this if you need to use local flyteidl2 #flyteidl2 = { path = "/Users/ytong/go/src/github.com/flyteorg/flyte/gen/rust" } -flyteidl2 = "=2.0.0" -reqwest = { version = "0.12", features = ["json", "rustls-tls"] } +flyteidl2 = "=2.0.6" +reqwest = { version = "0.12", default-features = false, features = ["json", "rustls-tls"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" base64 = "0.22" diff --git a/rs_controller/Makefile b/rs_controller/Makefile index 2ff7137d8..c539234ad 100644 --- a/rs_controller/Makefile +++ b/rs_controller/Makefile @@ -29,7 +29,6 @@ define BUILD_WHEELS_RECIPE docker run --rm \ -v $(PWD):/io \ -v $(PWD)/docker_cargo_cache:/root/.cargo/registry \ - -v $(CLOUD_REPO):/cloud \ wheel-builder:$(1) /bin/bash -c "\ cd /io; \ sed -i 's/^version = .*/version = \"$(VERSION)\"/' pyproject.toml; \ diff --git a/rs_controller/pyproject.toml b/rs_controller/pyproject.toml index 6dd883ffc..540a04c58 100644 --- a/rs_controller/pyproject.toml +++ b/rs_controller/pyproject.toml @@ -4,15 +4,16 @@ build-backend = "maturin" [project] name = "flyte_controller_base" -version = "2.0.0b42.dev24+g976c9b15.dirty" +version = "2.0.0b57.dev45+g99214408.dirty" description = "Rust controller for Union" requires-python = ">=3.10" classifiers = ["Programming Language :: Python", "Programming Language :: Rust"] dependencies = [ - "flyteidl2>=2.0.0a14", + "flyteidl2==2.0.6", ] [tool.maturin] module-name = "flyte_controller_base" +no-default-features = true features = ["extension-module"] [tool.ruff] diff --git a/rs_controller/src/auth/client_credentials.rs b/rs_controller/src/auth/client_credentials.rs index 3b0593166..6f5372814 100644 --- a/rs_controller/src/auth/client_credentials.rs +++ b/rs_controller/src/auth/client_credentials.rs @@ -3,19 +3,19 @@ use std::{ time::{Duration, SystemTime}, }; +use flyteidl2::flyteidl::auth::{ + auth_metadata_service_client::AuthMetadataServiceClient, GetOAuth2MetadataRequest, + GetOAuth2MetadataResponse, GetPublicClientConfigRequest, GetPublicClientConfigResponse, +}; use tokio::sync::RwLock; use tonic::transport::Channel; use tracing::{debug, info}; use super::{ - config::{AuthConfig, ClientConfigExt}, + config::AuthConfig, errors::TokenError, token_client::{self, GrantType, TokenResponse}, }; -use crate::proto::{ - AuthMetadataServiceClient, OAuth2MetadataRequest, OAuth2MetadataResponse, - PublicClientAuthConfigRequest, PublicClientAuthConfigResponse, -}; /// Stored credentials with expiration tracking #[derive(Debug, Clone)] @@ -46,8 +46,8 @@ impl Credentials { pub struct ClientCredentialsAuthenticator { config: AuthConfig, credentials: Arc>>, - client_config: Arc>>, - oauth2_metadata: Arc>>, + client_config: Arc>>, + oauth2_metadata: Arc>>, } impl ClientCredentialsAuthenticator { @@ -64,9 +64,9 @@ impl ClientCredentialsAuthenticator { async fn fetch_client_config( &self, channel: Channel, - ) -> Result { + ) -> Result { let mut client = AuthMetadataServiceClient::new(channel.clone()); - let request = tonic::Request::new(PublicClientAuthConfigRequest {}); + let request = tonic::Request::new(GetPublicClientConfigRequest {}); let response = client .get_public_client_config(request) @@ -80,9 +80,9 @@ impl ClientCredentialsAuthenticator { async fn fetch_oauth2_metadata( &self, channel: Channel, - ) -> Result { + ) -> Result { let mut client = AuthMetadataServiceClient::new(channel); - let request = tonic::Request::new(OAuth2MetadataRequest {}); + let request = tonic::Request::new(GetOAuth2MetadataRequest {}); let response = client .get_o_auth2_metadata(request) @@ -201,10 +201,10 @@ impl ClientCredentialsAuthenticator { pub async fn get_header_key(&self) -> String { let config_lock = self.client_config.read().await; if let Some(cfg) = config_lock.as_ref() { - // get rid of this - cfg.header_key().to_string() - } else { - "authorization".to_string() + if !cfg.authorization_metadata_key.is_empty() { + return cfg.authorization_metadata_key.clone(); + } } + "authorization".to_string() } } diff --git a/rs_controller/src/auth/config.rs b/rs_controller/src/auth/config.rs index b27ae2a17..dd34c27da 100644 --- a/rs_controller/src/auth/config.rs +++ b/rs_controller/src/auth/config.rs @@ -10,22 +10,6 @@ pub struct AuthConfig { pub client_secret: String, } -/// Extension trait to add helper methods to the proto-generated PublicClientAuthConfigResponse -pub trait ClientConfigExt { - fn header_key(&self) -> &str; -} - -// todo: get rid of this -impl ClientConfigExt for crate::proto::PublicClientAuthConfigResponse { - fn header_key(&self) -> &str { - if self.authorization_metadata_key.is_empty() { - "authorization" - } else { - &self.authorization_metadata_key - } - } -} - impl AuthConfig { pub fn new_from_api_key(api_key: &str) -> Result { let decoded = engine::general_purpose::STANDARD.decode(api_key)?; diff --git a/rs_controller/src/auth/mod.rs b/rs_controller/src/auth/mod.rs index 0418ad58d..768aaf89a 100644 --- a/rs_controller/src/auth/mod.rs +++ b/rs_controller/src/auth/mod.rs @@ -5,7 +5,7 @@ mod middleware; mod token_client; pub use client_credentials::{ClientCredentialsAuthenticator, Credentials}; -pub use config::{AuthConfig, ClientConfigExt}; +pub use config::AuthConfig; pub use errors::{AuthConfigError, TokenError}; pub use middleware::{AuthLayer, AuthService}; pub use token_client::{get_token, GrantType}; diff --git a/rs_controller/src/bin/try_list_tasks.rs b/rs_controller/src/bin/try_list_tasks.rs index 977cea97b..86683a797 100644 --- a/rs_controller/src/bin/try_list_tasks.rs +++ b/rs_controller/src/bin/try_list_tasks.rs @@ -4,10 +4,7 @@ /// _UNION_EAGER_API_KEY=your_api_key cargo run --bin try_list_tasks use std::sync::Arc; -use flyte_controller_base::{ - auth::{AuthConfig, AuthLayer, ClientCredentialsAuthenticator}, - error::ControllerError, -}; +use flyte_controller_base::auth::{AuthConfig, AuthLayer, ClientCredentialsAuthenticator}; use flyteidl2::flyteidl::{ common::{ListRequest, ProjectIdentifier}, task::{list_tasks_request, task_service_client::TaskServiceClient, ListTasksRequest}, @@ -30,13 +27,7 @@ async fn main() -> Result<(), Box> { let auth_config = AuthConfig::new_from_api_key(api_key.as_str())?; let endpoint = auth_config.endpoint.clone(); let static_endpoint = endpoint.clone().leak(); - // Strip "https://" (8 chars) to get just the hostname for TLS config - let domain = endpoint.strip_prefix("https://").ok_or_else(|| { - ControllerError::SystemError("Endpoint must start with https://".to_string()) - })?; - let endpoint = - flyte_controller_base::core::create_tls_endpoint(static_endpoint, domain).await?; - let channel = endpoint.connect().await.map_err(ControllerError::from)?; + let channel = flyte_controller_base::core::create_tls_channel(static_endpoint).await?; let authenticator = Arc::new(ClientCredentialsAuthenticator::new(auth_config)); diff --git a/rs_controller/src/bin/try_watch.rs b/rs_controller/src/bin/try_watch.rs index 7fed9ae88..d6c2a6efa 100644 --- a/rs_controller/src/bin/try_watch.rs +++ b/rs_controller/src/bin/try_watch.rs @@ -5,10 +5,7 @@ use std::sync::Arc; use std::time::Duration; -use flyte_controller_base::{ - auth::{AuthConfig, AuthLayer, ClientCredentialsAuthenticator}, - error::ControllerError, -}; +use flyte_controller_base::auth::{AuthConfig, AuthLayer, ClientCredentialsAuthenticator}; use flyteidl2::flyteidl::{ common::{ActionIdentifier, RunIdentifier}, workflow::{state_service_client::StateServiceClient, watch_request::Filter, WatchRequest}, @@ -34,13 +31,7 @@ async fn main() -> Result<(), Box> { let auth_config = AuthConfig::new_from_api_key(api_key.as_str())?; let endpoint = auth_config.endpoint.clone(); let static_endpoint = endpoint.clone().leak(); - // Strip "https://" (8 chars) to get just the hostname for TLS config - let domain = endpoint.strip_prefix("https://").ok_or_else(|| { - ControllerError::SystemError("Endpoint must start with https://".to_string()) - })?; - let endpoint = - flyte_controller_base::core::create_tls_endpoint(static_endpoint, domain).await?; - let channel = endpoint.connect().await.map_err(ControllerError::from)?; + let channel = flyte_controller_base::core::create_tls_channel(static_endpoint).await?; let authenticator = Arc::new(ClientCredentialsAuthenticator::new(auth_config)); diff --git a/rs_controller/src/core.rs b/rs_controller/src/core.rs index bf9310e17..d01d1673f 100644 --- a/rs_controller/src/core.rs +++ b/rs_controller/src/core.rs @@ -21,7 +21,7 @@ use tokio::{ sync::{mpsc, oneshot}, time::sleep, }; -use tonic::transport::{Certificate, ClientTlsConfig, Endpoint}; +use tonic::transport::{Channel, ClientTlsConfig, Endpoint}; use tower::ServiceBuilder; use tracing::{debug, error, info, warn}; @@ -32,42 +32,17 @@ use crate::{ informer::{Informer, InformerCache}, }; -// Fetches Amazon root CA certificate from Amazon Trust Services -pub async fn fetch_amazon_root_ca() -> Result { - // Amazon Root CA 1 - the main root used by AWS services - let url = "https://www.amazontrust.com/repository/AmazonRootCA1.pem"; - - let response = reqwest::get(url) - .await - .map_err(|e| ControllerError::SystemError(format!("Failed to fetch certificate: {}", e)))?; - - let cert_pem = response - .text() - .await - .map_err(|e| ControllerError::SystemError(format!("Failed to read certificate: {}", e)))?; - - Ok(Certificate::from_pem(cert_pem)) -} - -// Helper to create TLS-configured endpoint with Amazon CA certificate -// todo: when we resolve the pem issue, also remove the need to have both inputs which are basically the same -pub async fn create_tls_endpoint( - url: &'static str, - domain: &str, -) -> Result { - // Fetch Amazon root CA dynamically - let cert = fetch_amazon_root_ca().await?; - - let tls_config = ClientTlsConfig::new() - .domain_name(domain) - .ca_certificate(cert); - +// Helper to create TLS-configured channel +// todo: support no verify https://github.com/flyteorg/flyte-sdk/pull/299/files +pub async fn create_tls_channel(url: &'static str) -> Result { let endpoint = Endpoint::from_static(url) - .tls_config(tls_config) + .tls_config(ClientTlsConfig::new().with_native_roots()) .map_err(|e| ControllerError::SystemError(format!("TLS config error: {}", e)))? .keep_alive_while_idle(true); - Ok(endpoint) + let channel = endpoint.connect().await.map_err(ControllerError::from)?; + + Ok(channel) } enum ChannelType { @@ -141,17 +116,8 @@ impl CoreBaseController { let rt = get_runtime(); let channel = rt.block_on(async { // todo: escape hatch for localhost - // Strip "https://" to get just the hostname for TLS config - let domain = endpoint_url.strip_prefix("https://").ok_or_else(|| { - ControllerError::SystemError( - "Endpoint must start with https:// when using auth".to_string(), - ) - })?; - - // Create TLS-configured endpoint - let endpoint = create_tls_endpoint(endpoint_static, domain).await?; - let channel = endpoint.connect().await.map_err(ControllerError::from)?; - + // Create TLS-configured channel + let channel = create_tls_channel(endpoint_static).await?; let authenticator = Arc::new(ClientCredentialsAuthenticator::new(auth_config.clone())); let auth_channel = ServiceBuilder::new() .layer(AuthLayer::new(authenticator, channel.clone())) @@ -216,14 +182,9 @@ impl CoreBaseController { let endpoint = Endpoint::from_static(endpoint_static).keep_alive_while_idle(true); endpoint.connect().await.map_err(ControllerError::from)? } else if endpoint.starts_with("https://") { - // Strip "https://" to get just the hostname for TLS config - let domain = endpoint.strip_prefix("https://").ok_or_else(|| { - ControllerError::SystemError("Endpoint must start with https://".to_string()) - })?; - - // Create TLS-configured endpoint - let endpoint = create_tls_endpoint(endpoint_static, domain).await?; - endpoint.connect().await.map_err(ControllerError::from)? + // Create TLS-configured channel + let channel = create_tls_channel(endpoint_static).await?; + channel } else { return Err(ControllerError::SystemError(format!( "Malformed endpoint {}", @@ -541,7 +502,7 @@ impl CoreBaseController { .get_or_create_informer(run, parent_action_name) .await; let action_name = action_id.name.clone(); - match informer.get_action(action_name).await { + match informer.get_action(&action_name).await { Some(action) => Ok(Some(action)), None => { debug!("Action not found getting from action_id: {:?}", action_id); @@ -692,10 +653,13 @@ impl CoreBaseController { ); // get the action and return it - let final_action = informer.get_action(action_name).await; - final_action.ok_or(ControllerError::BadContext(String::from( + let final_action = informer.get_action(&action_name).await; + let final_action = final_action.ok_or(ControllerError::BadContext(String::from( "Action not found after done", - ))) + ))); + // Also remove. May be can do with prior step in the future. + informer.remove_action(&action_name).await; + final_action } pub async fn finalize_parent_action(&self, run_id: &RunIdentifier, parent_action_name: &str) { diff --git a/rs_controller/src/informer.rs b/rs_controller/src/informer.rs index ec86dd3b2..117161246 100644 --- a/rs_controller/src/informer.rs +++ b/rs_controller/src/informer.rs @@ -221,9 +221,17 @@ impl Informer { } } - pub async fn get_action(&self, action_name: String) -> Option { + pub async fn get_action(&self, action_name: &str) -> Option { let cache = self.action_cache.read().await; - cache.get(&action_name).cloned() + cache.get(action_name).cloned() + } + + pub async fn remove_action(&self, action_name: &str) -> Option { + let mut cache = self.action_cache.write().await; + let dropped_action = cache.remove(action_name); + self.completion_events.write().await.remove(action_name); + debug!("Removed action and completion event for {}", action_name); + dropped_action } pub async fn submit_action( diff --git a/rs_controller/src/lib.rs b/rs_controller/src/lib.rs index 70bc2a6e2..5717d7e4e 100644 --- a/rs_controller/src/lib.rs +++ b/rs_controller/src/lib.rs @@ -6,7 +6,6 @@ pub mod auth; pub mod core; pub mod error; mod informer; -pub mod proto; // Python bindings - thin wrappers around core types use std::sync::Arc; diff --git a/rs_controller/src/proto/flyteidl.service.rs b/rs_controller/src/proto/flyteidl.service.rs deleted file mode 100644 index bcd69cb84..000000000 --- a/rs_controller/src/proto/flyteidl.service.rs +++ /dev/null @@ -1,78 +0,0 @@ -// @generated -// This file is @generated by prost-build. -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, Copy, PartialEq, ::prost::Message)] -pub struct OAuth2MetadataRequest {} -/// OAuth2MetadataResponse defines an RFC-Compliant response for /.well-known/oauth-authorization-server metadata -/// as defined in -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct OAuth2MetadataResponse { - /// Defines the issuer string in all JWT tokens this server issues. The issuer can be admin itself or an external - /// issuer. - #[prost(string, tag = "1")] - pub issuer: ::prost::alloc::string::String, - /// URL of the authorization server's authorization endpoint \[RFC6749\]. This is REQUIRED unless no grant types are - /// supported that use the authorization endpoint. - #[prost(string, tag = "2")] - pub authorization_endpoint: ::prost::alloc::string::String, - /// URL of the authorization server's token endpoint \[RFC6749\]. - #[prost(string, tag = "3")] - pub token_endpoint: ::prost::alloc::string::String, - /// Array containing a list of the OAuth 2.0 response_type values that this authorization server supports. - #[prost(string, repeated, tag = "4")] - pub response_types_supported: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// JSON array containing a list of the OAuth 2.0 \[RFC6749\] scope values that this authorization server supports. - #[prost(string, repeated, tag = "5")] - pub scopes_supported: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// JSON array containing a list of client authentication methods supported by this token endpoint. - #[prost(string, repeated, tag = "6")] - pub token_endpoint_auth_methods_supported: - ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// URL of the authorization server's JWK Set \[JWK\] document. The referenced document contains the signing key(s) the - /// client uses to validate signatures from the authorization server. - #[prost(string, tag = "7")] - pub jwks_uri: ::prost::alloc::string::String, - /// JSON array containing a list of Proof Key for Code Exchange (PKCE) \[RFC7636\] code challenge methods supported by - /// this authorization server. - #[prost(string, repeated, tag = "8")] - pub code_challenge_methods_supported: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// JSON array containing a list of the OAuth 2.0 grant type values that this authorization server supports. - #[prost(string, repeated, tag = "9")] - pub grant_types_supported: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// URL of the authorization server's device authorization endpoint, as defined in Section 3.1 of \[RFC8628\] - #[prost(string, tag = "10")] - pub device_authorization_endpoint: ::prost::alloc::string::String, -} -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, Copy, PartialEq, ::prost::Message)] -pub struct PublicClientAuthConfigRequest {} -/// FlyteClientResponse encapsulates public information that flyte clients (CLIs... etc.) can use to authenticate users. -#[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] -pub struct PublicClientAuthConfigResponse { - /// client_id to use when initiating OAuth2 authorization requests. - #[prost(string, tag = "1")] - pub client_id: ::prost::alloc::string::String, - /// redirect uri to use when initiating OAuth2 authorization requests. - #[prost(string, tag = "2")] - pub redirect_uri: ::prost::alloc::string::String, - /// scopes to request when initiating OAuth2 authorization requests. - #[prost(string, repeated, tag = "3")] - pub scopes: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, - /// Authorization Header to use when passing Access Tokens to the server. If not provided, the client should use the - /// default http `Authorization` header. - #[prost(string, tag = "4")] - pub authorization_metadata_key: ::prost::alloc::string::String, - /// ServiceHttpEndpoint points to the http endpoint for the backend. If empty, clients can assume the endpoint used - /// to configure the gRPC connection can be used for the http one respecting the insecure flag to choose between - /// SSL or no SSL connections. - #[prost(string, tag = "5")] - pub service_http_endpoint: ::prost::alloc::string::String, - /// audience to use when initiating OAuth2 authorization requests. - #[prost(string, tag = "6")] - pub audience: ::prost::alloc::string::String, -} - -include!("flyteidl.service.tonic.rs"); -// @@protoc_insertion_point(module) diff --git a/rs_controller/src/proto/flyteidl.service.tonic.rs b/rs_controller/src/proto/flyteidl.service.tonic.rs deleted file mode 100644 index cc2cb4b92..000000000 --- a/rs_controller/src/proto/flyteidl.service.tonic.rs +++ /dev/null @@ -1,409 +0,0 @@ -// @generated -/// Generated client implementations. -pub mod auth_metadata_service_client { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] - use tonic::codegen::*; - use tonic::codegen::http::Uri; - /** The following defines an RPC service that is also served over HTTP via grpc-gateway. - Standard response codes for both are defined here: https://github.com/grpc-ecosystem/grpc-gateway/blob/master/runtime/errors.go - RPCs defined in this service must be anonymously accessible. -*/ - #[derive(Debug, Clone)] - pub struct AuthMetadataServiceClient { - inner: tonic::client::Grpc, - } - impl AuthMetadataServiceClient { - /// Attempt to create a new client by connecting to a given endpoint. - pub async fn connect(dst: D) -> Result - where - D: TryInto, - D::Error: Into, - { - let conn = tonic::transport::Endpoint::new(dst)?.connect().await?; - Ok(Self::new(conn)) - } - } - impl AuthMetadataServiceClient - where - T: tonic::client::GrpcService, - T::Error: Into, - T::ResponseBody: Body + Send + 'static, - ::Error: Into + Send, - { - pub fn new(inner: T) -> Self { - let inner = tonic::client::Grpc::new(inner); - Self { inner } - } - pub fn with_origin(inner: T, origin: Uri) -> Self { - let inner = tonic::client::Grpc::with_origin(inner, origin); - Self { inner } - } - pub fn with_interceptor( - inner: T, - interceptor: F, - ) -> AuthMetadataServiceClient> - where - F: tonic::service::Interceptor, - T::ResponseBody: Default, - T: tonic::codegen::Service< - http::Request, - Response = http::Response< - >::ResponseBody, - >, - >, - , - >>::Error: Into + Send + Sync, - { - AuthMetadataServiceClient::new(InterceptedService::new(inner, interceptor)) - } - /// Compress requests with the given encoding. - /// - /// This requires the server to support it otherwise it might respond with an - /// error. - #[must_use] - pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self { - self.inner = self.inner.send_compressed(encoding); - self - } - /// Enable decompressing responses. - #[must_use] - pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self { - self.inner = self.inner.accept_compressed(encoding); - self - } - /// Limits the maximum size of a decoded message. - /// - /// Default: `4MB` - #[must_use] - pub fn max_decoding_message_size(mut self, limit: usize) -> Self { - self.inner = self.inner.max_decoding_message_size(limit); - self - } - /// Limits the maximum size of an encoded message. - /// - /// Default: `usize::MAX` - #[must_use] - pub fn max_encoding_message_size(mut self, limit: usize) -> Self { - self.inner = self.inner.max_encoding_message_size(limit); - self - } - /** Anonymously accessible. Retrieves local or external oauth authorization server metadata. -*/ - pub async fn get_o_auth2_metadata( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic::codec::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/flyteidl.service.AuthMetadataService/GetOAuth2Metadata", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert( - GrpcMethod::new( - "flyteidl.service.AuthMetadataService", - "GetOAuth2Metadata", - ), - ); - self.inner.unary(req, path, codec).await - } - /** Anonymously accessible. Retrieves the client information clients should use when initiating OAuth2 authorization - requests. -*/ - pub async fn get_public_client_config( - &mut self, - request: impl tonic::IntoRequest, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - > { - self.inner - .ready() - .await - .map_err(|e| { - tonic::Status::new( - tonic::Code::Unknown, - format!("Service was not ready: {}", e.into()), - ) - })?; - let codec = tonic::codec::ProstCodec::default(); - let path = http::uri::PathAndQuery::from_static( - "/flyteidl.service.AuthMetadataService/GetPublicClientConfig", - ); - let mut req = request.into_request(); - req.extensions_mut() - .insert( - GrpcMethod::new( - "flyteidl.service.AuthMetadataService", - "GetPublicClientConfig", - ), - ); - self.inner.unary(req, path, codec).await - } - } -} -/// Generated server implementations. -pub mod auth_metadata_service_server { - #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] - use tonic::codegen::*; - /// Generated trait containing gRPC methods that should be implemented for use with AuthMetadataServiceServer. - #[async_trait] - pub trait AuthMetadataService: Send + Sync + 'static { - /** Anonymously accessible. Retrieves local or external oauth authorization server metadata. -*/ - async fn get_o_auth2_metadata( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; - /** Anonymously accessible. Retrieves the client information clients should use when initiating OAuth2 authorization - requests. -*/ - async fn get_public_client_config( - &self, - request: tonic::Request, - ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; - } - /** The following defines an RPC service that is also served over HTTP via grpc-gateway. - Standard response codes for both are defined here: https://github.com/grpc-ecosystem/grpc-gateway/blob/master/runtime/errors.go - RPCs defined in this service must be anonymously accessible. -*/ - #[derive(Debug)] - pub struct AuthMetadataServiceServer { - inner: _Inner, - accept_compression_encodings: EnabledCompressionEncodings, - send_compression_encodings: EnabledCompressionEncodings, - max_decoding_message_size: Option, - max_encoding_message_size: Option, - } - struct _Inner(Arc); - impl AuthMetadataServiceServer { - pub fn new(inner: T) -> Self { - Self::from_arc(Arc::new(inner)) - } - pub fn from_arc(inner: Arc) -> Self { - let inner = _Inner(inner); - Self { - inner, - accept_compression_encodings: Default::default(), - send_compression_encodings: Default::default(), - max_decoding_message_size: None, - max_encoding_message_size: None, - } - } - pub fn with_interceptor( - inner: T, - interceptor: F, - ) -> InterceptedService - where - F: tonic::service::Interceptor, - { - InterceptedService::new(Self::new(inner), interceptor) - } - /// Enable decompressing requests with the given encoding. - #[must_use] - pub fn accept_compressed(mut self, encoding: CompressionEncoding) -> Self { - self.accept_compression_encodings.enable(encoding); - self - } - /// Compress responses with the given encoding, if the client supports it. - #[must_use] - pub fn send_compressed(mut self, encoding: CompressionEncoding) -> Self { - self.send_compression_encodings.enable(encoding); - self - } - /// Limits the maximum size of a decoded message. - /// - /// Default: `4MB` - #[must_use] - pub fn max_decoding_message_size(mut self, limit: usize) -> Self { - self.max_decoding_message_size = Some(limit); - self - } - /// Limits the maximum size of an encoded message. - /// - /// Default: `usize::MAX` - #[must_use] - pub fn max_encoding_message_size(mut self, limit: usize) -> Self { - self.max_encoding_message_size = Some(limit); - self - } - } - impl tonic::codegen::Service> for AuthMetadataServiceServer - where - T: AuthMetadataService, - B: Body + Send + 'static, - B::Error: Into + Send + 'static, - { - type Response = http::Response; - type Error = std::convert::Infallible; - type Future = BoxFuture; - fn poll_ready( - &mut self, - _cx: &mut Context<'_>, - ) -> Poll> { - Poll::Ready(Ok(())) - } - fn call(&mut self, req: http::Request) -> Self::Future { - let inner = self.inner.clone(); - match req.uri().path() { - "/flyteidl.service.AuthMetadataService/GetOAuth2Metadata" => { - #[allow(non_camel_case_types)] - struct GetOAuth2MetadataSvc(pub Arc); - impl< - T: AuthMetadataService, - > tonic::server::UnaryService - for GetOAuth2MetadataSvc { - type Response = super::OAuth2MetadataResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::get_o_auth2_metadata( - &inner, - request, - ) - .await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let inner = inner.0; - let method = GetOAuth2MetadataSvc(inner); - let codec = tonic::codec::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } - "/flyteidl.service.AuthMetadataService/GetPublicClientConfig" => { - #[allow(non_camel_case_types)] - struct GetPublicClientConfigSvc(pub Arc); - impl< - T: AuthMetadataService, - > tonic::server::UnaryService - for GetPublicClientConfigSvc { - type Response = super::PublicClientAuthConfigResponse; - type Future = BoxFuture< - tonic::Response, - tonic::Status, - >; - fn call( - &mut self, - request: tonic::Request, - ) -> Self::Future { - let inner = Arc::clone(&self.0); - let fut = async move { - ::get_public_client_config( - &inner, - request, - ) - .await - }; - Box::pin(fut) - } - } - let accept_compression_encodings = self.accept_compression_encodings; - let send_compression_encodings = self.send_compression_encodings; - let max_decoding_message_size = self.max_decoding_message_size; - let max_encoding_message_size = self.max_encoding_message_size; - let inner = self.inner.clone(); - let fut = async move { - let inner = inner.0; - let method = GetPublicClientConfigSvc(inner); - let codec = tonic::codec::ProstCodec::default(); - let mut grpc = tonic::server::Grpc::new(codec) - .apply_compression_config( - accept_compression_encodings, - send_compression_encodings, - ) - .apply_max_message_size_config( - max_decoding_message_size, - max_encoding_message_size, - ); - let res = grpc.unary(method, req).await; - Ok(res) - }; - Box::pin(fut) - } - _ => { - Box::pin(async move { - Ok( - http::Response::builder() - .status(200) - .header("grpc-status", "12") - .header("content-type", "application/grpc") - .body(empty_body()) - .unwrap(), - ) - }) - } - } - } - } - impl Clone for AuthMetadataServiceServer { - fn clone(&self) -> Self { - let inner = self.inner.clone(); - Self { - inner, - accept_compression_encodings: self.accept_compression_encodings, - send_compression_encodings: self.send_compression_encodings, - max_decoding_message_size: self.max_decoding_message_size, - max_encoding_message_size: self.max_encoding_message_size, - } - } - } - impl Clone for _Inner { - fn clone(&self) -> Self { - Self(Arc::clone(&self.0)) - } - } - impl std::fmt::Debug for _Inner { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{:?}", self.0) - } - } - impl tonic::server::NamedService - for AuthMetadataServiceServer { - const NAME: &'static str = "flyteidl.service.AuthMetadataService"; - } -} diff --git a/rs_controller/src/proto/mod.rs b/rs_controller/src/proto/mod.rs deleted file mode 100644 index e40b8bb28..000000000 --- a/rs_controller/src/proto/mod.rs +++ /dev/null @@ -1,11 +0,0 @@ -// Generated protobuf files for Flyte IDL -// Only including the files needed for authentication and basic operations - -#[path = "flyteidl.service.rs"] -pub mod service; - -// Re-export the auth-related types and services for convenience -pub use service::{ - auth_metadata_service_client::AuthMetadataServiceClient, OAuth2MetadataRequest, - OAuth2MetadataResponse, PublicClientAuthConfigRequest, PublicClientAuthConfigResponse, -}; diff --git a/src/flyte/_bin/runtime.py b/src/flyte/_bin/runtime.py index 095044b3c..93aa66e1a 100644 --- a/src/flyte/_bin/runtime.py +++ b/src/flyte/_bin/runtime.py @@ -20,7 +20,6 @@ DOMAIN_NAME = "FLYTE_INTERNAL_EXECUTION_DOMAIN" ORG_NAME = "_U_ORG_NAME" ENDPOINT_OVERRIDE = "_U_EP_OVERRIDE" -INSECURE_SKIP_VERIFY_OVERRIDE = "_U_INSECURE_SKIP_VERIFY" RUN_OUTPUT_BASE_DIR = "_U_RUN_BASE" FLYTE_ENABLE_VSCODE_KEY = "_F_E_VS" diff --git a/src/flyte/_internal/controllers/remote/_r_controller.py b/src/flyte/_internal/controllers/remote/_r_controller.py index dda07563d..0cc8e9eab 100644 --- a/src/flyte/_internal/controllers/remote/_r_controller.py +++ b/src/flyte/_internal/controllers/remote/_r_controller.py @@ -17,7 +17,7 @@ import flyte.storage as storage from flyte._code_bundle import build_pkl_bundle from flyte._context import internal_ctx -from flyte._internal.controllers import TraceInfo +from flyte._internal.controllers import TaskCallSequencer, TraceInfo from flyte._internal.runtime import convert, io from flyte._internal.runtime.task_serde import translate_task_to_wire from flyte._internal.runtime.types_serde import transform_native_to_typed_interface @@ -147,9 +147,7 @@ def __init__( self._parent_action_semaphore: DefaultDict[str, asyncio.Semaphore] = defaultdict( lambda: asyncio.Semaphore(default_parent_concurrency) ) - self._parent_action_task_call_sequence: DefaultDict[str, DefaultDict[int, int]] = defaultdict( - lambda: defaultdict(int) - ) + self._sequencer = TaskCallSequencer() self._submit_loop: asyncio.AbstractEventLoop | None = None self._submit_thread: threading.Thread | None = None @@ -158,19 +156,10 @@ def generate_task_call_sequence(self, task_obj: object, action_id: ActionID) -> Generate a task call sequence for the given task object and action ID. This is used to track the number of times a task is called within an action. """ - uniq = unique_action_name(action_id) - current_action_sequencer = self._parent_action_task_call_sequence[uniq] - current_task_id = id(task_obj) - v = current_action_sequencer[current_task_id] - new_seq = v + 1 - current_action_sequencer[current_task_id] = new_seq - name = "" - if hasattr(task_obj, "__name__"): - name = task_obj.__name__ - elif hasattr(task_obj, "name"): - name = task_obj.name - logger.info(f"For action {uniq}, task {name} call sequence is {new_seq}") - return new_seq + action_key = unique_action_name(action_id) + seq = self._sequencer.next_seq(task_obj, action_key) + logger.info(f"For action {action_key}, task call sequence is {seq}") + return seq async def _submit(self, _task_call_seq: int, _task: TaskTemplate, *args, **kwargs) -> Any: ctx = internal_ctx() @@ -282,7 +271,7 @@ async def _submit(self, _task_call_seq: int, _task: TaskTemplate, *args, **kwarg logger.warning( f"Action {n_action_id_pb.name} was aborted, aborting current Action {current_action_id.name}" ) - raise flyte.errors.RunAbortedError( + raise flyte.errors.ActionAbortedError( f"Action {n_action_id_pb.name} was aborted, aborting current Action {current_action_id.name}" ) @@ -402,7 +391,7 @@ async def finalize_parent_action(self, action_id: ActionID): ) await super().finalize_parent_action(run_id_bytes=run_id.SerializeToString(), parent_action_name=action_id.name) self._parent_action_semaphore.pop(unique_action_name(action_id), None) - self._parent_action_task_call_sequence.pop(unique_action_name(action_id), None) + self._sequencer.clear(unique_action_name(action_id)) async def get_action_outputs( self, _interface: NativeInterface, _func: Callable, *args, **kwargs diff --git a/uv.lock b/uv.lock index 875e8bb2e..ccdfee6df 100644 --- a/uv.lock +++ b/uv.lock @@ -955,6 +955,7 @@ dependencies = [ { name = "click" }, { name = "cloudpickle" }, { name = "docstring-parser" }, + { name = "flyte-controller-base" }, { name = "flyteidl2" }, { name = "fsspec" }, { name = "grpcio" }, @@ -1032,7 +1033,8 @@ requires-dist = [ { name = "deltalake", marker = "extra == 'examples-test'" }, { name = "docstring-parser", specifier = ">=0.16" }, { name = "fastapi", marker = "extra == 'examples-test'" }, - { name = "flyteidl2", specifier = "==2.0.2" }, + { name = "flyte-controller-base", directory = "rs_controller" }, + { name = "flyteidl2", specifier = "==2.0.6" }, { name = "fsspec", specifier = ">=2025.3.0" }, { name = "grpcio", specifier = ">=1.71.0" }, { name = "grpcio-health-checking", marker = "extra == 'connector'" }, @@ -1083,9 +1085,20 @@ dev = [ { name = "textual", specifier = ">=0.80" }, ] +[[package]] +name = "flyte-controller-base" +version = "2.0.0b57.dev45+g99214408.dirty" +source = { directory = "rs_controller" } +dependencies = [ + { name = "flyteidl2" }, +] + +[package.metadata] +requires-dist = [{ name = "flyteidl2", specifier = "==2.0.6" }] + [[package]] name = "flyteidl2" -version = "2.0.2" +version = "2.0.6" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "googleapis-common-protos" }, @@ -1094,7 +1107,7 @@ dependencies = [ { name = "protovalidate" }, ] wheels = [ - { url = "https://files.pythonhosted.org/packages/99/17/66e2a06b8938b870de983b52ee78d430daf3b5df8a574b5c95293d3c66c7/flyteidl2-2.0.2-py3-none-any.whl", hash = "sha256:76651068492b1926dac6c095e4307b49a7251d915310857fb32da39d33d08d81", size = 254198, upload-time = "2026-02-04T22:59:30.97Z" }, + { url = "https://files.pythonhosted.org/packages/8e/a6/2bd845fd31af511db345a05d3fa5f05d90ea243afc75778bf1466d1dd6bd/flyteidl2-2.0.6-py3-none-any.whl", hash = "sha256:de0dc3d34fb5ff0bbe128d6b5808fd2f51a8dcdbc62f0562eb35baca5fa413e9", size = 259645, upload-time = "2026-02-14T01:32:54.989Z" }, ] [[package]]