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

atcdr/download.py

@@ -3,11 +3,22 @@ import re
 import time
 from dataclasses import dataclass
 from enum import Enum
-from typing import Callable, List, Match, Optional, Union, cast
+from typing import Callable, List, Optional, Union, cast
 
+import questionary as q
 import requests
+from rich.console import Console
+from rich.prompt import IntPrompt, Prompt
 
-from atcdr.util.problem import make_problem_markdown
+from atcdr.util.filetype import FILE_EXTENSIONS, Lang
+from atcdr.util.problem import (
+	get_title_from_html,
+	make_problem_markdown,
+	repair_html,
+	title_to_filename,
+)
+
+console = Console()
 
 
 class Diff(Enum):
@@ -37,63 +48,42 @@ def get_problem_html(problem: Problem) -> Optional[str]:
 		if response.status_code == 200:
 			return response.text
 		elif response.status_code == 429:
-			print(
-				f'[Error{response.status_code}] 再試行します. abc{problem.number} {problem.difficulty.value}'
+			console.print(
+				f'[bold yellow][Error {response.status_code}][/bold yellow] 再試行します。abc{problem.number} {problem.difficulty.value}'
 			)
 			time.sleep(retry_wait)
 		elif 300 <= response.status_code < 400:
-			print(
-				f'[Erroe{response.status_code}] リダイレクトが発生しました。abc{problem.number} {problem.difficulty.value}'
+			console.print(
+				f'[bold yellow][Error {response.status_code}][/bold yellow] リダイレクトが発生しました。abc{problem.number} {problem.difficulty.value}'
 			)
 		elif 400 <= response.status_code < 500:
-			print(
-				f'[Error{response.status_code}] 問題が見つかりません。abc{problem.number} {problem.difficulty.value}'
+			console.print(
+				f'[bold red][Error {response.status_code}][/bold red] 問題が見つかりません。abc{problem.number} {problem.difficulty.value}'
 			)
 			break
 		elif 500 <= response.status_code < 600:
-			print(
-				f'[Error{response.status_code}] サーバーエラーが発生しました。abc{problem.number} {problem.difficulty.value}'
+			console.print(
+				f'[bold red][Error {response.status_code}][/bold red] サーバーエラーが発生しました。abc{problem.number} {problem.difficulty.value}'
 			)
 			break
 		else:
-			print(
-				f'[Error{response.status_code}] abc{problem.number} {problem.difficulty.value}に対応するHTMLファイルを取得できませんでした。'
+			console.print(
+				f'[bold red][Error {response.status_code}][/bold red] abc{problem.number} {problem.difficulty.value}に対応するHTMLファイルを取得できませんでした。'
 			)
 			break
 	return None
 
 
-def repair_html(html: str) -> str:
-	html = html.replace('//img.atcoder.jp', 'https://img.atcoder.jp')
-	html = html.replace(
-		'<meta http-equiv="Content-Language" content="en">',
-		'<meta http-equiv="Content-Language" content="ja">',
-	)
-	html = html.replace('LANG = "en"', 'LANG="ja"')
-	return html
-
-
-def get_title_from_html(html: str) -> Optional[str]:
-	title_match: Optional[Match[str]] = re.search(
-		r'<title>(?:.*?-\s*)?([^<]*)</title>', html, re.IGNORECASE | re.DOTALL
-	)
-	if title_match:
-		title: str = title_match.group(1).replace(' ', '')
-		title = re.sub(r'[\\/*?:"<>| ]', '', title)
-		return title
-	return None
-
-
 def save_file(file_path: str, html: str) -> None:
 	with open(file_path, 'w', encoding='utf-8') as file:
 		file.write(html)
-	print(f'[+] ファイルを保存しました :{file_path}')
+	console.print(f'[bold green][+][/bold green] ファイルを保存しました :{file_path}')
 
 
 def mkdir(path: str) -> None:
 	if not os.path.exists(path):
 		os.makedirs(path)
-		print(f'[+] フォルダー: {path} を作成しました')
+		console.print(f'[bold green][+][/bold green] フォルダー: {path} を作成しました')
 
 
 class GenerateMode:
@@ -117,17 +107,20 @@ def generate_problem_directory(
 			continue
 
 		title = get_title_from_html(html)
-		if title is None:
-			print('[Error] タイトルが取得できませんでした')
+		if not title:
+			console.print('[bold red][Error][/bold red] タイトルが取得できませんでした')
 			title = f'problem{problem.number}{problem.difficulty.value}'
 
+		title = title_to_filename(title)
+
 		mkdir(dir_path)
 		repaired_html = repair_html(html)
 
-		html_path = os.path.join(dir_path, f'{title}.html')
+		html_path = os.path.join(dir_path, title + FILE_EXTENSIONS[Lang.HTML])
 		save_file(html_path, repaired_html)
 		md = make_problem_markdown(html, 'ja')
-		save_file(os.path.join(dir_path, f'{title}.md'), md)
+		md_path = os.path.join(dir_path, title + FILE_EXTENSIONS[Lang.MARKDOWN])
+		save_file(md_path, md)
 
 
 def parse_range(range_str: str) -> List[int]:
@@ -136,11 +129,11 @@ def parse_range(range_str: str) -> List[int]:
 		start, end = map(int, match.groups())
 		return list(range(start, end + 1))
 	else:
-		raise ValueError('Invalid range format')
+		raise ValueError('数字の範囲の形式が間違っています')
 
 
 def parse_diff_range(range_str: str) -> List[Diff]:
-	match = re.match(r'^([A-F])\.\.([A-F])$', range_str)
+	match = re.match(r'^([A-Z])\.\.([A-Z])$', range_str)
 	if match:
 		start, end = match.groups()
 		start_index = ord(start) - ord('A')
@@ -150,7 +143,7 @@ def parse_diff_range(range_str: str) -> List[Diff]:
 	raise ValueError('A..C の形式になっていません')
 
 
-def convert_arg(arg: Union[str, int]) -> Union[List[int], List[Diff]]:
+def convert_arg(arg: str) -> Union[List[int], List[Diff]]:
 	if isinstance(arg, int):
 		return [arg]
 	elif isinstance(arg, str):
@@ -160,7 +153,7 @@ def convert_arg(arg: Union[str, int]) -> Union[List[int], List[Diff]]:
 			return [Diff[arg]]
 		elif re.match(r'^\d+\.\.\d+$', arg):
 			return parse_range(arg)
-		elif re.match(r'^[A-F]\.\.[A-F]$', arg):
+		elif re.match(r'^[A-Z]\.\.[A-Z]$', arg):
 			return parse_diff_range(arg)
 	raise ValueError(f'{arg}は認識できません')
 
@@ -173,13 +166,87 @@ def are_all_diffs(args: Union[List[int], List[Diff]]) -> bool:
 	return all(isinstance(arg, Diff) for arg in args)
 
 
+def interactive_download() -> None:
+	CONTEST = '1. 特定のコンテストの問題を解きたい'
+	PRACTICE = '2. 特定の難易度の問題を集中的に練習したい'
+	ONE_FILE = '3. 1ファイルだけダウンロードする'
+	END = '4. 終了する'
+
+	choice = q.select(
+		message='AtCoderの問題のHTMLファイルをダウンロードします',
+		qmark='',
+		pointer='❯❯❯',
+		choices=[CONTEST, PRACTICE, ONE_FILE, END],
+		instruction='\n 十字キーで移動,[enter]で実行',
+		style=q.Style(
+			[
+				('question', 'fg:#2196F3 bold'),
+				('answer', 'fg:#FFB300 bold'),
+				('pointer', 'fg:#FFB300 bold'),
+				('highlighted', 'fg:#FFB300 bold'),
+				('selected', 'fg:#FFB300 bold'),
+			]
+		),
+	).ask()
+
+	if choice == CONTEST:
+		number = IntPrompt.ask(
+			'コンテスト番号を入力してください (例: 120)',
+		)
+		contest_diffs = list(Diff)
+
+		problems = [Problem(number, diff) for diff in contest_diffs]
+
+		generate_problem_directory('.', problems, GenerateMode.gene_path_on_num)
+
+	elif choice == PRACTICE:
+		diff = Prompt.ask(
+			'難易度を入力してください (例: A)',
+		)
+		try:
+			diff = Diff[diff.upper()]
+		except KeyError:
+			raise ValueError('入力された難易度が認識できません')
+		number_str = Prompt.ask(
+			'コンテスト番号または範囲を入力してください (例: 120..130)'
+		)
+		if number_str.isdigit():
+			contest_numbers = [int(number_str)]
+		elif re.match(r'^\d+\.\.\d+$', number_str):
+			contest_numbers = parse_range(number_str)
+		else:
+			raise ValueError('数字の範囲の形式が間違っています')
+
+		problems = [Problem(number, diff) for number in contest_numbers]
+
+		generate_problem_directory('.', problems, GenerateMode.gene_path_on_diff)
+
+	elif choice == ONE_FILE:
+		contest_number = IntPrompt.ask(
+			'コンテスト番号を入力してください (例: 120)',
+		)
+		difficulty = Prompt.ask(
+			'難易度を入力してください (例: A)', choices=[d.name for d in Diff]
+		)
+
+		difficulty = difficulty.upper().strip()
+
+		problem = Problem(contest_number, Diff[difficulty])
+		generate_problem_directory('.', [problem], GenerateMode.gene_path_on_num)
+
+	elif choice == END:
+		console.print('終了します', style='bold red')
+	else:
+		console.print('無効な選択です', style='bold red')
+
+
 def download(
 	first: Union[str, int, None] = None,
 	second: Union[str, int, None] = None,
 	base_path: str = '.',
 ) -> None:
 	if first is None:
-		main()
+		interactive_download()
 		return
 
 	first_args = convert_arg(str(first))
@@ -187,9 +254,9 @@ def download(
 		if isinstance(first, Diff):
 			raise ValueError(
 				"""難易度だけでなく, 問題番号も指定してコマンドを実行してください.
-                             例 atcdr -d A 120  : A問題の120をダウンロードます
-                             例 atcdr -d A 120..130  : A問題の120から130をダウンロードます
-                             """
+                    例 atcdr -d A 120  : A問題の120をダウンロードます
+                    例 atcdr -d A 120..130  : A問題の120から130をダウンロードます
+                """
 			)
 		second_args: Union[List[int], List[Diff]] = list(Diff)
 	else:
@@ -216,51 +283,7 @@ def download(
 	else:
 		raise ValueError(
 			"""次のような形式で問題を指定してください
-                            例 atcdr -d A 120..130  : A問題の120から130をダウンロードします
-                            例 atcdr -d 120         : ABCのコンテストの問題をダウンロードします
-                         """
+                例 atcdr -d A 120..130  : A問題の120から130をダウンロードします
+                例 atcdr -d 120         : ABCのコンテストの問題をダウンロードします
+            """
 		)
-
-
-def main() -> None:
-	print('AtCoderの問題のHTMLファイルをダウンロードします')
-	print(
-		"""
-    1. 番号の範囲を指定してダウンロードする
-    2. 1ファイルだけダウンロードする
-    q: 終了
-    """
-	)
-
-	choice = input('選択してください: ')
-
-	if choice == '1':
-		start_end = input(
-			'開始と終了のコンテストの番号をスペースで区切って指定してください (例: 223 230): '
-		)
-		start, end = map(int, start_end.split(' '))
-		difficulty = Diff[
-			input(
-				'ダウンロードする問題の難易度を指定してください (例: A, B, C): '
-			).upper()
-		]
-		problem_list = [Problem(number, difficulty) for number in range(start, end + 1)]
-		generate_problem_directory('.', problem_list, GenerateMode.gene_path_on_diff)
-	elif choice == '2':
-		number = int(input('コンテストの番号を指定してください: '))
-		difficulty = Diff[
-			input(
-				'ダウンロードする問題の難易度を指定してください (例: A, B, C): '
-			).upper()
-		]
-		generate_problem_directory(
-			'.', [Problem(number, difficulty)], GenerateMode.gene_path_on_diff
-		)
-	elif choice == 'q':
-		print('終了します')
-	else:
-		print('無効な選択です')
-
-
-if __name__ == '__main__':
-	main()

atcdr/generate.py

@@ -2,17 +2,20 @@ import json
 import os
 import re
 
+from rich.console import Console
+
 from atcdr.test import (
+	LabeledTestCaseResult,
 	ResultStatus,
 	create_testcases_from_html,
 	judge_code_from,
-	render_result,
+	render_results,
 )
-from atcdr.util.filename import (
+from atcdr.util.execute import execute_files
+from atcdr.util.filetype import (
 	FILE_EXTENSIONS,
 	Filename,
 	Lang,
-	execute_files,
 	lang2str,
 	str2lang,
 )
@@ -26,7 +29,38 @@ def get_code_from_gpt_output(output: str) -> str:
 	return match.group(1) if match else ''
 
 
+def render_result_for_GPT(lresult: LabeledTestCaseResult) -> str:
+	output = f'{lresult.label} of Test:\n'
+	result = lresult.result
+	testcase = lresult.testcase
+
+	if result.passed == ResultStatus.AC:
+		output += 'Accepted !! \n'
+
+	elif result.passed == ResultStatus.WA:
+		output += (
+			f'Wrong Answer\n'
+			f'Output:\n{result.output}\n'
+			f'Expected Output:\n{testcase.output}\n'
+		)
+
+	elif result.passed == ResultStatus.RE:
+		output += f'[RE] Runtime Error\n  Output:\n{result.output}'
+
+	elif result.passed == ResultStatus.TLE:
+		output += '[TLE] Time Limit Exceeded\n'
+
+	elif result.passed == ResultStatus.CE:
+		output += f'[CE] Compile Error\n  Output:\n{result.output}'
+
+	elif result.passed == ResultStatus.MLE:
+		output += '[ME] Memory Limit Exceeded\n'
+
+	return output
+
+
 def generate_code(file: Filename, lang: Lang) -> None:
+	console = Console()
 	with open(file, 'r') as f:
 		html_content = f.read()
 	md = make_problem_markdown(html_content, 'en')
@@ -36,20 +70,25 @@ def generate_code(file: Filename, lang: Lang) -> None:
 	gpt = ChatGPT(
 		system_prompt=f"""You are an excellent programmer. You solve problems in competitive programming.When a user provides you with a problem from a programming contest called AtCoder, including the Problem,Constraints, Input, Output, Input Example, and Output Example, please carefully consider these and solve the problem.Make sure that your output code block contains no more than two blocks. Pay close attention to the Input, Input Example, Output, and Output Example.Create the solution in {lang2str(lang)}.""",
 	)
+	with console.status(f'{gpt.model.value}がコードを生成しています...'):
+		reply = gpt.tell(md)
 
-	reply = gpt.tell(md)
 	code = get_code_from_gpt_output(reply)
-	print(f'AI利用にかかったAPIコスト: {gpt.sum_cost}')
 
 	saved_filename = (
 		os.path.splitext(file)[0] + f'_by_{gpt.model.value}' + FILE_EXTENSIONS[lang]
 	)
 	with open(saved_filename, 'w') as f:
-		print(f'[+]:{gpt.model.value}の出力したコードを保存しました：{f.name}')
+		console.print(
+			f'[green][+][/green] {gpt.model.value} の出力したコードを保存しました：{f.name}'
+		)
 		f.write(code)
 
+	console.print(f'[info] AI利用にかかったAPIコスト: {gpt.sum_cost}')
+
 
 def generate_template(file: Filename, lang: Lang) -> None:
+	console = Console()
 	with open(file, 'r') as f:
 		html_content = f.read()
 	md = make_problem_markdown(html_content, 'en')
@@ -70,17 +109,22 @@ The user will provide a problem from a programming contest called AtCoder. This
 
 You must not solve the problem. Please faithfully reproduce the variable names defined in the problem.
     """
-	reply = gpt.tell(md + propmpt)
+	with console.status(f'{lang2str(lang)}のテンプレートを生成しています...'):
+		reply = gpt.tell(md + propmpt)
 	code = get_code_from_gpt_output(reply)
-	print(f'AI利用にかかったAPIコスト:{gpt.sum_cost}')
 
 	savaed_filename = os.path.splitext(file)[0] + FILE_EXTENSIONS[lang]
-	with open(savaed_filename, 'w') as f:
-		print(f'[+]:テンプレートファイル{savaed_filename}を作成しました.')
+	with open(savaed_filename, 'x') as f:
+		console.print(
+			f'[green][+][/green] テンプレートファイルを作成 :{savaed_filename}'
+		)
 		f.write(code)
 
+	console.print(f'[info] AI利用にかかったAPIコスト: {gpt.sum_cost}')
+
 
 def solve_problem(file: Filename, lang: Lang) -> None:
+	console = Console()
 	with open(file, 'r') as f:
 		html_content = f.read()
 	md = make_problem_markdown(html_content, 'en')
@@ -94,9 +138,16 @@ def solve_problem(file: Filename, lang: Lang) -> None:
 
 	file_without_ext = os.path.splitext(file)[0]
 
-	reply = gpt.tell(md)
-
 	for i in range(1, 4):
+		with console.status(f'{i}回目のコード生成 (by {gpt.model.value})...'):
+			test_report = ''
+			if i == 1:
+				reply = gpt.tell(md)
+			else:
+				reply = gpt.tell(f"""The following is the test report for the code you provided:
+	{test_report}
+	Please provide an updated version of the code in {lang2str(lang)}.""")
+
 		code = get_code_from_gpt_output(reply)
 
 		saved_filename = (
@@ -106,25 +157,25 @@ def solve_problem(file: Filename, lang: Lang) -> None:
 			+ FILE_EXTENSIONS[lang]
 		)
 		with open(saved_filename, 'w') as f:
-			print(f'[+]:{gpt.model.value}の出力したコードを保存しました：{f.name}')
+			console.print(
+				f'[green][+][/green] {gpt.model.value} の出力したコードを保存しました：{f.name}'
+			)
 			f.write(code)
 
 		labeled_results = judge_code_from(labeled_cases, saved_filename)
-		test_report = '\n'.join(render_result(lresult) for lresult in labeled_results)
+		test_report = '\n'.join(
+			render_result_for_GPT(lresult) for lresult in labeled_results
+		)
 
-		print(f'{i}回目のコード生成でのテスト結果:---')
-		print(test_report)
+		console.rule(f'{i}回目のコード生成でのテスト結果')
+		render_results(saved_filename, labeled_results)
 
 		if all(
 			labeled_result.result.passed == ResultStatus.AC
 			for labeled_result in labeled_results
 		):
-			print('コードのテストに成功!')
+			console.print('[green]コードのテストに成功![/green]')
 			break
-		else:
-			reply = gpt.tell(f"""The following is the test report for the code you provided:
-{test_report}
-Please provide an updated version of the code in {lang2str(lang)}.""")
 
 	with open(
 		'log_'
@@ -133,9 +184,11 @@ Please provide an updated version of the code in {lang2str(lang)}.""")
 		+ FILE_EXTENSIONS[Lang.JSON],
 		'w',
 	) as f:
-		print(f'[+]:{gpt.model.value}の出力のログを保存しました：{f.name}')
+		console.print(
+			f'[green][+][/green] {gpt.model.value}の出力のログを保存しました：{f.name}'
+		)
 		f.write(json.dumps(gpt.messages, indent=2))
-	print(f'AI利用にかかったAPIコスト:{gpt.sum_cost}')
+	console.print(f'AI利用にかかったAPIコスト:{gpt.sum_cost}')
 	return
 
 

atcdr/main.py

@@ -1,9 +1,11 @@
 from importlib.metadata import metadata
 
 import fire  # type: ignore
+from rich.traceback import install
 
 from atcdr.download import download
 from atcdr.generate import generate
+from atcdr.markdown import markdown
 from atcdr.open import open_files
 from atcdr.test import test
 
@@ -22,12 +24,15 @@ MAP_COMMANDS: dict = {
 	'o': open_files,
 	'generate': generate,
 	'g': generate,
+	'markdown': markdown,
+	'md': markdown,
 	'--version': get_version,
 	'-v': get_version,
 }
 
 
 def main():
+	install()
 	fire.Fire(MAP_COMMANDS)
 
 

atcdr/markdown.py

@@ -0,0 +1,39 @@
+import os
+
+from rich.console import Console
+from rich.markdown import Markdown
+
+from atcdr.util.execute import execute_files
+from atcdr.util.filetype import FILE_EXTENSIONS, Lang
+from atcdr.util.problem import make_problem_markdown
+
+
+def save_markdown(html_path: str, lang: str) -> None:
+	console = Console()
+	with open(html_path, 'r', encoding='utf-8') as f:
+		html = f.read()
+	md = make_problem_markdown(html, lang)
+	file_without_ext = os.path.splitext(html_path)[0]
+	md_path = file_without_ext + FILE_EXTENSIONS[Lang.MARKDOWN]
+
+	with open(md_path, 'w', encoding='utf-8') as f:
+		f.write(md)
+		console.print('[green][+][/green] Markdownファイルを作成しました.')
+
+
+def print_markdown(md_path: str) -> None:
+	console = Console()
+	with open(md_path, 'r', encoding='utf-8') as f:
+		md = f.read()
+	console.print(Markdown(md))
+
+
+def markdown(*args: str, lang: str = 'ja', save: bool = False) -> None:
+	if save:
+		execute_files(
+			*args,
+			func=lambda html_path: save_markdown(html_path, lang),
+			target_filetypes=[Lang.HTML],
+		)
+	else:
+		execute_files(*args, func=print_markdown, target_filetypes=[Lang.MARKDOWN])

atcdr/open.py

@@ -1,35 +1,42 @@
-import webbrowser
+import webbrowser  # noqa: I001
+from rich.panel import Panel
+from rich.console import Console
 
-from bs4 import BeautifulSoup as bs
-from bs4.element import Tag
-
-from atcdr.util.filename import Lang, execute_files
-
-
-def find_link_from(html: str) -> str | None:
-	soup = bs(html, 'html.parser')
-	meta_tag = soup.find('meta', property='og:url')
-	if isinstance(meta_tag, Tag) and 'content' in meta_tag.attrs:
-		content = meta_tag['content']
-		if isinstance(content, list):
-			return content[0]  # 必要に応じて、最初の要素を返す
-		return content
-	return None
+from atcdr.util.filetype import Lang
+from atcdr.util.execute import execute_files
+from atcdr.util.problem import find_link_from_html
 
 
 def open_html(file: str) -> None:
+	console = Console()
 	try:
 		with open(file, 'r') as f:
 			html_content = f.read()
 	except FileNotFoundError:
-		print(f"HTMLファイル '{file}' が見つかりません。")
+		console.print(
+			Panel(
+				f"{file}' [red]が見つかりません[/]",
+				border_style='red',
+			)
+		)
 		return
 
-	url = find_link_from(html_content)
+	url = find_link_from_html(html_content)
 	if url:
-		webbrowser.open(url)
+		webbrowser.open_new_tab(url)
+		console.print(
+			Panel(
+				f'[green]URLを開きました[/] {url}',
+				border_style='green',
+			)
+		)
 	else:
-		print('URLが見つかりませんでした。')
+		console.print(
+			Panel(
+				f'{file} [yellow]にURLが見つかりませんでした[/]',
+				border_style='yellow',
+			)
+		)
 
 
 def open_files(*args: str) -> None:

atcdr/test.py

@@ -6,13 +6,15 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import Callable, Dict, List, Optional, Union
 
-import colorama
 from bs4 import BeautifulSoup as bs
-from colorama import Fore
+from rich.console import Console
+from rich.markup import escape
+from rich.panel import Panel
+from rich.table import Table
+from rich.text import Text
 
-from atcdr.util.filename import FILE_EXTENSIONS, SOURCE_LANGUAGES, Lang, execute_files
-
-colorama.init(autoreset=True)
+from atcdr.util.execute import execute_files
+from atcdr.util.filetype import FILE_EXTENSIONS, SOURCE_LANGUAGES, Lang
 
 
 @dataclass
@@ -137,8 +139,6 @@ def run_c(path: str, case: TestCase) -> TestCaseResult:
 			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)
 
 
@@ -152,8 +152,6 @@ def run_cpp(path: str, case: TestCase) -> TestCaseResult:
 			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)
 
 
@@ -167,8 +165,6 @@ def run_rust(path: str, case: TestCase) -> TestCaseResult:
 			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)
 
 
@@ -221,36 +217,61 @@ def judge_code_from(
 	]
 
 
-CHECK_MARK = '\u2713'
-CROSS_MARK = '\u00d7'
-
-
-def render_result(lresult: LabeledTestCaseResult) -> str:
-	output = f'{Fore.CYAN}{lresult.label} of Test:\n'
-	result = lresult.result
-	testcase = lresult.testcase
-
-	if result.passed == ResultStatus.AC:
-		output += (
-			Fore.GREEN + f'{CHECK_MARK} Accepted !! Time: {result.executed_time} ms\n'
-		)
-	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'
-		)
-	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'
+class CustomFormatStyle(Enum):
+	SUCCESS = 'green'
+	FAILURE = 'red'
+	WARNING = 'yellow'
+	INFO = 'blue'
 
-	output += Fore.RESET
 
-	return output
+def render_results(path: str, results: List[LabeledTestCaseResult]) -> None:
+	console = Console()
+	success_count = sum(
+		1 for result in results if result.result.passed == ResultStatus.AC
+	)
+	total_count = len(results)
+
+	# ヘッダー
+	header_text = Text.assemble(
+		f'{path}のテスト  ',
+		(
+			f'{success_count}/{total_count} ',
+			'green' if success_count == total_count else 'red',
+		),
+	)
+	console.print(Panel(header_text, expand=False))
+
+	CHECK_MARK = '\u2713'
+	CROSS_MARK = '\u00d7'
+	# 各テストケースの結果表示
+	for i, result in enumerate(results):
+		if result.result.passed == ResultStatus.AC:
+			status_text = f'[green]{CHECK_MARK}[/] [white on green]{result.result.passed.value}[/]'
+			console.rule(title=f'No.{i+1} {result.label}', style='green')
+			console.print(f'[bold]ステータス:[/] {status_text}')
+
+		else:
+			status_text = f'[red]{CROSS_MARK} {result.result.passed.value}[/]'
+			console.rule(title=f'No.{i+1} {result.label}', style='red')
+			console.print(f'[bold]ステータス:[/] {status_text}')
+
+		if result.result.executed_time is not None:
+			console.print(f'[bold]実行時間:[/] {result.result.executed_time} ms')
+
+		table = Table(show_header=True, header_style='bold')
+		table.add_column('入力', style='cyan', min_width=10)
+		if result.result.passed != ResultStatus.AC:
+			table.add_column('出力', style='red', min_width=10)
+			table.add_column('正解の出力', style='green', min_width=10)
+			table.add_row(
+				escape(result.testcase.input),
+				escape(result.result.output),
+				escape(result.testcase.output),
+			)
+		else:
+			table.add_column('出力', style='green', min_width=10)
+			table.add_row(escape(result.testcase.input), escape(result.result.output))
+		console.print(table)
 
 
 def run_test(path_of_code: str) -> None:
@@ -265,11 +286,8 @@ 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(path_of_code, test_results)
 
 
 def test(*args: str) -> None:

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))

atcdr/util/{filename.py → filetype.py}

@@ -1,6 +1,5 @@
-import os
 from enum import Enum
-from typing import Callable, Dict, List, TypeAlias
+from typing import Dict, List, TypeAlias
 
 # ファイル名と拡張子の型エイリアスを定義
 Filename: TypeAlias = str
@@ -72,6 +71,7 @@ def str2lang(lang: str) -> Lang:
 		'cpp': Lang.CPP,
 		'c++': Lang.CPP,
 		'csharp': Lang.CSHARP,
+		'cs': Lang.CSHARP,
 		'c#': Lang.CSHARP,
 		'rb': Lang.RUBY,
 		'ruby': Lang.RUBY,
@@ -89,49 +89,3 @@ def str2lang(lang: str) -> Lang:
 
 def lang2str(lang: Lang) -> str:
 	return lang.value
-
-
-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:
-			print('複数のファイルが見つかりました。以下のファイルから選択してください:')
-			for i, file in enumerate(files):
-				print(f'{i + 1}. {file}')
-			choice = int(input('ファイル番号を入力してください: ')) - 1
-			if 0 <= choice < len(files):
-				func(files[choice])
-			else:
-				print('無効な選択です')
-	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))

atcdr/util/problem.py

@@ -1,46 +1,48 @@
 import re
 from enum import Enum
-from typing import Optional, Union
+from typing import Match, Optional
 
 from bs4 import BeautifulSoup as bs
-from bs4 import NavigableString, Tag
+from bs4 import Tag
 from markdownify import MarkdownConverter  # type: ignore
 
 
-# TODO : そのうちgenerate.pyやtest.py, open.pyのHTMLのparse処理を全部まとめる
-class Lang(Enum):
-	JA = 'ja'
-	EN = 'en'
+def repair_html(html: str) -> str:
+	html = html.replace('//img.atcoder.jp', 'https://img.atcoder.jp')
+	html = html.replace(
+		'<meta http-equiv="Content-Language" content="en">',
+		'<meta http-equiv="Content-Language" content="ja">',
+	)
+	html = html.replace('LANG = "en"', 'LANG="ja"')
+	html = remove_unnecessary_emptylines(html)
+	return html
 
 
-class ProblemStruct:
-	def __init__(self) -> None:
-		self.problem_part: Optional[str] = None
-		self.condition_part: Optional[str] = None
-		self.io_part: Optional[str] = None
-		self.test_part: Optional[list[str]] = None
+def get_title_from_html(html: str) -> str:
+	title: Optional[Match[str]] = re.search(r'<title>([^<]*)</title>', html)
+	return title.group(1).strip() if title else ''
 
-	def divide_problem_part(self, task_statement: Union[Tag, NavigableString]) -> None:
-		if not isinstance(task_statement, Tag):
-			return
 
-		parts = task_statement.find_all('div', {'class': 'part'})
+def title_to_filename(title: str) -> str:
+	title = re.sub(r'[\\/*?:"<>| !@#$%^&()+=\[\]{};,\']', '', title)
+	title = re.sub(r'^[A-Z]-', '', title)
+	return title
 
-		if len(parts) >= 2:
-			self.problem_part = str(parts[0])
-			self.condition_part = str(parts[1])
 
-		io_div = task_statement.find('div', {'class': 'io-style'})
-		if isinstance(io_div, Tag):
-			io_parts = io_div.find_all('div', {'class': 'part'})
+def find_link_from_html(html: str) -> str:
+	soup = bs(html, 'html.parser')
+	meta_tag = soup.find('meta', property='og:url')
+	if isinstance(meta_tag, Tag) and 'content' in meta_tag.attrs:
+		content = meta_tag['content']
+		if isinstance(content, list):
+			return content[0]  # 必要に応じて、最初の要素を返す
+		return content
+	return ''
 
-			if len(io_parts) > 0:
-				self.io_part = str(
-					io_parts[0]
-				)  # .find_all() はリストを返すので、str()でキャスト
 
-			# 2つ目以降のdivをtest_partに格納
-			self.test_part = [str(part) for part in io_parts[1:]]
+class Lang(Enum):
+	JA = 'ja'
+	EN = 'en'
 
 
 class CustomMarkdownConverter(MarkdownConverter):
@@ -57,10 +59,10 @@ def custom_markdownify(html, **options):
 	return CustomMarkdownConverter(**options).convert(html)
 
 
-def remove_unnecessary_emptylines(md_text):
-	md_text = re.sub(r'\n\s*\n\s*\n+', '\n\n', md_text)
-	md_text = md_text.strip()
-	return md_text
+def remove_unnecessary_emptylines(text):
+	text = re.sub(r'\n\s*\n\s*\n+', '\n\n', text)
+	text = text.strip()
+	return text
 
 
 def abstract_problem_part(html_content: str, lang: str) -> str:
@@ -81,7 +83,9 @@ def abstract_problem_part(html_content: str, lang: str) -> str:
 
 
 def make_problem_markdown(html_content: str, lang: str) -> str:
+	title = get_title_from_html(html_content)
 	problem_part = abstract_problem_part(html_content, lang)
 	problem_md = custom_markdownify(problem_part)
+	problem_md = f'# {title}\n{problem_md}'
 	problem_md = remove_unnecessary_emptylines(problem_md)
 	return problem_md

{atcoderstudybooster-0.1.1.dist-info → atcoderstudybooster-0.21.dist-info}/METADATA

@@ -1,19 +1,19 @@
 Metadata-Version: 2.3
 Name: AtCoderStudyBooster
-Version: 0.1.1
+Version: 0.21
 Summary: A tool to download and manage AtCoder problems.
 Project-URL: Homepage, https://github.com/yuta6/AtCoderStudyBooster
 Author-email: yuta6 <46110512+yuta6@users.noreply.github.com>
 License: MIT
 Requires-Python: >=3.8
 Requires-Dist: beautifulsoup4
-Requires-Dist: colorama
 Requires-Dist: fire
 Requires-Dist: markdownify>=0.13.1
+Requires-Dist: questionary>=2.0.1
 Requires-Dist: requests
+Requires-Dist: rich>=13.7.1
 Requires-Dist: tiktoken
 Requires-Dist: types-beautifulsoup4>=4.12.0.20240511
-Requires-Dist: types-colorama>=0.4.15.20240311
 Requires-Dist: types-requests>=2.32.0.20240712
 Requires-Dist: yfinance
 Description-Content-Type: text/markdown

atcoderstudybooster-0.21.dist-info/RECORD

@@ -0,0 +1,17 @@
+atcdr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+atcdr/download.py,sha256=aqJEmrLop_Mj8GNJjoWRcSzWU0z9iNc9vtZOjhWXx3U,8945
+atcdr/generate.py,sha256=0yWX-5PS-FR6LTaP3muHq6a7rFB2a1Oek48mF45exoA,6972
+atcdr/main.py,sha256=y2IkXwcAyKZ_1y5PgU93GpXzo5lKak9oxo0XV_9d5Fo,727
+atcdr/markdown.py,sha256=jEktnYgrDYcgIuhxRpJImAzNpFmfSPkRikAesfMxAVk,1125
+atcdr/open.py,sha256=2UlmNWdieoMrPu1xSUWf-8sBB9Y19r0t6V9zDRBSPes,924
+atcdr/test.py,sha256=hAhttwVJiDJX8IAWcnpKj04yTTs4cmr8GQ-NsldBAGc,8468
+atcdr/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+atcdr/util/cost.py,sha256=0c9H8zLley7xZDLuYU4zJmB8m71qcO1WEIQOoEavD_4,3168
+atcdr/util/execute.py,sha256=tcYflnVo_38LdaOGDUAuqfSfcA54bTrCaTRShH7kwUw,1750
+atcdr/util/filetype.py,sha256=NyTkBbL44VbPwGXps381odbC_JEx_eYxRYPaYwRHfZ0,1647
+atcdr/util/gpt.py,sha256=Lto6SJHZGer8cC_Nq8lJVnaET2R7apFQteo6ZEFpjdM,3304
+atcdr/util/problem.py,sha256=WprmpOZm6xpyvksIS3ou1uHqFnBO1FUZWadsLziG1bY,2484
+atcoderstudybooster-0.21.dist-info/METADATA,sha256=bbRsuYSoizj_QSRzfxzxF0tsMNtMqSdze9mrEph5ZHk,4468
+atcoderstudybooster-0.21.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+atcoderstudybooster-0.21.dist-info/entry_points.txt,sha256=_bhz0R7vp2VubKl_eIokDO8Wz9TdqvYA7Q59uWfy6Sk,42
+atcoderstudybooster-0.21.dist-info/RECORD,,

atcoderstudybooster-0.1.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-atcdr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atcdr/download.py,sha256=UYOkKoFaN7Rj2p-13MOjvgq26QzdvoNmWKBaUW6cCKs,7995
-atcdr/generate.py,sha256=Bh0QHRUVeI8u5FvXbJssbs6gr55XtUkNT2p897FlUgs,5521
-atcdr/main.py,sha256=i-TFxFk7bFMtKZxtDgI7aPoZAF-dsXqNoz3O_ZsGvb4,605
-atcdr/open.py,sha256=vbOy3fthklhZ7_WIWNGyS2H3iK2FHLeClDt_tloJ_b0,924
-atcdr/test.py,sha256=it3QjFxdlR0GY6Hc0c2Qdke71Z4dj5eLhfuWVZU9cZA,7969
-atcdr/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atcdr/util/cost.py,sha256=0c9H8zLley7xZDLuYU4zJmB8m71qcO1WEIQOoEavD_4,3168
-atcdr/util/filename.py,sha256=taCgSwIpB5iCjWZrYWAGRncRyUUl9exoNfsP-KLF2bs,2984
-atcdr/util/gpt.py,sha256=Lto6SJHZGer8cC_Nq8lJVnaET2R7apFQteo6ZEFpjdM,3304
-atcdr/util/problem.py,sha256=iDfNGfoCk_sy9RQRZ4vVqd1ViyT8HSWe_ekKUb4PdKs,2412
-atcoderstudybooster-0.1.1.dist-info/METADATA,sha256=6ncUVzTFelY1WHUoNP4NNLIqsjHiDAh_54Lgsg3OruI,4478
-atcoderstudybooster-0.1.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-atcoderstudybooster-0.1.1.dist-info/entry_points.txt,sha256=_bhz0R7vp2VubKl_eIokDO8Wz9TdqvYA7Q59uWfy6Sk,42
-atcoderstudybooster-0.1.1.dist-info/RECORD,,