mainsequence 2.0.4rc0__py3-none-any.whl → 3.0.2__py3-none-any.whl

mainsequence/dashboards/streamlit/core/theme.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
-import streamlit as st
 from pathlib import Path
+import streamlit as st
 
 
+# --------------------- small theme helpers ---------------------
+
 def inject_css_for_dark_accents():
     st.markdown(
         """
@@ -22,126 +24,173 @@ def explain_theming():
     )
 
 
+# --------------------- spinner frame loader (runs once on import) ---------------------
 
+def _read_txt(p: Path) -> str:
+    return p.read_text(encoding="utf-8").strip()
 
-# --- Load spinner frames ONCE from two levels above, files: image_1_base64.txt ... image_5_base64.txt ---
 def _load_spinner_frames_for_this_template() -> list[str]:
-    base_dir = Path(__file__).resolve().parent.parent
-    frames: list[str] = []
-    for i in range(1, 6):
-        p = base_dir / f"assets/image_{i}_base64.txt"
-        if not p.exists():
-            raise FileNotFoundError(f"Missing spinner frame file: {p}")
-        frames.append(p.read_text(encoding="utf-8").strip())
-    return frames
-
-
-_SPINNER_FRAMES_RAW = _load_spinner_frames_for_this_template()
+    """
+    Looks under: <repo>/mainsequence/dashboards/streamlit/assets/
+
+    Order of precedence:
+      1) image_1_base64.txt ... image_5_base64.txt
+      2) image_base64.txt  (single file, replicated to 5 frames)
+      3) spinner_1.txt ... spinner_5.txt
+      4) Any *base64.txt (sorted) or *.txt (sorted), up to 5 frames
+         - If only one file is found, it is replicated to 5 frames.
+         - If 2-4 files are found, the last one is repeated to reach 5.
+    On total failure, returns five copies of a 1x1 transparent PNG.
+    """
+    assets = Path(__file__).resolve().parent.parent / "assets"
+
+    # 1) Named sequence: image_1_base64.txt .. image_5_base64.txt
+    seq = [assets / f"image_{i}_base64.txt" for i in range(1, 6)]
+    if all(p.exists() for p in seq):
+        return [_read_txt(p) for p in seq]
+
+    # 2) Single file replicated
+    single = assets / "image_base64.txt"
+    if single.exists():
+        s = _read_txt(single)
+        return [s] * 5
+
+    # 3) Alternate sequence
+    alt_seq = [assets / f"spinner_{i}.txt" for i in range(1, 6)]
+    if all(p.exists() for p in alt_seq):
+        return [_read_txt(p) for p in alt_seq]
+
+    # 4) Any *base64.txt, then any *.txt
+    candidates = sorted(assets.glob("*base64.txt")) or sorted(assets.glob("*.txt"))
+    frames = [_read_txt(p) for p in candidates[:5]]
+    if frames:
+        if len(frames) == 1:
+            frames = frames * 5
+        elif len(frames) < 5:
+            frames += [frames[-1]] * (5 - len(frames))
+        return frames
+
+    # Fallback: 1x1 transparent PNG
+    transparent_png = ("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8"
+                       "/w8AAn8B9p7u3t8AAAAASUVORK5CYII=")
+    return [transparent_png] * 5
+
+try:
+    _SPINNER_FRAMES_RAW = _load_spinner_frames_for_this_template()
+except Exception:
+    # Never break import due to spinner assets
+    transparent_png = ("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8"
+                       "/w8AAn8B9p7u3t8AAAAASUVORK5CYII=")
+    _SPINNER_FRAMES_RAW = [transparent_png] * 5
+
+# Public constants (used only within this module, but left as globals for clarity)
+IMAGE_1_B64, IMAGE_2_B64, IMAGE_3_B64, IMAGE_4_B64, IMAGE_5_B64 = _SPINNER_FRAMES_RAW
 
 
-# Expose constants for the function (keeps the code below simple)
-IMAGE_1_B64, IMAGE_2_B64, IMAGE_3_B64, IMAGE_4_B64, IMAGE_5_B64 = _SPINNER_FRAMES_RAW
+# --------------------- spinner override (CSS only) ---------------------
 
 def override_spinners(
     hide_deploy_button: bool = False,
     *,
     # Sizes
-    top_px: int = 35,          # top-right toolbar & st.status icon base size
-    inline_px: int = 288,       # animation size when centered
+    top_px: int = 20,          # top-right toolbar spinner size
+    inline_px: int = 96,       # inline/status spinner size
     # Timing
     duration_ms: int = 900,
-    # Toolbar nudges / spacing
-    toolbar_nudge_px: int = -3,
+    # Toolbar micro-positioning
+    toolbar_nudge_px: int = -2,
     toolbar_gap_left_px: int = 2,
     toolbar_left_offset_px: int = 0,
-    # Centered overlay styling
-    center_non_toolbar: bool = True,        # << keep True to center inline + status
-    dim_backdrop: bool = True,              # << set False to hide the dark veil
-    overlay_blur_px: float = 1.5,
-    overlay_opacity: float = 0.35,
-    overlay_z_index: int = 9990,            # keep below toolbar; we also lift toolbar above
+    # Overlay options (for inline/status)
+    center_non_toolbar: bool = True,
+    dim_backdrop: bool = False,
+    overlay_blur_px: float = 0.0,
+    overlay_opacity: float = 0.0,
+    overlay_z_index: int = 9990,
 ) -> None:
-    """Override Streamlit spinners with a 4-frame animation.
-    - Toolbar spinner stays in the toolbar (top-right).
-    - All other spinners (inline + st.status icon) are centered on screen.
+    """Replace Streamlit's spinners with a 5‑frame bitmap animation.
+
+    This injects CSS only (no JS). It hides native SVGs and applies the frames
+    to the toolbar spinner, inline st.spinner, and st.status icon.
     """
 
-    def as_data_uri(s: str, mime="image/png") -> str:
-        s = s.strip()
+    def as_data_uri(s: str, mime: str = "image/png") -> str:
+        s = (s or "").strip()
         return s if s.startswith("data:") else f"data:{mime};base64,{s}"
 
     i1 = as_data_uri(IMAGE_1_B64)
     i2 = as_data_uri(IMAGE_2_B64)
     i3 = as_data_uri(IMAGE_3_B64)
     i4 = as_data_uri(IMAGE_4_B64)
-    i5= as_data_uri(IMAGE_5_B64)
-
-    veil_bg = f"rgba(0,0,0,{overlay_opacity})"
+    i5 = as_data_uri(IMAGE_5_B64)
 
     st.markdown(f"""
 <style>
-/* ---- 4-frame animation ---- */
-@keyframes st-fourframe {{
-  0%% {{ background-image:url("{i1}"); }}
-  20%      {{ background-image:url("{i2}"); }}
-  40%      {{ background-image:url("{i3}"); }}
-  60%      {{ background-image:url("{i4}"); }}
-   80% {{ background-image:url("{i5}"); }}
-      100% {{ background-image:url("{i5}"); }}
+/* ===== 5-frame animation (fixed: do NOT use '0%%') ===== */
+@keyframes st-fiveframe {{
+  0%  {{ background-image:url("{i1}"); }}
+  20% {{ background-image:url("{i2}"); }}
+  40% {{ background-image:url("{i3}"); }}
+  60% {{ background-image:url("{i4}"); }}
+  80% {{ background-image:url("{i5}"); }}
+  100%{{ background-image:url("{i5}"); }}
 }}
 
-/* ---- CSS variables ---- */
 :root {{
-  --st-spin-top:{top_px}px;                 /* toolbar/status base size */
-  --st-spin-inline:{inline_px}px;           /* centered spinner size */
+  --st-spin-top:{top_px}px;
+  --st-spin-inline:{inline_px}px;
   --st-spin-dur:{duration_ms}ms;
 
-  --st-spin-toolbar-nudge:{toolbar_nudge_px}px;
-  --st-spin-toolbar-gap:{toolbar_gap_left_px}px;
-  --st-spin-toolbar-left:{toolbar_left_offset_px}px;
+  --st-toolbar-nudge:{toolbar_nudge_px}px;
+  --st-toolbar-gap:{toolbar_gap_left_px}px;
+  --st-toolbar-left:{toolbar_left_offset_px}px;
 
   --st-overlay-z:{overlay_z_index};
-  --st-overlay-bg:{veil_bg};
+  --st-overlay-bg: rgba(0,0,0,{overlay_opacity});
   --st-overlay-blur:{overlay_blur_px}px;
 }}
 
-/* Lift toolbar above any overlay so Stop/Deploy remain clickable */
+/* ===== ensure toolbar itself stays clickable above overlays ===== */
 div[data-testid="stToolbar"],
 [data-testid="stStatusWidget"] {{
   position: relative;
   z-index: calc(var(--st-overlay-z) + 5);
 }}
 
-/* =======================================================================
-   1) Top-right toolbar widget  (kept in place, not centered)
-   ======================================================================= */
+/* ===== hide every built-in spinner glyph (SVG/img) ===== */
+[data-testid="stSpinner"] svg,
+[data-testid="stSpinnerIcon"] svg,
+[data-testid="stStatusWidget"] svg,
+header [data-testid="stSpinner"] svg {{
+  display: none !important;
+}}
+
+/* ===== toolbar spinner (top-right) ===== */
 [data-testid="stStatusWidget"] {{
   position:relative;
-  padding-left: calc(var(--st-spin-top) + var(--st-spin-toolbar-gap));
+  padding-left: calc(var(--st-spin-top) + var(--st-toolbar-gap));
 }}
-[data-testid="stStatusWidget"] svg,
-[data-testid="stStatusWidget"] img {{ display:none !important; }}
 [data-testid="stStatusWidget"]::before {{
   content:"";
   position:absolute;
-  left: var(--st-spin-toolbar-left);
+  left: var(--st-toolbar-left);
   top:50%;
-  transform:translateY(-50%) translateY(var(--st-spin-toolbar-nudge));
+  transform: translateY(calc(-50% + var(--st-toolbar-nudge)));
   width:var(--st-spin-top);
   height:var(--st-spin-top);
-  background:no-repeat center/contain;
-  animation:st-fourframe var(--st-spin-dur) linear infinite;
+  background-image:url("{i1}");
+  background-repeat:no-repeat;
+  background-position:center center;
+  background-size:contain;
+  animation: st-fiveframe var(--st-spin-dur) steps(1, end) infinite;
 }}
 
-/* Hide the entire toolbar if requested */
+/* Optionally hide Deploy/Stop toolbar entirely */
 {"div[data-testid='stToolbar']{display:none !important;}" if hide_deploy_button else ""}
 
-/* =======================================================================
-   2) Inline spinner (st.spinner) — centered overlay
-   ======================================================================= */
-[data-testid="stSpinner"] svg {{ display:none !important; }}
+/* ===== inline st.spinner ===== */
 [data-testid="stSpinner"] {{
-  min-height: 0 !important;  /* avoid layout jump, since we center globally */
+  min-height: 0 !important;
 }}
 { "[data-testid='stSpinner']::after { content:''; position:fixed; inset:0; background:var(--st-overlay-bg); backdrop-filter: blur(var(--st-overlay-blur)); z-index: var(--st-overlay-z); pointer-events: none; }" if dim_backdrop else "" }
 [data-testid="stSpinner"]::before {{
@@ -152,61 +201,31 @@ div[data-testid="stToolbar"],
   transform: translate(-50%,-50%);
   width: var(--st-spin-inline);
   height: var(--st-spin-inline);
-  background:no-repeat center/contain;
-  animation:st-fourframe var(--st-spin-dur) linear infinite;
+  background-image:url("{i1}");
+  background-repeat:no-repeat;
+  background-position:center center;
+  background-size:contain;
+  animation: st-fiveframe var(--st-spin-dur) steps(1, end) infinite;
   z-index: calc(var(--st-overlay-z) + 1);
 }}
 
-/* Center the spinner message below the animation (works in sidebar or main) */
-[data-testid="stSpinner"] [data-testid="stSpinnerMessage"],
-[data-testid="stSpinner"] > div > div:last-child,
-[data-testid="stSpinner"] > div > div:only-child {{
-  position: fixed !important;
-  left: 50% !important;
-  top: calc(50% + var(--st-spin-inline) / 2 + 12px) !important;
-  transform: translateX(-50%) !important;
-  z-index: calc(var(--st-overlay-z) + 2) !important;
-  text-align: center !important;
-  margin: 0 !important;
-  padding: .25rem .75rem !important;
-  max-width: min(80vw, 900px) !important;  /* keeps long text from stretching off-screen */
-  white-space: normal !important;          /* use `nowrap` if you prefer single-line */
-  font-weight: 500 !important;
-}}
-
-/* Kill the tiny default glyph wrapper so you don't get a stray dot in the sidebar */
-[data-testid="stSpinner"] > div > div:first-child {{
-  display: none !important; 
-}}
-
-/* We still hide the default SVG everywhere */
-[data-testid="stSpinner"] svg {{
-  display: none !important; 
-}}
-
-/* =======================================================================
-   3) st.status(...) icon — centered overlay
-   ======================================================================= */
-[data-testid="stStatus"] [data-testid="stStatusIcon"] svg,
-[data-testid="stStatus"] [data-testid="stStatusIcon"] img {{ display:none !important; }}
-{"[data-testid='stStatus']::after { content:''; position:fixed; inset:0; background:var(--st-overlay-bg); backdrop-filter: blur(var(--st-overlay-blur)); z-index: var(--st-overlay-z); pointer-events: none; }" if dim_backdrop else ""}
+/* ===== st.status(...) icon ===== */
+[data-testid="stStatus"] [data-testid="stStatusIcon"] svg {{ display:none !important; }}
+{ "[data-testid='stStatus']::after { content:''; position:fixed; inset:0; background:var(--st-overlay-bg); backdrop-filter: blur(var(--st-overlay-blur)); z-index: var(--st-overlay-z); pointer-events: none; }" if dim_backdrop else "" }
 [data-testid="stStatus"] [data-testid="stStatusIcon"]::before {{
   content:"";
   position: fixed;
   left: 50%;
   top: 50%;
   transform: translate(-50%,-50%);
-  width: var(--st-spin-inline);             /* use same size as inline */
+  width: var(--st-spin-inline);
   height: var(--st-spin-inline);
-  background:no-repeat center/contain;
-  animation:st-fourframe var(--st-spin-dur) linear infinite;
+  background-image:url("{i1}");
+  background-repeat:no-repeat;
+  background-position:center center;
+  background-size:contain;
+  animation: st-fiveframe var(--st-spin-dur) steps(1, end) infinite;
   z-index: calc(var(--st-overlay-z) + 1);
 }}
-
-/* Optional: allow 'esc' feel without blocking clicks — achieved via pointer-events:none above. */
 </style>
     """, unsafe_allow_html=True)
-
-
-
-

mainsequence/dashboards/streamlit/scaffold.py

@@ -10,6 +10,9 @@ from importlib.resources import files as _pkg_files
 import sys
 import os
 
+
+
+
 def _detect_app_dir() -> Path:
     """
     Best-effort detection of the directory that contains the running Streamlit app.

mainsequence/instruments/__init__.py

@@ -1,2 +1,2 @@
-from .constants import *
+
 from .instruments import *

mainsequence/instruments/data_interface/__init__.py

@@ -4,7 +4,7 @@ from mainsequence.client import Constant as _C
 import os
 
 def _make_backend():
-    backend = os.getenv("MSI_DATA_BACKEND", "mock").lower()
+    backend = os.getenv("MSI_DATA_BACKEND", "mainsequence").lower()
     return MSInterface() if backend == "mainsequence" else MockDataInterface()
 
 # export a single, uniform instance

mainsequence/instruments/data_interface/data_interface.py

@@ -9,8 +9,9 @@ import pandas as pd
 from pathlib import Path
 
 
-DISCOUNT_CURVES_TABLE=msc.Constant.get_or_none(name="DISCOUNT_CURVES_TABLE")
-REFERENCE_RATES_FIXING_TABLE = msc.Constant.get_or_none(name="REFERENCE_RATES_FIXING_TABLE")
+
+DISCOUNT_CURVES_TABLE=msc.Constant.get_value(name="DISCOUNT_CURVES_TABLE")
+REFERENCE_RATES_FIXING_TABLE = msc.Constant.get_value(name="REFERENCE_RATES_FIXING_TABLE")
 
 assert DISCOUNT_CURVES_TABLE is not None, "DISCOUNT_CURVES_TABLE not found in constants"
 assert REFERENCE_RATES_FIXING_TABLE is not None, "REFERENCE_RATES_FIXING_TABLE not found in constants"
@@ -287,20 +288,22 @@ class MSInterface():
     @cachedmethod(cache=attrgetter("_curve_cache"), lock=attrgetter("_curve_cache_lock"))
     def get_historical_discount_curve(self, curve_name, target_date):
         from mainsequence.tdag import APIDataNode
+        from mainsequence.logconf import logger
         data_node = APIDataNode.build_from_identifier(identifier=DISCOUNT_CURVES_TABLE)
 
 
 
         # for test purposes only get lats observations
-        update_statistics = data_node.get_update_statistics()
-        target_date = update_statistics.asset_time_statistics[curve_name]
-        print("REMOVE ABOCVE ONLU FOR TESTING")
+        use_last_observation=os.environ.get("USE_LAST_OBSERVATION_MS_INSTRUMENT","true").lower()=="true"
+        if use_last_observation:
+            update_statistics = data_node.get_update_statistics()
+            target_date = update_statistics.asset_time_statistics[curve_name]
+            logger.warning("Curve is using last observation")
 
 
-        try:
-            limit = target_date + datetime.timedelta(days=1)
-        except Exception as e:
-            raise e
+    
+        limit = target_date + datetime.timedelta(days=1)
+       
 
 
 
@@ -336,19 +339,36 @@ class MSInterface():
         :return:
         """
         from mainsequence.tdag import APIDataNode
-        from mainsequence.instruments.settings import REFERENCE_RATES_FIXING_TABLE
+        from mainsequence.logconf import logger
+        import pytz  # patch
 
         data_node = APIDataNode.build_from_identifier(identifier=REFERENCE_RATES_FIXING_TABLE)
 
-        import pytz  # patch
         start_date = datetime.datetime(2024, 9, 10, tzinfo=pytz.utc)
         end_date=datetime.datetime(2025, 9, 17, tzinfo=pytz.utc)
+        
+        
+        
 
         fixings_df = data_node.get_ranged_data_per_asset(
             range_descriptor={reference_rate_uid: {"start_date": start_date, "start_date_operand": ">=",
                                                    "end_date": end_date, "end_date_operand": "<=", }}
         )
         if fixings_df.empty:
+
+            use_last_observation = os.environ.get("USE_LAST_OBSERVATION_MS_INSTRUMENT", "true").lower() == "true"
+            if use_last_observation:
+                logger.warning("Fixings are using last observation and filled forward")
+                fixings_df = data_node.get_ranged_data_per_asset(
+                    range_descriptor={reference_rate_uid: {"start_date": datetime.datetime(1900,1,1,tzinfo=pytz.utc),
+                                                           "start_date_operand": ">=",
+                                                           }}
+
+
+                )
+                
+                a=5
+            
             raise Exception(f"{reference_rate_uid} has not data between {start_date} and {end_date}.")
         fixings_df = fixings_df.reset_index().rename(columns={"time_index": "date"})
         fixings_df["date"] = fixings_df["date"].dt.date

mainsequence/instruments/instruments/bond.py

@@ -40,6 +40,10 @@ class Bond(InstrumentModel):
     settlement_days: int = Field(default=2)
     schedule: Optional[QSchedule] = Field(None)
 
+    benchmark_rate_index_name: Optional[str] = Field(...,description="A default index benchmark rate, helpful when doing"
+                                                                     "analysis and we want to  map the bond to a bencharmk for example to"
+                                                                     "the SOFR Curve or to de US Treasury curve etc")
+
     model_config = {"arbitrary_types_allowed": True}
 
     _bond: Optional[ql.Bond] = PrivateAttr(default=None)
@@ -279,11 +283,15 @@ class FixedRateBond(Bond):
     """Plain-vanilla fixed-rate bond following the shared Bond lifecycle."""
 
     coupon_rate: float = Field(...)
+
     # Optional market curve if you want to discount off a curve instead of a flat yield
     discount_curve: Optional[ql.YieldTermStructureHandle] = Field(default=None)
 
     model_config = {"arbitrary_types_allowed": True}
 
+    def reset_curve(self, curve: ql.YieldTermStructureHandle) -> None:
+        self.discount_curve = curve
+    
     def _get_default_discount_curve(self) -> Optional[ql.YieldTermStructureHandle]:
         return self.discount_curve
 

mainsequence/instruments/pricing_models/indices.py

@@ -48,8 +48,8 @@ def clear_index_cache() -> None:
 # No tenor tokens; we store the QuantLib Period directly.
 
 INDEX_CONFIGS: Dict[str, Dict] = {
-    _C.get_value(name="TIIE_28_UID"): dict(
-        curve_uid=_C.get_value(name="TIIE_28_ZERO_CURVE"),
+    _C.get_value(name="REFERENCE_RATE__TIIE_28"): dict(
+        curve_uid=_C.get_value(name="ZERO_CURVE__VALMER_TIIE_28"),
         calendar=(ql.Mexico() if hasattr(ql, "Mexico") else ql.TARGET()),
         day_counter=ql.Actual360(),
         currency=(ql.MXNCurrency() if hasattr(ql, "MXNCurrency") else ql.USDCurrency()),
@@ -58,8 +58,8 @@ INDEX_CONFIGS: Dict[str, Dict] = {
         bdc=ql.ModifiedFollowing,
         end_of_month=False,
     ),
-    _C.get_value(name="TIIE_91_UID"): dict(
-        curve_uid=_C.get_value(name="TIIE_28_ZERO_CURVE"),
+    _C.get_value(name="REFERENCE_RATE__TIIE_91"): dict(
+        curve_uid=_C.get_value(name="ZERO_CURVE__VALMER_TIIE_28"),
         calendar=(ql.Mexico() if hasattr(ql, "Mexico") else ql.TARGET()),
         day_counter=ql.Actual360(),
         currency=ql.MXNCurrency(),
@@ -68,8 +68,8 @@ INDEX_CONFIGS: Dict[str, Dict] = {
         bdc=ql.ModifiedFollowing,
         end_of_month=False,
     ),
-    _C.get_value(name="TIIE_182_UID"): dict(
-        curve_uid=_C.get_value(name="TIIE_28_ZERO_CURVE"),
+    _C.get_value(name="REFERENCE_RATE__TIIE_182"): dict(
+        curve_uid=_C.get_value(name="ZERO_CURVE__VALMER_TIIE_28"),
         calendar=(ql.Mexico() if hasattr(ql, "Mexico") else ql.TARGET()),
         day_counter=ql.Actual360(),
         currency=ql.MXNCurrency(),
@@ -79,8 +79,8 @@ INDEX_CONFIGS: Dict[str, Dict] = {
         end_of_month=False,
     ),
     # Add more identifiers here as needed.
-    _C.get_value(name="TIIE_OVERNIGHT_UID"): dict(
-        curve_uid=_C.get_value(name="TIIE_28_ZERO_CURVE"),
+    _C.get_value(name="REFERENCE_RATE__TIIE_OVERNIGHT"): dict(
+        curve_uid=_C.get_value(name="ZERO_CURVE__VALMER_TIIE_28"),
         calendar=(ql.Mexico() if hasattr(ql, "Mexico") else ql.TARGET()),
         day_counter=ql.Actual360(),
         currency=ql.MXNCurrency(),
@@ -89,8 +89,8 @@ INDEX_CONFIGS: Dict[str, Dict] = {
         bdc=ql.ModifiedFollowing,
         end_of_month=False,
     ),
-    _C.get_value(name="CETE_28_UID"): dict(
-        curve_uid=_C.get_value(name="M_BONOS_ZERO_CURVE"),
+    _C.get_value(name="REFERENCE_RATE__CETE_28"): dict(
+        curve_uid=_C.get_value(name="ZERO_CURVE__BANXICO_M_BONOS_OTR"),
         calendar=(ql.Mexico() if hasattr(ql, "Mexico") else ql.TARGET()),
         day_counter=ql.Actual360(),  # BONOS accrue on Act/360
         currency=ql.MXNCurrency(),
@@ -99,8 +99,8 @@ INDEX_CONFIGS: Dict[str, Dict] = {
         bdc=ql.Following,  # “next banking business day” => Following
         end_of_month=False,  # Irrelevant when scheduling by days
     ),
-    _C.get_value(name="CETE_91_UID"): dict(
-        curve_uid=_C.get_value(name="M_BONOS_ZERO_CURVE"),
+    _C.get_value(name="REFERENCE_RATE__CETE_91"): dict(
+        curve_uid=_C.get_value(name="ZERO_CURVE__BANXICO_M_BONOS_OTR"),
         calendar=(ql.Mexico() if hasattr(ql, "Mexico") else ql.TARGET()),
         day_counter=ql.Actual360(),  # BONOS accrue on Act/360
         currency=ql.MXNCurrency(),
@@ -110,8 +110,8 @@ INDEX_CONFIGS: Dict[str, Dict] = {
         end_of_month=False,  # Irrelevant when scheduling by days
     ),
 
-    _C.get_value(name="CETE_182_UID"): dict(
-        curve_uid=_C.get_value(name="M_BONOS_ZERO_CURVE"),
+    _C.get_value(name="REFERENCE_RATE__CETE_182"): dict(
+        curve_uid=_C.get_value(name="ZERO_CURVE__BANXICO_M_BONOS_OTR"),
         calendar=(ql.Mexico() if hasattr(ql, "Mexico") else ql.TARGET()),
         day_counter=ql.Actual360(),  # BONOS accrue on Act/360
         currency=ql.MXNCurrency(),
@@ -120,6 +120,18 @@ INDEX_CONFIGS: Dict[str, Dict] = {
         bdc=ql.Following,  # “next banking business day” => Following
         end_of_month=False,  # Irrelevant when scheduling by days
     ),
+
+
+    _C.get_value(name="REFERENCE_RATE__USD_SOFR"): dict(
+        curve_uid=_C.get_value(name="ZERO_CURVE__UST_CMT_ZERO_CURVE_UID"),
+        calendar=ql.UnitedStates(ql.UnitedStates.FederalReserve),
+        day_counter=ql.Actual360(),
+        currency=ql.USDCurrency(),
+        period=ql.Period(6, ql.Months),  # Semiannual coupons
+        settlement_days=1,  # T+1
+        bdc=ql.ModifiedFollowing,
+        end_of_month=False,  # Irrelevant when scheduling by days
+    ),
 }