DefStream 0.1.11__tar.gz → 0.1.12__tar.gz

{defstream-0.1.11 → defstream-0.1.12}/DefStream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DefStream
-Version: 0.1.11
+Version: 0.1.12
 Summary: Synchronous message processing with pluggable broker adapters
 Home-page: https://github.com/yong5eon/DefStream
 Author: Heo Yongseon

{defstream-0.1.11 → defstream-0.1.12}/DefStream.egg-info/SOURCES.txt

@@ -21,6 +21,7 @@ issues/feature/8/ci.refs.json
 issues/fix/10/IMPLEMENTS.md
 issues/fix/10/README.md
 issues/fix/10/REQUIREMENTS.md
+issues/fix/13/README.md
 issues/fix/3/IMPLEMENTS.md
 issues/fix/3/README.md
 issues/fix/3/REQUIREMENTS.md

{defstream-0.1.11 → defstream-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DefStream
-Version: 0.1.11
+Version: 0.1.12
 Summary: Synchronous message processing with pluggable broker adapters
 Home-page: https://github.com/yong5eon/DefStream
 Author: Heo Yongseon

defstream-0.1.12/issues/fix/13/README.md

@@ -0,0 +1,31 @@
+# Worker 시작 배너와 샘플 로깅 순서
+
+## 변경 요약
+
+Worker 시작 배너를 로깅 설정 여부와 관계없이 먼저 확인할 수 있도록 Worker
+샘플의 로깅 설정 시점을 `WorkerSetup` 훅으로 옮겼습니다. 시작 배너는 터미널에서
+청록·파랑 계열로 강조하며, ASCII 아트의 모양과 문구는 유지합니다.
+
+## 변경 내용
+
+- [Worker 샘플](../../../sample/Worker/Sample.py)은 `configure_logging()`을
+  실행 진입점에서 호출하는 대신 `SetupLogger` setup 훅에서 수행합니다.
+  Worker 생성·작업 등록 시점의 로그는 아직 설정되지 않은 핸들러에 의해 출력되지
+  않으며, 시작 배너가 샘플의 첫 화면 출력이 됩니다.
+- [Startup](../../../src/Worker/Startup.py)은 stdout이 터미널이고 `NO_COLOR`
+  환경 변수가 설정되지 않은 경우에만 로고에 색을 적용합니다. `Starting Worker`
+  제목도 굵은 청록색으로 표시합니다. 파일·파이프 등으로 출력을 리다이렉트하거나
+  `NO_COLOR`를 설정하면 ANSI 색상 코드를 출력하지 않습니다.
+- `Worker.run()`의 로그와 배너 호출 순서는 변경하지 않았습니다. 따라서
+  로깅 핸들러가 미리 설정된 애플리케이션에서는 `Starting Worker` 로그가 배너보다
+  먼저 기록될 수 있습니다. 이 변경은 샘플의 로깅 설정 시점을 조정해 샘플 출력에서
+  배너를 먼저 보이게 합니다.
+
+## 호환성 및 검증 범위
+
+시작 배너의 ASCII 문자와 구성 출력은 유지됩니다. 색상은 터미널 조건에서만
+추가되며 `NO_COLOR`를 통해 끌 수 있습니다.
+
+로고 색상 적용 후 ANSI 코드를 제거한 결과가 원본과 동일한지, 수정한 Python 소스의
+문법이 유효한지 확인했습니다. Worker 시작 테스트는 환경에 `pika`가 없어 실행하지
+못했으며, 샘플의 로깅 순서 변경은 별도 실행으로 검증하지 않았습니다.

{defstream-0.1.11 → defstream-0.1.12}/sample/Worker/RabbitMQ/Client.py

@@ -3,7 +3,7 @@ from random import randint
 from Tasks import (
 	Add,
 	Divide,
-	LoggingSetup,
+	TaskLoggingSetup,
 	logger,
 )
 
@@ -16,7 +16,7 @@ from DefStream.Worker import request
 
 
 if __name__ == '__main__':
-	LoggingSetup()()
+	TaskLoggingSetup()()
 	broker = Connection(Configuration(
 		host='127.0.0.1',
 		port=5672,

{defstream-0.1.11 → defstream-0.1.12}/sample/Worker/RabbitMQ/Tasks.py

@@ -28,9 +28,11 @@ from DefStream.Validator.Patterns.Object import (
 	IsRequiredIn,
 )
 from DefStream.Worker import (
+	WorkerSetup,
 	PoolSetup,
 	Run,
 	Specification,
+	Worker,
 )
 
 __all__ = (
@@ -42,7 +44,27 @@ __all__ = (
 logger = getLogger('Sample')
 
 
-class LoggingSetup(PoolSetup):
+class SetupLogger(WorkerSetup):
+	"""부모와 spawn 자식 프로세스의 샘플 로그 출력을 설정한다."""
+
+	def __call__(
+		self,
+		worker: Worker,
+	) -> None:
+		handler = StreamHandler()
+		handler.setFormatter(Formatter('%(asctime)s %(processName)s %(name)s %(levelname)s %(message)s'))
+		sources = (
+			Filter('Sample'),
+			Filter('DefStream'),
+		)
+		handler.addFilter(lambda record: any(source.filter(record) for source in sources))
+		root = getLogger()
+		root.setLevel(DEBUG)
+		root.addHandler(handler)
+		return
+
+
+class TaskLoggingSetup(PoolSetup):
 	"""부모와 spawn 자식 프로세스의 샘플 로그 출력을 설정한다."""
 
 	def __call__(self) -> None:

{defstream-0.1.11 → defstream-0.1.12}/sample/Worker/RabbitMQ/Worker.py

@@ -7,7 +7,8 @@ from signal import (
 from Tasks import (
 	Add,
 	Divide,
-	LoggingSetup,
+	TaskLoggingSetup,
+	SetupLogger,
 	logger,
 )
 
@@ -76,7 +77,6 @@ class Cleanup(WorkerCleanup):
 
 
 if __name__ == '__main__':
-	LoggingSetup()()
 	worker = Worker(
 		Connection(Configuration(
 			host='127.0.0.1',
@@ -86,9 +86,12 @@ if __name__ == '__main__':
 		)),
 		ProcessPool(
 			10,
-			setups=LoggingSetup(),
+			setups=TaskLoggingSetup(),
+		),
+		setups=(
+			SetupLogger(),
+			Prepare(),
 		),
-		setups=Prepare(),
 		cleanups=Cleanup(),
 		inspector=Inspector(
 			host='127.0.0.1',

{defstream-0.1.11 → defstream-0.1.12}/sample/Worker/Redis/Sample.py

@@ -39,19 +39,6 @@ from DefStream.Worker import (
 logger = getLogger('Sample')
 
 
-def configure_logging() -> None:
-	handler = StreamHandler()
-	handler.setFormatter(Formatter('%(asctime)s %(name)s %(levelname)s %(message)s'))
-	sources = (
-		Filter('Sample'),
-		Filter('DefStream'),
-	)
-	handler.addFilter(lambda record: any(source.filter(record) for source in sources))
-	root = getLogger()
-	root.setLevel(DEBUG)
-	root.addHandler(handler)
-	return
-
 
 class Add(
 	Run,
@@ -96,6 +83,24 @@ class Divide(
 		return result
 
 
+class SetupLogger(WorkerSetup):
+	def __call__(
+		self,
+		worker: Worker,
+	) -> None:
+		handler = StreamHandler()
+		handler.setFormatter(Formatter('%(asctime)s %(name)s %(levelname)s %(message)s'))
+		sources = (
+			Filter('Sample'),
+			Filter('DefStream'),
+		)
+		handler.addFilter(lambda record: any(source.filter(record) for source in sources))
+		root = getLogger()
+		root.setLevel(DEBUG)
+		root.addHandler(handler)
+		return
+
+
 class Prepare(WorkerSetup):
 	def __call__(
 		self,
@@ -139,11 +144,13 @@ class Cleanup(WorkerCleanup):
 
 
 def main() -> None:
-	configure_logging()
 	worker = Worker(
 		Connection(Configuration()),
 		ThreadPool(10),
-		setups=Prepare(),
+		setups=(
+			SetupLogger(),
+			Prepare(),
+		),
 		cleanups=Cleanup(),
 		inspector=Inspector(
 			host='127.0.0.1',

{defstream-0.1.11 → defstream-0.1.12}/sample/Worker/Sample.py

@@ -35,19 +35,6 @@ from DefStream.Worker import (
 logger = getLogger('Sample')
 
 
-def configure_logging() -> None:
-	handler = StreamHandler()
-	handler.setFormatter(Formatter('%(asctime)s %(name)s %(levelname)s %(message)s'))
-	sources = (
-		Filter('Sample'),
-		Filter('DefStream'),
-	)
-	handler.addFilter(lambda record: any(source.filter(record) for source in sources))
-	root = getLogger()
-	root.setLevel(DEBUG)
-	root.addHandler(handler)
-	return
-
 
 class Queue(Sendable):
 	def __init__(self):
@@ -219,6 +206,24 @@ class Add(
 		)
 
 
+class SetupLogger(WorkerSetup):
+	def __call__(
+		self,
+		worker: Worker,
+	) -> None:
+		handler = StreamHandler()
+		handler.setFormatter(Formatter('%(asctime)s %(name)s %(levelname)s %(message)s'))
+		sources = (
+			Filter('Sample'),
+			Filter('DefStream'),
+		)
+		handler.addFilter(lambda record: any(source.filter(record) for source in sources))
+		root = getLogger()
+		root.setLevel(DEBUG)
+		root.addHandler(handler)
+		return
+
+
 class Prepare(WorkerSetup):
 	def __call__(
 		self,
@@ -252,12 +257,16 @@ class Cleanup(WorkerCleanup):
 
 
 if __name__ == '__main__':
-	configure_logging()
 	worker = Worker(
 		Broker(),
 		ThreadPool(1),
-		setups=Prepare(),
-		cleanups=Cleanup(),
+		setups=(
+			SetupLogger(),
+			Prepare(),
+		),
+		cleanups=(
+			Cleanup(),
+		),
 	)
 	worker.add(Add)
 	worker.run()

{defstream-0.1.11 → defstream-0.1.12}/src/Worker/Startup.py

@@ -1,5 +1,6 @@
 from collections.abc import Mapping
-from os import getpid
+from os import environ, getpid
+import sys
 from typing import (
 	Any,
 	TYPE_CHECKING,
@@ -19,9 +20,42 @@ LOGO = r"""
 ███  ███ ▄█▀█▄ ▀██▀  ▀████▄  ▀██▀▀ ████▄ ▄█▀█▄  ▀▀█▄ ███▄███▄ 
 ███  ███ ██▄█▀  ██     ▀████  ██   ██ ▀▀ ██▄█▀ ▄█▀██ ██ ██ ██ 
 ██████▀  ▀█▄▄▄  ██  ███████▀  ██   ██    ▀█▄▄▄ ▀█▄██ ██ ██ ██ 
+
+Just def. Let workers do the work. You don't need to await this.
 """
 
 
+def supports_color() -> bool:
+	return (
+		getattr(sys.stdout, 'isatty', lambda: False)()
+		and not environ.get('NO_COLOR')
+	)
+
+
+def colorize_logo(logo: str) -> str:
+	colors = (
+		'\033[38;5;39m',
+		'\033[38;5;45m',
+		'\033[38;5;51m',
+		'\033[38;5;45m',
+		'\033[38;5;39m',
+	)
+	reset = '\033[0m'
+	colorized_lines = []
+	art_line = 0
+	for line in logo.splitlines(keepends=True):
+		if line.strip() and art_line < len(colors):
+			newline = '\n' if line.endswith('\n') else ''
+			colorized_lines.append(
+				f'{colors[art_line]}{line[:-1] if newline else line}'
+				f'{reset}{newline}',
+			)
+			art_line += 1
+		else:
+			colorized_lines.append(line)
+	return ''.join(colorized_lines)
+
+
 def subscription_value(
 	parameters: Any,
 	name: str,
@@ -90,10 +124,15 @@ def startup(worker: 'Worker') -> None:
 			str,
 		) and vhost:
 			broker_name += '/' + vhost.lstrip('/')
+	logo = LOGO.rstrip()
+	starting_worker = 'Starting Worker'
+	if supports_color():
+		logo = colorize_logo(logo)
+		starting_worker = f'\033[1;38;5;51m{starting_worker}\033[0m'
 	lines = [
-		LOGO.rstrip(),
+		logo,
 		'',
-		'Starting Worker',
+		starting_worker,
 		f'  PID: {getpid()}',
 		f'  Broker: {broker_name}',
 	]

{defstream-0.1.11 → defstream-0.1.12}/test/test_logging.py

@@ -274,7 +274,7 @@ class LoggingTests(TestCase):
 		try:
 			spec.loader.exec_module(sample)
 			self.assertEqual(root.handlers, handlers)
-			sample.configure_logging()
+			sample.SetupLogger()(Mock())
 			handler = root.handlers[-1]
 			for name, expected in (
 				(