fix: clarify signup for 2FA, simulation progress bar

Author: MadeInPierre

examples/full_example.py

@@ -501,7 +501,7 @@
         hide_amounts=False,
         hide_root=False,
         show_data=False,
-        check_budget=True,
+        check_budget=False,
         sidecars=[
             Sidecar("[ideal]", "[delta]", render_folders=False),
             Sidecar("[delta]", render_folders=False),

finalynx/assistant.py

@@ -31,6 +31,7 @@
 from rich.columns import Columns
 from rich.console import Console
 from rich.panel import Panel
+from rich.progress import track
 from rich.text import Text
 from rich.tree import Tree
 
@@ -282,7 +283,7 @@ def simulate(self) -> Tree:
         if not (self.simulation and self._timeline and not self._timeline.is_finished):
             raise ValueError("Nothing to simulate, have you added events?")
 
-        console.log(f"Running simulation until {self._timeline.end_date}...")
+        console.log("Launching simulation...")
         tree = Tree("\n[bold]Worth", guide_style=TH().TREE_BRANCH)
 
         # Utility function to append a new formatted line to the tree
@@ -291,13 +292,16 @@ def append_worth(year: int, amount: float) -> None:
 
         # Run the simulation and append the results to the tree every `step_years`
         append_worth(date.today().year, self.portfolio.get_amount())
-        for year in range(
-            date.today().year + self.simulation.step_years,
-            self._timeline.end_date.year,
-            self.simulation.step_years,
+        for year in track(
+            range(date.today().year + 1, self._timeline.end_date.year),
+            description=f"Simulating until [{TH().ACCENT} bold]{self._timeline.end_date}[/]...",
         ):
             self._timeline.goto(date(year, 12, 31))
-            append_worth(year, self.portfolio.get_amount())
+
+            if (year - date.today().year) % self.simulation.step_years == 0:
+                append_worth(year, self.portfolio.get_amount())
+
+        # Run until the end date and append the final result
         self._timeline.run()
         append_worth(self._timeline.current_date.year, self.portfolio.get_amount())
         console.log(f"    Portfolio will be worth [{TH().ACCENT}]{self.portfolio.get_amount():.0f} €[/]")

finalynx/fetch/source_finary.py

@@ -122,7 +122,13 @@ def _authenticate(self) -> Optional[Session]:
 
         # Login to Finary with the existing cookies file or credentials in environment variables and retrieve data
         if os.environ.get("FINARY_EMAIL") and os.environ.get("FINARY_PASSWORD"):
-            with console.status(f"[bold {TH().ACCENT}]Signing in to Finary...", spinner_style=TH().ACCENT):
+            self._log("Signing in to Finary...")
+            with console.status(
+                f"""[bold {TH().ACCENT}]Signing in to Finary...[/]  """
+                """[dim white](Type your 2FA code if prompted and press [italic]Enter[/], """
+                """it will remain invisible while you type)""",
+                spinner_style=TH().ACCENT,
+            ):
                 result = ff.signin()
                 self._log("Signed in to Finary.")
 

finalynx/simulator/timeline.py

@@ -7,8 +7,6 @@
 from typing import Optional
 
 from finalynx.analyzer.investment_state import AnalyzeInvestmentStates
-from finalynx.config import get_active_theme as TH
-from finalynx.console import console
 from finalynx.portfolio.bucket import Bucket
 from finalynx.portfolio.envelope import EnvelopeState
 from finalynx.portfolio.folder import Portfolio
@@ -80,14 +78,13 @@ def run(self) -> None:
 
     def goto(self, target_date: date) -> None:
         """Step until the target date is reached (in the future or past)."""
-        with console.status(f"[bold {TH().ACCENT}]Moving timeline until {target_date}...", spinner_style=TH().ACCENT):
-            if target_date == self.current_date:
-                return
-            elif target_date > self.current_date:
-                self.step_until(target_date)
-            else:
-                self.unstep_until(target_date)
-            self.current_date = target_date
+        if target_date == self.current_date:
+            return
+        elif target_date > self.current_date:
+            self.step_until(target_date)
+        else:
+            self.unstep_until(target_date)
+        self.current_date = target_date
 
     def step_until(self, target_date: date) -> None:
         """Execute all events until the specified date is reached."""