xoscar 0.3.0__cp311-cp311-win_amd64.whl → 0.3.2__cp311-cp311-win_amd64.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,5 +1,5 @@
-xoscar/__init__.py,sha256=MfWK519G_Rs8z-zkT5HdrEfJcPa6p6vqU5uvdTJTH5Y,1785
-xoscar/_utils.cp311-win_amd64.pyd,sha256=BI3ETE3P8dXxdsVcLIA_fgRS-UF8c-BiU3njvTPEtZw,113152
+xoscar/__init__.py,sha256=dlwtB7dnDp5WME6CZVQY7d9lk1yJ9s___H5UxjGlAd4,1668
+xoscar/_utils.cp311-win_amd64.pyd,sha256=juEr1Sv2CWXbAJzgyBtDCXO9rwtWc8Y1Sc-2su_KTyU,113664
 xoscar/_utils.pxd,sha256=rlNbTg5lhXA-jCOLksqF4jhUlNn0xw2jx1HxdLa34pc,1193
 xoscar/_utils.pyx,sha256=5Wvind3AQ3JaMK7Zv9SjhiPO6LEol2hW7_fMncn69go,7300
 xoscar/_version.py,sha256=bsfCVAo_o9LkiP3AjPsP4SRRqhjuS0t4D1WGJPzbdls,24412
@@ -7,20 +7,19 @@ xoscar/api.py,sha256=B5oXv4vgMxMteh1YNaBmNFDrUFmYa_dCdzfaWwwZnCo,13820
 xoscar/backend.py,sha256=8G5JwjoOT6Q2slb11eXNApxgcmvNQUCdQzkoIMDwLcQ,1917
 xoscar/batch.py,sha256=Jk5BSpvMFAV9DrRy0a9tgPvIo_dt8cbJReZBL0cnOPc,8128
 xoscar/constants.py,sha256=H9ntCahBz5nKO-A6rkrGKy4WB2kNaLZAytkDajKIXqM,780
-xoscar/context.cp311-win_amd64.pyd,sha256=zzlJVBymhpTEksIDH3Rc1EDToHadqN2V1DBbFPZj-to,154624
+xoscar/context.cp311-win_amd64.pyd,sha256=UsoRK54uaajgzditdwm45Pyb6Mrpx2P0Y9i60KbrAZ4,155648
 xoscar/context.pxd,sha256=6n6IAbmArSRq8EjcsbS6npW8xP1jI0qOoS1fF0oyj-o,746
 xoscar/context.pyx,sha256=FOJVerGOvxe2USryXEQA0rpaFX_ScxISH6QWKUcahY8,11310
-xoscar/core.cp311-win_amd64.pyd,sha256=Z0OX0RpAwBwmn-LOnmExfHzUFg45gjxjkF-AXIuXphU,323072
+xoscar/core.cp311-win_amd64.pyd,sha256=jDsd41TfJf2zILBfkrj462H3gxA_QTWFEsiGrZBynzs,324096
 xoscar/core.pxd,sha256=dGv62H92PFG98SVILuF641kY-NWFEt1FYqqOX3WY5RQ,1330
 xoscar/core.pyx,sha256=0YvJW2AHgymyfsAlPGvIFw65J5gTKO3PK2p1wl4VlJ0,22388
 xoscar/debug.py,sha256=hrmxIH6zvTKasQo6PUUgXu5mgEsR0g87Fvpw7CoHipg,5257
 xoscar/driver.py,sha256=EjZ7HkdSgwtE9pXGiJXXwgWfxaIn10eZyqKpBhelaoc,1414
-xoscar/entrypoints.py,sha256=BOFOyMIeH3LwRCqonP6-HJGXp1gUdOrHX64KnpAFxjI,1684
 xoscar/errors.py,sha256=hfIAlYuSVfB3dAQYr8hTLAMmfy5en6Y8mihdtw1gTEE,1304
 xoscar/libcpp.pxd,sha256=XGy887HXdRsvF47s-A7PvHX6Gaf15d_azRscWJY0Hc8,1178
 xoscar/nvutils.py,sha256=z6RCVs0sgKFm55TTgAYG3qy5f_AKJzjcH2kcRB-wTJQ,21129
 xoscar/profiling.py,sha256=LUqkj6sSxaFj0ltS7Yk2kFsh5ieHY417xypTYHwQOb4,8275
-xoscar/utils.py,sha256=gLZeaF51zYJuea_0NWbkf4wlSVp81uUno3oQ2LkIxhc,15136
+xoscar/utils.py,sha256=ENwjm_ImxD3fA-3FP4qERYv7XuDnB0xvySDjM2LHQug,16578
 xoscar/aio/__init__.py,sha256=pkMRxXvvUy_aedqw53aIi6ZS0kb7SCoNLjN9HXUQKIk,834
 xoscar/aio/_threads.py,sha256=-cfEFZUzx5j_3d7M0ub2FQaVZ8MrOG2UVo5ugucEmMY,1348
 xoscar/aio/base.py,sha256=ytknTCjTjNQbTM7l7QGXqPYYUkD7qq-zVBGVZ34L1Tc,2335
@@ -30,11 +29,11 @@ xoscar/aio/parallelism.py,sha256=egpScbxggXzAdc_evLsNmUyHafuxu62JWAYS-2ISSuI,133
 xoscar/backends/__init__.py,sha256=g9OllTquu9MRB5nySVoyiRv2z-_OSALWrOhwt7L9WXc,657
 xoscar/backends/allocate_strategy.py,sha256=DzvTlixwzTANURI2mDLHm3vcaugSPDxU6UQZb89KH0U,5005
 xoscar/backends/config.py,sha256=7nmvU_19zYR7n-bT8BNasbjntwmobmMiM7wN7O6Lujc,5129
-xoscar/backends/context.py,sha256=zhOFZk_RPLaJ9a8ZDQBHcV54E6r3-VnLVO-D3pIr1qA,15685
-xoscar/backends/core.py,sha256=4eMQ5a0-_wYs4OhOWuRIZoBojhMhj7wr6qzo2dqXFSg,7582
-xoscar/backends/message.cp311-win_amd64.pyd,sha256=j6br0bvvxohc9VvAeuKEOdmcArbBICLlneOwtl3cgis,259584
+xoscar/backends/context.py,sha256=NukXzBwq9ZwuiN1y6RE1hfNGsW589hDtJAVwu-DV9E0,15874
+xoscar/backends/core.py,sha256=bVQxM1E4qMq1-SkfrZM1aolNg1WQv2sHcZxWI1ETyMM,7625
+xoscar/backends/message.cp311-win_amd64.pyd,sha256=2az1IuGpt-4Vj8FdBSUatCRdIazfpZ2laYTjNX9qSNY,261632
 xoscar/backends/message.pyx,sha256=kD_bqaApizHtMzqH0Baw5GH3N7r26NwOGoVfm7KCXWg,18203
-xoscar/backends/pool.py,sha256=mYZ3VXgAgpt1OO0qw0oMrSXMgguKqVmK1-nnwkHMLPo,60874
+xoscar/backends/pool.py,sha256=_PtJn9AHYLwmEqk1FYaNO4_3mQo_AK79UsRS5P3a_RE,60742
 xoscar/backends/router.py,sha256=GJpSV_LhzINHdTp5jtsMHfPNMkNb1KI-WlqGqhwApGU,7953
 xoscar/backends/communication/__init__.py,sha256=Z0_RJkPGwLJeapSNt-TiO9DvnpBPu8P4PCooLaAqjkk,1080
 xoscar/backends/communication/base.py,sha256=wmWTeE4lcB_ohqyJJ6MdzMGcrOqy2RSKRp8y-NDuFdY,7736
@@ -56,8 +55,8 @@ xoscar/collective/common.py,sha256=9c7xq3IOUvfA0I9GnpalUqXZOzmF6IEILv4zL64BYVE,3
 xoscar/collective/core.py,sha256=Rx1niJ_6rznLG9varP53oqTH_bZabRzgbuP2V6JPu54,24235
 xoscar/collective/process_group.py,sha256=kTPbrLMJSGhqbiWvTIiz-X3W0rZWd_CFn_zUIlXbOlM,23286
 xoscar/collective/utils.py,sha256=p3WEVtXvnVhkuO5mRgQBhBRFr1dKHcDKMjrbMyuiyfg,1219
-xoscar/collective/uv.dll,sha256=GzdaDYmvmj9KqzTqsM9Xx7FJslFQtMAh1NhVzn_zG2E,618496
-xoscar/collective/xoscar_pygloo.cp311-win_amd64.pyd,sha256=HJa0W_g8u72kEyN20ZhOXYSznI6aP1lzxTuDsjCjaTw,849920
+xoscar/collective/uv.dll,sha256=bSZN79NqBDsfQOvBaxDuwybHfc5HIQevKWh5ZUVnIWQ,620544
+xoscar/collective/xoscar_pygloo.cp311-win_amd64.pyd,sha256=QncXGheUQws17BkzdBwC_3Mb2lQenpyTepBmeNQ9MLo,847872
 xoscar/metrics/__init__.py,sha256=RjXuuYw4I2YYgD8UY2Z5yCZk0Z56xMJ1n40O80Dtxf8,726
 xoscar/metrics/api.py,sha256=dtJ4QrIqQNXhJedeqOPs4TXKgrRGZFFN50xAd9SCfec,9144
 xoscar/metrics/backends/__init__.py,sha256=ZHepfhCDRuK9yz4pAM7bjpWDvS3Ijp1YgyynoUFLeuU,594
@@ -68,7 +67,7 @@ xoscar/metrics/backends/prometheus/__init__.py,sha256=ZHepfhCDRuK9yz4pAM7bjpWDvS
 xoscar/metrics/backends/prometheus/prometheus_metric.py,sha256=65hb8O3tmsEJ7jgOrIwl_suj9SE5Tmqcfjuk0urkLvE,2120
 xoscar/serialization/__init__.py,sha256=NOAn046vnHEkx--82BKNinV8EpyOfT5hqfRBGnKl56s,866
 xoscar/serialization/aio.py,sha256=bL31B2lwrEKA5nztRSeSgDyqsbBN6dCMr6rHwNDGAIk,4715
-xoscar/serialization/core.cp311-win_amd64.pyd,sha256=kkuA7gOSfF_q4djQkPM7t-E5GROH0jNyakVIF5bak0M,294400
+xoscar/serialization/core.cp311-win_amd64.pyd,sha256=JSJWVNyzniebPGUWVfeizWSvdZlrJFZkJJm2Uxl6bZg,294912
 xoscar/serialization/core.pxd,sha256=X-47bqBM2Kzw5SkLqICdKD0gU6CpmLsBxC3kfW--wVk,1013
 xoscar/serialization/core.pyx,sha256=H6YZos-OHDxqFvu1vKvoH3Fhw3HzGn8dI3YPACFL5C0,31085
 xoscar/serialization/cuda.py,sha256=Fj4Cpr_YmkGceUCo0mQn8fRvmHP_5WcLdRx6epZ3RC0,3869
@@ -76,7 +75,7 @@ xoscar/serialization/exception.py,sha256=t6yZn_Ate04UE1RbabNh7mu739sdtwarjuPXWhA
 xoscar/serialization/numpy.py,sha256=C6WVx-Sdl2OHBAvVY34DFjAKXlekMbpc2ni6bR8wxYo,3001
 xoscar/serialization/pyfury.py,sha256=3ucal29Hr7PX9_1SfB2x43FE2xw_C0rLkVv3foL7qwM,1200
 xoscar/serialization/scipy.py,sha256=9ph-yoRoNiwUZTwQrn35U60VPirWlncXNAg6EXvqMR4,2554
-xoscar-0.3.0.dist-info/METADATA,sha256=xTCPaE-hcyu068f2-F_Xi6gqb_3Nu3LwiQRq-dgxINQ,9438
-xoscar-0.3.0.dist-info/WHEEL,sha256=nSybvzWlmdJnHiUQSY-d7V1ycwEVUTqXiTvr2eshg44,102
-xoscar-0.3.0.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
-xoscar-0.3.0.dist-info/RECORD,,
+xoscar-0.3.2.dist-info/METADATA,sha256=JntIPeg3LYhNWmp19WZeEetJ5ykvrrkPXb2wInUVAOE,9471
+xoscar-0.3.2.dist-info/WHEEL,sha256=nSybvzWlmdJnHiUQSY-d7V1ycwEVUTqXiTvr2eshg44,102
+xoscar-0.3.2.dist-info/top_level.txt,sha256=vYlqqY4Nys8Thm1hePIuUv8eQePdULVWMmt7lXtX_ZA,21
+xoscar-0.3.2.dist-info/RECORD,,

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)