xmas-app 0.11.0__tar.gz → 0.11.2__tar.gz

{xmas_app-0.11.0 → xmas_app-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmas-app
-Version: 0.11.0
+Version: 0.11.2
 Summary: The XLeitstelle model-driven application schema app.
 License: EUPL-1.2-or-later
 License-File: LICENSE

{xmas_app-0.11.0 → xmas_app-0.11.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xmas-app"
-version = "0.11.0"
+version = "0.11.2"
 description = "The XLeitstelle model-driven application schema app."
 authors = [{ name = "Tobias Kraft", email = "tobias.kraft@gv.hamburg.de" }]
 classifiers = [
@@ -58,6 +58,7 @@ args = [
 ]
 cmd = """
 pixi workspace version {{version}}
+&& git pull
 && pixi lock
 && git add pyproject.toml pixi.lock
 && git commit -m "bump to $(pixi workspace version get)"

{xmas_app-0.11.0 → xmas_app-0.11.2}/xmas_app/main.py

@@ -3,36 +3,48 @@ import importlib
 import inspect
 import io
 import logging
-import os
 import re
 from contextlib import asynccontextmanager
 from functools import partial
 from pathlib import Path
-from tempfile import NamedTemporaryFile
+from tempfile import NamedTemporaryFile, gettempdir
 from typing import Any, Literal
 from uuid import uuid4
 
 import pydantic
 import pydantic_core
+from fastapi import APIRouter, Depends, HTTPException, Request, status
+from nicegui import app, run, ui
+from nicegui.events import ClickEventArguments, ValueChangeEventArguments
 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 xplan_tools.interface import repo_factory
+from xplan_tools.interface.db import DBRepository
+from xplan_tools.interface.gml import GMLRepository
+from xplan_tools.model import model_factory
+from xplan_tools.util import (
+    cast_geom_to_multi,
+    cast_geom_to_single,
+    get_geometry_type_from_wkt,
+)
 
+from xmas_app.db import get_db_feature_ids, get_nodes
 from xmas_app.deps.version_guard import enforce_plugin_version
+from xmas_app.form import ModelForm
+from xmas_app.models.crud import InsertPayload, UpdatePayload
 from xmas_app.schema import ErrorDetail, ErrorResponse, SplitPayload, SplitSuccess
+from xmas_app.services import crud
+from xmas_app.settings import get_appschema, settings
 from xmas_app.split_service import PlanSplitService, SplitValidationError
 
 
 def _resolve_log_dir() -> Path:
-    # If launched from QGIS plugin
-    if os.getenv("XMAS_APP_FROM_PLUGIN") == "1":
-        plugin_dir = os.getenv("XMAS_APP_PLUGIN_DIR")
-        if plugin_dir:
-            return Path(plugin_dir) / "webapp_logs"
-
-    # default: local repo logs (dev)
-    return Path(__file__).parent / "logs"
+    if settings.app_mode == "prod":
+        return Path(gettempdir()) / "xmas_log"
+    else:
+        # dev: local repo logs
+        return Path(__file__).parent.parent
 
 
 log_dir = _resolve_log_dir()
@@ -40,34 +52,15 @@ log_dir.mkdir(exist_ok=True)
 log_file = log_dir / "xmas_app.log"
 
 logger = logging.getLogger("xmas_app")
+logger.propagate = False
 
-if not logger.handlers:
-    logger.setLevel(logging.DEBUG)
-    fh = logging.FileHandler(log_file, mode="w", encoding="utf-8")
-    formatter = logging.Formatter(
-        "%(asctime)s - %(levelname)s - %(name)s - %(message)s"
-    )
-    fh.setFormatter(formatter)
-    logger.addHandler(fh)
-    logger.debug(f"Writing logs to {log_file}")
-
-from fastapi import APIRouter, Depends, HTTPException, Request, status
-from nicegui import app, run, ui
-from nicegui.events import ClickEventArguments, ValueChangeEventArguments
-from xplan_tools.interface import repo_factory
-from xplan_tools.interface.db import DBRepository
-from xplan_tools.interface.gml import GMLRepository
-from xplan_tools.model import model_factory
-from xplan_tools.util import (
-    cast_geom_to_multi,
-    cast_geom_to_single,
-)
-
-from xmas_app.db import get_db_feature_ids, get_nodes
-from xmas_app.form import ModelForm
-from xmas_app.models.crud import InsertPayload, UpdatePayload
-from xmas_app.services import crud
-from xmas_app.settings import get_appschema, settings
+logger.handlers.clear()
+logger.setLevel(logging.DEBUG if settings.debug else logging.INFO)
+fh = logging.FileHandler(log_file, mode="w", encoding="utf-8")
+formatter = logging.Formatter("%(asctime)s - %(levelname)s - %(name)s - %(message)s")
+fh.setFormatter(formatter)
+logger.addHandler(fh)
+logger.debug(f"Writing logs to {log_file}")
 
 ui.element.default_props("dense")
 
@@ -1239,15 +1232,14 @@ async def receive_split_plans(payload: SplitPayload) -> SplitSuccess:
 
 @asynccontextmanager
 async def lifespan(starlette_app):
-    logger.info(
-        f"NiceGUI server is running on port {settings.app_port} in {settings.app_mode} mode."
-    )
-    print(
-        f"NiceGUI server is running on port {settings.app_port} in {settings.app_mode} mode."
+    msg = (
+        f"XMAS-App is running on port {settings.app_port} in {settings.app_mode} mode."
     )
+    logger.info(msg)
+    print(msg)
     yield
-    logger.info("Server is shutting down.")
-    print("Server is shutting down.")
+    logger.info("XMAS-App is shutting down.")
+    print("XMAS-App is shutting down.")
 
 
 starlette_app = Starlette(