maxframe 1.2.0__cp37-cp37m-macosx_10_9_x86_64.whl → 1.2.1__cp37-cp37m-macosx_10_9_x86_64.whl

maxframe/dataframe/datasource/read_odps_query.py

@@ -262,7 +262,7 @@ class DataFrameReadODPSQuery(
     column_renames = DictField("column_renames", default=None)
 
     def get_columns(self):
-        return self.columns
+        return self.columns or list(self.dtypes.index)
 
     def set_pruned_columns(self, columns, *, keep_order=None):  # pragma: no cover
         self.columns = columns

maxframe/dataframe/datasource/tests/test_datasource.py

@@ -364,6 +364,7 @@ def test_from_odps_query():
             index=["col1", "col2", "col3"],
         ),
     )
+    assert df.op.get_columns() == ["col1", "col2", "col3"]
 
     df = read_odps_query(query1, skip_schema=True)
     assert df.dtypes is None
@@ -373,6 +374,7 @@ def test_from_odps_query():
     df = read_odps_query(query1, index_col="col1")
     assert df.op.query == query1
     assert df.index_value.name == "col1"
+    assert df.op.get_columns() == ["col2", "col3"]
     assert isinstance(df.index_value.value, IndexValue.Index)
     pd.testing.assert_series_equal(
         df.dtypes,
@@ -389,6 +391,7 @@ def test_from_odps_query():
     df = read_odps_query(query2, index_col=["col1", "col2"])
     assert df.op.query == query2
     assert df.index_value.names == ["col1", "col2"]
+    assert df.op.get_columns() == ["c31", "c32"]
     assert isinstance(df.index_value.value, IndexValue.MultiIndex)
     pd.testing.assert_series_equal(
         df.dtypes,
@@ -405,6 +408,7 @@ def test_from_odps_query():
     assert df.op.query == query3
     assert df.op.extra_params.no_split_sql is False
     assert df.index_value.names == ["c1"]
+    assert df.op.get_columns() == ["c32"]
     pd.testing.assert_series_equal(
         df.dtypes,
         pd.Series([np.dtype("float64")], index=["c32"]),

maxframe/lib/dtypes_extension/__init__.py

@@ -11,4 +11,4 @@
 # 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.
-from .dtypes import ArrowDtype, dict_, infer_arrow_dtype, is_map_dtype
+from .dtypes import ArrowDtype, dict_, is_map_dtype

maxframe/lib/dtypes_extension/dtypes.py

@@ -13,10 +13,8 @@
 # limitations under the License.
 from typing import Union
 
-import numpy as np
 import pandas as pd
 import pyarrow as pa
-from pandas.api.extensions import ExtensionDtype
 
 try:
     from pandas import ArrowDtype
@@ -45,47 +43,3 @@ def is_map_dtype(dtype: ArrowDtype) -> bool:
     if ArrowDtype is None:
         raise ImportError("ArrowDtype is not supported in current environment")
     return isinstance(dtype, ArrowDtype) and isinstance(dtype.pyarrow_dtype, pa.MapType)
-
-
-_dtype_mapping = {
-    pd.Int8Dtype(): lambda x: pa.int8(),
-    pd.Int16Dtype(): lambda x: pa.int16(),
-    pd.Int32Dtype(): lambda x: pa.int32(),
-    pd.Int64Dtype(): lambda x: pa.int64(),
-    pd.UInt8Dtype(): lambda x: pa.uint8(),
-    pd.UInt16Dtype(): lambda x: pa.uint16(),
-    pd.UInt32Dtype(): lambda x: pa.uint32(),
-    pd.UInt64Dtype(): lambda x: pa.uint64(),
-    pd.BooleanDtype(): lambda x: pa.bool_(),
-    pd.Float32Dtype(): lambda x: pa.float32(),
-    pd.Float64Dtype(): lambda x: pa.float64(),
-    pd.StringDtype(): lambda x: pa.string(),
-}
-
-
-def infer_arrow_dtype(
-    dtype: Union[np.dtype, pa.DataType, ExtensionDtype]
-) -> Union[ArrowDtype, ExtensionDtype]:
-    """
-    Convert any pandas accepted dtype to arrow type in a best effort way.
-
-    Parameters
-    ----------
-    dtype : Union[np.dtype, pa.DataType, ExtensionDtype]
-        The dtype instance, can be np.dtype, pa.DataType or ExtensionDtype
-
-    Returns
-    -------
-    Union[pd.ArrowDtype, ExtensionDtype]: The converted pd.ArrowDtype, or ExtensionDtype if conversion failed.
-    """
-    if isinstance(dtype, ArrowDtype):
-        return dtype
-
-    if isinstance(dtype, np.dtype):
-        return ArrowDtype(pa.from_numpy_dtype(dtype))
-    if isinstance(dtype, pd.DatetimeTZDtype):
-        return pa.timestamp(dtype.unit, dtype.tz)
-
-    if dtype in _dtype_mapping:
-        return ArrowDtype(_dtype_mapping[dtype](dtype))
-    return dtype

maxframe/lib/dtypes_extension/tests/test_dtypes.py

@@ -12,13 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import numpy as np
 import pandas as pd
 import pyarrow as pa
 import pytest
 
 from ....utils import ARROW_DTYPE_NOT_SUPPORTED
-from ..dtypes import dict_, infer_arrow_dtype, is_map_dtype
+from ..dtypes import dict_, is_map_dtype
 
 try:
     from pandas import ArrowDtype
@@ -37,32 +36,3 @@ def test_map_dtype():
     dt = pd.ArrowDtype(pa.list_(pa.int64()))
     assert not is_map_dtype(dt)
     assert not is_map_dtype(pd.Int64Dtype)
-
-
-@pytest.mark.skipif(
-    ARROW_DTYPE_NOT_SUPPORTED,
-    reason="pandas doesn't support ArrowDtype",
-)
-@pytest.mark.parametrize(
-    "input_dtype, expected_type, expected_pa_dtype",
-    [
-        (
-            ArrowDtype(pa.int64()) if ArrowDtype else None,
-            ArrowDtype,
-            pa.int64(),
-        ),  # pd.ArrowDtype
-        (np.dtype("int64"), ArrowDtype, pa.int64()),  # np.dtype
-        (pd.CategoricalDtype(), pd.CategoricalDtype, None),  # pa.DataType
-        (pd.Int64Dtype(), ArrowDtype, pa.int64()),  # pd.ExtensionDtype
-        (
-            pd.DatetimeTZDtype("ns", "Asia/Shanghai"),
-            pa.TimestampType,
-            pa.timestamp("ns", "Asia/Shanghai"),
-        ),
-    ],
-)
-def test_infer_arrow_dtype(input_dtype, expected_type, expected_pa_dtype):
-    result = infer_arrow_dtype(input_dtype)
-    assert isinstance(result, expected_type)
-    if expected_type == ArrowDtype:
-        assert result.pyarrow_dtype == expected_pa_dtype

{maxframe-1.2.0.dist-info → maxframe-1.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maxframe
-Version: 1.2.0
+Version: 1.2.1
 Summary: MaxFrame operator-based data analyze framework
 Requires-Dist: numpy <2.0.0,>=1.19.0
 Requires-Dist: pandas >=1.0.0

{maxframe-1.2.0.dist-info → maxframe-1.2.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
-maxframe-1.2.0.dist-info/RECORD,,
-maxframe-1.2.0.dist-info/WHEEL,sha256=HS_2vgrXyXO7N4Q-5VnuMAgG-fG_r8eemMgfU9Aw3Kk,110
-maxframe-1.2.0.dist-info/top_level.txt,sha256=O_LOO6KS5Y1ZKdmCjA9mzfg0-b1sB_P6Oy-hD8aSDfM,25
-maxframe-1.2.0.dist-info/METADATA,sha256=TiHqD4_0cvyV9LovA0AXKbloyFW5qfRTuMrJxwDD0Sc,3055
+maxframe-1.2.1.dist-info/RECORD,,
+maxframe-1.2.1.dist-info/WHEEL,sha256=HS_2vgrXyXO7N4Q-5VnuMAgG-fG_r8eemMgfU9Aw3Kk,110
+maxframe-1.2.1.dist-info/top_level.txt,sha256=O_LOO6KS5Y1ZKdmCjA9mzfg0-b1sB_P6Oy-hD8aSDfM,25
+maxframe-1.2.1.dist-info/METADATA,sha256=BDhFnZopw5BEo7LJru1V9dPskhg94eUdVCYdqkwOhLk,3055
 maxframe_client/conftest.py,sha256=JkQKlLZqd9uJekiO8HvMvEegidF-6KlCVFcg-KmQLLY,643
 maxframe_client/__init__.py,sha256=z4QT02esANpxtSVZPO_96693bqSvhG82e4suaD6Ll1E,689
 maxframe_client/fetcher.py,sha256=9zIq_mNGlk8DcTVH0f1-dgNmH72X0edRM9a8muwko6Y,9172
@@ -28,7 +28,7 @@ maxframe/__init__.py,sha256=Gws_d9VblPR6Ld36_hSueVzs5mdN1ns4fMpgvbcEsxo,1004
 maxframe/utils.py,sha256=ObMiBp0NDlgBSwNSPnJQk74j9taJCO7YzWL_GR3Wvoc,34852
 maxframe/extension.py,sha256=xh1_qeZqzkW4GmcI3EMqTZhbsW8GHiGnWh1k_96DMP4,2720
 maxframe/errors.py,sha256=Mk6qW6hVSW3fFcGvk8yRCiUTlbQyvXA-rY6pfeq09XQ,1028
-maxframe/_utils.cpython-37m-darwin.so,sha256=b89iMgqZyo_cVhVzvcj-a2T35PION5R5cfhb2q7wXJE,415632
+maxframe/_utils.cpython-37m-darwin.so,sha256=XVOsKb5wIPmHuXy-QpUfxiTnWdXnlpKi8u_9VzoUADc,415632
 maxframe/udf.py,sha256=ctZQ2KxCPUbHMAk5wsWdYNnqiJMgoU7GNUVWh3FNxKw,5351
 maxframe/typing_.py,sha256=V-xuayMMepLmG2Kg0V3bi8qRosRd2FV9mJ-kAWdhOjQ,1180
 maxframe/codegen.py,sha256=OYhug8DUbd6X0qHq-pFQv473MlAiLluYci2lvfJoI_k,18317
@@ -81,14 +81,14 @@ maxframe/dataframe/datasource/from_index.py,sha256=c7jX1Vq4C4ZOXiL3MbRayJ3Jl0JEA
 maxframe/dataframe/datasource/dataframe.py,sha256=-V8qjEhRwaFeOYeFzjf8h5A1gqpgH_-GbNCf4Au7VRM,2023
 maxframe/dataframe/datasource/series.py,sha256=Sou6J9hg3JJdSxuTcJjsD5EWPmvVB1J5I_ys24IkBe4,1909
 maxframe/dataframe/datasource/__init__.py,sha256=LaVpAg_oMJ2OofTlyjw-v9YLRQNfPQYHNVkWnCXPRCc,640
-maxframe/dataframe/datasource/read_odps_query.py,sha256=nXz-wROVmmFCP-Axfy5M8y-gGHiAWflw0NKy1aXlOe8,14621
+maxframe/dataframe/datasource/read_odps_query.py,sha256=bpwKPQOoMLWJ8D5F44rBZAvU7CDkyQ5CXH72BkX80e0,14648
 maxframe/dataframe/datasource/core.py,sha256=W9AMhDsmlp4jl4T4iBsqTlMsdLNPCjcJbTi7SivsiFU,2687
 maxframe/dataframe/datasource/date_range.py,sha256=TNfvRWgfwkpIhm52RbMZDxvBAdbWbbwGAUnbwFJRRAE,17227
 maxframe/dataframe/datasource/read_odps_table.py,sha256=P-m8aqFCG3avt2MzpAReAiCewoT9H_VLrtjF7y7fMwA,9409
 maxframe/dataframe/datasource/read_parquet.py,sha256=Pk3c1eQ0l8pJdhhvE7jfPI2IG933OZv8_k4e72ULEx0,14531
 maxframe/dataframe/datasource/from_tensor.py,sha256=GrBxy0e-Vng640Z9kWnyshGsI9vkkmyowkRQvwDGsWs,14727
 maxframe/dataframe/datasource/from_records.py,sha256=VB4rO5evF1_EUN6_GJq3xHrsvFxInW1TZH1AvtzPAis,3442
-maxframe/dataframe/datasource/tests/test_datasource.py,sha256=q9Oao7HMoTJhvlhAeMkaUihSofWyvj0I4yFQEOPgE00,18576
+maxframe/dataframe/datasource/tests/test_datasource.py,sha256=bpIS9Kz5tM2HPO5yIh_ztiWjFbgU5x4n50xuuXekiWw,18777
 maxframe/dataframe/datasource/tests/__init__.py,sha256=YsJxv7HbG4YYJmqAJZPYb8iHFRQX5JGpGn2PInDXvY8,596
 maxframe/dataframe/sort/sort_index.py,sha256=gmv55CmKkAsWrA9bWf45JfX8IvMc0FuFloqb6D3cziI,5412
 maxframe/dataframe/sort/__init__.py,sha256=E76aFGW1nejyX-_YV4AXlbl3vj0gSANgif5kbrmMWL4,1160
@@ -324,7 +324,7 @@ maxframe/core/entity/objects.py,sha256=XgeJHAFg9CT3i76kUkxiAhn0hByNLCo1Jr8C_CFC5
 maxframe/core/entity/tests/__init__.py,sha256=YsJxv7HbG4YYJmqAJZPYb8iHFRQX5JGpGn2PInDXvY8,596
 maxframe/core/entity/tests/test_objects.py,sha256=o0_ntvlp1u3eObNwf-WpomK-AeZcIbdUf3CGit1K1Es,1349
 maxframe/core/graph/__init__.py,sha256=qlKFvg4JNTmNOOvidxwOQOZofw5WePSWphkYpZ7hVoc,765
-maxframe/core/graph/core.cpython-37m-darwin.so,sha256=YERnZyJDY_B4H15A9QrXMHANWtoMphaHoW5X6uArPls,321120
+maxframe/core/graph/core.cpython-37m-darwin.so,sha256=Vfo4sYkm2e3hufXKGZKaFEeWbjvk6E1dADoUudjxOi4,321120
 maxframe/core/graph/entity.py,sha256=feXajqZBbPTsZID8FcRzhDCll3LW-S5Lf3UGObSA_fw,4863
 maxframe/core/graph/core.pyx,sha256=trOWJOlAn1bwMuErZwugqGXO1loCuhLBupYBxxmlHaI,15923
 maxframe/core/graph/tests/__init__.py,sha256=YsJxv7HbG4YYJmqAJZPYb8iHFRQX5JGpGn2PInDXvY8,596
@@ -358,7 +358,7 @@ maxframe/serialization/arrow.py,sha256=A1gDQ7BmsLk_57qPd34e5SIMSqbuMZrfKsixLtHrp
 maxframe/serialization/__init__.py,sha256=psw8R-cCgEO7f5TB0ivKQHQcSYGmVZhdX62qGdU5a3k,936
 maxframe/serialization/maxframe_objects.py,sha256=Ha2pFpBivutH_YES1EQN-zpWu3TbKtotJHiuc8Cs8S8,1365
 maxframe/serialization/numpy.py,sha256=i6t8mI_pe34QQMxTEH23DrvPisRP6KxE2qLQ99MwjNI,3213
-maxframe/serialization/core.cpython-37m-darwin.so,sha256=vs_TyB73E5Cz1f6p34Jm5OZy6887DMJK1DM8Qj_SlBI,600360
+maxframe/serialization/core.cpython-37m-darwin.so,sha256=r4GT7jikG3jIzGO7yKxOJKLm7QzEWvqxcHc6iIB3Pqo,600360
 maxframe/serialization/scipy.py,sha256=W4P_r-4tAGGfVAFhwqcaHBxdW-dpZ6rIMLuppQzMXjo,2427
 maxframe/serialization/core.pyx,sha256=9xb7LsnSZiaNGpkx61OWeVUyCHyL0u8xDmzvOLgqyP8,35945
 maxframe/serialization/tests/test_serial.py,sha256=fsn5h9628eN-S3tPjzyhGtZtx_TEmTUdcNNJs-dSXXc,13163
@@ -395,7 +395,7 @@ maxframe/lib/wrapped_pickle.py,sha256=4qWVAbDcTJm4WAvs631fFXrV3NEyzGSnG1jSKHSzdv
 maxframe/lib/version.py,sha256=krhgFvMhLdoNCJk3d9U-yyIAHixCR4S9-NggKdqrnHQ,18321
 maxframe/lib/compression.py,sha256=QPxWRp0Q2q33EQzY-Jfx_iz7SELax6fu3GTmyIVyjGY,1442
 maxframe/lib/__init__.py,sha256=spk1N3D3EL-0RyJDNlnwqHfQEW47lXL-rNDukcF6qlk,642
-maxframe/lib/mmh3.cpython-37m-darwin.so,sha256=Zv2Tv_7Vt7yXFYK5bJcFVc-aZYjdn6oE1gs4enLcmKk,37200
+maxframe/lib/mmh3.cpython-37m-darwin.so,sha256=95ymEsO7tHUhn1HBaVT21nou8fVmnNtJapxWC52jZHA,37200
 maxframe/lib/mmh3.pyi,sha256=R_MzTIyUSTn8TF4Gs2hRP7NSWfWi0SeuUauh4eZJc-g,1494
 maxframe/lib/functools_compat.py,sha256=c3gOw--FLvQNbamt0V8oqsTNRhPlASPEOzhMrzA2was,2616
 maxframe/lib/mmh3_src/mmh3module.cpp,sha256=9J9eA42eKWTl546fvfQPNuIM3B2jpWSADpgIw3tr2jg,11604
@@ -431,10 +431,10 @@ maxframe/lib/filesystem/_oss_lib/handle.py,sha256=EqXngu4ScEvEzWoVhk8SdcFHVd3eth
 maxframe/lib/filesystem/_oss_lib/__init__.py,sha256=YsJxv7HbG4YYJmqAJZPYb8iHFRQX5JGpGn2PInDXvY8,596
 maxframe/lib/filesystem/_oss_lib/glob.py,sha256=ZAOPflY2zomCM7fKkrhG9qdULoyhHliBmbbmFaPvCKM,4837
 maxframe/lib/filesystem/_oss_lib/common.py,sha256=zbhcqv_UKLHmk9cPT7T_9i43Uf2iz1DH_Uis8DJPOfs,6615
-maxframe/lib/dtypes_extension/__init__.py,sha256=jfQ-njtVH6QSBqWeane16jm0KqOXjIQ7_MwXh9Pr5ew,667
-maxframe/lib/dtypes_extension/dtypes.py,sha256=1vOMTMj8RRcjZw44cL4XtVUs--i64QdVzmu-V5K82r8,3019
+maxframe/lib/dtypes_extension/__init__.py,sha256=vDReFX8FP-k9sqHKkFdV58KUfR-Rf5KnUB1fX9qY62M,648
+maxframe/lib/dtypes_extension/dtypes.py,sha256=9TGEqLqAbVwyfujyLYG5Sk3jF28qxlkDfweFB-eHpa8,1534
 maxframe/lib/dtypes_extension/tests/__init__.py,sha256=YsJxv7HbG4YYJmqAJZPYb8iHFRQX5JGpGn2PInDXvY8,596
-maxframe/lib/dtypes_extension/tests/test_dtypes.py,sha256=YryIHQBTeeaMTB-m17PDH9FeUr8Sf1XXKBzyjeCT1a8,2133
+maxframe/lib/dtypes_extension/tests/test_dtypes.py,sha256=qr73aCmmIJo-UlawSrCz6o_LkY8nfHgGRBwz8gNgfFA,1127
 maxframe/lib/sparse/matrix.py,sha256=EjPVR8s8DgXnE7mMqAyZngNbFhobrrMbZLSYGHYzTVY,7154
 maxframe/lib/sparse/vector.py,sha256=a7q1uMWlF8rs_2lNYvWzFmpWsnOlF_FjWAsPjIUutk4,4809
 maxframe/lib/sparse/__init__.py,sha256=V2akd93BuaxrSMURjikfbOmlCD5C_wyzkuwqfvzaYlM,18058