Merge pull request #64 from xpodev/dev/v1/implement-pages

Implement Pages

Author: neriyaco

Diff for: core/app/ez_app.py

@@ -16,7 +16,7 @@ def __init__(self) -> None:
 
         from sandbox.events.event_emitter import EventEmitter
 
-        self.web_app = EZWebApplication(self.app_host)
+        self.web_app = EZWebApplication()
         self.event_system = EventEmitter(self.app_host)
 
         module_manager_config = ModuleManagerConfig()
@@ -25,4 +25,9 @@ def __init__(self) -> None:
     def run(self) -> Any:
         self.module_manager.load_modules()
 
+        import ez.log as log
+
+        for module in self.module_manager.get_modules():
+            log.info(f"\tLoaded module: {module.name}")
+
         self.event_system.emit("App.Started")

Diff for: core/web/applications.py

@@ -1,32 +1,7 @@
 from typing import TYPE_CHECKING
 
 from starlette.applications import Starlette
-from starlette.middleware.base import BaseHTTPMiddleware
-
-from .router import EZRouter
-
-if TYPE_CHECKING:
-    from sandbox.host import AppHost
-
-
-class EZMiddleware(BaseHTTPMiddleware):
-    def __init__(self, app, host: "AppHost"):
-        super().__init__(app)
-        self.host = host
-
-    async def dispatch(self, request, call_next):
-        with self.host.application(self.app):
-            return await call_next(request)
 
 
 class EZWebApplication(Starlette):
-    ez_router: EZRouter
-
-    def __init__(self, app_host: "AppHost"):
-        Starlette.__init__(self)
-        self.app_host = app_host
-        self._initialize()
-
-    def _initialize(self):
-        self.ez_router = EZRouter()
-        self.mount("/", self.ez_router)
+    ...

Diff for: include/ez/__init__.py

@@ -12,8 +12,10 @@
         events,
         log,
         lowlevel,
+        pages,
         plugins,
         site,
+        templates,
         web,
     )
 
@@ -40,7 +42,9 @@
     "events",
     "log",
     "lowlevel",
+    "pages",
     "plugins",
     "site",
+    "templates",
     "web",
 ]

Diff for: include/ez/data

@@ -0,0 +1 @@
+../../modules/data/__api__

Diff for: include/ez/jsx

@@ -0,0 +1 @@
+../../modules/seamless/__api__

Diff for: include/ez/seamless

@@ -0,0 +1,13 @@
+import warnings
+
+
+def current_application():
+    from .host import AppHost
+
+    return AppHost.current_host.current_application
+
+
+def current_plugin():
+    warnings.warn("This function should not be used yet because the plugin host was not yet refactored")
+
+    return current_application()

Diff for: include/sandbox/__init__.py

@@ -15,6 +15,12 @@ def __init__(self, oid: ObjectID, permissions: PermissionSet) -> None:
         SecurityProvider.__init__(self, permissions)
         self._host = None
 
+    @property
+    def is_root(self):
+        if self.host is None:
+            return False
+        return self.host.root_application == self
+
     @property
     def host(self) -> "AppHost | None":
         return self._host

Diff for: include/sandbox/applications/application.py

@@ -34,6 +34,7 @@ def __init__(self, context: Context | Application | Any):
             context = Application("root", PermissionSet())
         if isinstance(context, Application):
             context = Context(context)
+        context.host_application._host = self
         self._context = context
         self._root = context.current_application
         self._apps = [self._root]

Diff for: include/sandbox/host/app_host.py

@@ -1,6 +1,7 @@
-from typing import Any, TypeAlias
+from typing import TYPE_CHECKING, Any, TypeAlias
 
-from ez.data.repository import Repository
+if TYPE_CHECKING:
+    from ez.data.repository import Repository
 
 from .object_id import ObjectID
 from .uid import UID
@@ -14,17 +15,17 @@ class OIDCategory:
     def add(self, value: Any, *, oid: ObjectID | None = None) -> ObjectID:
         raise NotImplementedError()
 
-    def get(self, oid: ObjectID, path: ObjectPath) -> Repository:
+    def get(self, oid: ObjectID, path: ObjectPath) -> "Repository":
         raise NotImplementedError()
 
     def set(self, oid: ObjectID, path: ObjectPath, value):
         raise NotImplementedError()
 
 
 class OIDCategoryRepository(OIDCategory):
-    _repository: Repository[Any]
+    _repository: "Repository[Any]"
 
-    def __init__(self, name: str, repository: Repository) -> None:
+    def __init__(self, name: str, repository: "Repository") -> None:
         self.name = name
         self._repository = repository
 

Diff for: include/sandbox/identity/oid_db.py

@@ -0,0 +1,11 @@
+from typing import TYPE_CHECKING
+
+
+if TYPE_CHECKING:
+    from modules.data import providers
+    from modules.data.providers import DataProviderBase, ModelProvider, get_provider, get_or_create_provider
+
+else:
+    from . import providers
+
+    from .providers import DataProviderBase, ModelProvider, get_provider, get_or_create_provider

Diff for: modules/data/__api__/__init__.py

@@ -0,0 +1,28 @@
+from typing import TYPE_CHECKING
+
+
+if TYPE_CHECKING:
+    from modules.data.providers import (
+        DataProviderBase, 
+        ModelProvider, 
+        get_provider, 
+        get_provider_type,
+        get_or_create_provider
+    )
+else:
+    from ..providers import (
+        DataProviderBase, 
+        ModelProvider, 
+        get_provider, 
+        get_provider_type,
+        get_or_create_provider
+    )
+
+
+__all__ = [
+    "DataProviderBase",
+    "ModelProvider",
+    "get_provider",
+    "get_provider_type",
+    "get_or_create_provider",
+]

Diff for: include/ez/data/database.py renamed to modules/data/__api__/database.py

@@ -0,0 +1,4 @@
+from .providers import primitives as _
+
+
+

Diff for: include/ez/data/database_model.py renamed to modules/data/__api__/database_model.py

@@ -0,0 +1,33 @@
+from typing import Any, Generic, Self, TypeVar, get_args, get_origin
+
+from pydantic import BaseModel
+
+
+T = TypeVar("T", bound=BaseModel)
+
+
+class Configurable(Generic[T]):
+    config: T
+
+    def __init__(self, config: T):
+        self.config = config
+
+    def save(self) -> dict[str, Any]:
+        return self.config.model_dump()
+
+    @classmethod
+    def load(cls, config: dict) -> Self:
+        for base in cls.__bases__:
+            origin = get_origin(base)
+            if isinstance(origin, type) and issubclass(origin, Configurable):
+                args = get_args(base)
+                if len(args) != 1:
+                    raise ValueError(f"Configurable class {cls} has more than one type argument")
+                config_cls = args[0]
+                if isinstance(config_cls, TypeVar):
+                    raise ValueError(f"Cannot load Configurable class {cls} with a type argument that is a TypeVar")
+                if not issubclass(config_cls, BaseModel):
+                    raise ValueError(f"Configurable class {cls} has a type argument that is not a subclass of BaseModel")
+                config: BaseModel = config_cls.model_validate(config)
+                return cls(config)
+        raise ValueError(f"Configurable class {cls} does not have a base class that is a subclass of Configurable")

Diff for: include/ez/data/database_repository.py renamed to modules/data/__api__/database_repository.py

@@ -0,0 +1,25 @@
+from .provider import (
+    ModelProvider,
+    DataProviderBase,
+    get_provider,
+    get_provider_type,
+    get_or_create_provider,
+)
+from .primitives import (
+    StringProvider,
+    BooleanProvider,
+    Config,
+)
+
+
+__all__ = [
+    "ModelProvider",
+    "DataProviderBase",
+    "get_provider",
+    "get_provider_type",
+    "get_or_create_provider",
+    
+    "StringProvider",
+    "BooleanProvider",
+    "Config",
+]

Diff for: modules/data/__api__/providers.py

@@ -0,0 +1,53 @@
+from typing import Any, ClassVar, Generic, TypeVar
+
+from pydantic import RootModel
+
+from .provider import DataProviderBase
+
+from seamless.html import Input
+
+
+_T = TypeVar("_T")
+
+
+class Config(RootModel[_T], Generic[_T]):
+    ...
+
+
+class _ValueProvider(DataProviderBase[_T], Generic[_T]):
+    DEFAULT: ClassVar[Any]
+
+    def __init__(self, value: _T):
+        self.value = value
+
+    def provide(self) -> _T:
+        return self.value
+    
+    @classmethod
+    def default(cls):
+        return cls(cls.DEFAULT)
+    
+    @classmethod
+    def load(cls, config: _T):
+        return cls(config)
+
+
+class StringProvider(_ValueProvider[str], data_type=str):
+    DEFAULT = ""
+
+    def render_input(self):
+        return Input(type="text", value=self.value)
+    
+
+class IntegerProvider(_ValueProvider[int], data_type=int):
+    DEFAULT = 0
+
+    def render_input(self):
+        return Input(type="number", value=self.value)
+    
+
+class BooleanProvider(_ValueProvider[bool], data_type=bool):
+    DEFAULT = False
+
+    def render_input(self):
+        return Input(type="checkbox", checked=self.value)