models can be now inspected as a package as well (#160)

* models can be now inspected as a package as well * tests altered a bit as new version of libraries give slightly different error messages

Author: mumtozvalijonov

fastapi_contrib/db/utils.py

@@ -3,6 +3,7 @@
 import pkgutil
 import pyclbr
 import random
+import inspect
 
 from typing import List
 
@@ -83,19 +84,22 @@ def get_models() -> list:
  models = []
  for app in settings.apps:
  app_path = f"{apps_folder_name}/{app}"
- modules = [f[1] for f in pkgutil.walk_packages(path=[app_path])]
- if "models" in modules:
+ modules = [f for f in pkgutil.walk_packages(path=[app_path]) if f.name == 'models']
+ if not modules:
+ continue
+ for module in modules:
  path_to_models = f"{apps_folder_name}.{app}.models"
- try:
- module_models = pyclbr.readmodule(path_to_models).keys()
- except (AttributeError, ImportError):
- logger.warning(
- f"Unable to read module attributes in {path_to_models}"
- )
- continue
- mudule = importlib.import_module(
- f"{apps_folder_name}.{app}.models"
- )
+ mudule = importlib.import_module(path_to_models)
+ if module.ispkg:
+ module_models = [x[0] for x in inspect.getmembers(mudule, inspect.isclass)]
+ else:
+ try:
+ module_models = pyclbr.readmodule(path_to_models).keys()
+ except (AttributeError, ImportError):
+ logger.warning(
+ f"Unable to read module attributes in {path_to_models}"
+ )
+ continue
  models.extend([getattr(mudule, model) for model in module_models])
 
  return list(filter(lambda x: issubclass(x, MongoDBModel), models))

tests/test_exception_handlers.py

@@ -244,7 +244,7 @@ def test_exception_handler_when_choice_invalid():
  assert response["message"] == "Validation error."
  assert response["fields"] == [
  {
- "message": "One or more values provided are not valid.",
+ "message": "Value is not a valid enumeration member; permitted: 'a', 'b', 'c'.",
  "name": "kind",
  "error_code": 400,
  }
@@ -262,7 +262,7 @@ def test_exception_handler_when_one_of_multi_choice_invalid():
  assert response["message"] == "Validation error."
  assert response["fields"] == [
  {
- "message": "One or more values provided are not valid.",
+ "message": "Value is not a valid enumeration member; permitted: 'a', 'b', 'c'.",
  "name": "multi",
  "error_code": 400,
  }
@@ -280,7 +280,7 @@ def test_exception_handler_when_choice_default_and_received_invalid():
  assert response["message"] == "Validation error."
  assert response["fields"] == [
  {
- "message": "One or more values provided are not valid.",
+ "message": "Value is not a valid enumeration member; permitted: 'a', 'b', 'c'.",
  "name": "kind",
  "error_code": 400,
  }
@@ -300,7 +300,7 @@ def test_exception_handler_when_choice_default_and_received_invalid():
  assert response["message"] == "Validation error."
  assert response["fields"] == [
  {
- "message": "One or more values provided are not valid.",
+ "message": "Value is not a valid enumeration member; permitted: 'a', 'b', 'c'.",
  "name": "kind",
  "error_code": 400,
  },