Fix package model detection (#575)

Author: droserasprout

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog], and this project adheres to [Semantic Versioning].
 
+## [Unreleased]
+
+### Fixed
+
+- models: Fixed package model detection.
+
 ## [6.4.0] - 2022-12-20
 
 ### Fixed
@@ -15,7 +21,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 ## [6.4.0rc1] - 2022-12-09
 
-## Added
+### Added
 
 - config: Added optional `code_hash` field to contract config.
 - context: Added `first_level` and `last_level` arguments to `ctx.add_index` methods.

docs/deployment/docker.md

@@ -9,7 +9,7 @@ DipDup provides multiple prebuilt images for different environments hosted on [D
 | base image | `python:3.10-slim` | `python:3.10-slim` | `python:3.10-alpine` |
 | platforms | `amd64`, `arm64` | `amd64`, `arm64` | `amd64`, `arm64` |
 | latest tag | `{{ cookiecutter.dipdup_version }}` | `{{ cookiecutter.dipdup_version }}-pytezos` | `{{ cookiecutter.dipdup_version }}-slim` |
-| image size | 352M | 481M | 136M | <!-- TODO: Possibly outdated -->
+| image size | 356M | 476M | 139M |
 | `dipdup init` command | ✅ | ✅ | ❌ |
 | `git` and `poetry` included | ✅ | ✅ | ❌ |
 | PyTezos included | ❌ | ✅ | ❌

src/dipdup/utils/database.py

@@ -91,7 +91,15 @@ def is_model_class(obj: Any) -> bool:
     """Is subclass of tortoise.Model, but not the base class"""
     from dipdup.models import Model
 
-    return isinstance(obj, type) and issubclass(obj, TortoiseModel) and obj not in (TortoiseModel, Model)
+    if not isinstance(obj, type):
+        return False
+    if not issubclass(obj, TortoiseModel):
+        return False
+    if obj in (TortoiseModel, Model):
+        return False
+    if obj._meta.abstract:
+        return False
+    return True
 
 
 def iter_models(package: Optional[str]) -> Iterator[tuple[str, Type[TortoiseModel]]]:
@@ -114,8 +122,6 @@ def iter_models(package: Optional[str]) -> Iterator[tuple[str, Type[TortoiseMode
 
             attr_value = getattr(module, attr)
             if is_model_class(attr_value):
-                if getattr(getattr(attr_value, 'Meta', None), 'abstract', False):
-                    continue
                 yield app, attr_value
 
 

tests/replays/c0fda4857a03b944f0d9363fb906fbe3d6c0498c4d53a490a2e08288d1014fd2

@@ -7,6 +7,7 @@
 from dipdup.transactions import TransactionManager
 from dipdup.utils import pascal_to_snake
 from dipdup.utils import snake_to_pascal
+from dipdup.utils.database import iter_models
 from dipdup.utils.database import tortoise_wrapper
 
 
@@ -62,3 +63,11 @@ async def test_humps_helpers() -> None:
     assert snake_to_pascal('foobar') == 'Foobar'
     assert snake_to_pascal('foo__bar') == 'FooBar'
     assert snake_to_pascal('FOOBAR') == 'Foobar'
+
+
+async def test_iter_models() -> None:
+    models = list(iter_models('demo_token'))
+    assert len(models) == 8
+    assert models[0][0] == 'int_models'
+    assert models[-1][0] == 'models'
+