dfm-python 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

dfm_python/__init__.py

@@ -34,7 +34,7 @@ Example (High-level API - Recommended):
     
 Example (Low-level API - For advanced usage):
     >>> from dfm_python import DFM, DFMConfig, SeriesConfig
-    >>> from dfm_python.data_loader import load_data
+    >>> from dfm_python.data import load_data  # Preferred import
     >>> # Option 1: Load from YAML
     >>> config = load_config('config.yaml')
     >>> # Option 2: Create directly
@@ -50,7 +50,7 @@ Example (Low-level API - For advanced usage):
 For detailed documentation, see the README.md file and the tutorial notebooks/scripts.
 """
 
-__version__ = "0.2.4"
+__version__ = "0.2.5"
 
 from .config import DFMConfig, SeriesConfig, BlockConfig, Params, DEFAULT_GLOBAL_BLOCK_NAME
 from .config import (
@@ -62,62 +62,19 @@ from .config import (
     MergedConfigSource,
     make_config_source,
 )
-from .data_loader import transform_data
-from .dfm import DFMResult, calculate_rmse, diagnose_series, print_series_diagnosis
+from .data import transform_data
+from .dfm import DFMResult
+from .core import calculate_rmse, diagnose_series, print_series_diagnosis
 from .dfm import DFM as _DFMCore  # Core DFM class from dfm.py
 from .kalman import run_kf, skf, fis, miss_data
 from .news import update_nowcast, news_dfm, para_const
 
 # Import high-level API (extends core DFM with convenience methods)
-from .api import DFM, _dfm_instance, from_yaml, from_spec, from_spec_df, from_dict
-
-# Module-level API: expose singleton instance methods and properties
-# This allows: import dfm_python as dfm; dfm.load_config(...); dfm.result
-def load_config(
-    source=None,
-    *,
-    yaml=None,
-    mapping=None,
-    spec=None,
-    hydra=None,
-    base=None,
-    override=None,
-    config=None,
-):
-    """Load configuration (module-level convenience function).
-    
-    See DFM.load_config() for parameter documentation.
-    """
-    return _dfm_instance.load_config(
-        source=source,
-        yaml=yaml,
-        mapping=mapping,
-        spec=spec,
-        hydra=hydra,
-        base=base,
-        override=override,
-        config=config,
-    )
-
-def load_data(data_path=None, data=None, **kwargs):
-    """Load data (module-level convenience function)."""
-    return _dfm_instance.load_data(data_path=data_path, data=data, **kwargs)
-
-def train(threshold=None, max_iter=None, **kwargs):
-    """Train the model (module-level convenience function)."""
-    return _dfm_instance.train(threshold=threshold, max_iter=max_iter, **kwargs)
-
-def predict(horizon=12, **kwargs):
-    """Forecast using the trained model (module-level convenience function)."""
-    return _dfm_instance.predict(horizon=horizon, **kwargs)
-
-def plot(**kwargs):
-    """Plot common visualizations (module-level convenience function)."""
-    return _dfm_instance.plot(**kwargs)
-
-def reset():
-    """Reset state (module-level convenience function)."""
-    return _dfm_instance.reset()
+# Import module-level convenience functions directly from api.py to avoid duplication
+from .api import (
+    DFM, _dfm_instance, from_yaml, from_spec, from_spec_df, from_dict,
+    load_config, load_data, train, predict, plot, reset
+)
 
 # Expose properties as module-level attributes
 # Use property-like access via functions or direct attribute access

dfm_python/api.py

@@ -23,7 +23,7 @@ import numpy as np
 import pandas as pd
 
 from .config import DFMConfig, Params
-from .data_loader import load_data as _load_data
+from .data import load_data as _load_data
 from .config import (
     make_config_source,
     ConfigSource,
@@ -272,7 +272,7 @@ class DFM(_DFMCore):
         if forecast_horizon is not None and forecast_horizon > 0:
             Z_fore = self.predict(forecast_horizon, return_series=False, return_factors=True)
             # Build forecast dates
-            last_date = time_hist[-1]
+            last_date = time_hist.iloc[-1] if hasattr(time_hist, 'iloc') else time_hist[-1]
             # Use same monthly-end spacing; if freq missing, fallback to monthly-end
             try:
                 forecast_dates = pd.date_range(start=last_date + pd.tseries.frequencies.to_offset('ME'),
@@ -390,7 +390,7 @@ def from_spec(spec_path: Union[str, Path], params: Optional[Params] = None) -> D
 
 def from_spec_df(spec_df: pd.DataFrame, params: Optional[Params] = None) -> DFM:
     """Load configuration from spec DataFrame (convenience constructor)."""
-    from .data_loader import _load_config_from_dataframe
+    from .data import _load_config_from_dataframe
     
     if params is None:
         params = Params()
@@ -414,7 +414,7 @@ def from_dict(mapping: Dict[str, Any]) -> DFM:
 
 # Expose singleton instance for direct access
 # Users can access: dfm.config, dfm.data, dfm.result, etc.
-__all__ = ['DFM', 'load_config', 'load_data', 'train', 'reset', 
+__all__ = ['DFM', 'load_config', 'load_data', 'train', 'predict', 'plot', 'reset', 
            'from_yaml', 'from_spec', 'from_spec_df', 'from_dict']