half-orm-dev 1.0.0a22__tar.gz → 1.0.0a24__tar.gz

{half_orm_dev-1.0.0a22/half_orm_dev.egg-info → half_orm_dev-1.0.0a24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a22
+Version: 1.0.0a24
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

half_orm_dev-1.0.0a24/half_orm_dev/cli/commands/upgrade.py

@@ -0,0 +1,198 @@
+"""
+Upgrade command - Apply releases sequentially to production database.
+
+Equivalent to 'apt upgrade' - applies available releases incrementally
+to existing production database without data destruction.
+"""
+
+import click
+from half_orm_dev.repo import Repo
+from half_orm_dev.release_manager import ReleaseManagerError
+from half_orm import utils
+
+
+@click.command()
+@click.option(
+    '--to-release', '-t',
+    type=str,
+    default=None,
+    help='Stop at specific version (e.g., 1.3.7). Default: choose interactively'
+)
+@click.option(
+    '--dry-run', '-d',
+    is_flag=True,
+    help='Simulate upgrade without making changes'
+)
+@click.option(
+    '--force',
+    is_flag=True,
+    help='Overwrite existing backup without confirmation'
+)
+@click.option(
+    '--skip-backup',
+    is_flag=True,
+    help='Skip backup creation (DANGEROUS - for testing only)'
+)
+@click.option(
+    '--yes', '-y',
+    is_flag=True,
+    help='Skip confirmation prompt'
+)
+def upgrade(to_release, dry_run, force, skip_backup, yes):
+    """
+    Apply releases sequentially to production database.
+
+    Fetches available releases, lets you choose a target version interactively,
+    then upgrades the production database incrementally without data destruction.
+    Creates automatic backup before any changes.
+
+    Examples:
+        # Interactive: choose target from list
+        half_orm dev upgrade
+
+        # Upgrade to specific version (no prompt)
+        half_orm dev upgrade --to-release=1.3.7
+
+        # Simulate upgrade (no changes, no prompt)
+        half_orm dev upgrade --dry-run
+
+        # Apply all without confirmation
+        half_orm dev upgrade --yes
+    """
+    try:
+        repo = Repo()
+
+        # === Fetch and display available releases ===
+        click.echo("🔄 Fetching available releases...\n")
+        update_info = repo.release_manager.update_production()
+
+        current = update_info['current_version']
+        click.echo(f"Current version: {utils.Color.bold(current)}")
+
+        if not update_info['has_updates']:
+            click.echo(f"\n✓ {utils.Color.green('Production is already at latest version.')}")
+            return
+
+        available = update_info['available_releases']
+        upgrade_path = update_info['upgrade_path']
+        latest = upgrade_path[-1]
+
+        click.echo(f"\nAvailable releases:")
+        for rel in available:
+            patch_count = len(rel['patches'])
+            patches_label = f"{patch_count} patch{'es' if patch_count != 1 else ''}"
+            click.echo(f"  • {utils.Color.bold(rel['version'])}  ({patches_label})")
+
+        # === Determine target version ===
+        if to_release is None and not dry_run and not yes:
+            path_str = " → ".join([current] + upgrade_path)
+            click.echo(f"\nUpgrade path: {path_str}\n")
+
+            raw = click.prompt(
+                "Target version",
+                default=latest,
+            ).strip()
+
+            if raw not in upgrade_path:
+                click.echo(
+                    f"\n❌ '{raw}' is not in the upgrade path.\n"
+                    f"   Available: {', '.join(upgrade_path)}",
+                    err=True,
+                )
+                raise click.Abort()
+            to_release = raw if raw != latest else None  # None means "all"
+
+        # === Confirmation (unless --dry-run or --yes) ===
+        if not dry_run and not yes:
+            apply_path = upgrade_path
+            if to_release:
+                apply_path = upgrade_path[:upgrade_path.index(to_release) + 1]
+
+            click.echo(f"\nWill apply: {utils.Color.bold(' → '.join(apply_path))}")
+            if not skip_backup:
+                click.echo("Will create backup before starting.")
+
+            if not click.confirm("\nProceed?", default=True):
+                click.echo("\nUpgrade cancelled.")
+                return
+
+        click.echo()
+
+        # === Run upgrade (pass pre-fetched update_info to avoid double git fetch) ===
+        result = repo.release_manager.upgrade_production(
+            to_version=to_release,
+            dry_run=dry_run,
+            force_backup=force,
+            skip_backup=skip_backup,
+            update_info=update_info,
+        )
+
+        _display_upgrade_results(result)
+
+    except ReleaseManagerError as e:
+        click.echo(f"\n❌ {utils.Color.red('Upgrade failed:')}")
+        click.echo(f"   {str(e)}\n")
+        raise click.Abort()
+
+
+def _display_upgrade_results(result):
+    """Format and display upgrade results."""
+    if result.get('dry_run'):
+        click.echo(f"{utils.Color.bold('DRY RUN')} - Simulation only, no changes made\n")
+
+        current = result['current_version']
+        click.echo(f"Current version: {utils.Color.bold(current)}")
+
+        if not result.get('releases_would_apply'):
+            click.echo(f"\n✓ {utils.Color.green('Already at latest version')}")
+            return
+
+        click.echo(f"\nWould create backup: {utils.Color.bold(result.get('backup_would_be_created', ''))}")
+        click.echo(f"\nWould apply releases:")
+        for version in result['releases_would_apply']:
+            patches = result['patches_would_apply'][version]
+            click.echo(f"  → {utils.Color.bold(version)} - {len(patches)} patches")
+            for patch_id in patches:
+                click.echo(f"      • {patch_id}")
+
+        final = result['final_version']
+        click.echo(f"\nWould upgrade: {current} → {utils.Color.green(final)}")
+        click.echo(f"\n{utils.Color.bold('To apply this upgrade, run without --dry-run')}")
+        return
+
+    current = result['current_version']
+
+    if result.get('backup_created'):
+        click.echo(f"✓ Backup created: {utils.Color.bold(result['backup_created'])}")
+    elif result.get('snapshot_used'):
+        click.echo(f"✓ Snapshot created: {utils.Color.bold(result['snapshot_used'])}")
+    elif result.get('releases_applied'):
+        click.echo(f"⚠️  {utils.Color.bold('No backup created (--skip-backup used)')}")
+
+    if not result['releases_applied']:
+        click.echo(f"\n✓ {utils.Color.green('Production already at latest version')}")
+        return
+
+    click.echo(f"\n{utils.Color.green('Applied releases:')}")
+    for version in result['releases_applied']:
+        patches = result['patches_applied'][version]
+        if patches:
+            click.echo(f"  ✓ {utils.Color.bold(version)} - {len(patches)} patches")
+            for patch_id in patches:
+                click.echo(f"      • {patch_id}")
+        else:
+            click.echo(f"  ✓ {utils.Color.bold(version)} - (empty release)")
+
+    final = result['final_version']
+    click.echo(f"\n{utils.Color.green('✓ Upgrade complete!')}")
+    click.echo(f"   {current} → {utils.Color.bold(utils.Color.green(final))}")
+
+    if result.get('target_version'):
+        click.echo(f"\n📝 Partial upgrade to {result['target_version']} complete.")
+        click.echo(f"   To upgrade further, run: half_orm dev upgrade")
+    else:
+        click.echo(f"\n📝 Production is now at latest version.")
+
+    if result.get('backup_created'):
+        click.echo(f"\n💡 To rollback if needed:")
+        click.echo(f"   psql -d {result.get('db_name', 'DATABASE')} -f {result['backup_created']}")

{half_orm_dev-1.0.0a22 → half_orm_dev-1.0.0a24}/half_orm_dev/database.py

@@ -149,7 +149,7 @@ class Database:
 
     def __init_db(self):
         """Tries to connect to the database. If unsuccessful, creates the
-        database end initializes it with half_orm_meta.
+        database and initializes it with half_orm_meta.
         """
         try:
             self.__model = Model(self.__name)

{half_orm_dev-1.0.0a22 → half_orm_dev-1.0.0a24}/half_orm_dev/hgit.py

@@ -356,6 +356,22 @@ class HGit:
         # Push branch with or without upstream tracking
         origin.push(branch_name, set_upstream=set_upstream)
 
+    def read_file_at_ref(self, ref: str, relative_path: str) -> str:
+        """
+        Read a file's content from a git ref (tag or commit) without checking it out.
+
+        Args:
+            ref: Git ref (e.g., "v1.3.6", "ho-prod", commit SHA)
+            relative_path: File path relative to repo root (e.g., ".hop/releases/1.3.6.txt")
+
+        Returns:
+            File content as string, or '' if not found.
+        """
+        try:
+            return self.__git_repo.git.show(f'{ref}:{relative_path}')
+        except Exception:
+            return ''
+
     def fetch_tags(self) -> None:
         """
         Fetch all tags from remote.

{half_orm_dev-1.0.0a22 → half_orm_dev-1.0.0a24}/half_orm_dev/migration_manager.py

@@ -590,6 +590,12 @@ class MigrationManager:
         Stale local branches (no longer on remote) are skipped to avoid pre-commit
         hook failures.
         """
+        if self._repo.production:
+            raise MigrationManagerError(
+                "PRODUCTION SAFETY: _regenerate_modules_after_migration() is forbidden "
+                "on a production server.\nModule regeneration (which includes database "
+                "restoration) must never run in production."
+            )
         import re as _re
         from half_orm_dev import modules as _modules
 

{half_orm_dev-1.0.0a22 → half_orm_dev-1.0.0a24}/half_orm_dev/modules.py

@@ -667,6 +667,7 @@ def __gen_baseclass(relation, fkeys) -> str:
     dc_name = rel._ho_dataclass_name()
     d = f'{full_name}Dict'
     HO_BASECLASSES_DICT_NAMES.add(d)
+
     lines = [
         f"class {bc_name}(",
         f"    MODEL.get_relation_class('{fqtn}', fields_aliases=None),",

{half_orm_dev-1.0.0a22 → half_orm_dev-1.0.0a24}/half_orm_dev/release_manager.py

@@ -1357,14 +1357,21 @@ class ReleaseManager:
             # Extract base version for file lookup (remove suffix)
             base_version = version.split('-')[0]
 
-            # Read patches from release file
+            # Read patches from release file.
+            # The file may not exist in the current checkout (production server
+            # is at an older tag), so fall back to reading from the git tag.
             release_file = self._releases_dir / f"{version}.txt"
             patches = []
 
             if release_file.exists():
                 content = release_file.read_text().strip()
-                if content:
-                    patches = [line.strip() for line in content.split('\n') if line.strip()]
+            else:
+                content = self._repo.hgit.read_file_at_ref(
+                    tag, f'.hop/releases/{version}.txt'
+                )
+
+            if content.strip():
+                patches = [line.strip() for line in content.split('\n') if line.strip()]
 
             # Only include releases newer than current version
             if Version(version) > Version(current_version):
@@ -1511,7 +1518,8 @@ class ReleaseManager:
         to_version: Optional[str] = None,
         dry_run: bool = False,
         force_backup: bool = False,
-        skip_backup: bool = False
+        skip_backup: bool = False,
+        update_info: Optional[dict] = None,
     ) -> dict:
         """
         Upgrade production database to target version.
@@ -1603,10 +1611,30 @@ class ReleaseManager:
             #   'message': 'Production already at latest version'
             # }
         """
+        assert self._repo.production
         # Get current version
         current_version = self._repo.database.last_release_s
 
-        # === 1. SNAPSHOT OR BACKUP (unless dry_run or skip_backup) ===
+        # === 1. Get available releases (before any destructive operation) ===
+        if update_info is None:
+            update_info = self.update_production()
+
+        # Check if already up to date — exit before creating any snapshot/backup
+        if not update_info['has_updates']:
+            return {
+                'status': 'success',
+                'dry_run': False,
+                'backup_created': None,
+                'snapshot_used': None,
+                'current_version': current_version,
+                'target_version': to_version,
+                'releases_applied': [],
+                'patches_applied': {},
+                'final_version': current_version,
+                'message': 'Production already at latest version'
+            }
+
+        # === 2. SNAPSHOT OR BACKUP (unless dry_run or skip_backup) ===
         # Preferred: instant snapshot via CREATE DATABASE ... TEMPLATE (requires CREATEDB).
         # Fallback: full pg_dump.
         # Connections are terminated before the snapshot — this is intentional:
@@ -1632,27 +1660,9 @@ class ReleaseManager:
                     force=force_backup
                 )
 
-        # === 2. Validate environment ===
+        # === 3. Validate environment ===
         self._validate_production_upgrade()
 
-        # === 3. Get available releases ===
-        update_info = self.update_production()
-
-        # Check if already up to date
-        if not update_info['has_updates']:
-            return {
-                'status': 'success',
-                'dry_run': False,
-                'backup_created': backup_path,
-                'snapshot_used': snapshot_name,
-                'current_version': current_version,
-                'target_version': to_version,
-                'releases_applied': [],
-                'patches_applied': {},
-                'final_version': current_version,
-                'message': 'Production already at latest version'
-            }
-
         # === 4. Calculate upgrade path ===
         if to_version:
             # Upgrade to specific version

{half_orm_dev-1.0.0a22 → half_orm_dev-1.0.0a24}/half_orm_dev/templates/module_template_1

@@ -8,4 +8,4 @@ WARNING!
 """
 from half_orm.model import register
 from {package_name} import MODEL, ho_baseclasses
-
+{inheritance_import}

half_orm_dev-1.0.0a24/half_orm_dev/templates/module_template_2

@@ -0,0 +1,7 @@
+
+@register
+class {class_name}({inherited_classes}ho_baseclasses.{bc_name}):
+    """
+{documentation}
+    """
+

half_orm_dev-1.0.0a24/half_orm_dev/version.txt

@@ -0,0 +1 @@
+1.0.0-a24

{half_orm_dev-1.0.0a22 → half_orm_dev-1.0.0a24/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a22
+Version: 1.0.0a24
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later

half_orm_dev-1.0.0a22/half_orm_dev/cli/commands/upgrade.py

@@ -1,191 +0,0 @@
-"""
-Upgrade command - Apply releases sequentially to production database.
-
-Equivalent to 'apt upgrade' - applies available releases incrementally
-to existing production database without data destruction.
-"""
-
-import click
-from pathlib import Path
-from half_orm_dev.repo import Repo
-from half_orm_dev.release_manager import ReleaseManagerError
-from half_orm import utils
-
-
-@click.command()
-@click.option(
-    '--to-release', '-t',
-    type=str,
-    default=None,
-    help='Stop at specific version (e.g., 1.3.7). Default: upgrade to latest'
-)
-@click.option(
-    '--dry-run', '-d',
-    is_flag=True,
-    help='Simulate upgrade without making changes'
-)
-@click.option(
-    '--force',
-    is_flag=True,
-    help='Overwrite existing backup without confirmation'
-)
-@click.option(
-    '--skip-backup',
-    is_flag=True,
-    help='Skip backup creation (DANGEROUS - for testing only)'
-)
-def upgrade(to_release, dry_run, force, skip_backup):
-    """
-    Apply releases sequentially to production database.
-
-    Upgrades production database by applying releases incrementally
-    to existing data. NEVER destroys or recreates the database.
-    Creates automatic backup before any changes.
-
-    CRITICAL: This command works on EXISTING production database.
-    It does NOT use restore operations that would destroy data.
-
-    Must be run from ho-prod branch.
-
-    Workflow:
-        1. CREATE BACKUP (backups/{version}.sql) - FIRST ACTION
-        2. Validate environment (ho-prod branch, clean repo)
-        3. Apply releases sequentially on existing database
-        4. Update database version after each release
-
-    Examples:
-        # Upgrade to latest (all available releases)
-        half_orm dev upgrade
-
-        # Upgrade to specific version
-        half_orm dev upgrade --to-release=1.3.7
-
-        # Simulate upgrade (no changes)
-        half_orm dev upgrade --dry-run
-
-        # Force overwrite existing backup
-        half_orm dev upgrade --force
-
-    Options:
-        --to-release=VERSION  Stop at specific version
-        --dry-run            Simulate without changes
-        --force              Overwrite existing backup
-        --skip-backup        Skip backup (DANGEROUS)
-
-    Requires:
-        - Current branch: ho-prod
-        - Repository: clean (no uncommitted changes)
-        - Permissions: Database write access
-    """
-    try:
-        # Get repository instance
-        repo = Repo()
-
-        # Delegate to ReleaseManager
-        click.echo("🔄 Starting production upgrade...\n")
-
-        result = repo.release_manager.upgrade_production(
-            to_version=to_release,
-            dry_run=dry_run,
-            force_backup=force,
-            skip_backup=skip_backup
-        )
-
-        # Display results
-        _display_upgrade_results(result)
-
-    except ReleaseManagerError as e:
-        click.echo(f"\n❌ {utils.Color.red('Upgrade failed:')}")
-        click.echo(f"   {str(e)}\n")
-        raise click.Abort()
-
-
-def _display_upgrade_results(result):
-    """
-    Format and display upgrade results to user.
-
-    Args:
-        result: Dict from ReleaseManager.upgrade_production()
-    """
-    # === DRY RUN MODE ===
-    if result.get('dry_run'):
-        click.echo(f"{utils.Color.bold('DRY RUN')} - Simulation only, no changes made\n")
-
-        current = result['current_version']
-        click.echo(f"Current version: {utils.Color.bold(current)}")
-
-        if not result['releases_would_apply']:
-            click.echo(f"\n✓ {utils.Color.green('Already at latest version')}")
-            return
-
-        # Show what would happen
-        click.echo(f"\nWould create backup: {utils.Color.bold(result['backup_would_be_created'])}")
-
-        click.echo(f"\nWould apply releases:")
-        for version in result['releases_would_apply']:
-            patches = result['patches_would_apply'][version]
-            patch_count = len(patches)
-            click.echo(f"  → {utils.Color.bold(version)} - {patch_count} patches")
-            for patch_id in patches:
-                click.echo(f"      • {patch_id}")
-
-        final = result['final_version']
-        click.echo(f"\nWould upgrade: {current} → {utils.Color.green(final)}")
-
-        click.echo(f"\n{utils.Color.bold('To apply this upgrade, run without --dry-run')}")
-        return
-
-    # === ACTUAL UPGRADE ===
-
-    current = result['current_version']
-
-    # Backup confirmation
-    if result['backup_created']:
-        backup_path = result['backup_created']
-        click.echo(f"✓ Backup created: {utils.Color.bold(backup_path)}")
-    elif result.get('message') and 'already at latest' in result['message'].lower():
-        # Up to date scenario
-        pass
-    else:
-        click.echo(f"⚠️  {utils.Color.bold('No backup created (--skip-backup used)')}")
-
-    click.echo(f"\nCurrent version: {utils.Color.bold(current)}")
-
-    # Check if already up to date
-    if not result['releases_applied']:
-        click.echo(f"\n✓ {utils.Color.green('Production already at latest version')}")
-        return
-
-    # Show applied releases
-    click.echo(f"\n{utils.Color.green('Applied releases:')}")
-
-    for version in result['releases_applied']:
-        patches = result['patches_applied'][version]
-        patch_count = len(patches)
-
-        if patch_count == 0:
-            click.echo(f"  ✓ {utils.Color.bold(version)} - (empty release)")
-        else:
-            click.echo(f"  ✓ {utils.Color.bold(version)} - {patch_count} patches")
-            for patch_id in patches:
-                click.echo(f"      • {patch_id}")
-
-    # Final status
-    final = result['final_version']
-    click.echo(f"\n{utils.Color.green('✓ Upgrade complete!')}")
-    click.echo(f"   {current} → {utils.Color.bold(utils.Color.green(final))}")
-
-    # Next steps
-    if result['target_version']:
-        # Partial upgrade
-        click.echo(f"\n📝 Partial upgrade to {result['target_version']} complete.")
-        click.echo(f"   To upgrade further, run: half_orm dev upgrade")
-    else:
-        # Full upgrade
-        click.echo(f"\n📝 Production is now at latest version.")
-
-    # Rollback information
-    if result['backup_created']:
-        backup_path = result['backup_created']
-        click.echo(f"\n💡 To rollback if needed:")
-        click.echo(f"   psql -d {result.get('db_name', 'DATABASE')} -f {backup_path}")

half_orm_dev-1.0.0a22/half_orm_dev/templates/module_template_2

@@ -1,7 +0,0 @@
-
-@register
-class {class_name}(ho_baseclasses.{bc_name}):
-    """
-{documentation}
-    """
-

half_orm_dev-1.0.0a22/half_orm_dev/version.txt

@@ -1 +0,0 @@
-1.0.0-a22