xmas-app 0.9.0__py3-none-any.whl → 0.10.0__py3-none-any.whl

xmas_app/form.py

@@ -710,7 +710,9 @@ class ModelForm:
                                             ui.select(
                                                 options,
                                                 label=prop_info["typename"],
-                                                on_change=self._set_stylesheetId_and_schriftinhalt,
+                                                on_change=self._set_stylesheetId_and_schriftinhalt
+                                                if self.editable
+                                                else None,
                                                 multiple=prop_info["list"],
                                                 clearable=prop_info["nullable"],
                                                 validation=None

xmas_app/main.py

@@ -1,16 +1,3 @@
-import os
-
-import pydantic
-import pydantic_core
-from nicegui.observables import ObservableSet
-from xplan_tools.util import get_geometry_type_from_wkt
-
-from xmas_app.schema import ErrorDetail, ErrorResponse, SplitPayload, SplitSuccess
-from xmas_app.split_service import PlanSplitService, SplitValidationError
-
-os.environ["PGGSSENCMODE"] = "disable"
-os.environ["PGSSLMODE"] = "disable"
-
 import asyncio
 import importlib
 import inspect
@@ -24,8 +11,15 @@ from tempfile import NamedTemporaryFile
 from typing import Any, Literal
 from uuid import uuid4
 
+import pydantic
+import pydantic_core
+from nicegui.observables import ObservableSet
 from pydantic import ValidationError
 from starlette.applications import Starlette
+from xplan_tools.util import get_geometry_type_from_wkt
+
+from xmas_app.schema import ErrorDetail, ErrorResponse, SplitPayload, SplitSuccess
+from xmas_app.split_service import PlanSplitService, SplitValidationError
 
 log_dir = Path(__file__).parent / "logs"
 log_dir.mkdir(exist_ok=True)
@@ -43,19 +37,6 @@ if not logger.handlers:
     logger.addHandler(fh)
     logger.debug(f"Writing logs to {log_file}")
 
-
-# ui.timer(
-#     1.0,
-#     lambda: (
-#         print("bindings:", len(binding.bindings)),
-#         print("a. links:", len(binding.active_links)),
-#         print("b. props:", len(binding.bindable_properties)),
-#         print(
-#             "c. link elements:", "\n".join([str(link) for link in binding.active_links])
-#         ),
-#     ),
-# )
-
 from fastapi import APIRouter, HTTPException, Request, status
 from nicegui import app, run, ui
 from nicegui.events import ClickEventArguments, ValueChangeEventArguments
@@ -170,7 +151,7 @@ async def plan_tree(
             tree.update()
 
     app.storage.client["user_agent"] = request.headers.get("user-agent", None)
-    qgis = app.storage.client["user_agent"] == "QGIS XGeoStd Plugin"
+    qgis = app.storage.client["user_agent"].startswith(settings.qgis_plugin_name)
     if qgis:
         ui.add_head_html('<script src="qrc:///qtwebchannel/qwebchannel.js"></script>')
 
@@ -244,23 +225,17 @@ async def plan_tree(
                     if feature.get_geom_wkt():
                         ui.button("Zum Feature springen").on(
                             "click",
-                            lambda e, origin=origin, target=target: highlight_feature(
-                                e, str(origin), str(target)
-                            ),
+                            lambda e, target=target: highlight_feature(e, str(target)),
                         )
 
                     ui.button("Feature selektieren").on(
                         "click",
-                        lambda e, origin=origin, target=target: select_feature(
-                            e, str(origin), str(target)
-                        ),
+                        lambda e, target=target: select_feature(e, str(target)),
                     )
 
                     ui.button("Attributformular öffnen").on(
                         "click",
-                        lambda e, origin=origin, target=target: show_attribute_form(
-                            e, str(origin), str(target)
-                        ),
+                        lambda e, target=target: show_attribute_form(e, str(target)),
                     )
 
                     # ui.button(
@@ -308,12 +283,12 @@ async def plan_tree(
                 return
             action_dialog.open()
 
-    async def highlight_feature(e: ClickEventArguments, origin: str, target: str):
+    async def highlight_feature(e: ClickEventArguments, target: str):
         logger.debug("highlight_feature called")
         try:
             logger.info("Sending highlight_feature to QWebChannel handler")
             ui.run_javascript(f"""new QWebChannel(qt.webChannelTransport, function (channel) {{
-                                        channel.objects.handler.highlight_feature("{origin}", "{target}")
+                                        channel.objects.handler.highlight_feature("{target}")
                                 }});""")
         except Exception as ex:
             logger.error(
@@ -322,12 +297,12 @@ async def plan_tree(
         finally:
             e.sender.props(remove="loading")
 
-    async def show_attribute_form(e: ClickEventArguments, origin: str, target: str):
+    async def show_attribute_form(e: ClickEventArguments, target: str):
         logger.debug("show_attribute_form called")
         try:
             logger.info("Sending show_attribute_form to QWebChannel handler")
             ui.run_javascript(f"""new QWebChannel(qt.webChannelTransport, function (channel) {{
-                                        channel.objects.handler.show_attribute_form("{origin}", "{target}")
+                                        channel.objects.handler.show_attribute_form("{target}")
                                 }});""")
         except Exception as ex:
             logger.error(
@@ -336,12 +311,12 @@ async def plan_tree(
         finally:
             e.sender.props(remove="loading")
 
-    async def select_feature(e: ClickEventArguments, origin: str, target: str):
+    async def select_feature(e: ClickEventArguments, target: str):
         logger.debug("highlight_feature called")
         try:
             logger.info("Sending select_feature to QWebChannel handler")
             ui.run_javascript(f"""new QWebChannel(qt.webChannelTransport, function (channel) {{
-                                        channel.objects.handler.select_feature("{origin}", "{target}")
+                                        channel.objects.handler.select_feature("{target}")
                                 }});""")
         except Exception as ex:
             logger.error(f"Exception while select_feature called: {ex}", exc_info=True)
@@ -397,7 +372,7 @@ async def plan_tree(
         nodes,
         on_select=show_menu,
         tick_strategy=None,
-    ).props("accordion")
+    ).props("accordion no-transition")
 
     notification.spinner = False
     notification.type = "positive"
@@ -434,7 +409,7 @@ async def plans(
     ui.dropdown_button.default_props("flat square no-caps")
     ui.select.default_props("square filled dense")
     app.storage.client["user_agent"] = request.headers.get("user-agent", None)
-    qgis = app.storage.client["user_agent"] == "QGIS XGeoStd Plugin"
+    qgis = app.storage.client["user_agent"].startswith(settings.qgis_plugin_name)
     if qgis:
         ui.add_head_html('<script src="qrc:///qtwebchannel/qwebchannel.js"></script>')
 
@@ -865,7 +840,7 @@ async def feature(
     app.storage.client["parent_id"] = parentId
     app.storage.client["user_agent"] = request.headers.get("user-agent", None)
 
-    qgis = app.storage.client["user_agent"] == "QGIS XGeoStd Plugin"
+    qgis = app.storage.client["user_agent"].startswith(settings.qgis_plugin_name)
 
     ui.colors(
         # primary=f"{'#f0f0f0' if qgis else 'rgb(157 157 156)'}",
@@ -1059,7 +1034,7 @@ def get_associations(
 
     app.storage.client["user_agent"] = request.headers.get("user-agent", None)
 
-    qgis = app.storage.client["user_agent"] == "QGIS XGeoStd Plugin"
+    qgis = app.storage.client["user_agent"].startswith(settings.qgis_plugin_name)
 
     feature_data = {}
 

xmas_app/settings.py

@@ -2,7 +2,9 @@ import os
 from typing import Any, Dict, List, Literal, Optional, TypedDict
 
 from pydantic import HttpUrl
+from pydantic_extra_types.semver import _VersionPydanticAnnotation
 from pydantic_settings import BaseSettings, SettingsConfigDict
+from semver import Version
 from xplan_tools.interface.db import DBRepository
 
 
@@ -52,6 +54,8 @@ class Settings(BaseSettings):
     codelist_repo: HttpUrl = HttpUrl(
         "https://registry.gdi-de.org/codelist/de.xleitstelle.xplanung"
     )
+    qgis_plugin_name: str = "XMAS-Plugin"
+    qgis_plugin_min_version: _VersionPydanticAnnotation = Version(major=0, minor=9)
 
     model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8")
 

{xmas_app-0.9.0.dist-info → xmas_app-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmas-app
-Version: 0.9.0
+Version: 0.10.0
 Summary: The XLeitstelle model-driven application schema app.
 License: EUPL-1.2-or-later
 License-File: LICENSE
@@ -13,10 +13,11 @@ Classifier: License :: OSI Approved :: European Union Public Licence 1.2 (EUPL 1
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Dist: nicegui (>=2.20,<3.0)
+Requires-Dist: pydantic-extra-types[semver]
 Requires-Dist: pydantic-settings (>=2.0,<3.0)
 Requires-Dist: xplan-tools (>=1.10.3)
 Project-URL: Homepage, https://gitlab.opencode.de/xleitstelle/xmas-app
-Project-URL: Issues, https://gitlab.opencode.de/xleitstelle/xplanung/xmas-app/-/issues
+Project-URL: Issues, https://gitlab.opencode.de/xleitstelle/xmas-app/-/issues
 Description-Content-Type: text/markdown
 
 # XMAS-App
@@ -106,7 +107,7 @@ pixi shell
 then run
 
 ```shell
-xplan-gui
+xmas-app
 ```
 
 ### Optional: batch import test data to the database using xplan-tools
@@ -125,10 +126,11 @@ done
 (on Windows:):
 ```cmd
 for %f in (*.gml) do xplan-tools convert "%f" postgresql://postgres:postgres@127.0.0.1:55432/postgres
-cd ```
+```
+
+## License
 
-### Notes
+The code in this repository is licensed under the [EUPL-1.2-or-later](https://joinup.ec.europa.eu/collection/eupl)
 
-We set PGGSSENCMODE=disable and PGSSLMODE=disable at runtime to avoid Windows security and file locking issues in local development.
-This does not affect production deployments, which can use secure defaults.
+&copy; [XLeitstelle](https://xleitstelle.de), 2025
 

{xmas_app-0.9.0.dist-info → xmas_app-0.10.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
 xmas_app/db.py,sha256=dHU8_xDsH2WduEMrYs0spY55hLlN5Xv12tRb8lHAado,7139
 xmas_app/db_uow.py,sha256=usvqo1bO4dQnMbiub5PyQAAgu8Af-HYAJTsFNYS3Le0,761
-xmas_app/form.py,sha256=Kaspn9K9VEulcvpRQBGYKjv9Lm2ZFuT0OxkdO9S4G3g,70831
-xmas_app/main.py,sha256=Gm6QM-xWpIyxLXY1KCqYyzh8xgw316JIVjwdHOMoxgQ,50637
+xmas_app/form.py,sha256=fO-7Fwl3TCEQIlZYrbathPIZ1iBIk7nkVLnLaN5vDbM,70954
+xmas_app/main.py,sha256=cjRi56mVcWdmKb_CCW61GRuMSDidQbJlM6OEiKvwIB8,49937
 xmas_app/models/crud.py,sha256=p_NkUXAo9UkUPUPh2yPtuWoUnP2yMONjxgPaMmgkhzw,411
 xmas_app/pygeoapi/config.yaml,sha256=lmb08zXk8-dB0sh_4EQ1enVBIqgBI-v6QcoIiHyH3N8,7992
 xmas_app/pygeoapi/openapi.yaml,sha256=h4J4kYugyNVMFjL_C2CLcntELgIkGh0N4VzpPf8u_tE,40650
 xmas_app/pygeoapi/provider.py,sha256=uKHK_Hsqale1C2pNRKYpyka9GnNHYvGBmbzfcSi05NE,25109
 xmas_app/schema.py,sha256=3P-i14caMqydGsxNw6SOAcanEg1Qr4qxqciAow1aCUM,1507
 xmas_app/services/crud.py,sha256=qY6d_bXKSNN-6lID8h7vVeYAvwOb8A6JkhZpaWLRIE8,2464
-xmas_app/settings.py,sha256=eI7RH8FvAhnvXLxaGo-29BJpTWspiH8D4FkjSigQYJM,2317
+xmas_app/settings.py,sha256=oxVrJArZNOQCMBM72Iv0YGBkRUbGSArBxsl26SgaJPg,2537
 xmas_app/split_service.py,sha256=Ag_Ix2vMgT04OsQ0DIGK7WFKQlbktmmTqWlESO2ZgVs,26701
 xmas_app/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xmas_app/util/codelist.py,sha256=7qdiaKQLm38TA7WuAfizmdXd_AjJVZ-tnAFpQg4vdeA,1951
-xmas_app-0.9.0.dist-info/METADATA,sha256=JDV6r6-5gHFo7QTDNg8_yU8twR-WGUmy0CA6ReAtDCM,5324
-xmas_app-0.9.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-xmas_app-0.9.0.dist-info/entry_points.txt,sha256=uve2b0hgPbVfiD047-hOI6_dD97ZytvCPWk7HsN9Xng,53
-xmas_app-0.9.0.dist-info/licenses/LICENSE,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
-xmas_app-0.9.0.dist-info/RECORD,,
+xmas_app-0.10.0.dist-info/METADATA,sha256=QsglqnmJkp760bffaZFnj7gG6StKlnAI5hVVqytwEVk,5315
+xmas_app-0.10.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+xmas_app-0.10.0.dist-info/entry_points.txt,sha256=uve2b0hgPbVfiD047-hOI6_dD97ZytvCPWk7HsN9Xng,53
+xmas_app-0.10.0.dist-info/licenses/LICENSE,sha256=b8nnCcy_4Nd_v_okJ6mDKCvi64jkexzbSfIag7TR5mU,13827
+xmas_app-0.10.0.dist-info/RECORD,,