goodmap 1.0.4__py3-none-any.whl → 1.1.0__py3-none-any.whl

goodmap/config.py

@@ -0,0 +1,42 @@
+import sys
+import typing as t
+
+import yaml
+from platzky.config import Config as PlatzkyConfig
+from pydantic import Field
+
+
+class GoodmapConfig(PlatzkyConfig):
+    """Extended configuration for Goodmap with additional frontend library URL."""
+
+    goodmap_frontend_lib_url: str = Field(
+        default="https://cdn.jsdelivr.net/npm/@problematy/goodmap@0.4.2",
+        alias="GOODMAP_FRONTEND_LIB_URL",
+    )
+
+    @classmethod
+    def model_validate(
+        cls,
+        obj: t.Any,
+        *,
+        strict: bool | None = None,
+        from_attributes: bool | None = None,
+        context: dict[str, t.Any] | None = None,
+    ) -> "GoodmapConfig":
+        """Override to return correct type for GoodmapConfig."""
+        return t.cast(
+            "GoodmapConfig",
+            super().model_validate(
+                obj, strict=strict, from_attributes=from_attributes, context=context
+            ),
+        )
+
+    @classmethod
+    def parse_yaml(cls, path: str) -> "GoodmapConfig":
+        """Parse YAML configuration file and return GoodmapConfig instance."""
+        try:
+            with open(path, "r") as f:
+                return cls.model_validate(yaml.safe_load(f))
+        except FileNotFoundError:
+            print(f"Config file not found: {path}", file=sys.stderr)
+            raise SystemExit(1)

goodmap/goodmap.py

@@ -3,25 +3,26 @@ import os
 from flask import Blueprint, redirect, render_template, session
 from flask_wtf.csrf import CSRFProtect, generate_csrf
 from platzky import platzky
-from platzky.config import Config, languages_dict
+from platzky.config import languages_dict
 from platzky.models import CmsModule
 
+from goodmap.config import GoodmapConfig
 from goodmap.core_api import core_pages
 from goodmap.data_models.location import create_location_model
 from goodmap.db import extend_db_with_goodmap_queries, get_location_obligatory_fields
 
 
 def create_app(config_path: str) -> platzky.Engine:
-    config = Config.parse_yaml(config_path)
+    config = GoodmapConfig.parse_yaml(config_path)
     return create_app_from_config(config)
 
 
 # TODO Checking if there is a feature flag secition should be part of configs logic not client app
-def is_feature_enabled(config: Config, feature: str) -> bool:
+def is_feature_enabled(config: GoodmapConfig, feature: str) -> bool:
     return config.feature_flags.get(feature, False) if config.feature_flags else False
 
 
-def create_app_from_config(config: Config) -> platzky.Engine:
+def create_app_from_config(config: GoodmapConfig) -> platzky.Engine:
     directory = os.path.dirname(os.path.realpath(__file__))
 
     locale_dir = os.path.join(directory, "locale")
@@ -52,7 +53,11 @@ def create_app_from_config(config: Config) -> platzky.Engine:
 
     @goodmap.route("/")
     def index():
-        return render_template("map.html", feature_flags=config.feature_flags)
+        return render_template(
+            "map.html",
+            feature_flags=config.feature_flags,
+            goodmap_frontend_lib_url=config.goodmap_frontend_lib_url,
+        )
 
     @goodmap.route("/goodmap-admin")
     def admin():
@@ -65,6 +70,7 @@ def create_app_from_config(config: Config) -> platzky.Engine:
         return render_template(
             "goodmap-admin.html",
             feature_flags=config.feature_flags,
+            goodmap_frontend_lib_url=config.goodmap_frontend_lib_url,
             user=user,
             cms_modules=app.cms_modules,
         )

goodmap/templates/goodmap-admin.html

@@ -739,5 +739,5 @@ document.addEventListener('DOMContentLoaded', function() {
     window.USE_LAZY_LOADING = {{ feature_flags.USE_LAZY_LOADING | default(false) | tojson }};
     window.SHOW_ACCESSIBILITY_TABLE = {{ feature_flags.SHOW_ACCESSIBILITY_TABLE | default(false) | tojson }};
 </script>
-<script src="/static/map.js"></script>
+<script src="{{ goodmap_frontend_lib_url }}"></script>
 {% endblock %}

goodmap/templates/map.html

@@ -119,5 +119,5 @@ window.USE_LAZY_LOADING = {{ feature_flags.USE_LAZY_LOADING | default(false) | t
 window.SHOW_ACCESSIBILITY_TABLE = {{ feature_flags.SHOW_ACCESSIBILITY_TABLE | default(false) | tojson }};
 window.FEATURE_FLAGS = {{ feature_flags | tojson }};
 </script>
-<script src="/static/map.js"></script>
+<script src="{{ goodmap_frontend_lib_url }}"></script>
 {% endblock %}

{goodmap-1.0.4.dist-info → goodmap-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: goodmap
-Version: 1.0.4
+Version: 1.1.0
 Summary: Map engine to serve all the people :)
 License-File: LICENSE.md
 Author: Krzysztof Kolodzinski
@@ -24,7 +24,7 @@ Requires-Dist: google-cloud-storage (>=2.7.0,<3.0.0)
 Requires-Dist: gql (>=3.4.0,<4.0.0)
 Requires-Dist: gunicorn (>=20.1.0,<21.0.0)
 Requires-Dist: humanize (>=4.6.0,<5.0.0)
-Requires-Dist: platzky (>=0.4.3,<0.5.0)
+Requires-Dist: platzky (>=1.0.0,<2.0.0)
 Requires-Dist: pydantic (>=2.7.1,<3.0.0)
 Description-Content-Type: text/markdown
 

{goodmap-1.0.4.dist-info → goodmap-1.1.0.dist-info}/RECORD

@@ -1,14 +1,15 @@
 goodmap/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+goodmap/config.py,sha256=sseE4sceFB8OBuFsrRpQJvjv0Vg5KFdkzihBX_hbE2c,1313
 goodmap/core.py,sha256=rzMhOIYnR1jxTX6uHQJKIPLYxdUm4_v2d6LrtHtJpHU,1465
 goodmap/core_api.py,sha256=MxJ7SGOFBBnV_cBIiZoImHLaY8_FtEW-dl3od5-mIt8,13529
 goodmap/data_models/location.py,sha256=H3EKozc-WZvrYm6cwajl8_gaw4rQhxdlvxR1mk4mpkA,1104
 goodmap/data_validator.py,sha256=lBmVAPxvSmEOdUGeVYSjUvVVmKfPyq4CWoHfczTtEMM,4090
 goodmap/db.py,sha256=i-fe_f_s9hQxvTqq4alA-RK9j6vQpnaNpXEDPci3s1Y,42049
 goodmap/formatter.py,sha256=VlUHcK1HtM_IEU0VE3S5TOkZLVheMdakvUeW2tCKdq0,783
-goodmap/goodmap.py,sha256=OOcuDEY7GZsHh8vjIJ9brd4SuGxNRq_lC_DMmNuome8,2731
-goodmap/templates/goodmap-admin.html,sha256=zGuau239BXyBerV21mDXcHy34ke8cLmZcMngcX1xhAs,35598
-goodmap/templates/map.html,sha256=-qbJ313t2EdSyIwULnQy3j81pH4MqI5yjtJ4Xoo7N7M,3979
-goodmap-1.0.4.dist-info/METADATA,sha256=XZ4XugRInA3jVCXDDi1lTQQ2Y6uLaScVmAkpMKIs9dc,5356
-goodmap-1.0.4.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-goodmap-1.0.4.dist-info/licenses/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
-goodmap-1.0.4.dist-info/RECORD,,
+goodmap/goodmap.py,sha256=q6okPopWBH6jDkKJcGDegebaapHLFUVilJ3p3aKi97k,2960
+goodmap/templates/goodmap-admin.html,sha256=39PJ1drk_xdkyzXgPZZNXYq9gA9oTVeR8hsgeae6E0g,35614
+goodmap/templates/map.html,sha256=N4N0ONzEFUS4bFtOA2jgXVbMQ7cKd1cRYIVnGLUzBIE,3995
+goodmap-1.1.0.dist-info/METADATA,sha256=Guut0eb_hYRPviLOJ8s4BA2goFJrgjQagMkGvZXOQRI,5356
+goodmap-1.1.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+goodmap-1.1.0.dist-info/licenses/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
+goodmap-1.1.0.dist-info/RECORD,,