Further eliminate UserDefinedProcesses.get_for_user usage

for Open-EO/openeo-aggregator#125
and related to #377

Author: soxofaan

openeo_driver/backend.py

@@ -638,6 +638,7 @@ def prepare_for_json(self) -> dict:
 
     def to_api_dict(self, full=True, user: User = None) -> dict:
         """API-version-aware conversion of UDP metadata to jsonable dict"""
+        # TODO: avoid coupling with user object through argument: make it a property of the UDP object, or generalize to namespace
         d = self.prepare_for_json()
         if not full:
             # API recommends to limit response size by omitting larger/optional fields
@@ -666,12 +667,13 @@ class UserDefinedProcessesListing:
     def __init__(self, udps: List[UserDefinedProcessMetadata]):
         self._udps = udps
 
-    def to_response_dict(self) -> dict:
+    def to_response_dict(self, *, full: bool = False, target_version: Optional[str] = None, user: User = None) -> dict:
         """
         Produce `GET /process_graphs` response data, to be JSONified.
         """
         return {
-            "processes": [udp.to_api_dict(full=False) for udp in self._udps],
+            "version": target_version,
+            "processes": [udp.to_api_dict(full=full, user=user) for udp in self._udps],
             "links": [],
         }
 
@@ -701,9 +703,12 @@ def list_for_user(
         self,
         user_id: str,
         pagination: Optional[PaginationRequest] = None,
+        public_only: bool = False,
     ) -> UserDefinedProcessesListing:
         # TODO: remove this adapter implementation once `get_for_user` is removed
         udps = self.get_for_user(user_id=user_id)
+        if public_only:
+            udps = [udp for udp in udps if udp.public]
         return UserDefinedProcessesListing(udps=udps)
 
     def save(self, user_id: str, process_id: str, spec: dict) -> None:

openeo_driver/views.py

@@ -755,14 +755,18 @@ def processes():
     def processes_from_namespace(namespace):
         # TODO: this endpoint is in draft at the moment
         #       see https://github.com/Open-EO/openeo-api/issues/310, https://github.com/Open-EO/openeo-api/pull/348
-        # TODO: convention for user namespace? use '@' instead of "u:"
         # TODO: unify with `/processes` endpoint?
+        # TODO #377 pagination?
+        _log.warning(f"Usage of non-standard endpoint `/processes/{namespace}`")
         full = smart_bool(request.args.get("full", False))
         target_version = None
+        # TODO: convention for user namespace? use '@' instead of "u:"
         if namespace.startswith("u:") and backend_implementation.user_defined_processes:
             user_id = namespace.partition("u:")[-1]
-            user_udps = [p for p in backend_implementation.user_defined_processes.get_for_user(user_id) if p.public]
-            processes = [udp.to_api_dict(full=full, user=User(user_id=user_id)) for udp in user_udps]
+            udp_listing = backend_implementation.user_defined_processes.list_for_user(user_id, public_only=True)
+            response = udp_listing.to_response_dict(
+                full=full, target_version=target_version, user=User(user_id=user_id)
+            )
         elif ":" not in namespace:
             process_registry = backend_implementation.processing.get_process_registry(
                 api_version=requested_api_version()
@@ -777,7 +781,6 @@ def processes_from_namespace(namespace):
                 ]
         else:
             raise OpenEOApiException("Could not handle namespace {n!r}".format(n=namespace))
-        # TODO: pagination links?
         return jsonify(
             {
                 "version": target_version,
@@ -1766,7 +1769,7 @@ def udp_get(process_graph_id: str, user: User):
     def udp_list_for_user(user: User):
         pagination = PaginationRequest.from_request(request=flask.request)
         udps = backend_implementation.user_defined_processes.list_for_user(user_id=user.user_id, pagination=pagination)
-        return jsonify(udps.to_response_dict())
+        return jsonify(udps.to_response_dict(full=False, user=user))
 
     @api_endpoint
     @blueprint.route('/process_graphs/<process_graph_id>', methods=['DELETE'])