opengris-scaler 1.12.9__cp38-cp38-manylinux_2_28_x86_64.whl → 1.12.12__cp38-cp38-manylinux_2_28_x86_64.whl

{opengris_scaler-1.12.9.dist-info → opengris_scaler-1.12.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: opengris-scaler
-Version: 1.12.9
+Version: 1.12.12
 Summary: OpenGRIS Scaler Distribution Framework
 Author-Email: Citi <opensource@citi.com>
 License: Apache 2.0
@@ -365,6 +365,8 @@ with Client(address="tcp://127.0.0.1:2345") as client:
     print(future.result())  # 21
 ```
 
+**Note**: When creating a `Client` inside a task (nested client), the `address` parameter is optional. If omitted, the client automatically uses the scheduler address from the worker context. If provided, the specified address takes precedence.
+
 ## Task Routing and Capability Management
 
 > **Note**: This feature is experimental and may change in future releases.

{opengris_scaler-1.12.9.dist-info → opengris_scaler-1.12.12.dist-info}/RECORD

@@ -3,9 +3,9 @@ opengris_scaler.libs/libkj-1-094aa318.1.0.so,sha256=dRbFbTaca-2vf1SS5LDL3WNfPzoE
 scaler/CMakeLists.txt,sha256=60rkhpiwy0F-DSsRX_6nRrjYQvQ1Jp9mGp8fZsi006k,305
 scaler/__init__.py,sha256=nZU5QZ9oW2YIaGwm3-r-6dfmirTVzZpDPDNtX-ITCV4,513
 scaler/about.py,sha256=OBcfSvHO0P3mWaa2Ci4WEOTbH7is-3uYymScxgZPxyg,161
-scaler/version.txt,sha256=BapNVsomB8f82_4o6SME3mmtU8l5mwsJj9b5hMy6ADk,7
+scaler/version.txt,sha256=_ybmMM5LatOmnnmjaCb5UGsJOUUCujnikVGbB3D0Atg,8
 scaler/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scaler/client/client.py,sha256=uyYVNYhLaX3H-Aqecf-yHSqvkKnWeDzpTr2atNUUv0E,24373
+scaler/client/client.py,sha256=9WWclvdsouYPREGwmkWWA3gpz5DVFEAD6HKbtXr3Jx8,25506
 scaler/client/future.py,sha256=fOl5g4Is4E5jtvO0kmRk4uUs_eUjSjMmyniYhWMAH4w,10041
 scaler/client/object_buffer.py,sha256=MBjz1Rf6ufgTyjMYoV8V78xpezot0aUit41nj-5kV50,4670
 scaler/client/object_reference.py,sha256=Pow064leLlO6OhfW-yyEjcesbzn22ijqGBSQlsQNEtU,606
@@ -43,7 +43,7 @@ scaler/config/types/worker.py,sha256=0pt871QcyQ0_PEDVPxxgnnk3l5_syQA-71V1bhUmf0g
 scaler/config/types/zmq.py,sha256=0VODax61H-4PxN6rIeWKlMXOHiW5elVSt1zc-UF0SL8,2593
 scaler/entry_points/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/entry_points/cluster.py,sha256=5jPO_fFVe8IiSiAkLhLZ0mXJKXiYUWjvpXjEGlcgwW4,5779
-scaler/entry_points/object_storage_server.py,sha256=SEfBC_MdIHdZUxqHhGPb2AHje5dtIEM5uELRdHfFc0o,1316
+scaler/entry_points/object_storage_server.py,sha256=YGDl9-ws0oha1YXXl3gFH660B-IV2o06gCp41zUovdg,1418
 scaler/entry_points/scheduler.py,sha256=w4Ps1PJX0dnu13xwnnuQFMppkW5Se7cIrcXuJlaWfTA,6025
 scaler/entry_points/top.py,sha256=pqOPD27HeZrnMvqw4cOF4bvZ-sxgg7zp_Q1v8VtbC4A,9542
 scaler/entry_points/webui.py,sha256=ypcrE6Lr4rUX_qM0qSsv-dX7kzZiMMWTe5GL-Ol45BI,1067
@@ -108,7 +108,7 @@ scaler/io/ymq/pymod_ymq/python.h,sha256=wb0-WNF4occ4nDphSoUI47_OrfVPP72eLlGC_B59
 scaler/io/ymq/pymod_ymq/ymq.cpp,sha256=LoxL5ViLK0zyWRSYfmZn0QO-0vLw3xVZrRQJ5rWtc4w,526
 scaler/io/ymq/pymod_ymq/ymq.h,sha256=juX5DcDMY8rxp5BixFR0NgSlTrLBPog4JdqyQB9NfVI,11936
 scaler/io/ymq/third_party/concurrentqueue.h,sha256=yN268t8miyojar0bBBPIEjMI3DlHVZci2eufkDDA0FA,152819
-scaler/object_storage/CMakeLists.txt,sha256=tmkXHBOe1Gho32n4zEqChZBNlxytRTPnIaJ_hAWHBKg,1665
+scaler/object_storage/CMakeLists.txt,sha256=qexi6sKNGieaRhKkO65kxdaQrKRY-8adYKlvc42aEew,1566
 scaler/object_storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/object_storage/constants.h,sha256=b5iTCS6lxWjNlanaknIheKJocTofopVxpcRCuMxiDaI,304
 scaler/object_storage/defs.h,sha256=hYFhhYdHgkT6C7iFQuG2d-Rexvkr8VvIy1LLGEh8Mrk,286
@@ -118,9 +118,9 @@ scaler/object_storage/message.cpp,sha256=nOaLu--Q1UyRLLHZY_8obHtGEhSnPiSnMSbF5uO
 scaler/object_storage/message.h,sha256=8KCts7n36jys3PiX09-lPtfa6DjfHI_2hYvled9afG0,4208
 scaler/object_storage/object_manager.cpp,sha256=cxNv9vOkCC910hlF5JF0mOUwTho8ieA1RJgF_P4e3ho,3083
 scaler/object_storage/object_manager.h,sha256=TkxICR8_20I-tkHwnMO0VpLWkm24vOEabrmQG6hdnmQ,1696
-scaler/object_storage/object_storage_server.cpp,sha256=lJ863--NU6yzcUJAL4EQ2yQjDBekOaP0dYU581hl_Nc,13635
+scaler/object_storage/object_storage_server.cpp,sha256=ZiMpLOakguD3p108OVRf0XQmsZtHN5tw5Fs46Pq0nwA,13794
 scaler/object_storage/object_storage_server.h,sha256=11BD3U9NnLcqx8hFXJCnTjvQEgyirj-0LKlTYgtzaXI,4277
-scaler/object_storage/object_storage_server.so,sha256=S5JyMSQqRZHKBoBe0WE2Llk4Yye4tQRjElAfKdRF9yo,1353377
+scaler/object_storage/object_storage_server.so,sha256=ic4LhtD3scZgBv_relU691uKHM8PDX1iICh1ikGguXM,1349345
 scaler/object_storage/pymod_object_storage_server.cpp,sha256=D09p81wZF6WnV35I6od3iDhgktV20v82CRR_tQ90ROs,3811
 scaler/protocol/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/protocol/introduction.md,sha256=G8oRzui4KmSlfFUu70y24tTmDmfEKBkog9tFVUn7G1U,5406
@@ -200,18 +200,18 @@ scaler/utility/queues/async_sorted_priority_queue.py,sha256=f4k1dO34LcJkq1OMLbI_
 scaler/utility/queues/indexed_queue.py,sha256=MLFkXWEZ8HaJC-gKZD9F9gf-oXL_lJ7O317FnTWFCuQ,3077
 scaler/worker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/worker/preload.py,sha256=gjkNx1IvRBk_bJeYCBN_tD6Vyw8n0LJbnI1O2qwZz18,3086
-scaler/worker/worker.py,sha256=gMsuHQcnOS9ej1JOTXbB0-bJJfCA2p590kGcg9y0zKk,10892
+scaler/worker/worker.py,sha256=Zj4kGey1FAgF7vzY6R0q2Xp48cJei4jh9IMyi9N2NDc,10937
 scaler/worker/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/worker/agent/heartbeat_manager.py,sha256=R-pWuH8xixqHsANGVv_pFkJtFie4S2VNHlFa4olWfJA,4730
 scaler/worker/agent/mixins.py,sha256=fhTytvyBHB3ydIy-J1_q4bvp4fsCTUPAU2ZDC5rCQFI,4067
-scaler/worker/agent/processor_holder.py,sha256=VYr-Io-eVZvT9bD0t3h-ESHoBoU1iqYZKQ-Cyvxi8NU,4978
-scaler/worker/agent/processor_manager.py,sha256=0AOn1eViRlgPTxsmMGWFvhBiJiRk1p24sbaHK0Q8zPM,13248
+scaler/worker/agent/processor_holder.py,sha256=TZoTG6C7NkSmYkg7MfVEmK2AIxaRBqLVp1ZMZwNlfuE,5065
+scaler/worker/agent/processor_manager.py,sha256=BBBf7DirMvCgfVXzBRgyX76QE8lFnsjIW3KL465bpo0,13375
 scaler/worker/agent/profiling_manager.py,sha256=77qF_b8LhfKszQ5eNZiUUc9FqcBCH5Uo1jpEklbCExg,3977
 scaler/worker/agent/task_manager.py,sha256=7X1J9MW8Ib58t1dBb84yhkZVo60zezKn-Z5M2oF-RoA,6149
 scaler/worker/agent/timeout_manager.py,sha256=HAUBUOhFh8QTeuYTrhInr0mX1O12PGbODBkkUtcLReQ,602
 scaler/worker/agent/processor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/worker/agent/processor/object_cache.py,sha256=6IlU1hAV3ZgapNj9UMXJI_eN7uwVbCvVh9Vhlv6arEs,3857
-scaler/worker/agent/processor/processor.py,sha256=_KZDCmpECwnnnEp_oIg2rb0mIqR1oLpzON5PSXziUag,10843
+scaler/worker/agent/processor/processor.py,sha256=DZgJEvUXKYbpqCO72rCAhYaTJa-ZilShPe_ympy1ksc,11104
 scaler/worker/agent/processor/streaming_buffer.py,sha256=aOBfbC3VOveYvpR6HIqBcTCXPc--dY0-q1IGIAXeI1k,863
 scaler/worker_adapter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaler/worker_adapter/native.py,sha256=FYlw7TFY5zn2re-9bJ5SnTCAAsx7I_4HEbRJIkRlz9E,6179
@@ -222,10 +222,10 @@ scaler/worker_adapter/symphony/message.py,sha256=HOonEASua8e-uwpPVxprjyl1rrYmFJa
 scaler/worker_adapter/symphony/task_manager.py,sha256=phgx8dtAv-5ynsvsmG4DKcSlENz4b340FE6LDUWyMwo,12139
 scaler/worker_adapter/symphony/worker.py,sha256=VIDOoqVXbwrjHYN3lghbQpEIuCbVJUgiYsBknrI-0oc,7957
 scaler/worker_adapter/symphony/worker_adapter.py,sha256=eAAD1O0Uz1pjEdQPPl2fd8kyaF6q-aqCRrg48k1ocUU,5455
-opengris_scaler-1.12.9.dist-info/METADATA,sha256=Yk5bpbJorqpYauwfQ26S-BG7KHYEexvon0rWodbQrp0,26987
-opengris_scaler-1.12.9.dist-info/WHEEL,sha256=bKtBd2Y01bPNvwWQdkWtUr_JJojfYjoR2u8AhaLkE6I,116
-opengris_scaler-1.12.9.dist-info/entry_points.txt,sha256=KROw4kj4Z6p8YuOgpOFt5spHskm87A7Z-fOOffT4tVU,446
-opengris_scaler-1.12.9.dist-info/RECORD,,
-opengris_scaler-1.12.9.dist-info/licenses/LICENSE,sha256=xudC0jta6OXJkSHiLzzQQU50HIwSo0G97exO280dtR8,11345
-opengris_scaler-1.12.9.dist-info/licenses/LICENSE.spdx,sha256=i49Qe6AmXxuvocKyExEFduvdh-NQ5YuxdHs515G8VOQ,225
-opengris_scaler-1.12.9.dist-info/licenses/NOTICE,sha256=JUHdG2ssq0nP2QsqPM8X2eJhfJhK_lemIvDBqBRXrMo,286
+opengris_scaler-1.12.12.dist-info/METADATA,sha256=It2hi9UNQsgtbh--T9GMMiPlwYH2CnWCXEYrcY_uEV4,27234
+opengris_scaler-1.12.12.dist-info/WHEEL,sha256=bKtBd2Y01bPNvwWQdkWtUr_JJojfYjoR2u8AhaLkE6I,116
+opengris_scaler-1.12.12.dist-info/entry_points.txt,sha256=KROw4kj4Z6p8YuOgpOFt5spHskm87A7Z-fOOffT4tVU,446
+opengris_scaler-1.12.12.dist-info/RECORD,,
+opengris_scaler-1.12.12.dist-info/licenses/LICENSE,sha256=xudC0jta6OXJkSHiLzzQQU50HIwSo0G97exO280dtR8,11345
+opengris_scaler-1.12.12.dist-info/licenses/LICENSE.spdx,sha256=i49Qe6AmXxuvocKyExEFduvdh-NQ5YuxdHs515G8VOQ,225
+opengris_scaler-1.12.12.dist-info/licenses/NOTICE,sha256=JUHdG2ssq0nP2QsqPM8X2eJhfJhK_lemIvDBqBRXrMo,286

scaler/client/client.py

@@ -51,7 +51,7 @@ class _CallNode:
 class Client:
     def __init__(
         self,
-        address: str,
+        address: Optional[str] = None,
         profiling: bool = False,
         timeout_seconds: int = DEFAULT_CLIENT_TIMEOUT_SECONDS,
         heartbeat_interval_seconds: int = DEFAULT_HEARTBEAT_INTERVAL_SECONDS,
@@ -61,8 +61,9 @@ class Client:
         """
         The Scaler Client used to send tasks to a scheduler.
 
-        :param address: Address of Scheduler to submit work to
-        :type address: str
+        :param address: Address of Scheduler to submit work to. If None, will attempt to auto-detect
+                       when running inside a worker context.
+        :type address: Optional[str]
         :param profiling: If True, the returned futures will have the `task_duration()` property enabled.
         :type profiling: bool
         :param timeout_seconds: Seconds until heartbeat times out
@@ -72,6 +73,7 @@ class Client:
         :param stream_output: If True, stdout/stderr will be streamed to client during task execution
         :type stream_output: bool
         """
+        address = self._resolve_scheduler_address(address)
         self.__initialize__(address, profiling, timeout_seconds, heartbeat_interval_seconds, serializer, stream_output)
 
     def __initialize__(
@@ -380,6 +382,10 @@ class Client:
         disconnect from connected scheduler, this will not shut down the scheduler
         """
 
+        # Handle case where client wasn't fully initialized
+        if not hasattr(self, "_stop_event"):
+            return
+
         if self._stop_event.is_set():
             self.__destroy()
             return
@@ -633,3 +639,20 @@ class Client:
         assert current_task is not None
 
         return retrieve_task_flags_from_task(current_task).priority
+
+    def _resolve_scheduler_address(self, address: Optional[str]) -> str:
+        """Resolve the scheduler address based on the provided address and worker context."""
+        # Provided address always takes precedence
+        if address is not None:
+            return address
+
+        # No address provided, check if we're running inside a worker context
+        current_processor = Processor.get_current_processor()
+        if current_processor is None:
+            raise ValueError(
+                "No scheduler address provided and not running inside a worker context. "
+                "Please provide a scheduler address when creating the Client outside of a worker."
+            )
+
+        # Return the scheduler address from the current processor
+        return current_processor.scheduler_address().to_address()

scaler/entry_points/object_storage_server.py

@@ -1,5 +1,6 @@
 import argparse
 import logging
+import sys
 
 from scaler.config.loader import load_config
 from scaler.config.section.object_storage_server import ObjectStorageServerConfig
@@ -31,11 +32,14 @@ def main():
 
     log_format_str, log_level_str, log_paths = get_logger_info(logging.getLogger())
 
-    ObjectStorageServer().run(
-        oss_config.object_storage_address.host,
-        oss_config.object_storage_address.port,
-        oss_config.object_storage_address.identity,
-        log_level_str,
-        log_format_str,
-        log_paths,
-    )
+    try:
+        ObjectStorageServer().run(
+            oss_config.object_storage_address.host,
+            oss_config.object_storage_address.port,
+            oss_config.object_storage_address.identity,
+            log_level_str,
+            log_format_str,
+            log_paths,
+        )
+    except KeyboardInterrupt:
+        sys.exit(0)

scaler/object_storage/CMakeLists.txt

@@ -31,11 +31,9 @@ set_target_properties(py_object_storage_server PROPERTIES
 )
 
 target_link_libraries(py_object_storage_server PRIVATE
-    $<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,-Bstatic>
     capnp_objs
     ymq_objs
     object_storage_server_objs
-    $<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,-Bdynamic>
     CapnProto::capnp
     CapnProto::kj
     Python3::Module

scaler/object_storage/object_storage_server.cpp

@@ -138,6 +138,8 @@ void ObjectStorageServer::processRequests(std::function<bool()> running)
             auto maybeMessageFuture = ymq::futureRecvMessage(_ioSocket);
             while (maybeMessageFuture.wait_for(100ms) == std::future_status::timeout) {
                 if (!running()) {
+                    _logger.log(scaler::ymq::Logger::LoggingLevel::info, "ObjectStorageServer: stopped by user");
+                    pendingRequests.clear();
                     return;
                 }
             }

scaler/version.txt

@@ -1 +1 @@
-1.12.9
+1.12.12

scaler/worker/agent/processor/processor.py

@@ -37,6 +37,7 @@ class Processor(multiprocessing.get_context("spawn").Process):  # type: ignore
         self,
         event_loop: str,
         agent_address: ZMQConfig,
+        scheduler_address: ZMQConfig,
         storage_address: ObjectStorageConfig,
         preload: Optional[str],
         resume_event: Optional[EventType],
@@ -50,6 +51,7 @@ class Processor(multiprocessing.get_context("spawn").Process):  # type: ignore
 
         self._event_loop = event_loop
         self._agent_address = agent_address
+        self._scheduler_address = scheduler_address
         self._storage_address = storage_address
         self._preload = preload
 
@@ -74,6 +76,10 @@ class Processor(multiprocessing.get_context("spawn").Process):  # type: ignore
         """Returns the current Processor instance controlling the current process, if any."""
         return _current_processor.get()
 
+    def scheduler_address(self) -> ZMQConfig:
+        """Returns the scheduler address this processor's worker is connected to."""
+        return self._scheduler_address
+
     def current_task(self) -> Optional[Task]:
         return self._current_task
 

scaler/worker/agent/processor_holder.py

@@ -19,6 +19,7 @@ class ProcessorHolder:
         self,
         event_loop: str,
         agent_address: ZMQConfig,
+        scheduler_address: ZMQConfig,
         storage_address: ObjectStorageConfig,
         preload: Optional[str],
         garbage_collect_interval_seconds: int,
@@ -43,6 +44,7 @@ class ProcessorHolder:
         self._processor = Processor(
             event_loop=event_loop,
             agent_address=agent_address,
+            scheduler_address=scheduler_address,
             storage_address=storage_address,
             preload=preload,
             resume_event=self._resume_event,

scaler/worker/agent/processor_manager.py

@@ -23,6 +23,7 @@ class VanillaProcessorManager(ProcessorManager):
         identity: WorkerID,
         event_loop: str,
         address_internal: ZMQConfig,
+        scheduler_address: ZMQConfig,
         preload: Optional[str],
         garbage_collect_interval_seconds: int,
         trim_memory_threshold_bytes: int,
@@ -34,6 +35,7 @@ class VanillaProcessorManager(ProcessorManager):
 
         self._identity = identity
         self._event_loop = event_loop
+        self._scheduler_address = scheduler_address
         self._preload = preload
 
         self._garbage_collect_interval_seconds = garbage_collect_interval_seconds
@@ -299,6 +301,7 @@ class VanillaProcessorManager(ProcessorManager):
         self._current_holder = ProcessorHolder(
             self._event_loop,
             self._address_internal,
+            self._scheduler_address,
             storage_address,
             self._preload,
             self._garbage_collect_interval_seconds,

scaler/worker/worker.py

@@ -139,6 +139,7 @@ class Worker(multiprocessing.get_context("spawn").Process):  # type: ignore
             identity=self._ident,
             event_loop=self._event_loop,
             address_internal=self._address_internal,
+            scheduler_address=self._address,
             preload=self._preload,
             garbage_collect_interval_seconds=self._garbage_collect_interval_seconds,
             trim_memory_threshold_bytes=self._trim_memory_threshold_bytes,