maxframe 0.1.0b5__tar.gz → 1.0.0rc2__tar.gz

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/MANIFEST.in

@@ -4,6 +4,7 @@ global-include *.pxd
 global-exclude *.c
 global-exclude *.cpp
 include pyproject.toml
+include README.rst
 include maxframe/lib/mmh3_src/*
 exclude **/tests/**/*
 exclude **/tests/*

maxframe-1.0.0rc2/PKG-INFO

@@ -0,0 +1,177 @@
+Metadata-Version: 2.1
+Name: maxframe
+Version: 1.0.0rc2
+Summary: MaxFrame operator-based data analyze framework
+Requires-Dist: numpy<2.0.0,>=1.19.0
+Requires-Dist: pandas>=1.0.0
+Requires-Dist: pyodps>=0.11.6.1
+Requires-Dist: scipy>=1.0
+Requires-Dist: pyarrow>=1.0.0
+Requires-Dist: msgpack>=1.0.0
+Requires-Dist: traitlets>=5.0
+Requires-Dist: cloudpickle>=1.5.0
+Requires-Dist: pyyaml>=5.1
+Requires-Dist: pickle5; python_version < "3.8"
+Requires-Dist: tornado>=6.0
+Requires-Dist: defusedxml>=0.5.0
+Requires-Dist: tqdm>=4.1.0
+Requires-Dist: importlib_metadata>=1.4
+Provides-Extra: dev
+Requires-Dist: black>=22.3.0; extra == "dev"
+Requires-Dist: flake8>=5.0.4; extra == "dev"
+Requires-Dist: pre-commit>=2.15.0; extra == "dev"
+Requires-Dist: graphviz>=0.20.1; extra == "dev"
+Provides-Extra: test
+Requires-Dist: mock; extra == "test"
+Requires-Dist: pytest>=7.3.1; extra == "test"
+Requires-Dist: pytest-cov>=4.1.0; extra == "test"
+Requires-Dist: pytest-asyncio>=0.21.0; extra == "test"
+Requires-Dist: pytest-timeout>=2.1.0; extra == "test"
+Requires-Dist: matplotlib>=2.0.0; extra == "test"
+
+MaxCompute MaxFrame Client
+==========================
+
+MaxFrame is a computational framework created by Alibaba Cloud to
+provide a way for Python developers to parallelize their code with
+MaxCompute. It creates a runnable computation graph locally, submits it
+to MaxCompute to execute and obtains results from MaxCompute.
+
+MaxFrame client is the client of MaxFrame. Currently it provides a
+DataFrame-based SDK with compatible APIs for pandas. In future, other
+common Python libraries like numpy and scikit-learn will be added as
+well. Python 3.7 is recommended for MaxFrame client to enable all
+functionalities while supports for higher Python versions are on the
+way.
+
+Installation
+------------
+
+You may install MaxFrame client through PIP:
+
+.. code:: bash
+
+   pip install maxframe
+
+Latest beta version can be installed with ``--pre`` argument:
+
+.. code:: bash
+
+   pip install --pre maxframe
+
+You can also install MaxFrame client from source code:
+
+.. code:: bash
+
+   pip install git+https://github.com/aliyun/alibabacloud-odps-maxframe-client.git
+
+Getting started
+---------------
+
+We show a simple code example of MaxFrame client which read data from a
+MaxCompute table, performs some simple data transform and writes back
+into MaxCompute.
+
+.. code:: python
+
+   import maxframe.dataframe as md
+   import os
+   from maxframe import new_session
+   from odps import ODPS
+
+   o = ODPS(
+       os.getenv('ALIBABA_CLOUD_ACCESS_KEY_ID'),
+       os.getenv('ALIBABA_CLOUD_ACCESS_KEY_SECRET'),
+       project='your-default-project',
+       endpoint='your-end-point',
+   )
+   session = new_session(o)
+
+   df = md.read_odps_table("source_table")
+   df["A"] = "prefix_" + df["A"]
+   md.to_odps_table(df, "prefix_source_table")
+
+Documentation
+-------------
+
+Detailed documentations can be found
+`here <https://maxframe.readthedocs.io>`__.
+
+License
+-------
+
+Licensed under the `Apache License
+2.0 <https://www.apache.org/licenses/LICENSE-2.0.html>`__.
+MaxCompute MaxFrame Client
+==========================
+
+MaxFrame is a computational framework created by Alibaba Cloud to
+provide a way for Python developers to parallelize their code with
+MaxCompute. It creates a runnable computation graph locally, submits it
+to MaxCompute to execute and obtains results from MaxCompute.
+
+MaxFrame client is the client of MaxFrame. Currently it provides a
+DataFrame-based SDK with compatible APIs for pandas. In future, other
+common Python libraries like numpy and scikit-learn will be added as
+well. Python 3.7 is recommended for MaxFrame client to enable all
+functionalities while supports for higher Python versions are on the
+way.
+
+Installation
+------------
+
+You may install MaxFrame client through PIP:
+
+.. code:: bash
+
+   pip install maxframe
+
+Latest beta version can be installed with ``--pre`` argument:
+
+.. code:: bash
+
+   pip install --pre maxframe
+
+You can also install MaxFrame client from source code:
+
+.. code:: bash
+
+   pip install git+https://github.com/aliyun/alibabacloud-odps-maxframe-client.git
+
+Getting started
+---------------
+
+We show a simple code example of MaxFrame client which read data from a
+MaxCompute table, performs some simple data transform and writes back
+into MaxCompute.
+
+.. code:: python
+
+   import maxframe.dataframe as md
+   import os
+   from maxframe import new_session
+   from odps import ODPS
+
+   o = ODPS(
+       os.getenv('ALIBABA_CLOUD_ACCESS_KEY_ID'),
+       os.getenv('ALIBABA_CLOUD_ACCESS_KEY_SECRET'),
+       project='your-default-project',
+       endpoint='your-end-point',
+   )
+   session = new_session(o)
+
+   df = md.read_odps_table("source_table")
+   df["A"] = "prefix_" + df["A"]
+   md.to_odps_table(df, "prefix_source_table")
+
+Documentation
+-------------
+
+Detailed documentations can be found
+`here <https://maxframe.readthedocs.io>`__.
+
+License
+-------
+
+Licensed under the `Apache License
+2.0 <https://www.apache.org/licenses/LICENSE-2.0.html>`__.

maxframe-0.1.0b5/PKG-INFO → maxframe-1.0.0rc2/README.rst

@@ -1,10 +1,76 @@
-Metadata-Version: 2.1
-Name: maxframe
-Version: 0.1.0b5
-Summary: MaxFrame operator-based data analyze framework
-Provides-Extra: dev
-Provides-Extra: test
+MaxCompute MaxFrame Client
+==========================
+
+MaxFrame is a computational framework created by Alibaba Cloud to
+provide a way for Python developers to parallelize their code with
+MaxCompute. It creates a runnable computation graph locally, submits it
+to MaxCompute to execute and obtains results from MaxCompute.
+
+MaxFrame client is the client of MaxFrame. Currently it provides a
+DataFrame-based SDK with compatible APIs for pandas. In future, other
+common Python libraries like numpy and scikit-learn will be added as
+well. Python 3.7 is recommended for MaxFrame client to enable all
+functionalities while supports for higher Python versions are on the
+way.
+
+Installation
+------------
+
+You may install MaxFrame client through PIP:
+
+.. code:: bash
+
+   pip install maxframe
+
+Latest beta version can be installed with ``--pre`` argument:
+
+.. code:: bash
+
+   pip install --pre maxframe
+
+You can also install MaxFrame client from source code:
+
+.. code:: bash
+
+   pip install git+https://github.com/aliyun/alibabacloud-odps-maxframe-client.git
+
+Getting started
+---------------
+
+We show a simple code example of MaxFrame client which read data from a
+MaxCompute table, performs some simple data transform and writes back
+into MaxCompute.
+
+.. code:: python
+
+   import maxframe.dataframe as md
+   import os
+   from maxframe import new_session
+   from odps import ODPS
+
+   o = ODPS(
+       os.getenv('ALIBABA_CLOUD_ACCESS_KEY_ID'),
+       os.getenv('ALIBABA_CLOUD_ACCESS_KEY_SECRET'),
+       project='your-default-project',
+       endpoint='your-end-point',
+   )
+   session = new_session(o)
+
+   df = md.read_odps_table("source_table")
+   df["A"] = "prefix_" + df["A"]
+   md.to_odps_table(df, "prefix_source_table")
+
+Documentation
+-------------
 
+Detailed documentations can be found
+`here <https://maxframe.readthedocs.io>`__.
+
+License
+-------
+
+Licensed under the `Apache License
+2.0 <https://www.apache.org/licenses/LICENSE-2.0.html>`__.
 MaxCompute MaxFrame Client
 ==========================
 

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/codegen.py

@@ -86,6 +86,8 @@ class AbstractUDF(Serializable):
 
 
 class UserCodeMixin:
+    __slots__ = ()
+
     @classmethod
     def obj_to_python_expr(cls, obj: Any = None) -> str:
         """
@@ -344,6 +346,8 @@ def register_engine_codegen(type_: Type["BigDagCodeGenerator"]):
 BUILTIN_ENGINE_SPE = "SPE"
 BUILTIN_ENGINE_MCSQL = "MCSQL"
 
+FAST_RANGE_INDEX_ENABLED = "codegen.fast_range_index_enabled"
+
 
 class BigDagCodeGenerator(metaclass=abc.ABCMeta):
     _context: BigDagCodeContext
@@ -516,12 +520,12 @@ class BigDagCodeGenerator(metaclass=abc.ABCMeta):
 
     def register_udfs(self, odps_ctx: "ODPSSessionContext"):
         for udf in self._context.get_udfs():
-            logger.info("[Session %s] Registering UDF %s", self._session_id, udf.name)
+            logger.info("[Session=%s] Registering UDF %s", self._session_id, udf.name)
             udf.register(odps_ctx, True)
 
     def unregister_udfs(self, odps_ctx: "ODPSSessionContext"):
         for udf in self._context.get_udfs():
-            logger.info("[Session %s] Unregistering UDF %s", self._session_id, udf.name)
+            logger.info("[Session=%s] Unregistering UDF %s", self._session_id, udf.name)
             udf.unregister(odps_ctx)
 
     def get_udfs(self) -> List[AbstractUDF]:

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/config/config.py

@@ -19,6 +19,15 @@ import warnings
 from copy import deepcopy
 from typing import Any, Dict, Optional, Union
 
+from odps.lib import tzlocal
+
+try:
+    from zoneinfo import available_timezones
+except ImportError:
+    from pytz import all_timezones
+
+    available_timezones = lambda: all_timezones
+
 from ..utils import get_python_tag
 from .validators import (
     ValidatorType,
@@ -28,6 +37,7 @@ from .validators import (
     is_dict,
     is_in,
     is_integer,
+    is_non_negative_integer,
     is_null,
     is_numeric,
     is_string,
@@ -37,10 +47,12 @@ _DEFAULT_REDIRECT_WARN = "Option {source} has been replaced by {target} and migh
 _DEFAULT_MAX_ALIVE_SECONDS = 3 * 24 * 3600
 _DEFAULT_MAX_IDLE_SECONDS = 3600
 _DEFAULT_SPE_OPERATION_TIMEOUT_SECONDS = 120
+_DEFAULT_SPE_FAILURE_RETRY_TIMES = 5
 _DEFAULT_UPLOAD_BATCH_SIZE = 4096
 _DEFAULT_TEMP_LIFECYCLE = 1
 _DEFAULT_TASK_START_TIMEOUT = 60
-_DEFAULT_LOGVIEW_HOURS = 24 * 60
+_DEFAULT_TASK_RESTART_TIMEOUT = 300
+_DEFAULT_LOGVIEW_HOURS = 24 * 30
 
 
 class OptionError(Exception):
@@ -296,19 +308,37 @@ class Config:
         return {k: v for k, v in res.items() if k in self._remote_options}
 
 
+def _get_legal_local_tz_name() -> Optional[str]:
+    """Sometimes we may get illegal tz name from tzlocal.get_localzone()"""
+    tz_name = str(tzlocal.get_localzone())
+    if tz_name not in available_timezones():
+        return None
+    return tz_name
+
+
 default_options = Config()
 default_options.register_option(
     "execution_mode", "trigger", validator=is_in(["trigger", "eager"])
 )
+default_options.register_option("use_common_table", False, validator=is_bool)
 default_options.register_option(
     "python_tag", get_python_tag(), validator=is_string, remote=True
 )
+default_options.register_option(
+    "local_timezone",
+    _get_legal_local_tz_name(),
+    validator=any_validator(is_null, is_in(set(available_timezones()))),
+    remote=True,
+)
 default_options.register_option(
     "session.logview_hours", _DEFAULT_LOGVIEW_HOURS, validator=is_integer, remote=True
 )
 default_options.register_option(
     "client.task_start_timeout", _DEFAULT_TASK_START_TIMEOUT, validator=is_integer
 )
+default_options.register_option(
+    "client.task_restart_timeout", _DEFAULT_TASK_RESTART_TIMEOUT, validator=is_integer
+)
 default_options.register_option("sql.enable_mcqa", True, validator=is_bool, remote=True)
 default_options.register_option(
     "sql.generate_comments", True, validator=is_bool, remote=True
@@ -374,7 +404,13 @@ default_options.register_option(
 default_options.register_option(
     "spe.operation_timeout_seconds",
     _DEFAULT_SPE_OPERATION_TIMEOUT_SECONDS,
-    validator=is_integer,
+    validator=is_non_negative_integer,
+    remote=True,
+)
+default_options.register_option(
+    "spe.failure_retry_times",
+    _DEFAULT_SPE_FAILURE_RETRY_TIMES,
+    validator=is_non_negative_integer,
     remote=True,
 )
 

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/config/validators.py

@@ -40,6 +40,7 @@ is_numeric = lambda x: isinstance(x, (int, float))
 is_string = lambda x: isinstance(x, str)
 is_dict = lambda x: isinstance(x, dict)
 is_positive_integer = lambda x: is_integer(x) and x > 0
+is_non_negative_integer = lambda x: is_integer(x) and x >= 0
 
 
 def is_in(vals):

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/core/__init__.py

@@ -19,7 +19,6 @@ from .entity import (
     CHUNK_TYPE,
     ENTITY_TYPE,
     FUSE_CHUNK_TYPE,
-    OBJECT_CHUNK_TYPE,
     OBJECT_TYPE,
     TILEABLE_TYPE,
     Chunk,
@@ -33,8 +32,6 @@ from .entity import (
     HasShapeTileableData,
     NotSupportTile,
     Object,
-    ObjectChunk,
-    ObjectChunkData,
     ObjectData,
     OutputType,
     Tileable,

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/core/entity/__init__.py

@@ -16,14 +16,7 @@ from .chunks import CHUNK_TYPE, Chunk, ChunkData
 from .core import ENTITY_TYPE, Entity, EntityData
 from .executable import ExecutableTuple, _ExecuteAndFetchMixin
 from .fuse import FUSE_CHUNK_TYPE, FuseChunk, FuseChunkData
-from .objects import (
-    OBJECT_CHUNK_TYPE,
-    OBJECT_TYPE,
-    Object,
-    ObjectChunk,
-    ObjectChunkData,
-    ObjectData,
-)
+from .objects import OBJECT_TYPE, Object, ObjectData
 from .output_types import (
     OutputType,
     get_fetch_class,

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/core/entity/objects.py

@@ -14,58 +14,17 @@
 
 from typing import Any, Dict
 
-from ...serialization.serializables import FieldTypes, ListField
-from ...utils import skip_na_call
-from .chunks import Chunk, ChunkData
 from .core import Entity
 from .executable import _ToObjectMixin
 from .tileables import TileableData
 
 
-class ObjectChunkData(ChunkData):
-    # chunk whose data could be any serializable
-    __slots__ = ()
-    type_name = "Object"
-
-    def __init__(self, op=None, index=None, **kw):
-        super().__init__(_op=op, _index=index, **kw)
-
-    @property
-    def params(self) -> Dict[str, Any]:
-        # params return the properties which useful to rebuild a new chunk
-        return {
-            "index": self.index,
-        }
-
-    @params.setter
-    def params(self, new_params: Dict[str, Any]):
-        params = new_params.copy()
-        params.pop("index", None)  # index not needed to update
-        if params:  # pragma: no cover
-            raise TypeError(f"Unknown params: {list(params)}")
-
-    @classmethod
-    def get_params_from_data(cls, data: Any) -> Dict[str, Any]:
-        return dict()
-
-
-class ObjectChunk(Chunk):
-    __slots__ = ()
-    _allow_data_type_ = (ObjectChunkData,)
-    type_name = "Object"
-
-
 class ObjectData(TileableData, _ToObjectMixin):
     __slots__ = ()
     type_name = "Object"
-
-    # optional fields
-    _chunks = ListField(
-        "chunks",
-        FieldTypes.reference(ObjectChunkData),
-        on_serialize=skip_na_call(lambda x: [it.data for it in x]),
-        on_deserialize=skip_na_call(lambda x: [ObjectChunk(it) for it in x]),
-    )
+    # workaround for removed field since v0.1.0b5
+    # todo remove this when all versions below v1.0.0rc1 is eliminated
+    _legacy_deprecated_non_primitives = ["_chunks"]
 
     def __init__(self, op=None, nsplits=None, **kw):
         super().__init__(_op=op, _nsplits=nsplits, **kw)
@@ -97,4 +56,3 @@ class Object(Entity, _ToObjectMixin):
 
 
 OBJECT_TYPE = (Object, ObjectData)
-OBJECT_CHUNK_TYPE = (ObjectChunk, ObjectChunkData)

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/core/graph/core.pyx

@@ -354,10 +354,10 @@ cdef class DirectedGraph:
                         sio.write(f'"Chunk:{self._gen_chunk_key(input_chunk, trunc_key)}" {chunk_style}\n')
                         visited.add(input_chunk.key)
                     if op.key not in visited:
-                        sio.write(f'"{op_name}:{op.key[:trunc_key]}" {operator_style}\n')
+                        sio.write(f'"{op_name}:{op.key[:trunc_key]}_{id(op)}" {operator_style}\n')
                         visited.add(op.key)
                     sio.write(f'"Chunk:{self._gen_chunk_key(input_chunk, trunc_key)}" -> '
-                              f'"{op_name}:{op.key[:trunc_key]}"\n')
+                              f'"{op_name}:{op.key[:trunc_key]}_{id(op)}"\n')
 
                 for output_chunk in (op.outputs or []):
                     if output_chunk.key not in visited:
@@ -367,9 +367,9 @@ cdef class DirectedGraph:
                         sio.write(f'"Chunk:{self._gen_chunk_key(output_chunk, trunc_key)}" {tmp_chunk_style}\n')
                         visited.add(output_chunk.key)
                     if op.key not in visited:
-                        sio.write(f'"{op_name}:{op.key[:trunc_key]}" {operator_style}\n')
+                        sio.write(f'"{op_name}:{op.key[:trunc_key]}_{id(op)}" {operator_style}\n')
                         visited.add(op.key)
-                    sio.write(f'"{op_name}:{op.key[:trunc_key]}" -> '
+                    sio.write(f'"{op_name}:{op.key[:trunc_key]}_{id(op)}" -> '
                               f'"Chunk:{self._gen_chunk_key(output_chunk, trunc_key)}"')
                     if show_columns:
                         sio.write(f' [ label={get_col_names(output_chunk)} ]')

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/dataframe/__init__.py

@@ -54,7 +54,7 @@ from .reduction import CustomReduction, unique
 from .tseries.to_datetime import to_datetime
 
 try:
-    from pandas import NA, Timestamp
+    from pandas import NA, NaT, Timestamp
 except ImportError:  # pragma: no cover
     pass
 

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/dataframe/arithmetic/around.py

@@ -43,20 +43,20 @@ def around(df, decimals=0, *args, **kwargs):
     return op(df)
 
 
+# FIXME Series input of decimals not supported yet
 around.__frame_doc__ = """
 Round a DataFrame to a variable number of decimal places.
 
 Parameters
 ----------
-decimals : int, dict, Series
+decimals : int, dict
     Number of decimal places to round each column to. If an int is
     given, round each column to the same number of places.
     Otherwise dict and Series round to variable numbers of places.
     Column names should be in the keys if `decimals` is a
-    dict-like, or in the index if `decimals` is a Series. Any
-    columns not included in `decimals` will be left as is. Elements
-    of `decimals` which are not columns of the input will be
-    ignored.
+    dict-like. Any columns not included in `decimals` will be left
+    as is. Elements of `decimals` which are not columns of the
+    input will be ignored.
 *args
     Additional keywords have no effect but might be accepted for
     compatibility with numpy.
@@ -107,18 +107,6 @@ places as value
 1   0.0   1.0
 2   0.7   0.0
 3   0.2   0.0
-
-Using a Series, the number of places for specific columns can be
-specified with the column names as index and the number of
-decimal places as value
-
->>> decimals = md.Series([0, 1], index=['cats', 'dogs'])
->>> df.round(decimals).execute()
-    dogs  cats
-0   0.2   0.0
-1   0.0   1.0
-2   0.7   0.0
-3   0.2   0.0
 """
 around.__series_doc__ = """
 Round each value in a Series to the given number of decimals.

{maxframe-0.1.0b5 → maxframe-1.0.0rc2}/maxframe/dataframe/arithmetic/core.py

@@ -39,7 +39,7 @@ class DataFrameBinOpMixin(DataFrameOperatorMixin):
         raise NotImplementedError
 
     @classmethod
-    def _calc_properties(cls, x1, x2=None, axis="columns"):
+    def _calc_properties(cls, x1, x2=None, axis="columns", level=None):
         if isinstance(x1, DATAFRAME_TYPE) and (
             x2 is None or pd.api.types.is_scalar(x2) or isinstance(x2, TENSOR_TYPE)
         ):
@@ -108,7 +108,9 @@ class DataFrameBinOpMixin(DataFrameOperatorMixin):
                     index = copy.copy(x1.index_value)
                     index_shape = x1.shape[0]
                 else:
-                    index = infer_index_value(x1.index_value, x2.index_value)
+                    index = infer_index_value(
+                        x1.index_value, x2.index_value, level=level
+                    )
                     if index.key == x1.index_value.key == x2.index_value.key and (
                         not np.isnan(x1.shape[0]) or not np.isnan(x2.shape[0])
                     ):
@@ -141,7 +143,9 @@ class DataFrameBinOpMixin(DataFrameOperatorMixin):
                         column_shape = len(dtypes)
                     else:  # pragma: no cover
                         dtypes = x1.dtypes  # FIXME
-                        columns = infer_index_value(x1.columns_value, x2.index_value)
+                        columns = infer_index_value(
+                            x1.columns_value, x2.index_value, level=level
+                        )
                         column_shape = np.nan
             else:
                 assert axis == "index" or axis == 0
@@ -169,7 +173,9 @@ class DataFrameBinOpMixin(DataFrameOperatorMixin):
                                 ],
                                 index=x1.dtypes.index,
                             )
-                        index = infer_index_value(x1.index_value, x2.index_value)
+                        index = infer_index_value(
+                            x1.index_value, x2.index_value, level=level
+                        )
                         index_shape = np.nan
             return {
                 "shape": (index_shape, column_shape),
@@ -187,7 +193,9 @@ class DataFrameBinOpMixin(DataFrameOperatorMixin):
                     index = copy.copy(x1.index_value)
                     index_shape = x1.shape[0]
                 else:
-                    index = infer_index_value(x1.index_value, x2.index_value)
+                    index = infer_index_value(
+                        x1.index_value, x2.index_value, level=level
+                    )
                     if index.key == x1.index_value.key == x2.index_value.key and (
                         not np.isnan(x1.shape[0]) or not np.isnan(x2.shape[0])
                     ):
@@ -237,14 +245,14 @@ class DataFrameBinOpMixin(DataFrameOperatorMixin):
         self._check_inputs(x1, x2)
         if isinstance(x1, DATAFRAME_TYPE) or isinstance(x2, DATAFRAME_TYPE):
             df1, df2 = (x1, x2) if isinstance(x1, DATAFRAME_TYPE) else (x2, x1)
-            kw = self._calc_properties(df1, df2, axis=self.axis)
+            kw = self._calc_properties(df1, df2, axis=self.axis, level=self.level)
             if not pd.api.types.is_scalar(df2):
                 return self.new_dataframe([x1, x2], **kw)
             else:
                 return self.new_dataframe([df1], **kw)
         if isinstance(x1, SERIES_TYPE) or isinstance(x2, SERIES_TYPE):
             s1, s2 = (x1, x2) if isinstance(x1, SERIES_TYPE) else (x2, x1)
-            kw = self._calc_properties(s1, s2)
+            kw = self._calc_properties(s1, s2, level=self.level)
             if not pd.api.types.is_scalar(s2):
                 return self.new_series([x1, x2], **kw)
             else: