xoscar 0.3.0__cp311-cp311-macosx_10_9_universal2.whl → 0.3.2__cp311-cp311-macosx_10_9_universal2.whl

xoscar/__init__.py

@@ -50,7 +50,6 @@ from ._utils import create_actor_ref
 
 # make sure methods are registered
 from .backends import indigen, test
-from .entrypoints import init_extension_entrypoints
 from . import _version
 
 del indigen, test
@@ -59,6 +58,3 @@ _T = TypeVar("_T")
 ActorRefType = Union[ActorRef, _T]
 
 __version__ = _version.get_versions()["version"]
-
-init_extension_entrypoints()
-del init_extension_entrypoints

xoscar/backends/context.py

@@ -26,7 +26,7 @@ from ..context import BaseActorContext
 from ..core import ActorRef, BufferRef, FileObjectRef, create_local_actor_ref
 from ..debug import debug_async_timeout, detect_cycle_send
 from ..errors import CannotCancelTask
-from ..utils import dataslots
+from ..utils import dataslots, fix_all_zero_ip
 from .allocate_strategy import AddressSpecified, AllocateStrategy
 from .communication import Client, DummyClient, UCXClient
 from .core import ActorCaller
@@ -187,6 +187,7 @@ class IndigenActorContext(BaseActorContext):
 
     async def actor_ref(self, *args, **kwargs):
         actor_ref = create_actor_ref(*args, **kwargs)
+        connect_addr = actor_ref.address
         local_actor_ref = create_local_actor_ref(actor_ref.address, actor_ref.uid)
         if local_actor_ref is not None:
             return local_actor_ref
@@ -195,7 +196,10 @@ class IndigenActorContext(BaseActorContext):
         )
         future = await self._call(actor_ref.address, message, wait=False)
         result = await self._wait(future, actor_ref.address, message)
-        return self._process_result_message(result)
+        res = self._process_result_message(result)
+        if res.address != connect_addr:
+            res.address = fix_all_zero_ip(res.address, connect_addr)
+        return res
 
     async def send(
         self,

xoscar/backends/core.py

@@ -85,7 +85,8 @@ class ActorCaller:
                         f"Remote server {client.dest_address} closed"
                     ) from None
                 future = self._client_to_message_futures[client].pop(message.message_id)
-                future.set_result(message)
+                if not future.done():
+                    future.set_result(message)
             except DeserializeMessageFailed as e:
                 message_id = e.message_id
                 future = self._client_to_message_futures[client].pop(message_id)

xoscar/backends/pool.py

@@ -33,7 +33,6 @@ from .._utils import TypeDispatcher, create_actor_ref, to_binary
 from ..api import Actor
 from ..core import ActorRef, BufferRef, FileObjectRef, register_local_pool
 from ..debug import debug_async_timeout, record_message_trace
-from ..entrypoints import init_extension_entrypoints
 from ..errors import (
     ActorAlreadyExist,
     ActorNotExist,
@@ -188,8 +187,6 @@ class AbstractActorPool(ABC):
         self._asyncio_task_timeout_detector_task = (
             register_asyncio_task_timeout_detector()
         )
-        # load third party extensions.
-        init_extension_entrypoints()
         # init metrics
         metric_configs = self._config.get_metric_configs()
         metric_backend = metric_configs.get("backend")

xoscar/utils.py

@@ -462,3 +462,41 @@ def is_windows():
 
 def is_linux():
     return sys.platform.startswith("linux")
+
+
+def is_v4_zero_ip(ip_port_addr: str) -> bool:
+    return ip_port_addr.startswith("0.0.0.0:")
+
+
+def is_v6_zero_ip(ip_port_addr: str) -> bool:
+    # tcp6 addr ":::123", ":: means all zero"
+    arr = ip_port_addr.split(":")
+    if len(arr) <= 2:  # Not tcp6 or udp6
+        return False
+    for part in arr[0:-1]:
+        if part != "":
+            if int(part, 16) != 0:
+                return False
+    return True
+
+
+def fix_all_zero_ip(remote_addr: str, connect_addr: str) -> str:
+    """
+    Use connect_addr to fix ActorRef.address return by remote server.
+    When remote server listen on "0.0.0.0:port" or ":::port", it will return ActorRef.address set to listening addr,
+    it cannot be use by client for the following interaction unless we fix it.
+    (client will treat 0.0.0.0 as 127.0.0.1)
+
+    NOTE: Server might return a different addr from a pool for load-balance purpose.
+    """
+    if remote_addr == connect_addr:
+        return remote_addr
+    if not is_v4_zero_ip(remote_addr) and not is_v6_zero_ip(remote_addr):
+        # Remote server returns on non-zero ip
+        return remote_addr
+    if is_v4_zero_ip(connect_addr) or is_v6_zero_ip(connect_addr):
+        # Client connect to local server
+        return remote_addr
+    remote_port = remote_addr.split(":")[-1]
+    connect_ip = ":".join(connect_addr.split(":")[0:-1])  # Remote the port
+    return f"{connect_ip}:{remote_port}"

{xoscar-0.3.0.dist-info → xoscar-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xoscar
-Version: 0.3.0
+Version: 0.3.2
 Summary: Python actor framework for heterogeneous computing.
 Home-page: http://github.com/xorbitsai/xoscar
 Author: Qin Xuye
@@ -18,11 +18,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown
-Requires-Dist: numpy >=1.14.0
+Requires-Dist: numpy <2.0.0,>=1.14.0
 Requires-Dist: pandas >=1.0.0
 Requires-Dist: cloudpickle >=1.5.0
 Requires-Dist: psutil >=5.9.0
 Requires-Dist: tblib >=1.7.0
+Requires-Dist: packaging
 Requires-Dist: pickle5 ; python_version < "3.8"
 Requires-Dist: uvloop >=0.14.0 ; sys_platform != "win32"
 Requires-Dist: scipy >=1.0.0 ; sys_platform != "win32" or python_version >= "3.10"

{xoscar-0.3.0.dist-info → xoscar-0.3.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
-xoscar-0.3.0.dist-info/RECORD,,
-xoscar-0.3.0.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
-xoscar-0.3.0.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.3.0.dist-info/METADATA,sha256=g1Ydcyv284XHtaoDxFz2B3m829Tpj8T1hqIi9IHAyZM,9214
+xoscar-0.3.2.dist-info/RECORD,,
+xoscar-0.3.2.dist-info/WHEEL,sha256=eupBwbXGAhwNAPJSvj5BiShZwdZO8jnQ5yHfv-9aUGw,115
+xoscar-0.3.2.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.3.2.dist-info/METADATA,sha256=Sw1MUXmjiJDvY37wnlzYTfiAyRYM3pqIMfefEvjPr94,9246
 xoscar/_utils.pyx,sha256=UR1FtYXAYKIdEWR9HulEpMbSOrkQWi6xGz63d4IQmG0,7059
-xoscar/_utils.cpython-311-darwin.so,sha256=eiNmn-p1RhNrK8Hi67_bw84OMFZh6J1w7H9JHf3grxo,385817
+xoscar/_utils.cpython-311-darwin.so,sha256=j0TQn2RtCqdUEXEVG24eQsPUC6Ck713HFg61oeUP-Ns,385817
 xoscar/backend.py,sha256=is436OPkZfSpQXaoqTRVta5eoye_pp45RFgCstAk2hU,1850
 xoscar/core.pxd,sha256=4lBq8J0kjcXcsGuvN7Kv4xcL5liHwTTFWlqyK7XAEnw,1280
 xoscar/_version.py,sha256=ClSPrUjgGRGHIkVMQV9XQnkQ-n0akJMnq_rh819nqFE,23719
@@ -11,15 +11,14 @@ xoscar/context.pxd,sha256=qKa0OyDPZtVymftSh447m-RzFZgmz8rGqQBa7qlauvc,725
 xoscar/batch.py,sha256=DpArS0L3WYJ_HVPG-6hSYEwoAFY1mY2-mlC4Jp5M_Dw,7872
 xoscar/nvutils.py,sha256=qmW4mKLU0WB2yCs198ccQOgLL02zB7Fsa-AotO3NOmg,20412
 xoscar/constants.py,sha256=Yn59lRIOvE1VFwyuZB5G2-gxYIyhIZ1rVovbdFAR2NM,759
-xoscar/__init__.py,sha256=9BapEEmHU9OlpDOIc_4LwXNHfauP1XDW0YRnAUKZp_8,1721
+xoscar/__init__.py,sha256=0zX8kKaio3ZIrlzB79WybcravMJw1OxPWjDspTgJFyQ,1608
 xoscar/api.py,sha256=3hztPoOxg8A_mlhWyWgVP7FMXG0PATA1TP4Rbaj7A-g,13327
-xoscar/utils.py,sha256=TH81N2EWUDfAMdlkPYSh0juZS2EbdvvdhWx_6euQygk,14672
-xoscar/context.cpython-311-darwin.so,sha256=-Nwftvl4S0ZmalDJcyKuoLlF0zlTljoELwOpbmdE1Bo,480506
+xoscar/utils.py,sha256=TYp6wC8xx2AjKcoKt6Xk0bwhFeccBJKCK50YQE1XOV4,16076
+xoscar/context.cpython-311-darwin.so,sha256=MLHUlrFejkdMx97TOIsWajRit_HDtkW_8_iL3eJN21Q,480506
 xoscar/debug.py,sha256=9Z8SgE2WaKYQcyDo-5-DxEJQ533v7kWjrvCd28pSx3E,5069
 xoscar/libcpp.pxd,sha256=DJqBxLFOKL4iRr9Kale5UH3rbvPRD1x5bTSOPHFpz9I,1147
-xoscar/entrypoints.py,sha256=t-PfnqYDyjzXbV-Z-hjaQxpf_m95eSx2saAsb-V2ODY,1642
 xoscar/context.pyx,sha256=8CdgPnWcE9eOp3N600WgDQ03MCi8P73eUOGcfV7Zksg,10942
-xoscar/core.cpython-311-darwin.so,sha256=bUBlbA7fAtQm4n_wWrNRL9E8EVw6U93xBS2LRIderBI,1000215
+xoscar/core.cpython-311-darwin.so,sha256=uW__LsWANQObKe4gYYznR9J69mrEHwUMD_MVf79eIDI,1000183
 xoscar/errors.py,sha256=wBlQOKsXf0Fc4skN39tDie0YZT-VIAuLNRgoDl2pZcA,1241
 xoscar/core.pyx,sha256=Aqc2i8Fetsd5wRAPF4kL0ddnBZn3E2HRNCvup79BbQc,21730
 xoscar/driver.py,sha256=498fowtJr6b3FE8FIOA_Tc1Vwx88nfZw7p0FxrML0h4,1372
@@ -33,7 +32,7 @@ xoscar/metrics/backends/prometheus/__init__.py,sha256=h_JgzSqV5lP6vQ6XX_17kE4IY4
 xoscar/metrics/backends/prometheus/prometheus_metric.py,sha256=MxoMvVrg0pOkKpkjJ0PcAuEaaEJR2FZljmPrLjQ1-oc,2050
 xoscar/metrics/backends/console/console_metric.py,sha256=y5CCtH33j3AqI5_Uhwi4mgOcAhyhb4cWv_YvR6fxcbQ,2082
 xoscar/metrics/backends/console/__init__.py,sha256=h_JgzSqV5lP6vQ6XX_17kE4IY4BRnvKta_7VLQAL1ms,581
-xoscar/collective/xoscar_pygloo.cpython-311-darwin.so,sha256=2nAinNRMjxQ0E0Ynjf_zk34cd-WEjcZAZQk1B0HZxMI,2315344
+xoscar/collective/xoscar_pygloo.cpython-311-darwin.so,sha256=dawA3vphdfyKcJ4NKtMrcERE9iCSmtsxQT2jXNWuFI0,2315344
 xoscar/collective/__init__.py,sha256=XsClIkO_3Jd8GDifYuAbZCmJLAo9ZqGvnjUn9iuogmU,774
 xoscar/collective/core.py,sha256=WfMJZloiRiqsLlIMhU4Pa47eo0jE-hoXdbTBwZPM6TM,23498
 xoscar/collective/common.py,sha256=INAnISbfnRicbbbDHTqbSr9ITb89ZphH5BUkSpEdXXU,3561
@@ -47,17 +46,17 @@ xoscar/serialization/numpy.py,sha256=5Kem87CvpJmzUMp3QHk4WeHU30FoQWTJJP2SwIcaQG0
 xoscar/serialization/cuda.py,sha256=iFUEnN4SiquBIhyieyOrfw3TnKnW-tU_vYgqOxO_DrA,3758
 xoscar/serialization/scipy.py,sha256=yOEi0NB8cqQ6e2UnCZ1w006RsB7T725tIL-DM_hNcsU,2482
 xoscar/serialization/aio.py,sha256=S9e3rHMBwqqKmJtDz7KzYAqWc8w9bttA0Dj83IBfEU0,4577
-xoscar/serialization/core.cpython-311-darwin.so,sha256=ougWFP45tS2bJCY1wBW22n_znWpfXIA5yLaiE_yhmlk,943239
+xoscar/serialization/core.cpython-311-darwin.so,sha256=9Il-HW7qNang-e0IKPDXUYOO7dqWu8qYXpLv6oP3L78,943239
 xoscar/serialization/core.pyx,sha256=E3xIKmdI2gn99JduR3yuU_YTm-lOyG0Tkc7fZVBWCho,30131
-xoscar/backends/message.cpython-311-darwin.so,sha256=aXjPNttzPx-0NDnVt2dNumL92cZeqUYuKyqYczfrYKs,822890
+xoscar/backends/message.cpython-311-darwin.so,sha256=66DnDIPifP6KZQODg9vczddK7gsOxJCjSmGDFoigtZw,822858
 xoscar/backends/config.py,sha256=EG26f0GwX_f4dAhwTW77RBjiK9h8R_3JrD-rBF1bAq8,4984
 xoscar/backends/allocate_strategy.py,sha256=tC1Nbq2tJohahUwd-zoRYHEDX65wyuX8tmeY45uWj_w,4845
 xoscar/backends/__init__.py,sha256=VHEBQcUWM5bj027W8EUf9PiJUAP7JoMrRw3Tsvy5ySw,643
-xoscar/backends/core.py,sha256=o6g3ZOW7PkGmiu-nNtp6I3Sd_2KkQDwOsKz-FdgRFs0,7390
-xoscar/backends/context.py,sha256=b4mDqcrA7uBsy9Rb5laxlbujCyj8GpBglpjkNcg-Mg0,15285
+xoscar/backends/core.py,sha256=aHb3mMZ9vJe6pxg0P8kSOKvjXF1IaqgOgyhKVhHpNLM,7432
+xoscar/backends/context.py,sha256=Vr_PibRxYCDQ_gYK7r-BOlw9TXw8VQbFsVTH7K7mHPk,15470
 xoscar/backends/router.py,sha256=mhSvM5KVfV882jricVcpyxAqHEvhS4zL6ivczC6fOTE,7746
 xoscar/backends/message.pyx,sha256=_rXcsWPcWu77Z_38rvjDBdQojpY5xJoaHQrt57_LVyo,17612
-xoscar/backends/pool.py,sha256=DsArJyR754IDF3rak452Ft5i_VbYvWFTO9_QAfZtDxY,59278
+xoscar/backends/pool.py,sha256=bvS1r31O01E8jTdoWOhSqcFymksNqO2nX3Fkqary8Ro,59149
 xoscar/backends/indigen/backend.py,sha256=znl_fZzWGEtLH8hZ9j9Kkf0fva25jEem2_KO7I1RVvc,1612
 xoscar/backends/indigen/__init__.py,sha256=tKHP5ClzedBRBpZsLRVErR3EUNbbDm4CY4u0rCFJr44,685
 xoscar/backends/indigen/driver.py,sha256=VGzkacYKykegW5qhCuhx01gdgBZEKJjNIyfNCnA6Nm8,952

xoscar/entrypoints.py

@@ -1,42 +0,0 @@
-# Copyright 2022-2023 XProbe Inc.
-#
-# 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.
-
-import functools
-import logging
-import warnings
-
-logger = logging.getLogger(__name__)
-
-
-# from https://github.com/numba/numba/blob/master/numba/core/entrypoints.py
-# Must put this here to avoid extensions re-triggering initialization
-@functools.lru_cache(maxsize=None)
-def init_extension_entrypoints():
-    """Execute all `xoscar_extensions` entry points with the name `init`
-    If extensions have already been initialized, this function does nothing.
-    """
-    from pkg_resources import iter_entry_points  # type: ignore
-
-    for entry_point in iter_entry_points("xoscar_extensions", "init"):
-        logger.info("Loading extension: %s", entry_point)
-        try:
-            func = entry_point.load()
-            func()
-        except Exception as e:
-            msg = "Xoscar extension module '{}' failed to load due to '{}({})'."
-            warnings.warn(
-                msg.format(entry_point.module_name, type(e).__name__, str(e)),
-                stacklevel=2,
-            )
-            logger.info("Extension loading failed for: %s", entry_point)