continuum-task-server-sdk 1.5.0__tar.gz → 1.6.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/PKG-INFO +1 -1
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/__init__.py +1 -1
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/client.py +8 -2
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/presence.py +3 -0
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/server.py +9 -5
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/websocket.py +23 -5
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/pyproject.toml +1 -1
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/.gitignore +0 -0
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/README.md +0 -0
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/_http.py +0 -0
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/_stomp.py +0 -0
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/context.py +0 -0
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/exceptions.py +0 -0
- {continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/models.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: continuum-task-server-sdk
|
|
3
|
-
Version: 1.
|
|
3
|
+
Version: 1.6.0
|
|
4
4
|
Summary: Python SDK for the Continuum Task Server
|
|
5
5
|
Project-URL: Homepage, https://github.com/ContinuumWorkflow/continuum-task-server-sdk-python
|
|
6
6
|
Project-URL: Issues, https://github.com/ContinuumWorkflow/continuum-task-server-sdk-python/issues
|
{continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/client.py
RENAMED
|
@@ -240,6 +240,8 @@ class QueueApi:
|
|
|
240
240
|
priority: int | None = None,
|
|
241
241
|
parent_id: UUID | str | None = None,
|
|
242
242
|
idempotency_token: str | None = None,
|
|
243
|
+
layer: str | None = None,
|
|
244
|
+
strict_layer: bool | None = None,
|
|
243
245
|
) -> QueueItem:
|
|
244
246
|
"""Add a queue item. At least one of task_name or task_item_name is required."""
|
|
245
247
|
if task_name is None and task_item_name is None:
|
|
@@ -252,6 +254,8 @@ class QueueApi:
|
|
|
252
254
|
"priority": priority,
|
|
253
255
|
"inputData": _encode_input(input_data),
|
|
254
256
|
"idempotencyToken": idempotency_token,
|
|
257
|
+
"layer": layer,
|
|
258
|
+
"strictLayer": strict_layer,
|
|
255
259
|
}
|
|
256
260
|
)
|
|
257
261
|
return QueueItem.model_validate(self._http.post_json(self._MGMT, body))
|
|
@@ -266,9 +270,11 @@ class QueueApi:
|
|
|
266
270
|
data, mime = result
|
|
267
271
|
return Content(data=data, mime_type=mime)
|
|
268
272
|
|
|
269
|
-
def claim(self, task_name: str) -> QueueItem | None:
|
|
273
|
+
def claim(self, task_name: str, *, layer: str | None = None) -> QueueItem | None:
|
|
270
274
|
"""Claim one OPEN queue item for the given task name. Returns None if none available."""
|
|
271
|
-
result = self._http.post_optional(
|
|
275
|
+
result = self._http.post_optional(
|
|
276
|
+
f"{self._QUEUE}/claim", drop_none({"taskName": task_name, "layer": layer})
|
|
277
|
+
)
|
|
272
278
|
if result is None:
|
|
273
279
|
return None
|
|
274
280
|
return QueueItem.model_validate(result)
|
|
@@ -37,12 +37,14 @@ class TaskServerPresence:
|
|
|
37
37
|
instance_id: str | None,
|
|
38
38
|
labels: dict[str, str] | None,
|
|
39
39
|
task_names: Callable[[], Iterable[str]],
|
|
40
|
+
layer: str | None = None,
|
|
40
41
|
) -> None:
|
|
41
42
|
self._client = client
|
|
42
43
|
self._name = name or None
|
|
43
44
|
self._instance_id = instance_id or str(uuid.uuid4())
|
|
44
45
|
self._labels = _labels(labels)
|
|
45
46
|
self._task_names = task_names
|
|
47
|
+
self._layer = layer.strip() if isinstance(layer, str) and layer.strip() else None
|
|
46
48
|
self._enabled = True
|
|
47
49
|
self._stopped = threading.Event()
|
|
48
50
|
self._token: str | None = None
|
|
@@ -111,6 +113,7 @@ class TaskServerPresence:
|
|
|
111
113
|
"name": self._name,
|
|
112
114
|
"taskNames": list(self._task_names()),
|
|
113
115
|
"labels": self._labels,
|
|
116
|
+
"layer": self._layer,
|
|
114
117
|
}
|
|
115
118
|
try:
|
|
116
119
|
payload = self._client.post_raw(_PATH, body) or {}
|
{continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/server.py
RENAMED
|
@@ -97,6 +97,7 @@ class TaskServer:
|
|
|
97
97
|
labels: dict[str, str] | None = None,
|
|
98
98
|
instance_id: str | None = None,
|
|
99
99
|
presence: bool = True,
|
|
100
|
+
layer: str | None = None,
|
|
100
101
|
) -> None:
|
|
101
102
|
http_transport: httpx.BaseTransport | None = None
|
|
102
103
|
if isinstance(transport, httpx.BaseTransport):
|
|
@@ -134,6 +135,7 @@ class TaskServer:
|
|
|
134
135
|
self._base_url = base_url
|
|
135
136
|
self._api_key = api_key
|
|
136
137
|
self._active: dict[uuid.UUID, _ActiveClaim] = {}
|
|
138
|
+
self._layer = layer.strip() if isinstance(layer, str) and layer.strip() else None
|
|
137
139
|
self._presence = (
|
|
138
140
|
TaskServerPresence(
|
|
139
141
|
self._client,
|
|
@@ -141,6 +143,7 @@ class TaskServer:
|
|
|
141
143
|
instance_id=instance_id,
|
|
142
144
|
labels=labels,
|
|
143
145
|
task_names=self._handlers.keys,
|
|
146
|
+
layer=self._layer,
|
|
144
147
|
)
|
|
145
148
|
if presence
|
|
146
149
|
else None
|
|
@@ -364,7 +367,8 @@ class TaskServer:
|
|
|
364
367
|
ws = self._ensure_websocket()
|
|
365
368
|
ws.connect()
|
|
366
369
|
for name in self._handlers:
|
|
367
|
-
ws.
|
|
370
|
+
ws.set_layer(self._layer)
|
|
371
|
+
ws.subscribe_work(name, layer=self._layer)
|
|
368
372
|
logger.info("WebSocket subscribed to work: %s", list(self._handlers))
|
|
369
373
|
while not self._stop_event.is_set():
|
|
370
374
|
event = ws.next_event(timeout=0.25)
|
|
@@ -654,19 +658,19 @@ class TaskServer:
|
|
|
654
658
|
|
|
655
659
|
def _claim_http(self, task_name: str) -> QueueItem | None:
|
|
656
660
|
try:
|
|
657
|
-
return self._client.queue.claim(task_name)
|
|
661
|
+
return self._client.queue.claim(task_name, layer=self._layer)
|
|
658
662
|
except ConflictError:
|
|
659
663
|
if self._presence is None or not self._presence.reregister():
|
|
660
664
|
raise
|
|
661
|
-
return self._client.queue.claim(task_name)
|
|
665
|
+
return self._client.queue.claim(task_name, layer=self._layer)
|
|
662
666
|
|
|
663
667
|
def _claim_socket(self, ws: ContinuumWebSocketClient, task_name: str) -> QueueItem | None:
|
|
664
668
|
try:
|
|
665
|
-
return ws.claim(task_name)
|
|
669
|
+
return ws.claim(task_name, layer=self._layer)
|
|
666
670
|
except ConflictError:
|
|
667
671
|
if self._presence is None or not self._presence.reregister():
|
|
668
672
|
raise
|
|
669
|
-
return ws.claim(task_name)
|
|
673
|
+
return ws.claim(task_name, layer=self._layer)
|
|
670
674
|
|
|
671
675
|
def _drain(self) -> None:
|
|
672
676
|
if self._executor is None:
|
|
@@ -127,6 +127,7 @@ class ContinuumWebSocketClient:
|
|
|
127
127
|
self._events_cv = threading.Condition()
|
|
128
128
|
self._event_callbacks: list[EventCallback] = []
|
|
129
129
|
self._work_subscriptions: set[str] = set()
|
|
130
|
+
self._layer: str | None = None
|
|
130
131
|
self._control_subscriptions: set[tuple[str, str | None]] = set()
|
|
131
132
|
self._wait_subscribers: set[str] = set()
|
|
132
133
|
self._seen_completed: OrderedDict[str, None] = OrderedDict()
|
|
@@ -228,6 +229,8 @@ class ContinuumWebSocketClient:
|
|
|
228
229
|
parent_id: UUID | str | None = None,
|
|
229
230
|
request_id: str | None = None,
|
|
230
231
|
idempotency_token: str | None = None,
|
|
232
|
+
layer: str | None = None,
|
|
233
|
+
strict_layer: bool | None = None,
|
|
231
234
|
) -> QueueItem:
|
|
232
235
|
if task_name is None and task_item_name is None:
|
|
233
236
|
raise ValueError("at least one of task_name or task_item_name is required")
|
|
@@ -239,6 +242,8 @@ class ContinuumWebSocketClient:
|
|
|
239
242
|
"priority": priority,
|
|
240
243
|
"inputData": _encode_input(input_data),
|
|
241
244
|
"idempotencyToken": idempotency_token,
|
|
245
|
+
"layer": layer,
|
|
246
|
+
"strictLayer": strict_layer,
|
|
242
247
|
}
|
|
243
248
|
)
|
|
244
249
|
payload = self._command("/app/enqueue", body, request_id=request_id, retry=False)
|
|
@@ -260,6 +265,8 @@ class ContinuumWebSocketClient:
|
|
|
260
265
|
correlation: str | None = None,
|
|
261
266
|
request_id: str | None = None,
|
|
262
267
|
idempotency_token: str | None = None,
|
|
268
|
+
layer: str | None = None,
|
|
269
|
+
strict_layer: bool | None = None,
|
|
263
270
|
) -> EnqueueAndSubscribeWaitResult:
|
|
264
271
|
if task_name is None and task_item_name is None:
|
|
265
272
|
raise ValueError("at least one of task_name or task_item_name is required")
|
|
@@ -277,6 +284,8 @@ class ContinuumWebSocketClient:
|
|
|
277
284
|
"mode": mode_value,
|
|
278
285
|
"correlation": correlation,
|
|
279
286
|
"idempotencyToken": idempotency_token,
|
|
287
|
+
"layer": layer,
|
|
288
|
+
"strictLayer": strict_layer,
|
|
280
289
|
}
|
|
281
290
|
)
|
|
282
291
|
payload = self._command(
|
|
@@ -289,10 +298,16 @@ class ContinuumWebSocketClient:
|
|
|
289
298
|
self._wait_subscribers.add(subscriber_id)
|
|
290
299
|
return result
|
|
291
300
|
|
|
292
|
-
def
|
|
301
|
+
def set_layer(self, layer: str | None) -> None:
|
|
302
|
+
self._layer = layer.strip() if isinstance(layer, str) and layer.strip() else None
|
|
303
|
+
|
|
304
|
+
def claim(
|
|
305
|
+
self, task_name: str, *, request_id: str | None = None, layer: str | None = None
|
|
306
|
+
) -> QueueItem | None:
|
|
307
|
+
chosen = layer if layer else self._layer
|
|
293
308
|
payload = self._command(
|
|
294
309
|
"/app/claim",
|
|
295
|
-
{"taskName": task_name},
|
|
310
|
+
drop_none({"taskName": task_name, "layer": chosen}),
|
|
296
311
|
request_id=request_id,
|
|
297
312
|
retry=False,
|
|
298
313
|
)
|
|
@@ -343,11 +358,12 @@ class ContinuumWebSocketClient:
|
|
|
343
358
|
return QueueItem.model_validate(payload["item"])
|
|
344
359
|
|
|
345
360
|
def subscribe_work(
|
|
346
|
-
self, task_name: str, *, request_id: str | None = None
|
|
361
|
+
self, task_name: str, *, request_id: str | None = None, layer: str | None = None
|
|
347
362
|
) -> WorkSubscriptionResult:
|
|
363
|
+
chosen = layer if layer else self._layer
|
|
348
364
|
payload = self._command(
|
|
349
365
|
"/app/subscribeWork",
|
|
350
|
-
{"taskName": task_name},
|
|
366
|
+
drop_none({"taskName": task_name, "layer": chosen}),
|
|
351
367
|
request_id=request_id,
|
|
352
368
|
retry=True,
|
|
353
369
|
)
|
|
@@ -695,7 +711,9 @@ class ContinuumWebSocketClient:
|
|
|
695
711
|
controls = list(self._control_subscriptions)
|
|
696
712
|
for task_name in work:
|
|
697
713
|
try:
|
|
698
|
-
self._command_inline(
|
|
714
|
+
self._command_inline(
|
|
715
|
+
"/app/subscribeWork", drop_none({"taskName": task_name, "layer": self._layer})
|
|
716
|
+
)
|
|
699
717
|
except ContinuumError:
|
|
700
718
|
logger.error("Failed to restore work subscription %s", task_name, exc_info=True)
|
|
701
719
|
for subscriber_id in waits:
|
|
File without changes
|
|
File without changes
|
{continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/_http.py
RENAMED
|
File without changes
|
{continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/_stomp.py
RENAMED
|
File without changes
|
{continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/context.py
RENAMED
|
File without changes
|
|
File without changes
|
{continuum_task_server_sdk-1.5.0 → continuum_task_server_sdk-1.6.0}/continuum_task_server/models.py
RENAMED
|
File without changes
|