From d104d994f8b35a7704bd27f963e0e4d57a8e36a1 Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Thu, 4 Dec 2025 11:49:52 +0100 Subject: [PATCH] correct typing errors --- corrlib/main.py | 10 +++++----- corrlib/tools.py | 3 ++- corrlib/tracker.py | 4 ++-- corrlib/trackers/datalad.py | 8 +++++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/corrlib/main.py b/corrlib/main.py index df303cd..2065206 100644 --- a/corrlib/main.py +++ b/corrlib/main.py @@ -6,7 +6,7 @@ from .git_tools import move_submodule import shutil from .find import _project_lookup_by_id from .tools import list2str, str2list -from .tracker import get_file +from .tracker import get from typing import Union, Optional @@ -26,7 +26,7 @@ def create_project(path: str, uuid: str, owner: Union[str, None]=None, tags: Uni The code that was used to create the measurements. """ db = path + "/backlogger.db" - get_file(path, "backlogger.db") + get(path, "backlogger.db") conn = sqlite3.connect(db) c = conn.cursor() known_projects = c.execute("SELECT * FROM projects WHERE id=?", (uuid,)) @@ -47,7 +47,7 @@ def create_project(path: str, uuid: str, owner: Union[str, None]=None, tags: Uni def update_project_data(path: str, uuid: str, prop: str, value: Union[str, None] = None) -> None: - get_file(path, "backlogger.db") + get(path, "backlogger.db") conn = sqlite3.connect(os.path.join(path, "backlogger.db")) c = conn.cursor() c.execute(f"UPDATE projects SET '{prop}' = '{value}' WHERE id == '{uuid}'") @@ -58,7 +58,7 @@ def update_project_data(path: str, uuid: str, prop: str, value: Union[str, None] def update_aliases(path: str, uuid: str, aliases: list[str]) -> None: db = os.path.join(path, "backlogger.db") - get_file(path, "backlogger.db") + get(path, "backlogger.db") known_data = _project_lookup_by_id(db, uuid)[0] known_aliases = known_data[1] @@ -123,7 +123,7 @@ def import_project(path: str, url: str, owner: Union[str, None]=None, tags: Opti raise ValueError("The dataset does not have a uuid!") if not os.path.exists(path + "/projects/" + uuid): db = path + "/backlogger.db" - get_file(path, "backlogger.db") + get(path, "backlogger.db") dl.unlock(db, dataset=path) create_project(path, uuid, owner, tags, aliases, code) move_submodule(path, 'projects/tmp', 'projects/' + uuid) diff --git a/corrlib/tools.py b/corrlib/tools.py index 4d444cc..77bfd2e 100644 --- a/corrlib/tools.py +++ b/corrlib/tools.py @@ -1,5 +1,6 @@ import os from configparser import ConfigParser +from typing import Any def str2list(string: str) -> list[str]: @@ -19,7 +20,7 @@ def k2m(k: float) -> float: return (1/(2*k))-4 -def set_config(path, section, option, value): +def set_config(path: str, section: str, option: str, value: Any) -> None: config_path = os.path.join(path, '.corrlib') config = ConfigParser() if os.path.exists(config_path): diff --git a/corrlib/tracker.py b/corrlib/tracker.py index 7f63e9b..900268c 100644 --- a/corrlib/tracker.py +++ b/corrlib/tracker.py @@ -15,7 +15,7 @@ def get_tracker(path: str) -> str: def get(path: str, file: str) -> None: tracker = get_tracker(path) if tracker == 'datalad': - dl.get_file(path, file) + dl.get(path, file) else: raise ValueError(f"Tracker {tracker} is not supported.") return @@ -24,7 +24,7 @@ def get(path: str, file: str) -> None: def save(path: str, message: str, files: list[str]) -> None: tracker = get_tracker(path) if tracker == 'datalad': - dl.save(files, message=message, dataset=path) + dl.save(path, message, files) else: raise ValueError(f"Tracker {tracker} is not supported.") diff --git a/corrlib/trackers/datalad.py b/corrlib/trackers/datalad.py index 4eccf0f..e3be365 100644 --- a/corrlib/trackers/datalad.py +++ b/corrlib/trackers/datalad.py @@ -1,17 +1,19 @@ import datalad.api as dl import os +from typing import Optional -def get(path, file): +def get(path: str, file: str) -> None: if file == "backlogger.db": print("Downloading database...") else: print("Downloading data...") dl.get(os.path.join(path, file), dataset=path) print("> downloaded file") + return -def save(path, message, files= None): +def save(path: str, message: str, files: Optional[list[str]]=None) -> None: if files is None: files = path else: @@ -20,6 +22,6 @@ def save(path, message, files= None): return -def create(path): +def create(path: str) -> None: dl.create(path) return