[ENH] add new UI

.flake8

@@ -1,13 +1,16 @@
 [flake8]
 exclude =
     .git,
+	./env
+	**/env
+	ecobidas/_version.py
 
 docstring-convention = numpy
 max-line-length = 150
 max_complexity = 15
 max_function_length = 150
 max_parameters_amount = 10
-max_returns_amount = 4
+max_returns_amount = 7
 
 # ----------------------- errors to include / exclude -----------------------
 

.pre-commit-config.yaml

@@ -76,6 +76,24 @@ repos:
 #         additional_dependencies: [types-all, pandas-stubs]
 #         args: [--config-file=pyproject.toml]
 
+# Check formatting of CSS and HTML
+# prettier: https://prettier.io/
+-   repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.8
+    hooks:
+    -   id: prettier
+        types_or: [css, html, json]
+        # exclude: |
+        #     (?x)^(
+        #         ui/ecobidas_ui/static/css/font-awesome.min.css
+        #     )$
+
+# Check formatting HTML / Jinja
+# -   repo: https://github.com/thibaudcolas/curlylint
+    # rev: v0.13.1
+    # hooks:
+    # -   id: curlylint
+
 # Check that Python code complies with PEP8 guidelines
 # flake8 uses pydocstyle to check docstrings: https://flake8.pycqa.org/en/latest/
 # flake8-docstrings: https://pypi.org/project/flake8-docstrings/

.vscode/extensions.json

@@ -1,9 +1,8 @@
 {
-	"recommendations": [
-		"ms-python.python",
-		"sourcery.sourcery",
-		"ms-python.vscode-pylance"
-	],
-	"unwantedRecommendations": [
-	]
+  "recommendations": [
+    "ms-python.python",
+    "sourcery.sourcery",
+    "ms-python.vscode-pylance"
+  ],
+  "unwantedRecommendations": []
 }

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "restructuredtext.pythonRecommendation.disabled": true
+  "restructuredtext.pythonRecommendation.disabled": true
 }

ecobidas/cli.py

@@ -1,5 +1,5 @@
 import sys
-from typing import Sequence
+from collections.abc import Sequence
 
 from loguru import logger
 from rich_argparse import RichHelpFormatter

ecobidas/create_schema.py

@@ -85,11 +85,10 @@ def create_schema(
 
             item_info = get_item_info(this_item)
 
-            item_info["id"] = f"{activity_idx:.0f}.{item_idx:.0f}"
-
             print_item_info(activity_idx, item_idx, item_info)
 
             item = define_new_item(item_info)
+
             item.write(os.path.join(activity_path, "items"))
 
             activity.append_item(item)

ecobidas/download_tsv.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 """Download the content of the different google spreadsheet in the inputs folder."""
+import ast
 import json
 from pathlib import Path
 
@@ -19,19 +20,19 @@ def download_spreadsheet(schema: str, output_dir: Path = None) -> None:
     spreadsheets_info = get_spreadsheets_info()
 
     # Initialize lists to store data
-    google_IDs = []
+    google_ids = []
     subfolders = []
     output_filenames = []
 
     # Parse the file
     for spreadsheet, values in spreadsheets_info.items():
         if spreadsheet.startswith(schema):
-            google_IDs.append(values["google_id"])
+            google_ids.append(values["google_id"])
             subfolders.append(values["dir"])
             output_filenames.append(values["basename"])
 
     # Iterate through entries and download spreadsheets
-    for google_id, subfolder, output_filename in zip(google_IDs, subfolders, output_filenames):
+    for google_id, subfolder, output_filename in zip(google_ids, subfolders, output_filenames):
 
         output_folder = output_dir / subfolder
         output_folder.mkdir(exist_ok=True, parents=True)
@@ -95,6 +96,25 @@ def validate_downloaded_file(file: str | Path) -> None:
             f"\nThe following columns are missing from the data dictionary: {sorted(extra_columns)}"
         )
 
+    invalid_vis = []
+    visibility = df.visibility.values
+    for vis in visibility:
+        if not is_valid_python(vis):
+            invalid_vis.append(vis)
+    if invalid_vis:
+        logger.warning(f"\nThe following visibility are not valid python:\n{invalid_vis}")
+
+
+def is_valid_python(code):
+    try:
+        ast.parse(code)
+    except SyntaxError:
+        return False
+    except ValueError as exc:
+        print(f"{exc}: {code}")
+        return True
+    return True
+
 
 def main() -> None:
     # validates files