Feat/htmx 2

pyproject.toml

@@ -19,6 +19,7 @@ loguru = "^0.7.2"
 uvicorn = { extras = ["standard"], version = "^0.23.2" }
 httpx = "^0.25.0"
 pydantic = "^2.4.2"
+pytailwindcss = "^0.2.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.3"

src/main.py

@@ -1,4 +1,5 @@
 from fastapi import FastAPI, File, Form, UploadFile
+from jinja2_fragments.fastapi import Jinja2Blocks
 from starlette.requests import Request
 from starlette.staticfiles import StaticFiles
 from starlette.templating import Jinja2Templates
@@ -20,14 +21,20 @@
 )
 
 app.mount("/static", StaticFiles(directory="src/static"), name="static")
-templates = Jinja2Templates(directory="src//static/templates")
+templates = Jinja2Templates(directory="src/static/templates")
+templates_fragments = Jinja2Blocks(directory="src/static/templates")
 
 
 @app.get("/")
 async def root(request: Request):
     return templates.TemplateResponse("home.html", {"request": request})
 
 
+@app.get("/info/supported_battlescribe_versions")
+async def supported_battlescribe_versions():
+    return 2.03
+
+
 @app.post("/files/")
 async def upload_roster(
     request: Request,
@@ -45,11 +52,11 @@ async def upload_roster(
     data = get_parser_type_and_parse(roster=upload_contents, summary_page=summary_page)
 
     parsed_roster = data.get("roster")
-    template = data.get("template")
+    template: str = data.get("template", "")
     rules_summary = data.get("rules_summary")
 
     if use_icons:
-        template = "icons_" + template
+        template = f"icons_{template}"
 
     return templates.TemplateResponse(
         template,

src/parsers/heresy/heresy.py

@@ -69,6 +69,19 @@ def create_parsed_list(list_of_squads):
 
 
 def sort_units_by_statline(squads):
+    """
+    Sorts a list of squads by their statline type (toughness, armored, or hybrid).
+
+    Args:
+        squads (list): A list of squads to be sorted.
+
+    Returns:
+        tuple: A tuple containing the sorted squads in the following order:
+            - armored (list): Squads with an 'armored' statline type.
+            - hybrid (list): Squads with a 'hybrid' statline type.
+            - parsed_squads (list): All squads, parsed into a standardized format.
+            - toughness (list): Squads with a 'toughness' statline type.
+    """
     toughness = []
     armored = []
     hybrid = []

src/parsers/heresy/heresy_parsing_test.py

@@ -0,0 +1,74 @@
+from os import listdir
+from pathlib import Path
+
+from src.models.heresy_unit import HeresyUnit
+from src.parsers.heresy.heresy_constants import TOUGHNESS
+from src.utils.test_utils import fetch_and_parse_roster
+
+base_path = Path.cwd() / "test_rosters" / "horus_heresy"
+
+
+def test__heresy_loop_through_test_folder_and_parse():
+    """method: fetch_and_parse_roster(horus heresy)
+    prerequisite: given an unzipped roster file it will parse without errors
+    expected: successfully parses all roster files in the test folder.
+    """
+    parsed_rosters = []
+    list_of_rosters = [file for file in listdir(str(base_path)) if Path.is_file(base_path / file)]
+
+    for roster in list_of_rosters:
+        parsed_roster = fetch_and_parse_roster(roster_file=base_path / roster)
+        parsed_rosters.append(parsed_roster)
+
+    assert bool(parsed_rosters)
+
+
+def test__stat_type_finder():
+    """method: get_stat_type
+    pre-req: should find the correct stat line for a unit
+    expected: should return the toughness stat line.
+    """
+    test_unit_type = "infantry"
+    stat_type = HeresyUnit.get_stat_type(test_unit_type)
+    assert stat_type == TOUGHNESS.get("name")
+
+
+def test_legion_zm_list():
+    """
+    Test a basic 1000 points night lords list
+    contains and HQ with a command squad + a contemptor + several infantry units
+    """
+    hhv2_night_lords_zm = base_path / "hhv2.nightlords_zm.ros"
+    parsed_roster = fetch_and_parse_roster(roster_file=hhv2_night_lords_zm)
+
+    assert bool(parsed_roster) is True
+
+
+def test_solar_aux_zm_list():
+    """
+
+    """
+    hhv2_solar_aux_zm = base_path / "hhv2.solar_aux_zm.ros"
+    parsed_roster = fetch_and_parse_roster(roster_file=hhv2_solar_aux_zm)
+
+    assert bool(parsed_roster) is True
+
+
+def test_mechanicum_zm_list():
+    """
+
+    """
+    hhv2_mechanicum_zm = base_path / "hhv2.mechanicum_zm.ros"
+    parsed_roster = fetch_and_parse_roster(roster_file=hhv2_mechanicum_zm)
+
+    assert bool(parsed_roster) is True
+
+
+def test_custodes_zm_list():
+    """
+
+    """
+    hhv2_custodes_zm = base_path / "hhv2.custodes_zm.ros"
+    parsed_roster = fetch_and_parse_roster(roster_file=hhv2_custodes_zm)
+
+    assert bool(parsed_roster) is True

src/parsers/heresy/heresy_test.py

@@ -1,74 +1,4 @@
-from os import listdir
-from pathlib import Path
 
-from src.models.heresy_unit import HeresyUnit
-from src.parsers.heresy.heresy_constants import TOUGHNESS
-from src.utils.test_utils import fetch_and_parse_roster
 
-base_path = Path.cwd() / "test_rosters" / "horus_heresy"
-
-
-def test__heresy_loop_through_test_folder_and_parse():
-    """method: fetch_and_parse_roster(horus heresy)
-    prerequisite: given an unzipped roster file it will parse without errors
-    expected: successfully parses all roster files in the test folder.
-    """
-    parsed_rosters = []
-    list_of_rosters = [file for file in listdir(str(base_path)) if Path.is_file(base_path / file)]
-
-    for roster in list_of_rosters:
-        parsed_roster = fetch_and_parse_roster(roster_file=base_path / roster)
-        parsed_rosters.append(parsed_roster)
-
-    assert bool(parsed_rosters)
-
-
-def test__stat_type_finder():
-    """method: get_stat_type
-    pre-req: should find the correct stat line for a unit
-    expected: should return the toughness stat line.
-    """
-    test_unit_type = "infantry"
-    stat_type = HeresyUnit.get_stat_type(test_unit_type)
-    assert stat_type == TOUGHNESS.get("name")
-
-
-def test_legion_zm_list():
-    """
-    Test a basic 1000 points night lords list
-    contains and HQ with a command squad + a contemptor + several infantry units
-    """
-    hhv2_night_lords_zm = base_path / "hhv2.nightlords_zm.ros"
-    parsed_roster = fetch_and_parse_roster(roster_file=hhv2_night_lords_zm)
-
-    assert bool(parsed_roster) is True
-
-
-def test_solar_aux_zm_list():
-    """
-
-    """
-    hhv2_solar_aux_zm = base_path / "hhv2.solar_aux_zm.ros"
-    parsed_roster = fetch_and_parse_roster(roster_file=hhv2_solar_aux_zm)
-
-    assert bool(parsed_roster) is True
-
-
-def test_mechanicum_zm_list():
-    """
-
-    """
-    hhv2_mechanicum_zm = base_path / "hhv2.mechanicum_zm.ros"
-    parsed_roster = fetch_and_parse_roster(roster_file=hhv2_mechanicum_zm)
-
-    assert bool(parsed_roster) is True
-
-
-def test_custodes_zm_list():
-    """
-
-    """
-    hhv2_custodes_zm = base_path / "hhv2.custodes_zm.ros"
-    parsed_roster = fetch_and_parse_roster(roster_file=hhv2_custodes_zm)
-
-    assert bool(parsed_roster) is True
+def test_sort_units_by_statline():
+    pass