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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a24
+Version: 1.0.0a26
 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-1.0.0a26}/half_orm_dev/cli/commands/release.py

@@ -526,6 +526,10 @@ def release_attach_patch(patch_id: str, force: bool) -> None:
 
         version = current_branch.replace('ho-release/', '')
 
+        # Accept full branch name or short patch ID
+        if patch_id.startswith('ho-patch/'):
+            patch_id = patch_id[len('ho-patch/'):]
+
         # Confirmation
         if not force:
             click.echo(f"Attaching patch '{patch_id}' to release {version}")

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

@@ -624,7 +624,12 @@ class MigrationManager:
             b['name'] for b in branches_status.get('release_branches', [])
             if b.get('exists_on_remote', True)
         ]
-        all_branches = ['ho-prod'] + release_branches + patch_branches
+        # ho-patch/* branches are excluded: their schema includes tables that
+        # don't yet exist in production, so restoring the production schema
+        # before generate() would delete the modules for those new tables and
+        # erase user-written code (Fkeys, business methods). The developer
+        # will re-run `hop patch apply` which regenerates with the correct schema.
+        all_branches = ['ho-prod'] + release_branches
 
         for branch in all_branches:
             try:

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

@@ -173,9 +173,11 @@ def __get_field_desc(field_name, field):
         field_desc = f'{field_desc.__module__}.{ext}'
     else:
         field_desc = field_desc.__name__
-    value = 'dataclasses.field(default=None)'
     if field._metadata['fieldtype'][0] == '_':
         value = 'dataclasses.field(default_factory=list)'
+    else:
+        value = 'dataclasses.field(default=None)'
+        field_desc = f'Optional[{field_desc}]'
     field_desc = f'{field_desc} = {value}'
     field_desc = f"    {field_name}: {field_desc}"
     error = utils.check_attribute_name(field_name)
@@ -188,10 +190,10 @@ def __gen_dataclass(relation, fkeys):
     rel = relation()
     dc_name = relation._ho_dataclass_name()
     fields = []
-    post_init = ['    def __post_init__(self):']
+    post_init = ['    def __post_init__(self) -> None:']
     for field_name, field in rel._ho_fields.items():
         fields.append(__get_field_desc(field_name, field))
-        post_init.append(f'        self.{field_name}: Field = None')
+        post_init.append(f'        self.{field_name}: Optional[Field] = None')
 
     # Invert user-defined aliases: constraint_name → alias
     aliases = {constraint: alias for alias, constraint in fkeys.items() if alias != ''}
@@ -518,15 +520,22 @@ def __update_this_module(
     fields = []
     kwargs = []
     arg_names = []
+    type_import_modules: set = set()
     for key, value in rel._ho_fields.items():
         error = utils.check_attribute_name(key)
         if not error:
             fields.append(f"self.{key}: Field = None")
             kwarg_type = 'typing.Any'
             if hasattr(value.py_type, '__name__'):
-                kwarg_type = str(value.py_type.__name__)
-            kwargs.append(f"{key}: '{kwarg_type}'=None")
+                mod = getattr(value.py_type, '__module__', 'builtins')
+                if mod and mod != 'builtins':
+                    type_import_modules.add(mod)
+                    kwarg_type = f'{mod}.{value.py_type.__name__}'
+                else:
+                    kwarg_type = str(value.py_type.__name__)
+            kwargs.append(f"{key}: 'typing.Optional[{kwarg_type}]'=None")
             arg_names.append(f'{key}={key}')
+    type_imports = '\n'.join(f'import {m}' for m in sorted(type_import_modules))
     fields = "\n        ".join(fields)
     kwargs.append('**kwargs')
     kwargs = ", ".join(kwargs)
@@ -575,6 +584,7 @@ def __update_this_module(
                 fqtn=fqtn,
                 kwargs=kwargs,
                 arg_names=arg_names,
+                type_imports=type_imports,
                 warning=WARNING_TEMPLATE.format(package_name=package_name)))
 
     # Generate test file in tests/ directory structure
@@ -641,7 +651,7 @@ def __gen_dc_relation() -> tuple:
         if is_classmethod:
             block.append('    @classmethod')
         prefix = '    async def' if is_async else '    def'
-        block.append(f'{prefix} {name}{sig_str}:')
+        block.append(f'{prefix} {name}{sig_str}:  # type: ignore[empty-body]')
         if doc:
             block.append(_fmt_doc(doc))
         block.append('        ...')
@@ -670,29 +680,29 @@ def __gen_baseclass(relation, fkeys) -> str:
 
     lines = [
         f"class {bc_name}(",
-        f"    MODEL.get_relation_class('{fqtn}', fields_aliases=None),",
+        f"    MODEL.get_relation_class('{fqtn}', fields_aliases=None),  # type: ignore[misc]",
         f"    {dc_name}",
         f"):",
         f"    def __iter__(self) -> Iterator[{d}]:",
-        f"        return super().__iter__()",
+        f"        return super().__iter__()  # type: ignore[return-value]",
         f"",
-        f"    def ho_select(self, *args, distinct: bool = False, order_by: str = None, limit: int = None, offset: int = None, json_agg=None) -> Iterator[{d}]:",
-        f"        return super().ho_select(*args, distinct=distinct, order_by=order_by, limit=limit, offset=offset, json_agg=json_agg)",
+        f"    def ho_select(self, *args, distinct: bool = False, order_by: Optional[str] = None, limit: Optional[int] = None, offset: Optional[int] = None, json_agg=None) -> Iterator[{d}]:",
+        f"        return super().ho_select(*args, distinct=distinct, order_by=order_by, limit=limit, offset=offset, json_agg=json_agg)  # type: ignore[return-value]",
         f"",
-        f"    def ho_get(self, *args) -> {d}:",
-        f"        return super().ho_get(*args)",
+        f"    def ho_get(self, *args) -> {d}:  # type: ignore[override]",
+        f"        return super().ho_get(*args)  # type: ignore[return-value]",
         f"",
-        f"    def ho_insert(self, *args, upsert: Optional[bool] = False) -> {d}:",
-        f"        return super().ho_insert(*args, upsert=upsert)",
+        f"    def ho_insert(self, *args, upsert: Optional[bool] = False) -> {d}:  # type: ignore[override]",
+        f"        return super().ho_insert(*args, upsert=upsert)  # type: ignore[return-value]",
         f"",
-        f"    async def ho_aselect(self, *args, distinct: bool = False, order_by: str = None, limit: int = None, offset: int = None) -> List[{d}]:",
-        f"        return await super().ho_aselect(*args, distinct=distinct, order_by=order_by, limit=limit, offset=offset)",
+        f"    async def ho_aselect(self, *args, distinct: bool = False, order_by: Optional[str] = None, limit: Optional[int] = None, offset: Optional[int] = None) -> List[{d}]:",
+        f"        return await super().ho_aselect(*args, distinct=distinct, order_by=order_by, limit=limit, offset=offset)  # type: ignore[return-value]",
         f"",
-        f"    async def ho_aget(self, *args) -> {d}:",
-        f"        return await super().ho_aget(*args)",
+        f"    async def ho_aget(self, *args) -> {d}:  # type: ignore[override]",
+        f"        return await super().ho_aget(*args)  # type: ignore[return-value]",
         f"",
-        f"    async def ho_ainsert(self, *args, upsert: bool = False) -> {d}:",
-        f"        return await super().ho_ainsert(*args, upsert=upsert)",
+        f"    async def ho_ainsert(self, *args, upsert: bool = False) -> {d}:  # type: ignore[override]",
+        f"        return await super().ho_ainsert(*args, upsert=upsert)  # type: ignore[return-value]",
     ]
     return '\n'.join(lines)
 
@@ -716,10 +726,10 @@ def __gen_baseclasses(package_dir, package_name):
         typing_names = sorted(dc_typing | {'Iterator', 'List', 'Optional', 'TYPE_CHECKING'})
         file_.write(f"from typing import {', '.join(typing_names)}\n")
         file_.write("import dataclasses\n")
-        file_.write("from half_orm.field import Field\n")
+        file_.write("from half_orm.field import Field  # type: ignore[import-not-found]\n")
         for mod in sorted(HO_DATACLASSES_IMPORTS):
             file_.write(f"import {mod}\n")
-        file_.write(f"from {package_name} import MODEL\n")
+        file_.write(f"from {package_name} import MODEL  # type: ignore[import-not-found]\n")
         if HO_BASECLASSES_DICT_NAMES:
             file_.write("if TYPE_CHECKING:\n")
             file_.write(f"    from {package_name}.ho_typeddicts import (\n")

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

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

half_orm_dev-1.0.0a26/half_orm_dev/version.txt

@@ -0,0 +1 @@
+1.0.0-a26

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: half_orm_dev
-Version: 1.0.0a24
+Version: 1.0.0a26
 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-1.0.0a26}/half_orm_dev.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ half_orm_dev/migration_manager.py
 half_orm_dev/modules.py
 half_orm_dev/patch_manager.py
 half_orm_dev/patch_validator.py
+half_orm_dev/py.typed
 half_orm_dev/release_file.py
 half_orm_dev/release_manager.py
 half_orm_dev/repo.py

{half_orm_dev-1.0.0a24 → half_orm_dev-1.0.0a26}/pyproject.toml

@@ -45,6 +45,7 @@ include = ["half_orm_dev*"]
 
 [tool.setuptools.package-data]
 half_orm_dev = [
+    "py.typed",
     "templates/*",
     "templates/git-hooks/*",
     "templates/.gitignore",

half_orm_dev-1.0.0a24/half_orm_dev/version.txt

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