maxframe 1.0.0rc2__tar.gz → 1.0.0rc3__tar.gz

{maxframe-1.0.0rc2 → maxframe-1.0.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: maxframe
-Version: 1.0.0rc2
+Version: 1.0.0rc3
 Summary: MaxFrame operator-based data analyze framework
 Requires-Dist: numpy<2.0.0,>=1.19.0
 Requires-Dist: pandas>=1.0.0
@@ -9,7 +9,7 @@ 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: cloudpickle<3.0.0,>=1.5.0
 Requires-Dist: pyyaml>=5.1
 Requires-Dist: pickle5; python_version < "3.8"
 Requires-Dist: tornado>=6.0
@@ -102,76 +102,3 @@ 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-1.0.0rc2 → maxframe-1.0.0rc3}/README.rst

@@ -71,76 +71,3 @@ 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-1.0.0rc2 → maxframe-1.0.0rc3}/maxframe/codegen.py

@@ -26,9 +26,9 @@ from odps.utils import camel_to_underline
 from .core import OperatorType, Tileable, TileableGraph
 from .core.operator import Fetch
 from .extension import iter_extensions
+from .io.odpsio import build_dataframe_table_meta
+from .io.odpsio.schema import pandas_to_odps_schema
 from .lib import wrapped_pickle as pickle
-from .odpsio import build_dataframe_table_meta
-from .odpsio.schema import pandas_to_odps_schema
 from .protocol import DataFrameTableMeta, ResultInfo
 from .serialization import PickleContainer
 from .serialization.serializables import Serializable, StringField
@@ -506,6 +506,7 @@ class BigDagCodeGenerator(metaclass=abc.ABCMeta):
                 prefer_binary=pack.prefer_binary,
                 pre_release=pack.pre_release,
                 force_rebuild=pack.force_rebuild,
+                no_audit_wheel=pack.no_audit_wheel,
                 python_tag=python_tag,
                 is_production=is_production,
                 schedule_id=schedule_id,

{maxframe-1.0.0rc2 → maxframe-1.0.0rc3}/maxframe/config/config.py

@@ -32,7 +32,6 @@ from ..utils import get_python_tag
 from .validators import (
     ValidatorType,
     all_validator,
-    any_validator,
     is_bool,
     is_dict,
     is_in,
@@ -41,6 +40,7 @@ from .validators import (
     is_null,
     is_numeric,
     is_string,
+    is_valid_cache_path,
 )
 
 _DEFAULT_REDIRECT_WARN = "Option {source} has been replaced by {target} and might be removed in a future release."
@@ -327,7 +327,7 @@ default_options.register_option(
 default_options.register_option(
     "local_timezone",
     _get_legal_local_tz_name(),
-    validator=any_validator(is_null, is_in(set(available_timezones()))),
+    validator=is_null | is_in(set(available_timezones())),
     remote=True,
 )
 default_options.register_option(
@@ -348,6 +348,17 @@ default_options.register_option("sql.settings", {}, validator=is_dict, remote=Tr
 default_options.register_option("is_production", False, validator=is_bool, remote=True)
 default_options.register_option("schedule_id", "", validator=is_string, remote=True)
 
+default_options.register_option(
+    "service_role_arn", None, validator=is_null | is_string, remote=True
+)
+default_options.register_option(
+    "object_cache_url", None, validator=is_null | is_valid_cache_path, remote=True
+)
+
+default_options.register_option(
+    "chunk_size", None, validator=is_null | is_integer, remote=True
+)
+
 default_options.register_option(
     "session.max_alive_seconds",
     _DEFAULT_MAX_ALIVE_SECONDS,
@@ -366,9 +377,7 @@ default_options.register_option(
     validator=is_integer,
 )
 default_options.register_option(
-    "session.table_lifecycle",
-    None,
-    validator=any_validator(is_null, is_integer),
+    "session.table_lifecycle", None, validator=is_null | is_integer
 )
 default_options.register_option(
     "session.temp_table_lifecycle",
@@ -379,7 +388,7 @@ default_options.register_option(
 default_options.register_option(
     "session.subinstance_priority",
     None,
-    validator=any_validator(is_null, is_integer),
+    validator=is_null | is_integer,
     remote=True,
 )
 
@@ -391,9 +400,7 @@ default_options.register_option(
 default_options.register_option(
     "optimize.head_optimize_threshold", 1000, validator=is_integer
 )
-default_options.register_option(
-    "show_progress", "auto", validator=any_validator(is_bool, is_string)
-)
+default_options.register_option("show_progress", "auto", validator=is_bool | is_string)
 default_options.register_option(
     "dag.settings", value=dict(), validator=is_dict, remote=True
 )

maxframe-1.0.0rc3/maxframe/config/validators.py

@@ -0,0 +1,88 @@
+# Copyright 1999-2024 Alibaba Group Holding Ltd.
+#
+# Licensed 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.
+
+from typing import Callable
+from urllib.parse import urlparse
+
+ValidatorType = Callable[..., bool]
+
+
+def any_validator(*validators: ValidatorType):
+    def validate(x):
+        return any(validator(x) for validator in validators)
+
+    return validate
+
+
+def all_validator(*validators: ValidatorType):
+    def validate(x):
+        return all(validator(x) for validator in validators)
+
+    validate.validators = validators
+    return validate
+
+
+class Validator:
+    def __init__(self, func: ValidatorType):
+        self._func = func
+
+    def __call__(self, arg) -> bool:
+        return self._func(arg)
+
+    def __or__(self, other):
+        return OrValidator(self, other)
+
+
+class OrValidator(Validator):
+    def __init__(self, lhs: Validator, rhs: Validator):
+        super().__init__(lambda x: lhs(x) or rhs(x))
+
+
+is_null = Validator(lambda x: x is None)
+is_bool = Validator(lambda x: isinstance(x, bool))
+is_float = Validator(lambda x: isinstance(x, float))
+is_integer = Validator(lambda x: isinstance(x, int))
+is_numeric = Validator(lambda x: isinstance(x, (int, float)))
+is_string = Validator(lambda x: isinstance(x, str))
+is_dict = Validator(lambda x: isinstance(x, dict))
+is_positive_integer = Validator(lambda x: is_integer(x) and x > 0)
+is_non_negative_integer = Validator(lambda x: is_integer(x) and x >= 0)
+
+
+def is_in(vals):
+    return Validator(vals.__contains__)
+
+
+def _is_valid_cache_path(path: str) -> bool:
+    """
+    path should look like oss://oss_endpoint/oss_bucket/path
+    """
+    parsed_url = urlparse(path)
+    return (
+        parsed_url.scheme == "oss"
+        and parsed_url.netloc
+        and parsed_url.path
+        and "/" in parsed_url.path
+    )
+
+
+is_valid_cache_path = Validator(_is_valid_cache_path)
+
+
+_invalid_char_in_yaml_str = {'"', "'", "\n", "\\"}
+
+
+def simple_yaml_str_validator(name: str) -> bool:
+    chars = set(name)
+    return len(_invalid_char_in_yaml_str & chars) == 0

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

@@ -14,20 +14,14 @@
 
 # noinspection PyUnresolvedReferences
 from ..typing_ import ChunkType, EntityType, OperatorType, TileableType
-from .base import ExecutionError
+from .base import Base, ExecutionError
 from .entity import (
-    CHUNK_TYPE,
     ENTITY_TYPE,
-    FUSE_CHUNK_TYPE,
     OBJECT_TYPE,
     TILEABLE_TYPE,
-    Chunk,
-    ChunkData,
     Entity,
     EntityData,
     ExecutableTuple,
-    FuseChunk,
-    FuseChunkData,
     HasShapeTileable,
     HasShapeTileableData,
     NotSupportTile,
@@ -40,23 +34,18 @@ from .entity import (
     get_fetch_class,
     get_output_types,
     get_tileable_types,
-    register,
     register_fetch_class,
     register_output_types,
-    unregister,
 )
 
 # noinspection PyUnresolvedReferences
 from .graph import (
     DAG,
-    ChunkGraph,
-    ChunkGraphBuilder,
     DirectedGraph,
     GraphContainsCycleError,
     GraphSerializer,
     TileableGraph,
     TileableGraphBuilder,
-    TileContext,
-    TileStatus,
 )
 from .mode import enter_mode, is_build_mode, is_eager_mode, is_kernel_mode
+from .operator import build_fetch

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

@@ -12,10 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-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_TYPE, Object, ObjectData
 from .output_types import (
     OutputType,
@@ -32,6 +30,4 @@ from .tileables import (
     NotSupportTile,
     Tileable,
     TileableData,
-    register,
-    unregister,
 )

maxframe-1.0.0rc3/maxframe/core/entity/objects.py

@@ -0,0 +1,101 @@
+# Copyright 1999-2024 Alibaba Group Holding Ltd.
+#
+# Licensed 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.
+
+from typing import Any, Dict, Type
+
+from ...serialization import load_type
+from ...serialization.serializables import StringField
+from .core import Entity
+from .executable import _ToObjectMixin
+from .tileables import TileableData
+
+
+class ObjectData(TileableData, _ToObjectMixin):
+    __slots__ = ()
+    type_name = "Object"
+    # 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"]
+    _legacy_new_non_primitives = ["object_class"]
+
+    object_class = StringField("object_class", default=None)
+
+    @classmethod
+    def get_entity_class(cls) -> Type["Object"]:
+        if getattr(cls, "_entity_class", None) is not None:
+            return cls._entity_class
+        assert cls.__qualname__[-4:] == "Data"
+        target_class_name = cls.__module__ + "#" + cls.__qualname__[:-4]
+        cls._entity_class = load_type(target_class_name, Object)
+        return cls._entity_class
+
+    def __new__(cls, op=None, nsplits=None, **kw):
+        if cls is ObjectData:
+            obj_cls = kw.get("object_class")
+            if isinstance(obj_cls, str):
+                obj_cls = load_type(obj_cls, (Object, ObjectData))
+            if isinstance(obj_cls, type) and issubclass(obj_cls, Object):
+                obj_cls = obj_cls.get_data_class()
+
+            if obj_cls is not None and cls is not obj_cls:
+                return obj_cls(op=op, nsplits=nsplits, **kw)
+        return super().__new__(cls)
+
+    def __init__(self, op=None, nsplits=None, **kw):
+        obj_cls = kw.pop("object_class", None)
+        if isinstance(obj_cls, type):
+            if isinstance(obj_cls, type) and issubclass(obj_cls, Object):
+                obj_cls = obj_cls.get_data_class()
+            kw["object_class"] = obj_cls.__module__ + "#" + obj_cls.__qualname__
+
+        super().__init__(_op=op, _nsplits=nsplits, **kw)
+        if self.object_class is None and type(self) is not ObjectData:
+            cls = type(self)
+            self.object_class = cls.__module__ + "#" + cls.__qualname__
+
+    def __repr__(self):
+        return f"Object <op={type(self.op).__name__}, key={self.key}>"
+
+    @property
+    def params(self):
+        # params return the properties which useful to rebuild a new tileable object
+        return dict(object_class=self.object_class)
+
+    @params.setter
+    def params(self, new_params: Dict[str, Any]):
+        params = new_params.copy()
+        if params:  # pragma: no cover
+            raise TypeError(f"Unknown params: {list(params)}")
+
+    def refresh_params(self):
+        # refresh params when chunks updated
+        # nothing needs to do for Object
+        pass
+
+
+class Object(Entity, _ToObjectMixin):
+    __slots__ = ()
+    _allow_data_type_ = (ObjectData,)
+    type_name = "Object"
+
+    @classmethod
+    def get_data_class(cls) -> Type[ObjectData]:
+        if getattr(cls, "_data_class", None) is not None:
+            return cls._data_class
+        target_class_name = cls.__module__ + "#" + cls.__qualname__ + "Data"
+        cls._data_class = load_type(target_class_name, ObjectData)
+        return cls._data_class
+
+
+OBJECT_TYPE = (Object, ObjectData)

{maxframe-1.0.0rc2 → maxframe-1.0.0rc3}/maxframe/core/entity/output_types.py

@@ -15,7 +15,6 @@
 import functools
 from enum import Enum
 
-from .fuse import FUSE_CHUNK_TYPE
 from .objects import OBJECT_TYPE
 
 
@@ -77,8 +76,6 @@ def get_output_types(*objs, unknown_as=None):
     for obj in objs:
         if obj is None:
             continue
-        elif isinstance(obj, FUSE_CHUNK_TYPE):
-            obj = obj.chunk
 
         try:
             output_types.append(_get_output_type_by_cls(type(obj)))

{maxframe-1.0.0rc2 → maxframe-1.0.0rc3}/maxframe/core/entity/tileables.py

@@ -15,17 +15,15 @@
 import builtins
 import itertools
 from operator import attrgetter
-from typing import Callable, List
 from weakref import WeakKeyDictionary, WeakSet
 
 import numpy as np
 
 from ...serialization.serializables import BoolField, FieldTypes, TupleField
-from ...typing_ import OperatorType, TileableType
+from ...typing_ import TileableType
 from ...utils import on_deserialize_shape, on_serialize_nsplits, on_serialize_shape
 from ..base import Base
 from ..mode import enter_mode
-from .chunks import Chunk
 from .core import Entity, EntityData
 from .executable import _ExecutableMixin
 
@@ -34,79 +32,6 @@ class NotSupportTile(Exception):
     pass
 
 
-class OperatorTilesHandler:
-    _handlers = dict()
-
-    @classmethod
-    def _get_op_cls(cls, op: OperatorType):
-        if isinstance(op, type):
-            return op
-        return type(op)
-
-    @classmethod
-    def register(
-        cls, op: OperatorType, tile_handler: Callable[[OperatorType], TileableType]
-    ):
-        cls._handlers[cls._get_op_cls(op)] = tile_handler
-
-    @classmethod
-    def unregister(cls, op: OperatorType):
-        del cls._handlers[cls._get_op_cls(op)]
-
-    @classmethod
-    def get_handler(
-        cls, op: OperatorType
-    ) -> Callable[[OperatorType], List[TileableType]]:
-        op_cls = cls._get_op_cls(op)
-        return cls._handlers.get(op_cls, op_cls.tile)
-
-    @classmethod
-    def _assign_to(
-        cls,
-        tile_after_tensor_datas: List["TileableData"],
-        tile_before_tensor_datas: List["TileableData"],
-    ):
-        assert len(tile_after_tensor_datas) == len(tile_before_tensor_datas)
-
-        for tile_after_tensor_data, tile_before_tensor_data in zip(
-            tile_after_tensor_datas, tile_before_tensor_datas
-        ):
-            if tile_before_tensor_data is None:
-                # garbage collected
-                continue
-            tile_after_tensor_data.copy_to(tile_before_tensor_data)
-            tile_before_tensor_data.op.outputs = tile_before_tensor_datas
-
-    @enter_mode(kernel=True)
-    def dispatch(self, op: OperatorType):
-        op_cls = self._get_op_cls(op)
-        tiled = None
-        cause = None
-
-        if op_cls in self._handlers:
-            tiled = self._handlers[op_cls](op)
-        else:
-            try:
-                tiled = op_cls.tile(op)
-            except NotImplementedError as ex:
-                cause = ex
-                for super_cls in op_cls.__mro__:
-                    if super_cls in self._handlers:
-                        h = self._handlers[op_cls] = self._handlers[super_cls]
-                        tiled = h(op)
-                        break
-
-        if tiled is not None:
-            return tiled if isinstance(tiled, list) else [tiled]
-        else:
-            raise NotImplementedError(f"{type(op)} does not support tile") from cause
-
-
-handler = OperatorTilesHandler()
-register = OperatorTilesHandler.register
-unregister = OperatorTilesHandler.unregister
-
-
 class _ChunksIndexer:
     __slots__ = ("_tileable",)
 
@@ -231,7 +156,7 @@ entity_view_handler = EntityDataModificationHandler()
 
 
 class TileableData(EntityData, _ExecutableMixin):
-    __slots__ = "_cix", "_entities", "_executed_sessions"
+    __slots__ = "_chunks", "_cix", "_entities", "_executed_sessions"
     _no_copy_attrs_ = Base._no_copy_attrs_ | {"_cix"}
 
     # optional fields
@@ -245,6 +170,8 @@ class TileableData(EntityData, _ExecutableMixin):
     cache = BoolField("cache", default=False)
 
     def __init__(self: TileableType, *args, **kwargs):
+        if kwargs.get("chunks") is not None:
+            self._chunks = kwargs.pop("chunks")
         if kwargs.get("_nsplits", None) is not None:
             kwargs["_nsplits"] = tuple(tuple(s) for s in kwargs["_nsplits"])
 
@@ -270,7 +197,7 @@ class TileableData(EntityData, _ExecutableMixin):
             return tuple(map(len, self._nsplits))
 
     @property
-    def chunks(self) -> List[Chunk]:
+    def chunks(self) -> list:
         return getattr(self, "_chunks", None)
 
     @property

{maxframe-1.0.0rc2 → maxframe-1.0.0rc3}/maxframe/core/graph/__init__.py

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .builder import ChunkGraphBuilder, TileableGraphBuilder, TileContext, TileStatus
+from .builder import TileableGraphBuilder
 from .core import DAG, DirectedGraph, GraphContainsCycleError
-from .entity import ChunkGraph, EntityGraph, GraphSerializer, TileableGraph
+from .entity import EntityGraph, GraphSerializer, TileableGraph

{maxframe-1.0.0rc2/maxframe/tensor/merge → maxframe-1.0.0rc3/maxframe/core/graph/builder}/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .stack import stack
+from .tileable import TileableGraphBuilder