OpenFisca-France 169.16.0__py3-none-any.whl → 169.16.1__py3-none-any.whl

{OpenFisca_France-169.16.0.dist-info → OpenFisca_France-169.16.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: OpenFisca-France
-Version: 169.16.0
+Version: 169.16.1
 Summary: OpenFisca Rules as Code model for France.
 Author-email: OpenFisca Team <contact@openfisca.fr>
 Project-URL: Homepage, https://github.com/openfisca/openfisca-france

{OpenFisca_France-169.16.0.dist-info → OpenFisca_France-169.16.1.dist-info}/RECORD

@@ -83,7 +83,7 @@ openfisca_france/model/prestations/aide_permis_pro_btp.py,sha256=bzh9cDpJetqn72S
 openfisca_france/model/prestations/aides_logement.py,sha256=YuZ3NE531fbBoom2zYZ_2oke8lPCztWP22mbVlcgkDw,90710
 openfisca_france/model/prestations/alimentation.py,sha256=3gkbQrPdobAHmroJiG07ajxzWjLlyMhMh6kMvg4s4Hk,2350
 openfisca_france/model/prestations/autonomie.py,sha256=7UpuhDO-LFjwbq3UWSDyOKJCsTw1rx8O-tS3dG-MBn8,19394
-openfisca_france/model/prestations/bail_reel_solidaire.py,sha256=ebHqyT0wFy73O7VilHzjfQlsimILaAlcQtIdm5kYBq8,3122
+openfisca_france/model/prestations/bail_reel_solidaire.py,sha256=uEDGxseBXC70v-otwXHOCTVUj7ZqIlc1za7rv8EE5Hg,3166
 openfisca_france/model/prestations/cheque_energie.py,sha256=YsmPzfUhs4P7CW5ePrOkBG-2iqeMeuFmfDyR0zKMeLg,6037
 openfisca_france/model/prestations/complement_are.py,sha256=A3w76QuTfglsUmErWLpRbrFHqPECnZT3uDE1KgJWcTc,16530
 openfisca_france/model/prestations/depart1825.py,sha256=2TJYxttcBJbSqpqs-3Wh6yB1-zARnnR396kkgQx_Quw,2528
@@ -4043,8 +4043,8 @@ openfisca_france/scripts/performance/measure_spiral_performances.py,sha256=cQIxE
 openfisca_france/scripts/performance/measure_tests_performance.py,sha256=HYgSJy-OMZay2AZt6ztntgdUbW_RL2xMr-iHcK-zoVY,1869
 openfisca_france/situation_examples/__init__.py,sha256=BTRmrqk9lsjfhtPXsYcsWqXFEYyFpgLcxNs6oJsy8zk,262
 openfisca_france/situation_examples/couple.json,sha256=Ot1x4wl3IS-2-10X3V7ZUokkOMXi96s-xK7A0gNvRF4,862
-OpenFisca_France-169.16.0.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
-OpenFisca_France-169.16.0.dist-info/METADATA,sha256=cB0VRe0AbZ2Euz0eWWbGuj-sh0HE0TaOaB6szDyjZfs,20831
-OpenFisca_France-169.16.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-OpenFisca_France-169.16.0.dist-info/top_level.txt,sha256=1LbD6QJWehKGIcjtaJ45tbQOSDiFEXOlIdgWRI_jaHU,17
-OpenFisca_France-169.16.0.dist-info/RECORD,,
+OpenFisca_France-169.16.1.dist-info/LICENSE.AGPL.txt,sha256=2N5ReRelkdqkR9a-KP-y-shmcD5P62XoYiG-miLTAzo,34519
+OpenFisca_France-169.16.1.dist-info/METADATA,sha256=54Zy9lAGUpsrF-ejZcFiV9nfn1i7tSdnKidUzOt--oQ,20831
+OpenFisca_France-169.16.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+OpenFisca_France-169.16.1.dist-info/top_level.txt,sha256=1LbD6QJWehKGIcjtaJ45tbQOSDiFEXOlIdgWRI_jaHU,17
+OpenFisca_France-169.16.1.dist-info/RECORD,,

openfisca_france/model/prestations/bail_reel_solidaire.py

@@ -1,81 +1,80 @@
 from openfisca_france.model.base import *
-import os
+import openfisca_france
 import csv
+import codecs
+import pkg_resources
 import numpy as np
 
 
-def load_zonage_file(period, parameters):
-    chemin_fichier_zonage_abc = os.path.join(parameters(period).prestations_sociales.bail_reel_solidaire.parametres_generaux.fichier_zonage[0])
+def bail_reel_solidaire_zones_elligibles():
+    with pkg_resources.resource_stream(openfisca_france.__name__, 'assets/zonage-communes/zonage-abc-juillet-2024.csv') as csv_file:
+        utf8_reader = codecs.getreader('utf-8')
+        csv_reader = csv.DictReader(utf8_reader(csv_file), delimiter=';')
+        return {
+            row['CODGEO']: row['Zone en vigueur depuis le 5 juillet 2024']
+            for row in csv_reader
+            }
 
-    if not os.path.exists(chemin_fichier_zonage_abc):
-        return None
-
-    with open(chemin_fichier_zonage_abc, 'r', encoding='utf-8') as csvfile:
-        csv_reader = csv.DictReader(csvfile, delimiter=';')
-        return {row['CODGEO']: row['Zone en vigueur depuis le 5 juillet 2024'] for row in csv_reader}
-
-
-def plafond_par_zone_et_composition(nb_personnes, plafonds_par_zones, zone):
-    plafond_zone = plafonds_par_zones[f'zone_{zone}']
-
-    tranches_composition = range(1, 7)
-    conditions_nb_personnes = [
-        nb_personnes == i if i < 6 else nb_personnes >= i
-        for i in tranches_composition
-        ]
-
-    plafonds_revenus = [
-        plafond_zone[f'nb_personnes_{i}']
-        for i in tranches_composition
-        ]
-
-    return select(conditions_nb_personnes, plafonds_revenus)
 
+class bail_reel_solidaire_zones_menage(Variable):
+    value_type = str
+    label = 'Zone du ménage pour le Bail Réel Solidaire'
+    entity = Menage
+    definition_period = MONTH
 
-def plafond_supplementaire_par_zone(nb_personnes, plafonds_par_zones, zone, nb_personnes_max):
-    return where(
-        nb_personnes > nb_personnes_max,
-        (nb_personnes - nb_personnes_max) * plafonds_par_zones[f'zone_{zone}']['nb_personnes_supplementaires'],
-        0
-        )
+    def formula(menage, period):
+        depcom = menage('depcom', period)
+        return np.fromiter(
+            (bail_reel_solidaire_zones_elligibles().get(depcom_cell.decode('utf-8')) for depcom_cell in depcom),
+            dtype='<U4'  # String length max for zones (A, Abis, B1, B2, C)
+            )
 
 
-class bail_reel_solidaire(Variable):
+class bail_reel_solidaire_plafond_total(Variable):
+    value_type = float
+    label = 'Plafond de ressources total du Bail Réel Solidaire'
     entity = Menage
-    value_type = bool
-    reference = [
-        'https://www.legifrance.gouv.fr/jorf/id/JORFTEXT000032918488',
-        'https://www.legifrance.gouv.fr/loda/id/JORFTEXT000000437021'
-        ]
-    label = 'Bail réel solidaire'
     definition_period = MONTH
 
     def formula(menage, period, parameters):
-        parametres = parameters(period).prestations_sociales.bail_reel_solidaire.parametres_generaux
-        zones_abc_eligibles = parametres.zones_abc_eligibles
-        nb_personnes_max = parametres.nombre_personnes_maximum
-
-        zones_par_depcom = load_zonage_file(period, parameters)
-        if not zones_par_depcom:
-            return False
-
+        params = parameters(period).prestations_sociales.bail_reel_solidaire
+        zones_abc_eligibles = params.parametres_generaux.zones_abc_eligibles
+        plafonds_par_zones = params.plafonds_par_zones
+        zones_menage = menage('bail_reel_solidaire_zones_menage', period)
         nb_personnes = menage.nb_persons()
-        depcom = menage('depcom', period.first_month)
-        zones_menage = np.array([zones_par_depcom.get(d.decode('utf-8'), None) for d in depcom])
-
-        plafonds_par_zones = parameters(period).prestations_sociales.bail_reel_solidaire.plafonds_par_zones
-
-        plafond_revenu_base = select(
+        nb_personnes_max = params.parametres_generaux.nombre_personnes_maximum
+
+        def calcul_plafonds_zone(zone):
+            plafond_zone = plafonds_par_zones[f'zone_{zone}']
+            plafond_base = select(
+                [nb_personnes == i if i < 6 else nb_personnes >= i for i in range(1, 7)],
+                [plafond_zone[f'nb_personnes_{i}'] for i in range(1, 7)]
+                )
+            plafond_supp = where(
+                nb_personnes > nb_personnes_max,
+                (nb_personnes - nb_personnes_max) * plafond_zone.nb_personnes_supplementaires,
+                0
+                )
+            return plafond_base + plafond_supp
+
+        return select(
             [zones_menage == zone for zone in zones_abc_eligibles],
-            [plafond_par_zone_et_composition(nb_personnes, plafonds_par_zones, zone) for zone in zones_abc_eligibles]
+            [calcul_plafonds_zone(zone) for zone in zones_abc_eligibles]
             )
 
-        plafond_revenu_supplementaire = select(
-            [zones_menage == zone for zone in zones_abc_eligibles],
-            [plafond_supplementaire_par_zone(nb_personnes, plafonds_par_zones, zone, nb_personnes_max) for zone in zones_abc_eligibles]
-            )
 
-        rfr = menage.sum(menage.members.foyer_fiscal(
-            'rfr', period.n_2), role=FoyerFiscal.DECLARANT_PRINCIPAL)
+class bail_reel_solidaire(Variable):
+    value_type = bool
+    label = 'Éligibilité au Bail Réel Solidaire'
+    entity = Menage
+    definition_period = MONTH
+    reference = [
+        'https://www.legifrance.gouv.fr/jorf/id/JORFTEXT000032918488',
+        'https://www.legifrance.gouv.fr/loda/id/JORFTEXT000000437021'
+        ]
 
-        return where(zones_menage is not None, rfr <= (plafond_revenu_base + plafond_revenu_supplementaire), False)
+    def formula(menage, period):
+        plafond_total = menage('bail_reel_solidaire_plafond_total', period)
+        zones_menage = menage('bail_reel_solidaire_zones_menage', period)
+        rfr = menage.sum(menage.members.foyer_fiscal('rfr', period.n_2), role=FoyerFiscal.DECLARANT_PRINCIPAL)
+        return where(zones_menage is not None, rfr <= plafond_total, False)