ouolim/beaky
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add mypy and fix xlsx parsing

Browse Source
This commit is contained in:
Chlupaty
2026-03-11 21:28:29 +01:00
parent 47a41828c6
commit c504860b69
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pyproject.toml
View File

@@ -9,20 +9,16 @@ description = "Scan tickets and decide"
requires-python = ">=3.12" requires-python = ">=3.12"
dependencies = [ dependencies = [
"pillow==12.1.1", "pillow==12.1.1",
<<<<<<< HEAD
"pydantic==2.12.5", "pydantic==2.12.5",
"pandas==3.0.1" # "pandas==3.0.1",
======= # "openpyxl>=3.1.0",
"openpyxl>=3.1.0",
"pydantic==2.12.5"
>>>>>>> ec872d0 (Implement xlsx parsing)
] ]
[project.optional-dependencies] [project.optional-dependencies]
dev = [ dev = [
"pytest>=9.0.2", "pytest>=9.0.2",
"ruff==0.15.5", "ruff==0.15.5",
"playwright==1.58.0" # only dev because it cant be installed in a pipeline, just locally # "playwright==1.58.0" # only dev because it cant be installed in a pipeline, just locally
] ]
[project.scripts] [project.scripts]
@@ -30,7 +26,7 @@ beaky = "beaky.cli:main"
[tool.ruff] [tool.ruff]
line-length = 130 line-length = 120
lint.select = ["E", "F", "I"] lint.select = ["E", "F", "I"]
[tool.mypy] [tool.mypy]

23
src/beaky/scanner/scanner.py
View File

@@ -1,9 +1,8 @@
from datetime import datetime from datetime import datetime
from typing import List, Optional, Iterator, Union from typing import Iterator, List, Optional
from pydantic.dataclasses import dataclass
from openpyxl import load_workbook from openpyxl import load_workbook
from pydantic.dataclasses import dataclass
from beaky.config import Config from beaky.config import Config
from beaky.datamodels.scan import Scan from beaky.datamodels.scan import Scan
@@ -41,16 +40,7 @@ class Link:
class Links: class Links:
"""Loads Link objects from an Excel file (.xlsx). def __init__(self, path: str | Config):
Usage:
l = Links(path_to_xlsx)
links = l.ret_links() # returns list[Link]
for link in l: ...
"""
def __init__(self, path: Union[str, Config]):
# Accept either a raw path string or a Config with .path attribute
if isinstance(path, Config): if isinstance(path, Config):
self._path = path.path self._path = path.path
else: else:
@@ -83,7 +73,7 @@ class Links:
header_map = { (str(h).strip().lower() if h is not None else ""): i for i, h in enumerate(header) } header_map = { (str(h).strip().lower() if h is not None else ""): i for i, h in enumerate(header) }
# Helper to parse date-like values # Helper to parse date-like values
def parse_date(v) -> Optional[datetime]: def parse_date(v: None | datetime) -> Optional[datetime]:
if v is None: if v is None:
return None return None
if isinstance(v, datetime): if isinstance(v, datetime):
@@ -107,7 +97,7 @@ class Links:
# Find the column indices we care about # Find the column indices we care about
id_idx = header_map.get("id") id_idx = header_map.get("id")
url_idx = header_map.get("link") or header_map.get("url") url_idx = header_map.get("link")
date_idx = header_map.get("date") date_idx = header_map.get("date")
if id_idx is None or url_idx is None: if id_idx is None or url_idx is None:
@@ -124,7 +114,8 @@ class Links:
# skip empty rows # skip empty rows
continue continue
link = Link(id=str(raw_id).strip() if raw_id is not None else "", url=str(raw_url).strip() if raw_url is not None else "", date=parse_date(raw_date)) link = Link(id=str(raw_id).strip() if raw_id is not None else "",
url=str(raw_url).strip() if raw_url is not None else "", date=parse_date(raw_date))
self.links.append(link) self.links.append(link)
except Exception: except Exception:
# Skip problematic rows silently # Skip problematic rows silently