half-orm-dev 1.0.0a9__tar.gz → 1.0.0a11__tar.gz

{half_orm_dev-1.0.0a9/half_orm_dev.egg-info → half_orm_dev-1.0.0a11}/PKG-INFO

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

@@ -423,18 +423,66 @@ def __get_inheritance_info(rel, package_name):
 
 
 def __get_fkeys(repo, class_name, module_path):
+    """Read the Fkeys dict from the module file using AST, without importing.
+
+    Importing via importlib requires the project package to be on sys.path,
+    which is not guaranteed during `hop migrate`.  Parsing with ast reads
+    directly from the file on disk regardless of installation state.
+    """
+    if not os.path.exists(module_path):
+        return {}
     try:
-        mod_path = module_path.replace(str(repo.base_dir), '').replace(os.path.sep, '.')[1:-3]
-        mod = importlib.import_module(mod_path)
-        importlib.reload(mod)
-        cls = mod.__dict__[class_name]
-        fkeys = cls.__dict__.get('Fkeys', {})
-        return fkeys
-    except ModuleNotFoundError:
+        import ast
+        source = utils.read(module_path)
+        tree = ast.parse(source)
+        for node in ast.walk(tree):
+            if isinstance(node, ast.ClassDef) and node.name == class_name:
+                for stmt in node.body:
+                    if (isinstance(stmt, ast.Assign)
+                            and len(stmt.targets) == 1
+                            and isinstance(stmt.targets[0], ast.Name)
+                            and stmt.targets[0].id == 'Fkeys'):
+                        return ast.literal_eval(stmt.value)
+    except Exception:
         pass
     return {}
 
 
+def __apply_fkey_aliases_to_doc(documentation: str, rel, existing_fkeys: dict) -> str:
+    """Replace the Fkeys block in the docstring using the developer's aliases.
+
+    For each constraint already aliased in existing_fkeys the alias is preserved.
+    New constraints (not yet aliased) fall back to the default rfk_/fk_ name.
+    This prevents spurious diffs when generate() runs automatically on branches
+    where the developer has already defined aliases.
+    """
+    import re
+    if not rel._ho_fkeys:
+        return documentation
+
+    # Invert existing_fkeys: constraint_name → alias (skip empty aliases)
+    aliases = {constraint: alias for alias, constraint in existing_fkeys.items() if alias}
+
+    lines = ["        Fkeys = {"]
+    for constraint_name in rel._ho_fkeys:
+        if constraint_name in aliases:
+            key = aliases[constraint_name]
+        elif constraint_name.startswith('_reverse_fkey_'):
+            key = 'rfk_' + constraint_name[len('_reverse_fkey_'):]
+        else:
+            key = 'fk_' + constraint_name
+        lines.append(f"            '{key}': '{constraint_name}',")
+    lines.append("        }")
+    new_block = '\n'.join(lines)
+
+    return re.sub(
+        r'        Fkeys = \{[^}]*\}',
+        new_block,
+        documentation,
+        flags=re.DOTALL,
+    )
+
+
 def __assemble_module_template(module_path):
     """Construct the module after slicing it if it already exists."""
     ALT_BEGIN_CODE = "#>>> PLACE YOUR CODE BELLOW THIS LINE. DO NOT REMOVE THIS LINE!\n"
@@ -506,7 +554,7 @@ def __update_this_module(
     if not os.path.exists(path_1):
         os.makedirs(path_1)
 
-    # Read user-defined Fkeys aliases (for dataclass generation only).
+    # Read user-defined Fkeys aliases (for docstring and dataclass generation).
     existing_fkeys = __get_fkeys(repo, class_name, module_path)
 
     module_template = __assemble_module_template(module_path)
@@ -519,6 +567,7 @@ def __update_this_module(
     # 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:]])
+        documentation = __apply_fkey_aliases_to_doc(documentation, rel, existing_fkeys)
         file_.write(
             module_template.format(
                 hop_release = hop_version(),

half_orm_dev-1.0.0a11/half_orm_dev/version.txt

@@ -0,0 +1 @@
+1.0.0-a11

{half_orm_dev-1.0.0a9 → half_orm_dev-1.0.0a11/half_orm_dev.egg-info}/PKG-INFO

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

@@ -1 +0,0 @@
-1.0.0-a9