From b511f9bf2b008ef6b8deeb95487689e4953c8650 Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Wed, 16 Oct 2024 23:45:22 -0700 Subject: [PATCH 01/10] try pandas 2.2.2 --- core/amber/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/amber/requirements.txt b/core/amber/requirements.txt index 679d7f7086b..e7cb9882968 100644 --- a/core/amber/requirements.txt +++ b/core/amber/requirements.txt @@ -1,6 +1,6 @@ wheel==0.41.2 numpy==1.26.4 -pandas==1.5.3 +pandas==2.2.2 flake8==7.1.1 black==24.3.0 iniconfig==1.1.1 From 7d796fc000056d2998a1123fd7a13736d46b53a7 Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Wed, 16 Oct 2024 23:50:53 -0700 Subject: [PATCH 02/10] python-dateutil==2.8.2 --- core/amber/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/amber/requirements.txt b/core/amber/requirements.txt index e7cb9882968..e3987cb822a 100644 --- a/core/amber/requirements.txt +++ b/core/amber/requirements.txt @@ -7,7 +7,7 @@ iniconfig==1.1.1 loguru==0.7.0 pyarrow==14.0.1 pytest==7.4.0 -python-dateutil==2.8.1 +python-dateutil==2.8.2 pytest-timeout==2.2.0 protobuf==3.20.3 betterproto==2.0.0b3 From 721af60a58ae4a3e01dbb5e2c85f284c137bb645 Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:02:08 -0700 Subject: [PATCH 03/10] test --- core/amber/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/amber/requirements.txt b/core/amber/requirements.txt index e3987cb822a..276240600a7 100644 --- a/core/amber/requirements.txt +++ b/core/amber/requirements.txt @@ -1,13 +1,13 @@ wheel==0.41.2 numpy==1.26.4 -pandas==2.2.2 +pandas==2.0.0 flake8==7.1.1 black==24.3.0 iniconfig==1.1.1 loguru==0.7.0 pyarrow==14.0.1 pytest==7.4.0 -python-dateutil==2.8.2 +python-dateutil==2.8.1 pytest-timeout==2.2.0 protobuf==3.20.3 betterproto==2.0.0b3 From 71ca1686e57ca8aaac9313b22dfedb31b5b7b088 Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:08:09 -0700 Subject: [PATCH 04/10] test --- core/amber/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/amber/requirements.txt b/core/amber/requirements.txt index 276240600a7..aa95ce6b04f 100644 --- a/core/amber/requirements.txt +++ b/core/amber/requirements.txt @@ -7,7 +7,7 @@ iniconfig==1.1.1 loguru==0.7.0 pyarrow==14.0.1 pytest==7.4.0 -python-dateutil==2.8.1 +python-dateutil==2.8.2 pytest-timeout==2.2.0 protobuf==3.20.3 betterproto==2.0.0b3 From 0d1bc80e06bf93dbcd29f6abefc45f0050c0a154 Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:14:53 -0700 Subject: [PATCH 05/10] test --- core/amber/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/amber/requirements.txt b/core/amber/requirements.txt index aa95ce6b04f..e3987cb822a 100644 --- a/core/amber/requirements.txt +++ b/core/amber/requirements.txt @@ -1,6 +1,6 @@ wheel==0.41.2 numpy==1.26.4 -pandas==2.0.0 +pandas==2.2.2 flake8==7.1.1 black==24.3.0 iniconfig==1.1.1 From b7f82345faa159ae45aa78d063285516873d5300 Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:20:57 -0700 Subject: [PATCH 06/10] test --- core/amber/src/main/python/core/models/RTableExecutor.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/amber/src/main/python/core/models/RTableExecutor.py b/core/amber/src/main/python/core/models/RTableExecutor.py index f358f1c061a..301d818e7b2 100644 --- a/core/amber/src/main/python/core/models/RTableExecutor.py +++ b/core/amber/src/main/python/core/models/RTableExecutor.py @@ -60,6 +60,9 @@ def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike] ) output_pyarrow_table = rarrow_to_py_table(output_rarrow_table) + if output_pyarrow_table.num_rows == 0: + return [] + for field_accessor in ArrowTableTupleProvider(output_pyarrow_table): yield Tuple( {name: field_accessor for name in output_pyarrow_table.column_names} From 703a23ab678fff6e61148c8e5e84fa3f34d0389d Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:03:44 -0700 Subject: [PATCH 07/10] test --- core/amber/requirements.txt | 2 +- core/amber/src/main/python/core/models/RTableExecutor.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/amber/requirements.txt b/core/amber/requirements.txt index e3987cb822a..543d412e24f 100644 --- a/core/amber/requirements.txt +++ b/core/amber/requirements.txt @@ -1,6 +1,6 @@ wheel==0.41.2 numpy==1.26.4 -pandas==2.2.2 +pandas==2.2.1 flake8==7.1.1 black==24.3.0 iniconfig==1.1.1 diff --git a/core/amber/src/main/python/core/models/RTableExecutor.py b/core/amber/src/main/python/core/models/RTableExecutor.py index 301d818e7b2..9556e80b2d7 100644 --- a/core/amber/src/main/python/core/models/RTableExecutor.py +++ b/core/amber/src/main/python/core/models/RTableExecutor.py @@ -60,8 +60,8 @@ def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike] ) output_pyarrow_table = rarrow_to_py_table(output_rarrow_table) - if output_pyarrow_table.num_rows == 0: - return [] + # if output_pyarrow_table.num_rows == 0: + # return [] for field_accessor in ArrowTableTupleProvider(output_pyarrow_table): yield Tuple( From a374412097930b0a86789bba5aaeb323677aaabe Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:09:16 -0700 Subject: [PATCH 08/10] Update requirements.txt --- core/amber/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/amber/requirements.txt b/core/amber/requirements.txt index 543d412e24f..97658e4acb1 100644 --- a/core/amber/requirements.txt +++ b/core/amber/requirements.txt @@ -1,6 +1,6 @@ wheel==0.41.2 numpy==1.26.4 -pandas==2.2.1 +pandas==2.1.4 flake8==7.1.1 black==24.3.0 iniconfig==1.1.1 From e9e2f20c439dea90e866746ac4c6ea10269b3fb0 Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Thu, 17 Oct 2024 10:19:26 -0700 Subject: [PATCH 09/10] test --- core/amber/requirements.txt | 2 +- core/amber/src/main/python/core/models/RTableExecutor.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/amber/requirements.txt b/core/amber/requirements.txt index 97658e4acb1..e3987cb822a 100644 --- a/core/amber/requirements.txt +++ b/core/amber/requirements.txt @@ -1,6 +1,6 @@ wheel==0.41.2 numpy==1.26.4 -pandas==2.1.4 +pandas==2.2.2 flake8==7.1.1 black==24.3.0 iniconfig==1.1.1 diff --git a/core/amber/src/main/python/core/models/RTableExecutor.py b/core/amber/src/main/python/core/models/RTableExecutor.py index 9556e80b2d7..301d818e7b2 100644 --- a/core/amber/src/main/python/core/models/RTableExecutor.py +++ b/core/amber/src/main/python/core/models/RTableExecutor.py @@ -60,8 +60,8 @@ def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike] ) output_pyarrow_table = rarrow_to_py_table(output_rarrow_table) - # if output_pyarrow_table.num_rows == 0: - # return [] + if output_pyarrow_table.num_rows == 0: + return [] for field_accessor in ArrowTableTupleProvider(output_pyarrow_table): yield Tuple( From 9ee213c68bd2d52744193bc852030824e8c50d2d Mon Sep 17 00:00:00 2001 From: mengw15 <125719918+mengw15@users.noreply.github.com> Date: Wed, 23 Oct 2024 21:21:14 -0700 Subject: [PATCH 10/10] revert --- core/amber/src/main/python/core/models/RTableExecutor.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/amber/src/main/python/core/models/RTableExecutor.py b/core/amber/src/main/python/core/models/RTableExecutor.py index 301d818e7b2..f358f1c061a 100644 --- a/core/amber/src/main/python/core/models/RTableExecutor.py +++ b/core/amber/src/main/python/core/models/RTableExecutor.py @@ -60,9 +60,6 @@ def process_table(self, table: Table, port: int) -> Iterator[Optional[TableLike] ) output_pyarrow_table = rarrow_to_py_table(output_rarrow_table) - if output_pyarrow_table.num_rows == 0: - return [] - for field_accessor in ArrowTableTupleProvider(output_pyarrow_table): yield Tuple( {name: field_accessor for name in output_pyarrow_table.column_names}