plain 0.23.1__tar.gz → 0.24.0__tar.gz

{plain-0.23.1 → plain-0.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain
-Version: 0.23.1
+Version: 0.24.0
 Summary: A web framework for building products with Python.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE

{plain-0.23.1 → plain-0.24.0}/plain/assets/finders.py

@@ -1,6 +1,6 @@
 import os
 
-from plain.packages import packages
+from plain.packages import packages_registry
 from plain.runtime import APP_PATH
 
 APP_ASSETS_DIR = APP_PATH / "assets"
@@ -33,7 +33,7 @@ def iter_assets():
 
 def iter_asset_dirs():
     # Iterate the installed package assets, in order
-    for pkg in packages.get_package_configs():
+    for pkg in packages_registry.get_package_configs():
         asset_dir = os.path.join(pkg.path, "assets")
         if os.path.exists(asset_dir):
             yield asset_dir

{plain-0.23.1 → plain-0.24.0}/plain/cli/cli.py

@@ -16,7 +16,7 @@ import plain.runtime
 from plain import preflight
 from plain.assets.compile import compile_assets, get_compiled_path
 from plain.exceptions import ImproperlyConfigured
-from plain.packages import packages
+from plain.packages import packages_registry
 from plain.utils.crypto import get_random_string
 
 from .formatting import PlainContext
@@ -161,7 +161,7 @@ def preflight_checks(package_label, deploy, fail_level, databases):
 
     if package_label:
         package_configs = [
-            packages.get_package_config(label) for label in package_label
+            packages_registry.get_package_config(label) for label in package_label
         ]
     else:
         package_configs = None

{plain-0.23.1 → plain-0.24.0}/plain/cli/packages.py

@@ -4,7 +4,7 @@ from importlib.util import find_spec
 
 import click
 
-from plain.packages import packages
+from plain.packages import packages_registry
 
 
 class InstalledPackagesGroup(click.Group):
@@ -21,7 +21,7 @@ class InstalledPackagesGroup(click.Group):
         command_names = []
 
         # Get installed packages with a cli.py module
-        for app in packages.get_package_configs():
+        for app in packages_registry.get_package_configs():
             if not find_spec(f"{app.name}.{self.MODULE_NAME}"):
                 continue
 

plain-0.24.0/plain/packages/__init__.py

@@ -0,0 +1,4 @@
+from .config import PackageConfig
+from .registry import packages_registry
+
+__all__ = ["PackageConfig", "packages_registry"]

{plain-0.23.1 → plain-0.24.0}/plain/packages/config.py

@@ -6,7 +6,6 @@ from plain.exceptions import ImproperlyConfigured
 from plain.utils.module_loading import import_string, module_has_submodule
 
 CONFIG_MODULE_NAME = "config"
-MODELS_MODULE_NAME = "models"
 
 
 class PackageConfig:
@@ -24,7 +23,7 @@ class PackageConfig:
 
         # Reference to the Packages registry that holds this PackageConfig. Set by the
         # registry when it registers the PackageConfig instance.
-        self.packages = None
+        self.packages_registry = None
 
         # The following attributes could be defined at the class level in a
         # subclass, hence the test-and-set pattern.
@@ -43,15 +42,6 @@ class PackageConfig:
         if not hasattr(self, "path"):
             self.path = self._path_from_module(package_module)
 
-        # Module containing models e.g. <module 'plain.admin.models'
-        # from 'admin/models.py'>. Set by import_models().
-        # None if the application doesn't have a models module.
-        self.models_module = None
-
-        # Mapping of lowercase model names to model classes. Initially set to
-        # None to prevent accidental access before import_models() runs.
-        self.models = None
-
     def __repr__(self):
         return f"<{self.__class__.__name__}: {self.label}>"
 
@@ -200,53 +190,6 @@ class PackageConfig:
         # Entry is a path to an app config class.
         return package_config_class(package_name, package_module)
 
-    def get_model(self, model_name, require_ready=True):
-        """
-        Return the model with the given case-insensitive model_name.
-
-        Raise LookupError if no model exists with this name.
-        """
-        if require_ready:
-            self.packages.check_models_ready()
-        else:
-            self.packages.check_packages_ready()
-        try:
-            return self.models[model_name.lower()]
-        except KeyError:
-            raise LookupError(
-                f"Package '{self.label}' doesn't have a '{model_name}' model."
-            )
-
-    def get_models(self, include_auto_created=False, include_swapped=False):
-        """
-        Return an iterable of models.
-
-        By default, the following models aren't included:
-
-        - auto-created models for many-to-many relations without
-          an explicit intermediate table,
-        - models that have been swapped out.
-
-        Set the corresponding keyword argument to True to include such models.
-        Keyword arguments aren't documented; they're a private API.
-        """
-        self.packages.check_models_ready()
-        for model in self.models.values():
-            if model._meta.auto_created and not include_auto_created:
-                continue
-            if model._meta.swapped and not include_swapped:
-                continue
-            yield model
-
-    def import_models(self):
-        # Dictionary of models for this app, primarily maintained in the
-        # 'all_models' attribute of the Packages this PackageConfig is attached to.
-        self.models = self.packages.all_models[self.label]
-
-        if module_has_submodule(self.module, MODELS_MODULE_NAME):
-            models_module_name = f"{self.name}.{MODELS_MODULE_NAME}"
-            self.models_module = import_module(models_module_name)
-
     def ready(self):
         """
         Override this method in subclasses to run code when Plain starts.

{plain-0.23.1 → plain-0.24.0}/plain/packages/registry.py

@@ -10,7 +10,7 @@ from plain.exceptions import ImproperlyConfigured, PackageRegistryNotReady
 from .config import PackageConfig
 
 
-class Packages:
+class PackagesRegistry:
     """
     A registry that stores the configuration of installed applications.
 
@@ -21,7 +21,9 @@ class Packages:
         # installed_packages is set to None when creating the main registry
         # because it cannot be populated at that point. Other registries must
         # provide a list of installed packages and are populated immediately.
-        if installed_packages is None and hasattr(sys.modules[__name__], "packages"):
+        if installed_packages is None and hasattr(
+            sys.modules[__name__], "packages_registry"
+        ):
             raise RuntimeError("You must supply an installed_packages argument.")
 
         # Mapping of app labels => model names => model classes.
@@ -90,7 +92,7 @@ class Packages:
                     )
 
                 self.package_configs[package_config.label] = package_config
-                package_config.packages = self
+                package_config.packages_registry = self
 
             # Check for duplicate app names.
             counts = Counter(
@@ -106,18 +108,14 @@ class Packages:
 
             self.packages_ready = True
 
-            # Phase 2: import models modules.
-            for package_config in self.package_configs.values():
-                package_config.import_models()
+            # Phase 3: run ready() methods of app configs.
+            for package_config in self.get_package_configs():
+                package_config.ready()
 
             self.clear_cache()
 
             self.models_ready = True
 
-            # Phase 3: run ready() methods of app configs.
-            for package_config in self.get_package_configs():
-                package_config.ready()
-
             self.ready = True
 
     def check_packages_ready(self):
@@ -160,7 +158,9 @@ class Packages:
 
     # This method is performance-critical at least for Plain's test suite.
     @functools.cache
-    def get_models(self, include_auto_created=False, include_swapped=False):
+    def get_models(
+        self, *, package_label="", include_auto_created=False, include_swapped=False
+    ):
         """
         Return a list of all installed models.
 
@@ -175,10 +175,27 @@ class Packages:
         self.check_models_ready()
 
         result = []
-        for package_config in self.package_configs.values():
-            result.extend(
-                package_config.get_models(include_auto_created, include_swapped)
-            )
+
+        # Get models for a single package
+        if package_label:
+            package_models = self.all_models[package_label]
+            for model in package_models.values():
+                if model._meta.auto_created and not include_auto_created:
+                    continue
+                if model._meta.swapped and not include_swapped:
+                    continue
+                result.append(model)
+            return result
+
+        # Get models for all packages
+        for package_models in self.all_models.values():
+            for model in package_models.values():
+                if model._meta.auto_created and not include_auto_created:
+                    continue
+                if model._meta.swapped and not include_swapped:
+                    continue
+                result.append(model)
+
         return result
 
     def get_model(self, package_label, model_name=None, require_ready=True):
@@ -201,12 +218,13 @@ class Packages:
         if model_name is None:
             package_label, model_name = package_label.split(".")
 
-        package_config = self.get_package_config(package_label)
+        # package_config = self.get_package_config(package_label)
 
-        if not require_ready and package_config.models is None:
-            package_config.import_models()
+        # if not require_ready and package_config.models is None:
+        #     package_config.import_models()
 
-        return package_config.get_model(model_name, require_ready=require_ready)
+        package_models = self.all_models[package_label]
+        return package_models[model_name.lower()]
 
     def register_model(self, package_label, model):
         # Since this method is called when models are imported, it cannot
@@ -301,8 +319,8 @@ class Packages:
         if self.ready:
             # Circumvent self.get_models() to prevent that the cache is refilled.
             # This particularly prevents that an empty value is cached while cloning.
-            for package_config in self.package_configs.values():
-                for model in package_config.get_models(include_auto_created=True):
+            for package_models in self.all_models.values():
+                for model in package_models.values():
                     model._meta._expire_cache()
 
     def lazy_model_operation(self, function, *model_keys):
@@ -355,4 +373,4 @@ class Packages:
             function(model)
 
 
-packages = Packages(installed_packages=None)
+packages_registry = PackagesRegistry(installed_packages=None)

{plain-0.23.1 → plain-0.24.0}/plain/runtime/__init__.py

@@ -33,7 +33,7 @@ def setup():
         entry_point.load()()
 
     from plain.logs import configure_logging
-    from plain.packages import packages
+    from plain.packages import packages_registry
 
     if not APP_PATH.exists():
         raise AppPathNotFound(
@@ -48,7 +48,7 @@ def setup():
 
     configure_logging(settings.LOGGING)
 
-    packages.populate(settings.INSTALLED_PACKAGES)
+    packages_registry.populate(settings.INSTALLED_PACKAGES)
 
 
 __all__ = [

{plain-0.23.1 → plain-0.24.0}/plain/templates/jinja/__init__.py

@@ -1,6 +1,6 @@
 from importlib import import_module
 
-from plain.packages import packages
+from plain.packages import packages_registry
 from plain.runtime import settings
 from plain.utils.functional import LazyObject
 from plain.utils.module_loading import import_string, module_has_submodule
@@ -29,7 +29,7 @@ class JinjaEnvironment(LazyObject):
                 import_module(name)
                 self._imported_modules.add(name)
 
-        for package_config in packages.get_package_configs():
+        for package_config in packages_registry.get_package_configs():
             if module_has_submodule(package_config.module, "templates"):
                 # Allow this to fail in case there are import errors inside of their file
                 _maybe_import_module(f"{package_config.name}.templates")

{plain-0.23.1 → plain-0.24.0}/plain/templates/jinja/environments.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from jinja2 import Environment, StrictUndefined
 from jinja2.loaders import FileSystemLoader
 
-from plain.packages import packages
+from plain.packages import packages_registry
 from plain.runtime import settings
 
 from .filters import default_filters
@@ -40,7 +40,7 @@ def _get_app_template_dirs():
     dirname = "templates"
     template_dirs = [
         Path(package_config.path) / dirname
-        for package_config in packages.get_package_configs()
+        for package_config in packages_registry.get_package_configs()
         if package_config.path and (Path(package_config.path) / dirname).is_dir()
     ]
     # Immutable return value because it will be cached and shared by callers.

{plain-0.23.1 → plain-0.24.0}/plain/urls/resolvers.py

@@ -383,7 +383,7 @@ class URLResolver:
         else:
             lookup_view_s = lookup_view
 
-        patterns = [pattern for (_, pattern, _, _) in possibilities]
+        patterns = [pos[1] for pos in possibilities]
         if patterns:
             if args:
                 arg_msg = f"arguments '{args}'"

{plain-0.23.1 → plain-0.24.0}/plain/urls/routers.py

@@ -108,7 +108,7 @@ def path(route: str | re.Pattern, view: "View", *, name: str = "") -> URLPattern
         )
 
     # You typically pass a View class and we call as_view() for you
-    if issubclass(view, View):
+    if isinstance(view, type) and issubclass(view, View):
         return URLPattern(pattern=pattern, view=view.as_view(), name=name)
 
     # If you called View.as_view() yourself (or technically any callable)

{plain-0.23.1 → plain-0.24.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain"
-version = "0.23.1"
+version = "0.24.0"
 description = "A web framework for building products with Python."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"

plain-0.23.1/plain/packages/__init__.py

@@ -1,4 +0,0 @@
-from .config import PackageConfig
-from .registry import packages
-
-__all__ = ["PackageConfig", "packages"]