featrixsphere 0.2.1637__tar.gz → 0.2.2279__tar.gz

{featrixsphere-0.2.1637 → featrixsphere-0.2.2279}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: featrixsphere
-Version: 0.2.1637
+Version: 0.2.2279
 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.2279/VERSION

@@ -0,0 +1 @@
+0.2.2278

{featrixsphere-0.2.1637 → featrixsphere-0.2.2279}/featrix-update.py

@@ -208,9 +208,13 @@ def find_newest_version(index: Dict[str, Any]) -> Optional[Dict[str, Any]]:
         print("⚠️  No files with version information found")
         return None
     
-    # Sort by version (newest first)
+    # Sort by version (newest first), then by date_modified (newest first) as tiebreaker
+    # This ensures when multiple builds have the same version, we get the most recent one
     versioned_files.sort(
-        key=lambda x: tuple(int(p) for p in x['version'].split('.')[:3]),
+        key=lambda x: (
+            tuple(int(p) for p in x['version'].split('.')[:3]),
+            x.get('date_modified', '')
+        ),
         reverse=True
     )
     
@@ -267,16 +271,62 @@ def install_package(package_file: Path, force: bool = False) -> bool:
         print(f"   Package version: {package_version}")
         print(f"   Package hash: {package_hash}")
         
-        # Check if already deployed (unless forced)
-        if not force:
-            deployed_hash = None
-            if Path("/sphere/app/VERSION_HASH").exists():
-                deployed_hash = Path("/sphere/app/VERSION_HASH").read_text().strip()
-            
-            if deployed_hash and package_hash != "unknown" and package_hash == deployed_hash:
+        # Check if already deployed
+        deployed_hash = None
+        deployed_version = None
+        if Path("/sphere/app/VERSION_HASH").exists():
+            deployed_hash = Path("/sphere/app/VERSION_HASH").read_text().strip()
+        if Path("/sphere/app/VERSION").exists():
+            deployed_version = Path("/sphere/app/VERSION").read_text().strip()
+        
+        same_hash = deployed_hash and package_hash != "unknown" and package_hash == deployed_hash
+        same_version = deployed_version and package_version != "unknown" and package_version == deployed_version
+        
+        if same_hash and same_version:
+            if not force:
                 print(f"\n⏭️  This package is already deployed (hash: {package_hash})")
                 print(f"   Skipping installation. Use --force to reinstall anyway.")
                 return True
+            else:
+                # FORCE REINSTALL OF SAME BUILD - MAKE IT SUPER OBVIOUS
+                import time
+                print()
+                print()
+                print("\033[1;33m" + "╔" + "=" * 78 + "╗" + "\033[0m")
+                print("\033[1;33m" + "║" + " " * 78 + "║" + "\033[0m")
+                print("\033[1;33m" + "║" + "  ⚠️  ⚠️  ⚠️  REINSTALLING THE EXACT SAME BUILD  ⚠️  ⚠️  ⚠️".ljust(78) + "║" + "\033[0m")
+                print("\033[1;33m" + "║" + " " * 78 + "║" + "\033[0m")
+                print("\033[1;33m" + "╚" + "=" * 78 + "╝" + "\033[0m")
+                print()
+                print("\033[1;33m" + "⚠️  WARNING: You are using --force to reinstall the SAME build!" + "\033[0m")
+                print()
+                print(f"   Currently installed:")
+                print(f"     Version: {deployed_version}")
+                print(f"     Hash:    {deployed_hash}")
+                print()
+                print(f"   Package to install:")
+                print(f"     Version: {package_version}")
+                print(f"     Hash:    {package_hash}")
+                print()
+                print("\033[1;33m" + "   👉 THIS IS THE EXACT SAME BUILD (version AND hash match)" + "\033[0m")
+                print()
+                print("   This will:")
+                print("   • Kill and restart all services")
+                print("   • Copy the exact same files over existing files")
+                print("   • Take 2-3 minutes to complete")
+                print()
+                print("   Common reasons to do this:")
+                print("   • Testing deployment process")
+                print("   • Services are broken and need clean restart")
+                print("   • Files were manually modified and need to be restored")
+                print()
+                for i in range(10, 0, -1):
+                    print(f"\r   ⏳ Starting reinstall in {i} seconds... (Ctrl+C to abort)", end='', flush=True)
+                    time.sleep(1)
+                print()
+                print()
+                print("\033[1;32m" + "▶️  Proceeding with reinstall..." + "\033[0m")
+                print()
         
         # Find node-install.sh
         install_script = None
@@ -306,10 +356,14 @@ def install_package(package_file: Path, force: bool = False) -> bool:
             # 1. We've already done version checking in featrix-update.py
             # 2. The package is a specific version we want to install
             # 3. node-install.sh checks git state from /home/mitch/sphere which may not match the package
+            
+            # node-install.sh REQUIRES root (checked at line 326)
+            # It calls 'sbit fix-permissions' which needs sbit to have setuid bit
+            # The install script itself must run as root
             cmd = ["sudo", str(install_script), "--force"]
             print(f"   Using --force flag (installing from package)")
             
-            # Run the install script with sudo
+            # Run the install script
             result = subprocess.run(
                 cmd,
                 check=True,
@@ -409,10 +463,24 @@ def main():
         newest_version = newest['version']
         newest_filename = newest['filename']
         newest_hash = newest.get('hash')
+        newest_date = newest.get('date_modified')
         newest_url = f"{FIRMWARE_SERVER}/{newest_filename}"
         
+        # Format date if available
+        date_str = ""
+        if newest_date:
+            try:
+                # Parse ISO format date and format nicely
+                date_obj = datetime.fromisoformat(newest_date.replace('Z', '+00:00'))
+                date_str = date_obj.strftime("%Y-%m-%d %H:%M:%S")
+            except Exception:
+                # Fallback to raw date if parsing fails
+                date_str = newest_date
+        
         print(f"\n📊 Available versions:")
         print(f"   Newest: {newest_version} ({newest_filename})")
+        if date_str:
+            print(f"   Date: {date_str}")
         if newest_hash:
             print(f"   Hash: {newest_hash[:16]}...")
         
@@ -426,12 +494,19 @@ def main():
                 print(f"\n✅ Update available: {current_version} → {newest_version}")
                 should_update = True
             elif comparison == 0:
-                print(f"\n✅ Already on latest version: {current_version}")
-                if args.force:
-                    print("   --force flag set, will reinstall anyway")
+                # Same version - check if hash is different (newer build of same version)
+                current_hash = get_current_version_hash()
+                if current_hash and newest_hash and current_hash != newest_hash:
+                    print(f"\n✅ Newer build available: {current_version} ({current_hash} → {newest_hash[:8]})")
+                    print(f"   Same version number but different hash (newer build)")
                     should_update = True
                 else:
-                    should_update = False
+                    print(f"\n✅ Already on latest version: {current_version}")
+                    if args.force:
+                        print("   --force flag set, will reinstall anyway")
+                        should_update = True
+                    else:
+                        should_update = False
             else:
                 print(f"\n⚠️  Current version ({current_version}) is newer than available ({newest_version})")
                 if args.force:

{featrixsphere-0.2.1637 → featrixsphere-0.2.2279}/featrixsphere/__init__.py

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