platzky 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

platzky/__init__.py

@@ -1,3 +1,3 @@
-from .platzky import Engine as Engine
-from .platzky import create_app_from_config as create_app_from_config
-from .platzky import create_engine as create_engine
+from platzky.engine import Engine as Engine
+from platzky.platzky import create_app_from_config as create_app_from_config
+from platzky.platzky import create_engine as create_engine

platzky/admin/admin.py

@@ -0,0 +1,33 @@
+from os.path import dirname
+
+from flask import Blueprint, render_template, session
+
+
+def create_admin_blueprint(login_methods, db, locale_func):
+    admin = Blueprint(
+        "admin",
+        __name__,
+        url_prefix="/admin",
+        template_folder=f"{dirname(__file__)}/templates",
+    )
+
+    @admin.route("/", methods=["GET"])
+    def admin_panel_home():
+        user = session.get("user", None)
+
+        if not user:
+            return render_template("login.html", login_methods=login_methods)
+
+        cms_modules = {"plugins": [plugin.get("name") for plugin in db.get_plugins_data()]}
+        return render_template("admin.html", user=user, cms_modules=cms_modules)
+
+    @admin.route("/module/<module_name>", methods=["GET"])
+    def module_settings(module_name):
+        user = session.get("user", None)
+
+        if not user:
+            return render_template("login.html", login_methods=login_methods)
+
+        return render_template("module.html", user=user, module_name=module_name)
+
+    return admin

platzky/admin/templates/admin.html

@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block description %}
+{{ _("This is the admin page. You can manage your posts here.") }}
+{% endblock %}
+
+{% block content %}
+
+<div class="admin-contents mx-auto w-75">
+  <h1>{% block title %}Admin{% endblock %}</h1>
+  {% if user %}
+    <div class="alert alert-success" role="alert">You're logged in</div>
+  {% endif %}
+</div>
+
+{% endblock %}
+
+{% block left_panel %}
+<div id="admin-panel">
+  {% for cms_module_name, cms_entries in cms_modules.items() %}
+  <div class="cms-module mb-2">
+    <p>{{ cms_module_name }}</p>
+    {% for cms_entry in cms_entries %}
+    <a href="{{ url_for('admin.module', name=cms_entry) }}" class="cms-entry btn btn-primary btn-block mb-2">{{ cms_entry }}</a>
+    {% endfor %}
+  </div>
+  {% endfor %}
+</div>
+{% endblock %}

platzky/admin/templates/login.html

@@ -0,0 +1,21 @@
+{% extends "base.html" %}
+
+{% block description %}
+{{ _("This is the login page. You can log in here.") }}
+
+{% endblock %}
+
+{% block content %}
+
+<div class="login-contents mx-auto w-75">
+  <h1>{% block title %}Login{% endblock %}</h1>
+
+  <div class="row align-items-center">
+
+{% for login_method in login_methods %}
+    {{ login_method | safe }}
+{% endfor %}
+  </div>
+</div>
+
+{% endblock %}

platzky/admin/templates/module.html

@@ -0,0 +1,9 @@
+{% extends "admin.html" %}
+
+{% block content %}
+
+<div class="module-contents mx-auto w-75">
+  <h1>{% block title %}{% module_name %}{% endblock %}</h1>
+</div>
+
+{% endblock %}

platzky/db/db.py

@@ -4,7 +4,7 @@ from typing import Any, Callable
 
 from pydantic import BaseModel, Field
 
-from ..models import Color, MenuItem, Page, Post
+from platzky.models import Color, MenuItem, Page, Post
 
 
 class DB(ABC):

platzky/db/google_json_db.py

@@ -47,8 +47,3 @@ class GoogleJsonDb(Json):
 
         self.module_name = "google_json_db"
         self.db_name = "GoogleJsonDb"
-
-    def __save_entry(self, entry):
-        data = get_data(self.blob)
-        data["data"].append(entry)
-        self.blob.upload_from_string(json.dumps(data), content_type="application/json")

platzky/db/graph_ql_db.py

@@ -6,8 +6,8 @@ from gql.transport.aiohttp import AIOHTTPTransport
 from gql.transport.exceptions import TransportQueryError
 from pydantic import Field
 
-from ..models import Color, Post
-from .db import DB, DBConfig
+from platzky.db.db import DB, DBConfig
+from platzky.models import Color, Post
 
 
 def db_config_type():
@@ -29,7 +29,7 @@ def db_from_config(config: GraphQlDbConfig):
 
 def _standarize_comment(
     comment,
-):  # TODO add tests for checking stadarization of comments
+):
     return {
         "author": comment["author"],
         "comment": comment["comment"],
@@ -37,7 +37,7 @@ def _standarize_comment(
     }
 
 
-def _standarize_post(post):  # TODO add tests for checking stadarization of posts
+def _standarize_post(post):
     return {
         "author": post["author"]["name"],
         "slug": post["slug"],

platzky/db/json_db.py

@@ -73,7 +73,11 @@ class Json(DB):
         return menu_items_list
 
     def get_posts_by_tag(self, tag, lang):
-        return (post for post in self._get_site_content()["posts"] if tag in post["tags"])
+        return (
+            post
+            for post in self._get_site_content()["posts"]
+            if tag in post["tags"] and post["language"] == lang
+        )
 
     def _get_site_content(self):
         content = self.data.get("site_content")

platzky/engine.py

@@ -0,0 +1,62 @@
+import os
+
+from flask import Flask, request, session
+from flask_babel import Babel
+
+from platzky.config import Config
+
+
+class Engine(Flask):
+    def __init__(self, config: Config, db, import_name):
+        super().__init__(import_name)
+        self.config.from_mapping(config.model_dump(by_alias=True))
+        self.db = db
+        self.notifiers = []
+        self.login_methods = []
+        self.dynamic_body = ""
+        self.dynamic_head = ""
+        directory = os.path.dirname(os.path.realpath(__file__))
+        locale_dir = os.path.join(directory, "locale")
+        config.translation_directories.append(locale_dir)
+
+        babel_translation_directories = ";".join(config.translation_directories)
+        self.babel = Babel(
+            self,
+            locale_selector=self.get_locale,
+            default_translation_directories=babel_translation_directories,
+        )
+
+    def notify(self, message: str):
+        for notifier in self.notifiers:
+            notifier(message)
+
+    def add_notifier(self, notifier):
+        self.notifiers.append(notifier)
+
+    # TODO login_method should be interface
+    def add_login_method(self, login_method):
+        self.login_methods.append(login_method)
+
+    def add_dynamic_body(self, body: str):
+        self.dynamic_body += body
+
+    def add_dynamic_head(self, body: str):
+        self.dynamic_head += body
+
+    def get_locale(self) -> str:
+        domain = request.headers.get("Host", "localhost")
+        domain_to_lang = self.config.get("DOMAIN_TO_LANG")
+
+        languages = self.config.get("LANGUAGES", {}).keys()
+        backup_lang = session.get(
+            "language",
+            request.accept_languages.best_match(languages, "en"),
+        )
+
+        if domain_to_lang:
+            lang = domain_to_lang.get(domain, backup_lang)
+        else:
+            lang = backup_lang
+
+        session["language"] = lang
+        return lang

platzky/platzky.py

@@ -1,71 +1,20 @@
-import os
 import typing as t
 import urllib.parse
 
-from flask import Flask, redirect, render_template, request, session
-from flask_babel import Babel
+from flask import redirect, render_template, request, session
 from flask_minify import Minify
 
-from .blog import blog
-from .config import (
+from platzky.admin import admin
+from platzky.blog import blog
+from platzky.config import (
     Config,
     languages_dict,
 )
-from .db.db_loader import get_db
-from .plugin_loader import plugify
-from .seo import seo
-from .www_handler import redirect_nonwww_to_www, redirect_www_to_nonwww
-
-
-class Engine(Flask):
-    def __init__(self, config: Config, db, import_name):
-        super().__init__(import_name)
-        self.config.from_mapping(config.model_dump(by_alias=True))
-        self.db = db
-        self.notifiers = []
-        self.dynamic_body = ""
-        self.dynamic_head = ""
-        directory = os.path.dirname(os.path.realpath(__file__))
-        locale_dir = os.path.join(directory, "locale")
-        config.translation_directories.append(locale_dir)
-
-        babel_translation_directories = ";".join(config.translation_directories)
-        self.babel = Babel(
-            self,
-            locale_selector=self.get_locale,
-            default_translation_directories=babel_translation_directories,
-        )
-
-    def notify(self, message: str):
-        for notifier in self.notifiers:
-            notifier(message)
-
-    def add_notifier(self, notifier):
-        self.notifiers.append(notifier)
-
-    def add_dynamic_body(self, body: str):
-        self.dynamic_body += body
-
-    def add_dynamic_head(self, body: str):
-        self.dynamic_head += body
-
-    def get_locale(self) -> str:
-        domain = request.headers["Host"]
-        domain_to_lang = self.config.get("DOMAIN_TO_LANG")
-
-        languages = self.config.get("LANGUAGES", {}).keys()
-        backup_lang = session.get(
-            "language",
-            request.accept_languages.best_match(languages, "en"),
-        )
-
-        if domain_to_lang:
-            lang = domain_to_lang.get(domain, backup_lang)
-        else:
-            lang = backup_lang
-
-        session["language"] = lang
-        return lang
+from platzky.db.db_loader import get_db
+from platzky.engine import Engine
+from platzky.plugin.plugin_loader import plugify
+from platzky.seo import seo
+from platzky.www_handler import redirect_nonwww_to_www, redirect_www_to_nonwww
 
 
 def create_engine(config: Config, db) -> Engine:
@@ -133,6 +82,9 @@ def create_engine(config: Config, db) -> Engine:
 
 def create_app_from_config(config: Config) -> Engine:
     engine = create_engine_from_config(config)
+    admin_blueprint = admin.create_admin_blueprint(
+        login_methods=engine.login_methods, db=engine.db, locale_func=engine.get_locale
+    )
     blog_blueprint = blog.create_blog_blueprint(
         db=engine.db,
         blog_prefix=config.blog_prefix,
@@ -141,6 +93,7 @@ def create_app_from_config(config: Config) -> Engine:
     seo_blueprint = seo.create_seo_blueprint(
         db=engine.db, config=engine.config, locale_func=engine.get_locale
     )
+    engine.register_blueprint(admin_blueprint)
     engine.register_blueprint(blog_blueprint)
     engine.register_blueprint(seo_blueprint)
 

platzky/plugin/plugin.py

@@ -0,0 +1,66 @@
+import logging
+from abc import ABC, abstractmethod
+from typing import Any, Dict, Generic, Type, TypeVar
+
+from pydantic import BaseModel, ConfigDict
+
+from platzky.platzky import Engine as PlatzkyEngine
+
+logger = logging.getLogger(__name__)
+
+
+class PluginError(Exception):
+    """Exception raised for plugin-related errors."""
+
+    pass
+
+
+class ConfigPluginError(PluginError):
+    """Exception raised for plugin configuration-related errors."""
+
+    pass
+
+
+class PluginBaseConfig(BaseModel):
+    """Base Pydantic model for plugin configurations.
+
+    Plugin developers should extend this class to define their own configuration schema.
+    """
+
+    model_config = ConfigDict(extra="allow")
+
+
+T = TypeVar("T", bound=PluginBaseConfig)
+
+
+class PluginBase(Generic[T], ABC):
+    """Abstract base class for plugins.
+
+    Plugin developers must extend this class to implement their plugins.
+    """
+
+    @classmethod
+    def get_config_model(cls) -> Type[PluginBaseConfig]:
+        return PluginBaseConfig
+
+    def __init__(self, config: Dict[str, Any]):
+        try:
+            config_class = self.get_config_model()
+            self.config = config_class.model_validate(config)
+        except Exception as e:
+            raise ConfigPluginError(f"Invalid configuration: {e}") from e
+
+    @abstractmethod
+    def process(self, app: PlatzkyEngine) -> PlatzkyEngine:
+        """Process the plugin with the given app.
+
+        Args:
+            app: The Flask application instance
+
+        Returns:
+            Platzky Engine with processed plugins
+
+        Raises:
+            PluginError: If plugin processing fails
+        """
+        pass

platzky/plugin/plugin_loader.py

@@ -0,0 +1,109 @@
+import importlib.util
+import inspect
+import logging
+from typing import Any, Optional, Type
+
+import deprecation
+
+from platzky.engine import Engine
+from platzky.plugin.plugin import PluginBase, PluginError
+
+logger = logging.getLogger(__name__)
+
+
+def find_plugin(plugin_name: str) -> Any:
+    """Find plugin by name and return it as module.
+
+    Args:
+        plugin_name: name of plugin to find
+
+    Raises:
+        PluginError: if plugin cannot be imported
+
+    Returns:
+        module of plugin
+    """
+    try:
+        return importlib.import_module(f"platzky_{plugin_name}")
+    except ImportError as e:
+        raise PluginError(
+            f"Plugin {plugin_name} not found. Ensure it's installed and follows "
+            f"the 'platzky_<plugin_name>' naming convention"
+        ) from e
+
+
+def _is_class_plugin(plugin_module: Any) -> Optional[Type[PluginBase[Any]]]:
+    """Check if the plugin module contains a PluginBase implementation.
+
+    Args:
+        plugin_module: The imported plugin module
+
+    Returns:
+        The plugin class if found, None otherwise
+    """
+    # Look for classes in the module that inherit from PluginBase
+    for _, obj in inspect.getmembers(plugin_module):
+        if inspect.isclass(obj) and issubclass(obj, PluginBase) and obj != PluginBase:
+            return obj
+    return None
+
+
+@deprecation.deprecated(
+    deprecated_in="0.3.1",
+    removed_in="0.4.0",
+    current_version=None,  # You should replace this with the current version
+    details="Legacy plugin style using the entrypoint process() function is deprecated. "
+    "Please migrate to the PluginBase interface.",
+)
+def _process_legacy_plugin(plugin_module, app, plugin_config, plugin_name):
+    """Process a legacy plugin using the entrypoint approach."""
+    app = plugin_module.process(app, plugin_config)
+    logger.info(f"Processed legacy plugin: {plugin_name}")
+    return app
+
+
+def plugify(app: Engine) -> Engine:
+    """Load plugins and run their entrypoints.
+
+    Supports both class-based plugins (PluginBase) and legacy entrypoint plugins.
+
+    Args:
+        app: Platzky Engine instance
+
+    Returns:
+        Platzky Engine with processed plugins
+
+    Raises:
+        PluginError: if plugin processing fails
+    """
+    plugins_data = app.db.get_plugins_data()
+
+    for plugin_data in plugins_data:
+        plugin_config = plugin_data["config"]
+        plugin_name = plugin_data["name"]
+
+        try:
+            plugin_module = find_plugin(plugin_name)
+
+            # Check if this is a class-based plugin
+            plugin_class = _is_class_plugin(plugin_module)
+
+            if plugin_class:
+                # Handle new class-based plugins
+                plugin_instance = plugin_class(plugin_config)
+                app = plugin_instance.process(app)
+                logger.info(f"Processed class-based plugin: {plugin_name}")
+            elif hasattr(plugin_module, "process"):
+                # Handle legacy entrypoint plugins with deprecation warning
+                app = _process_legacy_plugin(plugin_module, app, plugin_config, plugin_name)
+            else:
+                raise PluginError(
+                    f"Plugin {plugin_name} doesn't implement either the PluginBase interface "
+                    f"or provide a process() function"
+                )
+
+        except Exception as e:
+            logger.error(f"Error processing plugin {plugin_name}: {e}")
+            raise PluginError(f"Error processing plugin {plugin_name}: {e}") from e
+
+    return app

{platzky-0.3.0.dist-info → platzky-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: platzky
-Version: 0.3.0
+Version: 0.3.1
 Summary: Not only blog engine
 License: MIT
 Requires-Python: >=3.10,<4.0
@@ -16,6 +16,7 @@ Requires-Dist: Flask-Minify (>=0.42,<0.43)
 Requires-Dist: Flask-WTF (>=1.2.1,<2.0.0)
 Requires-Dist: PyYAML (>=6.0,<7.0)
 Requires-Dist: aiohttp (>=3.9.5,<4.0.0)
+Requires-Dist: deprecation (>=2.1.0,<3.0.0)
 Requires-Dist: google-cloud-storage (>=2.5.0,<3.0.0)
 Requires-Dist: gql (>=3.4.0,<4.0.0)
 Requires-Dist: humanize (>=4.9.0,<5.0.0)

{platzky-0.3.0.dist-info → platzky-0.3.1.dist-info}/RECORD

@@ -1,20 +1,26 @@
-platzky/__init__.py,sha256=cEAqMh-FU8mbfCzFQaWMhKX4lDjoxDiQ9S4hTNsSOMg,160
+platzky/__init__.py,sha256=IhL91rSWxIIJQNfVsqJ1d4yY5D2WyWcefo4Xv2aX_lo,180
+platzky/admin/admin.py,sha256=nQq0IcBhrcX6S4gd71MejOcc2yizVv20UmF4ZRvZnBk,1019
+platzky/admin/templates/admin.html,sha256=aIeQI9lSFvj6kwZg8U_AE7VSiVCxZeUdB_gLXzZDU20,778
+platzky/admin/templates/login.html,sha256=a8dpJabAjvKyJZt9wKt9GtEO2XShuvo2m6BvZqDH6bU,391
+platzky/admin/templates/module.html,sha256=WuQZxKQDD4INl-QF2uiKHf9Fmf2h7cEW9RLe1nWKC8k,175
 platzky/blog/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 platzky/blog/blog.py,sha256=caBUewnwd6QrJDv20m4JDfDDjiVu7hM0AJnoTyCdwM4,3009
 platzky/blog/comment_form.py,sha256=4lkNJ_S_2DZmJBbz-NPDqahvy2Zz5AGNH2spFeGIop4,513
 platzky/config.py,sha256=M3gmZI9yI-ThgmTA4RKsAPcnJwJjcWhXipYzq3hO-Hk,2346
 platzky/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-platzky/db/db.py,sha256=W1EYQOrYaQI-Uon1IAJfD_1gmju2V_0yfo0hc8swUow,2790
+platzky/db/db.py,sha256=o3jXcA97MwOepJhxtmXpyfDATRcMcJmX6O1Bro5-Rkw,2796
 platzky/db/db_loader.py,sha256=CuEiXxhIa4bFMm0vi7ugzm7j3WycilGRKCU6smgIImE,905
-platzky/db/google_json_db.py,sha256=IgfCER7oJ4I_WD4TjhvFFL0voUj6EfeoaVWdoEcHTdA,1499
-platzky/db/graph_ql_db.py,sha256=EjM9MfHOoEngJI6tFXC1JDrsK3kl-tkUXd7TwH2QCZc,8623
-platzky/db/json_db.py,sha256=3heiXVhZIWZB6byhnbOtGhnI-59ixN9spz24co4bvAk,3681
+platzky/db/google_json_db.py,sha256=phRW8196o3lXxO3oSBAMMXfbOKR3K2MGkzF6w41SPBc,1305
+platzky/db/graph_ql_db.py,sha256=aGE1glBmLmx4mE1aysGe6sl0lP2uG89LUnu2hmkdvqk,8528
+platzky/db/json_db.py,sha256=J3sKykFLIv4tors0kEYF55SHLviLhHg8m-2fljXvqFI,3756
 platzky/db/json_file_db.py,sha256=UQ8TadELmqOzj_tgNfmzhtCkDkMAgcB9vaUy0GQXUY4,1010
+platzky/engine.py,sha256=x6cP1oCaqqamfFgDdup7R9pe8z1KafdbNvrcUEOX7Ns,1897
 platzky/locale/en/LC_MESSAGES/messages.po,sha256=WaZGlFAegKRq7CSz69dWKic-mKvQFhVvssvExxNmGaU,1400
 platzky/locale/pl/LC_MESSAGES/messages.po,sha256=sUPxMKDeEOoZ5UIg94rGxZD06YVWiAMWIby2XE51Hrc,1624
 platzky/models.py,sha256=-IIlyeLzACeTUpzuzvzJYxtT57E6wRiERoRgXJYMMtY,1502
-platzky/platzky.py,sha256=A_ku8ZFseCde12vXL9PLNn9ybMszXDcBIqZbWj1rxMo,4996
-platzky/plugin_loader.py,sha256=TkeBYa4DrkUZ2lSJtIY5YKJEgtJvOCiXHhav_K8RaWs,1162
+platzky/platzky.py,sha256=VBLN71eq81EDV5qQYwKUX_InQffmrouAXxblyoZpb-4,3666
+platzky/plugin/plugin.py,sha256=tV8aobIzMDJe1frKUAi4kLbrTAIS0FWE3oYpktSo6Ug,1633
+platzky/plugin/plugin_loader.py,sha256=MeQ8LNbrOomwXgc1ISHuyhjZd2mzYKen70eDShWs-Co,3497
 platzky/seo/seo.py,sha256=N_MmAA4KJZmmrDUh0hYNtD8ycOwpNKow4gVSAv8V3N4,2631
 platzky/static/blog.css,sha256=TrppzgQbj4UtuTufDCdblyNTVAqgIbhD66Cziyv_xnY,7893
 platzky/static/styles.css,sha256=U5ddGIK-VcGRJZ3BdOpMp0pR__k6rNEMsuQXkP4tFQ0,686
@@ -30,6 +36,6 @@ platzky/templates/post.html,sha256=GSgjIZsOQKtNx3cEbquSjZ5L4whPnG6MzRyoq9k4B8Q,1
 platzky/templates/robots.txt,sha256=2_j2tiYtYJnzZUrANiX9pvBxyw5Dp27fR_co18BPEJ0,116
 platzky/templates/sitemap.xml,sha256=iIJZ91_B5ZuNLCHsRtsGKZlBAXojOTP8kffqKLacgvs,578
 platzky/www_handler.py,sha256=pF6Rmvem1sdVqHD7z3RLrDuG-CwAqfGCti50_NPsB2w,725
-platzky-0.3.0.dist-info/METADATA,sha256=EhwOCjLEsHFcLEyM-IQasGVn8VKRX1_ZIeht_vAuE38,1642
-platzky-0.3.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-platzky-0.3.0.dist-info/RECORD,,
+platzky-0.3.1.dist-info/METADATA,sha256=iHkJnppWm5npC0Y-fJQywiO9toIVeoxQdbH0S3cAGhk,1686
+platzky-0.3.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+platzky-0.3.1.dist-info/RECORD,,

platzky/plugin_loader.py

@@ -1,43 +0,0 @@
-import importlib.util
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class PluginError(Exception):
-    pass
-
-
-def find_plugin(plugin_name):
-    """Find plugin by name and return it as module.
-    :param plugin_name: name of plugin to find
-    :raises PluginError: if plugin cannot be imported
-    :return: module of plugin
-    """
-    try:
-        return importlib.import_module(f"platzky_{plugin_name}")
-    except ImportError as e:
-        raise PluginError(
-            f"Plugin {plugin_name} not found. Ensure it's installed and follows "
-            f"the 'platzky_<plugin_name>' naming convention"
-        ) from e
-
-
-def plugify(app):
-    """Load plugins and run their entrypoints.
-    :param app: Flask app
-    :return: Flask app
-    """
-
-    plugins_data = app.db.get_plugins_data()
-
-    for plugin_data in plugins_data:
-        plugin_config = plugin_data["config"]
-        plugin_name = plugin_data["name"]
-        try:
-            plugin = find_plugin(plugin_name)
-            plugin.process(app, plugin_config)
-        except Exception as e:
-            raise PluginError(f"Error processing plugin {plugin_name}: {e}") from e
-
-    return app