Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
import org.apache.beam.it.common.PipelineOperator;
import org.apache.beam.it.common.PipelineOperator.Config;
import org.apache.beam.it.common.TestProperties;
import org.apache.beam.it.common.utils.IORedirectUtil;
import org.apache.beam.it.common.utils.PipelineUtils;
import org.apache.beam.it.gcp.artifacts.utils.ArtifactUtils;
import org.apache.beam.it.gcp.dataflow.ClassicTemplateClient;
Expand Down Expand Up @@ -364,11 +363,35 @@ private String getSpecPath(
LOG.info("Running command to stage templates: {}", String.join(" ", mavenCmd));

try {
Process exec = Runtime.getRuntime().exec(mavenCmd);

if (exec.waitFor() != 0) {
IORedirectUtil.redirectLinesLog(exec.getInputStream(), LOG);
IORedirectUtil.redirectLinesLog(exec.getErrorStream(), LOG);
ProcessBuilder pb = new ProcessBuilder(mavenCmd);
pb.redirectErrorStream(true);
Process exec = pb.start();

List<String> outputLines = Collections.synchronizedList(new ArrayList<>());
Thread streamReaderThread =
new Thread(
() -> {
try (java.io.BufferedReader reader =
new java.io.BufferedReader(
new java.io.InputStreamReader(exec.getInputStream(), UTF_8))) {
String line;
while ((line = reader.readLine()) != null) {
outputLines.add(line);
}
} catch (IOException e) {
LOG.error("Error reading process output", e);
}
});
streamReaderThread.start();

int exitCode = exec.waitFor();
streamReaderThread.join();

if (exitCode != 0) {
LOG.error("Error staging template, check Maven logs below:");
for (String line : outputLines) {
LOG.error(line);
}
throw new RuntimeException("Error staging template, check Maven logs.");
}

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<jacoco.version>0.8.13</jacoco.version>

<!-- Beam and linked versions -->
<beam.version>2.73.0</beam.version>
<beam-python.version>2.73.0</beam-python.version>
<beam-maven-repo></beam-maven-repo>
<beam.version>2.74.0</beam.version>
<beam-python.version>2.74.0</beam-python.version>
<beam-maven-repo>https://repository.apache.org/content/repositories/orgapachebeam-1431</beam-maven-repo>

<!-- Common dependency versions -->
<autovalue.version>1.10.4</autovalue.version>
Expand Down Expand Up @@ -956,7 +956,7 @@
<profile>
<id>validateCandidate</id>
<activation>
<activeByDefault>false</activeByDefault>
<jdk>[1.)</jdk>
</activation>
<repositories>
<repository>
Expand Down
2 changes: 1 addition & 1 deletion python/default_base_bqmonitor_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
apache-beam[gcp]
apache-beam[gcp]==2.74.0rc3
google-cloud-bigquery-storage
setuptools
2 changes: 1 addition & 1 deletion python/default_base_python_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
apache-beam[gcp]
apache-beam[gcp]==2.74.0rc3
setuptools
2 changes: 1 addition & 1 deletion python/default_base_yaml_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
apache-beam[dataframe,gcp,test,yaml,aws]
apache-beam[dataframe,gcp,test,yaml,aws]==2.74.0rc3
setuptools
job-builder-util-transforms @ https://storage.googleapis.com/dataflow-templates/extra-python-packages/2026-05-02/job_builder_util_transforms-0.1.1.tar.gz
499 changes: 237 additions & 262 deletions python/src/main/python/bigquery-anomaly-detection/requirements_all.txt

Large diffs are not rendered by default.

949 changes: 469 additions & 480 deletions python/src/main/python/job-builder-server/requirements.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion python/src/main/python/streaming-llm/base_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apache-beam[gcp]
apache-beam[gcp]==2.74.0rc3
torch
transformers
torchvision
Expand Down
131 changes: 101 additions & 30 deletions python/src/main/python/streaming-llm/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --allow-unsafe --generate-hashes --output-file=python/../python/src/main/python/streaming-llm/requirements.txt python/../python/src/main/python/streaming-llm/base_requirements.txt
# pip-compile --allow-unsafe --generate-hashes --output-file=./python/../python/src/main/python/streaming-llm/requirements.txt ./python/../python/src/main/python/streaming-llm/base_requirements.txt
#

aiofiles==25.1.0 \
--hash=sha256:a8d728f0a29de45dc521f18f07297428d56992a742f0cd2701ba86e44d23d5b2 \
--hash=sha256:abe311e527c862958650f9438e859c1fa7568a141b22abcd015e120e86a85695
Expand Down Expand Up @@ -173,28 +174,33 @@ anyio==4.13.0 \
# via
# google-genai
# httpx
apache-beam[gcp]==2.72.0 \
--hash=sha256:0674cb64ea27290b2303d3348125e244ba0fc551a94fc061775dc6a8ee3cd26d \
--hash=sha256:06e3ec4cbf97b4c5a8c6e73823cee6d85b87d47c6edb485e8b6ed18a8886e836 \
--hash=sha256:178d6fcc84e7ce1448adaaa0d6583e8467a12bd4d3556c30289f361aacc9e3a9 \
--hash=sha256:2c9dd7d5730c0fd97ae33ddc4912d126c62043b2936dea80ec1023da203a1e2d \
--hash=sha256:2d44e2ff6b40ce447fd23e9d3d02429647b5bbbe14574198b4870be66ca0dace \
--hash=sha256:3c3a260948fd60684747e8b68ea482eaa6eb06cdae7c723e9385ee91c093dbce \
--hash=sha256:4470453c76b2d86558e916b86cfa0e5dc9d0d525ad12d680e5684aa8226c77c7 \
--hash=sha256:4be89be9c916cf8c25184ea84d0e3fe2d950a2e9fa92f360b7f49bdbd3176553 \
--hash=sha256:4e2b13e6e19b044c23f2800269f59c902bf569f5cecc892e9040efde1fd52b78 \
--hash=sha256:517758c7dfcbade1f580822a9371aa626df0b93adbede6f605c12e82707961a2 \
--hash=sha256:6ec591e09d125c93ae0c0286cdc1fe21f6c2f6b0fed7090704e1f9a3ea54af63 \
--hash=sha256:6f1097ff9969276f35dd31b2247f06dd844510be3f93d5370fb6237eae462d4e \
--hash=sha256:7608878eecde0cc023df26a15960c0e6ae2546bd9f7cb197b66417a51a846517 \
--hash=sha256:8138c8772803c432e3218a3dee5190feece4a7216883a0ec42cc71476db080ac \
--hash=sha256:818fa1625b4b5fa12852f7a347982d978b19146ca13c06a2b1bc5f96a91ccc45 \
--hash=sha256:a5c1688894f7dd60da68111168d0abdb3a997c9277ae1ca0f5692b32f3205bd7 \
--hash=sha256:c9b1c13f081aed2e1c7c411827d6d3c3cc6ffc9aa0c0445fe5e132de1d20071a \
--hash=sha256:ccb2647dce66f7820bb7baf8dee4424ab11b36c14bdf5c4b7c5635c4464a54c4 \
--hash=sha256:cdb8fa6c08c8dea0ad1f9e7d8b36b99f6dd3c49f58c12cc0dcb44f8c912b811b \
--hash=sha256:d0230a274a0db161fc6bff52f2887ecfe777717f43c925c4bc161f805191d21c \
--hash=sha256:eab8631b15e0015cd9125e6a3648d0d6960ddda0f6a18b4bd62b9ad72153b6ff
apache-beam[gcp]==2.74.0rc3 \
--hash=sha256:15d3c1f6328ce10c7579dec7a8705af95951b39f30649e92a4e4e05e1836a088 \
--hash=sha256:18a50923e997a0f54edd725293ac1d07d8cf5b0091056632221eb1f647a794eb \
--hash=sha256:18dba88d97a87bf92d797b6511f7d582acb244be794d56a1e8b43c0200133ca5 \
--hash=sha256:35ac1684d4fe168eb1857d7b3a61da7ba029f71a01febae06a4add722084cba9 \
--hash=sha256:3c0d96f05312b83583a3a0bd261b3da91b1161274b88b7a4785b8c3d53f82c20 \
--hash=sha256:4015cf2a4e412b371c39359e51ba23be0a8f52cb0359aaa1e8965e6c356cb68e \
--hash=sha256:41861bb580ca9d3171b8a4ee36a21d71ec4fcea2ae3a820cb34812cf6f0f89d3 \
--hash=sha256:430e014ffff60c41acfd29b6d63b4a9375530c3288673e405f37e6a55b358101 \
--hash=sha256:464d34184dfffab9d3f0b010842d2d005c204fea6f70259ba840464c5c2c4ecf \
--hash=sha256:563cf799f1a1ec0dfe949555c34e7fb74da1318f81e6717ea8993f7978453612 \
--hash=sha256:5a7d3e27881a6200914dbd538e09f6b16c3a276178e122bf4a9ca6839e54fb28 \
--hash=sha256:5c081145f9e0c1b29f5914807fe5e74c06f2f4bcabb73422742ed7f26cf29677 \
--hash=sha256:6ed691b9dcd988f21d733d947a43d24302febf9c8667a5d7b42c35eae3175372 \
--hash=sha256:74034695cd98ad6541ba4a89815f8b341bf3b67ee2be19eda16d7b24fa73528a \
--hash=sha256:87d0ef03f75265e1053f02549e160ddb387e58cad32ff223806676994426d789 \
--hash=sha256:8bbfc4db0f2b3627d0591e6acfa7d590eb279b4303743cf5a0b86ecd3c52781d \
--hash=sha256:8c51102bb5126c80013ab8efb9eb85a8833b0d931e12af236a65a4444e52a9d5 \
--hash=sha256:8c83575230a773972eb7f7b8beaf6e0f64bd6d9d25061bf263e3f006a51c8666 \
--hash=sha256:98219aea0e8d12cba4746a092843c4df8c532c9ba7033e220d4720c352e0484a \
--hash=sha256:a620d9b0718380ba22e623842202333f8dec92af4dd390a8a6cecfc3e66ccb38 \
--hash=sha256:c2fc46ead1b57136af8ccbe1a44b6eea88c0a48f4f28e5547326c06509d14104 \
--hash=sha256:c5cd45de690b602c65b6220bb1083af682fe9ba5150d3c546536adb31b5dac59 \
--hash=sha256:cdd770f1052d0cf6ec87b630e1147d5d96c1262130035e4cf29cd82c61e89fe0 \
--hash=sha256:d7c668fd51f08f751250e518abf4fdb5ff6384284253d26d6ff0dfadb3b04e17 \
--hash=sha256:e3081ff0dd0f7b394fc5650d3f0cd53ecc8c36ed5819c832879ec1ff4f80d98c \
--hash=sha256:f125f5d9dbf67ffe727fb308fa732b155eb7f6a1c15a9602b57d18224d5ad65d
# via -r python/../python/src/main/python/streaming-llm/base_requirements.txt
asn1crypto==1.5.1 \
--hash=sha256:13ae38502be632115abf8a24cbe5f4da52e3b5231990aff31123c805306ccb9c \
Expand All @@ -212,9 +218,9 @@ beartype==0.22.9 \
--hash=sha256:8f82b54aa723a2848a56008d18875f91c1db02c32ef6a62319a002e3e25a975f \
--hash=sha256:d16c9bbc61ea14637596c5f6fbff2ee99cbe3573e46a716401734ef50c3060c2
# via apache-beam
betterproto==2.0.0b7 \
--hash=sha256:1b1458ca5278d519bcd62556a4c236f998a91d503f0f71c67b0b954747052af2 \
--hash=sha256:401ab8055e2f814e77b9c88a74d0e1ae3d1e8a969cced6aeb1b59f71ad63fbd2
betterproto==2.0.0b6 \
--hash=sha256:720ae92697000f6fcf049c69267d957f0871654c8b0d7458906607685daee784 \
--hash=sha256:a0839ec165d110a69d0d116f4d0e2bec8d186af4db826257931f0831dab73fcf
# via envoy-data-plane
cachetools==6.2.6 \
--hash=sha256:16c33e1f276b9a9c0b49ab5782d901e3ad3de0dd6da9bf9bcd29ac5672f2f9e6 \
Expand Down Expand Up @@ -547,9 +553,9 @@ docstring-parser==0.17.0 \
--hash=sha256:583de4a309722b3315439bb31d64ba3eebada841f2e2cee23b99df001434c912 \
--hash=sha256:cf2569abd23dce8099b300f9b4fa8191e9582dda731fd533daf54c4551658708
# via google-cloud-aiplatform
envoy-data-plane==0.2.6 \
--hash=sha256:6341768b9cf5d6268baced4d2e8b3429f98664fbbe8958dae69ee25316ae869a \
--hash=sha256:d1541c8cd00677886a2f93696edf9e3589cd4ac680defc66b3013ffb082f274c
envoy-data-plane==1.0.3 \
--hash=sha256:2eabfe0a98e3cf509c13c80798b93d94992a5ba436a4cdd3b5f805f50f40558f \
--hash=sha256:5244abb443435e312dbc42657606795071e4c4adeb3aa5779a689facb1a8e77f
# via apache-beam
fastavro==1.12.1 \
--hash=sha256:00650ca533907361edda22e6ffe8cf87ab2091c5d8aee5c8000b0f2dcdda7ed3 \
Expand Down Expand Up @@ -1048,12 +1054,76 @@ grpcio==1.80.0 \
# grpc-google-iam-v1
# grpc-interceptor
# grpcio-status
# grpcio-tools
grpcio-status==1.80.0 \
--hash=sha256:4b56990363af50dbf2c2ebb80f1967185c07d87aa25aa2bea45ddb75fc181dbe \
--hash=sha256:df73802a4c89a3ea88aa2aff971e886fccce162bc2e6511408b3d67a144381cd
# via
# google-api-core
# google-cloud-pubsub
grpcio-tools==1.80.0 \
--hash=sha256:017945c3e98a4ed1c4e21399781b4137fc08dfc1f802c8ace2e64ef52d32b142 \
--hash=sha256:12f950470449dbeec78317dbc090add7a00eb6ca812af7b0538ab7441e0a42c3 \
--hash=sha256:13f60f8d9397c514c6745a967d22b5c8c698347e88deebca1ff2e1b94555e450 \
--hash=sha256:1816e8e512402ed0b3fe4a336aaff14f9cb42455aa88fa86f754d53973668bd6 \
--hash=sha256:1872a867eb6217de19edb70a4ce4a374ced9d94293533dfd42fa649713f55bf4 \
--hash=sha256:18c51e07652ac7386fcdbd11866f8d55a795de073337c12447b5805575339f74 \
--hash=sha256:1ba1ffbf2cff71533615e2c5a138ed5569611eec9ae7f9c67b8898e127b54ac0 \
--hash=sha256:1c43e5c768578fe0c6de3dbfaabe64af642951e1aa05c487cacedda63fa6c6c4 \
--hash=sha256:25742de5958ae4325249a37e724e7c0e5120f8e302a24a977ebd1737b48a5e97 \
--hash=sha256:258bc30654a9a2236be4ca8e2ad443e2ac6db7c8cc20454d34cce60265922726 \
--hash=sha256:26052b19c6ce0dcf52d1024496aea3e2bdfa864159f06dc7b97b22d041a94b26 \
--hash=sha256:31fd01a4038b5dfc4ec79504a17061344f670f851833411717fef66920f13cd7 \
--hash=sha256:3399b5fd7b59bcffd59c6b9975a969d9f37a3c87f3e3d63c3a09c147907acb0d \
--hash=sha256:3954b5d07ac19d752ee70c7d63ee0ba0f9a840c33e042decf355f04b1ff41d93 \
--hash=sha256:3db830eaff1f2c2797328f2fa86c9dcdbd7d81af573a68db81e27afa2182a611 \
--hash=sha256:3e8dcfebe34cb54df095de3d5871a4562a85a29f26d0f8bb41ee2c3dcfb11c3c \
--hash=sha256:4534022e4d5dd3d7d2183ff5846bf950cbaf889af0ea5290f94212001f7cad84 \
--hash=sha256:4c615f3b5c6f7e8e0b06f60e3fa9cebf88372296255268db9e9a23e72bb698bf \
--hash=sha256:51caf99c28999e7e0f97e9cea190c1405b7681a57bb2e0631205accd92b43fa4 \
--hash=sha256:526b4402d47a0e9b31cd6087e42b7674784617916cc73c764e0bc35ed41b4ee5 \
--hash=sha256:57da9e19607fac4a01c48ead333c0dd15d91ed38794dce1194eda308f73e2038 \
--hash=sha256:5de4eb2d08bddeee28265c10369934b2d23b8c4acc39d419ee6a58afe34d754f \
--hash=sha256:623ee31fc2ff7df9a987b4f3d139c30af17ce46a861ae0e25fb8c112daa32dd8 \
--hash=sha256:6451b3f4eb52d12c7f32d04bf8e0185f80521f3f088ad04b8d222b3a4819c71e \
--hash=sha256:6a35a73042dc4bbcdd7aafc141ee9966c8ae97bf4b9f0f49e10e3e1aa54139ac \
--hash=sha256:6c129da370c5f85f569be2e545317dda786a60dd51d7deea29b03b0c05f6aac3 \
--hash=sha256:6c6ce08167fd77fa057dc44fea8501c66d108eeef536073dba55c8fd3684c7a9 \
--hash=sha256:727477b9afa4b53f5ec70cafb41c3965d893835e0d4ea9b542fe3d0d005602bf \
--hash=sha256:75f00450e08fe648ad8a1eeb25bc52219679d54cdd02f04dfdddc747309d83f6 \
--hash=sha256:7843b9ac6ff8ca508424d0dd968bd9a1a4559967e4a290f26be5bd6f04af2234 \
--hash=sha256:797c08460cae16b402326eac329aec720dccf45c9f9279b95a352792eb53cf0f \
--hash=sha256:7982b5fe42f012686b667dda12916884de95c4b1c65ff64371fb7232a1474b23 \
--hash=sha256:7a0106af212748823a6ebd8ffbd9043414216f47cae3835f3187de0a62c415d3 \
--hash=sha256:85fe8d15f146c62cb76f38d963e256392d287442b9232717d30ae9e3bbda9bc3 \
--hash=sha256:865a2b8e6334c838976ab02a322cbd55c863d2eaf3c1e1a0255883c63996772a \
--hash=sha256:88d77bad5dd3cd5e6f952c4ecdd0ee33e0c02ecfc2e4b0cbee3391ac19e0a431 \
--hash=sha256:90968f751851abb8b145593609800fa70c837e1c93ba0792c480b1c8d8bc29ef \
--hash=sha256:95f0fffb5ca00519f3b602f938169b4dfa04b165e03258323965a9dfe8cc4d80 \
--hash=sha256:970ec058fa469dd6dae6ebc687501c5da670d95dead75f62f5b0933dce2c9794 \
--hash=sha256:9a765334d3080d147ecf7b8ab04900e56108f6457dde0a3ba7f68c270f9d6efc \
--hash=sha256:9c6abc08d3485b2aac99bb58afcd31dc6cd4316ce36cf263ff09cb6df15f287f \
--hash=sha256:a225348456575f3ac7851d8e23163195e76d2a905ee340cf73f33da62fba08aa \
--hash=sha256:a33e265d4db803495007a6c623eafb0f6b9bb123ff4a0af89e44567dad809b88 \
--hash=sha256:a447f28958a8fe84ff0d9d3d9473868feb27ee4a9c9c805e66f5b670121cec59 \
--hash=sha256:a9396f02820d3f51c368c2c9dee15c55c77636c91be48a4d5c702e98d6fe0fdc \
--hash=sha256:ac6fdd42d5bb18f0d903a067e2825be172deff70cf197164b6f65676cb506c9b \
--hash=sha256:b46570a68378539ee2b75a5a43202561f8d753c832798b1047099e3c551cf5d6 \
--hash=sha256:b69dc5d6376ab43406304d1e2fc61ccf960b287d4325d77c3d45448c37a9d2da \
--hash=sha256:bbf8eeef78fda1966f732f79c1c802fadd5cfd203d845d2af4d314d18569069c \
--hash=sha256:c18def9c38d36767946932d2cc7baf39dcae5fea5a02843ea34399871f981a09 \
--hash=sha256:cdaa1c9aa8d3a87891a96700cadd29beec214711d6522818d207277f6452567c \
--hash=sha256:d19d5a8244311947b96f749c417b32d144641c6953f1164824579e1f0a51d040 \
--hash=sha256:d3f9a376a29c9adf62bb56f7ff5bc81eb4abeaf53d1e7dde5015564832901a51 \
--hash=sha256:db122ba5ee357e3bb14e8944d69bbebcbdae91d5eace29ed4df3edc53cbc6528 \
--hash=sha256:ddefd48c227e6f4d640fe576fac5fb2c4a8898196f513604c8ec7671b3b3d421 \
--hash=sha256:e3b6d09f87eb87a8cab58f7e99cae3551467f51b2bcbab17a2fe931e94e7efef \
--hash=sha256:e7046837859bbfd10b01786056145480155c16b222c9e209215b68d3be13060e \
--hash=sha256:ee101ecda7231770f6a5da1024a9a6ed587a7785f8fe23ab8283f4a1acb3ffe6 \
--hash=sha256:f760ac1722f33e774814c37b6aa0444143f612e85088ead7447a0e9cd306a1f1 \
--hash=sha256:fb599a3dc89ed1bb24489a2724b2f6dd4cddbbf0f7bdd69c073477bab0dc7554 \
--hash=sha256:fc622ed4ca400695f41c9eae3266276c6ba007e4c28164ce53b44e7ccc5e492b
# via envoy-data-plane
grpclib==0.4.9 \
--hash=sha256:7762ec1c8ed94dfad597475152dd35cbd11aecaaca2f243e29702435ca24cf0e \
--hash=sha256:cc589c330fa81004c6400a52a566407574498cb5b055fa927013361e21466c46
Expand Down Expand Up @@ -2107,6 +2177,7 @@ protobuf==6.33.6 \
# googleapis-common-protos
# grpc-google-iam-v1
# grpcio-status
# grpcio-tools
# proto-plus
pyarrow==23.0.1 \
--hash=sha256:00be9576d970c31defb5c32eb72ef585bf600ef6d0a82d5eccaae96639cf9d07 \
Expand Down Expand Up @@ -2819,7 +2890,6 @@ typing-extensions==4.15.0 \
# aiosignal
# anyio
# apache-beam
# betterproto
# google-cloud-aiplatform
# google-genai
# grpcio
Expand Down Expand Up @@ -3145,5 +3215,6 @@ setuptools==81.0.0 \
--hash=sha256:fdd925d5c5d9f62e4b74b30d6dd7828ce236fd6ed998a08d81de62ce5a6310d6
# via
# -r python/../python/src/main/python/streaming-llm/base_requirements.txt
# grpcio-tools
# torch

Loading
Loading