AtCoderStudyBooster 0.1.1__tar.gz → 0.21__tar.gz

atcoderstudybooster-0.21/.github/workflows/deploy.yaml

@@ -0,0 +1,40 @@
+name: Deploy to PyPI
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - main
+  release:
+    types: [published]
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref == 'develop'
+    name: Deploy
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Rye
+        shell: bash
+        run: |
+          curl -sSf https://rye.astral.sh/get | bash
+          echo 'source "$HOME/.rye/env"' >> ~/.bashrc
+          source ~/.bashrc
+
+      - name: Sync dependencies
+        run: rye sync
+
+      - name: Build
+        run: rye build
+
+      - name: Publish to PyPI
+        env:
+          PYPI_TOKEN: ${{ secrets.PYPI }}
+        run: rye publish --token $PYPI_TOKEN --yes

{atcoderstudybooster-0.1.1 → atcoderstudybooster-0.21}/PKG-INFO

@@ -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/atcdr/download.py

@@ -0,0 +1,289 @@
+import os
+import re
+import time
+from dataclasses import dataclass
+from enum import Enum
+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.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):
+	A = 'A'
+	B = 'B'
+	C = 'C'
+	D = 'D'
+	E = 'E'
+	F = 'F'
+	G = 'G'
+
+
+@dataclass
+class Problem:
+	number: int
+	difficulty: Diff
+
+
+def get_problem_html(problem: Problem) -> Optional[str]:
+	url = f'https://atcoder.jp/contests/abc{problem.number}/tasks/abc{problem.number}_{problem.difficulty.value.lower()}'
+	response = requests.get(url)
+	retry_attempts = 3
+	retry_wait = 1  # 1 second
+
+	for _ in range(retry_attempts):
+		response = requests.get(url)
+		if response.status_code == 200:
+			return response.text
+		elif response.status_code == 429:
+			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:
+			console.print(
+				f'[bold yellow][Error {response.status_code}][/bold yellow] リダイレクトが発生しました。abc{problem.number} {problem.difficulty.value}'
+			)
+		elif 400 <= response.status_code < 500:
+			console.print(
+				f'[bold red][Error {response.status_code}][/bold red] 問題が見つかりません。abc{problem.number} {problem.difficulty.value}'
+			)
+			break
+		elif 500 <= response.status_code < 600:
+			console.print(
+				f'[bold red][Error {response.status_code}][/bold red] サーバーエラーが発生しました。abc{problem.number} {problem.difficulty.value}'
+			)
+			break
+		else:
+			console.print(
+				f'[bold red][Error {response.status_code}][/bold red] abc{problem.number} {problem.difficulty.value}に対応するHTMLファイルを取得できませんでした。'
+			)
+			break
+	return None
+
+
+def save_file(file_path: str, html: str) -> None:
+	with open(file_path, 'w', encoding='utf-8') as file:
+		file.write(html)
+	console.print(f'[bold green][+][/bold green] ファイルを保存しました :{file_path}')
+
+
+def mkdir(path: str) -> None:
+	if not os.path.exists(path):
+		os.makedirs(path)
+		console.print(f'[bold green][+][/bold green] フォルダー: {path} を作成しました')
+
+
+class GenerateMode:
+	@staticmethod
+	def gene_path_on_diff(base: str, number: int, diff: Diff) -> str:
+		return os.path.join(base, diff.name, str(number))
+
+	@staticmethod
+	def gene_path_on_num(base: str, number: int, diff: Diff) -> str:
+		return os.path.join(base, str(number), diff.name)
+
+
+def generate_problem_directory(
+	base_path: str, problems: List[Problem], gene_path: Callable[[str, int, Diff], str]
+) -> None:
+	for problem in problems:
+		dir_path = gene_path(base_path, problem.number, problem.difficulty)
+
+		html = get_problem_html(problem)
+		if html is None:
+			continue
+
+		title = get_title_from_html(html)
+		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, title + FILE_EXTENSIONS[Lang.HTML])
+		save_file(html_path, repaired_html)
+		md = make_problem_markdown(html, 'ja')
+		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]:
+	match = re.match(r'^(\d+)\.\.(\d+)$', range_str)
+	if match:
+		start, end = map(int, match.groups())
+		return list(range(start, end + 1))
+	else:
+		raise ValueError('数字の範囲の形式が間違っています')
+
+
+def parse_diff_range(range_str: str) -> List[Diff]:
+	match = re.match(r'^([A-Z])\.\.([A-Z])$', range_str)
+	if match:
+		start, end = match.groups()
+		start_index = ord(start) - ord('A')
+		end_index = ord(end) - ord('A')
+		if start_index <= end_index:
+			return [Diff(chr(i + ord('A'))) for i in range(start_index, end_index + 1)]
+	raise ValueError('A..C の形式になっていません')
+
+
+def convert_arg(arg: str) -> Union[List[int], List[Diff]]:
+	if isinstance(arg, int):
+		return [arg]
+	elif isinstance(arg, str):
+		if arg.isdigit():
+			return [int(arg)]
+		elif arg in Diff.__members__:
+			return [Diff[arg]]
+		elif re.match(r'^\d+\.\.\d+$', arg):
+			return parse_range(arg)
+		elif re.match(r'^[A-Z]\.\.[A-Z]$', arg):
+			return parse_diff_range(arg)
+	raise ValueError(f'{arg}は認識できません')
+
+
+def are_all_integers(args: Union[List[int], List[Diff]]) -> bool:
+	return all(isinstance(arg, int) for arg in args)
+
+
+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:
+		interactive_download()
+		return
+
+	first_args = convert_arg(str(first))
+	if second is None:
+		if isinstance(first, Diff):
+			raise ValueError(
+				"""難易度だけでなく, 問題番号も指定してコマンドを実行してください.
+                    例 atcdr -d A 120  : A問題の120をダウンロードます
+                    例 atcdr -d A 120..130  : A問題の120から130をダウンロードます
+                """
+			)
+		second_args: Union[List[int], List[Diff]] = list(Diff)
+	else:
+		second_args = convert_arg(str(second))
+
+	if are_all_integers(first_args) and are_all_diffs(second_args):
+		first_args_int = cast(List[int], first_args)
+		second_args_diff = cast(List[Diff], second_args)
+		problems = [
+			Problem(number, diff)
+			for number in first_args_int
+			for diff in second_args_diff
+		]
+		generate_problem_directory(base_path, problems, GenerateMode.gene_path_on_num)
+	elif are_all_diffs(first_args) and are_all_integers(second_args):
+		first_args_diff = cast(List[Diff], first_args)
+		second_args_int = cast(List[int], second_args)
+		problems = [
+			Problem(number, diff)
+			for diff in first_args_diff
+			for number in second_args_int
+		]
+		generate_problem_directory(base_path, problems, GenerateMode.gene_path_on_diff)
+	else:
+		raise ValueError(
+			"""次のような形式で問題を指定してください
+                例 atcdr -d A 120..130  : A問題の120から130をダウンロードします
+                例 atcdr -d 120         : ABCのコンテストの問題をダウンロードします
+            """
+		)

{atcoderstudybooster-0.1.1 → atcoderstudybooster-0.21}/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
 
 

{atcoderstudybooster-0.1.1 → atcoderstudybooster-0.21}/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)
 
 

atcoderstudybooster-0.21/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])

atcoderstudybooster-0.21/atcdr/open.py

@@ -0,0 +1,43 @@
+import webbrowser  # noqa: I001
+from rich.panel import Panel
+from rich.console import Console
+
+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:
+		console.print(
+			Panel(
+				f"{file}' [red]が見つかりません[/]",
+				border_style='red',
+			)
+		)
+		return
+
+	url = find_link_from_html(html_content)
+	if url:
+		webbrowser.open_new_tab(url)
+		console.print(
+			Panel(
+				f'[green]URLを開きました[/] {url}',
+				border_style='green',
+			)
+		)
+	else:
+		console.print(
+			Panel(
+				f'{file} [yellow]にURLが見つかりませんでした[/]',
+				border_style='yellow',
+			)
+		)
+
+
+def open_files(*args: str) -> None:
+	execute_files(*args, func=open_html, target_filetypes=[Lang.HTML])