DefStream-RabbitMQ 0.1.1.3__py3-none-any.whl → 0.1.2.6__py3-none-any.whl

DefStream/Broker/Implements/RabbitMQ/Configuration.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from ... import Configuration as BaseConfiguration
+from DefStream.Broker import Configuration as BaseConfiguration
 
 from .Serializer import (
 	Encoder,

DefStream/Broker/Implements/RabbitMQ/Connection.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from ...Connection import (
+from DefStream.Broker import (
 	Connection as BaseConnection,
 	GetExchange,
 	GetQueue,
@@ -9,6 +9,8 @@ from ...Connection import (
 	Declarable,
 	TaskSender,
 	Requestable,
+	PrioritySupport,
+	EventHandler,
 )
 
 from .Configuration import Configuration
@@ -18,7 +20,6 @@ from .Queue import Queue
 from .Stream import Stream
 from .Consumer import Consumer
 from .Subscription import Subscription
-from ...Event import EventHandler
 
 from pika import (
 	BlockingConnection,
@@ -37,7 +38,7 @@ from enum import Enum
 from uuid import uuid4
 
 from typing import (
-	Any,
+	Any as AnyValue,
 	Iterator,
 	Union,
 	Optional,
@@ -75,7 +76,10 @@ class Parameters(Mapping):
 	def __len__(self) -> int:
 		return self.args.__len__()
 	
-	def __getitem__(self, key: Any) -> Any:
+	def __getitem__(
+		self,
+		key: AnyValue,
+	) -> AnyValue:
 		return self.args.__getitem__(key)
 	
 	def __contains__(self, key: object) -> bool:
@@ -106,6 +110,7 @@ class Connection(
 	Declarable,
 	TaskSender,
 	Requestable,
+	PrioritySupport,
 ):
 	"""Connection of Event Broker for RabbitMQ"""
 	def __init__(self, conf: Configuration):
@@ -140,7 +145,7 @@ class Connection(
 
 	def declare(
 		self,
-		parameters: Any,
+		parameters: AnyValue,
 	) -> None:
 		subscription = Subscription.parse(parameters)
 		channel = self.connected().channel()
@@ -155,6 +160,8 @@ class Connection(
 					'x-dead-letter-exchange': '',
 					'x-dead-letter-routing-key': subscription.error,
 				}
+			if subscription.max_priority is not None:
+				arguments['x-max-priority'] = subscription.max_priority
 			channel.queue_declare(
 				subscription.queue,
 				durable=True,
@@ -163,13 +170,26 @@ class Connection(
 		finally:
 			if channel.is_open:
 				channel.close()
+		return
+
+	def priority_parameters(
+		self,
+		parameters: AnyValue,
+	) -> Subscription:
+		"""작업 기본값을 검증하고 선언·발행에 사용할 구독 설정을 반환한다."""
+		return Subscription.parse(parameters)
 
 	def send(
 		self,
-		body: Any,
-		parameters: Any,
+		body: AnyValue,
+		parameters: AnyValue,
+		*,
+		priority: Optional[int] = None,
 	) -> str:
 		subscription = Subscription.parse(parameters)
+		if priority is None:
+			priority = subscription.priority
+		subscription.validate_priority(priority)
 		connection = self.connected()
 		channel = self.publisher
 		if channel is None or not channel.is_open:
@@ -192,6 +212,7 @@ class Connection(
 				content_type=self.conf.encode.format,
 				content_encoding=self.conf.encode.charset,
 				delivery_mode=2,
+				priority=priority,
 			),
 			mandatory=True,
 		)
@@ -199,14 +220,25 @@ class Connection(
 
 	def request(
 		self,
-		body: Any,
-		parameters: Any,
+		body: AnyValue,
+		parameters: AnyValue,
 		timeout: float = 5,
-	) -> Any:
+		*,
+		priority: Optional[int] = None,
+	) -> AnyValue:
 		subscription = Subscription.parse(parameters)
+		if priority is None:
+			priority = subscription.priority
+		subscription.validate_priority(priority)
 		self.connected()
 		queue = self.queue(subscription.queue)
 		try:
+			if priority is not None:
+				return queue.call(
+					body,
+					timeout=timeout,
+					priority=priority,
+				)
 			return queue.call(
 				body,
 				timeout=timeout,

DefStream/Broker/Implements/RabbitMQ/Consumer.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 
-from ... import (
+from DefStream.Broker import (
 	Consumer as BaseConsumer,
 	EventHandler,
+	Event as BaseEvent,
+	EventError,
 )
 
 from .Serializer import (
@@ -15,10 +17,6 @@ from logging import getLogger
 from .Event import Event
 from .Policies import Requeue
 from .Subscription import Subscription
-from ...Event import (
-	Event as BaseEvent,
-	EventError,
-)
 from typing import (
 	Any,
 	Callable,

DefStream/Broker/Implements/RabbitMQ/Event.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from ...Event import (
+from DefStream.Broker import (
 	Event as BaseEvent,
 	EventHandler as BaseEventHandler,
 )

DefStream/Broker/Implements/RabbitMQ/Exchange.py

@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 
-from ... import (
+from DefStream.Broker import (
 	Sendable,
 	Callable,
+	RemoteError,
+	validate_priority,
 )
 
 from .Serializer import (
 	Encoder,
 	Decoder,
 )
-from ...Errors import RemoteError
 from copy import deepcopy
 from math import (
 	ceil,
@@ -74,12 +75,16 @@ class Exchange(
 		body,
 		event: str = None,
 		headers: Dict = {},
-		priority: int = None,
+		priority: Optional[int] = None,
 		expiration: int = None,
 		timestamp: int = None,
 		persistent: bool = True,
 		id: str = None,
 	):
+		validate_priority(
+			priority,
+			255,
+		)
 		if not timestamp: timestamp = int(time())
 		if not id: id = uuid4().hex
 		properties = BasicProperties(

DefStream/Broker/Implements/RabbitMQ/Policies.py

@@ -1,4 +1,4 @@
-from ...Policies import (
+from DefStream.Broker import (
 	Requeue,
 	Reject,
 )

DefStream/Broker/Implements/RabbitMQ/Queue.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 
-from ... import (
+from DefStream.Broker import (
 	Sendable,
 	Callable,
 	Poppable,
+	RemoteError,
+	validate_priority,
 )
 
 from .Serializer import (
@@ -11,7 +13,6 @@ from .Serializer import (
 	Decoder,
 )
 from .Event import Event
-from ...Errors import RemoteError
 from copy import deepcopy
 from math import (
 	ceil,
@@ -78,7 +79,7 @@ class Queue(
 		body,
 		event: str = None,
 		headers: Dict = {},
-		priority: int = None,
+		priority: Optional[int] = None,
 		expiration: int = None,
 		timestamp: int = None,
 		persistent: bool = True,
@@ -86,6 +87,10 @@ class Queue(
 		reply_to: str = None,
 		correlation_id: str = None,
 	):
+		validate_priority(
+			priority,
+			255,
+		)
 		if not timestamp: timestamp = int(time())
 		if not id: id = uuid4().hex
 		properties = BasicProperties(
@@ -113,7 +118,13 @@ class Queue(
 		self,
 		body: Any,
 		timeout: float = 5,
+		*,
+		priority: Optional[int] = None,
 	) -> Any:
+		validate_priority(
+			priority,
+			255,
+		)
 		if self.rpc_parameters is None:
 			raise RuntimeError('RPC requires connection parameters; obtain the queue through Connection.queue')
 		if isinstance(
@@ -173,6 +184,7 @@ class Queue(
 				routing_key=self.queue,
 				body=self.encode(body),
 				properties=BasicProperties(
+					priority=priority,
 					reply_to=reply_queue,
 					correlation_id=correlation_id,
 					content_type=self.encode.format,

DefStream/Broker/Implements/RabbitMQ/Stream.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from ... import (
+from DefStream.Broker import (
 	Sendable,
 	Readable,
 )

DefStream/Broker/Implements/RabbitMQ/Subscription.py

@@ -4,6 +4,7 @@ from typing import (
 	Any,
 	Optional,
 )
+from DefStream.Broker import validate_priority
 
 __all__ = (
 	'Subscription',
@@ -16,8 +17,23 @@ class Subscription:
 	offset: Optional[int] = None
 	qos: Optional[int] = None
 	error: Optional[str] = None
+	max_priority: Optional[int] = None
+	priority: Optional[int] = None
 
 	def __post_init__(self):
+		if self.priority is not None and self.max_priority is None:
+			object.__setattr__(
+				self,
+				'max_priority',
+				255,
+			)
+		validate_priority(
+			self.max_priority,
+			255,
+			minimum=1,
+			name='max_priority',
+		)
+		self.validate_priority(self.priority)
 		if not isinstance(self.queue, str) or not self.queue:
 			raise ValueError('Subscription queue must be a non-empty string')
 		if self.error is not None:
@@ -37,6 +53,17 @@ class Subscription:
 				int,
 			) or not 0 <= self.qos <= 65535:
 				raise ValueError('Subscription qos must be an integer between 0 and 65535')
+		return
+
+	def validate_priority(
+		self,
+		priority: Optional[int],
+	) -> None:
+		validate_priority(
+			priority,
+			255 if self.max_priority is None else self.max_priority,
+		)
+		return
 
 	@classmethod
 	def parse(cls, parameters: Any) -> 'Subscription':

{defstream_rabbitmq-0.1.1.3.dist-info → defstream_rabbitmq-0.1.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DefStream-RabbitMQ
-Version: 0.1.1.3
+Version: 0.1.2.6
 Summary: RabbitMQ broker adapter for DefStream
 Home-page: https://github.com/yong5eon/DefStream-RabbitMQ
 Author: Heo Yongseon
@@ -176,12 +176,54 @@ Worker는 실행과 완료 훅이 끝난 뒤 ACK하고, 실패하면 지정한
   Worker의 공유 풀 크기와 별개입니다.
 - `error`: `declare()`가 생성하고 연결할 오류 큐 이름. 거부된 메시지의 DLQ입니다.
 - `offset`: RabbitMQ 스트림 구독에 사용할 정수 오프셋.
+- `max_priority`: classic 작업 큐의 최대 우선순위. 정수 `1..255` 또는 `None`.
+- `priority`: 기본 메시지 우선순위. 정수 `0..max_priority` 또는 `None`.
+  이 값만 지정하면 `max_priority`는 `255`로 설정됩니다.
 
 `Subscription` 객체 생성이나 `consumer.subs()`는 큐를 선언하지 않습니다.
 작업용 `declare()`는 일반 durable 큐와 선택적 DLQ를 준비하며,
 스트림 큐나 Exchange 바인딩을 자동 생성하지 않습니다.
 기존 큐의 선언 옵션이 다르면 실패하며 자동 삭제·재생성하지 않습니다.
 
+## 워커 작업 우선순위
+
+작업에 지정한 `Subscription`에 기본값 `priority`와 큐 최대값 `max_priority`를
+함께 설정합니다. `Run`에는 별도의 `priority` 설정을 두지 않습니다.
+
+```python
+class PriorityAdd(
+  Add,
+  parameters=Subscription(
+    queue='defstream.example.rabbitmq.priority.add',
+    qos=1,
+    max_priority=5,
+    priority=2,
+  ),
+):
+  pass
+```
+
+- 워커 API `declare(task=PriorityAdd, broker=connection)`는 큐에
+  `x-max-priority=5`를 반영합니다. 기존 DLQ 설정도 보존합니다.
+- `send(..., task=PriorityAdd, broker=connection)` 및
+  `request(..., task=PriorityAdd, broker=connection)`는 작업 기본값 `2`를 사용합니다.
+  호출에 `priority=0` 또는 다른 유효한 값을 지정하여 재정의할 수 있습니다.
+- 기본값만 정의하면 큐 최대값은 `255`, 최대값만 정의하면 기본값은 `None`입니다.
+  호출별 값도 없으면 AMQP 우선순위 속성을 생략합니다.
+- 워커 경로는 작업의 유효 최대값으로 검증합니다. 작업 설정 없이 호출에서만
+  지정하면 `0..255` 범위만 검증하며, 우선순위 큐 사전 선언은 호출자 책임입니다.
+- 기존 저수준 `Queue.send`, `Exchange.send`와 `Queue.call`도 `priority=`를 받습니다.
+  이 경로는 작업 정의를 받지 않으므로 작업별 최대값은 검증하지 않습니다.
+  정수 `0..255`만 허용하며 `bool`은 거부합니다.
+- 최대값을 늘릴수록 자원 비용이 증가하므로 필요한 수준만 지정하는 것을 권장합니다.
+- 동일 큐를 여러 작업 정의에서 선언한다면 최대값을 동일하게 맞춰야 합니다.
+  기존 일반 큐나 최대값이 다른 큐를 재선언하면 RabbitMQ 오류가 전파됩니다.
+  자동 삭제하지 않으므로, 새 큐로 전환하거나 미처리 메시지를 보존한 후 운영자가
+  안전하게 재생성하고 생산자·소비자를 함께 전환해야 합니다.
+- 높은 값이 먼저 전달되지만 이미 prefetch된 메시지나 실행 중인 작업은 선점하지
+  않습니다. 재전달, 다중 소비자에서는 완료 순서를 보장하지 않으며 낮은 우선순위
+  메시지가 오래 대기할 수 있습니다. Stream 및 Quorum 큐는 이번 지원 대상이 아닙니다.
+
 ## 동기 RPC
 
 실행 중인 Worker가 있는 큐에 `call()`을 사용하면 `Run.run()`의 반환값을 받습니다.

defstream_rabbitmq-0.1.2.6.dist-info/RECORD

@@ -0,0 +1,16 @@
+DefStream/Broker/Implements/RabbitMQ/Configuration.py,sha256=neAQA2H7zjL5dZnnXjJfyP9iv0gB8wwqKAk6wqFNZLo,1059
+DefStream/Broker/Implements/RabbitMQ/Connection.py,sha256=ArHJpoFJ3pN4Hn7Esp1Z9Ilq5V9OeLo9SOxjcG0Znj4,9758
+DefStream/Broker/Implements/RabbitMQ/Consumer.py,sha256=c1-gOdlHYTC_szQazqlOtWZqHhH4P40myXjXGmWZ54E,5170
+DefStream/Broker/Implements/RabbitMQ/Event.py,sha256=VyGORgRPiU7NIbrYV1a3MYMfof4DlerCwENc7AnacNg,1755
+DefStream/Broker/Implements/RabbitMQ/Exchange.py,sha256=uKwQZZeXg4dJZpnzLBlRYyYxyZS4P6IuIcpMjnaP-3g,4884
+DefStream/Broker/Implements/RabbitMQ/Policies.py,sha256=E0NA3zvO1h6BPr7CyMo9WPy6ztobuTd6fGUFgB8604o,90
+DefStream/Broker/Implements/RabbitMQ/Queue.py,sha256=Gq6XrWhe15rzC60OhTYfyK9xKrLt5OFalkScliOujac,5503
+DefStream/Broker/Implements/RabbitMQ/Serializer.py,sha256=ylwIBJ0blftq2W9usuYvjS3xfXovR8_9kP3O9DlXYxI,1575
+DefStream/Broker/Implements/RabbitMQ/Stream.py,sha256=IHmQY-008c3vAP35ixlP9hG0DLs8nBHhu7NJbvURs34,2296
+DefStream/Broker/Implements/RabbitMQ/Subscription.py,sha256=A1sCwWgytNYOIJ-D9PKps_1blxJNp1lGK0a1CDHh7Jw,1849
+DefStream/Broker/Implements/RabbitMQ/__init__.py,sha256=Ndt5yNXcgecN1mj0Qv7M32LUFK96WKmSi88wKMB1ZdU,673
+defstream_rabbitmq-0.1.2.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+defstream_rabbitmq-0.1.2.6.dist-info/METADATA,sha256=m-zt3qsFVSJhQ_WT3DIjWO70P7WYiKPWa-kysSekUwg,11806
+defstream_rabbitmq-0.1.2.6.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+defstream_rabbitmq-0.1.2.6.dist-info/top_level.txt,sha256=zsnisIu5wHL4b7VM8e9AggG9KTSdUU4morFqpb8YWFs,10
+defstream_rabbitmq-0.1.2.6.dist-info/RECORD,,

defstream_rabbitmq-0.1.1.3.dist-info/RECORD

@@ -1,16 +0,0 @@
-DefStream/Broker/Implements/RabbitMQ/Configuration.py,sha256=UFE3BCny4KXmLqEUuyDNXUvYcy9yleqCNio1LF1u_y8,1046
-DefStream/Broker/Implements/RabbitMQ/Connection.py,sha256=cDCfzKmYHs5WMQZvmvNSq7EAuLVRtHVhSBuYHLmDNks,8926
-DefStream/Broker/Implements/RabbitMQ/Consumer.py,sha256=KUBhqiDujMKzcFuyPyzsbDv-5uMmrIYFAgRJ9KdWBwk,5182
-DefStream/Broker/Implements/RabbitMQ/Event.py,sha256=LmSiaSUqJF_kx7v78tt-bawy797z5Q-lM5OO0hnIQcc,1747
-DefStream/Broker/Implements/RabbitMQ/Exchange.py,sha256=MjOdtn1Aeh20mzGZOsa0MxMlpePpyQkz49_VDlf_7oM,4815
-DefStream/Broker/Implements/RabbitMQ/Policies.py,sha256=kT7vreCclwsu5hMAFkDldsNBktuOMB611biOePk7Lr4,85
-DefStream/Broker/Implements/RabbitMQ/Queue.py,sha256=cQTO988qlL0K-ZMgW71jYFoGigcu0KVXhGnjltHMJSU,5325
-DefStream/Broker/Implements/RabbitMQ/Serializer.py,sha256=ylwIBJ0blftq2W9usuYvjS3xfXovR8_9kP3O9DlXYxI,1575
-DefStream/Broker/Implements/RabbitMQ/Stream.py,sha256=9E7R_bX_kDZ3VIH7hkMpP-Z7zGbJTonU8V6q_KT3YRI,2283
-DefStream/Broker/Implements/RabbitMQ/Subscription.py,sha256=0ACs8skbn_s9UfricBDf59hT0F6G3ljO4aUrkpLuI9g,1284
-DefStream/Broker/Implements/RabbitMQ/__init__.py,sha256=Ndt5yNXcgecN1mj0Qv7M32LUFK96WKmSi88wKMB1ZdU,673
-defstream_rabbitmq-0.1.1.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-defstream_rabbitmq-0.1.1.3.dist-info/METADATA,sha256=SRhV3AAy1XwU3uwaI-tFnFMZjqOP1zEmghZorysWznc,9242
-defstream_rabbitmq-0.1.1.3.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-defstream_rabbitmq-0.1.1.3.dist-info/top_level.txt,sha256=zsnisIu5wHL4b7VM8e9AggG9KTSdUU4morFqpb8YWFs,10
-defstream_rabbitmq-0.1.1.3.dist-info/RECORD,,