vivarium-public-health 3.2.2__tar.gz → 4.0.1__tar.gz

vivarium_public_health-4.0.1/.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# default owners
+* @albrja @hussain-jafari @patricktnast @rmudambi @stevebachmeier

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/CHANGELOG.rst

@@ -1,3 +1,11 @@
+**4.0.1 - 03/21/25**
+
+ - Feature: Update required resources for all components
+
+**4.0.0 - 03/17/25**
+
+ - Feature: Use birth exposure artifact key for LBWSG components
+
 **3.2.2 - 2/21/25**
 
  - Bugfix: Use relative risk data to get age intervals for LBWSGRiskEffect

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: vivarium_public_health
-Version: 3.2.2
+Version: 4.0.1
 Summary: Components for modelling diseases, risks, and interventions with ``vivarium``
 Home-page: https://github.com/ihmeuw/vivarium_public_health
 Author: The vivarium developers
@@ -70,6 +70,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary

vivarium_public_health-4.0.1/src/vivarium_public_health/_version.py

@@ -0,0 +1 @@
+__version__ = "4.0.1"

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/disease/model.py

@@ -114,7 +114,8 @@ class DiseaseModel(Machine):
         builder.value.register_value_modifier(
             "cause_specific_mortality_rate",
             self.adjust_cause_specific_mortality_rate,
-            requires_columns=["age", "sex"],
+            component=self,
+            required_resources=["age", "sex"],
         )
 
     def on_initialize_simulants(self, pop_data: SimulantData) -> None:

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/disease/special_disease.py

@@ -16,6 +16,7 @@ import pandas as pd
 from vivarium import Component
 from vivarium.framework.event import Event
 from vivarium.framework.population import SimulantData
+from vivarium.framework.resource import Resource
 from vivarium.framework.values import list_combiner, union_post_processor
 
 from vivarium_public_health.disease.transition import TransitionString
@@ -123,12 +124,8 @@ class RiskAttributableDisease(Component):
         return ["alive"]
 
     @property
-    def initialization_requirements(self) -> dict[str, list[str]]:
-        return {
-            "requires_columns": [],
-            "requires_values": [f"{self.risk.name}.exposure"],
-            "requires_streams": [],
-        }
+    def initialization_requirements(self) -> list[str | Resource]:
+        return [self.exposure_pipeline]
 
     @property
     def state_names(self):
@@ -171,17 +168,21 @@ class RiskAttributableDisease(Component):
         self.disability_weight = builder.value.register_value_producer(
             f"{self.cause.name}.disability_weight",
             source=self.compute_disability_weight,
-            requires_columns=get_lookup_columns(
+            component=self,
+            required_resources=get_lookup_columns(
                 [self.lookup_tables["raw_disability_weight"]]
             ),
         )
         builder.value.register_value_modifier(
-            "all_causes.disability_weight", modifier=self.disability_weight
+            "all_causes.disability_weight",
+            modifier=self.disability_weight,
+            component=self,
         )
         builder.value.register_value_modifier(
             "cause_specific_mortality_rate",
             self.adjust_cause_specific_mortality_rate,
-            requires_columns=get_lookup_columns(
+            component=self,
+            required_resources=get_lookup_columns(
                 [self.lookup_tables["cause_specific_mortality_rate"]]
             ),
         )
@@ -190,29 +191,32 @@ class RiskAttributableDisease(Component):
         self.excess_mortality_rate = builder.value.register_value_producer(
             self.excess_mortality_rate_pipeline_name,
             source=self.compute_excess_mortality_rate,
-            requires_columns=get_lookup_columns(
+            component=self,
+            required_resources=get_lookup_columns(
                 [self.lookup_tables["excess_mortality_rate"]]
-            ),
-            requires_values=[self.excess_mortality_rate_paf_pipeline_name],
+            )
+            + [self.joint_paf],
         )
         self.joint_paf = builder.value.register_value_producer(
             self.excess_mortality_rate_paf_pipeline_name,
             source=lambda idx: [self.lookup_tables["population_attributable_fraction"](idx)],
+            component=self,
             preferred_combiner=list_combiner,
             preferred_post_processor=union_post_processor,
         )
         builder.value.register_value_modifier(
             "mortality_rate",
             modifier=self.adjust_mortality_rate,
-            requires_values=[self.excess_mortality_rate_pipeline_name],
+            component=self,
+            required_resources=[self.excess_mortality_rate],
         )
 
         distribution = builder.data.load(f"{self.risk}.distribution")
-        exposure_pipeline = builder.value.get_value(f"{self.risk.name}.exposure")
+        self.exposure_pipeline = builder.value.get_value(f"{self.risk.name}.exposure")
         threshold = builder.configuration[self.name].threshold
 
         self.filter_by_exposure = self.get_exposure_filter(
-            distribution, exposure_pipeline, threshold
+            distribution, self.exposure_pipeline, threshold
         )
 
     #################

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/disease/state.py

@@ -15,6 +15,7 @@ import pandas as pd
 from vivarium.framework.engine import Builder
 from vivarium.framework.population import PopulationView, SimulantData
 from vivarium.framework.randomness import RandomnessStream
+from vivarium.framework.resource import Resource
 from vivarium.framework.state_machine import State, Transient, Transition, Trigger
 from vivarium.framework.values import Pipeline, list_combiner, union_post_processor
 from vivarium.types import DataInput, LookupTableData
@@ -57,12 +58,8 @@ class BaseDiseaseState(State):
         return [self.model, "alive"]
 
     @property
-    def initialization_requirements(self) -> dict[str, list[str]]:
-        return {
-            "requires_columns": [self.model],
-            "requires_values": [],
-            "requires_streams": [],
-        }
+    def initialization_requirements(self) -> list[str | Resource]:
+        return [self.model]
 
     #####################
     # Lifecycle methods #
@@ -327,6 +324,10 @@ class DiseaseState(BaseDiseaseState):
     # Properties #
     ##############
 
+    @property
+    def initialization_requirements(self) -> list[str | Resource]:
+        return super().initialization_requirements + [self.randomness_prevalence]
+
     @property
     def configuration_defaults(self) -> dict[str, Any]:
         configuration_defaults = super().configuration_defaults
@@ -465,19 +466,22 @@ class DiseaseState(BaseDiseaseState):
         self.disability_weight = self.get_disability_weight_pipeline(builder)
 
         builder.value.register_value_modifier(
-            "all_causes.disability_weight", modifier=self.disability_weight
+            "all_causes.disability_weight",
+            modifier=self.disability_weight,
+            component=self,
         )
 
         self.has_excess_mortality = is_non_zero(
             self.lookup_tables["excess_mortality_rate"].data
         )
-        self.excess_mortality_rate = self.get_excess_mortality_rate_pipeline(builder)
         self.joint_paf = self.get_joint_paf(builder)
+        self.excess_mortality_rate = self.get_excess_mortality_rate_pipeline(builder)
 
         builder.value.register_value_modifier(
             "mortality_rate",
             modifier=self.adjust_mortality_rate,
-            requires_values=[self.excess_mortality_rate_pipeline_name],
+            component=self,
+            required_resources=[self.excess_mortality_rate],
         )
 
         self.randomness_prevalence = self.get_randomness_prevalence(builder)
@@ -531,7 +535,8 @@ class DiseaseState(BaseDiseaseState):
         return builder.value.register_value_producer(
             f"{self.state_id}.dwell_time",
             source=self.lookup_tables["dwell_time"],
-            requires_columns=required_columns,
+            component=self,
+            required_resources=required_columns,
         )
 
     def get_disability_weight_source(self, disability_weight: DataInput | None) -> DataInput:
@@ -556,7 +561,8 @@ class DiseaseState(BaseDiseaseState):
         return builder.value.register_value_producer(
             f"{self.state_id}.disability_weight",
             source=self.compute_disability_weight,
-            requires_columns=lookup_columns + ["alive", self.model],
+            component=self,
+            required_resources=lookup_columns + ["alive", self.model],
         )
 
     def get_excess_mortality_rate_source(
@@ -583,8 +589,8 @@ class DiseaseState(BaseDiseaseState):
         return builder.value.register_rate_producer(
             self.excess_mortality_rate_pipeline_name,
             source=self.compute_excess_mortality_rate,
-            requires_columns=lookup_columns + ["alive", self.model],
-            requires_values=[self.excess_mortality_rate_paf_pipeline_name],
+            component=self,
+            required_resources=lookup_columns + ["alive", self.model, self.joint_paf],
         )
 
     def get_joint_paf(self, builder: Builder) -> Pipeline:
@@ -592,12 +598,15 @@ class DiseaseState(BaseDiseaseState):
         return builder.value.register_value_producer(
             self.excess_mortality_rate_paf_pipeline_name,
             source=lambda idx: [paf(idx)],
+            component=self,
             preferred_combiner=list_combiner,
             preferred_post_processor=union_post_processor,
         )
 
     def get_randomness_prevalence(self, builder: Builder) -> RandomnessStream:
-        return builder.randomness.get_stream(f"{self.state_id}_prevalent_cases")
+        return builder.randomness.get_stream(
+            f"{self.state_id}_prevalent_cases", component=self
+        )
 
     ##################
     # Public methods #

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/disease/transition.py

@@ -129,19 +129,20 @@ class RateTransition(Transition):
     # noinspection PyAttributeOutsideInit
     def setup(self, builder: Builder) -> None:
         lookup_columns = get_lookup_columns([self.lookup_tables["transition_rate"]])
-        self.transition_rate = builder.value.register_rate_producer(
-            self.transition_rate_pipeline_name,
-            source=self.compute_transition_rate,
-            requires_columns=lookup_columns + ["alive"],
-            requires_values=[f"{self.transition_rate_pipeline_name}.paf"],
-        )
         paf = builder.lookup.build_table(0)
         self.joint_paf = builder.value.register_value_producer(
             f"{self.transition_rate_pipeline_name}.paf",
             source=lambda index: [paf(index)],
+            component=self,
             preferred_combiner=list_combiner,
             preferred_post_processor=union_post_processor,
         )
+        self.transition_rate = builder.value.register_rate_producer(
+            self.transition_rate_pipeline_name,
+            source=self.compute_transition_rate,
+            component=self,
+            required_resources=lookup_columns + ["alive", self.joint_paf],
+        )
 
     #################
     # Setup methods #

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/mslt/delay.py

@@ -16,6 +16,7 @@ from vivarium import Component
 from vivarium.framework.engine import Builder
 from vivarium.framework.event import Event
 from vivarium.framework.population import SimulantData
+from vivarium.framework.resource import Resource
 
 
 class DelayedRisk(Component):
@@ -111,12 +112,8 @@ class DelayedRisk(Component):
         return ["age", "sex", "population"]
 
     @property
-    def initialization_requirements(self) -> dict[str, list[str]]:
-        return {
-            "requires_columns": ["age", "sex", "population"],
-            "requires_values": [],
-            "requires_streams": [],
-        }
+    def initialization_requirements(self) -> list[str | Resource]:
+        return ["age", "sex", "population"]
 
     #####################
     # Lifecycle methods #
@@ -168,9 +165,11 @@ class DelayedRisk(Component):
         )
         inc_name = "{}.incidence".format(self.risk)
         inc_int_name = "{}_intervention.incidence".format(self.risk)
-        self.incidence = builder.value.register_rate_producer(inc_name, source=inc_data)
+        self.incidence = builder.value.register_rate_producer(
+            inc_name, source=inc_data, component=self
+        )
         self.int_incidence = builder.value.register_rate_producer(
-            inc_int_name, source=inc_data
+            inc_int_name, source=inc_data, component=self
         )
 
         # Load the remission rates for the BAU and intervention scenarios.
@@ -183,9 +182,11 @@ class DelayedRisk(Component):
         )
         rem_name = "{}.remission".format(self.risk)
         rem_int_name = "{}_intervention.remission".format(self.risk)
-        self.remission = builder.value.register_rate_producer(rem_name, source=rem_data)
+        self.remission = builder.value.register_rate_producer(
+            rem_name, source=rem_data, component=self
+        )
         self.int_remission = builder.value.register_rate_producer(
-            rem_int_name, source=rem_data
+            rem_int_name, source=rem_data, component=self
         )
 
         # We apply separate mortality rates to the different exposure bins.
@@ -255,6 +256,7 @@ class DelayedRisk(Component):
             source=builder.lookup.build_table(
                 mortality_data, key_columns=["sex"], parameter_columns=["age", "year"]
             ),
+            component=self,
         )
 
     #################
@@ -312,7 +314,7 @@ class DelayedRisk(Component):
         for template in rate_templates:
             rate_name = template.format(disease)
             modifier = lambda ix, rate: self.incidence_adjustment(disease, ix, rate)
-            builder.value.register_value_modifier(rate_name, modifier)
+            builder.value.register_value_modifier(rate_name, modifier, component=self)
 
     ########################
     # Event-driven methods #

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/mslt/disease.py

@@ -16,6 +16,7 @@ from vivarium import Component
 from vivarium.framework.engine import Builder
 from vivarium.framework.event import Event
 from vivarium.framework.population import SimulantData
+from vivarium.framework.resource import Resource
 
 
 class AcuteDisease(Component):
@@ -67,19 +68,23 @@ class AcuteDisease(Component):
             yld_data, key_columns=["sex"], parameter_columns=["age", "year"]
         )
         self.excess_mortality = builder.value.register_rate_producer(
-            f"{self.disease}.excess_mortality", source=mty_rate
+            f"{self.disease}.excess_mortality", source=mty_rate, component=self
         )
         self.int_excess_mortality = builder.value.register_rate_producer(
-            f"{self.disease}_intervention.excess_mortality", source=mty_rate
+            f"{self.disease}_intervention.excess_mortality", source=mty_rate, component=self
         )
         self.disability_rate = builder.value.register_rate_producer(
-            f"{self.disease}.yld_rate", source=yld_rate
+            f"{self.disease}.yld_rate", source=yld_rate, component=self
         )
         self.int_disability_rate = builder.value.register_rate_producer(
-            f"{self.disease}_intervention.yld_rate", source=yld_rate
+            f"{self.disease}_intervention.yld_rate", source=yld_rate, component=self
+        )
+        builder.value.register_value_modifier(
+            "mortality_rate", self.mortality_adjustment, component=self
+        )
+        builder.value.register_value_modifier(
+            "yld_rate", self.disability_adjustment, component=self
         )
-        builder.value.register_value_modifier("mortality_rate", self.mortality_adjustment)
-        builder.value.register_value_modifier("yld_rate", self.disability_adjustment)
 
     ##################################
     # Pipeline sources and modifiers #
@@ -164,12 +169,8 @@ class Disease(Component):
         return ["age", "sex"]
 
     @property
-    def initialization_requirements(self) -> dict[str, list[str]]:
-        return {
-            "requires_columns": ["age", "sex"],
-            "requires_values": [],
-            "requires_streams": [],
-        }
+    def initialization_requirements(self) -> list[str | Resource]:
+        return ["age", "sex"]
 
     def __init__(self, disease: str):
         super().__init__()
@@ -192,10 +193,10 @@ class Disease(Component):
             inc_data, key_columns=["sex"], parameter_columns=["age", "year"]
         )
         self.incidence = builder.value.register_rate_producer(
-            bau_prefix + "incidence", source=i
+            bau_prefix + "incidence", source=i, component=self
         )
         self.incidence_intervention = builder.value.register_rate_producer(
-            int_prefix + "incidence", source=i
+            int_prefix + "incidence", source=i, component=self
         )
 
         rem_data = builder.data.load(data_prefix + "remission")
@@ -203,7 +204,7 @@ class Disease(Component):
             rem_data, key_columns=["sex"], parameter_columns=["age", "year"]
         )
         self.remission = builder.value.register_rate_producer(
-            bau_prefix + "remission", source=r
+            bau_prefix + "remission", source=r, component=self
         )
 
         mty_data = builder.data.load(data_prefix + "mortality")
@@ -211,7 +212,7 @@ class Disease(Component):
             mty_data, key_columns=["sex"], parameter_columns=["age", "year"]
         )
         self.excess_mortality = builder.value.register_rate_producer(
-            bau_prefix + "excess_mortality", source=f
+            bau_prefix + "excess_mortality", source=f, component=self
         )
 
         yld_data = builder.data.load(data_prefix + "morbidity")
@@ -219,7 +220,7 @@ class Disease(Component):
             yld_data, key_columns=["sex"], parameter_columns=["age", "year"]
         )
         self.disability_rate = builder.value.register_rate_producer(
-            bau_prefix + "yld_rate", source=yld_rate
+            bau_prefix + "yld_rate", source=yld_rate, component=self
         )
 
         prev_data = builder.data.load(data_prefix + "prevalence")
@@ -227,8 +228,12 @@ class Disease(Component):
             prev_data, key_columns=["sex"], parameter_columns=["age", "year"]
         )
 
-        builder.value.register_value_modifier("mortality_rate", self.mortality_adjustment)
-        builder.value.register_value_modifier("yld_rate", self.disability_adjustment)
+        builder.value.register_value_modifier(
+            "mortality_rate", self.mortality_adjustment, component=self
+        )
+        builder.value.register_value_modifier(
+            "yld_rate", self.disability_adjustment, component=self
+        )
 
     ########################
     # Event-driven methods #

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/mslt/intervention.py

@@ -44,7 +44,9 @@ class ModifyAllCauseMortality(Component):
         self.scale = self.config.intervention[self.intervention]["scale"]
         if self.scale < 0:
             raise ValueError("Invalid scale: {}".format(self.scale))
-        builder.value.register_value_modifier("mortality_rate", self.mortality_adjustment)
+        builder.value.register_value_modifier(
+            "mortality_rate", self.mortality_adjustment, component=self
+        )
 
     ##################################
     # Pipeline sources and modifiers #
@@ -89,7 +91,7 @@ class ModifyDiseaseRate(Component):
         if self.scale < 0:
             raise ValueError("Invalid scale: {}".format(self.scale))
         rate_name = "{}_intervention.{}".format(self.disease, self.rate)
-        builder.value.register_value_modifier(rate_name, self.adjust_rate)
+        builder.value.register_value_modifier(rate_name, self.adjust_rate, component=self)
 
     ##################################
     # Pipeline sources and modifiers #
@@ -167,9 +169,9 @@ class ModifyAcuteDiseaseIncidence(Component):
         if self.scale < 0:
             raise ValueError("Invalid incidence scale: {}".format(self.scale))
         yld_rate = "{}_intervention.yld_rate".format(self.intervention)
-        builder.value.register_value_modifier(yld_rate, self.rate_adjustment)
+        builder.value.register_value_modifier(yld_rate, self.rate_adjustment, component=self)
         mort_rate = "{}_intervention.excess_mortality".format(self.intervention)
-        builder.value.register_value_modifier(mort_rate, self.rate_adjustment)
+        builder.value.register_value_modifier(mort_rate, self.rate_adjustment, component=self)
 
     ##################################
     # Pipeline sources and modifiers #
@@ -210,7 +212,9 @@ class ModifyAcuteDiseaseMorbidity(Component):
         if self.scale < 0:
             raise ValueError("Invalid YLD scale: {}".format(self.scale))
         rate = "{}_intervention.yld_rate".format(self.intervention)
-        builder.value.register_value_modifier(rate, self.disability_adjustment)
+        builder.value.register_value_modifier(
+            rate, self.disability_adjustment, component=self
+        )
 
     ##################################
     # Pipeline sources and modifiers #
@@ -251,7 +255,7 @@ class ModifyAcuteDiseaseMortality(Component):
         if self.scale < 0:
             raise ValueError("Invalid mortality scale: {}".format(self.scale))
         rate = "{}_intervention.excess_mortality".format(self.intervention)
-        builder.value.register_value_modifier(rate, self.mortality_adjustment)
+        builder.value.register_value_modifier(rate, self.mortality_adjustment, component=self)
 
     ##################################
     # Pipeline sources and modifiers #
@@ -288,7 +292,7 @@ class TobaccoFreeGeneration(Component):
         self.year = builder.configuration["tobacco_free_generation"].year
         self.clock = builder.time.clock()
         rate_name = "{}_intervention.incidence".format(self.exposure)
-        builder.value.register_value_modifier(rate_name, self.adjust_rate)
+        builder.value.register_value_modifier(rate_name, self.adjust_rate, component=self)
 
     ##################################
     # Pipeline sources and modifiers #
@@ -329,9 +333,13 @@ class TobaccoEradication(Component):
         self.year = builder.configuration["tobacco_eradication"].year
         self.clock = builder.time.clock()
         inc_rate_name = "{}_intervention.incidence".format(self.exposure)
-        builder.value.register_value_modifier(inc_rate_name, self.adjust_inc_rate)
+        builder.value.register_value_modifier(
+            inc_rate_name, self.adjust_inc_rate, component=self
+        )
         rem_rate_name = "{}_intervention.remission".format(self.exposure)
-        builder.value.register_value_modifier(rem_rate_name, self.adjust_rem_rate)
+        builder.value.register_value_modifier(
+            rem_rate_name, self.adjust_rem_rate, component=self
+        )
 
     ##################################
     # Pipeline sources and modifiers #

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/mslt/magic_wand_components.py

@@ -20,7 +20,9 @@ class MortalityShift(Component):
     #####################
 
     def setup(self, builder: Builder) -> None:
-        builder.value.register_value_modifier("mortality_rate", self.mortality_adjustment)
+        builder.value.register_value_modifier(
+            "mortality_rate", self.mortality_adjustment, component=self
+        )
 
     ##################################
     # Pipeline sources and modifiers #
@@ -36,7 +38,9 @@ class YLDShift(Component):
     #####################
 
     def setup(self, builder: Builder) -> None:
-        builder.value.register_value_modifier("yld_rate", self.disability_adjustment)
+        builder.value.register_value_modifier(
+            "yld_rate", self.disability_adjustment, component=self
+        )
 
     ##################################
     # Pipeline sources and modifiers #
@@ -56,7 +60,9 @@ class IncidenceShift(Component):
 
     def setup(self, builder: Builder) -> None:
         builder.value.register_value_modifier(
-            f"{self.disease}_intervention.incidence", self.incidence_adjustment
+            f"{self.disease}_intervention.incidence",
+            self.incidence_adjustment,
+            component=self,
         )
 
     ##################################
@@ -95,7 +101,9 @@ class ModifyAcuteDiseaseYLD(Component):
         if self.scale < 0:
             raise ValueError(f"Invalid YLD scale: {self.scale}")
         builder.value.register_value_modifier(
-            f"{self.disease}_intervention.yld_rate", self.disability_adjustment
+            f"{self.disease}_intervention.yld_rate",
+            self.disability_adjustment,
+            component=self,
         )
 
     ##################################
@@ -134,7 +142,9 @@ class ModifyAcuteDiseaseMortality(Component):
         if self.scale < 0:
             raise ValueError(f"Invalid mortality scale: {self.scale}")
         builder.value.register_value_modifier(
-            f"{self.disease}_intervention.excess_mortality", self.mortality_adjustment
+            f"{self.disease}_intervention.excess_mortality",
+            self.mortality_adjustment,
+            component=self,
         )
 
     ##################################

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/mslt/population.py

@@ -146,6 +146,7 @@ class Mortality(Component):
             source=builder.lookup.build_table(
                 mortality_data, key_columns=["sex"], parameter_columns=["age", "year"]
             ),
+            component=self,
         )
 
     ########################
@@ -208,7 +209,9 @@ class Disability(Component):
         yld_rate = builder.lookup.build_table(
             yld_data, key_columns=["sex"], parameter_columns=["age", "year"]
         )
-        self.yld_rate = builder.value.register_rate_producer("yld_rate", source=yld_rate)
+        self.yld_rate = builder.value.register_rate_producer(
+            "yld_rate", source=yld_rate, component=self
+        )
 
     ########################
     # Event-driven methods #

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/population/add_new_birth_cohorts.py

@@ -13,6 +13,7 @@ from vivarium import Component
 from vivarium.framework.engine import Builder
 from vivarium.framework.event import Event
 from vivarium.framework.population import SimulantData
+from vivarium.framework.resource import Resource
 
 from vivarium_public_health import utilities
 from vivarium_public_health.population.data_transformations import get_live_births_per_year
@@ -164,12 +165,8 @@ class FertilityAgeSpecificRates(Component):
         return ["sex"]
 
     @property
-    def initialization_requirements(self) -> dict[str, list[str]]:
-        return {
-            "requires_columns": ["sex"],
-            "requires_values": [],
-            "requires_streams": [],
-        }
+    def initialization_requirements(self) -> list[str | Resource]:
+        return ["sex"]
 
     #####################
     # Lifecycle methods #
@@ -188,10 +185,13 @@ class FertilityAgeSpecificRates(Component):
             age_specific_fertility_rate, parameter_columns=["age", "year"]
         )
         self.fertility_rate = builder.value.register_rate_producer(
-            "fertility rate", source=fertility_rate, requires_columns=["age"]
+            "fertility rate",
+            source=fertility_rate,
+            component=self,
+            required_resources=["age"],
         )
 
-        self.randomness = builder.randomness.get_stream("fertility")
+        self.randomness = builder.randomness.get_stream("fertility", component=self)
         self.simulant_creator = builder.population.get_simulant_creator()
 
     #################

{vivarium_public_health-3.2.2 → vivarium_public_health-4.0.1}/src/vivarium_public_health/population/base_population.py

@@ -88,18 +88,19 @@ class BasePopulation(Component):
     # Setup methods #
     #################
 
-    @staticmethod
-    def get_randomness_streams(builder: Builder) -> dict[str, RandomnessStream]:
+    def get_randomness_streams(self, builder: Builder) -> dict[str, RandomnessStream]:
         return {
-            "general_purpose": builder.randomness.get_stream("population_generation"),
+            "general_purpose": builder.randomness.get_stream(
+                "population_generation", component=self
+            ),
             "bin_selection": builder.randomness.get_stream(
-                "bin_selection", initializes_crn_attributes=True
+                "bin_selection", component=self, initializes_crn_attributes=True
             ),
             "age_smoothing": builder.randomness.get_stream(
-                "age_smoothing", initializes_crn_attributes=True
+                "age_smoothing", component=self, initializes_crn_attributes=True
             ),
             "age_smoothing_age_bounds": builder.randomness.get_stream(
-                "age_smoothing_age_bounds", initializes_crn_attributes=True
+                "age_smoothing_age_bounds", component=self, initializes_crn_attributes=True
             ),
         }