maxframe 1.0.0rc4__cp310-cp310-win32.whl → 1.1.1__cp310-cp310-win32.whl

maxframe/serialization/tests/test_serial.py

@@ -42,7 +42,7 @@ except ImportError:
 from ...lib.sparse import SparseMatrix
 from ...lib.wrapped_pickle import switch_unpickle
 from ...tests.utils import require_cudf, require_cupy
-from ...utils import lazy_import
+from ...utils import lazy_import, no_default
 from .. import (
     PickleContainer,
     RemoteException,
@@ -90,6 +90,7 @@ class CustomNamedTuple(NamedTuple):
         pd.Timedelta(102.234154131),
         {"abc": 5.6, "def": [3.4], "gh": None, "ijk": {}},
         OrderedDict([("abcd", 5.6)]),
+        no_default,
     ],
 )
 @switch_unpickle

maxframe/tensor/__init__.py

@@ -191,11 +191,6 @@ from .ufunc import ufunc
 # isort: off
 # noinspection PyUnresolvedReferences
 from numpy import (
-    NAN,
-    NINF,
-    AxisError,
-    Inf,
-    NaN,
     e,
     errstate,
     geterr,
@@ -206,12 +201,21 @@ from numpy import (
     seterr,
 )
 
+try:
+    from numpy.exceptions import AxisError
+except ImportError:
+    from numpy import AxisError
+
+NAN = nan
+NINF = -inf
+Inf = inf
+NaN = nan
+
 # import numpy types
 # noinspection PyUnresolvedReferences
 from numpy import (
     bool_ as bool,
     bytes_,
-    cfloat,
     character,
     complex64,
     complex128,
@@ -242,9 +246,17 @@ from numpy import (
     uint16,
     uint32,
     uint64,
-    unicode_,
     unsignedinteger,
     void,
 )
 
+try:
+    from numpy import cfloat
+except ImportError:
+    from numpy import cdouble as cfloat
+try:
+    from numpy import str_ as unicode_
+except ImportError:
+    from numpy import unicode_
+
 del fetch, ufunc

maxframe/tensor/merge/vstack.py

@@ -48,7 +48,7 @@ def vstack(tup):
 
     Examples
     --------
-    >>> import mars.tensor as mt
+    >>> import maxframe.tensor as mt
 
     >>> a = mt.array([1, 2, 3])
     >>> b = mt.array([2, 3, 4])

maxframe/tests/utils.py

@@ -18,11 +18,13 @@ import hashlib
 import os
 import queue
 import socket
+import time
 import types
 from threading import Thread
 from typing import Dict, List, Optional, Set, Tuple
 
 import pytest
+from odps import ODPS
 from tornado import netutil
 
 from ..core import Tileable, TileableGraph
@@ -171,3 +173,17 @@ def get_test_unique_name(size=None):
     if size:
         digest = digest[:size]
     return digest + "_" + str(os.getpid())
+
+
+def assert_mf_index_dtype(idx_obj, dtype):
+    from ..dataframe.core import IndexValue
+
+    assert isinstance(idx_obj, IndexValue.IndexBase) and idx_obj.dtype == dtype
+
+
+def ensure_table_deleted(odps_entry: ODPS, table_name: str) -> None:
+    retry_times = 20
+    while odps_entry.exist_table(table_name) and retry_times > 0:
+        time.sleep(1)
+        retry_times -= 1
+    assert not odps_entry.exist_table(table_name)

maxframe/udf.py

@@ -19,6 +19,7 @@ from odps.models import Resource
 
 from .serialization.serializables import (
     BoolField,
+    DictField,
     FieldTypes,
     FunctionField,
     ListField,
@@ -54,6 +55,10 @@ class MarkedFunction(Serializable):
     func = FunctionField("func")
     resources = ListField("resources", FieldTypes.string, default_factory=list)
     pythonpacks = ListField("pythonpacks", FieldTypes.reference, default_factory=list)
+    expect_engine = StringField("expect_engine", default=None)
+    expect_resources = DictField(
+        "expect_resources", FieldTypes.string, default_factory=dict
+    )
 
     def __init__(self, func: Optional[Callable] = None, **kw):
         super().__init__(func=func, **kw)
@@ -120,6 +125,28 @@ def with_python_requirements(
     return func_wrapper
 
 
+def with_running_options(
+    *,
+    engine: Optional[str] = None,
+    cpu: Optional[int] = None,
+    memory: Optional[int] = None,
+    **kwargs,
+):
+    engine = engine.upper() if engine else None
+    resources = {"cpu": cpu, "memory": memory, **kwargs}
+
+    def func_wrapper(func):
+        if all(v is None for v in (engine, cpu, memory)):
+            return func
+        if isinstance(func, MarkedFunction):
+            func.expect_engine = engine
+            func.expect_resources = resources
+            return func
+        return MarkedFunction(func, expect_engine=engine, expect_resources=resources)
+
+    return func_wrapper
+
+
 with_resource_libraries = with_resources
 
 

maxframe/utils.py

@@ -835,8 +835,41 @@ def parse_readable_size(value: Union[str, int, float]) -> Tuple[float, bool]:
         raise ValueError(f"Unknown limitation value: {value}")
 
 
-def remove_suffix(value: str, suffix: str) -> str:
-    return value[: -len(suffix)] if value.endswith(suffix) else value
+def remove_suffix(value: str, suffix: str) -> Tuple[str, bool]:
+    """
+    Remove a suffix from a given string if it exists.
+
+    Parameters
+    ----------
+    value : str
+        The original string.
+    suffix : str
+        The suffix to be removed.
+
+    Returns
+    -------
+    Tuple[str, bool]
+        A tuple containing the modified string and a boolean indicating whether the suffix was found.
+    """
+
+    # Check if the suffix is an empty string
+    if len(suffix) == 0:
+        # If the suffix is empty, return the original string with True
+        return value, True
+
+    # Check if the length of the value is less than the length of the suffix
+    if len(value) < len(suffix):
+        # If the value is shorter than the suffix, it cannot have the suffix
+        return value, False
+
+    # Check if the suffix matches the end of the value
+    match = value.endswith(suffix)
+
+    # If the suffix is found, remove it; otherwise, return the original string
+    if match:
+        return value[: -len(suffix)], match
+    else:
+        return value, match
 
 
 def find_objects(nested: Union[List, Dict], types: Union[Type, Tuple[Type]]) -> List:
@@ -1081,7 +1114,6 @@ def collect_leaf_operators(root) -> List[Type]:
 
 @contextmanager
 def sync_pyodps_options():
-    from odps.config import OptionError
     from odps.config import option_context as pyodps_option_context
 
     from .config import options
@@ -1089,13 +1121,15 @@ def sync_pyodps_options():
     with pyodps_option_context() as cfg:
         cfg.local_timezone = options.local_timezone
         if options.session.enable_schema:
-            try:
-                cfg.enable_schema = options.session.enable_schema
-            except (AttributeError, OptionError):
-                # fixme enable_schema only supported in PyODPS 0.12.0 or later
-                cfg.always_enable_schema = options.session.enable_schema
+            cfg.enable_schema = options.session.enable_schema
         yield
 
 
 def str_to_bool(s: Optional[str]) -> Optional[bool]:
     return s.lower().strip() in ("true", "1") if s is not None else None
+
+
+def is_empty(val):
+    if isinstance(val, (pd.DataFrame, pd.Series, pd.Index)):
+        return val.empty
+    return not bool(val)

{maxframe-1.0.0rc4.dist-info → maxframe-1.1.1.dist-info}/METADATA

@@ -1,21 +1,21 @@
 Metadata-Version: 2.1
 Name: maxframe
-Version: 1.0.0rc4
+Version: 1.1.1
 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: pyodps>=0.12.0
 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<3.0.0,>=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
-Requires-Dist: pickle5; python_version < "3.8"
+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"