platzky 0.2.12__py3-none-any.whl → 0.2.15__py3-none-any.whl

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/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/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/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/plugin_loader.py

@@ -1,10 +1,18 @@
 import importlib.util
+import logging
 import os
 import sys
 from os.path import abspath, dirname
 
+logger = logging.getLogger(__name__)
 
-def find_plugin(plugin_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
@@ -22,6 +30,37 @@ def find_plugin(plugin_name):
     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
@@ -33,7 +72,10 @@ def plugify(app):
     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)
+        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.dist-info → platzky-0.2.15.dist-info}/METADATA

@@ -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.dist-info → platzky-0.2.15.dist-info}/RECORD

@@ -4,17 +4,17 @@ 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=SayR69Nxs9aGMfYumLyLIH0LVLVmwiQt9WAICq59gng,2709
+platzky/db/db.py,sha256=yVlLqKoKRZiGNaQmRv_8Jjk0aMkHdLgDOhPbxvG_MEs,2708
 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=aIqRxPV-Txr5MY2-qVALby9fHyIvWgvSz2t24M9SNRI,7343
-platzky/db/json_db.py,sha256=AtZoTcM6S2ZHo19rxkCi4h4E4INGieZ4W6H5O2iormA,3246
+platzky/db/graph_ql_db.py,sha256=yXVhYCXNexYYo8QYeiUzE05uehdkl0cuuxbLU1hFC-k,8148
+platzky/db/json_db.py,sha256=Iqr2bHxd55-ajosCxXOJsJ7T0TOk45KE7oIrrKo5iSM,3313
 platzky/db/json_file_db.py,sha256=UQ8TadELmqOzj_tgNfmzhtCkDkMAgcB9vaUy0GQXUY4,1010
 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=tqCqGp-DCeyLuUcwD8RzyZiZ40SpMtRL_mhvS2xDXnc,4896
-platzky/plugin_loader.py,sha256=KYLDSEd_hseAgBuSbikerU_IFx-YmcYK5UwYw7kla2E,1106
+platzky/platzky.py,sha256=h4oeC3B8cxbzv-Ut7iGKvsBmRTmxDKcK-R4PzUTZ-fE,4910
+platzky/plugin_loader.py,sha256=kYLaBOc8MA4b0T2yhVpSxZsX1rTxfcAnyGJCNKPGBXY,2428
 platzky/plugins/google-tag-manager/entrypoint.py,sha256=Z4npXtmCdrSuUG_ZvFdPhUZg5QcwIPGQWj9Uw9dcm8A,1021
 platzky/plugins/redirections/entrypoint.py,sha256=yoqHsRLqRALdICs5_UMSREkfEo1Lbsjj9tqEA7dsseg,1555
 platzky/plugins/sendmail/entrypoint.py,sha256=16GszfLaYhVUSuCdL4SPVKYN9-mONp-hK5ZWSiLluPo,1215
@@ -32,6 +32,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.2.12.dist-info/METADATA,sha256=XWU3ZXH5SMPVsF3X38JWtuK4nykS5fm8u7EtsTFTyDc,1643
-platzky-0.2.12.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-platzky-0.2.12.dist-info/RECORD,,
+platzky-0.2.15.dist-info/METADATA,sha256=PCyQWLEQkuh0zG6giZjLMwJxtzXFh6OGM8BiK7rCgKM,1643
+platzky-0.2.15.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+platzky-0.2.15.dist-info/RECORD,,

{platzky-0.2.12.dist-info → platzky-0.2.15.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any