half-orm-dev 1.0.0a31__tar.gz → 1.0.0a33__tar.gz

{half_orm_dev-1.0.0a31/half_orm_dev.egg-info → half_orm_dev-1.0.0a33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a31
+Version: 1.0.0a33
 Summary: half_orm development Framework.
 Author-email: Joël Maïzi <joel.maizi@collorg.org>
 License-Expression: GPL-3.0-or-later
@@ -21,9 +21,11 @@ License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: GitPython
 Requires-Dist: click
+Requires-Dist: packaging
 Requires-Dist: pydash
 Requires-Dist: pytest
-Requires-Dist: half_orm<1.1.0,>=1.0.0a1
+Requires-Dist: pytest-asyncio
+Requires-Dist: half_orm<1.1.0,>=1.0.0rc16
 Requires-Dist: tomli>=2.0.0; python_version < "3.11"
 Requires-Dist: tomli_w>=1.0.0
 Dynamic: license-file
@@ -384,29 +386,31 @@ half_orm dev upgrade [--to-release X.Y.Z]
 half_orm dev upgrade --dry-run
 ```
 
-### Data Bootstrap
+### Bootstrap - Data Initialization
 
-Mark patch files with `-- @HOP:bootstrap` (SQL) or `# @HOP:bootstrap` (Python) to declare reference data.
-The marker **must be on the first line** of the file:
+Bootstrap scripts initialize application data on empty databases. Place SQL and Python files in the `bootstrap/` directory:
 
-```sql
--- @HOP:bootstrap
-INSERT INTO roles (name) VALUES ('admin'), ('user') ON CONFLICT DO NOTHING;
 ```
-
-```python
-# @HOP:bootstrap
-# (no shebang — the file is executed directly by half-orm-dev)
-MyModel(field='value').ho_insert()
+bootstrap/
+├── 01-init-roles.sql
+├── 02-seed-config.py
+└── 03-reference-data.sql
 ```
 
-These files are automatically:
-- Copied to `bootstrap/` during `patch merge`
-- Executed during production `upgrade`
-- Tracked in database (each script runs once)
+Files are executed **alphabetically** during:
+- **Development**: Each `patch apply` (allows iteration on bootstrap scripts)
+- **Production**: Initial `clone` only (one-time initialization)
+
+For production data changes, use **patches** (not bootstrap).
 
-> **Note:** If the marker is not on the first line it is silently ignored.
-> A warning is displayed during `patch apply` to help catch this mistake.
+**Python files** can define a `run(model)` function to share the database connection:
+
+```python
+def run(model):
+    # model is the halfORM Model instance with active connection
+    MyModel = model.get_relation_class('schema.table')
+    MyModel(field='value').ho_insert()
+```
 
 **Note:** Use `half_orm dev <command> --help` for detailed help on each command.
 

{half_orm_dev-1.0.0a31 → half_orm_dev-1.0.0a33}/README.md

@@ -353,29 +353,31 @@ half_orm dev upgrade [--to-release X.Y.Z]
 half_orm dev upgrade --dry-run
 ```
 
-### Data Bootstrap
+### Bootstrap - Data Initialization
 
-Mark patch files with `-- @HOP:bootstrap` (SQL) or `# @HOP:bootstrap` (Python) to declare reference data.
-The marker **must be on the first line** of the file:
+Bootstrap scripts initialize application data on empty databases. Place SQL and Python files in the `bootstrap/` directory:
 
-```sql
--- @HOP:bootstrap
-INSERT INTO roles (name) VALUES ('admin'), ('user') ON CONFLICT DO NOTHING;
 ```
-
-```python
-# @HOP:bootstrap
-# (no shebang — the file is executed directly by half-orm-dev)
-MyModel(field='value').ho_insert()
+bootstrap/
+├── 01-init-roles.sql
+├── 02-seed-config.py
+└── 03-reference-data.sql
 ```
 
-These files are automatically:
-- Copied to `bootstrap/` during `patch merge`
-- Executed during production `upgrade`
-- Tracked in database (each script runs once)
+Files are executed **alphabetically** during:
+- **Development**: Each `patch apply` (allows iteration on bootstrap scripts)
+- **Production**: Initial `clone` only (one-time initialization)
+
+For production data changes, use **patches** (not bootstrap).
 
-> **Note:** If the marker is not on the first line it is silently ignored.
-> A warning is displayed during `patch apply` to help catch this mistake.
+**Python files** can define a `run(model)` function to share the database connection:
+
+```python
+def run(model):
+    # model is the halfORM Model instance with active connection
+    MyModel = model.get_relation_class('schema.table')
+    MyModel(field='value').ho_insert()
+```
 
 **Note:** Use `half_orm dev <command> --help` for detailed help on each command.
 

half_orm_dev-1.0.0a33/half_orm_dev/_bootstrap_runner.py

@@ -0,0 +1,39 @@
+"""
+Internal entrypoint for running a single bootstrap script in a project's
+own virtual environment, as a subprocess.
+
+Invoked as:
+    <venv_python> -m half_orm_dev._bootstrap_runner <script_path> <database_name>
+
+Not a public API - used exclusively by
+half_orm_dev.file_executor.execute_python_bootstrap() when a venv_python
+is provided (i.e. the project declared its own dependencies via
+requirements.txt). Running via -m rather than a bare script path avoids
+needing to locate this file on disk from inside the target venv; it only
+needs half_orm_dev importable there, which pip install -e . already
+guarantees (pyproject.toml always depends on half_orm_dev).
+"""
+
+import importlib.util
+import sys
+
+from half_orm.model import Model
+
+
+def main() -> None:
+    script_path, database_name = sys.argv[1], sys.argv[2]
+
+    spec = importlib.util.spec_from_file_location('_bootstrap_script', script_path)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+
+    run = getattr(module, 'run', None)
+    if run is not None:
+        model = Model(database_name)
+        result = run(model)
+        if result is not None:
+            print(result)
+
+
+if __name__ == '__main__':
+    main()

{half_orm_dev-1.0.0a31 → half_orm_dev-1.0.0a33}/half_orm_dev/cli/commands/__init__.py

@@ -15,14 +15,13 @@ from .check import check
 from .set_git_origin import set_git_origin
 from .migrate import migrate
 from .revert_migration import revert_migration
-from .bootstrap import bootstrap
 from .rollback import rollback
 from .recover import recover
+from .restore import restore
 from .todo import apply_release
 
 # ♻️ Adapted existing commands
 from .todo import sync_package    # Unchanged
-from .todo import restore      # Adapted for new architecture
 
 # Registry of all available commands - Git-centric architecture
 ALL_COMMANDS = {
@@ -36,17 +35,16 @@ ALL_COMMANDS = {
     'set-git-origin': set_git_origin,  # Update git remote origin URL
     'migrate': migrate,        # Repository migration after upgrade
     'revert-migration': revert_migration,  # Revert last migration
-    'bootstrap': bootstrap,    # Execute data initialization scripts
     # 🚧 (stubs)
     'apply_release': apply_release,
 
     # 🚧 Emergency workflow (stubs)
     'rollback': rollback,
     'recover': recover,
+    'restore': restore,
 
     # ♻️ Adapted commands
     'sync-package': sync_package, # Unchanged
-    'restore': restore,          # Adapted
 }
 
 __all__ = [
@@ -58,9 +56,9 @@ __all__ = [
     'upgrade',
     'check',
     'migrate',
-    'bootstrap',
     'rollback',
     'recover',
+    'restore',
     # Adapted commands
     'sync_package',
     'ALL_COMMANDS'

{half_orm_dev-1.0.0a31 → half_orm_dev-1.0.0a33}/half_orm_dev/cli/commands/check.py

@@ -162,7 +162,7 @@ def _display_check_results(repo, result: dict, dry_run: bool, verbose: bool):
         click.echo(f"\n🔧 {utils.Color.bold('Orphaned patches')} ({len(orphaned_patches)}):")
         for patch_id in sorted(orphaned_patches):
             click.echo(f"  • {patch_id}")
-        click.echo(f"  {utils.Color.blue('(Use \"half_orm dev release attach-patch <id>\" to reattach)')}")
+        click.echo(f"""  {utils.Color.blue('(Use "half_orm dev release attach-patch <id>" to reattach)')}""")
 
     # Show standalone patch branches (not in candidates/stage)
     standalone_patches = [b for b in patch_branches

{half_orm_dev-1.0.0a31 → half_orm_dev-1.0.0a33}/half_orm_dev/cli/commands/clone.py

@@ -14,8 +14,8 @@ from half_orm_dev.repo import Repo, RepoError
 @click.argument('git_origin')
 @click.option('--database-name', default=None, help='Custom local database name (default: use project name)')
 @click.option('--dest-dir', default=None, help='Destination directory name (default: infer from git URL)')
-@click.option('--host', default='localhost', help='PostgreSQL host (default: localhost)')
-@click.option('--port', default=5432, type=int, help='PostgreSQL port (default: 5432)')
+@click.option('--host', default=None, help='PostgreSQL host (default: $PGHOST, then localhost)')
+@click.option('--port', default=None, type=int, help='PostgreSQL port (default: $PGPORT, then 5432)')
 @click.option('--user', default=None, help='Database user (default: $USER)')
 @click.option('--password', default=None, help='Database password (prompts if missing)')
 @click.option('--production', is_flag=True, help='Production mode (default: False)')

{half_orm_dev-1.0.0a31 → half_orm_dev-1.0.0a33}/half_orm_dev/cli/commands/init.py

@@ -25,8 +25,8 @@ class ProjectDirectoryExistsError(Exception):
 
 @click.command('init')
 @click.argument('project_name')
-@click.option('--host', default='localhost', help='PostgreSQL host (default: localhost)')
-@click.option('--port', default=5432, type=int, help='PostgreSQL port (default: 5432)')
+@click.option('--host', default=None, help='PostgreSQL host (default: $PGHOST, then localhost)')
+@click.option('--port', default=None, type=int, help='PostgreSQL port (default: $PGPORT, then 5432)')
 @click.option('--user', default=None, help='Database user (default: $USER)')
 @click.option('--password', default=None, help='Database password (prompts if missing)')
 @click.option('--git-origin', default=None, help='Git remote origin URL (prompts if missing)')
@@ -34,7 +34,15 @@ class ProjectDirectoryExistsError(Exception):
 @click.option('--force-sync-only', is_flag=True, help='Skip metadata installation, force sync-only mode')
 @click.option('--create-db', is_flag=False, default=True)
 @click.option('--docker', default='', help='Docker container name for PostgreSQL')
-def init(project_name, host, port, user, password, git_origin, production, force_sync_only, create_db, docker):
+@click.option(
+    '--with-meta', is_flag=False, flag_value='__ALL__', default=None,
+    metavar='[NAMES]',
+    help='Expose half_orm_meta data on the generated Model. Bare flag '
+         'exposes everything; pass a comma-separated allowlist of '
+         'fully-qualified relation names to expose only those, e.g. '
+         '--with-meta=half_orm_meta.identity.user'
+)
+def init(project_name, host, port, user, password, git_origin, production, force_sync_only, create_db, docker, with_meta):
     """
     Initialize a new half_orm_dev project with database and code structure.
 
@@ -187,10 +195,18 @@ def init(project_name, host, port, user, password, git_origin, production, force
         click.echo(f"📁 Creating project structure...")
 
         # Now safe to instantiate Repo (database is configured)
+        if with_meta is None:
+            with_half_orm_meta = False
+        elif with_meta == '__ALL__':
+            with_half_orm_meta = True
+        else:
+            with_half_orm_meta = with_meta
+
         repo = Repo()
         repo.init_git_centric_project(
             package_name=package_name,
-            git_origin=git_origin
+            git_origin=git_origin,
+            with_half_orm_meta=with_half_orm_meta
         )
 
         # ============================================================

{half_orm_dev-1.0.0a31 → half_orm_dev-1.0.0a33}/half_orm_dev/cli/commands/recover.py

@@ -41,6 +41,6 @@ def recover() -> None:
 
     if result['errors']:
         for error in result['errors']:
-            click.echo(utils.Color.yellow(f"Warning: {error}"), err=True)
+            click.echo(utils.Color.bold(f"Warning: {error}"), err=True)
 
     click.echo(utils.Color.green("Recovery complete."))

half_orm_dev-1.0.0a33/half_orm_dev/cli/commands/restore.py

@@ -0,0 +1,62 @@
+"""
+Restore command - Restore the development database to a given release.
+"""
+
+from pathlib import Path
+
+import click
+from half_orm_dev.repo import Repo, RepoError
+from half_orm import utils
+
+
+@click.command()
+@click.argument('release')
+def restore(release: str) -> None:
+    """
+    Restore the database to the state of RELEASE.
+
+    Drops all user schemas and reloads them, picking the most precise
+    snapshot available for RELEASE:
+
+    \b
+    1. .hop/model/release-RELEASE.sql   (production + patches staged
+       for that release, still in development)
+    2. .hop/model/schema-RELEASE.sql    (published snapshot of that
+       exact released version)
+
+    Fails with an error, rather than silently loading a different
+    version, if neither file exists.
+
+    \b
+    Examples:
+        # Restore to a release currently in development
+        half_orm dev restore 0.17.1
+
+        # Restore to an already-published version
+        half_orm dev restore 0.3.5
+    """
+    try:
+        repo = Repo()
+        click.echo(f"Restoring database to release {utils.Color.bold(release)}...")
+
+        release_schema_path = repo.get_release_schema_path(release)
+        schema_path = Path(repo.model_dir) / f"schema-{release}.sql"
+
+        if release_schema_path.exists():
+            repo.restore_database_from_release_schema(release)
+        elif schema_path.exists():
+            repo.restore_database_from_version_schema(release)
+        else:
+            raise RepoError(
+                f"No schema found for release '{release}': neither "
+                f"{release_schema_path.name} nor {schema_path.name} "
+                f"exists in {repo.model_dir}."
+            )
+
+        click.echo(f"✓ {utils.Color.green('Database restored to')} {utils.Color.bold(release)}")
+    except RepoError as e:
+        click.echo(utils.Color.red(f"\n❌ {e}"), err=True)
+        raise click.Abort()
+    except Exception as e:
+        click.echo(utils.Color.red(f"\n❌ Unexpected error: {e}"), err=True)
+        raise click.Abort()

{half_orm_dev-1.0.0a31 → half_orm_dev-1.0.0a33}/half_orm_dev/cli/commands/todo.py

@@ -42,7 +42,6 @@ def todo(ctx):
         'create-hotfix': 'Create emergency hotfix bypassing normal workflow',
         'rollback': 'Rollback database to previous version using backups/',
         'sync-package': 'Synchronize Python package with database model',
-        'restore': 'Restore database to specific version (adapt for new backups)',
         'list-patches': 'List all patches in Patches/ directory',
         'status': 'Show development status with patch/release information',
         'apply-release': 'Apply next release',
@@ -70,4 +69,3 @@ status = todo
 
 # ♻️ Commands to adapt (also in todo for now)
 sync_package = todo   # Keep functionality, adapt to new architecture
-restore = todo        # Adapt for new backup/restore logic

{half_orm_dev-1.0.0a31 → half_orm_dev-1.0.0a33}/half_orm_dev/cli/main.py

@@ -60,8 +60,8 @@ class Hop:
             return ['sync-package', 'check']
 
         # DEVELOPMENT ENVIRONMENT - Patch development
-        return ['patch', 'release', 'check', 'bootstrap', 'set-git-origin',
-                'revert-migration', 'recover']
+        return ['patch', 'release', 'check', 'set-git-origin',
+                'revert-migration', 'recover', 'restore']
 
     @property
     def repo_checked(self):