featrixsphere 0.2.1206__py3-none-any.whl → 0.2.1229__py3-none-any.whl

featrixsphere/__init__.py

@@ -38,7 +38,7 @@ Example:
     ...                                labels=['Experiment A', 'Experiment B'])
 """
 
-__version__ = "0.2.1206"
+__version__ = "0.2.1229"
 __author__ = "Featrix"
 __email__ = "support@featrix.com"
 __license__ = "MIT"

featrixsphere/client.py

@@ -633,13 +633,97 @@ class FeatrixSphereClient:
             _client=self
         )
     
-    def get_model_card(self, session_id: str, max_retries: int = None) -> Dict[str, Any]:
+    def update_user_metadata(self, session_id: str, metadata: Dict[str, Any], write_mode: str = "merge") -> Dict[str, Any]:
+        """
+        Update user metadata for a session.
+        
+        Args:
+            session_id: The session ID to update metadata for
+            metadata: Dictionary of metadata to update (max 32KB total)
+            write_mode: How to update metadata:
+                - "merge" (default): Merge new metadata with existing (existing keys are updated, new keys are added)
+                - "overwrite": Replace all user_metadata with the new dictionary
+        
+        Returns:
+            Dictionary containing the updated session information
+            
+        Raises:
+            requests.exceptions.HTTPError: If the request fails
+            ValueError: If write_mode is not "merge" or "overwrite"
+            
+        Example:
+            >>> # Merge new metadata with existing
+            >>> client.update_user_metadata(
+            ...     session_id="abc123",
+            ...     metadata={"new_key": "value", "existing_key": "updated_value"},
+            ...     write_mode="merge"
+            ... )
+            
+            >>> # Replace all metadata
+            >>> client.update_user_metadata(
+            ...     session_id="abc123",
+            ...     metadata={"only_key": "only_value"},
+            ...     write_mode="overwrite"
+            ... )
+        """
+        if write_mode not in ["merge", "overwrite"]:
+            raise ValueError(f"write_mode must be 'merge' or 'overwrite', got '{write_mode}'")
+        
+        request_data = {
+            "user_metadata": metadata,
+            "write_mode": write_mode
+        }
+        
+        response_data = self._post_json(f"/session/{session_id}/update_user_metadata", request_data)
+        return response_data
+    
+    def is_foundation_model_ready(self, session_id: str, max_retries: int = None) -> Tuple[bool, str]:
+        """
+        Check if a foundation model session is ready to use (training completed).
+        
+        Args:
+            session_id: The session ID to check
+            max_retries: Maximum number of retries (defaults to client default)
+            
+        Returns:
+            Tuple of (is_ready: bool, status_message: str)
+            - is_ready: True if session is done and model card is available
+            - status_message: Human-readable status message
+            
+        Example:
+            >>> is_ready, message = client.is_foundation_model_ready("session_123")
+            >>> if not is_ready:
+            ...     print(f"Foundation model not ready: {message}")
+        """
+        try:
+            session_status = self.get_session_status(session_id, max_retries=max_retries)
+            
+            if session_status.status in ["done", "DONE"]:
+                # Check if model card exists
+                try:
+                    self.get_model_card(session_id, max_retries=max_retries, check_status_first=False)
+                    return True, "Foundation model is ready"
+                except (requests.exceptions.HTTPError, FileNotFoundError):
+                    return False, "Session is done but model card is not available yet"
+            else:
+                return False, f"Session is still {session_status.status}. Training may still be in progress."
+                
+        except requests.exceptions.HTTPError as e:
+            if e.response.status_code == 404:
+                return False, f"Session {session_id} not found"
+            return False, f"Error checking session status: {e}"
+        except Exception as e:
+            return False, f"Error checking foundation model: {e}"
+    
+    def get_model_card(self, session_id: str, max_retries: int = None, check_status_first: bool = True) -> Dict[str, Any]:
         """
         Get the model card JSON for a given session.
         
         Args:
             session_id: The session ID to get the model card for
             max_retries: Maximum number of retries (defaults to client default)
+            check_status_first: If True, check session status before fetching model card.
+                               Provides better error messages if session is still training.
             
         Returns:
             Dictionary containing the model card JSON data
@@ -647,12 +731,31 @@ class FeatrixSphereClient:
         Raises:
             requests.exceptions.HTTPError: If the request fails
             FileNotFoundError: If the model card doesn't exist (404)
+            ValueError: If session is not ready and check_status_first is True
             
         Example:
             >>> client = FeatrixSphereClient()
             >>> model_card = client.get_model_card("session_123")
             >>> print(model_card["model_details"]["name"])
         """
+        # Check session status first to provide better error messages
+        if check_status_first:
+            try:
+                session_status = self.get_session_status(session_id, max_retries=max_retries)
+                if session_status.status not in ["done", "DONE"]:
+                    raise ValueError(
+                        f"Session {session_id} is not ready (status: {session_status.status}). "
+                        f"Model card is only available after training completes. "
+                        f"Use wait_for_session_completion() to wait for training to finish."
+                    )
+            except requests.exceptions.HTTPError as e:
+                # If we can't get status, continue and let the model_card request fail
+                # This handles cases where the session doesn't exist
+                if e.response.status_code == 404:
+                    raise FileNotFoundError(f"Session {session_id} not found") from e
+                # For other HTTP errors, continue to try model_card request
+                pass
+        
         response = self._make_request(
             "GET",
             f"/session/{session_id}/model_card",
@@ -774,8 +877,8 @@ class FeatrixSphereClient:
             >>> print(f"Model card recreated: {model_card['model_info']['name']}")
         """
         response = self._make_request(
-            "POST",
-            f"/session/{session_id}/model_card",
+            "GET",
+            f"/compute/session/{session_id}/model_card",
             max_retries=max_retries
         )
         return response.json()
@@ -4008,6 +4111,7 @@ class FeatrixSphereClient:
 
     def train_on_foundational_model(self, foundation_model_id: str, target_column: str, target_column_type: str,
                                     input_filename: str = None,
+                                    df = None,
                                     name: str = None,
                                     session_name_prefix: str = None,
                                     epochs: int = 0, batch_size: int = 0, learning_rate: float = 0.001,
@@ -4029,6 +4133,8 @@ class FeatrixSphereClient:
             target_column: Name of the target column to predict
             target_column_type: Type of target column ("set" or "scalar")
             input_filename: Optional input data file (uses foundation model's data if not provided)
+            df: Optional pandas DataFrame with training data (uses foundation model's data if not provided).
+                Use input_filename OR df (not both) to train predictor on different data than the foundation model.
             name: Optional name for the new session
             session_name_prefix: Optional prefix for session ID. Session will be named <prefix>-<uuid>
             epochs: Number of training epochs (default: 0; automatic)
@@ -4048,6 +4154,48 @@ class FeatrixSphereClient:
         print(f"Training predictor on foundation model {foundation_model_id}...")
         print(f"  Target: {target_column} ({target_column_type})")
         
+        # Validate that only one data source is provided
+        if input_filename and df is not None:
+            raise ValueError("Provide either input_filename or df, not both")
+        
+        # If DataFrame provided, save to temp file and upload it
+        temp_file = None
+        if df is not None:
+            import pandas as pd
+            import tempfile
+            import os
+            
+            if not isinstance(df, pd.DataFrame):
+                raise ValueError("df must be a pandas DataFrame")
+            
+            if verbose:
+                print(f"📊 Using provided DataFrame ({len(df)} rows, {len(df.columns)} columns)")
+            
+            # Create temporary CSV file
+            temp_file = tempfile.NamedTemporaryFile(mode='w', suffix='.csv', delete=False)
+            temp_file_path = temp_file.name
+            temp_file.close()
+            
+            # Save DataFrame to temp file
+            df.to_csv(temp_file_path, index=False)
+            
+            if verbose:
+                print(f"📁 Saved to temporary file: {os.path.basename(temp_file_path)}")
+                print(f"📤 Uploading file to server...")
+            
+            # Upload the file
+            uploaded_filename = self.upload_file(temp_file_path)
+            input_filename = uploaded_filename
+            
+            if verbose:
+                print(f"✅ File uploaded: {input_filename}")
+            
+            # Clean up temp file
+            try:
+                os.unlink(temp_file_path)
+            except Exception:
+                pass  # Ignore cleanup errors
+        
         data = {
             "foundation_model_id": foundation_model_id,
             "target_column": target_column,
@@ -4059,17 +4207,26 @@ class FeatrixSphereClient:
         }
         
         if input_filename:
-            # Clean up input_filename: extract just the filename if it's an absolute path
-            # The file should be uploaded first or already exist on the server
+            # If absolute path provided, upload the file first
             from pathlib import Path
             input_path = Path(input_filename)
             if input_path.is_absolute():
-                # Extract just the filename - client should upload file first
-                cleaned_filename = input_path.name
-                print(f"⚠️  Note: Extracted filename '{cleaned_filename}' from absolute path '{input_filename}'")
-                print(f"   Make sure the file has been uploaded to the server first")
-                data["input_filename"] = cleaned_filename
+                # Upload the file first, then use the uploaded filename
+                if not input_path.exists():
+                    raise FileNotFoundError(f"Input file not found: {input_filename}")
+                
+                if verbose:
+                    print(f"📤 Uploading file from absolute path: {input_filename}")
+                
+                # Upload the file
+                uploaded_filename = self.upload_file(str(input_path))
+                
+                if verbose:
+                    print(f"✅ File uploaded as: {uploaded_filename}")
+                
+                data["input_filename"] = uploaded_filename
             else:
+                # Relative filename - assume it's already on the server
                 data["input_filename"] = input_filename
         if name:
             data["name"] = name

{featrixsphere-0.2.1206.dist-info → featrixsphere-0.2.1229.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: featrixsphere
-Version: 0.2.1206
+Version: 0.2.1229
 Summary: Transform any CSV into a production-ready ML model in minutes, not months.
 Home-page: https://github.com/Featrix/sphere
 Author: Featrix

featrixsphere-0.2.1229.dist-info/RECORD

@@ -0,0 +1,9 @@
+featrixsphere/__init__.py,sha256=DEdcEduSBsw68Ph6BuxpHiBXauP0gGVZUk4w5krgwU4,1888
+featrixsphere/cli.py,sha256=AW9O3vCvCNJ2UxVGN66eRmeN7XLSiHJlvK6JLZ9UJXc,13358
+featrixsphere/client.py,sha256=y5x_zTSryHMy-R7pleySQnkpdoztcSxq8D2cdtwNLpM,381173
+featrixsphere/test_client.py,sha256=4SiRbib0ms3poK0UpnUv4G0HFQSzidF3Iswo_J2cjLk,11981
+featrixsphere-0.2.1229.dist-info/METADATA,sha256=Y5AwjOmojP46zRuFAx9VRYksJcMaZ08lSHTqHloVZPk,16232
+featrixsphere-0.2.1229.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+featrixsphere-0.2.1229.dist-info/entry_points.txt,sha256=QreJeYfD_VWvbEqPmMXZ3pqqlFlJ1qZb-NtqnyhEldc,51
+featrixsphere-0.2.1229.dist-info/top_level.txt,sha256=AyN4wjfzlD0hWnDieuEHX0KckphIk_aC73XCG4df5uU,14
+featrixsphere-0.2.1229.dist-info/RECORD,,

featrixsphere-0.2.1206.dist-info/RECORD

@@ -1,9 +0,0 @@
-featrixsphere/__init__.py,sha256=6sjz6sAZEsBAotAiefePXdOHnoBmovpFqVy4vq4wONE,1888
-featrixsphere/cli.py,sha256=AW9O3vCvCNJ2UxVGN66eRmeN7XLSiHJlvK6JLZ9UJXc,13358
-featrixsphere/client.py,sha256=C9b_x2aRrGJJI0UCN2GtAdoSjIsMzAR9EKGbJvAzzPE,374039
-featrixsphere/test_client.py,sha256=4SiRbib0ms3poK0UpnUv4G0HFQSzidF3Iswo_J2cjLk,11981
-featrixsphere-0.2.1206.dist-info/METADATA,sha256=SjuRakp3SS59KnY4N7r65ZnlLp7Lg0O1DAq_NgQZ1fo,16232
-featrixsphere-0.2.1206.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-featrixsphere-0.2.1206.dist-info/entry_points.txt,sha256=QreJeYfD_VWvbEqPmMXZ3pqqlFlJ1qZb-NtqnyhEldc,51
-featrixsphere-0.2.1206.dist-info/top_level.txt,sha256=AyN4wjfzlD0hWnDieuEHX0KckphIk_aC73XCG4df5uU,14
-featrixsphere-0.2.1206.dist-info/RECORD,,