AtCoderStudyBooster 0.1.1__py3-none-any.whl → 0.3__py3-none-any.whl

atcdr/test.py

@@ -2,17 +2,28 @@ import os
 import subprocess
 import tempfile
 import time
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from enum import Enum
-from typing import Callable, Dict, List, Optional, Union
+from typing import Dict, Generator, List, Tuple, Union, Optional
 
-import colorama
 from bs4 import BeautifulSoup as bs
-from colorama import Fore
-
-from atcdr.util.filename import FILE_EXTENSIONS, SOURCE_LANGUAGES, Lang, execute_files
-
-colorama.init(autoreset=True)
+from rich.console import Console, Group, RenderableType
+from rich.markup import escape
+from rich.panel import Panel
+from rich.rule import Rule
+from rich.style import Style
+from rich.syntax import Syntax
+from rich.table import Table
+from rich.text import Text
+
+from atcdr.util.execute import execute_files
+from atcdr.util.filetype import (
+	COMPILED_LANGUAGES,
+	INTERPRETED_LANGUAGES,
+	Lang,
+	detect_language,
+	lang2str,
+)
 
 
 @dataclass
@@ -28,12 +39,13 @@ class LabeledTestCase:
 
 
 class ResultStatus(Enum):
-	CE = 'Compilation Error'
-	MLE = 'Memory Limit Exceeded'
+	AC = 'Accepted'
+	WA = 'Wrong Answer'
 	TLE = 'Time Limit Exceeded'
+	MLE = 'Memory Limit Exceeded'
 	RE = 'Runtime Error'
-	WA = 'Wrong Answer'
-	AC = 'Accepted'
+	CE = 'Compilation Error'
+	WJ = 'Juding ...'
 
 
 @dataclass
@@ -48,10 +60,20 @@ class TestCaseResult:
 class LabeledTestCaseResult:
 	label: str
 	testcase: TestCase
-	# TODO : 実はラベル自体を使わない方がいいかもしれない.ラベルという概念が削除してプリントするときに適当にTest1, Test2と適当に名前をつけてもいいかも.
 	result: TestCaseResult
 
 
+@dataclass
+class TestInformation:
+	lang: Lang
+	sourcename: str
+	case_number: int
+	result_summary: ResultStatus = ResultStatus.WJ
+	resultlist: List[LabeledTestCaseResult] = field(default_factory=list)  # 修正
+	compiler_message: str = ''
+	compile_time : Optional[int] = None
+
+
 def create_testcases_from_html(html: str) -> List[LabeledTestCase]:
 	soup = bs(html, 'html.parser')
 	test_cases = []
@@ -84,173 +106,312 @@ def create_testcases_from_html(html: str) -> List[LabeledTestCase]:
 
 
 def run_code(cmd: list, case: TestCase) -> TestCaseResult:
+	start_time = time.time()
 	try:
-		start_time = time.time()
 		proc = subprocess.run(
 			cmd, input=case.input, text=True, capture_output=True, timeout=4
 		)
-		end_time = time.time()
-
-		execution_time = int((end_time - start_time) * 1000)
-
-		if proc.returncode != 0:
-			return TestCaseResult(
-				output=proc.stderr, executed_time=None, passed=ResultStatus.RE
-			)
+		executed_time = int((time.time() - start_time) * 1000)
+	except subprocess.TimeoutExpired as e_proc:
+		executed_time = int((time.time() - start_time) * 1000)
+		stdout_text = e_proc.stdout.decode('utf-8') if e_proc.stdout is not None else ''
+		stderr_text = e_proc.stderr.decode('utf-8') if e_proc.stderr is not None else ''
+		text = stdout_text + '\n' + stderr_text
+		return TestCaseResult(
+			output=text, executed_time=executed_time, passed=ResultStatus.TLE
+		)
 
-		actual_output = proc.stdout.strip()
-		expected_output = case.output.strip()
+	# プロセスの終了コードを確認し、異常終了ならREを返す
+	if proc.returncode != 0:
+		return TestCaseResult(
+			output=proc.stdout + '\n' + proc.stderr,
+			executed_time=executed_time,
+			passed=ResultStatus.RE,
+		)
 
-		if actual_output != expected_output:
-			return TestCaseResult(
-				output=actual_output,
-				executed_time=execution_time,
-				passed=ResultStatus.WA,
-			)
+	# 実際の出力と期待される出力を比較
+	actual_output = proc.stdout.strip()
+	expected_output = case.output.strip()
 
+	if actual_output != expected_output:
 		return TestCaseResult(
-			output=actual_output, executed_time=execution_time, passed=ResultStatus.AC
+			output=actual_output,
+			executed_time=executed_time,
+			passed=ResultStatus.WA,
 		)
-	except subprocess.TimeoutExpired:
+	else:
 		return TestCaseResult(
-			output='Time Limit Exceeded', executed_time=None, passed=ResultStatus.TLE
+			output=actual_output, executed_time=executed_time, passed=ResultStatus.AC
 		)
-	except Exception as e:
-		return TestCaseResult(output=str(e), executed_time=None, passed=ResultStatus.RE)
 
 
-def run_python(path: str, case: TestCase) -> TestCaseResult:
-	return run_code(['python3', path], case)
-
+LANGUAGE_RUN_COMMANDS: Dict[Lang, list] = {
+	Lang.PYTHON: ['python3', '{source_path}'],
+	Lang.JAVASCRIPT: ['node', '{source_path}'],
+	Lang.C: ['{exec_path}'],
+	Lang.CPP: ['{exec_path}'],
+	Lang.RUST: ['{exec_path}'],
+	Lang.JAVA: ['java', '{exec_path}'],
+}
 
-def run_javascript(path: str, case: TestCase) -> TestCaseResult:
-	return run_code(['node', path], case)
+LANGUAGE_COMPILE_COMMANDS: Dict[Lang, list] = {
+	Lang.C: ['gcc', '{source_path}', '-o', '{exec_path}'],
+	Lang.CPP: ['g++', '{source_path}', '-o', '{exec_path}'],
+	Lang.RUST: ['rustc', '{source_path}', '-o', '{exec_path}'],
+	Lang.JAVA: ['javac', '{source_path}'],
+}
 
 
-def run_c(path: str, case: TestCase) -> TestCaseResult:
+def run_compile(path: str, lang: Lang) -> Tuple[str, subprocess.CompletedProcess]:
 	with tempfile.NamedTemporaryFile(delete=True) as tmp:
 		exec_path = tmp.name
-		compile_result = subprocess.run(
-			['gcc', path, '-o', exec_path], capture_output=True, text=True
-		)
-		if compile_result.returncode != 0:
-			return TestCaseResult(
-				output=compile_result.stderr, executed_time=None, passed=ResultStatus.CE
-			)
-		if compile_result.stderr:
-			print(f'コンパイラーからのメッセージ\n{compile_result.stderr}')
-		return run_code([exec_path], case)
+	cmd = [
+		arg.format(source_path=path, exec_path=exec_path)
+		for arg in LANGUAGE_COMPILE_COMMANDS[lang]
+	]
+	start_time = time.time()
+	compile_result = subprocess.run(cmd, capture_output=True, text=True)
+	compile_time = int((time.time() - start_time) * 1000)
 
+	return exec_path, compile_result, compile_time
 
-def run_cpp(path: str, case: TestCase) -> TestCaseResult:
-	with tempfile.NamedTemporaryFile(delete=True) as tmp:
-		exec_path = tmp.name
-		compile_result = subprocess.run(
-			['g++', path, '-o', exec_path], capture_output=True, text=True
-		)
+
+def judge_code_from(
+	lcases: List[LabeledTestCase], path: str
+) -> Generator[
+	Union[LabeledTestCaseResult, TestInformation],  # type: ignore
+	None,
+	None,
+]:
+	lang = detect_language(path)
+	if lang in COMPILED_LANGUAGES:
+		exe_path, compile_result, compile_time = run_compile(path, lang)
 		if compile_result.returncode != 0:
-			return TestCaseResult(
-				output=compile_result.stderr, executed_time=None, passed=ResultStatus.CE
+			yield TestInformation(
+				lang=lang,
+				sourcename=path,
+				case_number=len(lcases),
+				result_summary=ResultStatus.CE,
+				compiler_message=compile_result.stderr,
+			)
+			return
+		else:
+			yield TestInformation(
+				lang=lang,
+				sourcename=path,
+				case_number=len(lcases),
+				compiler_message=compile_result.stderr,
+				compile_time=compile_time,
 			)
-		if compile_result.stderr:
-			print(f'コンパイラーからのメッセージ\n{compile_result.stderr}')
-		return run_code([exec_path], case)
 
+			cmd = [
+				arg.format(exec_path=exe_path) for arg in LANGUAGE_RUN_COMMANDS[lang]
+			]
 
-def run_rust(path: str, case: TestCase) -> TestCaseResult:
-	with tempfile.NamedTemporaryFile(delete=True) as tmp:
-		exec_path = tmp.name
-		compile_result = subprocess.run(
-			['rustc', path, '-o', exec_path], capture_output=True, text=True
-		)
-		if compile_result.returncode != 0:
-			return TestCaseResult(
-				output=compile_result.stderr, executed_time=None, passed=ResultStatus.CE
-			)
-		if compile_result.stderr:
-			print(f'コンパイラーからのメッセージ\n{compile_result.stderr}')
-		return run_code([exec_path], case)
+			for lcase in lcases:
+				yield LabeledTestCaseResult(
+					lcase.label, lcase.case, run_code(cmd, lcase.case)
+				)
 
+			if os.path.exists(exe_path):
+				os.remove(exe_path)
 
-def run_java(path: str, case: TestCase) -> TestCaseResult:
-	compile_result = subprocess.run(['javac', path], capture_output=True, text=True)
-	if compile_result.returncode != 0:
-		return TestCaseResult(
-			output=compile_result.stderr, executed_time=None, passed=ResultStatus.CE
+	elif lang in INTERPRETED_LANGUAGES:
+		yield TestInformation(
+			lang=lang,
+			sourcename=path,
+			case_number=len(lcases),
 		)
-	class_file = os.path.splitext(path)[0]
-	try:
-		return run_code(['java', class_file], case)
-	finally:
-		class_path = class_file + '.class'
-		if os.path.exists(class_path):
-			os.remove(class_path)
-
-
-LANGUAGE_RUNNERS: Dict[Lang, Callable[[str, TestCase], TestCaseResult]] = {
-	Lang.PYTHON: run_python,
-	Lang.JAVASCRIPT: run_javascript,
-	Lang.C: run_c,
-	Lang.CPP: run_cpp,
-	Lang.RUST: run_rust,
-	Lang.JAVA: run_java,
+		cmd = [arg.format(source_path=path) for arg in LANGUAGE_RUN_COMMANDS[lang]]
+		for lcase in lcases:
+			yield LabeledTestCaseResult(
+				lcase.label, lcase.case, run_code(cmd, lcase.case)
+			)
+	else:
+		raise ValueError('適切な言語が見つかりませんでした.')
+
+
+COLOR_MAP = {
+	ResultStatus.AC: 'green',
+	ResultStatus.WA: 'red',
+	ResultStatus.TLE: 'yellow',
+	ResultStatus.MLE: 'yellow',
+	ResultStatus.RE: 'yellow',
+	ResultStatus.CE: 'yellow',
+	ResultStatus.WJ: 'grey',
 }
 
+STATUS_TEXT_MAP = {
+	ResultStatus.AC: Text.assemble(
+		('\u2713 ', 'green'),
+		(
+			f'{ResultStatus.AC.value}',
+			Style(bgcolor=COLOR_MAP[ResultStatus.AC], bold=True),
+		),
+	),
+	ResultStatus.WA: Text(
+		f'\u00d7 {ResultStatus.WA.value}', style=COLOR_MAP[ResultStatus.WA]
+	),
+	ResultStatus.TLE: Text(
+		f'\u00d7 {ResultStatus.TLE.value}', style=COLOR_MAP[ResultStatus.TLE]
+	),
+	ResultStatus.MLE: Text(
+		f'\u00d7 {ResultStatus.MLE.value}', style=COLOR_MAP[ResultStatus.MLE]
+	),
+	ResultStatus.RE: Text(
+		f'\u00d7 {ResultStatus.RE.value}', style=COLOR_MAP[ResultStatus.RE]
+	),
+	ResultStatus.CE: Text(
+		f'\u00d7 {ResultStatus.CE.value}', style=COLOR_MAP[ResultStatus.CE]
+	),
+	ResultStatus.WJ: Text(
+		f'\u23f3 {ResultStatus.WJ.value}', style=COLOR_MAP[ResultStatus.WJ]
+	),
+}
 
-def choose_lang(path: str) -> Optional[Callable[[str, TestCase], TestCaseResult]]:
-	ext = os.path.splitext(path)[1]
-	lang = next(
-		(lang for lang, extension in FILE_EXTENSIONS.items() if extension == ext), None
+
+def create_renderable_test_info(test_info: TestInformation) -> RenderableType:
+	components = []
+
+	success_count = sum(
+		1 for result in test_info.resultlist if result.result.passed == ResultStatus.AC
+	)
+	total_count = test_info.case_number
+
+	# 結果に応じたスタイル付きのテキストを取得
+	status_text = STATUS_TEXT_MAP[test_info.result_summary]
+
+	# ヘッダーのテキストを構築
+	header_text = Text.assemble(
+		Text.from_markup(f'[cyan]{test_info.sourcename}[/]のテスト [\n]'),
+		Text.from_markup(f'[gray]コンパイルにかかった時間: [italic]{test_info.compile_time} ms[/][/][\n]') if test_info.compile_time else Text(''),
+		status_text,
+		Text.from_markup(
+			f'  [{COLOR_MAP[test_info.result_summary]} bold]{success_count}[/] / [white bold]{total_count}[/]'
+		),
 	)
-	# lang が None でない場合のみ get を呼び出す
-	if lang is not None:
-		return LANGUAGE_RUNNERS.get(lang)
-	return None
 
+	components.append(Panel(header_text, expand=False))
 
-def judge_code_from(
-	lcases: List[LabeledTestCase], path: str
-) -> List[LabeledTestCaseResult]:
-	runner = choose_lang(path)
-	if runner is None:
-		raise ValueError(f'ランナーが見つかりませんでした。指定されたパス: {path}')
-
-	return [
-		LabeledTestCaseResult(lcase.label, lcase.case, runner(path, lcase.case))
-		for lcase in lcases
+	if test_info.compiler_message:
+		rule = Rule(
+			title='コンパイラーのメッセージ',
+			style=COLOR_MAP[ResultStatus.CE],
+		)
+		components.append(rule)
+		error_message = Syntax(
+			test_info.compiler_message, lang2str(test_info.lang), line_numbers=False
+		)
+		components.append(error_message)
+
+	return Group(*components)
+
+
+def update_test_info(
+	test_info: TestInformation, test_result: LabeledTestCaseResult
+) -> None:
+	test_info.resultlist.append(test_result)
+
+	priority_order = [
+		ResultStatus.RE,
+		ResultStatus.WA,
+		ResultStatus.TLE,
+		ResultStatus.MLE,
+		ResultStatus.WJ,
+		ResultStatus.AC,
 	]
 
+	# 現在の結果の中で最も高い優先順位のステータスを見つける
+	highest_priority_status = (
+		test_info.result_summary
+	)  # デフォルトはWJまたは現在のサマリー
+	for result in test_info.resultlist:
+		status = result.result.passed
+		if priority_order.index(status) < priority_order.index(highest_priority_status):
+			highest_priority_status = status
+
+	# 特殊ケース: すべてのテストケースがACである場合（途中でも）
+	if all(result.result.passed == ResultStatus.AC for result in test_info.resultlist):
+		test_info.result_summary = ResultStatus.AC
+	else:
+		test_info.result_summary = highest_priority_status
+
+
+def create_renderable_test_result(
+	i: int,
+	test_result: LabeledTestCaseResult,
+) -> RenderableType:
+	rule = Rule(
+		title=f'No.{i+1} {test_result.label}',
+		style=COLOR_MAP[test_result.result.passed],
+	)
 
-CHECK_MARK = '\u2713'
-CROSS_MARK = '\u00d7'
+	# 以下の部分は if-else ブロックの外に移動
+	status_header = Text.assemble(
+		'ステータス ',
+		STATUS_TEXT_MAP[test_result.result.passed],  # status_text をここに追加
+	)
 
+	execution_time_text = None
+	if test_result.result.executed_time is not None:
+		execution_time_text = Text.from_markup(
+			f'実行時間   [cyan]{test_result.result.executed_time}[/cyan] ms'
+		)
 
-def render_result(lresult: LabeledTestCaseResult) -> str:
-	output = f'{Fore.CYAN}{lresult.label} of Test:\n'
-	result = lresult.result
-	testcase = lresult.testcase
+	table = Table(show_header=True, header_style='bold')
+	table.add_column('入力', style='cyan', min_width=10)
 
-	if result.passed == ResultStatus.AC:
-		output += (
-			Fore.GREEN + f'{CHECK_MARK} Accepted !! Time: {result.executed_time} ms\n'
+	if test_result.result.passed != ResultStatus.AC:
+		table.add_column(
+			'出力', style=COLOR_MAP[test_result.result.passed], min_width=10
+		)
+		table.add_column('正解の出力', style=COLOR_MAP[ResultStatus.AC], min_width=10)
+		table.add_row(
+			escape(test_result.testcase.input),
+			escape(test_result.result.output),
+			escape(test_result.testcase.output),
 		)
-	elif result.passed == ResultStatus.WA:
-		output += (
-			Fore.RED
-			+ f'{CROSS_MARK} Wrong Answer ! Time: {result.executed_time} ms\nOutput:\n{result.output}\nExpected Output:\n{testcase.output}\n'
+	else:
+		table.add_column(
+			'出力', style=COLOR_MAP[test_result.result.passed], min_width=10
+		)
+		table.add_row(
+			escape(test_result.testcase.input), escape(test_result.result.output)
 		)
-	elif result.passed == ResultStatus.RE:
-		output += Fore.YELLOW + f'[RE] Runtime Error\n  Output:\n{result.output}'
-	elif result.passed == ResultStatus.TLE:
-		output += Fore.YELLOW + '[TLE] Time Limit Exceeded\n'
-	elif result.passed == ResultStatus.CE:
-		output += Fore.YELLOW + f'[CE] Compile Error\n  Output:\n{result.output}'
-	elif result.passed == ResultStatus.MLE:
-		output += Fore.YELLOW + '[ME] Memory Limit Exceeded\n'
 
-	output += Fore.RESET
+	components = [
+		rule,
+		status_header,
+		execution_time_text if execution_time_text else '',
+		table,
+	]
 
-	return output
+	return Group(*components)
+
+
+def render_results(
+	results: Generator[Union[LabeledTestCaseResult, TestInformation], None, None],
+) -> None:
+	console = Console()
+
+	# 最初の結果は TestInformation として取得
+	first_result = next(results)
+	if not isinstance(first_result, TestInformation):
+		raise ValueError('最初のジェネレーターの結果はTestInformationです')
+	test_info: TestInformation = first_result
+
+	curernt_display_object = [test_info]
+
+	while True : 
+	# 各テストケースの結果表示
+	for i, result in enumerate(results):
+		if isinstance(result, LabeledTestCaseResult):
+			console.print(create_renderable_test_result(i, result))
+			update_test_info(test_info, result)
+		else:
+			raise ValueError('テスト結果がyieldする型はLabeledTestCaseResultです')
+
+	console.print(create_renderable_test_info(test_info))
 
 
 def run_test(path_of_code: str) -> None:
@@ -265,12 +426,13 @@ def run_test(path_of_code: str) -> None:
 		html = file.read()
 
 	test_cases = create_testcases_from_html(html)
-	print(f'{path_of_code}をテストします。\n' + '-' * 20 + '\n')
 	test_results = judge_code_from(test_cases, path_of_code)
-	output = '\n'.join(render_result(lresult) for lresult in test_results)
-
-	print(output)
+	render_results(test_results)
 
 
 def test(*args: str) -> None:
-	execute_files(*args, func=run_test, target_filetypes=SOURCE_LANGUAGES)
+	execute_files(
+		*args,
+		func=run_test,
+		target_filetypes=INTERPRETED_LANGUAGES + COMPILED_LANGUAGES,
+	)

atcdr/util/execute.py

@@ -0,0 +1,63 @@
+import os
+from typing import Callable, List
+
+import questionary as q
+from rich import print
+
+from atcdr.util.filetype import FILE_EXTENSIONS, Filename, Lang
+
+
+def execute_files(
+	*args: str, func: Callable[[Filename], None], target_filetypes: List[Lang]
+) -> None:
+	target_extensions = [FILE_EXTENSIONS[lang] for lang in target_filetypes]
+
+	files = [
+		file
+		for file in os.listdir('.')
+		if os.path.isfile(file) and os.path.splitext(file)[1] in target_extensions
+	]
+
+	if not files:
+		print(
+			'対象のファイルが見つかりません.\n対象ファイルが存在するディレクトリーに移動してから実行してください。'
+		)
+		return
+
+	if not args:
+		if len(files) == 1:
+			func(files[0])
+		else:
+			target_file = q.select(
+				message='複数のファイルが見つかりました.ファイルを選択してください:',
+				choices=[q.Choice(title=file, value=file) for file in files],
+				instruction='\n 十字キーで移動, [enter]で実行',
+				pointer='❯❯❯',
+				qmark='',
+				style=q.Style(
+					[
+						('qmark', 'fg:#2196F3 bold'),
+						('question', 'fg:#2196F3 bold'),
+						('answer', 'fg:#FFB300 bold'),
+						('pointer', 'fg:#FFB300 bold'),
+						('highlighted', 'fg:#FFB300 bold'),
+						('selected', 'fg:#FFB300 bold'),
+					]
+				),
+			).ask()
+			list(map(func, [target_file]))
+	else:
+		target_files = set()
+		for arg in args:
+			if arg == '*':
+				target_files.update(files)
+			elif arg.startswith('*.'):
+				ext = arg[1:]  # ".py" のような拡張子を取得
+				target_files.update(file for file in files if file.endswith(ext))
+			else:
+				if arg in files:
+					target_files.add(arg)
+				else:
+					print(f'エラー: {arg} は存在しません。')
+
+		list(map(func, target_files))