Merge branch 'more-international-support'

beachdweller · beachdweller · commit e5b0953e73b8 · 2024-10-09T07:50:29.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased] - YYYY-MM-DD
 
 ### Added
-* Italian support
+* Bahasa Indonesia, Nederands, and Vietnamese support
+
 
 ### Changed
 
@@ -22,6 +23,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 
+## [v0.1.4] - 2024-10-09
+
+### Added
+* Bahasa Indonesia support
+* Nederands support
+* Vietnamese support
+
+
 ## [v0.1.3] - 2024-10-06
 
 ### Added
diff --git a/ai_tutor.py b/ai_tutor.py
@@ -165,13 +165,16 @@ def get_directive(explanation_in:str) -> str:
     d = {
         'Korean': '숙제 답안으로 제출한 코드가 오류를 일으킨 원인을 입문자 용어만으로 중복 없는 간결한 문장으로 설명하시오.',
         'English': 'Explain in beginner terms, without duplicates, the cause of the error in the code submitted as homework.',
-        'Japanese': '宿題の回答として提出されたコードがエラーの原因を、初心者向けの用語で重複なく簡潔に説明してください。',
+        'Bahasa Indonesia': 'Jelaskan dalam istilah pemula, tanpa duplikat, penyebab kesalahan dalam kode yang dikirim sebagai pekerjaan rumah.',
         'Chinese': '请用初学者术语简洁地解释作业提交的代码出错的原因，不要重复。',
-        'Spanish': 'Explique en términos para principiantes, sin duplicados, la causa del error en el código enviado como tarea.',
         'French': '''Expliquez en termes de débutant, sans doublons, la cause de l'erreur dans le code soumis comme devoir.''',
         'German': 'Erklären Sie in Anfängerterminologie ohne Duplikate die Ursache des Fehlers im als Hausaufgabe eingereichten Code.',
         'Italian': 'Spiega in termini per principianti, senza duplicati, la causa dell\'errore nel codice inviato come compito.',
+        'Japanese': '宿題の回答として提出されたコードがエラーの原因を、初心者向けの用語で重複なく簡潔に説明してください。',
+        'Nederlands': 'Leg in beginners termen, zonder duplicaten, de oorzaak van de fout in de code die als huiswerk is ingediend uit.',
+        'Spanish': 'Explique en términos para principiantes, sin duplicados, la causa del error en el código enviado como tarea.',
         'Thai': 'อธิบายด้วยภาษาของผู้เริ่มต้นโดยไม่ซ้ำซ้อนว่าสาเหตุของข้อผิดพลาดในรหัสที่ส่งเป็นการบ้านคืออะไร',
+        'Vietnamese': 'Hãy giải thích lỗi trong đoạn mã bài tập đã nộp bằng ngôn ngữ dễ hiểu dành cho người mới bắt đầu, và đừng lặp lại thông tin.',
     }
     return f"{d[explanation_in]}\n"
 
@@ -199,13 +202,16 @@ def get_report_header(explanation_in:str) -> str:
     d = {
         'Korean': "오류 메시지 시작",
         'English': "Error Message Start",
-        'Japanese': "エラーメッセージ開始",
+        'Bahasa Indonesia': "Pesan Kesalahan Dimulai",
         'Chinese': "错误消息开始",
-        'Spanish': "Mensaje de error comienza",
         'French': '''Message d'erreur commence''',
         'German': "Fehlermeldung beginnt",
         'Italian': "Messaggio di errore inizia",
+        'Japanese': "エラーメッセージ開始",
+        'Nederlands': "Foutmelding begint",
+        'Spanish': "Mensaje de error comienza",
         'Thai': "ข้อความผิดพลาดเริ่มต้น",
+        'Vietnamese': "Thông báo lỗi bắt đầu",
     }
     return (
         f"## {d[explanation_in]}\n"
@@ -217,13 +223,16 @@ def get_report_footer(explanation_in:str) -> str:
     d = {
         'Korean': "오류 메시지 끝",
         'English': "Error Message End",
-        'Japanese': "エラーメッセージ終わり",
+        'Bahasa Indonesia': "Pesan Kesalahan Berakhir",
         'Chinese': "错误消息结束",
-        'Spanish': "Mensaje de error termina",
         'French': '''Message d'erreur fin''',
         'German': "Fehlermeldung endet",
         'Italian': "Messaggio di errore finisce",
+        'Japanese': "エラーメッセージ終わり",
+        'Nederlands': "Foutmelding eindigt",
+        'Spanish': "Mensaje de error termina",
         'Thai': "ข้อความผิดพลาดสิ้นสุด",
+        'Vietnamese': "Thông báo lỗi kết thúc",
     }
     return (
         f"## {d[explanation_in]}\n"
@@ -240,49 +249,61 @@ def get_code_instruction(
     d_homework_start = {
         'Korean': "숙제 제출 코드 시작",
         'English': "Homework Submission Code Start",
-        'Japanese': "宿題提出コード開始",
+        'Bahasa Indonesia': "Kode Pengumpulan Tugas Dimulai",
         'Chinese': "作业提交代码开始",
-        'Spanish': "Inicio del código de envío de tareas",
         'French': '''Début du code de soumission des devoirs''',
         'German': "Code für die Einreichung von Hausaufgaben von hier aus",
         'Italian': "Inizio del codice di invio dei compiti",
+        'Japanese': "宿題提出コード開始",
+        'Nederlands': "Huiswerk inzendcode begint",
+        'Spanish': "Inicio del código de envío de tareas",
         'Thai': "การส่งงานเริ่มต้น",
+        'Vietnamese': "Bắt đầu mã nộp bài tập",
     }
 
     d_homework_end = {
         'Korean': "숙제 제출 코드 끝",
         'English': "Homework Submission Code End",
-        'Japanese': "宿題提出コード終わり",
+        'Bahasa Indonesia': "Kode Pengumpulan Tugas Berakhir",
         'Chinese': "作业提交代码结束",
-        'Spanish': "Fin del código de envío de tareas",
         'French': '''Fin du code de soumission des devoirs''',
         'German': "Ende der Hausaufgaben-Einreichungscodes",
         'Italian': "Fine del codice di invio dei compiti",
+        'Japanese': "宿題提出コード終わり",
+        'Nederlands': "Huiswerk inzendcode eindigt",
+        'Spanish': "Fin del código de envío de tareas",
         'Thai': "การส่งงานสิ้นสุด",
+        'Vietnamese': "Mã nộp bài tập kết thúc",
     }
 
     d_instruction_start = {
         'Korean': "과제 지침 시작",
         'English': "Assignment Instruction Start",
-        'Japanese': "課題指示開始",
+        'Bahasa Indonesia': "Instruksi Tugas Dimulai",
         'Chinese': "作业说明开始",
-        'Spanish': "Inicio de la instrucción de la tarea",
         'French': '''Début de l'instruction de la tâche''',
         'German': "Start der Aufgabenanweisung",
         'Italian': "Inizio dell'istruzione dell'assegnazione",
+        'Japanese': "課題指示開始",
+        'Nederlands': "Start van de taakinstructie",
+        'Spanish': "Inicio de la instrucción de la tarea",
         'Thai': "คำแนะนำการบ้านเริ่มต้น",
+        'Vietnamese': "Bắt đầu hướng dẫn nhiệm vụ",
     }
 
     d_instruction_end = {
         'Korean': "과제 지침 끝",
         'English': "Assignment Instruction End",
-        'Japanese': "課題指示終わり",
+        'Bahasa Indonesia': "Instruksi Tugas Berakhir",
         'Chinese': "作业说明结束",
-        'Spanish': "Fin de la instrucción de la tarea",
         'French': '''Fin de l'instruction de la tâche''',
         'German': "Ende der Aufgabenanweisung",
         'Italian': "Fine dell'istruzione dell'assegnazione",
+        'Japanese': "課題指示終わり",
+        'Nederlands': "Einde van de taakinstructie",
+        'Spanish': "Fin de la instrucción de la tarea",
         'Thai': "คำแนะนำการบ้านสิ้นสุด",
+        'Vietnamese': "Kết thúc hướng dẫn nhiệm vụ",
     }
 
     return (
diff --git a/tests/test_ai_tutor.py b/tests/test_ai_tutor.py
@@ -57,23 +57,26 @@ def test_collect_longrepr(json_dict_div_zero_try_except:Dict):
     assert result
 
 
-@pytest.fixture(params=('Korean', 'English', 'Japanese', 'Chinese', 'Spanish', 'French', 'German', 'Italian', 'Thai'))
+@pytest.fixture(params=('Korean', 'English', 'Bahasa Indonesia', 'Chinese', 'French', 'German', 'Italian', 'Japanese', 'Nederlands', 'Spanish', 'Thai', 'Vietnamese'))
 def explanation_in(request) -> str:
-    return request.param.capitalize()
+    return request.param
 
 
 @pytest.fixture
 def homework(explanation_in:str) -> Tuple[str]:
     d = {
         'Korean': ('숙제',),
         'English': ('Homework',),
-        'Japanese': ('宿題',),
+        'Bahasa Indonesia': ('tugas', 'pekerjaan rumah', 'PR'),
         'Chinese': ('作业',),
-        'Spanish': ('Tarea',),
         'French': ('Devoir',),
         'German': ('Hausaufgabe',),
         'Italian': ('Compito', 'Compiti'),
+        'Japanese': ('宿題',),
+        'Nederlands': ('Huiswerk',),
+        'Spanish': ('Tarea',),
         'Thai': ('การบ้าน',),
+        'Vietnamese': ('Bài tập',),
     }    
     return tuple(
         map(
@@ -88,13 +91,16 @@ def msg(explanation_in:str) -> str:
     d = {
         'Korean': '메시지',
         'English': 'Message',
-        'Japanese': 'メッセ',
+        'Bahasa Indonesia': 'Pesan',
         'Chinese': '消息',
-        'Spanish': 'Mensaje',
         'French': 'Message',
         'German': 'Fehlermeldung',
         'Italian': 'Messaggio',
+        'Japanese': 'メッセ',
+        'Nederlands': 'Foutmelding', # error message
+        'Spanish': 'Mensaje',
         'Thai': 'ข้อความ',
+        'Vietnamese': 'thông báo', # notification
     }
     return d[explanation_in].lower()
 
@@ -107,17 +113,21 @@ def test_get_directive(explanation_in:str, homework:Tuple[str]):
             lambda x: x in result.lower(),
             homework
         )
+    ), (
+        f"Could not find homework: {homework} in result: {result}."
     )
 
 
 def test_get_instruction(explanation_in:str, homework:Tuple[str],):
-    result = ai_tutor.get_directive(explanation_in=explanation_in)
+    result = ai_tutor.get_directive(explanation_in=explanation_in).lower()
 
     assert any(
         map(
-            lambda x: x in result.lower(),
+            lambda x: x in result,
             homework
         )
+    ), (
+        f"Could not find homework: {homework} in result: {result}."
     )
 
 
@@ -126,7 +136,7 @@ def test_get_report__header__footer(explanation_in:str, msg:str, func:Callable):
 
     result = func(explanation_in=explanation_in)
 
-    assert msg in result.lower()
+    assert msg in result.lower(), f"Could not find msg: {msg} in result: {result}."
 
 
 @pytest.fixture
@@ -142,17 +152,25 @@ def sample_readme_path() -> pathlib.Path:
 @pytest.fixture
 def instruction(explanation_in:str) -> str:
     d = {
-        'Korean': '지침',
-        'English': 'Instruction',
-        'Japanese': '指示',
-        'Chinese': '说明',
-        'Spanish': 'instrucción',
-        'French': 'instruction',
-        'German': 'Aufgabenanweisung',
-        'Italian': 'istruzione',
-        'Thai': 'แนะนำ',
+        'Korean': ('지침',),
+        'English': ('Instruction',),
+        'Bahasa Indonesia': ('Petunjuk', 'Instruksi'),
+        'Chinese': ('说明',),
+        'French': ('instruction',),
+        'German': ('Aufgabenanweisung',),
+        'Italian': ('istruzione',),
+        'Japanese': ('指示',),
+        'Nederlands': ('instructie',),
+        'Spanish': ('instrucción',),
+        'Thai': ('แนะนำ',),
+        'Vietnamese': ('hướng dẫn',),
     }
-    return d[explanation_in].lower()
+    return tuple(
+        map(
+            lambda x: x.lower(),
+            d[explanation_in]
+        )
+    )
 
 
 def test_get_code_instruction(
@@ -175,7 +193,13 @@ def test_get_code_instruction(
             homework
         )
     )
-    assert instruction in result
+
+    assert any(
+        map(
+            lambda x: x in result,
+            instruction
+        )
+    ), f"Could not find instruction: {instruction} in result: {result}."
 
 
 def test_get_the_question(
@@ -202,7 +226,13 @@ def test_get_the_question(
         )
     )
     assert msg in result
-    assert instruction in result
+
+    assert any(
+        map(
+            lambda x: x in result,
+            instruction
+        )
+    ), f"Could not find instruction: {instruction} in result: {result}."
 
 
 if '__main__' == __name__:
