From 4d59adacd9677cd0aea824ad052baa52a3bff62e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Dec 2025 05:29:31 +0000 Subject: [PATCH 1/4] chore(deps): bump protobuf from 3.20.3 to 4.25.8 in /amber Bumps [protobuf](https://github.com/protocolbuffers/protobuf) from 3.20.3 to 4.25.8. - [Release notes](https://github.com/protocolbuffers/protobuf/releases) - [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.20.3...v4.25.8) --- updated-dependencies: - dependency-name: protobuf dependency-version: 4.25.8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- amber/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amber/requirements.txt b/amber/requirements.txt index 7e2c5304ec6..9b3b19ce59c 100644 --- a/amber/requirements.txt +++ b/amber/requirements.txt @@ -27,7 +27,7 @@ pyarrow==21.0.0 pytest==7.4.0 python-dateutil==2.8.2 pytest-timeout==2.2.0 -protobuf==3.20.3 +protobuf==4.25.8 betterproto==2.0.0b7 typing==3.7.4.3 pampy==0.3.0 From bf09eddef660d129fc856532ebf369465a7d1872 Mon Sep 17 00:00:00 2001 From: Yicong-Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Tue, 2 Dec 2025 10:44:52 -0800 Subject: [PATCH 2/4] fix: update proto-gen script --- bin/python-proto-gen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/python-proto-gen.sh b/bin/python-proto-gen.sh index c049fcbbfc2..0faf33eb9b7 100755 --- a/bin/python-proto-gen.sh +++ b/bin/python-proto-gen.sh @@ -23,7 +23,7 @@ AMBER_DIR="$TEXERA_HOME/amber" PYAMBER_DIR="$AMBER_DIR/src/main/python" PROTOBUF_AMBER_DIR="$AMBER_DIR/src/main/protobuf" -CORE_DIR="$TEXERA_HOME/core/workflow-core" +CORE_DIR="$TEXERA_HOME/common/workflow-core" PROTOBUF_CORE_DIR="$CORE_DIR/src/main/protobuf" # proto-gen From ab789eaf858cc00de6073ab1edac22d336efba2c Mon Sep 17 00:00:00 2001 From: Yicong-Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Tue, 2 Dec 2025 10:45:20 -0800 Subject: [PATCH 3/4] fix: update genereated python protobuf files --- amber/src/main/python/proto/__init__.py | 16 ---------------- amber/src/main/python/proto/org/__init__.py | 16 ---------------- .../main/python/proto/org/apache/__init__.py | 16 ---------------- .../proto/org/apache/texera/__init__.py | 16 ---------------- .../proto/org/apache/texera/amber/__init__.py | 16 ---------------- .../org/apache/texera/amber/core/__init__.py | 19 +------------------ .../apache/texera/amber/engine/__init__.py | 16 ---------------- .../amber/engine/architecture/__init__.py | 16 ---------------- .../amber/engine/architecture/rpc/__init__.py | 19 +------------------ .../architecture/sendsemantics/__init__.py | 19 +------------------ .../engine/architecture/worker/__init__.py | 19 +------------------ .../texera/amber/engine/common/__init__.py | 19 +------------------ .../src/main/python/proto/scalapb/__init__.py | 17 ----------------- 13 files changed, 5 insertions(+), 219 deletions(-) diff --git a/amber/src/main/python/proto/__init__.py b/amber/src/main/python/proto/__init__.py index 13a83393a91..e69de29bb2d 100644 --- a/amber/src/main/python/proto/__init__.py +++ b/amber/src/main/python/proto/__init__.py @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. diff --git a/amber/src/main/python/proto/org/__init__.py b/amber/src/main/python/proto/org/__init__.py index 13a83393a91..e69de29bb2d 100644 --- a/amber/src/main/python/proto/org/__init__.py +++ b/amber/src/main/python/proto/org/__init__.py @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. diff --git a/amber/src/main/python/proto/org/apache/__init__.py b/amber/src/main/python/proto/org/apache/__init__.py index 13a83393a91..e69de29bb2d 100644 --- a/amber/src/main/python/proto/org/apache/__init__.py +++ b/amber/src/main/python/proto/org/apache/__init__.py @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. diff --git a/amber/src/main/python/proto/org/apache/texera/__init__.py b/amber/src/main/python/proto/org/apache/texera/__init__.py index 13a83393a91..e69de29bb2d 100644 --- a/amber/src/main/python/proto/org/apache/texera/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/__init__.py @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. diff --git a/amber/src/main/python/proto/org/apache/texera/amber/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/__init__.py index 13a83393a91..e69de29bb2d 100644 --- a/amber/src/main/python/proto/org/apache/texera/amber/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/amber/__init__.py @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. diff --git a/amber/src/main/python/proto/org/apache/texera/amber/core/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/core/__init__.py index e6881ed2bd9..35975bc0e6c 100644 --- a/amber/src/main/python/proto/org/apache/texera/amber/core/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/amber/core/__init__.py @@ -1,22 +1,5 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - # Generated by the protocol buffer compiler. DO NOT EDIT! -# sources: org/apache/amber/core/executor.proto, org/apache/amber/core/virtualidentity.proto, org/apache/amber/core/workflow.proto, org/apache/amber/core/workflowruntimestate.proto +# sources: org/apache/texera/amber/core/executor.proto, org/apache/texera/amber/core/virtualidentity.proto, org/apache/texera/amber/core/workflow.proto, org/apache/texera/amber/core/workflowruntimestate.proto # plugin: python-betterproto # This file has been @generated diff --git a/amber/src/main/python/proto/org/apache/texera/amber/engine/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/__init__.py index 13a83393a91..e69de29bb2d 100644 --- a/amber/src/main/python/proto/org/apache/texera/amber/engine/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/__init__.py @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. diff --git a/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/__init__.py index 13a83393a91..e69de29bb2d 100644 --- a/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/__init__.py @@ -1,16 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. diff --git a/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py index 1fc9bf2b5bb..ea6ddc5e43f 100644 --- a/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/rpc/__init__.py @@ -1,22 +1,5 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - # Generated by the protocol buffer compiler. DO NOT EDIT! -# sources: org/apache/amber/engine/architecture/rpc/controlcommands.proto, org/apache/amber/engine/architecture/rpc/controllerservice.proto, org/apache/amber/engine/architecture/rpc/controlreturns.proto, org/apache/amber/engine/architecture/rpc/testerservice.proto, org/apache/amber/engine/architecture/rpc/workerservice.proto +# sources: org/apache/texera/amber/engine/architecture/rpc/controlcommands.proto, org/apache/texera/amber/engine/architecture/rpc/controllerservice.proto, org/apache/texera/amber/engine/architecture/rpc/controlreturns.proto, org/apache/texera/amber/engine/architecture/rpc/testerservice.proto, org/apache/texera/amber/engine/architecture/rpc/workerservice.proto # plugin: python-betterproto # This file has been @generated diff --git a/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/sendsemantics/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/sendsemantics/__init__.py index b8bb7d2fef4..94ed31cce3f 100644 --- a/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/sendsemantics/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/sendsemantics/__init__.py @@ -1,22 +1,5 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - # Generated by the protocol buffer compiler. DO NOT EDIT! -# sources: org/apache/amber/engine/architecture/sendsemantics/partitionings.proto +# sources: org/apache/texera/amber/engine/architecture/sendsemantics/partitionings.proto # plugin: python-betterproto # This file has been @generated diff --git a/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/worker/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/worker/__init__.py index 9c39ccd1739..072e7c8ce65 100644 --- a/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/worker/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/architecture/worker/__init__.py @@ -1,22 +1,5 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - # Generated by the protocol buffer compiler. DO NOT EDIT! -# sources: org/apache/amber/engine/architecture/worker/statistics.proto +# sources: org/apache/texera/amber/engine/architecture/worker/statistics.proto # plugin: python-betterproto # This file has been @generated diff --git a/amber/src/main/python/proto/org/apache/texera/amber/engine/common/__init__.py b/amber/src/main/python/proto/org/apache/texera/amber/engine/common/__init__.py index 35f2958c50a..55c789aa395 100644 --- a/amber/src/main/python/proto/org/apache/texera/amber/engine/common/__init__.py +++ b/amber/src/main/python/proto/org/apache/texera/amber/engine/common/__init__.py @@ -1,22 +1,5 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - # Generated by the protocol buffer compiler. DO NOT EDIT! -# sources: org/apache/amber/engine/common/actormessage.proto, org/apache/amber/engine/common/ambermessage.proto, org/apache/amber/engine/common/executionruntimestate.proto +# sources: org/apache/texera/amber/engine/common/actormessage.proto, org/apache/texera/amber/engine/common/ambermessage.proto, org/apache/texera/amber/engine/common/executionruntimestate.proto # plugin: python-betterproto # This file has been @generated diff --git a/amber/src/main/python/proto/scalapb/__init__.py b/amber/src/main/python/proto/scalapb/__init__.py index 153dd1b07aa..49c713815a5 100644 --- a/amber/src/main/python/proto/scalapb/__init__.py +++ b/amber/src/main/python/proto/scalapb/__init__.py @@ -1,20 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - # Generated by the protocol buffer compiler. DO NOT EDIT! # sources: scalapb/scalapb.proto # plugin: python-betterproto From c904c347e4b3238baff7e5ffb595778372213731 Mon Sep 17 00:00:00 2001 From: Yicong-Huang <17627829+Yicong-Huang@users.noreply.github.com> Date: Tue, 2 Dec 2025 10:45:44 -0800 Subject: [PATCH 4/4] chore: ignore python proto-gen files for license checking --- .licenserc.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.licenserc.yaml b/.licenserc.yaml index 9f2f0823e44..fed8faf136e 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -25,3 +25,4 @@ header: - '.gitignore' - '.licenserc.yaml' - 'frontend/.yarn/**' + - 'amber/src/main/python/proto/**'