Update app.py

adding batch costs, fixing indicators

app.py

@@ -135,6 +135,9 @@ class CannabinoidEstimator(param.Parameterized):
     shifts_per_week = param.Number(
         default=21.0, bounds=(1, 28), step=1.0, label="Shifts per week"
     )
+    batch_frequency = param.String(
+        default = "Day", label="New batch frequency"
+    )
 
     kg_processed_per_shift = 0.0
     labour_cost_per_shift = 0.0
@@ -215,6 +218,20 @@ class CannabinoidEstimator(param.Parameterized):
                 "Value": "center",
             },
         )
+        self.profit_weekly = pn.indicators.Number(
+            name="Weekly Profit",
+            value=self.net_rev_per_week,
+            format=f"${self.net_rev_per_week / 1000:.0f} k",
+            default_color="green",
+            align="center",
+        )
+        self.profit_pct = pn.indicators.Number(
+            name="Operating Profit",
+            value=self.operating_profit_pct,
+            format=f"{self.operating_profit_pct * 100.0:.2f}%",
+            default_color="green",
+            align="center",
+        )
         self._update_calculations()
 
     def _create_sliders(self):
@@ -456,6 +473,13 @@ class CannabinoidEstimator(param.Parameterized):
             format="0",
         )
 
+        self.batch_frequency_radio = pn.widgets.RadioButtonGroup.from_param(
+            self.param.batch_frequency,
+            name=self.param.batch_frequency.label,
+            options=["Shift", "Day", "Week"],
+            button_type="primary",
+        )
+
     @param.depends(
         "kg_processed_per_hour",
         "finished_product_yield_pct",
@@ -470,6 +494,7 @@ class CannabinoidEstimator(param.Parameterized):
         "wholesale_cbx_price",
         "wholesale_cbx_pct",
         "batch_test_cost",
+        "batch_frequency",
         "fixed_overhead_per_week",
         "workers_per_shift",
         "worker_hourly_rate",
@@ -555,10 +580,34 @@ class CannabinoidEstimator(param.Parameterized):
             else 0.0
         )
 
+        # Calculate batch_test_cost_per_shift based on batch_frequency
+        self.batch_test_cost_per_shift = 0.0
+        if self.batch_frequency == "Shift":
+            self.batch_test_cost_per_shift = self.batch_test_cost
+        elif self.batch_frequency == "Day":
+            # Ensure self.shifts_per_day is defined and positive
+            if hasattr(self, 'shifts_per_day') and self.shifts_per_day > 0:
+                self.batch_test_cost_per_shift = self.batch_test_cost / self.shifts_per_day
+            else:
+                # If no shifts per day, or attribute not defined, cost per shift is 0
+                # Or, this could be an error condition if shifts_per_day is expected
+                self.batch_test_cost_per_shift = 0.0
+        elif self.batch_frequency == "Week":
+            # self.shifts_per_week is used above, so it should be available
+            if self.shifts_per_week > 0:
+                self.batch_test_cost_per_shift = self.batch_test_cost / self.shifts_per_week
+            else:
+                # If no shifts per week, cost per shift is 0
+                self.batch_test_cost_per_shift = 0.0
+        # else: # Optional: handle invalid self.batch_frequency value
+            # For example, raise ValueError or log a warning
+            # print(f"Warning: Unknown batch_frequency: {self.batch_frequency}")
+
         shift_cogs_before_output_specific = (
             self.labour_cost_per_shift
             + self.variable_cost_per_shift
             + self.overhead_cost_per_shift
+            + self.batch_test_cost_per_shift  # Added batch test cost
         )
         shift_output_specific_cogs = (
             self.consumables_per_kg_output * self.saleable_kg_per_shift
@@ -698,6 +747,14 @@ class CannabinoidEstimator(param.Parameterized):
         self.processing_data_df = pd.DataFrame(processing_data_dict)
         if hasattr(self, "processing_table"):
             self.processing_table.value = self.processing_data_df
+        
+        if hasattr(self, "profit_weekly"):
+            self.profit_weekly.value = self.net_rev_per_week
+            self.profit_weekly.format = f"${self.net_rev_per_week / 1000:.0f} k"
+        
+        if hasattr(self, "profit_pct"):
+            self.profit_pct.value = self.operating_profit_pct
+            self.profit_pct.format=f"{self.operating_profit_pct * 100.0:.2f}%"
 
     def _get_money_formatters(self):
         return {
@@ -718,14 +775,14 @@ class CannabinoidEstimator(param.Parameterized):
             max_width=input_col_max_width,
         )
         col2 = pn.Column(
-            pn.pane.Markdown("### Biomass parameters"),
+            pn.pane.Markdown("### Biomass parameters", margin=0),
             self.bio_cbx_pct_slider,
             self.bio_cost_slider,
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
         col3 = pn.Column(
-            pn.pane.Markdown("### Consumable rates"),
+            pn.pane.Markdown("### Consumable rates", margin=0),
             self.kwh_rate_slider,
             self.water_cost_per_1000l_slider,
             self.consumables_per_kg_bio_rate_slider,
@@ -733,14 +790,14 @@ class CannabinoidEstimator(param.Parameterized):
             max_width=input_col_max_width,
         )
         col4 = pn.Column(
-            pn.pane.Markdown("### Wholesale details"),
+            pn.pane.Markdown("### Wholesale details", margin=0),
             self.wholesale_cbx_price_slider,
             self.wholesale_cbx_pct_slider,
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
         col5 = pn.Column(
-            pn.pane.Markdown("### Variable costs"),
+            pn.pane.Markdown("### Variable costs", margin=0),
             self.kwh_per_kg_bio_slider,
             self.water_liters_consumed_per_kg_bio_slider,
             self.consumables_per_kg_output_slider,
@@ -748,15 +805,17 @@ class CannabinoidEstimator(param.Parameterized):
             max_width=input_col_max_width,
         )
         col6 = pn.Column(
-            pn.pane.Markdown("### Compliance"),
+            pn.pane.Markdown("### Compliance", margin=0),
             self.batch_test_cost_slider,
-            pn.pane.Markdown("### Overhead"),
+            pn.pane.Markdown("New Batch Every:", margin=0),
+            self.batch_frequency_radio,
+            pn.pane.Markdown("### Overhead", margin=0),
             self.fixed_overhead_per_week_slider,
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
         col8 = pn.Column(
-            pn.pane.Markdown("### Worker Details"),
+            pn.pane.Markdown("### Worker Details", margin=0),
             self.workers_per_shift_slider,
             self.worker_hourly_rate_slider,
             self.managers_per_shift_slider,
@@ -765,7 +824,7 @@ class CannabinoidEstimator(param.Parameterized):
             max_width=input_col_max_width,
         )
         col9 = pn.Column(
-            pn.pane.Markdown("### Shift details"),
+            pn.pane.Markdown("### Shift details", margin=0),
             self.labour_hours_per_shift_slider,
             self.processing_hours_per_shift_slider,
             self.shifts_per_day_slider,
@@ -773,7 +832,12 @@ class CannabinoidEstimator(param.Parameterized):
             sizing_mode="stretch_width",
             max_width=input_col_max_width,
         )
-        
+
+        # input_grid = pn.GridSpec(sizing_mode="stretch_width", max_width=1800, margin=10)
+        # input_grid[0, 0] = col1
+        # input_grid[0, 1] = col2
+        # input_grid[0, 2] = col3
+        # input_grid[0, 3] = col4
         input_grid = pn.FlexBox(
             col1, col2, col3, col4, col5, col8, col9, col6, align_content="normal"
         )
@@ -799,25 +863,30 @@ class CannabinoidEstimator(param.Parameterized):
             max_width=input_col_max_width,
         )
 
-        profit_weekly = pn.indicators.Number(
-            name="Weekly Profit",
-            value=self.net_rev_per_week,
-            format=f"${self.net_rev_per_week / 1000:.0f} k",
-            default_color="green",
-            align="center",
-        )
+        # profit_weekly = pn.indicators.Number(
+        #     name="Weekly Profit",
+        #     value=self.net_rev_per_week,
+        #     format=f"${self.net_rev_per_week / 1000:.0f} k",
+        #     default_color="green",
+        #     align="center",
+        # )
 
-        profit_pct = pn.indicators.Number(
-            name="Operating Profit",
-            value=self.operating_profit_pct,
-            format=f"{self.operating_profit_pct * 100.0:.2f}%",
-            default_color="green",
-            align="center",
-        )
-        
+        # profit_pct = pn.indicators.Number(
+        #     name="Operating Profit",
+        #     value=self.operating_profit_pct,
+        #     format=f"{self.operating_profit_pct * 100.0:.2f}%",
+        #     default_color="green",
+        #     align="center",
+        # )
+
+        # indicator_layout = pn.Column(profit_pct, profit_weekly, align="center")
+
+        # table_grid = pn.GridSpec(sizing_mode="stretch_width", max_width=1800, margin=10)
+        # table_grid[:, 0:2] = tables_layout
+        # table_grid[:, 2] = indicator_layout
         table_grid = pn.FlexBox(
-            profit_weekly,
-            profit_pct,
+            self.profit_weekly,
+            self.profit_pct,
             processing_table_display,
             profit_table_display,
             money_table_display,
@@ -839,6 +908,16 @@ estimator_app = CannabinoidEstimator()
 # pn.config.raw_css = custom_themes.get_base_css(custom_themes.DARK_THEME_VARS)
 estimator_app.view().servable(title="CBx Revenue Estimator")
 
+# Instantiate the template with widgets displayed in the sidebar
+# template = pn.template.FastListTemplate(
+#     title="CBx Revenue Estimator (FastList Panel)",
+#     #theme = custom_themes.DarkTheme,
+#     #sidebar=[freq, phase],
+# )
+
+# template.main.append(estimator_app.view())
+# template.servable()
+
 if __name__ == "__main__":
     pn.serve(
         estimator_app.view(),