python-ecd 0.1.9__tar.gz → 0.2.1__tar.gz

{python_ecd-0.1.9 → python_ecd-0.2.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.3
 Name: python-ecd
-Version: 0.1.9
+Version: 0.2.1
 Summary: Python CLI for Everybody Codes
 Author: Pablo Garcia
 Author-email: Pablo Garcia <pablofueros@gmail.com>
 Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: MIT License
-Requires-Dist: everybody-codes-data==0.2
+Requires-Dist: everybody-codes-data==0.3
 Requires-Dist: typer>=0.20.0
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
@@ -84,10 +84,10 @@ Note that is not necessary if you set it during initialization.
 
 ### Download Puzzle Input
 
-Get the input for a specific puzzle:
+Download the input for a specific puzzle:
 
 ```bash
-ecd get <QUEST_NUMBER> [OPTIONS]
+ecd pull <QUEST_NUMBER> [OPTIONS]
 ```
 
 Options:
@@ -95,6 +95,8 @@ Options:
 - `--part`, `-p`: Puzzle part (default: 1)
 - `--force`, `-f`: Overwrite existing files
 
+This command will create the necessary dirs and files if they do not exist.
+
 ### Run Solutions
 
 Execute your solution for a specific puzzle:
@@ -119,6 +121,18 @@ Options:
 - `--year`: Event year (default: actual)
 - `--part`: Part number to test (default: 1)
 
+### Submit Solutions
+
+Submit your solution for a specific puzzle:
+
+```bash
+ecd push <QUEST_NUMBER> [OPTIONS]
+```
+
+Options:
+- `--year`: Event year (default: actual)
+- `--part`: Part number to test (default: 1)
+
 ### Display Version
 
 Show the current version of the tool:
@@ -129,7 +143,7 @@ ecd --version
 
 ## ©️ License
 
-[MIT License](LICENSE)
+This project is licensed under the terms of the MIT license.
 
 ## 🤝 Contributing
 

{python_ecd-0.1.9 → python_ecd-0.2.1}/README.md

@@ -71,10 +71,10 @@ Note that is not necessary if you set it during initialization.
 
 ### Download Puzzle Input
 
-Get the input for a specific puzzle:
+Download the input for a specific puzzle:
 
 ```bash
-ecd get <QUEST_NUMBER> [OPTIONS]
+ecd pull <QUEST_NUMBER> [OPTIONS]
 ```
 
 Options:
@@ -82,6 +82,8 @@ Options:
 - `--part`, `-p`: Puzzle part (default: 1)
 - `--force`, `-f`: Overwrite existing files
 
+This command will create the necessary dirs and files if they do not exist.
+
 ### Run Solutions
 
 Execute your solution for a specific puzzle:
@@ -106,6 +108,18 @@ Options:
 - `--year`: Event year (default: actual)
 - `--part`: Part number to test (default: 1)
 
+### Submit Solutions
+
+Submit your solution for a specific puzzle:
+
+```bash
+ecd push <QUEST_NUMBER> [OPTIONS]
+```
+
+Options:
+- `--year`: Event year (default: actual)
+- `--part`: Part number to test (default: 1)
+
 ### Display Version
 
 Show the current version of the tool:
@@ -116,7 +130,7 @@ ecd --version
 
 ## ©️ License
 
-[MIT License](LICENSE)
+This project is licensed under the terms of the MIT license.
 
 ## 🤝 Contributing
 

{python_ecd-0.1.9 → python_ecd-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-ecd"
-version = "0.1.9"
+version = "0.2.1"
 description = "Python CLI for Everybody Codes"
 readme = "README.md"
 classifiers = [
@@ -9,7 +9,10 @@ classifiers = [
 ]
 authors = [{ name = "Pablo Garcia", email = "pablofueros@gmail.com" }]
 requires-python = ">=3.13"
-dependencies = ["everybody-codes-data==0.2", "typer>=0.20.0"]
+dependencies = [
+    "everybody-codes-data==0.3",
+    "typer>=0.20.0",
+]
 
 [project.scripts]
 python-ecd = "python_ecd.cli:app"

{python_ecd-0.1.9 → python_ecd-0.2.1}/src/python_ecd/cli.py

@@ -85,14 +85,13 @@ def set_token_cmd(
     typer.echo("🔑 Session token saved to /home/.config/ecd/token")
 
 
-@app.command("get")
-def get_cmd(
+@app.command("pull")
+def pull_cmd(
     quest: int = typer.Argument(..., help="Quest number (e.g. 3)"),
     year: int = typer.Option(datetime.now().year, "--year", "-y", help="Event year"),
-    part: int = typer.Option(1, "--part", "-p", help="Puzzle part (1, 2, or 3)"),
     force: bool = typer.Option(False, "--force", "-f", help="Overwrite existing files"),
 ) -> None:
-    """Download input data for a given quest and create local structure."""
+    """Download available input data for a given quest and create local structure."""
 
     # 0. Locate base directory
     base_dir = utils.find_base()
@@ -106,10 +105,9 @@ def get_cmd(
 
     # 2. Download the input for the given part
     try:
-        input_text = utils.download_input(year, quest, part)
+        input_dict = utils.download_input(year, quest)
     except Exception as e:
         typer.echo(f"❌ Failed to fetch input: {e}")
-        typer.echo("ℹ️ Maybe ")
         raise typer.Exit(1)
 
     # 3. Prepare directory structure
@@ -118,29 +116,34 @@ def get_cmd(
     # 4. Create solution.py if missing
     solution_file = quest_dir / "solution.py"
     if solution_file.exists() and not force:
-        typer.echo("⚠️ solution.py already exists (use --force to overwrite).")
+        typer.echo(
+            "⚠️ The solution python file already exists (use --force to overwrite)."
+        )
     else:
         utils.create_solution(quest_dir, force)
         typer.echo("🧩 Created solution.py")
 
-    # 5. Save input
-    input_file = quest_dir / f"input/input_p{part}.txt"
-    if input_file.exists() and not force:
-        typer.echo("⚠️ Input file already exists (use --force to overwrite).")
-    else:
-        input_file.write_text(input_text, encoding="utf-8")
-        typer.echo(f"📥 Saved input for quest {quest:02d} part {part}.")
-
-    # 6. Ensure empty test file exists
-    test_file = quest_dir / f"test/test_p{part}.txt"
-    if test_file.exists() and not force:
-        typer.echo("⚠️ Test file already exists (use --force to overwrite).")
-    else:
-        test_file.touch(exist_ok=True)
-
-    typer.echo(
-        f"✅ Quest {quest:02d} (Part {part}) ready at {solution_file.relative_to(base_dir)}"
-    )
+    for key, input in input_dict.items():
+        # 5. Save available inputs
+        input_file = quest_dir / f"input/input_p{key}.txt"
+        if input_file.exists() and not force:
+            typer.echo(
+                f"⚠️ Input file for part {key} already exists (use --force to overwrite)."
+            )
+        else:
+            input_file.write_text(input, encoding="utf-8")
+            typer.echo(f"📥 Saved input for quest {quest:02d} part {key}.")
+
+        # 6. Ensure empty test file exists
+        test_file = quest_dir / f"test/test_p{key}.txt"
+        if test_file.exists() and not force:
+            typer.echo(
+                f"⚠️ Test file for part {key} already exists (use --force to overwrite)."
+            )
+        else:
+            test_file.touch(exist_ok=True)
+
+    typer.echo(f"✅ Quest {quest:02d} ready at {solution_file.relative_to(base_dir)}")
 
 
 @app.command("run")
@@ -185,5 +188,75 @@ def test_cmd(
     typer.echo(f"🧪 Test result for Quest {quest} Part {part}:\n{result}")
 
 
+@app.command("push")
+def push_cmd(
+    quest: int = typer.Argument(..., help="Quest number (e.g. 3)"),
+    year: int = typer.Option(datetime.now().year, "--year", "-y", help="Event year"),
+    part: int = typer.Option(1, "--part", "-p", help="Part number to test"),
+) -> None:
+    """Submit the solution for a given quest and part."""
+
+    # 0. Locate base directory
+    base_dir = utils.find_base()
+
+    # 1. Submit the solution
+    try:
+        result = utils.push_solution(base_dir, quest, year, part)
+    except Exception as e:
+        typer.echo(f"❌ Failed to submit solution for Quest {quest} Part {part}: {e}")
+        raise typer.Exit(1)
+
+    if result.get("correct"):
+        typer.echo(
+            f"✅ Correct answer for Quest {quest} Part {part}!"
+            f"\n🏅 - Global place: {result.get('globalPlace', '?')}"
+            f"\n🏅 - Global score: {result.get('globalScore', '?')}"
+            f"\n⏱️ - Global time: {utils.format_duration(result.get('globalTime'))}"
+            f"\n⏱️ - Local time: {utils.format_duration(result.get('localTime'))}"
+        )
+
+        # Download the next part (if the quest is not ended)
+        if part == 3:
+            return
+        else:
+            typer.echo()
+
+        # Download the input for the given part
+        try:
+            input_dict = utils.download_input(year, quest)
+        except Exception as e:
+            typer.echo(f"❌ Failed to fetch input: {e}")
+            raise typer.Exit(1)
+
+        # Prepare directory structure
+        quest_dir = utils.create_quest_dir(base_dir, year, quest)
+
+        # 5. Save available inputs
+        input_file = quest_dir / f"input/input_p{part + 1}.txt"
+        if input_file.exists():
+            typer.echo(
+                f"⚠️ Input file for part {part + 1} already exists (use ecd pull --force to overwrite)."
+            )
+        else:
+            input_file.write_text(input_dict[str(part + 1)], encoding="utf-8")
+            typer.echo(f"📥 Saved input for quest {quest:02d} part {part + 1}.")
+
+        # 6. Ensure empty test file exists
+        test_file = quest_dir / f"test/test_p{part + 1}.txt"
+        if test_file.exists():
+            typer.echo(
+                f"⚠️ Test file for part {part + 1} already exists (use ecd pull --force to overwrite)."
+            )
+        else:
+            test_file.touch(exist_ok=True)
+
+    else:
+        typer.echo(
+            f"❌ Incorrect answer for Quest {quest} Part {part}:"
+            f"\n - lengthCorrect={result.get('lengthCorrect')}, "
+            f"\n - firstCorrect={result.get('firstCorrect')}"
+        )
+
+
 if __name__ == "__main__":
     app()

{python_ecd-0.1.9 → python_ecd-0.2.1}/src/python_ecd/templates/README.md.tpl

@@ -2,7 +2,7 @@
 
 My solutions to the [Everybody Codes](https://everybody.codes/) puzzles — powered by **[`python-ecd`](https://github.com/pablofueros/python-ecd)** ⚙️
 
-> A lightweight CLI tool to fetch, run, and organize Everybody Codes challenges with ease.
+> A lightweight CLI tool to fetch, test, and submit Everybody Codes challenges with ease.
 
 ---
 
@@ -35,10 +35,13 @@ Note that **[`python-ecd`](https://github.com/pablofueros/python-ecd)** must be
 ecd init
 
 # Fetch a puzzle input ()
-ecd get 3  # Quest 3 of the current year
+ecd pull 3  # Quest 3 of the current year
 
 # Run your test cases
 ecd test 3 --part 1
 
 # Execute your actual input
 ecd run 3 --part 1
+
+# Submit your answer
+ecd push 3 --part 1

{python_ecd-0.1.9 → python_ecd-0.2.1}/src/python_ecd/utils.py

@@ -2,9 +2,11 @@ import contextlib
 import importlib.util
 import io
 import subprocess
+from datetime import timedelta
 from pathlib import Path
+from typing import Literal, cast
 
-from ecd import get_inputs
+from ecd import get_inputs, submit
 
 
 def _read_template(template_name: str) -> str:
@@ -107,20 +109,12 @@ def get_token() -> str | None:
     return TOKEN_PATH.read_text().strip()
 
 
-def download_input(year: int, quest: int, part: int) -> str:
+def download_input(year: int, quest: int) -> dict[str, str]:
     """
-    Fetch the input text for a specific quest and part.
-    Raises if part not available.
+    Fetch the available input text for a specific quest.
     """
-
     with contextlib.redirect_stderr(io.StringIO()):
-        data = get_inputs(quest=quest, event=year)
-
-    key = str(part)
-    if key not in data:
-        raise ValueError(f"Part {part} not unlocked or not available.")
-
-    return data[key]
+        return get_inputs(quest=quest, event=year)
 
 
 def execute_part(
@@ -176,3 +170,86 @@ def execute_part(
         raise ValueError(f"{func_name} returned None.")
 
     return str(result)
+
+
+def push_solution(
+    base_dir: Path,
+    quest: int,
+    year: int,
+    part: int,
+) -> dict:
+    """
+    Submit the solution for a given quest and part using input data.
+
+    Returns:
+        The response message from the submission.
+    """
+
+    quest_dir = base_dir / "events" / str(year) / f"quest_{quest:02d}"
+    solution_path = quest_dir / "solution.py"
+    if not solution_path.exists():
+        raise FileNotFoundError(
+            f"Missing solution file: {solution_path.relative_to(base_dir)}"
+        )
+
+    # Dynamic import
+    spec = importlib.util.spec_from_file_location("solution", solution_path)
+    if spec is None or spec.loader is None:
+        raise ImportError(
+            f"Could not load module from {solution_path.relative_to(base_dir)}"
+        )
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+
+    func_name = f"part_{part}"
+    func = getattr(module, func_name, None)
+    if not callable(func):
+        raise AttributeError(f"No function '{func_name}' defined in solution.py")
+
+    # Fetch input data
+    input_dict = download_input(year=year, quest=quest)
+    input_text = input_dict[str(part)]
+
+    # Run the function
+    answer = func(input_text)
+    if answer is None:
+        raise ValueError(f"{func_name} returned None.")
+
+    # Submit the answer
+    with contextlib.redirect_stderr(io.StringIO()):
+        result = submit(
+            quest=quest,
+            event=year,
+            part=cast(Literal[1, 2, 3], part),
+            answer=str(answer),
+            quiet=True,
+        )
+
+    if result.status != 200:
+        raise RuntimeError(f"Submission failed with status {result.status}")
+
+    return result.json()
+
+
+def format_duration(ms: int | float | None) -> str:
+    """Format duration in milliseconds to a human-readable string using timedelta."""
+    if ms is None:
+        return "?"
+
+    td = timedelta(milliseconds=ms)
+
+    days = td.days
+    hours, remainder = divmod(td.seconds, 3600)
+    minutes, seconds = divmod(remainder, 60)
+
+    parts = []
+    if days:
+        parts.append(f"{days}d")
+    if hours:
+        parts.append(f"{hours}h")
+    if minutes:
+        parts.append(f"{minutes}m")
+    if seconds or not parts:
+        parts.append(f"{seconds}s")
+
+    return " ".join(parts)