workers-control 0.2.4__tar.gz → 0.2.5__tar.gz

{workers_control-0.2.4/src/workers_control.egg-info → workers_control-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workers-control
-Version: 0.2.4
+Version: 0.2.5
 Summary: A flask app for labour time accounting.
 License-Expression: AGPL-3.0-or-later
 Project-URL: Source, https://github.com/ida-arbeitszeit/workers-control
@@ -15,12 +15,12 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: alembic==1.18.1
 Requires-Dist: email-validator==2.3.0
-Requires-Dist: flask==3.1.2
+Requires-Dist: flask<=3.1.3,>=3.1.2
 Requires-Dist: flask-babel==4.0.0
 Requires-Dist: flask-talisman==1.1.0
 Requires-Dist: flask-login==0.6.3
 Requires-Dist: flask-wtf==1.2.2
-Requires-Dist: matplotlib<=3.11.0,>=3.10.9
+Requires-Dist: matplotlib<=3.11.1,>=3.10.9
 Provides-Extra: profiling
 Requires-Dist: flask_profiler; extra == "profiling"
 Dynamic: license-file

{workers_control-0.2.4 → workers_control-0.2.5}/build_support/backend.py

@@ -1,9 +1,15 @@
+from typing import Any, Dict, Optional
+
 from setuptools import build_meta as _orig
 from setuptools.build_meta import *  # noqa: F403,F401
 
 from build_support import translations
 
 
-def build_wheel(wheel_directory, config_settings=None, metadata_directory=None):  # type: ignore[no-redef]
+def build_wheel(  # type: ignore[no-redef]
+    wheel_directory: str,
+    config_settings: Optional[Dict[str, Any]] = None,
+    metadata_directory: Optional[str] = None,
+) -> str:
     translations.compile_messages()
     return _orig.build_wheel(wheel_directory, config_settings, metadata_directory)

{workers_control-0.2.4 → workers_control-0.2.5}/pyproject.toml

@@ -5,7 +5,7 @@ backend-path = ["."]
 
 [project]
 name = "workers-control"
-version = "0.2.4"
+version = "0.2.5"
 description = "A flask app for labour time accounting."
 license = "AGPL-3.0-or-later"
 requires-python = ">=3.13"
@@ -21,12 +21,12 @@ dependencies = [
     # Pin to exact versions, if possible.
     "alembic==1.18.1",
     "email-validator==2.3.0",
-    "flask==3.1.2",
+    "flask>=3.1.2, <=3.1.3", # different versions in stable/unstable nixpkgs
     "flask-babel==4.0.0",
     "flask-talisman==1.1.0",
     "flask-login==0.6.3",
     "flask-wtf==1.2.2",
-    "matplotlib>=3.10.9, <=3.11.0" # different versions in stable/unstable nixpkgs
+    "matplotlib>=3.10.9, <=3.11.1" # different versions in stable/unstable nixpkgs
 ]
 
 [project.optional-dependencies]
@@ -68,20 +68,14 @@ exclude = '''
 '''
 disable_error_code = "type-abstract"
 explicit_package_bases = true
+disallow_untyped_defs = true
 
 [[tool.mypy.overrides]]
 module = [
-    "src",
-    "dev",
-    "tests"
-]
-allow_untyped_defs = false
-
-[[tool.mypy.overrides]]
-module = [
-    "flask_babel",
-    "flask_login",
-    "flask_wtf",
+    "flask_babel.*",
+    "flask_login.*",
+    "flask_talisman.*",
+    "flask_wtf.*",
     "parameterized.*",
     "wtforms.*",
 ]

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/core/interactors/get_statistics.py

@@ -19,6 +19,7 @@ class StatisticsResponse:
     planned_work: Decimal
     planned_resources: Decimal
     planned_means: Decimal
+    public_sector_labour: Decimal
     payout_factor: Decimal
     psf_balance: Decimal
 
@@ -39,13 +40,15 @@ class GetStatisticsInteractor:
             .that_will_expire_after(now)
             .that_were_approved_before(now)
         )
+        active_public_plans = active_plans.that_are_public()
         planning_statistics = active_plans.get_statistics()
+        public_planning_statistics = active_public_plans.get_statistics()
         return StatisticsResponse(
             registered_companies_count=len(self.database.get_companies()),
             registered_members_count=len(self.database.get_members()),
             cooperations_count=len(self.database.get_cooperations()),
             active_plans_count=len(active_plans),
-            active_plans_public_count=len(active_plans.that_are_public()),
+            active_plans_public_count=len(active_public_plans),
             active_basic_services_count=len(
                 self.database.get_basic_services().that_are_active()
             ),
@@ -53,6 +56,7 @@ class GetStatisticsInteractor:
             planned_work=planning_statistics.total_planned_costs.labour_cost,
             planned_resources=planning_statistics.total_planned_costs.resource_cost,
             planned_means=planning_statistics.total_planned_costs.means_cost,
+            public_sector_labour=public_planning_statistics.total_planned_costs.labour_cost,
             payout_factor=fic,
             psf_balance=psf_balance,
         )

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/core/interactors/query_offers.py

@@ -4,7 +4,7 @@ import enum
 from dataclasses import dataclass
 from datetime import datetime
 from decimal import Decimal
-from typing import List, Optional
+from typing import Any, Callable, List, Optional
 from uuid import UUID
 
 from workers_control.core import records
@@ -157,7 +157,7 @@ class QueryOffersInteractor:
             return basic_services.ordered_by_provider_name()
         return basic_services.ordered_by_creation_date(ascending=False)
 
-    def _sort_key(self, sort_by: OfferSorting):
+    def _sort_key(self, sort_by: OfferSorting) -> Callable[[QueriedOffer], Any]:
         if sort_by == OfferSorting.by_provider_name:
             return lambda offer: offer.provider_name.lower()
         return lambda offer: -offer.created_or_approved_on.timestamp()

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/core/interactors/show_payout_factor_details.py

@@ -21,6 +21,8 @@ class Response:
     window_size_in_days: int
     window_start: datetime
     window_end: datetime
+    display_start: datetime
+    display_end: datetime
     plans: list[PlanData]
     basic_service_consumptions: list[BasicServiceConsumptionData]
 
@@ -54,7 +56,9 @@ class ShowPayoutFactorDetailsInteractor:
         window_size_in_days = self.payout_factor_config.get_window_length_in_days()
         window_start = now - timedelta(days=window_size_in_days / 2)
         window_end = now + timedelta(days=window_size_in_days / 2)
-        plan_records = self._get_plans_sorted(now, window_size_in_days)
+        display_start = now - timedelta(days=window_size_in_days)
+        display_end = now + timedelta(days=window_size_in_days)
+        plan_records = self._get_plans_sorted(display_start)
 
         plans = [
             self._create_plan_data(
@@ -74,17 +78,17 @@ class ShowPayoutFactorDetailsInteractor:
             window_size_in_days=window_size_in_days,
             window_start=window_start,
             window_end=window_end,
+            display_start=display_start,
+            display_end=display_end,
             plans=plans,
             basic_service_consumptions=basic_service_consumptions,
         )
 
-    def _get_plans_sorted(
-        self, now: datetime, window_size_in_days: int
-    ) -> list[records.Plan]:
+    def _get_plans_sorted(self, display_start: datetime) -> list[records.Plan]:
         relevant_plans = list(
             self.database_gateway.get_plans()
             .that_are_approved()
-            .that_will_expire_after(now - timedelta(days=window_size_in_days))
+            .that_will_expire_after(display_start)
         )
         plans_sorted = sorted(
             relevant_plans,

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/core/repositories.py

@@ -527,7 +527,7 @@ class AccountCredentialsUpdate(DatabaseUpdate, Protocol):
 
 
 class PasswordResetRequestResult(QueryResult[records.PasswordResetRequest], Protocol):
-    def with_email_address(self, email_address) -> Self: ...
+    def with_email_address(self, email_address: str) -> Self: ...
 
     def with_creation_date_after(self, creation_threshold: datetime) -> Self: ...
 

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/db/models.py

@@ -136,7 +136,7 @@ class Company(Base):
     a_account: Mapped[UUID] = mapped_column(Uuid, ForeignKey("account.id"))
     prd_account: Mapped[UUID] = mapped_column(Uuid, ForeignKey("account.id"))
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return "<Company(name='%s')>" % (self.name,)
 
     workers = relationship(

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/db/repositories.py

@@ -641,7 +641,7 @@ class MemberQueryResult(SqlQueryResult[records.Member]):
     def joined_with_email_address(
         self,
     ) -> SqlQueryResult[Tuple[records.Member, records.EmailAddress]]:
-        def mapper(row):
+        def mapper(row: Any) -> Tuple[records.Member, records.EmailAddress]:
             member_orm, email_orm = row
             return (
                 DatabaseGatewayImpl.member_from_orm(member_orm),
@@ -768,7 +768,7 @@ class CompanyQueryResult(SqlQueryResult[records.Company]):
     def joined_with_email_address(
         self,
     ) -> SqlQueryResult[Tuple[records.Company, records.EmailAddress]]:
-        def mapper(row):
+        def mapper(row: Any) -> Tuple[records.Company, records.EmailAddress]:
             company_orm, email_orm = row
             return (
                 DatabaseGatewayImpl.company_from_orm(company_orm),
@@ -884,6 +884,18 @@ class AccountantUpdate:
         return rowcount
 
 
+class AccountOwnerAliases:
+    """Aliases for all ORM models that can own an account. One instance
+    is needed per side (debtor, creditor) of a transfer query.
+    """
+
+    def __init__(self) -> None:
+        self.member = aliased(models.Member)
+        self.company = aliased(models.Company)
+        self.social_accounting = aliased(models.SocialAccounting)
+        self.cooperation = aliased(models.Cooperation)
+
+
 class TransferQueryResult(SqlQueryResult[records.Transfer]):
     def where_account_is_debtor(self, *account: UUID) -> Self:
         accounts = list(account)
@@ -1092,14 +1104,7 @@ class TransferQueryResult(SqlQueryResult[records.Transfer]):
             db=self.db,
         )
 
-    def _create_account_owner_aliases(self):
-        class AccountOwnerAliases:
-            def __init__(self):
-                self.member = aliased(models.Member)
-                self.company = aliased(models.Company)
-                self.social_accounting = aliased(models.SocialAccounting)
-                self.cooperation = aliased(models.Cooperation)
-
+    def _create_account_owner_aliases(self) -> AccountOwnerAliases:
         return AccountOwnerAliases()
 
     @classmethod
@@ -1136,7 +1141,11 @@ class TransferQueryResult(SqlQueryResult[records.Transfer]):
 
     @classmethod
     def _determine_account_owner(
-        cls, member, company, social_accounting, cooperation
+        cls,
+        member: Optional[Member],
+        company: Optional[Company],
+        social_accounting: Optional[SocialAccounting],
+        cooperation: Optional[models.Cooperation],
     ) -> records.AccountOwner:
         if member:
             return DatabaseGatewayImpl.member_from_orm(member)
@@ -1312,7 +1321,7 @@ class ProductiveConsumptionResult(SqlQueryResult[records.ProductiveConsumption])
         Tuple[records.ProductiveConsumption, records.Transfer, records.Plan]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.ProductiveConsumption, records.Transfer, records.Plan]:
             consumption_orm, transfer_orm, plan_orm = orm
             return (
@@ -1339,7 +1348,7 @@ class ProductiveConsumptionResult(SqlQueryResult[records.ProductiveConsumption])
         self,
     ) -> SqlQueryResult[Tuple[records.ProductiveConsumption, records.Transfer]]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.ProductiveConsumption, records.Transfer]:
             consumption_orm, transfer_orm = orm
             return (
@@ -1364,7 +1373,7 @@ class ProductiveConsumptionResult(SqlQueryResult[records.ProductiveConsumption])
         Tuple[records.ProductiveConsumption, records.Transfer, records.Company]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.ProductiveConsumption, records.Transfer, records.Company]:
             consumption_orm, transfer_orm, provider_orm = orm
             return (
@@ -1400,7 +1409,7 @@ class ProductiveConsumptionResult(SqlQueryResult[records.ProductiveConsumption])
         ]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[
             records.ProductiveConsumption,
             records.Transfer,
@@ -1499,7 +1508,7 @@ class PrivateConsumptionResult(SqlQueryResult[records.PrivateConsumption]):
         Tuple[records.PrivateConsumption, records.Transfer, records.Plan]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.PrivateConsumption, records.Transfer, records.Plan]:
             consumption_orm, transfer_orm, plan_orm = orm
             return (
@@ -1533,7 +1542,7 @@ class PrivateConsumptionResult(SqlQueryResult[records.PrivateConsumption]):
         ]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[
             records.PrivateConsumption,
             records.Transfer,
@@ -1597,7 +1606,7 @@ class PrivateConsumptionOfBasicServiceResult(
         Tuple[records.PrivateConsumptionOfBasicService, records.Transfer]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.PrivateConsumptionOfBasicService, records.Transfer]:
             consumption_orm, transfer_orm = orm
             return (
@@ -1628,7 +1637,7 @@ class PrivateConsumptionOfBasicServiceResult(
         ]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[
             records.PrivateConsumptionOfBasicService,
             records.Transfer,
@@ -1691,7 +1700,7 @@ class ProductiveConsumptionOfBasicServiceResult(
         Tuple[records.ProductiveConsumptionOfBasicService, records.Transfer]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.ProductiveConsumptionOfBasicService, records.Transfer]:
             consumption_orm, transfer_orm = orm
             return (
@@ -1722,7 +1731,7 @@ class ProductiveConsumptionOfBasicServiceResult(
         ]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[
             records.ProductiveConsumptionOfBasicService,
             records.Transfer,
@@ -1796,7 +1805,7 @@ class CooperationResult(SqlQueryResult[records.Cooperation]):
         self,
     ) -> SqlQueryResult[Tuple[records.Cooperation, records.Company]]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.Cooperation, records.Company]:
             cooperation_orm, company_orm = orm
             return (
@@ -1842,7 +1851,7 @@ class CoordinationTenureResult(SqlQueryResult[records.CoordinationTenure]):
         self,
     ) -> SqlQueryResult[Tuple[records.CoordinationTenure, records.Company]]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.CoordinationTenure, records.Company]:
             tenure_orm, company_orm = orm
             return (
@@ -1892,7 +1901,7 @@ class CoordinationTransferRequestResult(
         Tuple[records.CoordinationTransferRequest, records.Cooperation]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.CoordinationTransferRequest, records.Cooperation]:
             request_orm, cooperation_orm = orm
             return (
@@ -1942,7 +1951,7 @@ class CompanyWorkInviteResult(SqlQueryResult[records.CompanyWorkInvite]):
     def joined_with_member(
         self,
     ) -> SqlQueryResult[Tuple[records.CompanyWorkInvite, records.Member]]:
-        def mapper(orm) -> Tuple[records.CompanyWorkInvite, records.Member]:
+        def mapper(orm: Any) -> Tuple[records.CompanyWorkInvite, records.Member]:
             invite_orm, member_orm = orm
             return (
                 DatabaseGatewayImpl.company_work_invite_from_orm(invite_orm),
@@ -2041,7 +2050,7 @@ class RegisteredHoursWorkedResult(SqlQueryResult[records.RegisteredHoursWorked])
         ]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.RegisteredHoursWorked, records.Member]:
             hours_orm, member_orm = orm
             return (
@@ -2067,7 +2076,7 @@ class RegisteredHoursWorkedResult(SqlQueryResult[records.RegisteredHoursWorked])
         ]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.RegisteredHoursWorked, records.Transfer]:
             hours_orm, transfer_orm = orm
             return (
@@ -2095,7 +2104,7 @@ class RegisteredHoursWorkedResult(SqlQueryResult[records.RegisteredHoursWorked])
         ]
     ]:
         def mapper(
-            orm,
+            orm: Any,
         ) -> Tuple[records.RegisteredHoursWorked, records.Member, records.Transfer]:
             hours_orm, member_orm, transfer_orm = orm
             return (

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/flask/class_based_view.py

@@ -1,5 +1,5 @@
 from functools import wraps
-from typing import Any
+from typing import Any, Callable
 
 from flask import request
 
@@ -13,9 +13,9 @@ def _not_implemented_view(*args: Any, **kwargs: Any) -> Response:
 
 
 class as_flask_view:
-    def __call__(self, view_class):
+    def __call__(self, view_class: type[Any]) -> Callable[..., Response]:
         @wraps(view_class)
-        def wrapper(*args, **kwargs):
+        def wrapper(*args: Any, **kwargs: Any) -> Response:
             injector = create_dependency_injector()
             view = injector.get(view_class)
             dispatched_method = getattr(view, request.method, _not_implemented_view)

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/flask/dependency_injection.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from functools import wraps
+from typing import Any, Callable
 
 from flask import current_app
 
@@ -64,7 +65,7 @@ from workers_control.web.translator import Translator
 from workers_control.web.url_index import UrlIndex
 
 
-class FlaskModule(Module):
+class FlaskProductionModule(Module):
     def configure(self, binder: Binder) -> None:
         super().configure(binder)
         binder.bind(
@@ -137,14 +138,14 @@ class with_injection:
     def __init__(self) -> None:
         self._injector = create_dependency_injector()
 
-    def __call__(self, original_function):
+    def __call__(self, original_function: Callable[..., Any]) -> Callable[..., Any]:
         """When you wrap a function, make sure that the parameters to be
         injected come after the the parameters that the caller should
         provide.
         """
 
         @wraps(original_function)
-        def wrapped_function(*args, **kwargs):
+        def wrapped_function(*args: Any, **kwargs: Any) -> Any:
             return self._injector.call_with_injection(
                 original_function, args=args, kwargs=kwargs
             )
@@ -153,4 +154,4 @@ class with_injection:
 
 
 def create_dependency_injector() -> Injector:
-    return Injector([FlaskModule()])
+    return Injector([FlaskProductionModule()])

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/flask/flask_colors.py

@@ -25,21 +25,21 @@ def hsl_to_hex(hue: float, saturation: float, lightness: float) -> str:
 class FlaskColors:
     # hsl values must be in sync with colors.css
     @property
-    def primary(self):
+    def primary(self) -> str:
         return hsl_to_hex(171, 100, 41)
 
     @property
-    def info(self):
+    def info(self) -> str:
         return hsl_to_hex(207, 61, 53)
 
     @property
-    def warning(self):
+    def warning(self) -> str:
         return hsl_to_hex(44, 100, 77)
 
     @property
-    def danger(self):
+    def danger(self) -> str:
         return hsl_to_hex(348, 86, 61)
 
     @property
-    def success(self):
+    def success(self) -> str:
         return hsl_to_hex(153, 53, 53)

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/flask/flask_session.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Optional
+from typing import Any, Optional
 from urllib.parse import urljoin, urlparse
 from uuid import UUID
 
@@ -42,7 +42,7 @@ class FlaskLoginUser:
     def is_anonymous(self) -> bool:
         return False
 
-    def __getattr__(self, name):
+    def __getattr__(self, name: str) -> Any:
         return getattr(self.orm_user, name)
 
 

{workers_control-0.2.4 → workers_control-0.2.5}/src/workers_control/flask/mail_service/__init__.py

@@ -1,8 +1,8 @@
 import importlib
 
-from flask import current_app
+from flask import Flask, current_app
 
-from workers_control.core.injector import Injector
+from workers_control.core.injector import ClassProvider, Injector
 
 from .interface import EmailPlugin
 
@@ -11,7 +11,7 @@ def provide_email_service(injector: Injector) -> EmailPlugin:
     if plugin := current_app.extensions.get("woco_email_plugin"):
         return plugin
     plugin = _create_email_plugin_from_config(injector)
-    _store_email_plugin(plugin)
+    set_email_plugin(current_app, plugin)
     return plugin
 
 
@@ -21,9 +21,9 @@ def _create_email_plugin_from_config(injector: Injector) -> EmailPlugin:
     module = importlib.import_module(module_name)
     plugin_class = getattr(module, class_name)
     assert issubclass(plugin_class, EmailPlugin)
-    plugin = injector.get(plugin_class)
+    plugin = ClassProvider(plugin_class).provide(injector.binder)
     return plugin
 
 
-def _store_email_plugin(plugin: EmailPlugin) -> None:
-    current_app.extensions["woco_email_plugin"] = plugin
+def set_email_plugin(app: Flask, plugin: EmailPlugin) -> None:
+    app.extensions["woco_email_plugin"] = plugin