datfid 0.1.16__tar.gz → 0.1.17__tar.gz

{datfid-0.1.16 → datfid-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datfid
-Version: 0.1.16
+Version: 0.1.17
 Summary: SDK to access the DATFID API hosted on Hugging Face Spaces
 Author: DATFID
 Author-email: igor.schapiro@datfid.com

{datfid-0.1.16 → datfid-0.1.17}/datfid/client.py

@@ -9,6 +9,35 @@ import gc
 import psutil
 import logging
 
+# for nice output
+class FitResult(SimpleNamespace):
+    _ROW4  = ["Estimate", "Standard Error", "T statistic", "P value"]
+    _PERF5 = ["R2 within", "R2 between", "R2 overall", "MSE", "MAE"]
+
+    @staticmethod
+    def _df4(rows_list):
+        if not isinstance(rows_list, list):
+            return rows_list
+        return pd.DataFrame(rows_list, index=FitResult._ROW4[:len(rows_list)])
+
+    @staticmethod
+    def _df_perf(rows_list):
+        if not isinstance(rows_list, list):
+            return rows_list
+        return pd.DataFrame(rows_list, index=FitResult._PERF5[:len(rows_list)])
+
+    def __init__(self, **kwargs):
+        # Convert list→DataFrame for table-like fields
+        if "alpha" in kwargs:
+            kwargs["alpha"] = self._df4(kwargs["alpha"])
+        if "beta" in kwargs:
+            kwargs["beta"] = self._df4(kwargs["beta"])
+        if "Performance" in kwargs:
+            kwargs["Performance"] = self._df_perf(kwargs["Performance"])
+        if "df" in kwargs and isinstance(kwargs["df"], list):
+            kwargs["df"] = pd.DataFrame(kwargs["df"])
+        super().__init__(**kwargs)
+
 class DATFIDClient:
     def __init__(self, token: str):
         self.api_url = "https://datfid-org-datfid-sdk.hf.space/"
@@ -54,7 +83,7 @@ class DATFIDClient:
         current_features: Optional[list] = None,
         filter_by_significance: bool = False,
         meanvar_test: bool = False
-    ) -> SimpleNamespace:
+    ) -> FitResult:
         """
         Fit a model using the DATFID API.
         
@@ -99,8 +128,8 @@ class DATFIDClient:
             raise Exception(f"Model fit failed: {response.text}")
             
         result_dict = response.json()
-        return SimpleNamespace(**result_dict)
-
+        return FitResult(**result_dict)
+    
     def forecast_model(
         self,
         df_forecast: pd.DataFrame
@@ -156,7 +185,7 @@ class DATFIDClient:
         current_features: Optional[list] = None,
         filter_by_significance: bool = False,
         meanvar_test: bool = False
-    ) -> Dict[str, SimpleNamespace]:
+    ) -> Dict[str, FitResult]:
         """
         Fit a model individual by individual using the DATFID API.
         
@@ -202,7 +231,7 @@ class DATFIDClient:
             
         raw = response.json()  # { "<id>": { ... per-id result ... }, ... }
         # Wrap each per-id result into a SimpleNamespace for dot access:
-        result_per_id = {str(k): SimpleNamespace(**v) for k, v in raw.items()}
+        result_per_id = {str(k): FitResult(**v) for k, v in raw.items()}
         return result_per_id  # Dict[str, SimpleNamespace]
 
     def forecast_model_ind(

{datfid-0.1.16 → datfid-0.1.17}/datfid.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datfid
-Version: 0.1.16
+Version: 0.1.17
 Summary: SDK to access the DATFID API hosted on Hugging Face Spaces
 Author: DATFID
 Author-email: igor.schapiro@datfid.com

{datfid-0.1.16 → datfid-0.1.17}/setup.py

@@ -17,7 +17,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="datfid",
-    version="0.1.16",
+    version="0.1.17",
     description="SDK to access the DATFID API hosted on Hugging Face Spaces",
     long_description=long_description,
     long_description_content_type="text/markdown",  # Important!