Update to Version 2.1

.bumpversion.toml

@@ -0,0 +1,15 @@
+[bumpversion]
+current_version = "2.1.0rc1+fix-error-handling"
+commit = true
+tag = true
+tag_name = "v{new_version}"
+
+[[bumpversion.files]]
+filename = "pyproject.toml"
+search = 'version = "{current_version}"'
+replace = 'version = "{new_version}"'
+
+[[bumpversion.files]]
+filename = ".env"
+search = 'IMAGE_TAG={current_version}'
+replace = 'IMAGE_TAG={new_version}'

.env.example

@@ -1,10 +1,11 @@
 #---- App settings ----
 # The API_SERVER_URL is only used to return the complete URL in the result of the job details as specified in OGC.
 # Should be the base url to the api.
-
+UMP_SERVER_TIMEOUT=30
 UMP_LOG_LEVEL=DEBUG
 UMP_PROVIDERS_FILE=providers.yaml
 UMP_API_SERVER_URL=localhost:5000
+UMP_API_SERVER_URL_PREFIX=/api
 UMP_REMOTE_JOB_STATUS_REQUEST_INTERVAL=5
 UMP_DATABASE_NAME=ump
 UMP_DATABASE_HOST=localhost

.gitignore

@@ -172,3 +172,4 @@ cython_debug/
 
 geoserver_data
 postgresql_data
+scratch/*

.vscode/launch.json

@@ -5,7 +5,31 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Launch api",
+            "name": "ump + db",
+            "type": "debugpy",
+            "request": "launch",
+            "module": "flask",
+            "envFile": "${workspaceFolder}/.env",
+            "env": {
+                "FLASK_APP": "src/ump/main.py",
+                "FLASK_DEBUG": "1"
+            },
+            "args": [
+                "--debug",
+                "run",
+                "--no-debugger",
+                "-p",
+                // "5005",
+                "${command:pickArgs}"
+            ],
+            "jinja": true,
+            "autoStartBrowser": false,
+            "preLaunchTask": "start-postgis-container",
+            "postDebugTask": "stop-postgis-container",
+            "justMyCode": false,
+        },
+        {
+            "name": "ump + db + migrations",
             "type": "debugpy",
             "request": "launch",
             "module": "flask",

.vscode/settings.json

@@ -6,7 +6,7 @@
         "--preview"
     ],
     "[python]": {
-        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.defaultFormatter": "charliermarsh.ruff",
         "editor.formatOnSave": true,
         "editor.codeActionsOnSave": {
             "source.organizeImports": "explicit"
@@ -20,4 +20,5 @@
     ],
     "ruff.importStrategy": "fromEnvironment",
     "black-formatter.importStrategy": "fromEnvironment",
+    "python.analysis.typeCheckingMode": "basic",
 }

CHANGELOG.md

@@ -4,6 +4,43 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+# [2.x]
+## [2.1.0] - 2025-07-31
+### Changed:
+- improved error handling when requesting remote servers processes and jobs
+- helm chart is up-to-date with current UMP
+- provider loader listens on any event to be compatible with configmap-updates in k8s
+- provider loader improved: debouncing rapid file changes and atomic updates of providers object
+- improved server responses in certain situations, especially when something went wrong showing users json information (as this is a json api) in accordance with OGC api process spec
+- improved job starting mechanism
+
+### Added:
+- a new setting to control gunicorn worker timout was introduced: UMP_SERVER_TIMEOUT
+- a new setting to control ump server path prefix introduced: UMP_API_SERVER_URL_PREFIX
+- timeouts for all requests to remote servers
+
+### Fixed:
+- using setting UMP_KEYCLOAK_CLIENT_ID instead of hard-coded "ump-client"
+- job insert queries failed when logged-in user created a job
+- missing job metadata
+- fetch correct job status from remote server
+
+## [2.0.0] - 2025-06-25
+
+### Added
+- comprehensive documentation added
+- unified database connection pool handling 
+
+### Changed
+- created a providers pydantic class for better type safety and concise handling 
+- improved provider.yaml loading and provider updateing mechanism
+- improved logging 
+- keycloak coinnection error handling improved
+
+### Fixed
+- ump ran out of database connections due to unclosed connections
+
+# [1.x]
 ## [1.2.0] - 2024-05-25
 
 ### Added

Dockerfile

@@ -42,8 +42,12 @@ ARG USER_UID=1000
 ARG USERNAME=pythonuser
 ARG USER_GID=2000
 ARG SOURCE_COMMIT
+ARG IMAGE_TAG=2.0.0
 
-LABEL maintainer="Urban Data Analytics" name="analytics/urban-model-platform" source_commit=$SOURCE_COMMIT
+LABEL maintainer="Urban Data Analytics" \
+    name="analytics/urban-model-platform" \
+    source_commit=$SOURCE_COMMIT \
+    version=${IMAGE_TAG}
 
 # add user and group
 RUN groupadd --gid $USER_GID $USERNAME && \

Makefile

@@ -49,7 +49,10 @@ initiate-dev:
 build-image:
 	@echo 'Building release ${CONTAINER_REGISTRY}/${CONTAINER_NAMESPACE}/$(IMAGE_NAME):$(IMAGE_TAG)'
 # build your image
-	docker compose -f docker-compose-build.yaml build --build-arg SOURCE_COMMIT=$(GIT_COMMIT) api
+	docker compose -f docker-compose-build.yaml build \
+	--build-arg SOURCE_COMMIT=$(GIT_COMMIT) \
+	--build-arg TAG=$(IMAGE_TAG) \
+	api
 
 upload-image: build-image
 	docker compose -f docker-compose-build.yaml push api
@@ -95,3 +98,27 @@ build-docs:
 
 clean-docs:
 	jupyter-book clean docs
+
+# Update app version: bump major, minor, or patch
+bump-app-version:
+	@if [ -z "$(part)" ]; then \
+		echo "Usage: make bump-app part={major|minor|patch}"; \
+		exit 1; \
+	fi; \
+	bump-my-version bump $(part)
+
+# Update app version: set to a specific version
+set-app-version:
+	@if [ -z "$(version)" ]; then \
+		echo "Usage: make set-app-version version={version}"; \
+		exit 1; \
+	fi; \
+	bump-my-version set $(version)
+
+# Update chart version: bump major, minor, or patch
+bump-chart-version:
+	@if [ -z "$(part)" ]; then \
+		echo "Usage: make bump-chart part={major|minor|patch}"; \
+		exit 1; \
+	fi; \
+	(cd charts && bump-my-version bump $(part))

charts/.bumpversion.toml

@@ -0,0 +1,10 @@
+[bumpversion]
+current_version = "0.7.0"
+commit = true
+tag = true
+tag_name = "chart-v{new_version}"
+
+[[bumpversion.files]]
+filename = "urban-model-platform/Chart.yaml"
+search = 'version: {current_version}'
+replace = 'version: {new_version}'

charts/urban-model-platform/Chart.yaml

@@ -15,13 +15,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.0
+version: 0.9.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.9.2"
+appVersion: "2.1.0"
 kubeVersion: ">= 1.31.0"
 annotations:
   category: API

charts/urban-model-platform/templates/configmap-settings.yaml

@@ -5,9 +5,11 @@ metadata:
   labels:
     {{- include "ump.labels" . | nindent 4 }}
 data:
-  PROVIDERS_FILE: {{ .Values.config.providersFilePath | quote }}
-  CORS_URL_REGEX: {{ .Values.config.corsUrlRegex | quote }}
-  API_SERVER_URL: {{ .Values.config.serverUrl | quote }}
-  NUMBER_OF_WORKERS: {{ .Values.config.numberOfWorkers | quote }}
-  POSTGRES_PORT: {{ .Values.config.postgresPort | quote }}
-  POSTGRES_HOST: {{ .Values.config.postgresHost | quote }}
+  UMP_LOG_LEVEL: {{ .Values.config.logLevel | quote }}
+  UMP_PROVIDERS_FILE: {{ .Values.config.providersFilePath | quote }}
+  UMP_API_SERVER_URL: {{ .Values.config.apiServerUrl | quote }}
+  UMP_API_SERVER_URL_PREFIX: {{ .Values.config.apiServerUrlPrefix | quote }}
+  UMP_REMOTE_JOB_STATUS_REQUEST_INTERVAL: {{ .Values.config.remoteJobStatusRequestInterval | quote }}
+  UMP_JOB_DELETE_INTERVAL: {{ .Values.config.jobDeleteInterval | quote }}
+  UMP_API_SERVER_WORKERS: {{ .Values.config.apiServerWorkers | quote }}
+  UMP_SERVER_TIMEOUT: {{ .Values.config.serverWorkerTimeout | quote }}