ositah 24.4.dev1__tar.gz → 24.7__tar.gz

{ositah-24.4.dev1/ositah.egg-info → ositah-24.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.4.dev1
+Version: 24.7
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License

ositah-24.7/docker/Dockerfile

@@ -0,0 +1,20 @@
+FROM python
+
+WORKDIR /ositah
+
+ENV POETRY_HOME=/opt/poetry
+ENV POETRY_VIRTUALENVS_IN_PROJECT=true
+ENV PATH="$POETRY_HOME/bin:$PATH"
+
+RUN apt update
+RUN apt upgrade -qy
+RUN apt install -qy libsasl2-dev python-dev libldap2-dev libssl-dev
+
+RUN python -c 'from urllib.request import urlopen; print(urlopen("https://install.python-poetry.org").read().decode())' | python -
+
+COPY ./pyproject-poetry.toml ./pyproject.toml
+
+# Ensure to get latest ositah version
+RUN poetry add ositah@latest
+
+RUN poetry install --no-interaction --no-ansi -vvv

ositah-24.7/docker/docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.8"
+services:
+  ositah:
+    image: ositah
+    build: .
+    container_name: ositah
+    command: "/ositah/.venv/bin/gunicorn --chdir /ositah/conf --config /ositah/conf/ositah.conf.py 'ositah.main:make_app()'"
+    volumes:
+      - <path to ositah.conf.py>:/ositah/conf/ositah.conf.py
+      - <path to ositah.cfg>:/ositah/conf/ositah.cfg
+      - ./logs:/ositah/logs
+    ports:
+      - "7777:7777"

ositah-24.7/docker/pyproject-poetry.toml

@@ -0,0 +1,16 @@
+[tool.poetry]
+name = "ositah-app"
+version = "1.0"
+description = "Outils de Suivi d'Activités basé sur Hito"
+authors = ["Michel Jouvin"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.11"
+gunicorn = "^20.1.0"
+greenlet = "^2.0.1"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"

{ositah-24.4.dev1 → ositah-24.7}/ositah/apps/configuration/main.py

@@ -55,7 +55,11 @@ def declaration_periods_layout():
 
     # Disable creation of a new (next) period if the period matching the current already exists
     today = date.today().isoformat()
-    if today >= declaration_periods[-1].start_date and today <= declaration_periods[-1].end_date:
+    if (
+        len(declaration_periods) > 0
+        and today >= declaration_periods[-1].start_date
+        and today <= declaration_periods[-1].end_date
+    ):
         current_period_exists = True
     else:
         current_period_exists = False

{ositah-24.4.dev1 → ositah-24.7}/ositah/apps/validation/tables.py

@@ -298,7 +298,7 @@ def build_validation_table(team, team_selection_date, declaration_set: int, peri
                         html.Em(
                             (
                                 f"Temps déclarés de l'équipe / total ="
-                                f" {round(selected_declarations['percent_global'].mean(),1)}%"
+                                f" {round(selected_declarations['percent_global'].mean(), 1)}%"
                                 f" (100%={SEMESTER_WEEKS} semaines)"
                             )
                         )

{ositah-24.4.dev1 → ositah-24.7}/ositah/utils/hito_db_model.py

@@ -199,12 +199,16 @@ class ActiviteDetail(db.Model):
 
 
 class OSITAHSession(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True)
     email = db.Column(db.String(255), nullable=False)
     last_use = db.Column(db.DateTime, nullable=False)
 
 
 class OSITAHValidation(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True, default=new_uuid)
     validated = db.Column(db.Boolean, nullable=False)
     timestamp = db.Column(db.DateTime, nullable=False)
@@ -221,6 +225,8 @@ class OSITAHValidation(db.Model):
 
 
 class OSITAHValidationPeriod(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True, default=new_uuid)
     name = db.Column(db.String(255), unique=True, nullable=False)
     start_date = db.Column(db.DateTime, nullable=False)
@@ -229,6 +235,8 @@ class OSITAHValidationPeriod(db.Model):
 
 
 class OSITAHProjectDeclaration(db.Model):
+    __table_args__ = {"mysql_charset": "utf8mb4", "mysql_collate": "utf8mb4_unicode_ci"}
+
     id = db.Column(db.String(36), primary_key=True, default=new_uuid)
     projet = db.Column(db.String(255), nullable=False)
     masterprojet = db.Column(db.String(255), nullable=False)

{ositah-24.4.dev1 → ositah-24.7}/ositah/utils/menus.py

@@ -324,7 +324,7 @@ def ositah_jumbotron(title: str, main_text: str, details: str = None, title_clas
     return html.Div(
         dbc.Container(
             [
-                html.H1(title, className=f"display-3 {title_class if ( title_class ) else ''}"),
+                html.H1(title, className=f"display-3 {title_class if (title_class) else ''}"),
                 html.P(
                     main_text,
                     className="lead",

{ositah-24.4.dev1 → ositah-24.7}/ositah/utils/teams.py

@@ -1,42 +1,42 @@
-import re
-from typing import Dict, List
-
-import pandas as pd
-
-
-def get_hito_teams():
-    """
-    Return Hito teams as a Dataframe
-
-    :return: Hito teams
-    """
-
-    from .hito_db import Team, db
-
-    team_query = Team.query
-
-    teams = pd.read_sql(team_query.statement, con=db.session.bind)
-
-    return teams
-
-
-def get_project_team_ids(team_config: Dict[str, str], project: str) -> List[str]:
-    """
-    Return the list of team ID associated with the project based on the configuration passed.
-    The configuration is a dict where the key is a pattern applied to the project name and
-    the value is the list of team names.
-
-    :param team_config: dict describing the teams associated with a project
-    :param project: project name
-    :return: list of team ids or None if no match is found
-    """
-
-    for pattern, team_list in team_config.items():
-        if re.match(pattern, project):
-            hito_teams = get_hito_teams()
-            hito_teams["selected"] = False
-            for team_pattern in team_list:
-                hito_teams.loc[hito_teams.nom.str.match(f"{team_pattern}$"), "selected"] = True
-            return hito_teams["id"].to_list()
-
-    return None
+import re
+from typing import Dict, List
+
+import pandas as pd
+
+
+def get_hito_teams():
+    """
+    Return Hito teams as a Dataframe
+
+    :return: Hito teams
+    """
+
+    from .hito_db_model import Team, db
+
+    team_query = Team.query
+
+    teams = pd.read_sql(team_query.statement, con=db.session.bind)
+
+    return teams
+
+
+def get_project_team_ids(team_config: Dict[str, str], project: str) -> List[str]:
+    """
+    Return the list of team ID associated with the project based on the configuration passed.
+    The configuration is a dict where the key is a pattern applied to the project name and
+    the value is the list of team names.
+
+    :param team_config: dict describing the teams associated with a project
+    :param project: project name
+    :return: list of team ids or None if no match is found
+    """
+
+    for pattern, team_list in team_config.items():
+        if re.match(pattern, project):
+            hito_teams = get_hito_teams()
+            hito_teams["selected"] = False
+            for team_pattern in team_list:
+                hito_teams.loc[hito_teams.nom.str.match(f"{team_pattern}$"), "selected"] = True
+            return hito_teams["id"].to_list()
+
+    return None

{ositah-24.4.dev1 → ositah-24.7}/ositah/utils/utils.py

@@ -5,7 +5,6 @@ from typing import List
 
 import dash_bootstrap_components as dbc
 from dash import html
-from dateutil.relativedelta import relativedelta
 from flask import session
 from flask_sqlalchemy import SQLAlchemy
 from hito_tools.exceptions import ConfigFileEmpty, ConfigMissingParam
@@ -389,7 +388,7 @@ def define_config_params(file):
         config["declaration"]["thresholds"] = {"low": 50, "suspect": 75, "good": 100}
     # Default declaration period date defaults to current day if not explicitly defined
     if "default_date" not in config["declaration"]:
-        config["declaration"]["default_date"] = datetime.now() - relativedelta(months=10)
+        config["declaration"]["default_date"] = datetime.now()
     global_params.declaration_options = config["declaration"]
 
     if "validation" not in config:

{ositah-24.4.dev1 → ositah-24.7/ositah.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ositah
-Version: 24.4.dev1
+Version: 24.7
 Summary: Outils de Suivi d'Activités basé sur Hito
 Author-email: Michel Jouvin <michel.jouvin@ijclab.in2p3.fr>
 License: BSD 3-Clause License

{ositah-24.4.dev1 → ositah-24.7}/ositah.egg-info/SOURCES.txt

@@ -5,6 +5,9 @@ README.md
 noxfile.py
 pyproject.toml
 setup.py
+docker/Dockerfile
+docker/docker-compose.yml
+docker/pyproject-poetry.toml
 gunicorn.config/README.md
 gunicorn.config/gunicorn.ositah
 gunicorn.config/gunicorn@.service

{ositah-24.4.dev1 → ositah-24.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ositah"
-version = "24.4.dev1"
+version = "24.7"
 description = "Outils de Suivi d'Activités basé sur Hito"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -31,19 +31,19 @@ dependencies = [
 ]
 dynamic = []
 
+[project.license]
+text = "BSD 3-Clause License"
+
 [[project.authors]]
 name = "Michel Jouvin"
 email = "michel.jouvin@ijclab.in2p3.fr"
 
-
-[tool]
-
-[project.license]
-text = "BSD 3-Clause License"
-
 [project.urls]
 Homepage = "https://gitlab.in2p3.fr/hito/ositah"
 "Bug Tracker" = "https://gitlab.in2p3.fr/hito/ositah/-/issues"
 
 [project.scripts]
 ositah = "ositah.main:main"
+
+[tool.setuptools]
+packages = [ "ositah",]