half-orm-dev 1.0.0a4__tar.gz → 1.0.0a5__tar.gz

{half_orm_dev-1.0.0a4/half_orm_dev.egg-info → half_orm_dev-1.0.0a5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a4
+Version: 1.0.0a5
 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.0a4 → half_orm_dev-1.0.0a5}/half_orm_dev/modules.py

@@ -304,8 +304,7 @@ def __gen_typedict(relation, fkeys) -> list:
     """Generate TypedDict class(es) for a relation.
 
     Returns a list of class strings: nested JSON TypedDicts first, then the main class.
-    FK fields starting with 'rfk_' (reverse) are typed List['TargetDict'];
-    all other FK fields are typed 'TargetDict'.
+    Only database columns are included — FK accessor attributes are not part of a row dict.
     json/jsonb fields with a json_schema generate nested TypedDict classes.
     """
     rel = relation()
@@ -332,24 +331,6 @@ def __gen_typedict(relation, fkeys) -> list:
             line = f"# {line}  # FIX ME! {error}"
         fields.append(line)
 
-    aliases = {constraint: alias for alias, constraint in fkeys.items() if alias != ''}
-    for constraint_name, fkey in rel._ho_fkeys.items():
-        if constraint_name in aliases:
-            attr_name = aliases[constraint_name]
-        elif constraint_name.startswith('_reverse_fkey_'):
-            attr_name = 'rfk_' + constraint_name[len('_reverse_fkey_'):]
-        else:
-            attr_name = 'fk_' + constraint_name
-        try:
-            fk_fqrn = list(fkey()._t_fqrn)
-            target_name = f'{__get_full_class_name(fk_fqrn[1], fk_fqrn[2])}Dict'
-        except Exception:
-            target_name = dict_class_name
-        if attr_name.startswith('rfk_'):
-            fields.append(f"    {attr_name}: Optional[List['{target_name}']]")
-        else:
-            fields.append(f"    {attr_name}: Optional['{target_name}']")
-
     body = '\n'.join(fields) if fields else '    pass'
     main_class = f'class {dict_class_name}(TypedDict, total=False):\n{body}'
     return extra_classes + [main_class]
@@ -521,6 +502,9 @@ def __update_this_module(
     inheritance_import, inherited_classes = __get_inheritance_info(
         rel, package_name)
 
+    t_qrn = list(rel._t_fqrn)[1:]
+    dict_class_name = f'{__get_full_class_name(*t_qrn)}Dict'
+
     # Generate Python module
     with open(module_path, 'w', encoding='utf-8') as file_:
         documentation = "\n".join([line and f"    {line}" or "" for line in str(rel).split("\n")[1:]])
@@ -534,6 +518,7 @@ def __update_this_module(
                 inherited_classes=inherited_classes,
                 class_name=class_name,
                 dc_name=rel._ho_dataclass_name(),
+                dict_class_name=dict_class_name,
                 fqtn=fqtn,
                 kwargs=kwargs,
                 arg_names=arg_names,

{half_orm_dev-1.0.0a4 → half_orm_dev-1.0.0a5}/half_orm_dev/release_manager.py

@@ -2497,6 +2497,12 @@ class ReleaseManager:
 
         # Save original branch for rollback
         original_branch = self._repo.hgit.branch
+        # Save schema.sql symlink target so rollback can restore it if
+        # _generate_schema_sql updates it before a failure.
+        _schema_sql = Path(self._repo.model_dir) / 'schema.sql'
+        original_schema_link = (
+            os.readlink(str(_schema_sql)) if _schema_sql.is_symlink() else None
+        )
 
         try:
             # 5. Create temporary branch from release branch (validation only)
@@ -2547,6 +2553,15 @@ class ReleaseManager:
                 staged_patches = release_file.get_patches(status="staged")
                 self._create_prod_snapshot(version, staged_patches, release_file, model_dir)
 
+                # 10b. Passe 2: validate all bootstrap scripts against final schema.
+                # schema.sql now points to schema-X.Y.Z.sql (just generated).
+                # restore_database_from_schema() resets the DB and runs ALL pending
+                # bootstrap scripts in order — exactly what a fresh clone does.
+                # Any failure here aborts promotion before the commit.
+                print(f"\n🔍 Validating bootstrap scripts against schema {version}...")
+                self._repo.restore_database_from_schema()
+                print(f"✓ Bootstrap validation passed")
+
                 # 11. Commit the merge with all promote changes included
                 self._repo.hgit.add(".")
                 self._repo.hgit.commit("-m", commit_msg)
@@ -2625,6 +2640,15 @@ class ReleaseManager:
                 except GitCommandError:
                     pass
 
+                # Restore tracked files deleted/modified outside of git control
+                # during the merge window (by _generate_schema_sql and
+                # _create_prod_snapshot). merge_abort resets the index but
+                # not working-tree files that were deleted directly on disk.
+                try:
+                    self._repo.hgit.checkout('HEAD', '--', '.')
+                except GitCommandError:
+                    pass
+
                 # Return to original branch
                 try:
                     self._repo.hgit.checkout(original_branch)
@@ -2641,6 +2665,17 @@ class ReleaseManager:
                 except GitCommandError:
                     pass  # Already deleted (prod validation complete) or never created
 
+                # Restore schema.sql symlink if _generate_schema_sql changed it
+                # before the failure (merge_abort does not undo symlink changes
+                # made outside of the merge commit itself).
+                if original_schema_link is not None:
+                    try:
+                        if _schema_sql.is_symlink() and os.readlink(str(_schema_sql)) != original_schema_link:
+                            _schema_sql.unlink()
+                            _schema_sql.symlink_to(original_schema_link)
+                    except OSError:
+                        pass
+
             except (GitCommandError, TypeError) as cleanup_error:
                 print(f"  Warning: Cleanup failed: {cleanup_error}", file=sys.stderr)
 

{half_orm_dev-1.0.0a4 → half_orm_dev-1.0.0a5}/half_orm_dev/repo.py

@@ -868,12 +868,14 @@ class Repo:
 
             # Check if working directory is clean
             if git_repo.is_dirty(untracked_files=False):
+                status = git_repo.git.status('--short')
                 raise RepoError(
                     f"Working directory has uncommitted changes.\n"
                     f"Please commit or stash your changes before running this command:\n"
                     f"  git stash\n"
                     f"  OR\n"
-                    f"  git add . && git commit -m \"your message\""
+                    f"  git add . && git commit -m \"your message\"\n"
+                    f"Dirty files:\n{status}"
                 )
 
             # Switch to ho-prod temporarily
@@ -2494,11 +2496,14 @@ Each script is executed only once unless `--force` is used.
             # up_to_version prevents bootstraps from future versions from running.
             from half_orm_dev.bootstrap_manager import BootstrapManager
             bootstrap_mgr = BootstrapManager(self)
-            bootstrap_mgr.run_bootstrap(
+            result = bootstrap_mgr.run_bootstrap(
                 exclude_patch_id=exclude_bootstrap_patch_id,
                 exclude_version=exclude_bootstrap_version,
                 up_to_version=exclude_bootstrap_version
             )
+            if result['errors']:
+                error_msg = "\n".join([f"  • {f}: {e}" for f, e in result['errors']])
+                raise RepoError(f"Bootstrap execution failed:\n{error_msg}")
 
         except RepoError:
             # Re-raise RepoError as-is

{half_orm_dev-1.0.0a4 → half_orm_dev-1.0.0a5}/half_orm_dev/templates/module_template_1

@@ -6,7 +6,10 @@ WARNING!
 
 {warning}
 """
+from typing import TYPE_CHECKING, Iterator
 from half_orm.model import register
 from {package_name} import MODEL, ho_dataclasses
+if TYPE_CHECKING:
+    from {package_name}.ho_typeddicts import {dict_class_name}
 fields_aliases=None
 

{half_orm_dev-1.0.0a4 → half_orm_dev-1.0.0a5}/half_orm_dev/templates/module_template_3

@@ -1,3 +1,6 @@
     #pylint: disable=line-too-long, too-many-arguments, redefined-builtin, too-many-positional-arguments
     def __init__(self, {kwargs}):
-        super().__init__({arg_names}, **kwargs)
+        super().__init__({arg_names}, **kwargs)
+
+    def __iter__(self) -> 'Iterator[{dict_class_name}]':
+        return super().__iter__()

half_orm_dev-1.0.0a5/half_orm_dev/version.txt

@@ -0,0 +1 @@
+1.0.0-a5

{half_orm_dev-1.0.0a4 → half_orm_dev-1.0.0a5/half_orm_dev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a4
+Version: 1.0.0a5
 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.0a4/half_orm_dev/version.txt

@@ -1 +0,0 @@
-1.0.0-a4