platzky 0.2.12__tar.gz → 0.2.15__tar.gz

{platzky-0.2.12 → platzky-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: platzky
-Version: 0.2.12
+Version: 0.2.15
 Summary: Not only blog engine
 License: MIT
 Requires-Python: >=3.10,<4.0

{platzky-0.2.12 → platzky-0.2.15}/platzky/db/db.py

@@ -49,7 +49,7 @@ class DB(ABC):
         pass
 
     @abstractmethod
-    def get_menu_items(self) -> list[MenuItem]:
+    def get_menu_items_in_lang(self, lang) -> list[MenuItem]:
         pass
 
     @abstractmethod
@@ -69,9 +69,7 @@ class DB(ABC):
         pass
 
     @abstractmethod
-    def get_logo_url(
-        self,
-    ) -> str:  # TODO provide alternative text along with the URL of logo
+    def get_logo_url(self) -> str:  # TODO provide alternative text along with the URL of logo
         pass
 
     @abstractmethod

{platzky-0.2.12 → platzky-0.2.15}/platzky/db/graph_ql_db.py

@@ -3,6 +3,7 @@
 
 from gql import Client, gql
 from gql.transport.aiohttp import AIOHTTPTransport
+from gql.transport.exceptions import TransportQueryError
 from pydantic import Field
 
 from ..models import Color, Post
@@ -99,18 +100,39 @@ class GraphQL(DB):
 
         return [Post.model_validate(_standarize_post(post)) for post in raw_ql_posts]
 
-    def get_menu_items(self):
-        menu_items = gql(
-            """
-            query MyQuery {
-              menuItems(stage: PUBLISHED){
-                name
-                url
-              }
-            }
-            """
-        )
-        return self.client.execute(menu_items)["menuItems"]
+    def get_menu_items_in_lang(self, lang):
+        menu_items = []
+        try:
+            menu_items_with_lang = gql(
+                """
+                query MyQuery($lang: Lang!) {
+                  menuItems(where: {language: $lang}, stage: PUBLISHED){
+                    name
+                    url
+                  }
+                }
+                """
+            )
+            menu_items = self.client.execute(
+                menu_items_with_lang, variable_values={"language": lang}
+            )
+
+        # TODO remove try except block after bumping up version
+        # now it's backwards compatible with older versions
+        except TransportQueryError:
+            menu_items_without_lang = gql(
+                """
+                query MyQuery {
+                  menuItems(stage: PUBLISHED){
+                    name
+                    url
+                  }
+                }
+                """
+            )
+            menu_items = self.client.execute(menu_items_without_lang)
+
+        return menu_items["menuItems"]
 
     def get_post(self, slug):
         post = gql(

{platzky-0.2.12 → platzky-0.2.15}/platzky/db/json_db.py

@@ -56,9 +56,11 @@ class Json(DB):
         page = Post.model_validate(next(list_of_pages))
         return page
 
-    def get_menu_items(self) -> list[MenuItem]:
-        menu_items_raw = self._get_site_content().get("menu_items", [])
-        menu_items_list = [MenuItem.model_validate(x) for x in menu_items_raw]
+    def get_menu_items_in_lang(self, lang) -> list[MenuItem]:
+        menu_items_raw = self._get_site_content().get("menu_items", {})
+        items_in_lang = menu_items_raw.get(lang, {})
+
+        menu_items_list = [MenuItem.model_validate(x) for x in items_in_lang]
         return menu_items_list
 
     def get_posts_by_tag(self, tag, lang):

{platzky-0.2.12 → platzky-0.2.15}/platzky/platzky.py

@@ -107,7 +107,7 @@ def create_engine(config: Config, db) -> Engine:
             "current_lang_country": country,
             "current_language": locale,
             "url_link": url_link,
-            "menu_items": app.db.get_menu_items(),
+            "menu_items": app.db.get_menu_items_in_lang(locale),
             "logo_url": app.db.get_logo_url(),
             "favicon_url": app.db.get_favicon_url(),
             "font": app.db.get_font(),

platzky-0.2.15/platzky/plugin_loader.py

@@ -0,0 +1,81 @@
+import importlib.util
+import logging
+import os
+import sys
+from os.path import abspath, dirname
+
+logger = logging.getLogger(__name__)
+
+
+class PluginError(Exception):
+    pass
+
+
+# TODO remove find_local_plugin after all plugins will be extracted
+def find_local_plugin(plugin_name):
+    """Find plugin by name and return it as module.
+    :param plugin_name: name of plugin to find
+    :return: module of plugin
+    """
+    plugins_dir = os.path.join(dirname(abspath(__file__)), "plugins")
+    module_name = plugin_name.removesuffix(".py")
+    spec = importlib.util.spec_from_file_location(
+        module_name, os.path.join(plugins_dir, plugin_name, "entrypoint.py")
+    )
+    assert spec is not None
+    plugin = importlib.util.module_from_spec(spec)
+    sys.modules[module_name] = plugin
+    assert spec.loader is not None
+    spec.loader.exec_module(plugin)
+    return plugin
+
+
+def find_installed_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 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 found or imported
+    :return: module of plugin
+    """
+    plugin = None
+    try:
+        plugin = find_local_plugin(plugin_name)
+    except FileNotFoundError:
+        logger.info(f"Local plugin {plugin_name} not found, trying installed version")
+        plugin = find_installed_plugin(plugin_name)
+
+    return plugin
+
+
+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

{platzky-0.2.12 → platzky-0.2.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "platzky"
-version = "0.2.12"
+version = "0.2.15"
 description = "Not only blog engine"
 authors = []
 license = "MIT"

platzky-0.2.12/platzky/plugin_loader.py

@@ -1,39 +0,0 @@
-import importlib.util
-import os
-import sys
-from os.path import abspath, dirname
-
-
-def find_plugin(plugin_name):
-    """Find plugin by name and return it as module.
-    :param plugin_name: name of plugin to find
-    :return: module of plugin
-    """
-    plugins_dir = os.path.join(dirname(abspath(__file__)), "plugins")
-    module_name = plugin_name.removesuffix(".py")
-    spec = importlib.util.spec_from_file_location(
-        module_name, os.path.join(plugins_dir, plugin_name, "entrypoint.py")
-    )
-    assert spec is not None
-    plugin = importlib.util.module_from_spec(spec)
-    sys.modules[module_name] = plugin
-    assert spec.loader is not None
-    spec.loader.exec_module(plugin)
-    return plugin
-
-
-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"]
-        plugin = find_plugin(plugin_name)
-        plugin.process(app, plugin_config)
-
-    return app